fix(MORG-48): skip checkout when deleting a merged worktree branch (#38)

* fix(MORG-48): skip checkout when deleting a worktree branch

When a branch with a worktree is being deleted during sync and the user
is on that branch, git checkout main would fail because main is already
checked out in the main worktree. The checkout is unnecessary anyway since
removeWorktree handles cleanup — skip it and only checkout for regular
(non-worktree) branches.

* fix(MORG-48): use signalWorktreeCd when deleting current worktree branch

When the user is in a worktree and its branch gets deleted during sync,
use signalWorktreeCd to move the shell to the main worktree root — with
the shell wrapper this is automatic; without it a cd hint is printed.

Author: developerdavi

src/commands/sync.ts

@@ -8,11 +8,13 @@ import { theme, symbols } from '../ui/theme';
 import { withSpinner } from '../ui/spinner';
 import { confirm, select } from '../ui/prompts';
 import { promptTicketDone } from '../utils/providers';
+import { signalWorktreeCd } from '../utils/shell';
 import {
   getCurrentBranch,
   checkout,
   pullBranch,
   fetchAndUpdateBranch,
+  getMainWorktreeRoot,
   rebaseBranch,
   mergeBranch,
   deleteBranch,
@@ -108,7 +110,14 @@ async function runSync(options: { all?: boolean }): Promise<void> {
     if (doDelete) {
       const currentBranch = await getCurrentBranch();
       if (currentBranch === branch.branchName) {
-        await checkout(defaultBranch);
+        if (branch.worktreePath) {
+          // Can't checkout — defaultBranch is already used by the main worktree.
+          // Signal the shell wrapper (or print a hint) to cd there instead.
+          const mainRoot = await getMainWorktreeRoot();
+          signalWorktreeCd(mainRoot);
+        } else {
+          await checkout(defaultBranch);
+        }
       }
       // Remove worktree first so git allows the branch to be deleted
       if (branch.worktreePath) {