When the default isolation mode flipped from "worktree" to "none" between versions, mergeAndExit() returned early for mode "none" without checking whether the session was physically inside an active worktree. This silently skipped the merge, orphaning committed work on the milestone branch. The fix moves the worktree-presence check (isInAutoWorktree + originalBasePath) before the mode-none early return. If we are inside a worktree, mergeAndExit proceeds with the worktree merge path regardless of the configured mode. Also fixes the misleading JSDoc on GitPreferences.isolation that claimed "worktree" was the default when the runtime default is actually "none". Closes #2625 Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| agents | ||
| extensions | ||
| skills | ||
| GSD-WORKFLOW.md | ||