# Consensus Loop:merge > Squash-merge a worktree branch into the target branch with a structured commit message. Use after audit consensus and retrospective completion. - Skill: `berrzebb/consensus-loop-merge` (Agent Skill) - Install (CLI): `npx skillmds@latest add berrzebb/consensus-loop-merge` - Raw SKILL.md: https://api.skillmd.com/api/skills/berrzebb/consensus-loop-merge/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Security - Author: berrzebb (https://skillmd.com/u/berrzebb) - Updated: 2026-09-22 - Page: https://skillmd.com/skills/berrzebb/consensus-loop-merge --- # Merge Worktree Squash-merge the current worktree branch back into the target branch. All WIP commits become one structured commit. ## Who Runs This This skill is invoked by the **orchestrator** after: 1. Implementer's `[agree_tag]` consensus reached 2. Implementer's WIP commit completed 3. **Retrospective protocol completed** (session-gate released via `session-self-improvement-complete`) ## Execution Context | Context | Behavior | |---------|----------| | **Interactive** | Report merge result → ask about cleanup | | **Headless** | Merge → verify → report result → do NOT cleanup (orchestrator decides) | In headless mode, do NOT ask "keep worktree or remove?" — report the result and exit. The orchestrator handles cleanup. ## Current Context - Git dir: `!git rev-parse --git-dir` - Current branch: `!git branch --show-current` - Recent commits: `!git log --oneline -20` - Working tree status: `!git status --short` ## Instructions Follow phases in order. Do NOT skip phases. --- ### Phase 1: Validation 1. **Verify worktree**: `git rev-parse --git-dir` must contain `/worktrees/`. If not → stop: > "This skill must be run from inside a git worktree." 2. **Verify retrospective complete**: Check `.claude/retro-marker.json` in the repo root: ```bash git -C "$(git rev-parse --git-common-dir)/.." cat-file -e HEAD:.claude/retro-marker.json 2>/dev/null || cat "$(git rev-parse --git-common-dir)/../.claude/retro-marker.json" 2>/dev/null ``` If `retro_pending` is `true` → stop: > "Retrospective not completed. Run retrospective first, then `session-self-improvement-complete`." 3. **Identify current branch**: `git branch --show-current` 4. **Resolve target branch**: - If `$ARGUMENTS` provided → use as target - Otherwise → detect `main` or `master` 5. **Find original repo root**: ```bash ORIGINAL_ROOT="$(git rev-parse --git-common-dir)/.." ``` 6. **Clean working tree**: `git status --porcelain` must be empty. If not → stop: > "Uncommitted changes found. Commit or stash first." --- ### Phase 2: Research 1. **Commit history**: `git log --oneline ..HEAD` 2. **File change summary**: `git diff ...HEAD --stat` 3. **Full diff**: `git diff ...HEAD` — read carefully 4. **Read key files**: For significantly changed files, use Read to understand full context 5. **Categorize changes**: - Features (new functionality) - Fixes (bug corrections) - Refactors (code restructuring) - Tests (new or updated) - Docs (documentation) - Chore (build, CI, tooling) --- ### Phase 3: Generate Commit Message Structure: ``` ():