Roo to main

packages/cloud/src/WebAuthService.ts

@@ -331,10 +331,15 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A
 
 			await this.storeCredentials(credentials)
 
-			// Store the provider model if provided
+			// Store the provider model if provided, or flag that no model was selected
 			if (providerModel) {
 				await this.context.globalState.update("roo-provider-model", providerModel)
+				await this.context.globalState.update("roo-auth-skip-model", undefined)
 				this.log(`[auth] Stored provider model: ${providerModel}`)
+			} else {
+				// No model was selected during signup - flag this for the webview
+				await this.context.globalState.update("roo-auth-skip-model", true)
+				this.log(`[auth] No provider model selected during signup`)
 			}
 
 			const vscode = await importVscode()

packages/cloud/src/__tests__/WebAuthService.spec.ts

@@ -395,9 +395,38 @@ describe("WebAuthService", () => {
 			await authService.handleCallback("auth-code", storedState, null, "xai/grok-code-fast-1")
 
 			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-provider-model", "xai/grok-code-fast-1")
+			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-auth-skip-model", undefined)
 			expect(mockLog).toHaveBeenCalledWith("[auth] Stored provider model: xai/grok-code-fast-1")
 		})
 
+		it("should set skip model flag when provider model is NOT provided in callback", async () => {
+			const storedState = "valid-state"
+			mockContext.globalState.get.mockReturnValue(storedState)
+
+			// Mock successful Clerk sign-in response
+			const mockResponse = {
+				ok: true,
+				json: () =>
+					Promise.resolve({
+						response: { created_session_id: "session-123" },
+					}),
+				headers: {
+					get: (header: string) => (header === "authorization" ? "Bearer token-123" : null),
+				},
+			}
+			mockFetch.mockResolvedValue(mockResponse)
+
+			const vscode = await import("vscode")
+			const mockShowInfo = vi.fn()
+			vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo)
+
+			// Call without provider model
+			await authService.handleCallback("auth-code", storedState, null)
+
+			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-auth-skip-model", true)
+			expect(mockLog).toHaveBeenCalledWith("[auth] No provider model selected during signup")
+		})
+
 		it("should handle Clerk API errors", async () => {
 			const storedState = "valid-state"
 			mockContext.globalState.get.mockReturnValue(storedState)

packages/types/npm/package.metadata.json

@@ -1,6 +1,6 @@
 {
 	"name": "@roo-code/types",
-	"version": "1.94.0",
+	"version": "1.95.0",
 	"description": "TypeScript type definitions for Roo Code.",
 	"publishConfig": {
 		"access": "public",

packages/types/src/providers/zgsm.ts

@@ -8,7 +8,7 @@ export const zgsmModels = {
 		contextWindow: 128_000,
 		maxTokensKey: undefined,
 		supportsImages: false,
-		supportsNativeTools: true,
+		supportsNativeTools: undefined,
 		supportsComputerUse: false,
 		supportsPromptCache: true,
 		supportsReasoningBudget: false,

src/api/providers/__tests__/openai-native-tools.spec.ts

@@ -0,0 +1,77 @@
+import OpenAI from "openai"
+
+import { OpenAiHandler } from "../openai"
+
+describe("OpenAiHandler native tools", () => {
+	it("includes tools in request when custom model info lacks supportsNativeTools (regression test)", async () => {
+		const mockCreate = vi.fn().mockImplementationOnce(() => ({
+			[Symbol.asyncIterator]: async function* () {
+				yield {
+					choices: [{ delta: { content: "Test response" } }],
+				}
+			},
+		}))
+
+		// Set openAiCustomModelInfo WITHOUT supportsNativeTools to simulate
+		// a user-provided custom model info that doesn't specify native tool support.
+		// The getModel() fix should merge NATIVE_TOOL_DEFAULTS to ensure
+		// supportsNativeTools defaults to true.
+		const handler = new OpenAiHandler({
+			openAiApiKey: "test-key",
+			openAiBaseUrl: "https://example.com/v1",
+			openAiModelId: "test-model",
+			openAiCustomModelInfo: {
+				maxTokens: 4096,
+				contextWindow: 128000,
+			},
+		} as unknown as import("../../../shared/api").ApiHandlerOptions)
+
+		// Patch the OpenAI client call
+		const mockClient = {
+			chat: {
+				completions: {
+					create: mockCreate,
+				},
+			},
+		} as unknown as OpenAI
+		;(handler as unknown as { client: OpenAI }).client = mockClient
+
+		const tools: OpenAI.Chat.ChatCompletionTool[] = [
+			{
+				type: "function",
+				function: {
+					name: "test_tool",
+					description: "test",
+					parameters: { type: "object", properties: {} },
+				},
+			},
+		]
+
+		// Mimic the behavior in Task.attemptApiRequest() where tools are only
+		// included when modelInfo.supportsNativeTools is true. This is the
+		// actual regression path being tested - without the getModel() fix,
+		// supportsNativeTools would be undefined and tools wouldn't be passed.
+		const modelInfo = handler.getModel().info
+		const supportsNativeTools = modelInfo.supportsNativeTools ?? false
+
+		const stream = handler.createMessage("system", [], {
+			taskId: "test-task-id",
+			...(supportsNativeTools && { tools }),
+			...(supportsNativeTools && { toolProtocol: "native" as const }),
+		})
+		await stream.next()
+
+		expect(mockCreate).toHaveBeenCalledWith(
+			expect.objectContaining({
+				tools: expect.arrayContaining([
+					expect.objectContaining({
+						type: "function",
+						function: expect.objectContaining({ name: "test_tool" }),
+					}),
+				]),
+				parallel_tool_calls: false,
+			}),
+			expect.anything(),
+		)
+	})
+})

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

@@ -90,7 +90,13 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
 			model,
 			max_tokens,
 			temperature,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			// Enable mergeToolResultText to merge environment_details and other text content
+			// after tool_results into the last tool message. This prevents reasoning/thinking
+			// models from dropping reasoning_content when they see a user message after tool results.
+			messages: [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
+			],
 			stream: true,
 			stream_options: { include_usage: true },
 			...(metadata?.tools && { tools: this.convertToolsForOpenAI(metadata.tools) }),

src/api/providers/cerebras.ts

@@ -106,7 +106,7 @@ export class CerebrasHandler extends BaseProvider implements SingleCompletionHan
 			supportsNativeTools && metadata?.tools && metadata.tools.length > 0 && metadata?.toolProtocol !== "xml"
 
 		// Convert Anthropic messages to OpenAI format (Cerebras is OpenAI-compatible)
-		const openaiMessages = convertToOpenAiMessages(messages)
+		const openaiMessages = convertToOpenAiMessages(messages, { mergeToolResultText: true })
 
 		// Prepare request body following Cerebras API specification exactly
 		const requestBody: Record<string, any> = {

src/api/providers/chutes.ts

@@ -44,7 +44,10 @@ export class ChutesHandler extends RouterProvider implements SingleCompletionHan
 		const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
 			model,
 			max_tokens,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			messages: [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
+			],
 			stream: true,
 			stream_options: { include_usage: true },
 			...(metadata?.tools && { tools: metadata.tools }),

src/api/providers/deepinfra.ts

@@ -72,7 +72,10 @@ export class DeepInfraHandler extends RouterProvider implements SingleCompletion
 
 		const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
 			model: modelId,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			messages: [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
+			],
 			stream: true,
 			stream_options: { include_usage: true },
 			reasoning_effort,

src/api/providers/featherless.ts

@@ -44,7 +44,10 @@ export class FeatherlessHandler extends BaseOpenAiCompatibleProvider<Featherless
 			model,
 			max_tokens,
 			temperature,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			messages: [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
+			],
 			stream: true,
 			stream_options: { include_usage: true },
 		}

src/api/providers/fetchers/modelCache.ts

@@ -81,13 +81,10 @@ async function fetchModelsFromProvider(options: GetModelsOptions): Promise<Model
 				if (!model.id) {
 					return acc
 				}
-				// todo: add support for native tools
-				// const _mid = model.id.toLocaleLowerCase()
-				// model.supportsNativeTools = model.supportsNativeTools ?? (!_mid.includes("qwen-2.5"))
-				// model.defaultToolProtocol = model.defaultToolProtocol ? TOOL_PROTOCOL.XML : TOOL_PROTOCOL.NATIVE
-
-				model.supportsNativeTools = false
-				model.defaultToolProtocol = TOOL_PROTOCOL.XML
+				// todo: add support for native tools with api fetch
+				const _mid = model.id.toLocaleLowerCase()
+				model.supportsNativeTools = model.supportsNativeTools ?? (!_mid.includes("qwen-2.5"))
+				model.defaultToolProtocol = model.supportsNativeTools ? TOOL_PROTOCOL.NATIVE : TOOL_PROTOCOL.XML
 				acc[model.id] = model
 				return acc
 			}, {} as ModelRecord)

src/api/providers/huggingface.ts

@@ -56,7 +56,10 @@ export class HuggingFaceHandler extends BaseProvider implements SingleCompletion
 		const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
 			model: modelId,
 			temperature,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
+			messages: [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
+			],
 			stream: true,
 			stream_options: { include_usage: true },
 		}

src/api/providers/lite-llm.ts

@@ -45,7 +45,7 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
 	): ApiStream {
 		const { id: modelId, info } = await this.fetchModel()
 
-		const openAiMessages = convertToOpenAiMessages(messages)
+		const openAiMessages = convertToOpenAiMessages(messages, { mergeToolResultText: true })
 
 		// Prepare messages with cache control if enabled and supported
 		let systemMessage: OpenAI.Chat.ChatCompletionMessageParam

src/api/providers/lm-studio.ts

@@ -44,7 +44,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 	): ApiStream {
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
 			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
+			...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
 		]
 
 		// LM Studio always supports native tools (https://lmstudio.ai/docs/developer/core/tools)

src/api/providers/openai.ts

@@ -6,6 +6,7 @@ import {
 	type ModelInfo,
 	azureOpenAiDefaultApiVersion,
 	openAiModelInfoSaneDefaults,
+	NATIVE_TOOL_DEFAULTS,
 	DEEP_SEEK_DEFAULT_TEMPERATURE,
 	OPENAI_AZURE_AI_INFERENCE_PATH,
 } from "@roo-code/types"
@@ -126,7 +127,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 					}
 				}
 
