fix: let isolated cron setup use job timeout budget

aaroneden · aaroneden · commit ea14857772d2 · 2026-06-23T16:19:07.000-07:00
diff --git a/src/cron/service/agent-watchdog.test.ts b/src/cron/service/agent-watchdog.test.ts
@@ -6,6 +6,23 @@ describe("cron agent setup watchdog", () => {
     vi.useRealTimers();
   });
 
+  it("allows setup to continue past 60 seconds when the job timeout budget allows it", async () => {
+    vi.useFakeTimers();
+    const triggerTimeout = vi.fn();
+    const watchdog = createCronAgentWatchdog({
+      deferUntilRunner: true,
+      jobTimeoutMs: CRON_AGENT_SETUP_WATCHDOG_MS * 5,
+      triggerTimeout,
+    });
+
+    watchdog.start();
+
+    await vi.advanceTimersByTimeAsync(CRON_AGENT_SETUP_WATCHDOG_MS + 10_000);
+    watchdog.noteRunnerStarted();
+
+    expect(triggerTimeout).not.toHaveBeenCalled();
+  });
+
   it("does not keep lane-wait suppression after lane admission", async () => {
     vi.useFakeTimers();
     const triggerTimeout = vi.fn();
diff --git a/src/cron/service/agent-watchdog.ts b/src/cron/service/agent-watchdog.ts
@@ -14,6 +14,7 @@ import type { CronServiceState } from "./state.js";
 
 const CRON_TIMEOUT_CLEANUP_GUARD_MS = 20_000;
 export const CRON_AGENT_SETUP_WATCHDOG_MS = 60_000;
+const CRON_AGENT_SETUP_WATCHDOG_MAX_MS = 10 * 60_000;
 const CRON_AGENT_PRE_EXECUTION_WATCHDOG_MS = 60_000;
 const CRON_AGENT_PRE_EXECUTION_MIN_WATCHDOG_MS = 1_000;
 
@@ -48,6 +49,7 @@ const CRON_AGENT_PHASE_WATCHDOG_STAGE = {
 /** Handle for feeding isolated-agent progress into cron timeout watchdogs. */
 export type CronAgentWatchdog = {
   start: () => void;
+  setupTimeoutMs: () => number;
   noteLaneWait: () => void;
   noteLaneAdmitted: () => void;
   noteRunnerStarted: (info?: CronAgentExecutionStarted) => void;
@@ -69,6 +71,7 @@ export function createCronAgentWatchdog(params: {
   let preExecutionTimeoutId: NodeJS.Timeout | undefined;
   let activeExecution: CronAgentExecutionStarted | undefined;
   let observedLaneWait = false;
+  const setupTimeoutMs = resolveCronAgentSetupWatchdogMs(params.jobTimeoutMs);
 
   const setTimedOut = (reason: string) => {
     if (state === "timed_out" || state === "disposed") {
@@ -142,11 +145,12 @@ export function createCronAgentWatchdog(params: {
           if (state === "waiting_for_runner") {
             setTimedOut(setupTimeoutErrorMessage(activeExecution));
           }
-        }, CRON_AGENT_SETUP_WATCHDOG_MS);
+        }, setupTimeoutMs);
         return;
       }
       startTimeout();
     },
+    setupTimeoutMs: () => setupTimeoutMs,
     noteLaneWait: () => {
       if (state === "waiting_for_runner") {
         observedLaneWait = true;
@@ -223,3 +227,10 @@ function resolveCronAgentPreExecutionWatchdogMs(jobTimeoutMs: number): number {
     Math.min(CRON_AGENT_PRE_EXECUTION_WATCHDOG_MS, Math.floor(jobTimeoutMs / 2)),
   );
 }
+
+export function resolveCronAgentSetupWatchdogMs(jobTimeoutMs: number): number {
+  return Math.max(
+    CRON_AGENT_SETUP_WATCHDOG_MS,
+    Math.min(CRON_AGENT_SETUP_WATCHDOG_MAX_MS, Math.floor(jobTimeoutMs / 2)),
+  );
+}
diff --git a/src/cron/service/timer.ts b/src/cron/service/timer.ts
@@ -46,11 +46,7 @@ import type {
   CronRunStatus,
   CronRunTelemetry,
 } from "../types.js";
-import {
-  cleanupTimedOutCronAgentRun,
-  createCronAgentWatchdog,
-  CRON_AGENT_SETUP_WATCHDOG_MS,
-} from "./agent-watchdog.js";
+import { cleanupTimedOutCronAgentRun, createCronAgentWatchdog } from "./agent-watchdog.js";
 import {
   abortErrorMessage,
   isSetupTimeoutErrorText,
@@ -278,7 +274,7 @@ export async function executeJobCoreWithTimeout(
         job.sessionTarget === "isolated" && isSetupTimeoutErrorText(error) && !observedLaneWait
           ? {
               error,
-              timeoutMs: CRON_AGENT_SETUP_WATCHDOG_MS,
+              timeoutMs: watchdog.setupTimeoutMs(),
               otherCronJobsActiveAtTimeout: false,
             }
           : undefined;
