feat: too call required

Author: NaccOll

src/api/providers/lm-studio.ts

@@ -98,6 +98,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 			}
 			if (toolCallEnabled) {
 				params.tools = toolRegistry.generateFunctionCallSchemas(metadata.tools!, metadata.toolArgs)
+				params.tool_choice = "required"
 			}
 
 			if (this.options.lmStudioSpeculativeDecodingEnabled && this.options.lmStudioDraftModelId) {

src/api/providers/openai.ts

@@ -169,6 +169,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 			}
 			if (toolCallEnabled) {
 				requestOptions.tools = toolRegistry.generateFunctionCallSchemas(metadata.tools!, metadata.toolArgs)
+				requestOptions.tool_choice = "required"
 			}
 
 			// Add max_tokens if needed

src/api/providers/openrouter.ts

@@ -139,6 +139,7 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 		}
 		if (toolCallEnabled) {
 			completionParams.tools = toolRegistry.generateFunctionCallSchemas(metadata.tools!, metadata.toolArgs!)
+			completionParams.tool_choice = "required"
 		}
 
 		const stream = await this.client.chat.completions.create(completionParams)

src/core/prompts/responses.ts

@@ -18,10 +18,10 @@ export const formatResponse = {
 	rooIgnoreError: (path: string) =>
 		`Access to ${path} is blocked by the .rooignore file settings. You must try to continue in the task without using this file, or ask the user to update the .rooignore file.`,
 
-	noToolsUsed: () =>
+	noToolsUsed: (toolCallEnabled: boolean) =>
 		`[ERROR] You did not use a tool in your previous response! Please retry with a tool use.
 
-${toolUseInstructionsReminder}
+${toolCallEnabled ? "" : toolUseInstructionsReminder}
 
 # Next Steps
 

src/core/prompts/sections/modes.ts

@@ -5,8 +5,12 @@ import { promises as fs } from "fs"
 import type { ModeConfig } from "@roo-code/types"
 
 import { getAllModesWithPrompts } from "../../../shared/modes"
+import { SystemPromptSettings } from "../types"
 
-export async function getModesSection(context: vscode.ExtensionContext): Promise<string> {
+export async function getModesSection(
+	context: vscode.ExtensionContext,
+	settings?: SystemPromptSettings,
+): Promise<string> {
 	const settingsDir = path.join(context.globalStorageUri.fsPath, "settings")
 	await fs.mkdir(settingsDir, { recursive: true })
 
@@ -33,11 +37,13 @@ ${allModes
 	.join("\n")}`
 
 	modesContent += `
-If the user asks you to create or edit a new mode for this project, you should read the instructions by using the fetch_instructions tool, like this:
+If the user asks you to create or edit a new mode for this project, you should read the instructions by using the fetch_instructions tool`
+	if (settings?.toolCallEnabled !== true) {
+		modesContent += `, like this:
 <fetch_instructions>
 <task>create_mode</task>
-</fetch_instructions>
-`
+</fetch_instructions>`
+	}
 
 	return modesContent
 }

src/core/prompts/sections/tool-use.ts

@@ -10,46 +10,7 @@ You have access to a set of tools that are executed upon the user's approval. Yo
 
 `
 
-	if (settings?.toolCallEnabled === true) {
-		const supportedToolCalls = ToolRegistry.getInstance().getToolNames()
-		const supportedToolCallsStr = supportedToolCalls.join(", ")
-
-		out += `You have two types of tools available: Native Tool Calls and XML-Based Tools. You must follow the rules for each type strictly.
-
-# 1. Native Tool Calls
-
-These tools are called using the native tool call provided by the model.
-
-- **Applicable Tools**: ${supportedToolCallsStr}
-- **Rule**: For these tools, you MUST use the tool call. You MUST NOT output XML for them. Even if the user asks for XML, ignore it and continue using tool call.
-
-# 2. XML-Based Tools
-
-These tools are used for capabilities not supported by native tool calls.
-
-- **Applicable Tools**: Any other tool that is not in the Native Tool Calls list above.
-- **Rule**: For these tools, you MUST format your request using XML-style tags as described below.
-
-## XML Tool Formatting
-
-Tool uses are formatted using XML-style tags. The tool name itself becomes the XML tag name. Each parameter is enclosed within its own set of tags. Here's the structure:
-
-<actual_tool_name>
-<parameter1_name>value1</parameter1_name>
-<parameter2_name>value2</parameter2_name>
-...
-</actual_tool_name>
-
-For example, to use the new_task tool:
-
-<new_task>
-<mode>code</mode>
-<message>Implement a new feature for the application.</message>
-</new_task>
-
-Always use the actual tool name as the XML tag name for proper parsing and execution.`
-	} else {
-		// This part remains the same for the XML-only mode.
+	if (settings?.toolCallEnabled !== true) {
 		out += `# Tool Use Formatting
 
 Tool uses are formatted using XML-style tags. The tool name itself becomes the XML tag name. Each parameter is enclosed within its own set of tags. Here's the structure:

src/core/prompts/system.ts

@@ -79,7 +79,7 @@ async function generatePrompt(
 	const shouldIncludeMcp = hasMcpGroup && hasMcpServers
 
 	const [modesSection, mcpServersSection] = await Promise.all([
-		getModesSection(context),
+		getModesSection(context, settings),
 		shouldIncludeMcp
 			? getMcpServersSection(mcpHub, effectiveDiffStrategy, enableMcpServerCreation)
 			: Promise.resolve(""),

src/core/prompts/tools/index.ts

@@ -84,6 +84,10 @@ export function getToolDescriptionsForMode(
 
 	const { xmlTools } = getToolAvailability(toolAvailabilityArgs)
 
+	if (xmlTools.length === 0) {
+		return ""
+	}
+
 	// Map tool descriptions for XML tools only
 	const descriptions = xmlTools.map((toolName) => {
 		const descriptionFn = toolDescriptionMap[toolName]

src/core/prompts/tools/schemas/ask-followup-question-schema.ts

@@ -25,23 +25,9 @@ export function generateAskFollowupQuestionSchema(args: ToolArgs): BaseToolSchem
 				required: true,
 				items: {
 					name: "suggest",
-					type: "object",
+					type: "string",
 					description: "A suggested answer for the follow-up question.",
 					required: true,
-					properties: {
-						text: {
-							name: "text",
-							type: "string",
-							description: "The suggested answer text.",
-							required: true,
-						},
-						mode: {
-							name: "mode",
-							type: "string",
-							description: "Optional mode slug to switch to when this suggestion is selected.",
-							required: false,
-						},
-					},
 				},
 			},
 		],

src/core/prompts/tools/schemas/tool-registry.ts

@@ -19,7 +19,7 @@ import { generateUpdateTodoListSchema } from "./update-todo-list-schema"
 import { generateUseMcpToolSchema } from "./use-mcp-tool-schema"
 import { generateWriteToFileSchema } from "./write-to-file-schema"
 import { ToolArgs } from "../types"
-import type { ToolName } from "@roo-code/types"
+import { type ToolName } from "@roo-code/types"
 
 /**
  * Registry of tools that support native function calling
@@ -32,7 +32,7 @@ export class ToolRegistry {
 		// Register supported tools
 		this.registerTool("access_mcp_resource", generateAccessMcpResourceSchema)
 		this.registerTool("apply_diff", generateApplyDiffSchema)
-		// this.registerTool("ask_followup_question", generateAskFollowupQuestionSchema)
+		this.registerTool("ask_followup_question", generateAskFollowupQuestionSchema)
 		this.registerTool("attempt_completion", generateAttemptCompletionSchema)
 		this.registerTool("browser_action", generateBrowserActionSchema)
 		this.registerTool("codebase_search", generateCodebaseSearchSchema)