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

feat(FN-2110): merge fusion/fn-2110

Browse Source
This commit is contained in:
gsxdsm
2026-04-19 02:36:50 -07:00
parent 7a920249f8
commit 46aeee0959
2 changed files with 146 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
packages/engine/src/executor.test.ts
View File

@@ -143,7 +143,7 @@ vi.mock("./step-session-executor.js", () => ({
}));
vi.mock("./rate-limit-retry.js", () => ({
withRateLimitRetry: (fn: () => Promise<any>) => fn(),
withRateLimitRetry: vi.fn((fn: () => Promise<unknown>) => fn()),
}));
vi.mock("@mariozechner/pi-coding-agent", () => {
const mockSessionManager = {};
@@ -175,12 +175,14 @@ import type { Task, TaskDetail } from "@fusion/core";
import { SessionManager } from "@mariozechner/pi-coding-agent";
import { StepSessionExecutor } from "./step-session-executor.js";
import { executorLog } from "./logger.js";
import { withRateLimitRetry } from "./rate-limit-retry.js";
const mockedCreateHaiAgent = vi.mocked(createKbAgent);
const mockedSessionManager = vi.mocked(SessionManager);
const mockedGenerateWorktreeName = vi.mocked(generateWorktreeName);
const mockedFindWorktreeUser = vi.mocked(findWorktreeUser);
const mockedStepSessionExecutor = vi.mocked(StepSessionExecutor);
const mockedWithRateLimitRetry = vi.mocked(withRateLimitRetry);
type EventListener = (...args: unknown[]) => void;
@@ -3240,6 +3242,141 @@ describe("TaskExecutor pause behavior", () => {
});
describe("session tracking failure diagnostics", () => {
beforeEach(() => {
vi.clearAllMocks();
mockedWithRateLimitRetry.mockImplementation((fn: () => Promise<unknown>) => fn());
});
it("logs warning when rate-limit retry logEntry fails in step-session mode", async () => {
const warnSpy = vi.spyOn(executorLog, "warn");
const store = createMockStore();
store.getSettings.mockResolvedValue({
maxConcurrent: 2,
maxWorktrees: 4,
pollIntervalMs: 15000,
groupOverlappingFiles: false,
autoMerge: false,
runStepsInNewSessions: true,
maxParallelSteps: 2,
});
store.getTask.mockResolvedValue({
id: "FN-001",
title: "Rate-limit step-session task",
description: "Rate-limit diagnostics",
column: "in-progress",
dependencies: [],
steps: [{ name: "Step 0", status: "pending" }],
currentStep: 0,
log: [],
prompt: "# test\n## Steps\n### Step 0: Preflight\n- [ ] check",
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
baseCommitSha: "abc123",
enabledWorkflowSteps: [],
});
mockExecuteAll.mockResolvedValue([{ stepIndex: 0, success: true, retries: 0 }]);
store.logEntry.mockImplementation(async (_taskId: string, message: string) => {
if (message.includes("Rate limited — retry")) {
throw new Error("step-session retry log failure");
}
return undefined;
});
mockedWithRateLimitRetry.mockImplementationOnce((async (
fn: () => Promise<unknown>,
options?: { onRetry?: (attempt: number, delayMs: number, error: Error) => void },
) => {
options?.onRetry?.(2, 4_000, new Error("rate limit"));
return fn();
}) as typeof withRateLimitRetry);
const executor = new TaskExecutor(store, "/tmp/test");
await expect(executor.execute({
id: "FN-001",
title: "Rate-limit step-session task",
description: "Rate-limit diagnostics",
column: "in-progress",
dependencies: [],
steps: [{ name: "Step 0", status: "pending" }],
currentStep: 0,
log: [],
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
})).resolves.toBeUndefined();
expect(store.moveTask).toHaveBeenCalledWith("FN-001", "in-review");
expect(warnSpy).toHaveBeenCalledWith(
expect.stringContaining("FN-001: failed to log rate-limit retry 2: step-session retry log failure"),
);
warnSpy.mockRestore();
});
it("logs warning when rate-limit retry logEntry fails in main-agent mode", async () => {
const warnSpy = vi.spyOn(executorLog, "warn");
const store = createMockStore();
let capturedCustomTools: Array<{ name: string; execute: (callId: string, args: Record<string, unknown>) => Promise<unknown> }> = [];
store.logEntry.mockImplementation(async (_taskId: string, message: string) => {
if (message.includes("Rate limited — retry")) {
throw new Error("main-agent retry log failure");
}
return undefined;
});
mockedCreateHaiAgent.mockImplementation((async (opts: { customTools?: typeof capturedCustomTools }) => {
capturedCustomTools = opts.customTools ?? [];
return {
session: {
prompt: vi.fn().mockImplementation(async () => {
const taskDoneTool = capturedCustomTools.find((tool) => tool.name === "task_done");
if (taskDoneTool) {
await taskDoneTool.execute("call-1", { summary: "done" });
}
}),
dispose: vi.fn(),
subscribe: vi.fn(),
on: vi.fn(),
sessionManager: { getLeafId: vi.fn().mockReturnValue("leaf-1") },
state: {},
},
sessionFile: "/tmp/sessions/main-agent-rate-limit.jsonl",
};
}) as any);
mockedWithRateLimitRetry.mockImplementationOnce((async (
fn: () => Promise<unknown>,
options?: { onRetry?: (attempt: number, delayMs: number, error: Error) => void },
) => {
options?.onRetry?.(1, 3_000, new Error("rate limit"));
return fn();
}) as typeof withRateLimitRetry);
const executor = new TaskExecutor(store, "/tmp/test");
await expect(executor.execute({
id: "FN-001",
title: "Rate-limit main-agent task",
description: "Rate-limit diagnostics",
column: "in-progress",
dependencies: [],
steps: [{ name: "Step 0", status: "pending" }],
currentStep: 0,
log: [],
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
})).resolves.toBeUndefined();
expect(store.moveTask).toHaveBeenCalledWith("FN-001", "in-review");
expect(warnSpy).toHaveBeenCalledWith(
expect.stringContaining("FN-001: failed to log rate-limit retry 1: main-agent retry log failure"),
);
warnSpy.mockRestore();
});
it("logs warning when sessionFile update fails during retry", async () => {
const warnSpy = vi.spyOn(executorLog, "warn");
const store = createMockStore();
@@ -3282,8 +3419,9 @@ describe("session tracking failure diagnostics", () => {
updatedAt: new Date().toISOString(),
})).resolves.toBeUndefined();
expect(mockedCreateHaiAgent).toHaveBeenCalledTimes(2);
expect(warnSpy).toHaveBeenCalledWith(
expect.stringContaining("FN-001: failed to update sessionFile during retry"),
expect.stringContaining("FN-001: failed to persist retry session file: retry sessionFile write failed"),
);
warnSpy.mockRestore();
@@ -3322,8 +3460,9 @@ describe("session tracking failure diagnostics", () => {
updatedAt: new Date().toISOString(),
})).resolves.toBeUndefined();
expect(store.moveTask).toHaveBeenCalledWith("FN-001", "in-review");
expect(warnSpy).toHaveBeenCalledWith(
expect.stringContaining("FN-001: failed to clear sessionFile on completion"),
expect.stringContaining("FN-001: failed to clear session file on exit: session clear failed"),
);
warnSpy.mockRestore();

8
packages/engine/src/executor.ts
View File

@@ -1434,7 +1434,7 @@ export class TaskExecutor {
executorLog.warn(`⏳ ${task.id} rate limited — retry ${attempt} in ${delaySec}s: ${error.message}`);
this.store.logEntry(task.id, `Rate limited — retry ${attempt} in ${delaySec}s`, undefined, this.currentRunContext).catch((err: unknown) => {
const msg = err instanceof Error ? err.message : String(err);
executorLog.warn(`${task.id}: failed to log rate-limit entry during step-session execution: ${msg}`);
executorLog.warn(`${task.id}: failed to log rate-limit retry ${attempt}: ${msg}`);
});
},
});
@@ -1917,7 +1917,7 @@ export class TaskExecutor {
if (retrySessionFile) {
this.store.updateTask(task.id, { sessionFile: retrySessionFile }).catch((err: unknown) => {
const msg = err instanceof Error ? err.message : String(err);
executorLog.warn(`${task.id}: failed to update sessionFile during retry: ${msg}`);
executorLog.warn(`${task.id}: failed to persist retry session file: ${msg}`);
});
}
@@ -2006,7 +2006,7 @@ export class TaskExecutor {
if (!wasPaused && !this.pausedAborted.has(task.id)) {
this.store.updateTask(task.id, { sessionFile: null }).catch((err: unknown) => {
const msg = err instanceof Error ? err.message : String(err);
executorLog.warn(`${task.id}: failed to clear sessionFile on completion: ${msg}`);
executorLog.warn(`${task.id}: failed to clear session file on exit: ${msg}`);
});
}
// Invoke plugin onAgentRunEnd hook (fire-and-forget)
@@ -2021,7 +2021,7 @@ export class TaskExecutor {
executorLog.warn(`⏳ ${task.id} rate limited — retry ${attempt} in ${delaySec}s: ${error.message}`);
this.store.logEntry(task.id, `Rate limited — retry ${attempt} in ${delaySec}s`, undefined, this.currentRunContext).catch((err: unknown) => {
const msg = err instanceof Error ? err.message : String(err);
executorLog.warn(`${task.id}: failed to log rate-limit entry during regular execution: ${msg}`);
executorLog.warn(`${task.id}: failed to log rate-limit retry ${attempt}: ${msg}`);
});
},
});