fix: match timeout behaviour with docs

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/groq.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import OpenAI from "openai"
 import { Anthropic } from "@anthropic-ai/sdk"
 

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

@@ -5,9 +5,6 @@ import { LiteLLMHandler } from "../lite-llm"
 import { ApiHandlerOptions } from "../../../shared/api"
 import { litellmDefaultModelId, litellmDefaultModelInfo } from "@roo-code/types"
 
-// Mock vscode first to avoid import errors
-vi.mock("vscode", () => ({}))
-
 // Mock OpenAI
 vi.mock("openai", () => {
 	const mockStream = {

src/api/providers/__tests__/lm-studio-timeout.spec.ts

@@ -72,7 +72,7 @@ describe("LmStudioHandler timeout configuration", () => {
 		)
 	})
 
-	it("should handle zero timeout (no timeout)", () => {
+	it("should handle zero timeout", () => {
 		;(getApiRequestTimeout as any).mockReturnValue(0)
 
 		const options: ApiHandlerOptions = {
@@ -84,7 +84,7 @@ describe("LmStudioHandler timeout configuration", () => {
 
 		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
 			expect.objectContaining({
-				timeout: 0, // No timeout
+				timeout: 0,
 			}),
 		)
 	})

src/api/providers/__tests__/ollama-timeout.spec.ts

@@ -84,7 +84,7 @@ describe("OllamaHandler timeout configuration", () => {
 
 		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
 			expect.objectContaining({
-				timeout: 0, // No timeout
+				timeout: 0,
 			}),
 		)
 	})

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

@@ -137,7 +137,7 @@ describe("OpenAiHandler timeout configuration", () => {
 
 		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
 			expect.objectContaining({
-				timeout: 0, // No timeout
+				timeout: 0,
 			}),
 		)
 	})

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/openrouter.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
@@ -65,6 +62,7 @@ describe("OpenRouterHandler", () => {
 				"X-Title": "Roo Code",
 				"User-Agent": `RooCode/${Package.version}`,
 			},
+			timeout: 600000,
 		})
 	})
 

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

@@ -62,6 +62,7 @@ describe("RequestyHandler", () => {
 				"X-Title": "Roo Code",
 				"User-Agent": `RooCode/${Package.version}`,
 			},
+			timeout: 600000,
 		})
 	})
 
@@ -77,6 +78,7 @@ describe("RequestyHandler", () => {
 				"X-Title": "Roo Code",
 				"User-Agent": `RooCode/${Package.version}`,
 			},
+			timeout: 600000,
 		})
 	})
 

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/sambanova.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import OpenAI from "openai"
 import { Anthropic } from "@anthropic-ai/sdk"
 

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/vercel-ai-gateway.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
@@ -102,6 +99,7 @@ describe("VercelAiGatewayHandler", () => {
 				"X-Title": "Roo Code",
 				"User-Agent": expect.stringContaining("RooCode/"),
 			}),
+			timeout: 600000,
 		})
 	})
 

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/vertex.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import { Anthropic } from "@anthropic-ai/sdk"
 
 import { ApiStreamChunk } from "../../transform/stream"

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

@@ -1,8 +1,5 @@
 // npx vitest run src/api/providers/__tests__/zai.spec.ts
 
-// Mock vscode first to avoid import errors
-vitest.mock("vscode", () => ({}))
-
 import OpenAI from "openai"
 import { Anthropic } from "@anthropic-ai/sdk"
 

src/api/providers/anthropic.ts

@@ -18,6 +18,7 @@ import { getModelParams } from "../transform/model-params"
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
 import { calculateApiCostAnthropic } from "../../shared/cost"
+import { getApiRequestTimeout } from "./utils/timeout-config"
 
 export class AnthropicHandler extends BaseProvider implements SingleCompletionHandler {
 	private options: ApiHandlerOptions
@@ -30,9 +31,12 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 		const apiKeyFieldName =
 			this.options.anthropicBaseUrl && this.options.anthropicUseAuthToken ? "authToken" : "apiKey"
 
+		const timeout = getApiRequestTimeout()
+
 		this.client = new Anthropic({
 			baseURL: this.options.anthropicBaseUrl || undefined,
 			[apiKeyFieldName]: this.options.apiKey,
+			timeout,
 		})
 	}
 

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

@@ -9,6 +9,7 @@ import { convertToOpenAiMessages } from "../transform/openai-format"
 
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
 import { DEFAULT_HEADERS } from "./constants"
+import { getApiRequestTimeout } from "./utils/timeout-config"
 import { BaseProvider } from "./base-provider"
 import { handleOpenAIError } from "./utils/openai-error-handler"
 
@@ -56,10 +57,13 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
 			throw new Error("API key is required")
 		}
 
+		const timeout = getApiRequestTimeout()
+
 		this.client = new OpenAI({
 			baseURL,
 			apiKey: this.options.apiKey,
 			defaultHeaders: DEFAULT_HEADERS,
+			timeout,
 		})
 	}
 

src/api/providers/bedrock.ts

@@ -33,6 +33,7 @@ import { convertToBedrockConverseMessages as sharedConverter } from "../transfor
 import { getModelParams } from "../transform/model-params"
 import { shouldUseReasoningBudget } from "../../shared/api"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
+import { getApiRequestTimeout } from "./utils/timeout-config"
 
 /************************************************************************************
  *
@@ -401,17 +402,17 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 			...(thinkingEnabled && { anthropic_version: "bedrock-2023-05-31" }),
 		}
 
-		// Create AbortController with 10 minute timeout
+		// Create AbortController with configured timeout
 		const controller = new AbortController()
 		let timeoutId: NodeJS.Timeout | undefined
+		const timeoutMs = getApiRequestTimeout()
 
 		try {
-			timeoutId = setTimeout(
-				() => {
+			if (timeoutMs !== 0) {
+				timeoutId = setTimeout(() => {
 					controller.abort()
-				},
-				10 * 60 * 1000,
-			)
+				}, timeoutMs)
+			}
 
 			const command = new ConverseStreamCommand(payload)
 			const response = await this.client.send(command, {
@@ -670,8 +671,18 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 				inferenceConfig,
 			}
 
+			const controller = new AbortController()
+			let timeoutId: NodeJS.Timeout | undefined
+			const timeoutMs = getApiRequestTimeout()
+
+			if (timeoutMs !== 0) {
+				timeoutId = setTimeout(() => {
+					controller.abort()
+				}, timeoutMs)
+			}
+
 			const command = new ConverseCommand(payload)
-			const response = await this.client.send(command)
+			const response = await this.client.send(command, { abortSignal: controller.signal })
 
 			if (
 				response?.output?.message?.content &&
@@ -680,6 +691,7 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 				response.output.message.content[0].text.trim().length > 0
 			) {
 				try {
+					if (timeoutId) clearTimeout(timeoutId)
 					return response.output.message.content[0].text
 				} catch (parseError) {
 					logger.error("Failed to parse Bedrock response", {
@@ -688,6 +700,7 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 					})
 				}
 			}
+			if (timeoutId) clearTimeout(timeoutId)
 			return ""
 		} catch (error) {
 			// Use the extracted error handling method for all errors