finishing-a-development-branch

工程开发社区 @obra

信任分: 88/100
兼容 Agent: 1

速查档案只列事实：领域、Agent、信任分、作者、原文章节。装与不装请看下方作者解读。

领域: 工程开发
兼容 Agent: Claude Code
信任分: 88 / 100 · 社区维护
作者 / 版本 / 许可: @obra · 未声明 license
安装命令数: 1 条

需要注意： 未限定 allowed-tools，默认拥有全部工具权限。

解读由编辑根据原文凝练而成，命令、链接、术语均与作者原文一致；想看完整论述请切到右侧

设计思路

finishing-a-development-branch 是 superpowers 的「开发完成扫尾」skill——按一份精确的 4 选项菜单完成分支收尾，避免「合并到主分支后 CI 挂」「worktree 残留」「分支白白挂着」这类常见烂尾。作者把它做成 mechanical 的决策树，每一步都对应明确条件，不留发挥空间。

4 选项（detached HEAD 时降到 3 选项）

选项	Merge	Push	Keep Worktree	Cleanup Branch
1. Merge locally	yes	-	-	yes
2. Create PR	-	yes	yes	-
3. Keep as-is	-	-	yes	-
4. Discard	-	-	-	yes（force）

关键纪律：

选 1 / 选 4 才清 worktree——选 2 用户后续 PR iteration 还要用，别动。
先 merge 再 remove worktree 再 delete branch——git branch -d 在 worktree 还引用这个分支时会失败。
cd 回主仓再跑 git worktree remove——在 worktree 内部跑会静默失败。
跑完 git worktree prune 自愈清理 stale 注册。
Discard（选 4）必须打字 "discard" 二次确认——防误删。

Worktree 归属判断

只清理 .worktrees/ / worktrees/ / ~/.config/superpowers/worktrees/ 这三种自创的 worktree。harness 创的（IDE / 平台拥有的）绝不动——会留下幻影状态。

常见错误（按作者原文摘录）

跳过测试验证：合了挂代码或开了挂的 PR——所以提供选项前先验证。
开放式问题：「你下一步想做什么？」——必须给精确 4 选项。
删 branch 之前不删 worktree：branch -d 失败。
在 worktree 内跑 git worktree remove：静默失败——必须 cd 回主仓再跑。
Discard 没二次确认：手滑就丢工作。

Red Flags（永远不做）

测试挂还往下走
merge 完不再验测
不让用户确认就删工作
没明确许可就 force-push
没确认 merge 成功就删 worktree
清不是自己造的 worktree（provenance check）

适合谁

完成 task 后想稳妥收尾的工程师
多 worktree 工作流的核心收尾节点
团队有「PR 创建标准化」要求的项目

何时不该用

还在开发中——这是终点，不是中途
不在 git 仓库——大量步骤无效

配套

writing-plans（开始）→ executing-plans（执行）→ finishing-a-development-branch（收尾）；多 worktree 时用 using-git-worktrees 协同。

Finishing a Development Branch

Overview

Guide completion of development work by presenting clear options and handling chosen workflow.

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."

The Process

Step 1: Verify Tests

Before presenting options, verify tests pass:

# 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. Don't proceed to Step 2.

If tests pass: Continue to Step 2.

Step 2: Detect Environment

Determine workspace state before presenting options:

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)

This determines which menu to show and how cleanup works:

State	Menu	Cleanup
`GIT_DIR == GIT_COMMON` (normal repo)	Standard 4 options	No worktree to clean up
`GIT_DIR != GIT_COMMON`, named branch	Standard 4 options	Provenance-based (see Step 6)
`GIT_DIR != GIT_COMMON`, detached HEAD	Reduced 3 options (no merge)	No cleanup (externally managed)

Step 3: Determine Base Branch

# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null

Or ask: "This branch split from main - is that correct?"

Step 4: Present Options

Normal repo and named-branch worktree — present exactly these 4 options:

Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work

Which option?

Detached HEAD — present exactly these 3 options:

Implementation complete. You're on a detached HEAD (externally managed workspace).

1. Push as new branch and create a Pull Request
2. Keep as-is (I'll handle it later)
3. Discard this work

Which option?

Don't add explanation - keep options concise.

Step 5: Execute Choice

Option 1: Merge Locally

# Get main repo root for CWD safety
MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
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>

# Only after merge succeeds: cleanup worktree (Step 6), then delete branch

Then: Cleanup worktree (Step 6), then delete branch:

git branch -d <feature-branch>

Option 2: Push and Create PR

# Push branch
git push -u origin <feature-branch>

# Create PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>

## Test Plan
- [ ] <verification steps>
EOF
)"

Do NOT clean up worktree — user needs it alive to iterate on PR feedback.

Option 3: Keep As-Is

Report: "Keeping branch . Worktree preserved at ."

Don't cleanup worktree.

Option 4: Discard

Confirm first:

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

Type 'discard' to confirm.

Wait for exact confirmation.

If confirmed:

MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"

Then: Cleanup worktree (Step 6), then force-delete branch:

git branch -D <feature-branch>

Step 6: Cleanup Workspace

Only runs for Options 1 and 4. Options 2 and 3 always preserve the worktree.

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)
WORKTREE_PATH=$(git rev-parse --show-toplevel)

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

If worktree path is under .worktrees/, worktrees/, or ~/.config/superpowers/worktrees/: Superpowers created this worktree — we own cleanup.

MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"
git worktree remove "$WORKTREE_PATH"
git worktree prune  # Self-healing: clean up any stale registrations

Otherwise: The host environment (harness) owns this workspace. Do NOT remove it. If your platform provides a workspace-exit tool, use it. Otherwise, leave the workspace in place.

Quick Reference

Option	Merge	Push	Keep Worktree	Cleanup Branch
1. Merge locally	yes	-	-	yes
2. Create PR	-	yes	yes	-
3. Keep as-is	-	-	yes	-
4. Discard	-	-	-	yes (force)

Common Mistakes

Skipping test verification

Problem: Merge broken code, create failing PR
Fix: Always verify tests before offering options

Open-ended questions

Problem: "What should I do next?" is ambiguous
Fix: Present exactly 4 structured options (or 3 for detached HEAD)

Cleaning up worktree for Option 2

Problem: Remove worktree user needs for PR iteration
Fix: Only cleanup for Options 1 and 4

Deleting branch before removing worktree

Problem: git branch -d fails because worktree still references the branch
Fix: Merge first, remove worktree, then delete branch

Running git worktree remove from inside the worktree

Problem: Command fails silently when CWD is inside the worktree being removed
Fix: Always cd to main repo root before git worktree remove

Cleaning up harness-owned worktrees

Problem: Removing a worktree the harness created causes phantom state
Fix: Only clean up worktrees under .worktrees/, worktrees/, or ~/.config/superpowers/worktrees/

No confirmation for discard

Problem: Accidentally delete work
Fix: Require typed "discard" confirmation

Red Flags

Never:

Proceed with failing tests
Merge without verifying tests on result
Delete work without confirmation
Force-push without explicit request
Remove a worktree before confirming merge success
Clean up worktrees you didn't create (provenance check)
Run git worktree remove from inside the worktree

Always:

Verify tests before offering options
Detect environment before presenting menu
Present exactly 4 options (or 3 for detached HEAD)
Get typed confirmation for Option 4
Clean up worktree for Options 1 & 4 only
cd to main repo root before worktree removal
Run git worktree prune after removal