fix(server): strip linked worktree markers from branch list

Author: pallyoung

packages/server/src/__tests__/git/cli.test.ts

@@ -432,10 +432,12 @@ describe("GitError", () => {
 describe("runGitListBranches", () => {
   let testDir: string;
   let remoteDir: string;
+  let linkedWorktreeDir: string;
 
   beforeEach(async () => {
     testDir = join(tmpdir(), `git-test-${Date.now()}`);
     remoteDir = join(tmpdir(), `git-remote-${Date.now()}`);
+    linkedWorktreeDir = join(tmpdir(), `git-linked-worktree-${Date.now()}`);
     await mkdir(testDir);
 
     // Initialize git repo
@@ -455,6 +457,11 @@ describe("runGitListBranches", () => {
     } catch {
       // Ignore cleanup errors
     }
+    try {
+      await rmdir(linkedWorktreeDir, { recursive: true });
+    } catch {
+      // Ignore cleanup errors
+    }
   });
 
   it("returns structured branch data with remote branches", async () => {
@@ -601,6 +608,33 @@ describe("runGitListBranches", () => {
 
     await rm(testDir, { recursive: true });
   });
+
+  it("strips linked worktree markers from local branch names", async () => {
+    await writeFile(join(testDir, "README.md"), "test");
+    await execFileAsync("git", ["add", "."], { cwd: testDir });
+    await execFileAsync("git", ["commit", "-m", "initial"], { cwd: testDir });
+
+    const defaultBranch = await getCurrentBranch(testDir);
+    await execFileAsync("git", ["branch", "feature/worktree-branch"], { cwd: testDir });
+    await execFileAsync("git", ["worktree", "add", linkedWorktreeDir, "feature/worktree-branch"], {
+      cwd: testDir,
+    });
+
+    const { runGitListBranches } = await import("../../git/cli.js");
+    const result = await runGitListBranches(testDir);
+
+    expect(result.current).toBe(defaultBranch);
+    expect(result.branches).toContainEqual({
+      name: "feature/worktree-branch",
+      isRemote: false,
+      isCurrent: false,
+    });
+    expect(result.branches).not.toContainEqual(
+      expect.objectContaining({
+        name: expect.stringMatching(/^\+\s/),
+      })
+    );
+  });
 });
 
 describe("getGitStatus", () => {

packages/server/src/git/cli.ts

@@ -655,7 +655,7 @@ export async function runGitListBranches(cwd: string): Promise<{
   const localLines = localOutput.split("\n").filter((line) => line.trim());
   for (const line of localLines) {
     const isCurrent = line.startsWith("*");
-    const name = line.replace(/^\*?\s+/, "").trim();
+    const name = line.replace(/^[*+ ]\s+/, "").trim();
 
     // Skip detached HEAD indicator
     if (name.startsWith("(HEAD detached")) {