Roo to main

apps/web-evals/package.json

@@ -35,7 +35,7 @@
 		"cmdk": "^1.1.0",
 		"fuzzysort": "^3.1.0",
 		"lucide-react": "^0.518.0",
-		"next": "~15.2.6",
+		"next": "~15.2.8",
 		"next-themes": "^0.4.6",
 		"p-map": "^7.0.3",
 		"react": "^18.3.1",

apps/web-roo-code/package.json

@@ -25,7 +25,7 @@
 		"embla-carousel-react": "^8.6.0",
 		"framer-motion": "12.15.0",
 		"lucide-react": "^0.518.0",
-		"next": "~15.2.6",
+		"next": "~15.2.8",
 		"next-themes": "^0.4.6",
 		"posthog-js": "^1.248.1",
 		"react": "^18.3.1",

packages/types/src/providers/gemini.ts

@@ -3,7 +3,7 @@ import type { ModelInfo } from "../model.js"
 // https://ai.google.dev/gemini-api/docs/models/gemini
 export type GeminiModelId = keyof typeof geminiModels
 
-export const geminiDefaultModelId: GeminiModelId = "gemini-2.5-pro"
+export const geminiDefaultModelId: GeminiModelId = "gemini-3-pro-preview"
 
 export const geminiModels = {
 	"gemini-3-pro-preview": {
@@ -32,6 +32,22 @@ export const geminiModels = {
 			},
 		],
 	},
+	"gemini-3-flash-preview": {
+		maxTokens: 65_536,
+		contextWindow: 1_048_576,
+		supportsImages: true,
+		supportsNativeTools: true,
+		defaultToolProtocol: "native",
+		supportsPromptCache: true,
+		supportsReasoningEffort: ["minimal", "low", "medium", "high"],
+		reasoningEffort: "medium",
+		supportsTemperature: true,
+		defaultTemperature: 1,
+		inputPrice: 0.3,
+		outputPrice: 2.5,
+		cacheReadsPrice: 0.075,
+		cacheWritesPrice: 1.0,
+	},
 	// 2.5 Pro models
 	"gemini-2.5-pro": {
 		maxTokens: 64_000,

packages/types/src/providers/vertex.ts

@@ -32,6 +32,22 @@ export const vertexModels = {
 			},
 		],
 	},
+	"gemini-3-flash-preview": {
+		maxTokens: 65_536,
+		contextWindow: 1_048_576,
+		supportsImages: true,
+		supportsNativeTools: true,
+		defaultToolProtocol: "native",
+		supportsPromptCache: true,
+		supportsReasoningEffort: ["minimal", "low", "medium", "high"],
+		reasoningEffort: "medium",
+		supportsTemperature: true,
+		defaultTemperature: 1,
+		inputPrice: 0.3,
+		outputPrice: 2.5,
+		cacheReadsPrice: 0.075,
+		cacheWritesPrice: 1.0,
+	},
 	"gemini-2.5-flash-preview-05-20:thinking": {
 		maxTokens: 65_535,
 		contextWindow: 1_048_576,

src/api/providers/deepseek.ts

@@ -54,7 +54,13 @@ export class DeepSeekHandler extends OpenAiHandler {
 
 		// Convert messages to R1 format (merges consecutive same-role messages)
 		// This is required for DeepSeek which does not support successive messages with the same role
-		const convertedMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
+		// For thinking models (deepseek-reasoner), enable mergeToolResultText to preserve reasoning_content
+		// during tool call sequences. Without this, environment_details text after tool_results would
+		// create user messages that cause DeepSeek to drop all previous reasoning_content.
+		// See: https://api-docs.deepseek.com/guides/thinking_mode
+		const convertedMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages], {
+			mergeToolResultText: isThinkingModel,
+		})
 
 		const requestOptions: DeepSeekChatCompletionParams = {
 			model: modelId,

src/api/transform/__tests__/bedrock-converse-format.spec.ts

@@ -141,10 +141,10 @@ describe("convertToBedrockConverseMessages", () => {
 		}
 	})
 
