Add Sonnet 1M context checkbox (#7032)

Author: mrubens

packages/types/src/provider-settings.ts

@@ -3,6 +3,9 @@ import { z } from "zod"
 import { reasoningEffortsSchema, verbosityLevelsSchema, modelInfoSchema } from "./model.js"
 import { codebaseIndexProviderSchema } from "./codebase-index.js"
 
+// Bedrock Claude Sonnet 4 model ID that supports 1M context
+export const BEDROCK_CLAUDE_SONNET_4_MODEL_ID = "anthropic.claude-sonnet-4-20250514-v1:0"
+
 // Extended schema that includes "minimal" for GPT-5 models
 export const extendedReasoningEffortsSchema = z.union([reasoningEffortsSchema, z.literal("minimal")])
 
@@ -135,6 +138,7 @@ const bedrockSchema = apiModelIdProviderModelSchema.extend({
 	awsModelContextWindow: z.number().optional(),
 	awsBedrockEndpointEnabled: z.boolean().optional(),
 	awsBedrockEndpoint: z.string().optional(),
+	awsBedrock1MContext: z.boolean().optional(), // Enable 'context-1m-2025-08-07' beta for 1M context window
 })
 
 const vertexSchema = apiModelIdProviderModelSchema.extend({

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

@@ -25,6 +25,7 @@ vi.mock("@aws-sdk/client-bedrock-runtime", () => {
 
 import { AwsBedrockHandler } from "../bedrock"
 import { ConverseStreamCommand, BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime"
+import { BEDROCK_CLAUDE_SONNET_4_MODEL_ID } from "@roo-code/types"
 
 import type { Anthropic } from "@anthropic-ai/sdk"
 
@@ -564,4 +565,184 @@ describe("AwsBedrockHandler", () => {
 			expect(typeof model.info.supportsPromptCache).toBe("boolean")
 		})
 	})
+
+	describe("1M context beta feature", () => {
+		it("should enable 1M context window when awsBedrock1MContext is true for Claude Sonnet 4", () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: true,
+			})
+
+			const model = handler.getModel()
+
+			// Should have 1M context window when enabled
+			expect(model.info.contextWindow).toBe(1_000_000)
+		})
+
+		it("should use default context window when awsBedrock1MContext is false for Claude Sonnet 4", () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: false,
+			})
+
+			const model = handler.getModel()
+
+			// Should use default context window (200k)
+			expect(model.info.contextWindow).toBe(200_000)
+		})
+
+		it("should not affect context window for non-Claude Sonnet 4 models", () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: true,
+			})
+
+			const model = handler.getModel()
+
+			// Should use default context window for non-Sonnet 4 models
+			expect(model.info.contextWindow).toBe(200_000)
+		})
+
+		it("should include anthropic_beta parameter when 1M context is enabled", async () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: true,
+			})
+
+			const messages: Anthropic.Messages.MessageParam[] = [
+				{
+					role: "user",
+					content: "Test message",
+				},
+			]
+
+			const generator = handler.createMessage("", messages)
+			await generator.next() // Start the generator
+
+			// Verify the command was created with the right payload
+			expect(mockConverseStreamCommand).toHaveBeenCalled()
+			const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
+
+			// Should include anthropic_beta parameter but NOT anthropic_version (only for thinking)
+			expect(commandArg.anthropic_beta).toEqual(["context-1m-2025-08-07"])
+			expect(commandArg.anthropic_version).toBeUndefined()
+		})
+
+		it("should not include anthropic_beta parameter when 1M context is disabled", async () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: false,
+			})
+
+			const messages: Anthropic.Messages.MessageParam[] = [
+				{
+					role: "user",
+					content: "Test message",
+				},
+			]
+
+			const generator = handler.createMessage("", messages)
+			await generator.next() // Start the generator
+
+			// Verify the command was created with the right payload
+			expect(mockConverseStreamCommand).toHaveBeenCalled()
+			const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
+
+			// Should not include anthropic_beta parameter
+			expect(commandArg.anthropic_beta).toBeUndefined()
+		})
+
+		it("should not include anthropic_beta parameter for non-Claude Sonnet 4 models", async () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsBedrock1MContext: true,
+			})
+
+			const messages: Anthropic.Messages.MessageParam[] = [
+				{
+					role: "user",
+					content: "Test message",
+				},
+			]
+
+			const generator = handler.createMessage("", messages)
+			await generator.next() // Start the generator
+
+			// Verify the command was created with the right payload
+			expect(mockConverseStreamCommand).toHaveBeenCalled()
+			const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
+
+			// Should not include anthropic_beta parameter for non-Sonnet 4 models
+			expect(commandArg.anthropic_beta).toBeUndefined()
+		})
+
+		it("should enable 1M context window with cross-region inference for Claude Sonnet 4", () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsUseCrossRegionInference: true,
+				awsBedrock1MContext: true,
+			})
+
+			const model = handler.getModel()
+
+			// Should have 1M context window even with cross-region prefix
+			expect(model.info.contextWindow).toBe(1_000_000)
+			// Model ID should have cross-region prefix
+			expect(model.id).toBe(`us.${BEDROCK_CLAUDE_SONNET_4_MODEL_ID}`)
+		})
+
+		it("should include anthropic_beta parameter with cross-region inference for Claude Sonnet 4", async () => {
+			const handler = new AwsBedrockHandler({
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsAccessKey: "test",
+				awsSecretKey: "test",
+				awsRegion: "us-east-1",
+				awsUseCrossRegionInference: true,
+				awsBedrock1MContext: true,
+			})
+
+			const messages: Anthropic.Messages.MessageParam[] = [
+				{
+					role: "user",
+					content: "Test message",
+				},
+			]
+
+			const generator = handler.createMessage("", messages)
+			await generator.next() // Start the generator
+
+			// Verify the command was created with the right payload
+			expect(mockConverseStreamCommand).toHaveBeenCalled()
+			const commandArg = mockConverseStreamCommand.mock.calls[
+				mockConverseStreamCommand.mock.calls.length - 1
+			][0] as any
+
+			// Should include anthropic_beta parameter but NOT anthropic_version (only for thinking)
+			expect(commandArg.anthropic_beta).toEqual(["context-1m-2025-08-07"])
+			expect(commandArg.anthropic_version).toBeUndefined()
+			// Model ID should have cross-region prefix
+			expect(commandArg.modelId).toBe(`us.${BEDROCK_CLAUDE_SONNET_4_MODEL_ID}`)
+		})
+	})
 })

