Merge branch 'main' into add_api_key_env_vars

Signed-off-by: Geoff Wilson <[email protected]>

Author: suprjinx

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Roo Code Changelog
 
+## [3.25.12] - 2025-08-12
+
+- Update: Claude Sonnet 4 context window configurable to 1 million tokens in Anthropic provider (thanks @daniel-lxs!)
+- Add: Minimal reasoning support to OpenRouter (thanks @daniel-lxs!)
+- Fix: Add configurable API request timeout for local providers (#6521 by @dabockster, PR by @app/roomote)
+- Fix: Add --no-sandbox flag to browser launch options (#6632 by @QuinsZouls, PR by @QuinsZouls)
+- Fix: Ensure JSON files respect .rooignore during indexing (#6690 by @evermoving, PR by @app/roomote)
+- Add: New Chutes provider models (#6698 by @fstandhartinger, PR by @app/roomote)
+- Add: OpenAI gpt-oss models to Amazon Bedrock dropdown (#6752 by @josh-clanton-powerschool, PR by @app/roomote)
+- Fix: Correct tool repetition detector to not block first tool call when limit is 1 (#6834 by @NaccOll, PR by @app/roomote)
+- Fix: Improve checkpoint service initialization handling (thanks @NaccOll!)
+- Update: Improve zh-TW Traditional Chinese locale (thanks @PeterDaveHello!)
+- Add: Task expand and collapse translations (thanks @app/roomote!)
+- Update: Exclude GPT-5 models from 20% context window output token cap (thanks @app/roomote!)
+- Fix: Truncate long model names in model selector to prevent overflow (thanks @app/roomote!)
+- Add: Requesty base url support (thanks @requesty-JohnCosta27!)
+
 ## [3.25.11] - 2025-08-11
 
 - Add: Native OpenAI provider support for Codex Mini model (#5386 by @KJ7LNW, PR by @daniel-lxs)

packages/types/src/provider-settings.ts

@@ -100,6 +100,7 @@ const anthropicSchema = apiModelIdProviderModelSchema.extend({
 	anthropicConfigUseEnvVars: z.boolean().optional(),
 	anthropicBaseUrl: z.string().optional(),
 	anthropicUseAuthToken: z.boolean().optional(),
+	anthropicBeta1MContext: z.boolean().optional(), // Enable 'context-1m-2025-08-07' beta for 1M context window
 })
 
 const claudeCodeSchema = apiModelIdProviderModelSchema.extend({

packages/types/src/providers/anthropic.ts

@@ -8,15 +8,25 @@ export const anthropicDefaultModelId: AnthropicModelId = "claude-sonnet-4-202505
 export const anthropicModels = {
 	"claude-sonnet-4-20250514": {
 		maxTokens: 64_000, // Overridden to 8k if `enableReasoningEffort` is false.
-		contextWindow: 200_000,
+		contextWindow: 200_000, // Default 200K, extendable to 1M with beta flag 'context-1m-2025-08-07'
 		supportsImages: true,
 		supportsComputerUse: true,
 		supportsPromptCache: true,
-		inputPrice: 3.0, // $3 per million input tokens
-		outputPrice: 15.0, // $15 per million output tokens
+		inputPrice: 3.0, // $3 per million input tokens (≤200K context)
+		outputPrice: 15.0, // $15 per million output tokens (≤200K context)
 		cacheWritesPrice: 3.75, // $3.75 per million tokens
 		cacheReadsPrice: 0.3, // $0.30 per million tokens
 		supportsReasoningBudget: true,
+		// Tiered pricing for extended context (requires beta flag 'context-1m-2025-08-07')
+		tiers: [
+			{
+				contextWindow: 1_000_000, // 1M tokens with beta flag
+				inputPrice: 6.0, // $6 per million input tokens (>200K context)
+				outputPrice: 22.5, // $22.50 per million output tokens (>200K context)
+				cacheWritesPrice: 7.5, // $7.50 per million tokens (>200K context)
+				cacheReadsPrice: 0.6, // $0.60 per million tokens (>200K context)
+			},
+		],
 	},
 	"claude-opus-4-1-20250805": {
 		maxTokens: 8192,

packages/types/src/providers/bedrock.ts

@@ -221,6 +221,26 @@ export const bedrockModels = {
 		inputPrice: 1.35,
 		outputPrice: 5.4,
 	},
+	"openai.gpt-oss-20b-1:0": {
+		maxTokens: 8192,
+		contextWindow: 128_000,
+		supportsImages: false,
+		supportsComputerUse: false,
+		supportsPromptCache: false,
+		inputPrice: 0.5,
+		outputPrice: 1.5,
+		description: "GPT-OSS 20B - Optimized for low latency and local/specialized use cases",
+	},
+	"openai.gpt-oss-120b-1:0": {
+		maxTokens: 8192,
+		contextWindow: 128_000,
+		supportsImages: false,
+		supportsComputerUse: false,
+		supportsPromptCache: false,
+		inputPrice: 2.0,
+		outputPrice: 6.0,
+		description: "GPT-OSS 120B - Production-ready, general-purpose, high-reasoning model",
+	},
 	"meta.llama3-3-70b-instruct-v1:0": {
 		maxTokens: 8192,
 		contextWindow: 128_000,

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

@@ -0,0 +1,91 @@
+// npx vitest run api/providers/__tests__/lm-studio-timeout.spec.ts
+
+import { LmStudioHandler } from "../lm-studio"
+import { ApiHandlerOptions } from "../../../shared/api"
+
+// Mock the timeout config utility
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn(),
+}))
+
+import { getApiRequestTimeout } from "../utils/timeout-config"
+
+// Mock OpenAI
+const mockOpenAIConstructor = vitest.fn()
+vitest.mock("openai", () => {
+	return {
+		__esModule: true,
+		default: vitest.fn().mockImplementation((config) => {
+			mockOpenAIConstructor(config)
+			return {
+				chat: {
+					completions: {
+						create: vitest.fn(),
+					},
+				},
+			}
+		}),
+	}
+})
+
+describe("LmStudioHandler timeout configuration", () => {
+	beforeEach(() => {
+		vitest.clearAllMocks()
+	})
+
+	it("should use default timeout of 600 seconds when no configuration is set", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(600000)
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			lmStudioModelId: "llama2",
+			lmStudioBaseUrl: "http://localhost:1234",
+		}
+
+		new LmStudioHandler(options)
+
+		expect(getApiRequestTimeout).toHaveBeenCalled()
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				baseURL: "http://localhost:1234/v1",
+				apiKey: "noop",
+				timeout: 600000, // 600 seconds in milliseconds
+			}),
+		)
+	})
+
+	it("should use custom timeout when configuration is set", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(1200000) // 20 minutes
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			lmStudioModelId: "llama2",
+			lmStudioBaseUrl: "http://localhost:1234",
+		}
+
+		new LmStudioHandler(options)
+
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				timeout: 1200000, // 1200 seconds in milliseconds
+			}),
+		)
+	})
+
+	it("should handle zero timeout (no timeout)", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(0)
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			lmStudioModelId: "llama2",
+		}
+
+		new LmStudioHandler(options)
+
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				timeout: 0, // No timeout
+			}),
+		)
+	})
+})

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

