root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(FN-4917): stabilize workspace verification after worktree recovery changes

Browse Source 
Fusion-Task-Id: FN-4917
Fusion-Task-Lineage: 1422a545-f4b5-4e1f-a347-8be2a4202f45
This commit is contained in:
Fusion (runfusion.ai)
2026-05-17 11:52:17 -07:00
committed by gsxdsm
parent 5aeb7645ee
commit 434bfff37c
9 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/engine/src/__tests__/executor-test-helpers.ts
View File

@@ -110,6 +110,7 @@ vi.mock("../worktree-pool.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../worktree-pool.js")>();
return {
...actual,
classifyTaskWorktree: vi.fn().mockResolvedValue({ ok: true }),
isUsableTaskWorktree: vi.fn().mockResolvedValue(true),
};
});
@@ -246,7 +247,7 @@ import { withRateLimitRetry } from "../rate-limit-retry.js";
import { exec, execSync } from "node:child_process";
import { existsSync, realpathSync } from "node:fs";
import { hydrateWorktreeDb } from "../worktree-db-hydrate.js";
import { isUsableTaskWorktree } from "../worktree-pool.js";
import { classifyTaskWorktree, isUsableTaskWorktree } from "../worktree-pool.js";
import { classifyStaleLock, tryRemoveStaleLock } from "../worktree-stale-lock.js";
import { executingTaskLock } from "../active-session-registry.js";
@@ -261,6 +262,7 @@ export const mockedExecSync = vi.mocked(execSync);
export const mockedExistsSync = vi.mocked(existsSync);
export const mockedRealpathSync = vi.mocked(realpathSync);
export const mockedHydrateWorktreeDb = vi.mocked(hydrateWorktreeDb);
export const mockedClassifyTaskWorktree = vi.mocked(classifyTaskWorktree);
export const mockedIsUsableTaskWorktree = vi.mocked(isUsableTaskWorktree);
export const mockedClassifyStaleLock = vi.mocked(classifyStaleLock);
export const mockedTryRemoveStaleLock = vi.mocked(tryRemoveStaleLock);
@@ -337,6 +339,12 @@ export function resetExecutorMocks() {
mockedExec.mockReset();
mockedExecSync.mockReset();
mockedIsUsableTaskWorktree.mockResolvedValue(true);
mockedClassifyTaskWorktree.mockImplementation(async (rootDir: string, worktreePath: string) => {
const usable = await mockedIsUsableTaskWorktree(rootDir, worktreePath);
return usable
? { ok: true }
: { ok: false, classification: "incomplete", reason: "missing or invalid .git metadata" };
});
mockedClassifyStaleLock.mockReset();
mockedTryRemoveStaleLock.mockReset();
mockedClassifyStaleLock.mockResolvedValue({ kind: "fresh", reason: "fresh" } as any);