fix(agents): pass explicit CLI timeout overrides

ai-hpc · ai-hpc · commit 4f48041ddb77 · 2026-06-10T15:50:04.000+02:00
diff --git a/src/agents/agent-command.live-model-switch.test.ts b/src/agents/agent-command.live-model-switch.test.ts
@@ -775,7 +775,12 @@ vi.mock("./spawned-context.js", () => ({
 }));
 
 vi.mock("./timeout.js", () => ({
-  resolveAgentTimeoutMs: () => 30_000,
+  resolveAgentTimeoutMs: ({ overrideSeconds }: { overrideSeconds?: number | null }) =>
+    typeof overrideSeconds === "number" && Number.isFinite(overrideSeconds)
+      ? overrideSeconds === 0
+        ? 2_147_483_647
+        : Math.max(overrideSeconds * 1000, 1)
+      : 30_000,
 }));
 
 vi.mock("./workspace.js", () => ({
@@ -1142,6 +1147,22 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     expect(state.updateSessionStoreAfterAgentRunMock).toHaveBeenCalledTimes(1);
   });
 
+  it("passes explicit timeout overrides into agent attempts", async () => {
+    setupSingleAttemptFallback();
+    state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("openai", "gpt-5.4"));
+
+    await agentCommand({
+      message: "hello",
+      to: "+1234567890",
+      timeout: "600",
+    });
+
+    expectRecordFields(mockCallArg(state.runAgentAttemptMock), {
+      timeoutMs: 600_000,
+      runTimeoutOverrideMs: 600_000,
+    });
+  });
+
   it("skips the initial session touch after gateway ingress already persisted activity", async () => {
     setupSingleAttemptFallback();
     state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("openai", "gpt-5.4"));
diff --git a/src/agents/agent-command.ts b/src/agents/agent-command.ts
@@ -656,12 +656,12 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run
   const laneRaw = normalizeOptionalString(opts.lane) ?? "";
   const subagentLane: string = AGENT_LANE_SUBAGENT;
   const isSubagentLane = laneRaw === subagentLane;
-  const timeoutSecondsRaw =
-    opts.timeout !== undefined
-      ? (parseStrictNonNegativeInteger(opts.timeout) ?? Number.NaN)
-      : isSubagentLane
-        ? 0
-        : undefined;
+  const hasExplicitTimeoutOption = opts.timeout !== undefined;
+  const timeoutSecondsRaw = hasExplicitTimeoutOption
+    ? (parseStrictNonNegativeInteger(opts.timeout) ?? Number.NaN)
+    : isSubagentLane
+      ? 0
+      : undefined;
   if (
     timeoutSecondsRaw !== undefined &&
     (Number.isNaN(timeoutSecondsRaw) || timeoutSecondsRaw < 0)
@@ -672,6 +672,7 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run
     cfg,
     overrideSeconds: timeoutSecondsRaw,
   });
+  const runTimeoutOverrideMs = hasExplicitTimeoutOption ? timeoutMs : undefined;
 
   const sessionResolution = resolveSession({
     cfg,
@@ -776,6 +777,7 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run
     thinkOnce,
     verboseOverride,
     timeoutMs,
+    runTimeoutOverrideMs,
     sessionId,
     sessionKey,
     sessionEntry: sessionEntryRaw,
@@ -819,6 +821,7 @@ async function agentCommandInternal(
     thinkOnce,
     verboseOverride,
     timeoutMs,
+    runTimeoutOverrideMs,
     sessionId,
     sessionKey,
     sessionStore,
@@ -1776,6 +1779,7 @@ async function agentCommandInternal(
                 sessionEntry,
               }).enabled,
               timeoutMs,
+              runTimeoutOverrideMs,
               runId,
               opts,
               runContext,
