feat: remove args param to avoid claude tool call format error

NaccOll · NaccOll · commit 44766076fe7e · 2025-09-12T16:54:20.000+08:00
diff --git a/src/core/prompts/tools/schemas/apply-diff-schema.ts b/src/core/prompts/tools/schemas/apply-diff-schema.ts
@@ -158,61 +158,53 @@ When applying the diffs, be extra careful to remember to change any closing brac
 ALWAYS make as many changes in a single 'apply_diff' request as possible using multiple SEARCH/REPLACE blocks`,
 		parameters: [
 			{
-				name: "args",
-				type: "object",
-				description: "Container for the file modification arguments.",
+				name: "file",
+				type: "array",
+				description: `One or more file change objects.`,
 				required: true,
-				properties: {
-					file: {
-						name: "file",
-						type: "array",
-						description: `One or more file change objects.`,
-						required: true,
-						items: {
-							name: "fileItem",
-							type: "object",
-							description: "A file modification object containing the path and diff operations.",
+				items: {
+					name: "fileItem",
+					type: "object",
+					description: "A file modification object containing the path and diff operations.",
+					required: true,
+					properties: {
+						path: {
+							name: "path",
+							type: "string",
+							description: `The path of the file to modify (relative to the current workspace directory ${args.cwd})`,
 							required: true,
-							properties: {
-								path: {
-									name: "path",
-									type: "string",
-									description: `The path of the file to modify (relative to the current workspace directory ${args.cwd})`,
-									required: true,
-								},
-								diff: {
-									name: "diff",
-									type: "array",
-									description: "One or more diff elements containing.",
-									required: true,
-									items: {
-										name: "diffItem",
-										type: "object",
+						},
+						diff: {
+							name: "diff",
+							type: "array",
+							description: "One or more diff elements containing.",
+							required: true,
+							items: {
+								name: "diffItem",
+								type: "object",
+								description:
+									"A single search-and-replace operation. This object contains the search criteria and the replacement content.",
+								required: true,
+								properties: {
+									search: {
+										name: "search",
+										type: "string",
 										description:
-											"A single search-and-replace operation. This object contains the search criteria and the replacement content.",
+											"SEARCH BLOCK. MUST exactly match existing content including whitespace and indentation.",
+										required: true,
+									},
+									replace: {
+										name: "replace",
+										type: "string",
+										description: "REPLACE BLOCK.",
 										required: true,
-										properties: {
-											search: {
-												name: "search",
-												type: "string",
-												description:
-													"SEARCH BLOCK. MUST exactly match existing content including whitespace and indentation.",
-												required: true,
-											},
-											replace: {
-												name: "replace",
-												type: "string",
-												description: "REPLACE BLOCK.",
-												required: true,
-											},
-											start_line: {
-												name: "start_line",
-												type: "number",
-												description:
-													"The line number of original content where the search block starts",
-												required: false,
-											},
-										},
+									},
+									start_line: {
+										name: "start_line",
+										type: "number",
+										description:
+											"The line number of original content where the search block starts",
+										required: false,
 									},
 								},
 							},
diff --git a/src/core/prompts/tools/schemas/read-file-schema.ts b/src/core/prompts/tools/schemas/read-file-schema.ts
@@ -29,44 +29,36 @@ ${
 ${isMultipleReadsEnabled ? `- When you need to read more than ${maxConcurrentReads} files, prioritize the most critical files first, then use subsequent read_file requests for additional files` : ""}`,
 		parameters: [
 			{
-				name: "args",
-				type: "object",
-				description: "Contains one or more file elements, where each file contains.",
+				name: "file",
+				type: "array",
+				description: `An array of file objects to read, with an optional line range. Reading multiple files (within the ${maxConcurrentReads}-file limit).`,
 				required: true,
-				properties: {
-					file: {
-						name: "file",
-						type: "array",
-						description: `An array of file objects to read, with an optional line range. Reading multiple files (within the ${maxConcurrentReads}-file limit).`,
-						required: true,
-						items: {
-							name: "fileItem",
-							type: "object",
-							description: "A file object",
+				items: {
+					name: "fileItem",
+					type: "object",
+					description: "A file object",
+					required: true,
+					properties: {
+						path: {
+							name: "path",
+							type: "string",
+							description: `File path (relative to workspace directory ${args.cwd}).`,
 							required: true,
-							properties: {
-								path: {
-									name: "path",
-									type: "string",
-									description: `File path (relative to workspace directory ${args.cwd}).`,
-									required: true,
-								},
-								...(partialReadsEnabled
-									? {
-											line_range: {
-												name: "line_range",
-												type: "array",
-												description: `One or more line range elements in format "start-end" (1-based, inclusive).`,
-												required: false,
-												items: {
-													name: "text",
-													type: "string",
-												},
-											},
-										}
-									: {}),
-							},
 						},
+						...(partialReadsEnabled
+							? {
+									line_range: {
+										name: "line_range",
+										type: "array",
+										description: `One or more line range elements in format "start-end" (1-based, inclusive).`,
+										required: false,
+										items: {
+											name: "text",
+											type: "string",
+										},
+									},
+								}
+							: {}),
 					},
 				},
 			},
diff --git a/src/core/tools/multiApplyDiffTool.ts b/src/core/tools/multiApplyDiffTool.ts
@@ -105,19 +105,19 @@ export async function applyDiffTool(
 		return
 	}
 
-	if (argsXmlTag) {
+	if (argsXmlTag || block.toolUseId) {
 		// Parse file entries from XML (new way)
 		try {
 			let files = [] as any[]
-			if (!block.toolUseId) {
+			if (argsXmlTag) {
 				// IMPORTANT: We use parseXmlForDiff here instead of parseXml to prevent HTML entity decoding
 				// This ensures exact character matching when comparing parsed content against original file content
 				// Without this, special characters like & would be decoded to &amp; causing diff mismatches
 				const parsed = parseXmlForDiff(argsXmlTag, ["file.diff.content"]) as ParsedXmlResult
 				files = Array.isArray(parsed.file) ? parsed.file : [parsed.file].filter(Boolean)
 			} else {
 				const input = block.toolUseParam?.input as any
-				const args = input.args
+				const args = input
 				files = Array.isArray(args?.file) ? args?.file : [args?.file].filter(Boolean)
 			}
 
diff --git a/src/core/tools/readFileTool.ts b/src/core/tools/readFileTool.ts
@@ -125,11 +125,17 @@ export async function readFileTool(
 
 	const fileEntries: FileEntry[] = []
 
-	if (argsXmlTag) {
+	if (argsXmlTag || block.toolUseId) {
 		// Parse file entries from XML (new multi-file format)
 		try {
-			const parsed = parseXml(argsXmlTag) as any
-			const files = Array.isArray(parsed.file) ? parsed.file : [parsed.file].filter(Boolean)
+			let files: any[] = []
+			if (argsXmlTag) {
+				const parsed = parseXml(argsXmlTag) as any
+				files = Array.isArray(parsed.file) ? parsed.file : [parsed.file].filter(Boolean)
+			} else {
+				const params: any = block.toolUseParam?.input
+				files = params?.file || []
+			}
 
 			for (const file of files) {
 				if (!file.path) continue // Skip if no path in a file entry