src/api/providers/bedrock.ts

@@ -21,6 +21,7 @@ import {
 	BEDROCK_MAX_TOKENS,
 	BEDROCK_DEFAULT_CONTEXT,
 	AWS_INFERENCE_PROFILE_MAPPING,
+	BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
 } from "@roo-code/types"
 
 import { ApiStream } from "../transform/stream"
@@ -62,6 +63,7 @@ interface BedrockPayload {
 	system?: SystemContentBlock[]
 	inferenceConfig: BedrockInferenceConfig
 	anthropic_version?: string
+	anthropic_beta?: string[]
 	additionalModelRequestFields?: BedrockThinkingConfig
 }
 
@@ -375,6 +377,11 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 			inferenceConfig.topP = 0.1
 		}
 
+		// Check if 1M context is enabled for Claude Sonnet 4
+		// Use parseBaseModelId to handle cross-region inference prefixes
+		const baseModelId = this.parseBaseModelId(modelConfig.id)
+		const is1MContextEnabled = baseModelId === BEDROCK_CLAUDE_SONNET_4_MODEL_ID && this.options.awsBedrock1MContext
+
 		const payload: BedrockPayload = {
 			modelId: modelConfig.id,
 			messages: formatted.messages,
@@ -383,6 +390,8 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 			...(additionalModelRequestFields && { additionalModelRequestFields }),
 			// Add anthropic_version when using thinking features
 			...(thinkingEnabled && { anthropic_version: "bedrock-2023-05-31" }),
+			// Add anthropic_beta when 1M context is enabled
+			...(is1MContextEnabled && { anthropic_beta: ["context-1m-2025-08-07"] }),
 		}
 
 		// Create AbortController with 10 minute timeout
@@ -960,6 +969,17 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 			}
 		}
 
