finishing-a-development-branch

End-of-branch workflow covering final verification, changelog/version release prep, PR creation, merge strategy selection, and cleanup. Presents structured integration options (merge, PR, park, or discard) after confirming all tests pass. A core spellbook capability for cleanly completing feature work and integrating it into the main branch.

Auto-invocation: Your coding assistant will automatically invoke this skill when it detects a matching trigger.

Use when implementation is complete, tests pass, and you need to decide the integration path. Also use when asked to prepare a branch for release: 'update changelog', 'bump version', 'bump patch version', 'make sure changelog is correct', 'make sure version is correct'. Triggers: 'done with this branch', 'ready to merge', 'ship it', 'wrap this up', 'how should I integrate this', 'what next after implementation'. NOT for: PR creation mechanics (use creating-issues-and-pull-requests) or deciding whether to merge (use finishing-a-development-branch first).

Origin

This skill originated from obra/superpowers.

Workflow Diagram

Overview: finishing-a-development-branch Skill

flowchart TD
    START([Start: Branch Work Complete]) --> AUTOCHECK{Autonomous\nmode?}

    AUTOCHECK -->|post_impl=stop| STOP_REPORT([Report completion\nno action])
    AUTOCHECK -->|post_impl=auto_pr| EXEC_PR[Skip to Option 2\nPush + Create PR]
    AUTOCHECK -->|offer_options or unset| S1

    S1[Step 1: Run Test Suite] --> TESTQ{Tests\npass?}
    TESTQ -->|No| FAIL([STOP: Show failures\nCannot proceed])
    TESTQ -->|Yes| S2

    S2[Step 2: Determine Base Branch] --> BASE_Q{Base branch\nambiguous?}
    BASE_Q -->|Yes| ASK_BASE[Ask user to confirm\nbase branch]
    BASE_Q -->|No| PREP
    ASK_BASE --> PREP

    PREP{Release prep\nrequested?}
    PREP -->|Yes| CHANGELOG[Compute branch diff\nUpdate CHANGELOG.md]
    PREP -->|No| SWEEP
    CHANGELOG --> VBUMP[Bump version in\npyproject.toml]
    VBUMP --> SWEEP

    SWEEP[Embarrassment Sweep\n8-point hygiene check]
    SWEEP --> SWEEP_Q{Any\nblockers?}
    SWEEP_Q -->|Yes| FIX_OR_FLAG[Fix finding\nor flag to operator]
    FIX_OR_FLAG --> SWEEP
    SWEEP_Q -->|No| S3

    EXEC_PR --> SWEEP

    S3[Step 3: Present 5 Options]
    S3 --> CHOICE{User\nchoice}

    CHOICE -->|1| OPT1[Merge locally]
    CHOICE -->|2| OPT2[Push + Create PR]
    CHOICE -->|3| OPT3[Push + PR + PR Dance]
    CHOICE -->|4| OPT4[Keep as-is]
    CHOICE -->|5| OPT5[Discard]

    OPT1 --> S4A[Dispatch: finish-branch-execute]
    OPT2 --> S4B[Dispatch: finish-branch-execute]
    OPT3 --> S4C[Dispatch: finish-branch-execute]
    OPT4 --> S4D[Dispatch: finish-branch-execute]
    OPT5 --> CONFIRM{Typed 'discard'\nconfirmation?}
    CONFIRM -->|No / timeout| ABORT([Abort: no action])
    CONFIRM -->|Yes| S4E[Dispatch: finish-branch-execute]

    S4A --> S5A[Dispatch: finish-branch-cleanup]
    S4B --> S5B[Dispatch: finish-branch-cleanup]
    S4C --> S5C[Dispatch: finish-branch-cleanup]
    S4D --> KEEP([Keep worktree intact\nno cleanup])
    S4E --> S5E[Dispatch: finish-branch-cleanup]

    S5A --> DONE1([Merge complete\nworktree removed])
    S5B --> DONE2([PR URL reported\nworktree removed])
    S5C --> DONE3([PR merge-ready\nworktree removed])
    S5E --> DONE5([Branch discarded\nworktree removed])

    subgraph LEGEND
        direction LR
        L1[Process step]
        L2([Terminal])
        L3{Decision}
        L4[Subagent dispatch]
        L5[Quality gate]
        style L4 fill:#4a9eff,color:#fff
        style L5 fill:#ff6b6b,color:#fff
        style L2 fill:#51cf66,color:#fff
    end

    style S4A fill:#4a9eff,color:#fff
    style S4B fill:#4a9eff,color:#fff
    style S4C fill:#4a9eff,color:#fff
    style S4D fill:#4a9eff,color:#fff
    style S4E fill:#4a9eff,color:#fff
    style S5A fill:#4a9eff,color:#fff
    style S5B fill:#4a9eff,color:#fff
    style S5C fill:#4a9eff,color:#fff
    style S5E fill:#4a9eff,color:#fff
    style TESTQ fill:#ff6b6b,color:#fff
    style CONFIRM fill:#ff6b6b,color:#fff
    style SWEEP_Q fill:#ff6b6b,color:#fff
    style FAIL fill:#ff6b6b,color:#fff
    style ABORT fill:#ff6b6b,color:#fff
    style DONE1 fill:#51cf66,color:#fff
    style DONE2 fill:#51cf66,color:#fff
    style DONE3 fill:#51cf66,color:#fff
    style DONE5 fill:#51cf66,color:#fff
    style KEEP fill:#51cf66,color:#fff
    style STOP_REPORT fill:#51cf66,color:#fff

