Finishing a Development Branch

Overview

Core principle: Verify tests → Detect environment → Present options → Execute choice → Clean up.

Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."

Step 1: Verify Tests

Run the project's full test suite (npm test / cargo test / pytest / go test ./...).

If tests fail, report the failures and stop — the menu comes after a green suite:

Tests failing (<N> failures). Must fix before completing:

[Show failures]

If tests pass: continue to Step 2.

Step 2: Detect Environment

Run each of these on its own and note what it prints — later steps need these values, and a later run_command may start in a fresh shell:

git rev-parse --path-format=absolute --git-dir --git-common-dir
git rev-parse --show-toplevel

The first prints GIT_DIR, then GIT_COMMON; the second prints WORKTREE_PATH. Then run, with the GIT_COMMON you noted:

git -C "<GIT_COMMON>/.." rev-parse --show-toplevel

It prints MAIN_ROOT, the main checkout's root. Note all four now, while still inside the workspace — Step 5 changes directory before cleanup (Step 6) needs them. (Git older than 2.31 lacks --path-format: resolve each printed path to an absolute one before comparing.) Later steps write these values as <MAIN_ROOT> and <WORKTREE_PATH>; put the values you noted in their place.

This determines which menu to show and how cleanup works:

Step 3: Determine Base Branch

The base branch is whatever this work forked from — usually named in the plan, the conversation, or the branch's upstream. If it is not already known, ask: "This branch split from <your best guess> - is that correct?" Confirm before merging: merging into the wrong base is expensive to undo.

Step 4: Present Options

Use ask_question to present the options:

ask_question(questions: [{
  question: "Implementation complete. What would you like to do?",
  options: [
    "Merge back to <base-branch> locally",
    "Push and create a Pull Request",
    "Keep the branch as-is (I'll handle it later)"
  ],
  is_multi_select: false
}])

And for detached HEAD:

ask_question(questions: [{
  question: "Implementation complete. You're on a detached HEAD (externally managed workspace). What would you like to do?",
  options: [
    "Push as new branch and create a Pull Request",
    "Keep as-is (I'll handle it later)"
  ],
  is_multi_select: false
}])

Present the menu exactly as written — concise, with every option coming from the list above. Discarding the work happens only in response to your human partner explicitly asking for it (see "If your human partner asks to discard the work" below). Wait for their answer; the integration decision is theirs.

Step 5: Execute Choice

Run every command in Step 5 and Step 6 through run_command with Cwd set to <MAIN_ROOT>. The cd "<MAIN_ROOT>" lines say the same for a shell that keeps its directory; a new command may start in a fresh shell, and worktree removal must run from outside the worktree.

Option 1: Merge Locally

# Main repo root (noted in Step 2) for CWD safety
cd "<MAIN_ROOT>"

# Merge first — verify success before removing anything
git checkout <base-branch>
git pull
git merge <feature-branch>

# Verify tests on merged result
<test command>

If tests fail on the merged result: stop, leave the worktree and branch in place, and investigate — nothing has been pushed, so the merge is local and recoverable.

Once the merged result is green: clean up the worktree (Step 6), then delete the branch:

git branch -d <feature-branch>

Option 2: Push and Create PR

git push -u origin <feature-branch>
# From a detached HEAD, name the new branch on the remote:
# git push origin HEAD:refs/heads/<new-branch>

Then create the pull/merge request against <base-branch> with the forge's tooling — its CLI if one is available, or the creation URL most forges print when you push — following the repo's PR template and conventions if present, and report the URL to your human partner.

Keep the worktree — your human partner iterates on PR feedback there.

Option 3: Keep As-Is

Report: "Keeping branch <name>. Worktree preserved at <path>."

If your human partner asks to discard the work

This path exists only as a response to an explicit request to throw the work away. Confirm first:

This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>

Type 'discard' to confirm.

Wait for that exact confirmation. When it arrives:

cd "<MAIN_ROOT>"

Then clean up the worktree (Step 6) and force-delete the branch:

git branch -D <feature-branch>

Step 6: Cleanup Workspace

Runs for Option 1 and confirmed discards. Options 2 and 3 always preserve the workspace. Both callers have already changed directory to the main repo root — worktree removal must run from outside the worktree — and use the GIT_DIR/GIT_COMMON/WORKTREE_PATH values captured in Step 2, from before that directory change. The first matching branch below wins.

If GIT_DIR == GIT_COMMON: Normal repo, no worktree to clean up. Done.

If the workspace was created by invoke_subagent with Workspace: "branch": The platform handles cleanup automatically when the subagent terminates. No manual cleanup needed.

If WORKTREE_PATH is under <repo-root>/.worktrees/ or <repo-root>/worktrees/: Superpowers created this worktree — we own cleanup:

cd "<MAIN_ROOT>"
git worktree remove "<WORKTREE_PATH>"
git worktree prune  # Self-healing: clean up any stale registrations

If removal is refused (contains modified or untracked files): the worktree holds files that exist nowhere else — uncommitted plans, notes, or scratch work. Never --force on your own initiative. Show your human partner what is at stake and ask:

git -C "<WORKTREE_PATH>" status --porcelain -uall

Worktree removal refused — these files were never committed:

<file list>

1. Commit them to <branch> before cleanup
2. Move them into <main repo root>
3. Delete them (unrecoverable)

Which?

Carry out the choice, then remove the worktree.

Otherwise: The host environment owns this workspace — leave it in place.

Quick Reference

Common Rationalizations