Commit 6b916d3a6fbe2145ac53776c73ba7b3d0aa969de | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-12 23:28:10-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-12 23:29:44-08:00
log	6b916d3a6fbe2145ac53776c73ba7b3d0aa969de
tree	a4ff8856f92390614a05277ffdd0cfa50879d6e0
parent	21580dc1b0860e5cc711ab2cc494b52e64103d92

Handle branch recency lookup failures in branch listing

- move branch recency parsing into `readBranchRecency`
- fall back to an empty recency map if lookup fails
- add test to ensure branches still list when recency read times out

Co-authored-by: codex <codex@users.noreply.github.com>

2 files changed, 52 insertions(+), 25 deletions(-)

apps
- server
  - src
    git.test.ts
    git.ts

apps/server/src/git.test.ts+17-1

...	@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";	...	@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
2	import { mkdtemp, rm, writeFile } from "node:fs/promises";	2	import { mkdtemp, rm, writeFile } from "node:fs/promises";
3	import { tmpdir } from "node:os";	3	import { tmpdir } from "node:os";
4	import path from "node:path";	4	import path from "node:path";
5	import { describe, expect, it } from "vitest";	5	import { describe, expect, it, vi } from "vitest";
6		6
7	import {	7	import {
8	GitCoreService,	8	GitCoreService,
...	@@ -603,5 +603,21 @@ describe("git integration", () => {	...	@@ -603,5 +603,21 @@ describe("git integration", () => {
603	const skipped = await core.pushCurrentBranch(tmp.path, null);	603	const skipped = await core.pushCurrentBranch(tmp.path, null);
604	expect(skipped.status).toBe("skipped_up_to_date");	604	expect(skipped.status).toBe("skipped_up_to_date");
605	});	605	});
		606
		607	it("lists branches when recency lookup fails", async () => {
		608	await using tmp = await makeTmpDir();
		609	await initRepoWithCommit(tmp.path);
		610	const core = new GitCoreService();
		611	const recencySpy = vi
		612	.spyOn(core as any, "readBranchRecency")
		613	.mockRejectedValueOnce(new Error("timeout"));
		614
		615	const result = await core.listBranches({ cwd: tmp.path });
		616
		617	expect(result.isRepo).toBe(true);
		618	expect(result.branches.length).toBeGreaterThan(0);
		619	expect(result.branches[0]?.current).toBe(true);
		620	recencySpy.mockRestore();
		621	});
606	});	622	});
607	});	623	});

apps/server/src/git.ts+35-24

 @@ -312,7 +312,40 @@ export class GitCoreService {
     return value.length > 0 ? value : null;
   }
+  private async readBranchRecency(cwd: string): Promise<Map<string, number>> {
+    const branchRecency = await executeGit(
+      cwd,
+      ["for-each-ref", "--format=%(refname:short)%09%(committerdate:unix)", "refs/heads"],
+      {
+        timeoutMs: 15_000,
+        allowNonZeroExit: true,
+      },
+    );
+    const branchLastCommit = new Map<string, number>();
+    if (branchRecency.code !== 0) {
+      return branchLastCommit;
+    }
+    for (const line of branchRecency.stdout.split("\n")) {
+      if (line.length === 0) {
+        continue;
+      }
+      const [name, lastCommitRaw] = line.split("\t");
+      if (!name) {
+        continue;
+      }
+      const lastCommit = Number.parseInt(lastCommitRaw ?? "0", 10);
+      branchLastCommit.set(name, Number.isFinite(lastCommit) ? lastCommit : 0);
+    }
+    return branchLastCommit;
+  }
   async listBranches(input: GitListBranchesInput): Promise<GitListBranchesResult> {
+    const branchRecencyPromise = this.readBranchRecency(input.cwd).catch(
+      () => new Map<string, number>(),
+    );
     const result = await executeGit(input.cwd, ["branch", "--no-color"], {
       timeoutMs: 10_000,
       allowNonZeroExit: true,
 @@ -326,7 +359,7 @@ export class GitCoreService {
       throw new Error(stderr || "git branch failed");
     }
-    const [defaultRef, worktreeList, branchRecency] = await Promise.all([
+    const [defaultRef, worktreeList, branchLastCommit] = await Promise.all([
       executeGit(input.cwd, ["symbolic-ref", "refs/remotes/origin/HEAD"], {
         timeoutMs: 5_000,
         allowNonZeroExit: true,
 @@ -335,14 +368,7 @@ export class GitCoreService {
         timeoutMs: 5_000,
         allowNonZeroExit: true,
       }),
-      executeGit(
+      branchRecencyPromise,
-        input.cwd,
-        ["for-each-ref", "--format=%(refname:short)%09%(committerdate:unix)", "refs/heads"],
-        {
-          timeoutMs: 5_000,
-          allowNonZeroExit: true,
-        },
-      ),
     ]);
     const defaultBranch =
       defaultRef.code === 0
 @@ -364,21 +390,6 @@ export class GitCoreService {
       }
     }
-    const branchLastCommit = new Map<string, number>();
-    if (branchRecency.code === 0) {
-      for (const line of branchRecency.stdout.split("\n")) {
-        if (line.length === 0) {
-          continue;
-        }
-        const [name, lastCommitRaw] = line.split("\t");
-        if (!name) {
-          continue;
-        }
-        const lastCommit = Number.parseInt(lastCommitRaw ?? "0", 10);
-        branchLastCommit.set(name, Number.isFinite(lastCommit) ? lastCommit : 0);
-      }
-    }
     const branches = result.stdout
       .split("\n")
       .map((line) => line.trim())