---

Detail: Embarrassment Sweep (pre-push hygiene gate)

flowchart TD
    IN([Enter: before any push or PR]) --> DIFF[Compute branch diff\ngit diff merge-base...HEAD]

    DIFF --> C1{1. Debug leftovers\nprint / console.log /\ndebugger / breakpoints?}
    C1 -->|Found| B1[BLOCKER: remove\ndebug statements]
    C1 -->|Clean| C2

    B1 --> C2{2. Stray work markers\nTODO / FIXME / XXX /\nHACK with no follow-up?}
    C2 -->|Found| B2[BLOCKER: resolve or\ndelete markers]
    C2 -->|Clean| C3

    B2 --> C3{3. Commented-out code\ndead blocks left behind?}
    C3 -->|Found| B3[BLOCKER: delete\ndead code]
    C3 -->|Clean| C4

    B3 --> C4{4. Accidental inclusions\nswap files / .DS_Store /\nbuild artifacts?}
    C4 -->|Found| B4[BLOCKER: remove\naccidental files]
    C4 -->|Clean| C5

    B4 --> C5{5. AI-attribution violations\nCo-Authored-By / Generated\nwith / bot signatures?}
    C5 -->|Found| B5[BLOCKER: strip\nattributions]
    C5 -->|Clean| C6

    B5 --> C6{6. Issue-ref violations\n'#N' references that\nauto-link?}
    C6 -->|Found| B6[BLOCKER: remove\nissue refs]
    C6 -->|Clean| C7

    B6 --> C7{7. Out-of-scope paths\nfiles the feature has\nno business touching?}
    C7 -->|Found| B7[BLOCKER: remove or\nexplicitly flag ride-along]
    C7 -->|Clean| C8

    B7 --> C8{8. Repo consistency\nversion bump present /\nchangelog added /\nmirrors in sync?}
    C8 -->|Found gap| B8[BLOCKER: fix\nconsistency issue]
    C8 -->|All consistent| PASS

    B8 --> PASS([Sweep clean: proceed\nto push / PR])

    subgraph LEGEND
        direction LR
        La([Terminal])
        Lb{Gate check}
        Lc[Fix action]
        style La fill:#51cf66,color:#fff
        style Lb fill:#ff6b6b,color:#fff
    end

    style IN fill:#4a9eff,color:#fff
    style PASS fill:#51cf66,color:#fff
    style C1 fill:#ff6b6b,color:#fff
    style C2 fill:#ff6b6b,color:#fff
    style C3 fill:#ff6b6b,color:#fff
    style C4 fill:#ff6b6b,color:#fff
    style C5 fill:#ff6b6b,color:#fff
    style C6 fill:#ff6b6b,color:#fff
    style C7 fill:#ff6b6b,color:#fff
    style C8 fill:#ff6b6b,color:#fff

---

Detail: finish-branch-execute (Step 4)

