fix: apply apiRequestTimeout consistently across providers

.changeset/api-request-timeout.md

@@ -0,0 +1,5 @@
+---
+"zoo-code": patch
+---
+
+Updated `apiRequestTimeout` validation. Values must be integers between 1 and 3600 seconds; invalid or out-of-range values, including `0`, now fall back to 600 seconds. This aligns with the SDK's default timeout value.

src/api/providers/__tests__/anthropic-vertex.spec.ts

@@ -2,13 +2,26 @@
 
 import { Anthropic } from "@anthropic-ai/sdk"
 import { AnthropicVertex } from "@anthropic-ai/vertex-sdk"
+import { GoogleAuth } from "google-auth-library"
 
 import { VERTEX_1M_CONTEXT_MODEL_IDS } from "@roo-code/types"
 
 import { ApiStreamChunk } from "../../transform/stream"
 
 import { AnthropicVertexHandler } from "../anthropic-vertex"
 
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn().mockReturnValue(300_000),
+}))
+
+const MOCK_TIMEOUT_MS = 300_000
+
+vitest.mock("google-auth-library", () => ({
+	GoogleAuth: vitest.fn().mockImplementation(function (opts) {
+		return { __googleAuthOptions: opts }
+	}),
+}))
+
 vitest.mock("@anthropic-ai/vertex-sdk", () => ({
 	AnthropicVertex: vitest.fn().mockImplementation(function () {
 		return {
@@ -56,6 +69,11 @@ describe("VertexHandler", () => {
 	let handler: AnthropicVertexHandler
 
 	describe("constructor", () => {
+		beforeEach(() => {
+			;(AnthropicVertex as any).mockClear()
+			;(GoogleAuth as any).mockClear()
+		})
+
 		it("should initialize with provided config for Claude", () => {
 			handler = new AnthropicVertexHandler({
 				apiModelId: "claude-3-5-sonnet-v2@20241022",
@@ -66,7 +84,58 @@ describe("VertexHandler", () => {
 			expect(AnthropicVertex).toHaveBeenCalledWith({
 				projectId: "test-project",
 				region: "us-central1",
+				timeout: MOCK_TIMEOUT_MS,
+			})
+		})
+
+		it("should pass timeout when initializing with vertexJsonCredentials", () => {
+			const credentials = {
+				type: "service_account",
+				client_email: "test@test-project.iam.gserviceaccount.com",
+				private_key: "-----BEGIN PRIVATE KEY-----\nfake\n-----END PRIVATE KEY-----\n",
+			}
+
+			handler = new AnthropicVertexHandler({
+				apiModelId: "claude-3-5-sonnet-v2@20241022",
+				vertexProjectId: "test-project",
+				vertexRegion: "us-central1",
+				vertexJsonCredentials: JSON.stringify(credentials),
 			})
+
+			expect(GoogleAuth).toHaveBeenCalledWith({
+				scopes: ["https://www.googleapis.com/auth/cloud-platform"],
+				credentials,
+			})
+			expect(AnthropicVertex).toHaveBeenCalledWith(
+				expect.objectContaining({
+					projectId: "test-project",
+					region: "us-central1",
+					googleAuth: expect.any(Object),
+					timeout: MOCK_TIMEOUT_MS,
+				}),
+			)
+		})
+
+		it("should pass timeout when initializing with vertexKeyFile", () => {
+			handler = new AnthropicVertexHandler({
+				apiModelId: "claude-3-5-sonnet-v2@20241022",
+				vertexProjectId: "test-project",
+				vertexRegion: "us-central1",
+				vertexKeyFile: "/tmp/sa-key.json",
+			})
+
+			expect(GoogleAuth).toHaveBeenCalledWith({
+				scopes: ["https://www.googleapis.com/auth/cloud-platform"],
+				keyFile: "/tmp/sa-key.json",
+			})
+			expect(AnthropicVertex).toHaveBeenCalledWith(
+				expect.objectContaining({
+					projectId: "test-project",
+					region: "us-central1",
+					googleAuth: expect.any(Object),
+					timeout: MOCK_TIMEOUT_MS,
+				}),
+			)
 		})
 	})
 

src/api/providers/__tests__/lite-llm.spec.ts

@@ -6,7 +6,13 @@ import { ApiHandlerOptions } from "../../../shared/api"
 import { litellmDefaultModelId, litellmDefaultModelInfo } from "@roo-code/types"
 
 // Mock vscode first to avoid import errors
-vi.mock("vscode", () => ({}))
+vi.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
+}))
 
 // Mock OpenAI
 const mockCreate = vi.fn()

src/api/providers/__tests__/openai.spec.ts

@@ -8,6 +8,12 @@ import { openAiModelInfoSaneDefaults, DEEP_SEEK_DEFAULT_TEMPERATURE } from "@roo
 import { Package } from "../../../shared/package"
 import axios from "axios"
 
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn().mockReturnValue(300_000),
+}))
+
+const MOCK_TIMEOUT_MS = 300_000
+
 const mockCreate = vitest.fn()
 
 vitest.mock("openai", () => {
@@ -117,7 +123,7 @@ describe("OpenAiHandler", () => {
 					"X-Title": "Zoo Code",
 					"User-Agent": `ZooCode/${Package.version}`,
 				},
-				timeout: expect.any(Number),
+				timeout: MOCK_TIMEOUT_MS,
 			})
 		})
 	})

src/api/providers/__tests__/opencode-go.spec.ts

@@ -1,7 +1,13 @@
 // npx vitest run src/api/providers/__tests__/opencode-go.spec.ts
 
 // Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
+vitest.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
+}))
 
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"