@@ -0,0 +1,108 @@
+// npx vitest run api/providers/__tests__/ollama-timeout.spec.ts
+
+import { OllamaHandler } from "../ollama"
+import { ApiHandlerOptions } from "../../../shared/api"
+
+// Mock the timeout config utility
+vitest.mock("../utils/timeout-config", () => ({
+	getApiRequestTimeout: vitest.fn(),
+}))
+
+import { getApiRequestTimeout } from "../utils/timeout-config"
+
+// Mock OpenAI
+const mockOpenAIConstructor = vitest.fn()
+vitest.mock("openai", () => {
+	return {
+		__esModule: true,
+		default: vitest.fn().mockImplementation((config) => {
+			mockOpenAIConstructor(config)
+			return {
+				chat: {
+					completions: {
+						create: vitest.fn(),
+					},
+				},
+			}
+		}),
+	}
+})
+
+describe("OllamaHandler timeout configuration", () => {
+	beforeEach(() => {
+		vitest.clearAllMocks()
+	})
+
+	it("should use default timeout of 600 seconds when no configuration is set", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(600000)
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			ollamaModelId: "llama2",
+			ollamaBaseUrl: "http://localhost:11434",
+		}
+
+		new OllamaHandler(options)
+
+		expect(getApiRequestTimeout).toHaveBeenCalled()
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				baseURL: "http://localhost:11434/v1",
+				apiKey: "ollama",
+				timeout: 600000, // 600 seconds in milliseconds
+			}),
+		)
+	})
+
+	it("should use custom timeout when configuration is set", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(3600000) // 1 hour
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			ollamaModelId: "llama2",
+		}
+
+		new OllamaHandler(options)
+
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				timeout: 3600000, // 3600 seconds in milliseconds
+			}),
+		)
+	})
+
+	it("should handle zero timeout (no timeout)", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(0)
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			ollamaModelId: "llama2",
+			ollamaBaseUrl: "http://localhost:11434",
+		}
+
+		new OllamaHandler(options)
+
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				timeout: 0, // No timeout
+			}),
+		)
+	})
+
+	it("should use default base URL when not provided", () => {
+		;(getApiRequestTimeout as any).mockReturnValue(600000)
+
+		const options: ApiHandlerOptions = {
+			apiModelId: "llama2",
+			ollamaModelId: "llama2",
+		}
+
+		new OllamaHandler(options)
+
+		expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+			expect.objectContaining({
+				baseURL: "http://localhost:11434/v1",
+			}),
+		)
+	})
+})