refactor: tool call schema

Author: NaccOll

src/api/index.ts

@@ -1,6 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 
-import type { ProviderSettings, ModelInfo } from "@roo-code/types"
+import type { ProviderSettings, ModelInfo, ToolName } from "@roo-code/types"
 
 import { ApiStream } from "./transform/stream"
 
@@ -45,7 +45,7 @@ export interface SingleCompletionHandler {
 export interface ApiHandlerCreateMessageMetadata {
 	mode?: string
 	taskId: string
-	tools?: string[]
+	tools?: ToolName[]
 	toolArgs?: ToolArgs
 }
 

src/api/providers/openai.ts

@@ -23,7 +23,7 @@ import { getModelParams } from "../transform/model-params"
 import { DEFAULT_HEADERS } from "./constants"
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
-import { getToolRegistry } from "../../core/tools/schemas/tool-registry"
+import { getToolRegistry } from "../../core/prompts/tools/schemas/tool-registry"
 
 // TODO: Rename this to OpenAICompatibleHandler. Also, I think the
 // `OpenAINativeHandler` can subclass from this, since it's obviously
@@ -162,7 +162,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 				...(reasoning && reasoning),
 			}
 			if (toolCallEnabled) {
-				requestOptions.tools = toolRegistry.generateFunctionCallSchemas(metadata.tools!)
+				requestOptions.tools = toolRegistry.generateFunctionCallSchemas(metadata.tools!, metadata.toolArgs)
 			}
 
 			// Add max_tokens if needed

src/api/providers/openrouter.ts

@@ -25,7 +25,7 @@ import { getModelEndpoints } from "./fetchers/modelEndpointCache"
 import { DEFAULT_HEADERS } from "./constants"
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
-import { getToolRegistry } from "../../core/tools/schemas/tool-registry"
+import { getToolRegistry } from "../../core/prompts/tools/schemas/tool-registry"
 
 // Add custom interface for OpenRouter params.
 type OpenRouterChatCompletionParams = OpenAI.Chat.ChatCompletionCreateParams & {

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

@@ -1,11 +1,56 @@
-export function getSharedToolUseSection(): string {
-	return `====
+import { ToolRegistry } from "../tools/schemas/tool-registry"
+import { SystemPromptSettings } from "../types"
+
+export function getSharedToolUseSection(settings?: SystemPromptSettings): string {
+	let out = `====
 
 TOOL USE
 
 You have access to a set of tools that are executed upon the user's approval. You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
 
-# Tool Use Formatting
+`
+
+	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.
+		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:
 
@@ -23,4 +68,6 @@ For example, to use the new_task tool:
 </new_task>
 
 Always use the actual tool name as the XML tag name for proper parsing and execution.`
+	}
+	return out
 }

src/core/prompts/system.ts

@@ -91,7 +91,7 @@ async function generatePrompt(
 
 ${markdownFormattingSection()}
 
-${getSharedToolUseSection()}
+${getSharedToolUseSection(settings)}
 
 ${getToolDescriptionsForMode(
 	mode,

src/core/prompts/tools/index.ts

@@ -24,7 +24,7 @@ import { getNewTaskDescription } from "./new-task"
 import { getCodebaseSearchDescription } from "./codebase-search"
 import { getUpdateTodoListDescription } from "./update-todo-list"
 import { CodeIndexManager } from "../../../services/code-index/manager"
-import { getToolRegistry } from "../../tools/schemas/tool-registry"
+import { getToolRegistry } from "./schemas/tool-registry"
 
 // Map of tool names to their description functions
 const toolDescriptionMap: Record<string, (args: ToolArgs) => string | undefined> = {
@@ -118,18 +118,17 @@ export function getToolDescriptionsForMode(
 	if (settings?.todoListEnabled === false) {
 		tools.delete("update_todo_list")
 	}
-
 	// If toolCallEnabled is true, skip XML tool descriptions for supported tools
-	let supportedTools = []
+	let supportedTools = [] as ToolName[]
 	if (settings?.toolCallEnabled === true) {
 		const toolRegistry = getToolRegistry()
-		supportedTools = toolRegistry.getSupportedTools(Array.from(tools))
+		supportedTools = toolRegistry.getSupportedTools(Array.from(tools) as ToolName[])
 
 		for (const tool of supportedTools) {
-			// tools.delete(tool)
-			toolDescriptionMap[tool] = (args) => {
-				return `## ${tool}\n\nMUST USE ${tool} TOOL BY LLM NATIVE TOOL CALL. NOT USING XML FORMAT.`
-			}
+			tools.delete(tool)
+			// copyToolDescriptionMap[tool] = (args) => {
+			// 	return `## ${tool}\n\nMUST USE ${tool} TOOL BY NATIVE TOOL CALL. NOT USING XML FORMAT.`
+			// }
 		}
 	}
 

src/core/prompts/tools/schemas/access-mcp-resource-schema.ts

@@ -0,0 +1,44 @@
+import { ToolArgs } from "../types"
+import { BaseToolSchema } from "./base-tool-schema"
+
+export function generateAccessMcpResourceSchema(args: ToolArgs): BaseToolSchema {
+	const schema: BaseToolSchema = {
+		name: "access_mcp_resource",
+		description:
+			"Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.",
+		parameters: [
+			{
+				name: "server_name",
+				type: "string",
+				description: "The name of the MCP server providing the resource",
+				required: true,
+			},
+			{
+				name: "uri",
+				type: "string",
+				description: "The URI identifying the specific resource to access",
+				required: true,
+			},
+		],
+		systemPropmt: `## access_mcp_resource
+Description: Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.
+Parameters:
+- server_name: (required) The name of the MCP server providing the resource
+- uri: (required) The URI identifying the specific resource to access
+
+Usage:
+<access_mcp_resource>
+<server_name>server name here</server_name>
+<uri>resource URI here</uri>
+</access_mcp_resource>
+
+Example: Requesting to access an MCP resource
+
+<access_mcp_resource>
+<server_name>weather-server</server_name>
+<uri>weather://san-francisco/current</uri>
+</access_mcp_resource>`,
+	}
+
+	return schema
+}