fix(providers): cap model request timeout delays

steipete · steipete · commit 4e2d9b0b760d · 2026-05-29T14:43:32.000-04:00
diff --git a/src/agents/provider-transport-fetch.test.ts b/src/agents/provider-transport-fetch.test.ts
@@ -1,6 +1,7 @@
 import { Stream } from "openai/streaming";
 import type { Model } from "openclaw/plugin-sdk/llm";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { MAX_TIMER_TIMEOUT_MS } from "../shared/number-coercion.js";
 import { buildGuardedModelFetch } from "./provider-transport-fetch.js";
 
 type ProviderRequestPolicyConfigMockResult = {
@@ -227,6 +228,60 @@ describe("buildGuardedModelFetch", () => {
     }
   });
 
+  it("caps oversized model request timeouts before arming abort signals", async () => {
+    const timeoutController = new AbortController();
+    const timeoutSpy = vi.spyOn(AbortSignal, "timeout").mockReturnValue(timeoutController.signal);
+    const model = {
+      id: "deepseek-v4-flash",
+      provider: "ds4",
+      api: "openai-completions",
+      baseUrl: "http://127.0.0.1:18000/v1",
+    } as unknown as Model<"openai-completions">;
+
+    try {
+      const fetcher = buildGuardedModelFetch(model, Number.MAX_SAFE_INTEGER);
+      const response = await fetcher("http://127.0.0.1:18000/v1/chat/completions", {
+        method: "POST",
+      });
+      await response.text();
+
+      expect(timeoutSpy).toHaveBeenCalledWith(MAX_TIMER_TIMEOUT_MS);
+      expect(ensureModelProviderLocalServiceMock).toHaveBeenCalledWith(
+        model,
+        undefined,
+        timeoutController.signal,
+      );
+      expect(latestGuardedFetchParams().timeoutMs).toBe(MAX_TIMER_TIMEOUT_MS);
+    } finally {
+      timeoutSpy.mockRestore();
+    }
+  });
+
+  it("ignores non-positive model request timeout metadata", async () => {
+    const timeoutSpy = vi.spyOn(AbortSignal, "timeout");
+    const model = {
+      id: "deepseek-v4-flash",
+      provider: "ds4",
+      api: "openai-completions",
+      baseUrl: "http://127.0.0.1:18000/v1",
+      requestTimeoutMs: -1,
+    } as unknown as Model<"openai-completions">;
+
+    try {
+      const fetcher = buildGuardedModelFetch(model);
+      const response = await fetcher("http://127.0.0.1:18000/v1/chat/completions", {
+        method: "POST",
+      });
+      await response.text();
+
+      expect(timeoutSpy).not.toHaveBeenCalled();
+      expect(ensureModelProviderLocalServiceMock).toHaveBeenCalledWith(model, undefined, undefined);
+      expect(latestGuardedFetchParams().timeoutMs).toBeUndefined();
+    } finally {
+      timeoutSpy.mockRestore();
+    }
+  });
+
   it("combines caller abort signals with model request timeouts", async () => {
     const callerController = new AbortController();
     const timeoutController = new AbortController();
diff --git a/src/agents/provider-transport-fetch.ts b/src/agents/provider-transport-fetch.ts
@@ -19,6 +19,7 @@ import { createSubsystemLogger } from "../logging/subsystem.js";
 import { resolveDebugProxySettings } from "../proxy-capture/env.js";
 import {
   asFiniteNumberInRange,
+  clampTimerTimeoutMs,
   parseStrictFiniteNumber,
   parseStrictNonNegativeInteger,
 } from "../shared/number-coercion.js";
@@ -417,11 +418,13 @@ export function resolveModelRequestTimeoutMs(
   timeoutMs: number | undefined,
 ): number | undefined {
   if (timeoutMs !== undefined) {
-    return timeoutMs;
+    return typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0
+      ? clampTimerTimeoutMs(timeoutMs)
+      : undefined;
   }
   const modelTimeoutMs = (model as { requestTimeoutMs?: unknown }).requestTimeoutMs;
   return typeof modelTimeoutMs === "number" && Number.isFinite(modelTimeoutMs) && modelTimeoutMs > 0
-    ? Math.floor(modelTimeoutMs)
+    ? clampTimerTimeoutMs(modelTimeoutMs)
     : undefined;
 }
 