-				convertedMessages = [systemMessage, ...convertToOpenAiMessages(messages)]
+				convertedMessages = [systemMessage, ...convertToOpenAiMessages(messages, { mergeToolResultText: true })]
 
 				if (modelInfo.supportsPromptCache) {
 					// Note: the following logic is copied from openrouter:
@@ -234,7 +235,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 					? convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 					: enabledLegacyFormat
 						? [systemMessage, ...convertToSimpleMessages(messages)]
-						: [systemMessage, ...convertToOpenAiMessages(messages)],
+						: [systemMessage, ...convertToOpenAiMessages(messages, { mergeToolResultText: true })],
 				...(metadata?.tools && { tools: this.convertToolsForOpenAI(metadata.tools) }),
 				...(metadata?.tool_choice && { tool_choice: metadata.tool_choice }),
 				...(metadata?.toolProtocol === "native" && {
@@ -291,7 +292,13 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 
 	override getModel() {
 		const id = this.options.openAiModelId ?? ""
-		const info = this.options.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults
+		// Ensure OpenAI-compatible models default to supporting native tool calling.
+		// This is required for [`Task.attemptApiRequest()`](src/core/task/Task.ts:3817) to
+		// include tool definitions in the request.
+		const info: ModelInfo = {
+			...NATIVE_TOOL_DEFAULTS,
+			...(this.options.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults),
+		}
 		const params = getModelParams({ format: "openai", modelId: id, model: info, settings: this.options })
 		return { id, info, ...params }
 	}
@@ -353,7 +360,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 						role: "developer",
 						content: `Formatting re-enabled\n${systemPrompt}`,
 					},
-					...convertToOpenAiMessages(messages),
+					...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
 				],
 				stream: true,
 				...(isGrokXAI ? {} : { stream_options: { include_usage: true } }),
@@ -390,7 +397,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 						role: "developer",
 						content: `Formatting re-enabled\n${systemPrompt}`,
 					},
-					...convertToOpenAiMessages(messages),
+					...convertToOpenAiMessages(messages, { mergeToolResultText: true }),
 				],
 				reasoning_effort: modelInfo.reasoningEffort as "low" | "medium" | "high" | undefined,
 				temperature: undefined,