Branch switching blocked by untracked files (should only block on modified tracked files)

[JasonBroderick]

Summary

The worktree branch switching endpoint incorrectly blocks switching when there are untracked files (?? status). It should only block when there are modifications to tracked files that could be lost during checkout.

Steps to Reproduce

1. Create a new project with ensureInitialCommit() (empty initial commit)
2. Have untracked directories like .automaker/, .claude/, etc.
3. Generate features with branchName fields (creates worktrees)
4. Try to switch to a worktree branch via the UI

Expected Behavior

Branch switch succeeds. Untracked files are safe - git leaves them alone during checkout.

Actual Behavior

Error: Cannot switch branches: you have uncommitted changes (?? .automaker/, ?? .claude/, ?? .cursor/, ...). Please commit your changes first.

Root Cause

In apps/server/src/routes/worktree/routes/switch-branch.ts, the hasUncommittedChanges() function (lines 23-39) treats ALL git status --porcelain output as blocking changes:

async function hasUncommittedChanges(cwd: string): Promise<boolean> {
  const { stdout } = await execAsync('git status --porcelain', { cwd });
  const lines = stdout.trim().split('\n').filter((line) => {
    if (!line.trim()) return false;
    if (line.includes('.worktrees/')) return false;  // Only excludes .worktrees/
    return true;
  });
  return lines.length > 0;  // ANY remaining output = blocked
}

The code doesn't distinguish between:

• ?? (untracked files) - safe to switch
• M , A , D , etc. (modifications to tracked files) - should block

Suggested Fix

Filter out untracked files from the check:

const lines = stdout.trim().split('\n').filter((line) => {
  if (!line.trim()) return false;
  if (line.startsWith('??')) return false;  // Untracked files are safe
  if (line.includes('.worktrees/')) return false;
  return true;
});

Alternatively, use git status --porcelain --untracked-files=no to exclude untracked files from the output entirely.

[JasonBroderick]

Marking as low priority - this edge case is prevented by standard project hygiene (having a .gitignore from the start).

[DhanushSantosh]

Fixed in this branch.\n\nRoot cause was confirmed in switch-branch handling: untracked files (??) were treated as blocking uncommitted changes.\n\nWhat was changed:\n- Updated change filtering in apps/server/src/routes/worktree/routes/switch-branch.ts to ignore untracked entries while still blocking tracked modifications\n- Added route tests to verify both behaviors:\n - allows switch with only untracked files\n - blocks switch when tracked files are modified\n\nValidation:\n- npm run test:server -- apps/server/tests/unit/services/auto-mode-service.test.ts apps/server/tests/unit/routes/worktree/switch-branch.test.ts (pass)

[DhanushSantosh]

Closing as fixed by the changes and tests referenced above.