flowchart TD
    IN([Enter with: option number,\nfeature branch, base branch,\nworktree path]) --> OQ{Option\nselected}

    OQ -->|Option 1| O1_PULL[git checkout base\ngit pull]
    O1_PULL --> O1_MERGE[git merge feature-branch]
    O1_MERGE --> O1_TEST[Run test suite\npost-merge]
    O1_TEST --> O1_TQ{Post-merge\ntests pass?}
    O1_TQ -->|No| O1_FAIL([STOP: report failure\ndo NOT delete branch])
    O1_TQ -->|Yes| O1_DEL[git branch -d feature-branch]
    O1_DEL --> O1_CLEANUP[Invoke finish-branch-cleanup]
    O1_CLEANUP --> O1_DONE([Merge complete])

    OQ -->|Option 2| O2_PUSH[git push -u origin feature-branch]
    O2_PUSH --> O2_PQ{Push\nsucceeded?}
    O2_PQ -->|No| O2_FAIL([STOP: report error])
    O2_PQ -->|Yes| O2_PR[gh pr create\nwith title + body]
    O2_PR --> O2_PRQ{PR created\nsuccessfully?}
    O2_PRQ -->|No| O2_FAIL
    O2_PRQ -->|Yes| O2_URL[Report PR URL]
    O2_URL --> O2_CLEANUP[Invoke finish-branch-cleanup]
    O2_CLEANUP --> O2_DONE([PR open])

    OQ -->|Option 3| O3_PUSH[Execute Option 2 steps\npush + create PR]
    O3_PUSH --> O3_DANCE[Dispatch subagent:\npr-dance command]
    O3_DANCE --> O3_WAIT[Drive CI + bot review\ncycles until merge-ready]
    O3_WAIT --> O3_CLEANUP[Invoke finish-branch-cleanup]
    O3_CLEANUP --> O3_DONE([PR merge-ready])

    OQ -->|Option 4| O4_REPORT[Report: branch name\nand worktree path]
    O4_REPORT --> O4_DONE([Keep as-is:\nno cleanup invoked])

    OQ -->|Option 5| O5_SHOW[Display: branch name,\ncommit list, worktree path]
    O5_SHOW --> O5_CONFIRM{User types\nexact 'discard'?}
    O5_CONFIRM -->|No / partial| O5_ABORT([Abort: no action])
    O5_CONFIRM -->|Yes| O5_DEL[git checkout base\ngit branch -D feature-branch]
    O5_DEL --> O5_CLEANUP[Invoke finish-branch-cleanup]
    O5_CLEANUP --> O5_DONE([Branch discarded])

    subgraph LEGEND
        direction LR
        La([Terminal])
        Lb{Gate}
        Lc[Subagent dispatch]
        style La fill:#51cf66,color:#fff
        style Lb fill:#ff6b6b,color:#fff
        style Lc fill:#4a9eff,color:#fff
    end

    style IN fill:#4a9eff,color:#fff
    style O3_DANCE fill:#4a9eff,color:#fff
    style O1_CLEANUP fill:#4a9eff,color:#fff
    style O2_CLEANUP fill:#4a9eff,color:#fff
    style O3_CLEANUP fill:#4a9eff,color:#fff
    style O5_CLEANUP fill:#4a9eff,color:#fff
    style O1_TQ fill:#ff6b6b,color:#fff
    style O5_CONFIRM fill:#ff6b6b,color:#fff
    style O1_FAIL fill:#ff6b6b,color:#fff
    style O2_FAIL fill:#ff6b6b,color:#fff
    style O5_ABORT fill:#ff6b6b,color:#fff
    style O1_DONE fill:#51cf66,color:#fff
    style O2_DONE fill:#51cf66,color:#fff
    style O3_DONE fill:#51cf66,color:#fff
    style O4_DONE fill:#51cf66,color:#fff
    style O5_DONE fill:#51cf66,color:#fff

---

Detail: finish-branch-cleanup (Step 5)

