fix(acp): cap turn timeout timers

steipete · steipete · commit a841778b7b94 · 2026-05-29T17:20:48.000-04:00
diff --git a/src/acp/control-plane/manager.core.ts b/src/acp/control-plane/manager.core.ts
@@ -5,6 +5,7 @@ import { logVerbose } from "../../globals.js";
 import { formatErrorMessage } from "../../infra/errors.js";
 import { normalizeAgentId } from "../../routing/session-key.js";
 import { isAcpSessionKey } from "../../sessions/session-key-utils.js";
+import { clampTimerTimeoutMs } from "../../shared/number-coercion.js";
 import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";
 import {
   createRunningTaskRun,
@@ -1082,7 +1083,7 @@ export class AcpSessionManager {
       Number.isFinite(runtimeTimeoutSeconds) &&
       runtimeTimeoutSeconds > 0
     ) {
-      return Math.max(1_000, Math.round(runtimeTimeoutSeconds * 1_000));
+      return clampTimerTimeoutMs(Math.round(runtimeTimeoutSeconds * 1_000), 1_000) ?? 1_000;
     }
     return resolveAgentTimeoutMs({
       cfg: params.cfg,
@@ -1125,10 +1126,19 @@ export class AcpSessionManager {
       return outcome.value;
     }
 
+    const timeoutMs = clampTimerTimeoutMs(params.timeoutMs, 1);
+    if (timeoutMs === undefined) {
+      const outcome = await observedTurnPromise;
+      if (outcome.kind === "error") {
+        throw outcome.error;
+      }
+      return outcome.value;
+    }
+
     const timeoutToken = Symbol("acp-turn-timeout");
     let timer: NodeJS.Timeout | undefined;
     const timeoutPromise = new Promise<typeof timeoutToken>((resolve) => {
-      timer = setTimeout(() => resolve(timeoutToken), params.timeoutMs);
+      timer = setTimeout(() => resolve(timeoutToken), timeoutMs);
       timer.unref?.();
     });
 
diff --git a/src/acp/control-plane/manager.test.ts b/src/acp/control-plane/manager.test.ts
@@ -4,6 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { OpenClawConfig } from "../../config/config.js";
 import type { AcpSessionRuntimeOptions, SessionAcpMeta } from "../../config/sessions/types.js";
 import { resetHeartbeatWakeStateForTests } from "../../infra/heartbeat-wake.js";
+import { MAX_TIMER_TIMEOUT_MS } from "../../shared/number-coercion.js";
 import { withTempDir } from "../../test-helpers/temp-dir.js";
 import type { AcpRuntime, AcpRuntimeCapabilities } from "../runtime/types.js";
 
@@ -807,6 +808,38 @@ describe("AcpSessionManager", () => {
     }
   });
 
+  it("caps ACP runtime option turn timeouts before arming the watchdog", async () => {
+    const runtimeState = createRuntime();
+    hoisted.requireAcpRuntimeBackendMock.mockReturnValue({
+      id: "acpx",
+      runtime: runtimeState.runtime,
+    });
+    hoisted.readAcpSessionEntryMock.mockReturnValue({
+      sessionKey: "agent:codex:acp:session-1",
+      storeSessionKey: "agent:codex:acp:session-1",
+      acp: readySessionMeta({
+        runtimeOptions: {
+          timeoutSeconds: Number.MAX_SAFE_INTEGER,
+        },
+      }),
+    });
+    const timeoutSpy = vi.spyOn(globalThis, "setTimeout");
+    try {
+      const manager = new AcpSessionManager();
+      await manager.runTurn({
+        cfg: baseCfg,
+        sessionKey: "agent:codex:acp:session-1",
+        text: "first",
+        mode: "prompt",
+        requestId: "r1",
+      });
+
+      expect(timeoutSpy).toHaveBeenCalledWith(expect.any(Function), MAX_TIMER_TIMEOUT_MS);
+    } finally {
+      timeoutSpy.mockRestore();
+    }
+  });
+
   it("keeps timed-out runtime handles counted until timeout cleanup finishes", async () => {
     vi.useFakeTimers();
     try {
