changes

superpowers/finishing-a-development-branch/SKILL.md

@@ -135,7 +135,7 @@ Then: Cleanup worktree (Step 5)
 
 ### Step 5: Cleanup Worktree
 
-**For Options 1, 2, 4:**
+**Default for Options 1, 2, 4:** Clean up the worktree unless the user explicitly asked to preserve it.
 
 Check if in worktree:
 ```bash
@@ -154,7 +154,7 @@ git worktree remove <worktree-path>
 | Option | Merge | Push | Keep Worktree | Cleanup Branch |
 |--------|-------|------|---------------|----------------|
 | 1. Merge locally | ✓ | - | - | ✓ |
-| 2. Create PR | - | ✓ | ✓ | - |
+| 2. Create PR | - | ✓ | - | - |
 | 3. Keep as-is | - | - | ✓ | - |
 | 4. Discard | - | - | - | ✓ (force) |
 
@@ -168,9 +168,9 @@ git worktree remove <worktree-path>
 - **Problem:** "What should I do next?" → ambiguous
 - **Fix:** Present exactly 4 structured options
 
-**Automatic worktree cleanup**
-- **Problem:** Remove worktree when might need it (Option 2, 3)
-- **Fix:** Only cleanup for Options 1 and 4
+**Wrong cleanup default**
+- **Problem:** Preserve worktrees after merge/PR when cleanup is supposed to be the default
+- **Fix:** Cleanup for Options 1, 2, and 4 unless the user explicitly asks to keep the worktree
 
 **No confirmation for discard**
 - **Problem:** Accidentally delete work
@@ -188,7 +188,8 @@ git worktree remove <worktree-path>
 - Verify tests before offering options
 - Present exactly 4 options
 - Get typed confirmation for Option 4
-- Clean up worktree for Options 1 & 4 only
+- Clean up worktree for Options 1, 2, and 4 by default
+- Preserve the worktree for Option 3 or when the user explicitly says to keep it
 
 ## Integration