flowchart TD
    IN([Enter with: option number,\nworktree path]) --> OQ{Option\nnumber?}

    OQ -->|Option 4 / Keep as-is| SKIP([Skip entirely:\nworktree intact])

    OQ -->|Option 1, 2, or 5| DETECT[git worktree list\ngrep current branch]
    DETECT --> DQ{Worktree\ndetected?}

    DQ -->|No| REPORT_NONE([Report: No worktree detected\nnothing to remove])

    DQ -->|Yes| UNCOMMIT{Uncommitted\nchanges present?}
    UNCOMMIT -->|Yes| WARN[Warn operator\nabout uncommitted changes]
    UNCOMMIT -->|No| REMOVE

    WARN --> CONFIRM{User\nconfirms?}
    CONFIRM -->|No| ABORT([Abort: worktree\nleft intact])
    CONFIRM -->|Yes| REMOVE

    REMOVE[git worktree remove worktree-path]
    REMOVE --> RQ{Removal\nsucceeded?}
    RQ -->|No| ERR([Report error:\ndo NOT force-remove])
    RQ -->|Yes| DONE([Report: Worktree removed\nIntegration complete])

    subgraph LEGEND
        direction LR
        La([Terminal])
        Lb{Decision}
        Lc[Process]
        style La fill:#51cf66,color:#fff
        style Lb fill:#ff6b6b,color:#fff
    end

    style IN fill:#4a9eff,color:#fff
    style SKIP fill:#51cf66,color:#fff
    style REPORT_NONE fill:#51cf66,color:#fff
    style ABORT fill:#ff6b6b,color:#fff
    style ERR fill:#ff6b6b,color:#fff
    style DONE fill:#51cf66,color:#fff
    style DQ fill:#ff6b6b,color:#fff
    style UNCOMMIT fill:#ff6b6b,color:#fff
    style RQ fill:#ff6b6b,color:#fff

---

Detail: Release Prep (Changelog + Version Bump)

flowchart TD
    TRIGGER([Triggered by: 'update changelog',\n'bump version', 'make sure X is correct']) --> DIFF[Compute branch diff:\ngit diff merge-base...HEAD]

    DIFF --> CL_START[Derive user-facing\nchangelog entries from diff]
    CL_START --> CL_FORMAT[Format per Keep a Changelog:\nAdded / Changed / Fixed / etc.]
    CL_FORMAT --> BUMP_Q{Also bumping\nversion?}

    BUMP_Q -->|Yes| CL_VERSIONED[Entries under new\nversion heading + date]
    BUMP_Q -->|No| CL_UNRELEASED[Entries under\n'Unreleased' heading]

    CL_VERSIONED --> CL_FILE{CHANGELOG.md\nexists?}
    CL_UNRELEASED --> CL_FILE
    CL_FILE -->|No| CL_AGENTS[Check AGENTS.md for\nchangelog conventions]
    CL_FILE -->|Yes| VB_START
    CL_AGENTS --> VB_START

    VB_START[Check version in pyproject.toml\nvs origin/main]
    VB_START --> ALREADY_Q{Already\nbumped?}
    ALREADY_Q -->|Yes| TRUST([Trust existing bump\nno change needed])

    ALREADY_Q -->|No| INFER{Infer bump level\nfrom branch diff}
    INFER -->|Bug fixes / docs / refactor| PATCH[Patch bump\ne.g. 1.2.3 → 1.2.4]
    INFER -->|New features / API surface| MINOR[Minor bump\ne.g. 1.2.3 → 1.3.0]
    INFER -->|Breaking public API changes| MAJOR_Q{Confirm major\nwith user?}
    INFER -->|Cannot infer| ASK_USER[Ask user\nfor bump level]

    MAJOR_Q -->|Confirmed| MAJOR[Major bump\ne.g. 1.2.3 → 2.0.0]
    MAJOR_Q -->|Declined| MINOR

    PATCH --> APPLY[Apply version to\npyproject.toml / version file]
    MINOR --> APPLY
    MAJOR --> APPLY
    ASK_USER --> APPLY

    APPLY --> DONE([Release prep complete:\nchangelog updated + version bumped])

    subgraph LEGEND
        direction LR
        La([Terminal])
        Lb{Decision}
        Lc[Process]
        style La fill:#51cf66,color:#fff
        style Lb fill:#ff6b6b,color:#fff
    end

    style TRIGGER fill:#4a9eff,color:#fff
    style TRUST fill:#51cf66,color:#fff
    style DONE fill:#51cf66,color:#fff
    style BUMP_Q fill:#ff6b6b,color:#fff
    style ALREADY_Q fill:#ff6b6b,color:#fff
    style MAJOR_Q fill:#ff6b6b,color:#fff
    style CL_FILE fill:#ff6b6b,color:#fff

---

Cross-Reference: Overview Nodes → Detail Diagrams

Overview Node	Detail Diagram
SWEEP (Embarrassment Sweep)	Detail: Embarrassment Sweep
S4A–S4E (finish-branch-execute dispatches)	Detail: finish-branch-execute (Step 4)
S5A–S5E (finish-branch-cleanup dispatches)	Detail: finish-branch-cleanup (Step 5)
CHANGELOG + VBUMP (Release prep)	Detail: Release Prep

Skill Content

# Finishing a Development Branch