src/api/providers/__tests__/openrouter.spec.ts

@@ -1,6 +1,18 @@
 // pnpm --filter roo-cline test api/providers/__tests__/openrouter.spec.ts
 
-vitest.mock("vscode", () => ({}))
+vitest.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
+}))
+
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn().mockReturnValue(300_000),
+}))
+
+const MOCK_TIMEOUT_MS = 300_000
 
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
@@ -108,6 +120,7 @@ describe("OpenRouterHandler", () => {
 				"X-Title": "Zoo Code",
 				"User-Agent": `ZooCode/${Package.version}`,
 			},
+			timeout: MOCK_TIMEOUT_MS,
 		})
 	})
 

src/api/providers/__tests__/requesty.spec.ts

@@ -1,5 +1,11 @@
 // npx vitest run api/providers/__tests__/requesty.spec.ts
 
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn().mockReturnValue(300_000),
+}))
+
+const MOCK_TIMEOUT_MS = 300_000
+
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
@@ -82,6 +88,7 @@ describe("RequestyHandler", () => {
 				"X-Title": "Zoo Code",
 				"User-Agent": `ZooCode/${Package.version}`,
 			},
+			timeout: MOCK_TIMEOUT_MS,
 		})
 	})
 
@@ -97,6 +104,7 @@ describe("RequestyHandler", () => {
 				"X-Title": "Zoo Code",
 				"User-Agent": `ZooCode/${Package.version}`,
 			},
+			timeout: MOCK_TIMEOUT_MS,
 		})
 	})
 

src/api/providers/__tests__/vercel-ai-gateway.spec.ts

@@ -1,7 +1,13 @@
 // npx vitest run src/api/providers/__tests__/vercel-ai-gateway.spec.ts
 
 // Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
+vitest.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
+}))
 
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
@@ -118,6 +124,7 @@ describe("VercelAiGatewayHandler", () => {
 				"X-Title": "Zoo Code",
 				"User-Agent": expect.stringContaining("ZooCode/"),
 			}),
+			timeout: expect.any(Number),
 		})
 	})
 

src/api/providers/__tests__/vertex-credentials.spec.ts

@@ -2,7 +2,13 @@
 
 // Mock vscode first to avoid import errors when the provider stack pulls
 // transitive vscode-dependent modules during construction.
-vitest.mock("vscode", () => ({}))
+vitest.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
+}))
 
 vitest.mock("@roo-code/telemetry", () => ({
 	TelemetryService: {

src/api/providers/__tests__/vertex.spec.ts

@@ -1,7 +1,13 @@
 // npx vitest run src/api/providers/__tests__/vertex.spec.ts
 
 // Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
+vitest.mock("vscode", () => ({
+	workspace: {
+		getConfiguration: vitest.fn(() => ({
+			get: vitest.fn((key: string, defaultValue: any) => defaultValue),
+		})),
+	},
+}))
 
 const mockCaptureException = vitest.fn()
 

src/api/providers/__tests__/vscode-lm.spec.ts

@@ -18,6 +18,9 @@ vi.mock("vscode", () => {
 
 	return {
 		workspace: {
+			getConfiguration: vi.fn(() => ({
+				get: vi.fn((key: string, defaultValue: any) => defaultValue),
+			})),
 			onDidChangeConfiguration: vi.fn((_callback) => ({
 				dispose: vi.fn(),
 			})),

src/api/providers/__tests__/zoo-gateway.spec.ts

@@ -1,5 +1,11 @@
 // npx vitest run src/api/providers/__tests__/zoo-gateway.spec.ts
 
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn().mockReturnValue(300_000),
+}))
+
+const MOCK_TIMEOUT_MS = 300_000
+
 const { showErrorMessage, openExternal } = vitest.hoisted(() => ({
 	showErrorMessage: vitest.fn(async () => undefined as string | undefined),
 	openExternal: vitest.fn(async () => true),
@@ -9,6 +15,11 @@ vitest.mock("vscode", () => ({
 	window: { showErrorMessage },
 	env: { openExternal, uriScheme: "vscode", appName: "VS Code" },
 	Uri: { parse: (value: string) => ({ toString: () => value }) },
+	workspace: {
+		getConfiguration: () => ({
+			get: (_key: string, defaultValue?: unknown) => defaultValue,
+		}),
+	},
 }))
 
 vitest.mock("../../../i18n", () => ({
@@ -178,6 +189,7 @@ describe("ZooGatewayHandler", () => {
 					"X-Zoo-Editor": "vscode",
 					"X-Zoo-Extension-Version": Package.version,
 				}),
+				timeout: MOCK_TIMEOUT_MS,
 			})
 		})
 

src/api/providers/anthropic-vertex.ts

@@ -51,6 +51,7 @@ export class AnthropicVertexHandler extends BaseProvider implements SingleComple
 					scopes: ["https://www.googleapis.com/auth/cloud-platform"],
 					credentials: parsedVertexCredentials,
 				}),
+				timeout: this.timeoutMs,
 			})
 		} else if (this.options.vertexKeyFile) {
 			this.client = new AnthropicVertex({
@@ -60,9 +61,10 @@ export class AnthropicVertexHandler extends BaseProvider implements SingleComple
 					scopes: ["https://www.googleapis.com/auth/cloud-platform"],
 					keyFile: this.options.vertexKeyFile,
 				}),
+				timeout: this.timeoutMs,
 			})
 		} else {
-			this.client = new AnthropicVertex({ projectId, region })
+			this.client = new AnthropicVertex({ projectId, region, timeout: this.timeoutMs })
 		}
 	}
 

