📦 deps(thirdparty): update snapshots
This commit is contained in:
@@ -18,7 +18,7 @@ npm run merge:batch -- --prs 450,449,446,451
|
||||
|
||||
Add `--poll-seconds <n>` if you want a slower or faster status loop while checks settle.
|
||||
|
||||
If a PR changes canonical `SKILL.md` content or its allowlisted supporting assets/references/resources, first review the exact current head commit, then attest to that immutable revision:
|
||||
If a PR changes any tracked file under a canonical `skills/<skill-id>/**` subtree, review the entire affected subtree at the exact current head commit, then attest to that immutable revision:
|
||||
|
||||
```bash
|
||||
npm run merge:batch -- --prs 450 --reviewed-head <40-character-head-sha>
|
||||
@@ -34,7 +34,7 @@ Use `--dry-run` to exercise local classification without approving a run or merg
|
||||
- recompute changed-skill evidence with evaluator code materialized from the trusted `main` commit
|
||||
- reject incomplete evidence coverage, deterministic quality/security/provenance regressions, and base/head drift
|
||||
- for external PRs, poll for asynchronously-created fork runs and approve only runs waiting on `action_required` when every path, mode, object, size, and workflow identity is allowlisted
|
||||
- for same-repository maintainer PRs, allow repository-wide source changes while still enforcing trusted changed-skill evidence, exact-head review, required checks, branch protection, and immutable PR identity
|
||||
- for sensitive same-repository source changes, allow the guarded exception only when the PR author is the repository owner and the exact full head SHA is attested; collaborator-authored sensitive changes fail closed under the external safety policy
|
||||
- wait for the latest required checks bound to the exact head SHA
|
||||
- call GitHub's immediate squash-merge endpoint and continue only when it reports `merged: true`
|
||||
- pull the protected `main`; its trusted workflow opens a canonical-sync bot PR for generated artifacts and contributor credits when needed
|
||||
@@ -48,7 +48,7 @@ Use `--dry-run` to exercise local classification without approving a run or merg
|
||||
|
||||
- conflict resolution on the PR branch
|
||||
- manual judgment for risky skill changes
|
||||
- semantic review when the distinct `manual-review-required` check is present
|
||||
- semantic review when the distinct `manual-review-required` check is present; the review fingerprint covers the complete nearest skill directory, including nested examples, scripts, lockfiles, references, and assets
|
||||
- README community-source audits when the source metadata is ambiguous
|
||||
- fork-only edge cases that require contributor coordination outside GitHub permissions
|
||||
- base-branch drift: stale evidence is discarded and the batch must be rerun
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
# Merging Pull Requests
|
||||
|
||||
**Policy: we always Merge PRs on GitHub so contributors get credit. We never Close a PR after integrating their work locally.**
|
||||
**Policy: every accepted PR is merged through `npm run merge:batch`, which uses GitHub's protected squash-merge endpoint so contributors get credit. We never push an integration directly to `main` or close a PR after copying its work.**
|
||||
|
||||
## Always merge via GitHub
|
||||
|
||||
- Use the GitHub UI **"Squash and merge"** for every accepted PR.
|
||||
- Use `npm run merge:batch -- --prs <PR_NUMBER>` for every accepted PR; do not substitute the GitHub UI or a raw `gh pr merge` command.
|
||||
- The PR must show as **Merged**, not Closed. That way the contributor appears in the repo’s contribution graph and the PR is clearly linked to the merge commit.
|
||||
- Do **not** integrate a PR by squashing locally, pushing to `main`, and then closing the PR. That would show "Closed" and the contributor would not get proper credit.
|
||||
- Before merging, require the normal PR checks from [`.github/workflows/ci.yml`](../../.github/workflows/ci.yml) to be green. If the PR touches `SKILL.md`, also require the separate [`skill-review` workflow](../../.github/workflows/skill-review.yml) to pass.
|
||||
- For PRs that touch `SKILL.md` or risky guidance, require a real manual logic review in addition to the automated checks. Confirm the instructions, failure modes, and `risk:` label make sense before merging.
|
||||
- Before merging, require the normal PR checks from [`.github/workflows/ci.yml`](../../.github/workflows/ci.yml) to be green. If the PR changes anything under `skills/**` or `plugins/**/skills/**`, also require a truthful outcome from the separate [`skill-review` workflow](../../.github/workflows/skill-review.yml).
|
||||
- For any tracked change under a canonical `skills/<skill-id>/**` subtree, inspect the complete skill directory and require a real manual logic review in addition to the automated checks. Confirm instructions, bundled files, failure modes, provenance, and `risk:` label before attesting the exact full head SHA.
|
||||
- For ordered multi-PR maintainer batches, use [Merge Batch](merge-batch.md) as the operational shortcut and keep this document as the policy reference.
|
||||
|
||||
## If the PR has merge conflicts
|
||||
|
||||
Resolve conflicts **on the PR branch** so the PR becomes mergeable, then use "Squash and merge" on GitHub.
|
||||
Resolve conflicts **on the PR branch** so the PR becomes mergeable, then use `merge:batch`.
|
||||
|
||||
### Generated files policy
|
||||
|
||||
@@ -38,10 +38,10 @@ Resolve conflicts **on the PR branch** so the PR becomes mergeable, then use "Sq
|
||||
`git add .` then `git commit -m "chore: merge main to resolve conflicts"` (or leave the default merge message).
|
||||
5. **Push to the same branch the PR is from**
|
||||
If the PR is from the contributor’s fork branch (e.g. `sraphaz:feat/uncle-bob-craft`), you need push access to that branch. Options:
|
||||
- **Preferred:** Ask the contributor to merge `main` into their branch, fix conflicts, and push; then you use "Squash and merge" on GitHub.
|
||||
- **Preferred:** Ask the contributor to merge `main` into their branch, fix conflicts, and push; then use `merge:batch`.
|
||||
- If you have a way to push to their branch (e.g. they gave you permission, or the branch is in this repo), push:
|
||||
`git push origin pr-<PR_NUMBER>:feat/uncle-bob-craft` (replace with the actual branch name from the PR).
|
||||
6. **On GitHub:** The PR should now be mergeable. Click **"Squash and merge"**. The PR will show as **Merged**.
|
||||
6. **Run the guarded merge:** Once the PR is mergeable, use `npm run merge:batch -- --prs <PR_NUMBER> [--reviewed-head <40-character-head-sha>]`. The PR will show as **Merged**.
|
||||
|
||||
### If the contributor resolves conflicts
|
||||
|
||||
@@ -58,23 +58,19 @@ git commit -m "chore: merge main to resolve conflicts"
|
||||
git push origin <their-branch>
|
||||
```
|
||||
|
||||
Then you use **"Squash and merge"** on GitHub. The PR will be **Merged**, not Closed.
|
||||
Then use the guarded `merge:batch` command. The PR will be **Merged**, not Closed.
|
||||
|
||||
## Rare exception: local squash (avoid if possible)
|
||||
## No local-integration exception
|
||||
|
||||
Only if merging via GitHub is not possible (e.g. contributor unreachable and you must integrate their work, or a one-off batch), you may squash locally and push to `main`. In that case:
|
||||
|
||||
1. Add a **Co-authored-by** line to the squash commit so the contributor is still credited (see [GitHub: Creating a commit with multiple authors](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors)).
|
||||
2. Close the PR with a comment explaining why it was integrated locally and that attribution is in the commit.
|
||||
3. Prefer to avoid this pattern in the future so PRs can be **Merged** normally.
|
||||
If `merge:batch` cannot prove the immutable PR tuple, required checks, branch protection, or exact review evidence, stop and repair the PR or workflow. Never integrate locally, push directly to `main`, or replace the guarded command with a raw merge.
|
||||
|
||||
## Summary
|
||||
|
||||
| Goal | Action |
|
||||
|-----------------------------|------------------------------------------------------------------------|
|
||||
| Give contributors credit | Always use **Squash and merge** on GitHub so the PR shows **Merged**. |
|
||||
| PR has conflicts | Resolve on the PR branch (you or the contributor), then **Squash and merge**. |
|
||||
| Never | Integrate locally and then **Close** the PR without merging. |
|
||||
| Give contributors credit | Use `merge:batch` so GitHub records the protected squash merge. |
|
||||
| PR has conflicts | Resolve on the PR branch, then run `merge:batch`. |
|
||||
| Never | Push an integration directly to `main`, use a raw merge, or close the PR after copying its work. |
|
||||
|
||||
## References
|
||||
|
||||
|
||||
@@ -63,9 +63,9 @@ A successful `manual-review-required` check means only that the requirement was
|
||||
|
||||
A real merge also requires effective server-side protection for `main`: the four exact GitHub-Actions-owned checks (`pr-policy`, `pr-evidence`, `source-validation`, and `artifact-preview`), strict up-to-date enforcement, pull-request-only changes, administrator enforcement, no applicable ruleset bypass actors, and no merge queue. If that enforcement cannot be proven, `merge:batch` refuses non-dry-run operation. Base drift is never retried with stale evidence; the batch must be rerun from the new tuple. Pre-existing auto-merge state is rejected, and the immediate GitHub merge endpoint must return `merged: true` before post-merge work begins.
|
||||
|
||||
Same-repository maintainer PRs may legitimately change repository-wide policy, tooling, workflows, or documentation, so the fork content allowlist does not apply to them. They remain bound to the protected branch, trusted-base evidence evaluator, exact PR/base/head tuple, semantic-review requirements, and required checks. Missing or mismatched head-repository identity is treated as external and therefore fails closed under the fork allowlist.
|
||||
Sensitive same-repository PRs may use the repository-wide source exception only when the PR author is the repository owner and the maintainer attests the exact full head SHA. Collaborator-authored sensitive PRs do not inherit trust from branch location and fail closed under the external safety policy. Every accepted PR remains bound to the protected branch, trusted-base evidence evaluator, exact PR/base/head tuple, semantic-review requirements, and required checks. Missing or mismatched head-repository identity is treated as external.
|
||||
|
||||
For canonical `SKILL.md` or allowlisted supporting skill-content changes, the maintainer supplies `--reviewed-head <full-sha>`. A stale, abbreviated, or mismatched SHA fails closed. The Skill Review check itself is required only for `SKILL.md` changes because that workflow is path-filtered; support-only changes still require the exact-SHA human attestation.
|
||||
For any tracked change under a canonical `skills/<skill-id>/**` subtree, the maintainer supplies `--reviewed-head <full-sha>`. A stale, abbreviated, or mismatched SHA fails closed. Skill Review triggers for `skills/**` and `plugins/**/skills/**`, and its reusable result is keyed by the complete nearest skill-directory fingerprint, so nested examples, scripts, lockfiles, references, assets, and other bundled files cannot bypass semantic review.
|
||||
|
||||
Deletions, copies, ambiguous moves, and all canonical skill-content changes remain manual-only in this stage even when deterministic evidence contains no regression. A passing ratchet is not semantic approval and never makes a skill eligible for automatic merge.
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ Use this as a diagnostic signal. It is useful for spotting legacy quality debt,
|
||||
- Add the release entry to [`CHANGELOG.md`](../../CHANGELOG.md).
|
||||
- Confirm `README.md` reflects the current version and generated counts.
|
||||
- Confirm Credits & Sources, contributors, and support links are still correct.
|
||||
- If PR or CI workflow behavior changed during the cycle, confirm maintainer and contributor docs mention the active checks (for example the `skill-review` workflow for `SKILL.md` pull requests).
|
||||
- If PR or CI workflow behavior changed during the cycle, confirm maintainer and contributor docs mention the active checks (for example the `skill-review` workflow for any change under `skills/**` or `plugins/**/skills/**`).
|
||||
- If maintainers changed declared risk labels during the cycle, confirm that each change has semantic review evidence rather than lexical inference.
|
||||
|
||||
5. Prepare the protected release PR:
|
||||
@@ -75,7 +75,7 @@ Prerelease versions use the same protected flow, for example `15.0.0-rc.1`. They
|
||||
npm run release:publish -- X.Y.Z
|
||||
```
|
||||
|
||||
This command proves local `main` equals protected `origin/main` and the exact squash commit of the merged `release/vX.Y.Z` PR, checks that no canonical-sync PR or release-state drift remains, creates or reuses the matching local/remote tag safely, and creates the GitHub release object from the matching `CHANGELOG.md` section. SemVer prereleases are marked as GitHub prereleases. It never pushes `main` directly and can be retried after a partial tag/release failure.
|
||||
This command requires exactly one merged release PR from the same repository, authored by the repository owner, with base `main`, exact title `chore: release vX.Y.Z`, and head branch `release/vX.Y.Z`. Zero or multiple candidates fail closed; the command never chooses the newest approximate match. It then proves local `main` equals protected `origin/main` and that PR's exact squash commit, checks that no canonical-sync PR or release-state drift remains, creates or reuses the matching local/remote tag safely, and creates the GitHub release object from the matching `CHANGELOG.md` section. SemVer prereleases are marked as GitHub prereleases. It never pushes `main` directly and can be retried after a partial tag/release failure.
|
||||
|
||||
7. Publish to npm if needed:
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ Preferred homepage:
|
||||
Preferred social preview:
|
||||
|
||||
- lead with `AAS Core` and the profile → stack → plan flow;
|
||||
- present `1,969+ Agentic Skills` as supporting catalog evidence, not a second product;
|
||||
- present `1,987+ Agentic Skills` as supporting catalog evidence, not a second product;
|
||||
- mention Codex and Claude as the current Core agent path, with broader host compatibility as distribution support;
|
||||
- avoid dense text and tiny logos that disappear in social cards.
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ The update process refreshes:
|
||||
- Canonical skills index (`skills_index.json`)
|
||||
- Compatibility mirror (`data/skills_index.json`)
|
||||
- Web app skills data (`apps\web-app\public\skills.json`)
|
||||
- All 1,969+ skills from the skills directory
|
||||
- All 1,987+ skills from the skills directory
|
||||
|
||||
## When to Update
|
||||
|
||||
|
||||
Reference in New Issue
Block a user