<ROLE>
Release Engineer. Your reputation depends on clean integrations that never break main or lose work. A merge that breaks the build is a public failure. A discard without confirmation is unforgivable.
</ROLE>

**Announce:** "Using finishing-a-development-branch skill to complete this work."

## Invariant Principles

1. **Tests Gate Everything** - Never present options until tests pass. Never merge without verifying tests on merged result.
2. **Structured Choice Over Open Questions** - Present exactly 5 options, never "what should I do?"
3. **Destruction Requires Proof** - Option 5 (Discard) demands typed "discard" confirmation. No shortcuts.
4. **Worktree Lifecycle Matches Work State** - Cleanup only for Options 1 (merged) and 5 (discarded). Keep for Options 2, 3, and 4.

---

## Inputs

| Input | Required | Description |
|-------|----------|-------------|
| Passing test suite | Yes | Tests must pass before this skill can proceed |
| Feature branch | Yes | Current branch with completed implementation |
| Base branch | No | Branch to merge into (auto-detected if unset) |
| `post_impl` setting | No | Autonomous mode directive (auto_pr, offer_options, stop) |

## Outputs

| Output | Type | Description |
|--------|------|-------------|
| Integration result | Action | Merge, PR, preserved branch, or discarded branch |
| PR URL | Inline | GitHub PR URL (Options 2, 3 only) |
| Worktree state | State | Removed (Options 1, 5) or preserved (Options 2, 3, 4) |

---

## Autonomous Mode

Check context for autonomous mode indicators: "Mode: AUTONOMOUS", "autonomous mode", or `post_impl` preference.

| `post_impl` value | Behavior |
|-------------------|----------|
| `auto_pr` | Skip Step 3, execute Option 2 directly |
| `offer_options` | Present options normally |
| `stop` | Skip Step 3, report completion without action |
| (unset in autonomous) | Default to Option 2. Log: "Autonomous mode: defaulting to PR creation" |

<CRITICAL>
**Circuit breakers (always pause):**
- Tests failing - NEVER proceed
- Option 5 (Discard) selected - ALWAYS require typed confirmation, never auto-execute
</CRITICAL>

---

## Branch-Relative Documentation

<CRITICAL>
Changelogs, PR titles, PR descriptions, commit messages, and code comments describe the delta between current branch HEAD and the merge base with the target branch. Nothing else exists. The only reality is `git diff $(git merge-base HEAD <target>)...HEAD`.
</CRITICAL>

**Required behavior:**

- Derive all changelog/PR/commit content from the merge base diff at time of writing.
- When HEAD changes (new commits, rebases, amends), re-evaluate and actively delete stale entries. Never accumulate entries session-by-session.
- Code comments describe the present. Git describes the past. No "changed from X to Y", "previously did Z", "refactored from old approach", "CRITICAL FIX: now does X instead of Y".
- Test: "Does this comment make sense to someone reading the code for the first time, with no knowledge of prior implementation?" If no, delete it.

**The rare exception:** A comment may reference external historical facts that explain non-obvious constraints (e.g., "SQLite < 3.35 doesn't support RETURNING"). Reframe as a present-tense constraint, not a change narrative.

---

## Release Prep: Changelog and Version

When the user says "update changelog", "bump version", "make sure version is correct", or any variation, treat it as **prepare this branch for release**. Always do both changelog and version together.

### Changelog

1. Compute the branch diff: `git diff $(git merge-base HEAD <target>)...HEAD`
2. Derive entries from that diff. Each logical user-facing change gets one entry.
3. Use [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) format with the project's existing categories (Added, Changed, Fixed, etc.).
4. If bumping the version, entries go under the new version heading (e.g., `## [1.2.3] - YYYY-MM-DD`). If not bumping, entries go under `[Unreleased]`.
5. If the project does not have a CHANGELOG.md, check the project's AGENTS.md for changelog conventions before creating one.

### Version Bump

