feat: sync to v3.45.0 + restore tool protocol selector with rebuilt type definitions

Author: q1600822305

packages/types/src/model.ts

@@ -65,6 +65,17 @@ export type ModelParameter = z.infer<typeof modelParametersSchema>
 export const isModelParameter = (value: string): value is ModelParameter =>
 	modelParameters.includes(value as ModelParameter)
 
+/**
+ * ToolProtocol
+ */
+
+export const TOOL_PROTOCOL = {
+	XML: "xml" as const,
+	NATIVE: "native" as const,
+}
+
+export type ToolProtocol = "xml" | "native"
+
 /**
  * ModelInfo
  */
@@ -110,6 +121,10 @@ export const modelInfoSchema = z.object({
 	isStealthModel: z.boolean().optional(),
 	// Flag to indicate if the model is free (no cost)
 	isFree: z.boolean().optional(),
+	// Flag to indicate if the model supports native tool calling (OpenAI-style function calling)
+	supportsNativeTools: z.boolean().optional(),
+	// Default tool protocol preferred by this model
+	defaultToolProtocol: z.enum(["xml", "native"]).optional(),
 	// Exclude specific native tools from being available (only applies to native protocol)
 	// These tools will be removed from the set of tools available to the model
 	excludedTools: z.array(z.string()).optional(),

packages/types/src/provider-settings.ts

@@ -172,6 +172,7 @@ const baseProviderSettingsSchema = z.object({
 	modelTemperature: z.number().nullish(),
 	rateLimitSeconds: z.number().optional(),
 	consecutiveMistakeLimit: z.number().min(0).optional(),
+	toolProtocol: z.enum(["xml", "native"]).optional(),
 
 	// Model reasoning.
 	enableReasoningEffort: z.boolean().optional(),

src/core/assistant-message/presentAssistantMessage.ts

@@ -754,8 +754,6 @@ export async function presentAssistantMessage(cline: Task) {
 						askApproval,
 						handleError,
 						pushToolResult,
-						removeClosingTag,
-						toolProtocol,
 					})
 					break
 				case "apply_patch":

src/core/prompts/tools/multi-edit-file.ts

@@ -1,6 +1,4 @@
-import { ToolArgs } from "./types"
-
-export function getMultiEditFileDescription(args: ToolArgs): string {
+export function getMultiEditFileDescription(args: { cwd: string }): string {
 	return `## multi_edit_file
 Description: Apply multiple edits to a single file. Two modes available:
 1. String match: {"old_string": "find", "new_string": "replace"}

src/core/tools/MultiEditFileTool.ts

@@ -149,7 +149,7 @@ export class MultiEditFileTool extends BaseTool<"multi_edit_file"> {
 
 	async execute(params: MultiEditFileParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
 		const { path: relPath, edits } = params
-		const { askApproval, handleError, pushToolResult, toolProtocol } = callbacks
+		const { askApproval, handleError, pushToolResult } = callbacks
 
 		let relPathForErrorHandling: string | undefined
 
@@ -245,7 +245,7 @@ export class MultiEditFileTool extends BaseTool<"multi_edit_file"> {
 				await finalizePartialToolAskIfNeeded(relPath)
 				task.didToolFailInCurrentTurn = true
 				await task.say("rooignore_error", relPath)
-				pushToolResult(formatResponse.rooIgnoreError(relPath, toolProtocol))
+				pushToolResult(formatResponse.rooIgnoreError(relPath))
 				return
 			}