菜单
Merge a completed and validated task's worktree branch back to the working branch. Verifies checks passed, performs the merge, cleans up the worktree, and updates the task manifest. Directly invocable by users and by the orchestrate skill.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Validate that a pull request follows principled conventions: references a plan or proposal, has correct labels, includes required sections in the description, and links to relevant documents. Use in CI or before merging to enforce PR quality.
Generate a structured pull request description from a DDD plan task. Reads the plan, task manifest, and implementation branch to produce a PR body with references to the originating proposal, plan, ADRs, and related tasks. Use when opening a PR for plan-driven work.
Process open GitHub issues through the principled pipeline. Lists untriaged issues, normalizes their metadata, ingests them into the documentation pipeline, and reports a summary. Operates as the batch entry point — delegates to /ingest-issue for each individual issue.
Implementation orchestration strategy for the Principled framework. Consult when working with DDD plan execution, git worktrees for task isolation, task manifests, or the decompose-spawn-validate-merge lifecycle. Covers worktree management, sub-agent patterns, task state machines, and manifest schema.
Top-level orchestrator for DDD plan execution. Decomposes a plan into tasks, iterates through phases respecting dependencies, spawns worktree-isolated agents, validates implementations, and merges results. Runs inline to coordinate multiple sub-agent spawns. Use for automated end-to-end plan execution.
Audit ADR coverage across modules. Identifies modules with no architectural governance, orphaned ADRs referencing removed modules, and stale architecture docs. Classifies findings by severity.
| name | merge-work |
| description | Merge a completed and validated task's worktree branch back to the working branch. Verifies checks passed, performs the merge, cleans up the worktree, and updates the task manifest. Directly invocable by users and by the orchestrate skill. |
| allowed-tools | Read, Bash(git *), Bash(bash plugins/*), Bash(ls *) |
| user-invocable | true |
Merge a task's implementation from its worktree branch back to the working branch, then clean up the worktree.
/merge-work <task-id> [--force] [--no-cleanup]
| Argument | Required | Description |
|---|---|---|
<task-id> | Yes | Task to merge |
--force | No | Merge even if checks have not passed (not recommended) |
--no-cleanup | No | Keep the worktree after merge for inspection |
Parse arguments. Extract <task-id> and flags from $ARGUMENTS.
Load task from manifest. Run:
bash scripts/task-manifest.sh --get-task --task-id <task-id>
Verify:
passed (or any status if --force)Without --force, if status is not passed: "Task <task-id> has status '<status>'. Run /check-impl --task <task-id> first, or use --force to merge without validation."
Discover branch and worktree path. Get the branch name from the manifest. If not recorded, search for it:
git branch --list 'impl/*' | grep <task-id-sanitized>
Find the worktree path:
git worktree list | grep <branch>
Merge branch. From the main working tree:
git merge <branch> --no-ff \
-m "impl(<plan-number>): merge task <task-id> — <description>"
If merge conflict:
conflict/merge-work <task-id> again."Clean up worktree (unless --no-cleanup):
git worktree remove <worktree-path>
git branch -d <branch>
Update manifest. Run:
bash scripts/task-manifest.sh --update-status \
--task-id <task-id> \
--status merged
Report results. Display:
scripts/task-manifest.sh — Task manifest CRUD (copy from decompose)