Executor agents spawned with isolation="worktree" committed to temporary
branches in separate working trees, but no step existed to merge those
changes back or clean up. This left orphan worktrees and unmerged
branches after every execution.
Changes:
- execute-phase.md: add step 4.5 "Worktree cleanup" after wave
completion — merges worktree branch, removes worktree, deletes temp
branch. Handles merge conflicts gracefully.
- quick.md: add worktree cleanup step after executor returns, before
summary verification
- Both workflows skip cleanup when workflow.use_worktrees is false
- Both workflows skip silently when no worktrees are found
Closes#1496
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
316337816e