fix(cron): forward abort signal into runWithModelFallback

yayu · altaywtf · commit b88964e34479 · 2026-06-27T19:31:25.000+03:00
Thread the cron executor's abort signal into the shared
runWithModelFallback call so that cron timeouts and cancellations
stop the fallback chain instead of retrying with the next candidate.

Previously, the run callback checked params.abortSignal?.aborted and
threw, but runWithModelFallback itself had no signal — so the new
guard in model-fallback.ts could not distinguish a caller abort from
a provider-side AbortError and would retry silently.

Also adds a focused regression test verifying the signal is forwarded.
diff --git a/src/cron/isolated-agent/run-executor.ts b/src/cron/isolated-agent/run-executor.ts
@@ -283,6 +283,7 @@ export function createCronPromptExecutor(params: {
       agentDir: params.agentDir,
       agentId: params.agentId,
       sessionKey: params.runSessionKey,
+      abortSignal: params.abortSignal,
       prepareAgentHarnessRuntime: async ({ provider, model, agentHarnessRuntimeOverride }) => {
         await ensureSelectedAgentHarnessPlugin({
           config: params.cfgWithAgentDefaults,
diff --git a/src/cron/isolated-agent/run.cron-model-override-forwarding.test.ts b/src/cron/isolated-agent/run.cron-model-override-forwarding.test.ts
@@ -665,4 +665,21 @@ describe("runCronIsolatedAgentTurn — cron model override forwarding (#58065)",
 
     expect(capturedFallbacksOverride).toEqual(["openai/gpt-4o"]);
   });
+
+  it("forwards the cron abort signal into runWithModelFallback", async () => {
+    const controller = new AbortController();
+    let capturedAbortSignal: AbortSignal | undefined;
+    runWithModelFallbackMock.mockImplementation(
+      async (params: { provider: string; model: string; abortSignal?: AbortSignal }) => {
+        capturedAbortSignal = params.abortSignal;
+        return makeSuccessfulRunResult();
+      },
+    );
+
+    controller.abort(new Error("cron: job execution timed out"));
+
+    await runCronIsolatedAgentTurn(makeParams({ abortSignal: controller.signal }));
+
+    expect(capturedAbortSignal).toBe(controller.signal);
+  });
 });
