fix: type tool alias originalName and correct alias comments

hannesrudolph · hannesrudolph · commit 9a1a527ebc6f · 2025-12-11T16:52:16.000-07:00
diff --git a/src/core/assistant-message/NativeToolCallParser.ts b/src/core/assistant-message/NativeToolCallParser.ts
@@ -537,7 +537,7 @@ export class NativeToolCallParser {
 
 		// Preserve original name for API history when an alias was used
 		if (originalName) {
-			;(result as any).originalName = originalName
+			result.originalName = originalName
 		}
 
 		return result
@@ -559,7 +559,7 @@ export class NativeToolCallParser {
 			return this.parseDynamicMcpTool(toolCall)
 		}
 
-		// Resolve tool alias to canonical name (e.g., "edit_file" -> "search_and_replace")
+		// Resolve tool alias to canonical name (e.g., "edit_file" -> "apply_diff", "temp_edit_file" -> "search_and_replace")
 		const resolvedName = resolveToolAlias(toolCall.name as string) as TName
 
 		// Validate tool name (after alias resolution)
@@ -796,7 +796,7 @@ export class NativeToolCallParser {
 
 			// Preserve original name for API history when an alias was used
 			if (toolCall.name !== resolvedName) {
-				;(result as any).originalName = toolCall.name
+				result.originalName = toolCall.name
 			}
 
 			return result
diff --git a/src/core/assistant-message/presentAssistantMessage.ts b/src/core/assistant-message/presentAssistantMessage.ts
@@ -696,7 +696,7 @@ export async function presentAssistantMessage(cline: Task) {
 			if (!block.partial) {
 				const modelInfo = cline.api.getModel()
 				// Resolve aliases in includedTools before validation
-				// e.g., "edit_file" should resolve to "search_and_replace"
+				// e.g., "edit_file" should resolve to "apply_diff"
 				const rawIncludedTools = modelInfo?.info?.includedTools
 				const { resolveToolAlias } = await import("../prompts/tools/filter-tools-for-mode")
 				const includedTools = rawIncludedTools?.map((tool) => resolveToolAlias(tool))
diff --git a/src/core/prompts/tools/filter-tools-for-mode.ts b/src/core/prompts/tools/filter-tools-for-mode.ts
@@ -218,7 +218,7 @@ export function filterNativeToolsForMode(
 	)
 	allowedToolNames = customizedTools
 
-	// Apply tool aliases - if one tool in an alias group is allowed, all aliases are allowed
+	// Resolve any aliases to canonical tool names for execution-time filtering
 	allowedToolNames = applyToolAliases(allowedToolNames)
 
 	// Conditionally exclude codebase_search if feature is disabled or not configured
diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts
@@ -3110,7 +3110,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 								// When tool aliases are used (e.g., "edit_file" -> "search_and_replace"),
 								// we want the alias name in the conversation history to match what the model
 								// was told the tool was named, preventing confusion in multi-turn conversations.
-								const toolNameForHistory = (toolUse as any).originalName || toolUse.name
+								const toolNameForHistory = toolUse.originalName ?? toolUse.name
 
 								assistantContent.push({
 									type: "tool_use" as const,
diff --git a/src/shared/tools.ts b/src/shared/tools.ts
@@ -120,6 +120,12 @@ export interface ToolUse<TName extends ToolName = ToolName> {
 	type: "tool_use"
 	id?: string // Optional ID to track tool calls
 	name: TName
+	/**
+	 * The original tool name as called by the model (e.g. an alias like "edit_file"),
+	 * if it differs from the canonical tool name used for execution.
+	 * Used to preserve tool names in API conversation history.
+	 */
+	originalName?: string
 	// params is a partial record, allowing only some or none of the possible parameters to be used
 	params: Partial<Record<ToolParamName, string>>
 	partial: boolean

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ export class NativeToolCallParser {`
`537`	`537`
`538`	`538`	`// Preserve original name for API history when an alias was used`
`539`	`539`	`if (originalName) {`
`540`		`- ;(result as any).originalName = originalName`
	`540`	`+ result.originalName = originalName`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`return result`
`@@ -559,7 +559,7 @@ export class NativeToolCallParser {`
`559`	`559`	`return this.parseDynamicMcpTool(toolCall)`
`560`	`560`	`}`
`561`	`561`
`562`		`- // Resolve tool alias to canonical name (e.g., "edit_file" -> "search_and_replace")`
	`562`	`+ // Resolve tool alias to canonical name (e.g., "edit_file" -> "apply_diff", "temp_edit_file" -> "search_and_replace")`
`563`	`563`	`const resolvedName = resolveToolAlias(toolCall.name as string) as TName`
`564`	`564`
`565`	`565`	`// Validate tool name (after alias resolution)`
`@@ -796,7 +796,7 @@ export class NativeToolCallParser {`
`796`	`796`
`797`	`797`	`// Preserve original name for API history when an alias was used`
`798`	`798`	`if (toolCall.name !== resolvedName) {`
`799`		`- ;(result as any).originalName = toolCall.name`
	`799`	`+ result.originalName = toolCall.name`
`800`	`800`	`}`
`801`	`801`
`802`	`802`	`return result`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ export function filterNativeToolsForMode(`
`218`	`218`	`)`
`219`	`219`	`allowedToolNames = customizedTools`
`220`	`220`
`221`		`- // Apply tool aliases - if one tool in an alias group is allowed, all aliases are allowed`
	`221`	`+ // Resolve any aliases to canonical tool names for execution-time filtering`
`222`	`222`	`allowedToolNames = applyToolAliases(allowedToolNames)`
`223`	`223`
`224`	`224`	`// Conditionally exclude codebase_search if feature is disabled or not configured`