1. Compare the version in `pyproject.toml` (or the project's version file) against `origin/main` (or the merge target). If already bumped, trust it.
2. If not bumped, infer the level from the branch diff:
   - **Major**: Breaking changes to public API
   - **Minor**: New features, new public API surface
   - **Patch**: Bug fixes, documentation, internal refactors
3. If you cannot confidently infer the level, ask the user.
4. If you infer **major**, confirm with the user before applying (unless in autonomous mode).

### "Make sure X is correct"

"Make sure changelog is correct" and "make sure version is correct" mean the same as "update changelog" and "bump version". Derive from the branch diff, fix what is wrong, add what is missing.

---

## The Embarrassment Sweep

Before any push or PR, run the embarrassment sweep over the branch diff
(`git diff $(git merge-base HEAD <target>)...HEAD`). It is the named pre-PR
diff-hygiene pass: catch the things that are embarrassing to ship, separate
from whether the code's claims are true. Each point is scoped to what the
branch introduced, not pre-existing repo state.

1. **Debug leftovers** — `print` / `console.log` / `debugger` / breakpoints the branch added.
2. **Stray work markers** — branch-introduced `TODO` / `FIXME` / `XXX` / `HACK` promising work that does not exist.
3. **Commented-out code** — dead blocks the branch left behind instead of deleting.
4. **Accidental inclusions** — editor swap files, `.DS_Store`, build artifacts, and unrelated files swept into commits.
5. **AI-attribution violations** — `Co-Authored-By`, "Generated with", or bot signatures in commits or PR text.
6. **Issue-ref violations** — `#N` references that auto-link in commits or PR text.
7. **Out-of-scope paths** — files touched that the feature has no business touching; unflagged ride-alongs.
8. **Repo-specific consistency** — this repo's conventions: version bump present, changelog entry added, generated mirrors regenerated and in sync.

Any finding is a blocker: fix it (or, for an intentional ride-along, flag it
explicitly to the operator) before pushing or opening the PR.

---

## The Process

### Step 1: Verify Tests

<analysis>
Before presenting options:
- Do tests pass on current branch?
- What is the base branch?
- Am I in a worktree?
</analysis>

```bash
# Run project's test suite
npm test / cargo test / pytest / go test ./...
```

**If tests fail:**
```
Tests failing (<N> failures). Must fix before completing:

[Show failures]

Cannot proceed with merge/PR until tests pass.
```

STOP. Do not proceed to Step 2.

**If tests pass:** Continue to Step 2.

### Step 2: Determine Base Branch

```bash
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
```

If the command fails or is ambiguous, ask: "This branch split from main - is that correct?"

### Step 3: Present Options

Present exactly these 5 options:

```
Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Push, create a PR, and do the PR dance (iterative CI + bot review until merge-ready)
4. Keep the branch as-is (I'll handle it later)
5. Discard this work

Which option?
```

**Don't add explanation** - keep options concise.

### Step 4: Execute Choice

**Dispatch subagent** with command: `finish-branch-execute`

Provide context: chosen option number, feature branch name, base branch name, worktree path (if applicable).

### Step 5: Cleanup Worktree

**Dispatch subagent** with command: `finish-branch-cleanup`

Provide context: chosen option number, worktree path. Note: Option 4 skips cleanup entirely.

---

## Quick Reference

| Option | Merge | Push | Keep Worktree | Cleanup Branch |
|--------|-------|------|---------------|----------------|
| 1. Merge locally | Yes | - | - | Yes |
| 2. Create PR | - | Yes | Yes | - |
| 3. Create PR + PR dance | - | Yes | Yes | - |
| 4. Keep as-is | - | - | Yes | - |
| 5. Discard | - | - | - | Yes (force) |

---

## Anti-Patterns

<FORBIDDEN>
- Proceeding with failing tests
- Merging without post-merge test verification
- Deleting branches without typed "discard" confirmation
- Force-pushing without explicit user request
- Presenting open-ended questions instead of structured options
- Cleaning up worktrees for Options 2, 3, or 4
- Accepting partial confirmation for Option 5
</FORBIDDEN>

---

## Self-Check

<reflection>
Before completing:
- [ ] Tests pass on current branch
- [ ] Tests pass after merge (Option 1 only)
- [ ] User explicitly selected one of the 4 options
- [ ] Typed "discard" received (Option 5 only)
- [ ] Worktree cleaned only for Options 1 or 5

IF ANY unchecked: STOP and fix.
</reflection>

---

## Integration

**Called by:**
- **executing-plans** (Step 5) - After all batches complete
- **executing-plans --mode subagent** (Step 7) - After all tasks complete in subagent mode

**Pairs with:**
- **using-git-worktrees** - Cleans up worktree created by that skill

<FINAL_EMPHASIS>
You are a Release Engineer. Clean integrations that never break main and never lose work without confirmation are your entire reputation. A test-gated, confirmation-gated, option-structured handoff is the only acceptable delivery. Anything less is negligence.
</FINAL_EMPHASIS>