[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7E8BE7Q9MM5EWMM005ZFPDB":3,"skill-same:01M7E8BE7Q9MM5EWMM005ZFPDB":58},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":18,"publishedAt":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":30,"commitSha":31,"skillDirectory":32,"forksCount":14,"repositoryHtmlUrl":33,"repositoryHomepageUrl":6,"ownerHtmlUrl":34,"ownerBlogUrl":35,"ownerDescription":36,"updatedAt":37,"install":38,"resources":51},"01M7E8BE7Q9MM5EWMM005ZFPDB","merge-one",null,"Use when a user explicitly wants to land a single PR now via gh: readiness-gated, CI-watched, a merge commit in the repo's style, trunk synced.","tony\u002Fskills","tony","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F26336?v=4","01M72E5RNJ7SQV8F9KBM5RKRMN","Tony Narlock","01M7E7MBN5C6YZ4JJJ5Y82KBJG",0,"MIT","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fmerge-pr\u002Fskills\u002Fmerge-one\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: merge-one\ndescription: \"Use when a user explicitly wants to land a single PR now via gh: readiness-gated, CI-watched, a merge commit in the repo's style, trunk synced.\"\nallowed-tools: [\"Bash\", \"Read\", \"Write\", \"AskUserQuestion\"]\nargument-hint: \"[PR number or URL] [--squash | --rebase | any other gh pr merge flag]\"\n---\n\n# Merge One PR\n\nMerge a single pull request (the one this conversation is about, or the one\nthe current branch belongs to) via `gh pr merge`. Nothing merges until the\nreadiness gate passes. Report only what a command in this run verified.\n\nRead `..\u002F..\u002Freferences\u002Fmerge-readiness.md` before touching the PR.\n\nUser arguments: $ARGUMENTS\n\n## Procedure\n\n### 1. Identify the PR\n\nPrecedence: an explicit argument (number or URL) > the PR this\nconversation has been working on > the current branch's PR. If the\ncandidates disagree, ask via `AskUserQuestion` before proceeding; without a\nquestion tool, halt and list them.\n\nWith no argument and no conversation PR, run `git branch --show-current`\nand `gh pr view --json number` to find the current branch's PR.\n\nGather the PR's state. A failure here means no PR exists for the branch or\n`gh` is unavailable or unauthenticated: report it and stop. The readiness\ngate reuses this read. When the user passed `--repo`, add it to this command\nand every other `gh` call, and check the repo scope as the reference\ndescribes.\n\n```console\n$ gh pr view \u003Cn> --json number,title,url,state,isDraft,baseRefName,headRefOid,mergeable,mergeStateStatus,reviewDecision\n```\n\nTrunk is the PR's `baseRefName`.\n\n### 2. Run the readiness gate\n\nApply the readiness gate from the reference. If the PR is `BEHIND` or\n`DIRTY` and the repo scope is `local`, confirm with the user, then follow the\nreference's rebase procedure. Without a question tool, halt instead of\nrebasing. With scope `remote`, halt: the rebase cannot run here.\n\n### 3. Compose the merge commit message\n\nCheck the repo allows the strategy, per the reference's strategy section.\nThen follow its merge-commit-message section, which also says when to skip\nit (`--rebase`, or a message flag from the user). Write the message per\n`..\u002F..\u002Freferences\u002Fprose-rules.md`. The message carries no `Co-Authored-By`,\nno \"Generated with\" or other tool trailer, and no emoji.\n\n### 4. Merge\n\nPass the user's `gh pr merge` flags through verbatim, with the strategy flag\nand the reference's `--match-head-commit \u003Csha>` pin. Pass the composed message through the\nreference's `merge_pr.py merge` command, never inside a shell string. Use\n`--admin` only within the reference's policy.\n\n### 5. Sync trunk and stand by\n\nSync trunk and confirm the merge, per the reference's \"After each merge\",\nincluding its check that trunk contains the merge commit. Then stop.\nWhen the merge is only queued (`--auto`, or `state` still `OPEN` after the\nmerge), open with the queued hero and skip the sync.\n\n## Output\n\nOpen with a one-line hero (`✓ Merged #N: \u003Ctitle>`,\n`✓ Queued #N: \u003Ctitle>` for an `--auto` merge, `⚠ Blocked: \u003Creason>`, or\n`⚠ Merged #N: \u003Ctitle>; \u003Ctrunk fact>` when the PR merged but the\ncontains-the-merge-commit check failed or the subject was not verified,\nso the first line is never a false success),\nthen exactly these sections. A run that stops before\nthe merge (including `gh` unavailable: `⚠ Blocked: gh is not authenticated`)\ngives the hero and one sentence on what the user must do; no\nheadings, and never a sentence saying what was not done (\"nothing was\nmerged\", \"I did not use --admin\"). The hero states the cause only.\n\n1. `## Merge readiness`: the gate results, including anything that\n   required a rebase or a wait on CI.\n2. `## Merge`: the strategy, the merge commit short SHA with its subject\n   as read back from the commit, and the PR URL. A queued merge gives the\n   strategy and the PR URL (its reply keeps all three sections; see the\n   queued example). Name a flag only when the run dropped or added\n   one the user did not pass; never the head pin or the user's own flags.\n   Say nothing about the title's characters or how the message was passed.\n3. `## Trunk`: the post-merge trunk state and the result of the\n   contains-the-merge-commit check, or that the sync was skipped and why.\n   Report a mismatch as a fact with the short SHAs; give no cause and do\n   not narrate how the pull was run.\n\nState a failure as the fact the user needs; never quote the tool's error\ntext or explain how a check works. Follow the reference's \"Report wording\".\nWrite the sections per `..\u002F..\u002Freferences\u002Fprose-rules.md`, impersonally:\nno first person.\n\nReply in this shape, as plain text outside any code fence, with plain\nbullets, no bold (never `- **Label:** ...`), and no local paths:\n\n```text\n✓ Merged #31: Retry transient sync failures\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head after a wait on the lint job.\n- Behind main by one commit; rebased and force-pushed with the user's approval; previous head 3b1c9e4.\n\n## Merge\n\n- Strategy --merge, no extra flags. Merge commit 4f2a9c1: \"sync(fix[client]) Retry transient network errors (#31)\".\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F31\n\n## Trunk\n\n- main is at the merge commit; local main fast-forwarded.\n```\n\nA queued run (`--auto`) uses the same three sections, with readiness as\nin a merged run:\n\n```text\n✓ Queued #31: Retry transient sync failures\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head.\n\n## Merge\n\n- Strategy --squash. GitHub merges it once the required checks pass.\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F31\n\n## Trunk\n\n- Sync skipped: the merge has not happened yet.\n```\n\nA merged PR whose trunk check failed:\n\n```text\n⚠ Merged #42: Retry transient sync failures; local main does not contain merge commit 4f2a9c1.\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head.\n\n## Merge\n\n- Strategy --squash. Merge commit 4f2a9c1; the subject was not verified.\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F42\n\n## Trunk\n\n- Local main is at 9ad03e1, which does not contain 4f2a9c1.\n```\n\nA stopped run:\n\n```text\n⚠ Blocked: #42 needs an approving review before branch protection allows the merge.\n\nGet the review, or approve --admin.\n```\n\nEnd with an `AskUserQuestion` panel offering next steps (for example:\ncut a release from the merged trunk, merge another PR, delete the\nlocal branch, stop here); skip the panel in plan mode. Without a question\ntool, end after the sections and say nothing about the missing panel; no\n`## Next steps` section.\n\nOffer the release only when the merged trunk is in a releasable state and\nthe repo carries the version files a release touches. Name the project's\nrelease skill or command if one exists; tagging and pushing stay the user's\nexplicit act.\n","# Merge One PR\n\nMerge a single pull request (the one this conversation is about, or the one\nthe current branch belongs to) via `gh pr merge`. Nothing merges until the\nreadiness gate passes. Report only what a command in this run verified.\n\nRead `..\u002F..\u002Freferences\u002Fmerge-readiness.md` before touching the PR.\n\nUser arguments: $ARGUMENTS\n\n## Procedure\n\n### 1. Identify the PR\n\nPrecedence: an explicit argument (number or URL) > the PR this\nconversation has been working on > the current branch's PR. If the\ncandidates disagree, ask via `AskUserQuestion` before proceeding; without a\nquestion tool, halt and list them.\n\nWith no argument and no conversation PR, run `git branch --show-current`\nand `gh pr view --json number` to find the current branch's PR.\n\nGather the PR's state. A failure here means no PR exists for the branch or\n`gh` is unavailable or unauthenticated: report it and stop. The readiness\ngate reuses this read. When the user passed `--repo`, add it to this command\nand every other `gh` call, and check the repo scope as the reference\ndescribes.\n\n```console\n$ gh pr view \u003Cn> --json number,title,url,state,isDraft,baseRefName,headRefOid,mergeable,mergeStateStatus,reviewDecision\n```\n\nTrunk is the PR's `baseRefName`.\n\n### 2. Run the readiness gate\n\nApply the readiness gate from the reference. If the PR is `BEHIND` or\n`DIRTY` and the repo scope is `local`, confirm with the user, then follow the\nreference's rebase procedure. Without a question tool, halt instead of\nrebasing. With scope `remote`, halt: the rebase cannot run here.\n\n### 3. Compose the merge commit message\n\nCheck the repo allows the strategy, per the reference's strategy section.\nThen follow its merge-commit-message section, which also says when to skip\nit (`--rebase`, or a message flag from the user). Write the message per\n`..\u002F..\u002Freferences\u002Fprose-rules.md`. The message carries no `Co-Authored-By`,\nno \"Generated with\" or other tool trailer, and no emoji.\n\n### 4. Merge\n\nPass the user's `gh pr merge` flags through verbatim, with the strategy flag\nand the reference's `--match-head-commit \u003Csha>` pin. Pass the composed message through the\nreference's `merge_pr.py merge` command, never inside a shell string. Use\n`--admin` only within the reference's policy.\n\n### 5. Sync trunk and stand by\n\nSync trunk and confirm the merge, per the reference's \"After each merge\",\nincluding its check that trunk contains the merge commit. Then stop.\nWhen the merge is only queued (`--auto`, or `state` still `OPEN` after the\nmerge), open with the queued hero and skip the sync.\n\n## Output\n\nOpen with a one-line hero (`✓ Merged #N: \u003Ctitle>`,\n`✓ Queued #N: \u003Ctitle>` for an `--auto` merge, `⚠ Blocked: \u003Creason>`, or\n`⚠ Merged #N: \u003Ctitle>; \u003Ctrunk fact>` when the PR merged but the\ncontains-the-merge-commit check failed or the subject was not verified,\nso the first line is never a false success),\nthen exactly these sections. A run that stops before\nthe merge (including `gh` unavailable: `⚠ Blocked: gh is not authenticated`)\ngives the hero and one sentence on what the user must do; no\nheadings, and never a sentence saying what was not done (\"nothing was\nmerged\", \"I did not use --admin\"). The hero states the cause only.\n\n1. `## Merge readiness`: the gate results, including anything that\n   required a rebase or a wait on CI.\n2. `## Merge`: the strategy, the merge commit short SHA with its subject\n   as read back from the commit, and the PR URL. A queued merge gives the\n   strategy and the PR URL (its reply keeps all three sections; see the\n   queued example). Name a flag only when the run dropped or added\n   one the user did not pass; never the head pin or the user's own flags.\n   Say nothing about the title's characters or how the message was passed.\n3. `## Trunk`: the post-merge trunk state and the result of the\n   contains-the-merge-commit check, or that the sync was skipped and why.\n   Report a mismatch as a fact with the short SHAs; give no cause and do\n   not narrate how the pull was run.\n\nState a failure as the fact the user needs; never quote the tool's error\ntext or explain how a check works. Follow the reference's \"Report wording\".\nWrite the sections per `..\u002F..\u002Freferences\u002Fprose-rules.md`, impersonally:\nno first person.\n\nReply in this shape, as plain text outside any code fence, with plain\nbullets, no bold (never `- **Label:** ...`), and no local paths:\n\n```text\n✓ Merged #31: Retry transient sync failures\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head after a wait on the lint job.\n- Behind main by one commit; rebased and force-pushed with the user's approval; previous head 3b1c9e4.\n\n## Merge\n\n- Strategy --merge, no extra flags. Merge commit 4f2a9c1: \"sync(fix[client]) Retry transient network errors (#31)\".\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F31\n\n## Trunk\n\n- main is at the merge commit; local main fast-forwarded.\n```\n\nA queued run (`--auto`) uses the same three sections, with readiness as\nin a merged run:\n\n```text\n✓ Queued #31: Retry transient sync failures\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head.\n\n## Merge\n\n- Strategy --squash. GitHub merges it once the required checks pass.\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F31\n\n## Trunk\n\n- Sync skipped: the merge has not happened yet.\n```\n\nA merged PR whose trunk check failed:\n\n```text\n⚠ Merged #42: Retry transient sync failures; local main does not contain merge commit 4f2a9c1.\n\n## Merge readiness\n\n- Open, not a draft. CI green on the head.\n\n## Merge\n\n- Strategy --squash. Merge commit 4f2a9c1; the subject was not verified.\n- https:\u002F\u002Fgithub.com\u002Facme\u002Fwidgets\u002Fpull\u002F42\n\n## Trunk\n\n- Local main is at 9ad03e1, which does not contain 4f2a9c1.\n```\n\nA stopped run:\n\n```text\n⚠ Blocked: #42 needs an approving review before branch protection allows the merge.\n\nGet the review, or approve --admin.\n```\n\nEnd with an `AskUserQuestion` panel offering next steps (for example:\ncut a release from the merged trunk, merge another PR, delete the\nlocal branch, stop here); skip the panel in plan mode. Without a question\ntool, end after the sections and say nothing about the missing panel; no\n`## Next steps` section.\n\nOffer the release only when the merged trunk is in a releasable state and\nthe repo carries the version files a release touches. Name the project's\nrelease skill or command if one exists; tagging and pushing stay the user's\nexplicit act.\n",{"name":5,"description":7,"allowed-tools":24,"argument-hint":29},[25,26,27,28],"Bash","Read","Write","AskUserQuestion","[PR number or URL] [--squash | --rebase | any other gh pr merge flag]","main","5fbeb3b47beedea13813be7b7023f736a8d97a65","plugins\u002Fmerge-pr\u002Fskills\u002Fmerge-one","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills","https:\u002F\u002Fgithub.com\u002Ftony","https:\u002F\u002Ftony.sh","lighthouse keeper","2026-11-08 17:57:34",{"source":8,"skillName":5,"commands":39,"prompt":49,"zipAvailable":50},[40,43,46],{"tool":41,"command":42},"npx","npx skills add tony\u002Fskills --skill merge-one",{"tool":44,"command":45},"bunx","bunx skills add tony\u002Fskills --skill merge-one",{"tool":47,"command":48},"pnpm","pnpm dlx skills add tony\u002Fskills --skill merge-one","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fmerge-pr\u002Fskills\u002Fmerge-one\u002FSKILL.md",true,[52],{"path":53,"resourceType":54,"resourceTypeDesc":55,"sizeBytes":56,"sourceHtmlUrl":57},"agents\u002Fopenai.yaml","REFERENCE","参考文档",260,"https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fmerge-pr\u002Fskills\u002Fmerge-one\u002Fagents\u002Fopenai.yaml",[59,66,73,80,87,94],{"skillNo":60,"name":61,"nameZh":6,"description":62,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":63,"categories":64,"keywords":65,"publishedAt":19},"01M7E8NCSHXV2JPW4J61R0TQS7","serene-bliss","Use when asked to make a CLI --help, docs page, error message, or tooling UX more serene or calmer for developer experience; returns text, no edits.","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Fserene-bliss\u002FSKILL.md",[],[],{"skillNo":67,"name":68,"nameZh":6,"description":69,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":70,"categories":71,"keywords":72,"publishedAt":19},"01M7E8N87MAVJD8RRQKQB1ZPS6","review","Weave code review: run independent adversarial reviews in parallel, then synthesize findings","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Freview\u002FSKILL.md",[],[],{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":77,"categories":78,"keywords":79,"publishedAt":19},"01M7E8N402XG4ZBFNACQ413163","refine","Use when asked to refine a draft, iterate on code until cleaner, or polish a README through repeated critique and improvement.","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Frefine\u002FSKILL.md",[],[],{"skillNo":81,"name":82,"nameZh":6,"description":83,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":84,"categories":85,"keywords":86,"publishedAt":19},"01M7E8N01KB86A7136P00GVKJW","prompt","Weave prompt: compare independent adversarial implementations, then adopt the single best one","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Fprompt\u002FSKILL.md",[],[],{"skillNo":88,"name":89,"nameZh":6,"description":90,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":91,"categories":92,"keywords":93,"publishedAt":19},"01M7E8MW7YJW2PCMDW3G9RTGNK","plan","Weave planning: compare independent adversarial plans, then synthesize the best one","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Fplan\u002FSKILL.md",[],[],{"skillNo":95,"name":96,"nameZh":6,"description":97,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":98,"categories":99,"keywords":100,"publishedAt":19},"01M7E8MSBYXNCV4ZYWDS4PFJXK","fix-review","Fix weave review findings: validate, add test coverage, fix, and commit each as atomic changes","https:\u002F\u002Fgithub.com\u002Ftony\u002Fskills\u002Fblob\u002Fmain\u002Fplugins\u002Fweave\u002Fskills\u002Ffix-review\u002FSKILL.md",[],[]]