-	it("converts tool result messages correctly", () => {
+	it("converts tool result messages to XML text format (default, useNativeTools: false)", () => {
 		const messages: Anthropic.Messages.MessageParam[] = [
 			{
-				role: "assistant",
+				role: "user",
 				content: [
 					{
 						type: "tool_result",
@@ -155,14 +155,50 @@ describe("convertToBedrockConverseMessages", () => {
 			},
 		]
 
+		// Default behavior (useNativeTools: false) converts tool_result to XML text format
+		// This fixes the Bedrock error "toolConfig field must be defined when using toolUse and toolResult content blocks"
 		const result = convertToBedrockConverseMessages(messages)
 
 		if (!result[0] || !result[0].content) {
 			expect.fail("Expected result to have content")
 			return
 		}
 
-		expect(result[0].role).toBe("assistant")
+		expect(result[0].role).toBe("user")
+		const textBlock = result[0].content[0] as ContentBlock
+		if ("text" in textBlock) {
+			expect(textBlock.text).toContain("<tool_result>")
+			expect(textBlock.text).toContain("<tool_use_id>test-id</tool_use_id>")
+			expect(textBlock.text).toContain("File contents here")
+			expect(textBlock.text).toContain("</tool_result>")
+		} else {
+			expect.fail("Expected text block with XML content not found")
+		}
+	})
+
+	it("converts tool result messages to native format (useNativeTools: true)", () => {
+		const messages: Anthropic.Messages.MessageParam[] = [
+			{
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "test-id",
+						content: [{ type: "text", text: "File contents here" }],
+					},
+				],
+			},
+		]
+
+		// With useNativeTools: true, keeps tool_result as native format
+		const result = convertToBedrockConverseMessages(messages, { useNativeTools: true })
+
+		if (!result[0] || !result[0].content) {
+			expect.fail("Expected result to have content")
+			return
+		}
+
+		expect(result[0].role).toBe("user")
 		const resultBlock = result[0].content[0] as ContentBlock
 		if ("toolResult" in resultBlock && resultBlock.toolResult) {
 			const expectedContent: ToolResultContentBlock[] = [{ text: "File contents here" }]
@@ -176,7 +212,7 @@ describe("convertToBedrockConverseMessages", () => {
 		}
 	})
 
-	it("converts tool result messages with string content correctly", () => {
+	it("converts tool result messages with string content to XML text format (default)", () => {
 		const messages: Anthropic.Messages.MessageParam[] = [
 			{
 				role: "user",
@@ -197,6 +233,39 @@ describe("convertToBedrockConverseMessages", () => {
 			return
 		}
 
+		expect(result[0].role).toBe("user")
+		const textBlock = result[0].content[0] as ContentBlock
+		if ("text" in textBlock) {
+			expect(textBlock.text).toContain("<tool_result>")
+			expect(textBlock.text).toContain("<tool_use_id>test-id</tool_use_id>")
+			expect(textBlock.text).toContain("File: test.txt")
+			expect(textBlock.text).toContain("Hello World")
+		} else {
+			expect.fail("Expected text block with XML content not found")
+		}
+	})
+
+	it("converts tool result messages with string content to native format (useNativeTools: true)", () => {
+		const messages: Anthropic.Messages.MessageParam[] = [
+			{
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "test-id",
+						content: "File: test.txt\nLines 1-5:\nHello World",
+					} as any, // Anthropic types don't allow string content but runtime can have it
+				],
+			},
+		]
+
+		const result = convertToBedrockConverseMessages(messages, { useNativeTools: true })
+
+		if (!result[0] || !result[0].content) {
+			expect.fail("Expected result to have content")
+			return
+		}
+
 		expect(result[0].role).toBe("user")
 		const resultBlock = result[0].content[0] as ContentBlock
 		if ("toolResult" in resultBlock && resultBlock.toolResult) {
@@ -210,6 +279,56 @@ describe("convertToBedrockConverseMessages", () => {
 		}
 	})
 
+	it("converts both tool_use and tool_result consistently when native tools disabled", () => {
+		// This test ensures tool_use AND tool_result are both converted to XML text
+		// when useNativeTools is false, preventing Bedrock toolConfig errors
+		const messages: Anthropic.Messages.MessageParam[] = [
+			{
+				role: "assistant",
+				content: [
+					{
+						type: "tool_use",
+						id: "call-123",
+						name: "read_file",
+						input: { path: "test.txt" },
+					},
+				],
+			},
+			{
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "call-123",
+						content: "File contents here",
+					} as any,
+				],
+			},
+		]
+
+		const result = convertToBedrockConverseMessages(messages) // default useNativeTools: false
+
+		// Both should be text blocks, not native toolUse/toolResult
+		const assistantContent = result[0]?.content?.[0] as ContentBlock
+		const userContent = result[1]?.content?.[0] as ContentBlock
+
+		// tool_use should be XML text
+		expect("text" in assistantContent).toBe(true)
+		if ("text" in assistantContent) {
+			expect(assistantContent.text).toContain("<tool_use>")
+		}
+
+		// tool_result should also be XML text (this is what the fix addresses)
+		expect("text" in userContent).toBe(true)
+		if ("text" in userContent) {
+			expect(userContent.text).toContain("<tool_result>")
+		}
+
+		// Neither should have native format
+		expect("toolUse" in assistantContent).toBe(false)
+		expect("toolResult" in userContent).toBe(false)
+	})
+
 	it("handles text content correctly", () => {
 		const messages: Anthropic.Messages.MessageParam[] = [
 			{