+		// Check if 1M context is enabled for Claude Sonnet 4
+		// Use parseBaseModelId to handle cross-region inference prefixes
+		const baseModelId = this.parseBaseModelId(modelConfig.id)
+		if (baseModelId === BEDROCK_CLAUDE_SONNET_4_MODEL_ID && this.options.awsBedrock1MContext) {
+			// Update context window to 1M tokens when 1M context beta is enabled
+			modelConfig.info = {
+				...modelConfig.info,
+				contextWindow: 1_000_000,
+			}
+		}
+
 		// Get model params including reasoning configuration
 		const params = getModelParams({
 			format: "anthropic",

webview-ui/src/components/settings/providers/Bedrock.tsx

@@ -2,7 +2,12 @@ import { useCallback, useState, useEffect } from "react"
 import { Checkbox } from "vscrui"
 import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 
-import { type ProviderSettings, type ModelInfo, BEDROCK_REGIONS } from "@roo-code/types"
+import {
+	type ProviderSettings,
+	type ModelInfo,
+	BEDROCK_REGIONS,
+	BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+} from "@roo-code/types"
 
 import { useAppTranslation } from "@src/i18n/TranslationContext"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, StandardTooltip } from "@src/components/ui"
@@ -19,6 +24,9 @@ export const Bedrock = ({ apiConfiguration, setApiConfigurationField, selectedMo
 	const { t } = useAppTranslation()
 	const [awsEndpointSelected, setAwsEndpointSelected] = useState(!!apiConfiguration?.awsBedrockEndpointEnabled)
 
+	// Check if the selected model supports 1M context (Claude Sonnet 4)
+	const supports1MContextBeta = apiConfiguration?.apiModelId === BEDROCK_CLAUDE_SONNET_4_MODEL_ID
+
 	// Update the endpoint enabled state when the configuration changes
 	useEffect(() => {
 		setAwsEndpointSelected(!!apiConfiguration?.awsBedrockEndpointEnabled)
@@ -159,6 +167,20 @@ export const Bedrock = ({ apiConfiguration, setApiConfigurationField, selectedMo
 					</div>
 				</>
 			)}
+			{supports1MContextBeta && (
+				<div>
+					<Checkbox
+						checked={apiConfiguration?.awsBedrock1MContext ?? false}
+						onChange={(checked: boolean) => {
+							setApiConfigurationField("awsBedrock1MContext", checked)
+						}}>
+						{t("settings:providers.awsBedrock1MContextBetaLabel")}
+					</Checkbox>
+					<div className="text-sm text-vscode-descriptionForeground mt-1 ml-6">
+						{t("settings:providers.awsBedrock1MContextBetaDescription")}
+					</div>
+				</div>
+			)}
 			<Checkbox
 				checked={awsEndpointSelected}
 				onChange={(isChecked) => {

webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts

@@ -5,7 +5,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 import { renderHook } from "@testing-library/react"
 import type { Mock } from "vitest"
 
-import { ProviderSettings, ModelInfo } from "@roo-code/types"
+import { ProviderSettings, ModelInfo, BEDROCK_CLAUDE_SONNET_4_MODEL_ID } from "@roo-code/types"
 
 import { useSelectedModel } from "../useSelectedModel"
 import { useRouterModels } from "../useRouterModels"
@@ -448,4 +448,69 @@ describe("useSelectedModel", () => {
 			expect(result.current.info?.supportsImages).toBe(false)
 		})
 	})
+
+	describe("bedrock provider with 1M context", () => {
+		beforeEach(() => {
+			mockUseRouterModels.mockReturnValue({
+				data: {
+					openrouter: {},
+					requesty: {},
+					glama: {},
+					unbound: {},
+					litellm: {},
+					"io-intelligence": {},
+				},
+				isLoading: false,
+				isError: false,
+			} as any)
+
+			mockUseOpenRouterModelProviders.mockReturnValue({
+				data: {},
+				isLoading: false,
+				isError: false,
+			} as any)
+		})
+
+		it("should enable 1M context window for Bedrock Claude Sonnet 4 when awsBedrock1MContext is true", () => {
+			const apiConfiguration: ProviderSettings = {
+				apiProvider: "bedrock",
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsBedrock1MContext: true,
+			}
+
+			const wrapper = createWrapper()
+			const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
+
+			expect(result.current.id).toBe(BEDROCK_CLAUDE_SONNET_4_MODEL_ID)
+			expect(result.current.info?.contextWindow).toBe(1_000_000)
+		})
+
+		it("should use default context window for Bedrock Claude Sonnet 4 when awsBedrock1MContext is false", () => {
+			const apiConfiguration: ProviderSettings = {
+				apiProvider: "bedrock",
+				apiModelId: BEDROCK_CLAUDE_SONNET_4_MODEL_ID,
+				awsBedrock1MContext: false,
+			}
+
+			const wrapper = createWrapper()
+			const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
+
+			expect(result.current.id).toBe(BEDROCK_CLAUDE_SONNET_4_MODEL_ID)
+			expect(result.current.info?.contextWindow).toBe(200_000)
+		})
+
+		it("should not affect context window for non-Claude Sonnet 4 Bedrock models", () => {
+			const apiConfiguration: ProviderSettings = {
+				apiProvider: "bedrock",
+				apiModelId: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+				awsBedrock1MContext: true,
+			}
+
+			const wrapper = createWrapper()
+			const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
+
+			expect(result.current.id).toBe("anthropic.claude-3-5-sonnet-20241022-v2:0")
+			expect(result.current.info?.contextWindow).toBe(200_000)
+		})
+	})
 })