Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Retry failed plugin worktree lookups instead of caching misses (#4668)

Rudy Mizrahi Celekli1519b5132e5f
diff --git a/plugins/worktrunk/hooks/register.tsx b/plugins/worktrunk/hooks/register.tsx
index e48c56a30..af30237f4 100644
--- a/plugins/worktrunk/hooks/register.tsx
+++ b/plugins/worktrunk/hooks/register.tsx
@@ -312,7 +312,10 @@ async function locate($: EngineInterface, dir: string): Promise<Located | null>
.catch(() => null)
const [root, commonDir] = ran?.exitCode === 0 ? ran.stdout.trim().split('\n') : []
const found = root && commonDir ? { root, commonDir } : null
- located.set(dir, found)
+ // A miss can become a worktree after git init, or follow a transient Git failure.
+ if (found !== null) {
+ located.set(dir, found)
+ }
return found
}
diff --git a/plugins/worktrunk/tests/diff.test.tsx b/plugins/worktrunk/tests/diff.test.tsx
index 6486158f0..77501f719 100644
--- a/plugins/worktrunk/tests/diff.test.tsx
+++ b/plugins/worktrunk/tests/diff.test.tsx
@@ -139,7 +139,12 @@ type Ran = { exitCode: number; stdout: string; stderr: string; isStdoutTruncated
// Stands for the engine and the host: git and wt answer from fixtures, and
// `step` stands in for what `wt step diff` answers.
-function host(on: On, runs: string[][], step: Partial<Ran> = {}) {
+function host(
+ on: On,
+ runs: string[][],
+ step: Partial<Ran> = {},
+ gitReady: () => boolean = () => true,
+) {
mock.clock(on)
on('command.register', () => ({ value: { command: 'wt-diff' } }))
let isOpen = false
@@ -167,6 +172,17 @@ function host(on: On, runs: string[][], step: Partial<Ran> = {}) {
value: { exitCode: 0, stdout, stderr: '', isStdoutTruncated: false, isStderrTruncated: false },
})
if (argv[0] === 'git') {
+ if (!gitReady()) {
+ return {
+ value: {
+ exitCode: 128,
+ stdout: '',
+ stderr: 'not a git repository',
+ isStdoutTruncated: false,
+ isStderrTruncated: false,
+ },
+ }
+ }
return answer(`${dir.startsWith(OTHER) ? OTHER : HERE}\n${HERE}/.git\n`)
}
if (argv[3] === 'step') {
@@ -351,3 +367,21 @@ test('a hunk past the budget draws its start, under a recounted header', async (
expect(await ui.find({ type: 'Text', text: /rest of this file/ })).toBeDefined()
await ui.unmount()
})
+
+test('a failed lookup is retried when the directory becomes a repository', async ($, on) => {
+ const runs: string[][] = []
+ let ready = false
+ host(on, runs, {}, () => ready)
+ await $.session.start({ cwd: HERE, surface: 'terminal', isInteractive: true })
+ await $.command.run({ command: 'wt-diff', args: '', ...TYPED })
+ expect(runs.filter(argv => argv[0] === 'git').length).toBe(1)
+
+ // The session has now initialized a repository in that same directory.
+ ready = true
+ await $.command.run({ command: 'wt-diff', args: '', ...TYPED })
+ const ui = await $.ui.mount({ ...PANE, surface: 'terminal' })
+ expect(await ui.find({ key: `wt:${HERE}` })).toBeDefined()
+ await ui.unmount()
+ // The successful result is cached for the refresh that opens the pane.
+ expect(runs.filter(argv => argv[0] === 'git').length).toBe(2)
+})