Minor simplifications

Author: chrarnoldus

src/core/tools/useMcpToolTool.ts

@@ -84,26 +84,23 @@ async function validateParams(
 }
 
 /**
- * Reverses property renaming applied in schema generation.
+ * Reverses property renaming applied in schema generation (native tool calling).
  * Properties named `renamed_*` are converted back to their original names.
  */
-function reversePropertyRenaming(args: Record<string, unknown> | undefined): Record<string, unknown> | undefined {
+function reversePropertyRenaming_kilocode(
+	args: Record<string, unknown> | undefined,
+): Record<string, unknown> | undefined {
 	if (!args) {
 		return args
 	}
-
 	const reversed: Record<string, unknown> = {}
-
 	for (const [key, value] of Object.entries(args)) {
 		if (key.startsWith("renamed_")) {
-			// Extract original property name (e.g., "renamed_type" -> "type")
-			const originalKey = key.substring("renamed_".length)
-			reversed[originalKey] = value
+			reversed[key.substring("renamed_".length)] = value
 		} else {
 			reversed[key] = value
 		}
 	}
-
 	return reversed
 }
 
@@ -275,10 +272,10 @@ async function executeToolAndProcessResult(
 		toolName,
 	})
 
-	// Reverse any property renaming before calling the tool
-	const actualArguments = reversePropertyRenaming(parsedArguments)
-
-	const toolResult = await cline.providerRef.deref()?.getMcpHub()?.callTool(serverName, toolName, actualArguments)
+	const toolResult = await cline.providerRef
+		.deref()
+		?.getMcpHub()
+		?.callTool(serverName, toolName, reversePropertyRenaming_kilocode(parsedArguments))
 
 	let toolResultPretty = "(No response)"
 

webview-ui/src/components/chat/McpExecution.tsx

@@ -54,10 +54,11 @@ export const McpExecution = ({
 	// kilocode_change: Main collapse state for the entire MCP execution content
 	const [isResponseExpanded, setIsResponseExpanded] = useState(initiallyExpanded)
 
-	// Remove "renamed_" prefix from property names in JSON
-	const removeRenamedPrefix = useCallback((text: string): string => {
-		if (!text) return text
-		return text.replace(/"renamed_([^"]+)":/g, '"$1":')
+	// kilocode_change: Remove "renamed_" prefix from property names in JSON (native tool calling)
+	const removeRenamedPrefix_kilocode = useCallback((text: string): string => {
+		const prefix = "renamed_"
+		if (!text || !text.startsWith(prefix)) return text
+		return text.substring(prefix.length)
 	}, [])
 
 	// Try to parse JSON and return both the result and formatted text
@@ -281,7 +282,7 @@ export const McpExecution = ({
 							"mt-1 pt-1":
 								!isArguments && (useMcpServer?.type === "use_mcp_tool" || (toolName && serverName)),
 						})}>
-						<CodeBlock source={removeRenamedPrefix(formattedArgumentsText)} language="json" />
+						<CodeBlock source={removeRenamedPrefix_kilocode(formattedArgumentsText)} language="json" />
 					</div>
 				)}