Commit 94420192359d68c03241f03f47cf8d670abafa15 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-11 15:48:41-08:00
committer	Julius Marminge <julius0216@outlook.com> 2026-02-11 15:48:41-08:00
log	94420192359d68c03241f03f47cf8d670abafa15
tree	92c5841054415f1d8a25830cab2d3ac21e30ff80
parent	cf66f53a5559be6f0117118e07793acf35ea170b

Filter out stale worktree paths from branch listing

Worktrees in /tmp or other ephemeral locations get cleaned by the OS
but remain in git's worktree list as "prunable". These stale entries
caused branches to show a worktree label pointing at a non-existent
directory, leading to broken state when selected.

Now validates each worktree path with existsSync before including it
in the branch→worktreePath map.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

1 files changed, 3 insertions(+), 0 deletions(-)

apps
- server
  - src
    git.ts

apps/server/src/git.ts+3

 @@ -1,4 +1,5 @@
 import { spawn } from "node:child_process";
+import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 @@ -131,12 +132,14 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
     defaultRef.code === 0 ? defaultRef.stdout.trim().replace(/^refs\/remotes\/origin\//, "") : null;
   // Build branch-name → worktree-path map from porcelain output.
+  // Only include worktrees whose directories still exist on disk (skip prunable/stale ones).
   const worktreeMap = new Map<string, string>();
   if (worktreeList.code === 0) {
     let currentPath: string | null = null;
     for (const line of worktreeList.stdout.split("\n")) {
       if (line.startsWith("worktree ")) {
         currentPath = line.slice("worktree ".length);
+        if (!fs.existsSync(currentPath)) currentPath = null;
       } else if (line.startsWith("branch refs/heads/") && currentPath) {
         worktreeMap.set(line.slice("branch refs/heads/".length), currentPath);
       } else if (line === "") {