[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7ENP60JD9TCYYTAP3EXQWWH":3,"skill-same:01M7ENP60JD9TCYYTAP3EXQWWH":60},{"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":33,"commitSha":34,"skillDirectory":35,"forksCount":36,"repositoryHtmlUrl":37,"repositoryHomepageUrl":6,"ownerHtmlUrl":38,"ownerBlogUrl":6,"ownerDescription":39,"updatedAt":40,"install":41,"resources":53},"01M7ENP60JD9TCYYTAP3EXQWWH","merge-review",null,"Reviews pending fleet worktree merges before they're accepted. Reads the merge-check queue, detects file-level conflicts between branches, proposes a safe merge order, and surfaces reconciliation plans for overlapping changes.","lza6\u002FArmor-piercing-system-prompts","lza6","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F128880206?v=4","01M7EB3K7WPX5T28EJ2NVHE6EG","Chinese-tingfeng","01M7EB3K97E1KQ16QWKJMFNGX8",11,"MIT","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F04-安全渗透\u002Fmerge-review\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: merge-review\nlicense: MIT\ndescription: >-\n  Reviews pending fleet worktree merges before they're accepted. Reads the\n  merge-check queue, detects file-level conflicts between branches, proposes a\n  safe merge order, and surfaces reconciliation plans for overlapping changes.\nuser-invocable: true\nauto-trigger: false\ntrigger_keywords:\n  - merge review\n  - check merges\n  - any conflicts\n  - fleet conflicts\n  - pending branches\n  - safe to merge\nlast-updated: 2026-03-26\n---\n\n# \u002Fmerge-review — Fleet Merge Arbitration\n\n## Orientation\n\n**Use when:** reviewing pending fleet worktree merges before accepting them into the main branch.\n**Don't use when:** reviewing general code quality (use \u002Freview); checking CI status before merging (use \u002Fpr-watch).\n\n## When to Route Here\n\n- \"check merges\"\n- \"any conflicts\"\n- \"what do the fleet agents want to merge\"\n- \"review the pending branches\"\n- \"is it safe to merge fleet output\"\n- \"arbitrate the worktrees\"\n- worktree-remove.js has queued items and the user wants to process them\n\n## Invocation Forms\n\n```\n\u002Fmerge-review              # Process the full queue\n\u002Fmerge-review {branch}     # Review a specific branch only\n```\n\n## Protocol\n\n### Step 1: Read the Queue\n\nRead `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl`. Each line is a JSON object:\n```json\n{\"branch\": \"fleet\u002Ftask-abc\", \"worktree\": \"\u002Fpath\u002Fto\u002Fworktree\", \"queuedAt\": \"ISO\"}\n```\n\nIf the file doesn't exist or is empty:\n> \"No pending merge reviews. Fleet agents haven't completed any worktrees recently.\"\nStop here.\n\nIf invoked with a specific branch (`\u002Fmerge-review {branch}`): filter to that branch only.\n\n### Step 2: For Each Branch — Gather Diff Data\n\nRun `git diff main..{branch} --name-only`, `--stat`, and `git branch --list {branch}`.\n\nIf the branch no longer exists: mark `status: \"merged\"`, note \"likely already merged. Skipped.\", continue.\n\n### Step 3: Detect Overlapping Files\n\nCompare changed file sets pairwise. For each pair sharing files, read `git diff main..{branch} -- {file}` for both and classify:\n- **Additive**: both add to the file (low risk, likely auto-mergeable)\n- **Overlapping edits**: both modify the same function\u002Fsection (medium risk)\n- **Contradictory**: one adds, the other removes the same code (high risk)\n\n### Step 4: Assess Risk Per Branch\n\nFor each branch:\n- **low** — no overlapping files with other branches\n- **medium** — overlaps exist but changes appear additive or in different sections\n- **high** — overlaps in the same function, class, or closely coupled section\n\n### Step 5: Propose Merge Order\n\nOrder branches: fewest conflicts first, most conflicts last.\n\nIf circular dependencies exist (A conflicts with B, B conflicts with C, C conflicts\nwith A): escalate to the user — do not propose an impossible order.\n\n### Step 6: Output the Report\n\n```\n## Merge Review: {N} branch(es) pending\n\n### Branch: {name}\nFiles changed: {N}\nOverlap with other branches: {branch-X} ({file-list}) | none\nRisk: low | medium | high\nRecommendation: merge | review-first | resolve-conflict\n\n---\n[repeat for each branch]\n---\n\n### Conflicts Detected\n\n{branch-A} and {branch-B} both modified:\n  - {file}: {brief description — e.g., \"A adds export, B removes same export\"}\nRecommended resolution: {which change to keep, or how to combine them}\n\n[repeat for each conflict pair]\n\n### Proposed Merge Order\n\n1. {branch} — no conflicts, safe to merge first\n2. {branch} — depends on #1; review {file} after merging #1\n3. {branch} — manual conflict resolution needed in {file} before merging\n\n### Summary\nBranches ready to merge: {N}\nBranches needing review: {N}\nBranches with hard conflicts: {N}\n```\n\nIf all branches are conflict-free:\n```\n## Merge Review: {N} branch(es) pending — No conflicts detected\n\nAll branches can be merged in any order. Recommended order (by change size, smallest first):\n1. {branch} — {N} files\n2. {branch} — {N} files\n```\n\n### Step 7: Update the Queue\n\nAfter producing the report, mark reviewed items in the queue:\n- Branches still needing work: `status: \"reviewed\"`, add `reviewedAt` timestamp\n- Branches no longer existing: `status: \"merged\"` (already handled in Step 2)\n\nWrite the updated queue back to `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl`.\n\n### Step 8: Cleanup Merged Worktrees\n\nRun `git worktree list --porcelain`. For each non-main worktree: check `git branch --merged HEAD`. If merged and clean: run `git worktree remove \"{path}\" --force` and `git branch -d \"{branch}\"`. No user confirmation needed. Report count: \"Cleaned up {N} merged worktree(s): {branch-names}\".\n\n---\n\n## Fringe Cases\n\n**Queue empty:** Output \"No pending merge reviews.\" and stop.\n\n**Branch no longer exists:** Remove from queue, note, continue.\n\n**Branch not in queue:** Note \"not in the merge queue\" and suggest `\u002Fmerge-review` to see all.\n\n**All branches conflict (circular):** List all conflicts; do not propose an order; escalate to user.\n\n**One branch pending:** Skip conflict detection; output single-branch review (files, stat, recommendation).\n\n**Large diff (>500 lines):** Summarize changed areas; link to `git diff` command for details.\n\n**Worktree path missing but branch exists:** Proceed with git diff using branch name; worktree existence not required.\n\n---\n\n## Integration Points\n\n- **worktree-remove.js** — queues items to `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl` when a fleet worktree completes\n- **fleet skill** — run `\u002Fmerge-review` after fleet agents complete, before merging to main\n- **session-end.js** — may surface a reminder if the merge queue has items at session end\n\n## Contextual Gates\n\n**Disclosure:** \"Reviewing pending fleet worktree merges. Read-only — no changes applied.\"\n**Reversibility:** green — read-only review; no files merged or modified\n**Trust gates:**\n- Any: view merge review report and recommendations\n\n## Quality Gates\n\n- Never merge branches — only analyze and recommend\n- Always update the queue after processing (mark reviewed\u002Fmerged)\n- Always provide a concrete recommendation for each branch (merge \u002F review-first \u002F resolve-conflict)\n- If a branch was already merged, clean it from the queue without error\n- If all conflicts are circular\u002Funresolvable, escalate clearly rather than proposing an impossible order\n\n## Exit Protocol\n\n\u002Fmerge-review does not produce a HANDOFF block. It outputs the merge report (Step 6) and then\nwaits for the next user command.\n\nAfter the report, suggest next actions based on what was found:\n- If all branches are safe: \"All clear. Merge in the order above.\"\n- If conflicts exist: \"Resolve the flagged conflicts before merging. Run `\u002Fmerge-review` again after resolving.\"\n- If queue is empty: \"Queue is empty. Nothing to review.\"\n","# \u002Fmerge-review — Fleet Merge Arbitration\n\n## Orientation\n\n**Use when:** reviewing pending fleet worktree merges before accepting them into the main branch.\n**Don't use when:** reviewing general code quality (use \u002Freview); checking CI status before merging (use \u002Fpr-watch).\n\n## When to Route Here\n\n- \"check merges\"\n- \"any conflicts\"\n- \"what do the fleet agents want to merge\"\n- \"review the pending branches\"\n- \"is it safe to merge fleet output\"\n- \"arbitrate the worktrees\"\n- worktree-remove.js has queued items and the user wants to process them\n\n## Invocation Forms\n\n```\n\u002Fmerge-review              # Process the full queue\n\u002Fmerge-review {branch}     # Review a specific branch only\n```\n\n## Protocol\n\n### Step 1: Read the Queue\n\nRead `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl`. Each line is a JSON object:\n```json\n{\"branch\": \"fleet\u002Ftask-abc\", \"worktree\": \"\u002Fpath\u002Fto\u002Fworktree\", \"queuedAt\": \"ISO\"}\n```\n\nIf the file doesn't exist or is empty:\n> \"No pending merge reviews. Fleet agents haven't completed any worktrees recently.\"\nStop here.\n\nIf invoked with a specific branch (`\u002Fmerge-review {branch}`): filter to that branch only.\n\n### Step 2: For Each Branch — Gather Diff Data\n\nRun `git diff main..{branch} --name-only`, `--stat`, and `git branch --list {branch}`.\n\nIf the branch no longer exists: mark `status: \"merged\"`, note \"likely already merged. Skipped.\", continue.\n\n### Step 3: Detect Overlapping Files\n\nCompare changed file sets pairwise. For each pair sharing files, read `git diff main..{branch} -- {file}` for both and classify:\n- **Additive**: both add to the file (low risk, likely auto-mergeable)\n- **Overlapping edits**: both modify the same function\u002Fsection (medium risk)\n- **Contradictory**: one adds, the other removes the same code (high risk)\n\n### Step 4: Assess Risk Per Branch\n\nFor each branch:\n- **low** — no overlapping files with other branches\n- **medium** — overlaps exist but changes appear additive or in different sections\n- **high** — overlaps in the same function, class, or closely coupled section\n\n### Step 5: Propose Merge Order\n\nOrder branches: fewest conflicts first, most conflicts last.\n\nIf circular dependencies exist (A conflicts with B, B conflicts with C, C conflicts\nwith A): escalate to the user — do not propose an impossible order.\n\n### Step 6: Output the Report\n\n```\n## Merge Review: {N} branch(es) pending\n\n### Branch: {name}\nFiles changed: {N}\nOverlap with other branches: {branch-X} ({file-list}) | none\nRisk: low | medium | high\nRecommendation: merge | review-first | resolve-conflict\n\n---\n[repeat for each branch]\n---\n\n### Conflicts Detected\n\n{branch-A} and {branch-B} both modified:\n  - {file}: {brief description — e.g., \"A adds export, B removes same export\"}\nRecommended resolution: {which change to keep, or how to combine them}\n\n[repeat for each conflict pair]\n\n### Proposed Merge Order\n\n1. {branch} — no conflicts, safe to merge first\n2. {branch} — depends on #1; review {file} after merging #1\n3. {branch} — manual conflict resolution needed in {file} before merging\n\n### Summary\nBranches ready to merge: {N}\nBranches needing review: {N}\nBranches with hard conflicts: {N}\n```\n\nIf all branches are conflict-free:\n```\n## Merge Review: {N} branch(es) pending — No conflicts detected\n\nAll branches can be merged in any order. Recommended order (by change size, smallest first):\n1. {branch} — {N} files\n2. {branch} — {N} files\n```\n\n### Step 7: Update the Queue\n\nAfter producing the report, mark reviewed items in the queue:\n- Branches still needing work: `status: \"reviewed\"`, add `reviewedAt` timestamp\n- Branches no longer existing: `status: \"merged\"` (already handled in Step 2)\n\nWrite the updated queue back to `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl`.\n\n### Step 8: Cleanup Merged Worktrees\n\nRun `git worktree list --porcelain`. For each non-main worktree: check `git branch --merged HEAD`. If merged and clean: run `git worktree remove \"{path}\" --force` and `git branch -d \"{branch}\"`. No user confirmation needed. Report count: \"Cleaned up {N} merged worktree(s): {branch-names}\".\n\n---\n\n## Fringe Cases\n\n**Queue empty:** Output \"No pending merge reviews.\" and stop.\n\n**Branch no longer exists:** Remove from queue, note, continue.\n\n**Branch not in queue:** Note \"not in the merge queue\" and suggest `\u002Fmerge-review` to see all.\n\n**All branches conflict (circular):** List all conflicts; do not propose an order; escalate to user.\n\n**One branch pending:** Skip conflict detection; output single-branch review (files, stat, recommendation).\n\n**Large diff (>500 lines):** Summarize changed areas; link to `git diff` command for details.\n\n**Worktree path missing but branch exists:** Proceed with git diff using branch name; worktree existence not required.\n\n---\n\n## Integration Points\n\n- **worktree-remove.js** — queues items to `.planning\u002Ftelemetry\u002Fmerge-check-queue.jsonl` when a fleet worktree completes\n- **fleet skill** — run `\u002Fmerge-review` after fleet agents complete, before merging to main\n- **session-end.js** — may surface a reminder if the merge queue has items at session end\n\n## Contextual Gates\n\n**Disclosure:** \"Reviewing pending fleet worktree merges. Read-only — no changes applied.\"\n**Reversibility:** green — read-only review; no files merged or modified\n**Trust gates:**\n- Any: view merge review report and recommendations\n\n## Quality Gates\n\n- Never merge branches — only analyze and recommend\n- Always update the queue after processing (mark reviewed\u002Fmerged)\n- Always provide a concrete recommendation for each branch (merge \u002F review-first \u002F resolve-conflict)\n- If a branch was already merged, clean it from the queue without error\n- If all conflicts are circular\u002Funresolvable, escalate clearly rather than proposing an impossible order\n\n## Exit Protocol\n\n\u002Fmerge-review does not produce a HANDOFF block. It outputs the merge report (Step 6) and then\nwaits for the next user command.\n\nAfter the report, suggest next actions based on what was found:\n- If all branches are safe: \"All clear. Merge in the order above.\"\n- If conflicts exist: \"Resolve the flagged conflicts before merging. Run `\u002Fmerge-review` again after resolving.\"\n- If queue is empty: \"Queue is empty. Nothing to review.\"\n",{"name":5,"license":15,"description":7,"auto-trigger":20,"last-updated":24,"user-invocable":25,"trigger_keywords":26},1774483200000,true,[27,28,29,30,31,32],"merge review","check merges","any conflicts","fleet conflicts","pending branches","safe to merge","main","d69096e239f2a89aabc2cd078c47664a9d3b1e11","04-安全渗透\u002Fmerge-review",3,"https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts","https:\u002F\u002Fgithub.com\u002Flza6","个人vx：Tf00798\r\n个人✈：@TFGY999","2026-10-08 14:29:22",{"source":8,"skillName":5,"commands":42,"prompt":52,"zipAvailable":25},[43,46,49],{"tool":44,"command":45},"npx","npx skills add lza6\u002FArmor-piercing-system-prompts --skill merge-review",{"tool":47,"command":48},"bunx","bunx skills add lza6\u002FArmor-piercing-system-prompts --skill merge-review",{"tool":50,"command":51},"pnpm","pnpm dlx skills add lza6\u002FArmor-piercing-system-prompts --skill merge-review","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F04-安全渗透\u002Fmerge-review\u002FSKILL.md",[54],{"path":55,"resourceType":56,"resourceTypeDesc":57,"sizeBytes":58,"sourceHtmlUrl":59},"__benchmarks__\u002Fempty-queue.md","REFERENCE","参考文档",846,"https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F04-安全渗透\u002Fmerge-review\u002F__benchmarks__\u002Fempty-queue.md",[61,69,74,81,88,95],{"skillNo":62,"name":63,"nameZh":6,"description":64,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":65,"categories":66,"keywords":67,"publishedAt":68},"01M7FFG485KY83TD6HSC4YPCMC","obsidian-clipper-template-creator","Guide for creating templates for the Obsidian Web Clipper. Use when you want to create a new clipping template, understand available variables, or format clipped content.","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fobsidian-clipper-template-creator\u002FSKILL.md",[],[],"2026-11-16 10:05:34",{"skillNo":70,"name":63,"nameZh":6,"description":64,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":68},"01M7FFG0T6AZ0STEJPSB3CX84K","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fobsidian-clipper-template-creator-antigravity-awesome-skills-main\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":68},"01M7FFFY0QEM14SKWPDYGMXM2P","python-api","Programmatic Object-Detection-Metrics API guidance for BoundingBox, BoundingBoxes, Evaluator, enums, coordinate conversion, AP\u002FmAP semantics, and source-style import diagnostics.","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fobject-detection-metrics\u002Fsub-skills\u002Fpython-api\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":85,"categories":86,"keywords":87,"publishedAt":68},"01M7FFFVZQZ2GJ0C0TGP7JHD20","file-evaluation","Folder-based PASCAL VOC AP\u002FmAP evaluation from ground-truth and detection text files.","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fobject-detection-metrics\u002Fsub-skills\u002Ffile-evaluation\u002FSKILL.md",[],[],{"skillNo":89,"name":90,"nameZh":6,"description":91,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":92,"categories":93,"keywords":94,"publishedAt":68},"01M7FFFSFNYSE77SJ6PE1CK2DA","object-detection-metrics","Guides legacy Object-Detection-Metrics PASCAL VOC AP\u002FmAP evaluation from detection text folders and direct Python API classes.","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fobject-detection-metrics\u002FSKILL.md",[],[],{"skillNo":96,"name":97,"nameZh":6,"description":98,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":99,"categories":100,"keywords":101,"publishedAt":68},"01M7FFFP0GCK1RVXBCPQ8APBMT","nx-workspace-patterns","Configure and optimize Nx monorepo workspaces. Use when setting up Nx, configuring project boundaries, optimizing build caching, or implementing affected commands.","https:\u002F\u002Fgithub.com\u002Flza6\u002FArmor-piercing-system-prompts\u002Fblob\u002Fmain\u002F07-后端与架构\u002Fnx-workspace-patterns\u002FSKILL.md",[],[]]