src/api/providers/anthropic.ts

@@ -44,6 +44,7 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 		this.client = new Anthropic({
 			baseURL: this.options.anthropicBaseUrl || undefined,
 			[apiKeyFieldName]: this.options.apiKey,
+			timeout: this.timeoutMs,
 		})
 	}
 

src/api/providers/base-openai-compatible-provider.ts

@@ -13,7 +13,6 @@ import { DEFAULT_HEADERS } from "./constants"
 import { BaseProvider } from "./base-provider"
 import { handleOpenAIError } from "./utils/openai-error-handler"
 import { calculateApiCostOpenAI } from "../../shared/cost"
-import { getApiRequestTimeout } from "./utils/timeout-config"
 import { extractReasoningFromDelta } from "./utils/extract-reasoning"
 
 type BaseOpenAiCompatibleProviderOptions<ModelName extends string> = ApiHandlerOptions & {
@@ -64,7 +63,7 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
 			baseURL,
 			apiKey: this.options.apiKey,
 			defaultHeaders: DEFAULT_HEADERS,
-			timeout: getApiRequestTimeout(),
+			timeout: this.timeoutMs,
 		})
 	}
 

src/api/providers/base-provider.ts

@@ -6,11 +6,14 @@ import type { ApiHandler, ApiHandlerCreateMessageMetadata } from "../index"
 import { ApiStream } from "../transform/stream"
 import { countTokens } from "../../utils/countTokens"
 import { isMcpTool } from "../../utils/mcp-name"
+import { getApiRequestTimeout } from "./utils/timeout-config"
 
 /**
  * Base class for API providers that implements common functionality.
  */
 export abstract class BaseProvider implements ApiHandler {
+	protected readonly timeoutMs: number = getApiRequestTimeout()
+
 	abstract createMessage(
 		systemPrompt: string,
 		messages: Anthropic.Messages.MessageParam[],

src/api/providers/lm-studio.ts

@@ -15,7 +15,6 @@ import { ApiStream } from "../transform/stream"
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
 import { getModelsFromCache } from "./fetchers/modelCache"
-import { getApiRequestTimeout } from "./utils/timeout-config"
 import { handleOpenAIError } from "./utils/openai-error-handler"
 
 export class LmStudioHandler extends BaseProvider implements SingleCompletionHandler {
@@ -33,7 +32,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 		this.client = new OpenAI({
 			baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/v1",
 			apiKey: apiKey,
-			timeout: getApiRequestTimeout(),
+			timeout: this.timeoutMs,
 		})
 	}
 

src/api/providers/minimax.ts

@@ -73,6 +73,7 @@ export class MiniMaxHandler extends BaseProvider implements SingleCompletionHand
 		this.client = new Anthropic({
 			baseURL,
 			apiKey: options.minimaxApiKey,
+			timeout: this.timeoutMs,
 		})
 	}
 

src/api/providers/openai-codex.ts

@@ -371,6 +371,7 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 						apiKey: accessToken,
 						baseURL: CODEX_API_BASE_URL,
 						defaultHeaders: codexHeaders,
+						timeout: this.timeoutMs,
 					})
 
 				const stream = (await (client as any).responses.create(requestBody, {