@probelabs/probe 0.6.0-rc258 → 0.6.0-rc259

package/build/agent/ProbeAgent.js

@@ -59,6 +59,7 @@ import {
   attemptCompletionToolDefinition,
   editToolDefinition,
   createToolDefinition,
+  multiEditToolDefinition,
   googleSearchToolDefinition,
   urlContextToolDefinition,
   attemptCompletionSchema,
@@ -964,6 +965,9 @@ export class ProbeAgent {
       if (wrappedTools.createToolInstance && isToolAllowed('create')) {
         this.toolImplementations.create = wrappedTools.createToolInstance;
       }
+      if (wrappedTools.multiEditToolInstance && isToolAllowed('multi_edit')) {
+        this.toolImplementations.multi_edit = wrappedTools.multiEditToolInstance;
+      }
     }
 
     // Store wrapped tools for ACP system
@@ -2565,6 +2569,9 @@ ${extractGuidance}
     if (this.allowEdit && isToolAllowed('create')) {
       toolDefinitions += `${createToolDefinition}\n`;
     }
+    if (this.allowEdit && isToolAllowed('multi_edit')) {
+      toolDefinitions += `${multiEditToolDefinition}\n`;
+    }
     // Bash tool (require both enableBash flag AND allowedTools permission)
     if (this.enableBash && isToolAllowed('bash')) {
       toolDefinitions += `${bashToolDefinition}\n`;
@@ -2670,6 +2677,9 @@ The configuration is loaded from src/config.js lines 15-25 which contains the da
     if (this.allowEdit && isToolAllowed('create')) {
       availableToolsList += '- create: Create new files with specified content.\n';
     }
+    if (this.allowEdit && isToolAllowed('multi_edit')) {
+      availableToolsList += '- multi_edit: Apply multiple file edits in one call using a JSON array of operations.\n';
+    }
     if (this.enableDelegate && isToolAllowed('delegate')) {
       availableToolsList += '- delegate: Delegate big distinct tasks to specialized probe subagents.\n';
     }
@@ -3430,6 +3440,9 @@ Follow these instructions carefully:
           if (this.allowEdit && this.allowedTools.isEnabled('create')) {
             validTools.push('create');
           }
+          if (this.allowEdit && this.allowedTools.isEnabled('multi_edit')) {
+            validTools.push('multi_edit');
+          }
           // Bash tool (require both enableBash flag AND allowedTools permission)
           if (this.enableBash && this.allowedTools.isEnabled('bash')) {
             validTools.push('bash');

package/build/agent/index.js

@@ -9427,7 +9427,7 @@ async function handleLineEdit({ resolvedPath, file_path, start_line, end_line, n
     return buildLineEditResponse(file_path, startLine, endLine, newLines.length, fileLines, startLine - 1, action, modifications);
   }
 }
-var editTool, createTool, editSchema, createSchema, editDescription, createDescription, editToolDefinition, createToolDefinition;
+var editTool, createTool, multiEditTool, editSchema, createSchema, multiEditSchema, editDescription, createDescription, multiEditDescription, editToolDefinition, createToolDefinition, multiEditToolDefinition;
 var init_edit = __esm({
   "src/tools/edit.js"() {
     "use strict";
@@ -9497,7 +9497,7 @@ Parameters:
           },
           required: ["file_path", "new_string"]
         },
-        execute: async ({ file_path, old_string, new_string, replace_all = false, symbol, position, start_line, end_line }) => {
+        execute: async ({ file_path, old_string, new_string, replace_all = false, symbol, position, start_line, end_line, workingDirectory }) => {
           try {
             if (!file_path || typeof file_path !== "string" || file_path.trim() === "") {
               return `Error editing file: Invalid file_path - must be a non-empty string. Provide an absolute path or a path relative to the working directory (e.g. "src/main.js").`;
@@ -9505,7 +9505,8 @@ Parameters:
             if (new_string === void 0 || new_string === null || typeof new_string !== "string") {
               return `Error editing file: Invalid new_string - must be a string. Provide the replacement content as a string value (empty string "" is valid for deletions).`;
             }
-            const resolvedPath = isAbsolute(file_path) ? file_path : resolve(cwd || process.cwd(), file_path);
+            const effectiveCwd = workingDirectory || cwd || process.cwd();
+            const resolvedPath = isAbsolute(file_path) ? file_path : resolve(effectiveCwd, file_path);
             if (debug) {
               console.error(`[Edit] Attempting to edit file: ${resolvedPath}`);
             }
@@ -9612,7 +9613,7 @@ Important:
           },
           required: ["file_path", "content"]
         },
-        execute: async ({ file_path, content, overwrite = false }) => {
+        execute: async ({ file_path, content, overwrite = false, workingDirectory }) => {
           try {
             if (!file_path || typeof file_path !== "string" || file_path.trim() === "") {
               return `Error creating file: Invalid file_path - must be a non-empty string. Provide an absolute path or a path relative to the working directory (e.g. "src/newFile.js").`;
@@ -9620,7 +9621,8 @@ Important:
             if (content === void 0 || content === null || typeof content !== "string") {
               return `Error creating file: Invalid content - must be a string. Provide the file content as a string value (empty string "" is valid for an empty file).`;
             }
-            const resolvedPath = isAbsolute(file_path) ? file_path : resolve(cwd || process.cwd(), file_path);
+            const effectiveCwd = workingDirectory || cwd || process.cwd();
+            const resolvedPath = isAbsolute(file_path) ? file_path : resolve(effectiveCwd, file_path);
             if (debug) {
               console.error(`[Create] Attempting to create file: ${resolvedPath}`);
             }
@@ -9649,6 +9651,70 @@ Important:
         }
       });
     };
+    multiEditTool = (options = {}) => {
+      const editInstance = editTool(options);
+      return tool({
+        name: "multi_edit",
+        description: "Apply multiple file edits in a single tool call. Accepts a JSON array of edit operations.",
+        inputSchema: {
+          type: "object",
+          properties: {
+            edits: {
+              type: "string",
+              description: "JSON array of edit operations. Each object supports: file_path, old_string, new_string, replace_all, symbol, position, start_line, end_line."
+            }
+          },
+          required: ["edits"]
+        },
+        execute: async ({ edits: rawEdits }) => {
+          let edits;
+          if (typeof rawEdits === "string") {
+            try {
+              edits = JSON.parse(rawEdits);
+            } catch (e) {
+              return `Error: Invalid JSON in edits parameter - ${e.message}. Provide a raw JSON array between <edits> tags.`;
+            }
+          } else if (Array.isArray(rawEdits)) {
+            edits = rawEdits;
+          } else {
+            return "Error: edits must be a JSON array of edit operations.";
+          }
+          if (!Array.isArray(edits) || edits.length === 0) {
+            return "Error: edits must be a non-empty JSON array.";
+          }
+          if (edits.length > 50) {
+            return `Error: Too many edits (${edits.length}). Maximum 50 per batch.`;
+          }
+          const results = [];
+          let successCount = 0;
+          let failCount = 0;
+          for (let i = 0; i < edits.length; i++) {
+            const editOp = edits[i];
+            if (!editOp || typeof editOp !== "object" || Array.isArray(editOp)) {
+              results.push(`[${i + 1}] FAIL: Invalid edit operation - must be an object`);
+              failCount++;
+              continue;
+            }
+            try {
+              const result = await editInstance.execute(editOp);
+              const isError = typeof result === "string" && result.startsWith("Error");
+              if (isError) {
+                results.push(`[${i + 1}] FAIL: ${result}`);
+                failCount++;
+              } else {
+                results.push(`[${i + 1}] OK: ${result}`);
+                successCount++;
+              }
+            } catch (error) {
+              results.push(`[${i + 1}] FAIL: ${error.message}`);
+              failCount++;
+            }
+          }
+          const summary = `Multi-edit: ${successCount}/${edits.length} succeeded` + (failCount > 0 ? `, ${failCount} failed` : "");
+          return summary + "\n\n" + results.join("\n");
+        }
+      });
+    };
     editSchema = {
       type: "object",
       properties: {
@@ -9706,8 +9772,19 @@ Important:
       },
       required: ["file_path", "content"]
     };
+    multiEditSchema = {
+      type: "object",
+      properties: {
+        edits: {
+          type: "string",
+          description: "JSON array of edit operations"
+        }
+      },
+      required: ["edits"]
+    };
     editDescription = "Edit files using text replacement, AST-aware symbol operations, or line-targeted editing. Supports fuzzy matching for text edits and optional hash-based integrity verification for line edits.";
     createDescription = "Create new files with specified content. Will create parent directories if needed.";
+    multiEditDescription = "Apply multiple file edits in a single tool call. Accepts a JSON array of edit operations, each supporting the same modes as the edit tool.";
     editToolDefinition = `
 ## edit
 Description: ${editDescription}
@@ -9863,6 +9940,44 @@ Examples:
 This is a new project.</content>
 <overwrite>true</overwrite>
 </create>`;
+    multiEditToolDefinition = `
+## multi_edit
+Description: ${multiEditDescription}
+
+Apply multiple edits in one call. Each operation in the array uses the same parameters as the edit tool:
+- file_path, old_string, new_string (text mode)
+- file_path, symbol, new_string (symbol replace)
+- file_path, symbol, new_string, position (symbol insert)
+- file_path, start_line, new_string (line-targeted)
+
+Edits are applied sequentially. Failures do not stop remaining edits. Maximum 50 edits per call.
+
+Parameters:
+- edits: (required) JSON array of edit objects. Place raw JSON between tags.
+
+When to use multi_edit vs edit:
+- Use edit for a single change to one file
+- Use multi_edit when making 2+ related changes across files (e.g., rename a function and update all call sites)
+- Use multi_edit for coordinated multi-file refactoring where order matters
+
+Examples:
+
+Multiple text replacements across files:
+<multi_edit>
+<edits>[
+  {"file_path": "src/main.js", "old_string": "return false;", "new_string": "return true;"},
+  {"file_path": "src/config.js", "old_string": "debug: false", "new_string": "debug: true"}
+]</edits>
+</multi_edit>
+
+Mixed edit modes in one batch:
+<multi_edit>
+<edits>[
+  {"file_path": "src/utils.js", "symbol": "oldHelper", "new_string": "function newHelper() { return 42; }"},
+  {"file_path": "src/main.js", "old_string": "oldHelper()", "new_string": "newHelper()", "replace_all": true},
+  {"file_path": "src/index.js", "start_line": "10", "end_line": "12", "new_string": "export { newHelper };"}
+]</edits>
+</multi_edit>`;
   }
 });
 
@@ -10356,7 +10471,8 @@ function getValidParamsForTool(toolName) {
     task: taskSchema,
     attempt_completion: attemptCompletionSchema,
     edit: editSchema,
-    create: createSchema
+    create: createSchema,
+    multi_edit: multiEditSchema
   };
   const schema = schemaMap[toolName];
   if (!schema) {
@@ -10396,7 +10512,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
   const closeTag = `</${toolName}>`;
   const openIndex = earliestOpenIndex;
   let closeIndex;
-  if (toolName === "attempt_completion") {
+  if (LAST_INDEX_TOOLS.has(toolName)) {
     closeIndex = xmlString.lastIndexOf(closeTag);
     if (closeIndex !== -1 && closeIndex <= openIndex + openTag.length) {
       closeIndex = -1;
@@ -10421,7 +10537,15 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
     if (paramOpenIndex === -1) {
       continue;
     }
-    let paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
+    let paramCloseIndex;
+    if (RAW_CONTENT_PARAMS.has(paramName)) {
+      paramCloseIndex = innerContent.lastIndexOf(paramCloseTag);
+      if (paramCloseIndex !== -1 && paramCloseIndex <= paramOpenIndex + paramOpenTag.length) {
+        paramCloseIndex = -1;
+      }
+    } else {
+      paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
+    }
     if (paramCloseIndex === -1) {
       let nextTagIndex = innerContent.length;
       for (const nextParam of validParams) {
@@ -10433,18 +10557,26 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       }
       paramCloseIndex = nextTagIndex;
     }
-    let paramValue = unescapeXmlEntities(innerContent.substring(
+    const rawValue = innerContent.substring(
       paramOpenIndex + paramOpenTag.length,
       paramCloseIndex
-    ).trim());
-    if (paramValue.toLowerCase() === "true") {
-      paramValue = true;
-    } else if (paramValue.toLowerCase() === "false") {
-      paramValue = false;
-    } else if (!isNaN(paramValue) && paramValue.trim() !== "") {
-      const num = Number(paramValue);
-      if (Number.isFinite(num)) {
-        paramValue = num;
+    );
+    let paramValue;
+    if (RAW_CONTENT_PARAMS.has(paramName)) {
+      paramValue = unescapeXmlEntities(rawValue.replace(/^\n/, "").replace(/\n$/, ""));
+    } else {
+      paramValue = unescapeXmlEntities(rawValue.trim());
+    }
+    if (!RAW_CONTENT_PARAMS.has(paramName)) {
+      if (paramValue.toLowerCase() === "true") {
+        paramValue = true;
+      } else if (paramValue.toLowerCase() === "false") {
+        paramValue = false;
+      } else if (!isNaN(paramValue) && paramValue.trim() !== "") {
+        const num = Number(paramValue);
+        if (Number.isFinite(num)) {
+          paramValue = num;
+        }
       }
     }
     params[paramName] = paramValue;
@@ -10487,6 +10619,7 @@ function detectUnrecognizedToolCall(xmlString, validTools) {
     "readImage",
     "edit",
     "create",
+    "multi_edit",
     "delegate",
     "bash",
     "task",
@@ -10616,7 +10749,7 @@ function resolveTargetPath(target, cwd) {
   }
   return filePart + suffix;
 }
-var searchSchema, searchAllSchema, querySchema, extractSchema, delegateSchema, listSkillsSchema, useSkillSchema, bashSchema, analyzeAllSchema, executePlanSchema, cleanupExecutePlanSchema, attemptCompletionSchema, searchToolDefinition, queryToolDefinition, extractToolDefinition, delegateToolDefinition, attemptCompletionToolDefinition, analyzeAllToolDefinition, bashToolDefinition, googleSearchToolDefinition, urlContextToolDefinition, searchDescription, queryDescription, extractDescription, delegateDescription, analyzeAllDescription, DEFAULT_VALID_TOOLS;
+var searchSchema, searchAllSchema, querySchema, extractSchema, delegateSchema, listSkillsSchema, useSkillSchema, bashSchema, analyzeAllSchema, executePlanSchema, cleanupExecutePlanSchema, attemptCompletionSchema, searchToolDefinition, queryToolDefinition, extractToolDefinition, delegateToolDefinition, attemptCompletionToolDefinition, analyzeAllToolDefinition, bashToolDefinition, googleSearchToolDefinition, urlContextToolDefinition, searchDescription, queryDescription, extractDescription, delegateDescription, analyzeAllDescription, DEFAULT_VALID_TOOLS, RAW_CONTENT_PARAMS, LAST_INDEX_TOOLS;
 var init_common = __esm({
   "src/tools/common.js"() {
     "use strict";
@@ -11034,6 +11167,8 @@ Capabilities:
       "task",
       "attempt_completion"
     ];
+    RAW_CONTENT_PARAMS = /* @__PURE__ */ new Set(["content", "new_string", "old_string"]);
+    LAST_INDEX_TOOLS = /* @__PURE__ */ new Set(["attempt_completion", "create", "edit"]);
   }
 });
 
@@ -32036,6 +32171,13 @@ function createWrappedTools(baseTools) {
       baseTools.createTool.execute
     );
   }
+  if (baseTools.multiEditTool) {
+    wrappedTools.multiEditToolInstance = wrapToolWithEmitter(
+      baseTools.multiEditTool,
+      "multi_edit",
+      baseTools.multiEditTool.execute
+    );
+  }
   return wrappedTools;
 }
 var toolCallEmitter, activeToolExecutions, wrapToolWithEmitter, listFilesTool, searchFilesTool, listFilesToolInstance, searchFilesToolInstance;
@@ -32954,6 +33096,9 @@ function createTools(configOptions) {
   if (configOptions.allowEdit && isToolAllowed("create")) {
     tools2.createTool = createTool(configOptions);
   }
+  if (configOptions.allowEdit && isToolAllowed("multi_edit")) {
+    tools2.multiEditTool = multiEditTool(configOptions);
+  }
   return tools2;
 }
 function parseXmlToolCallWithThinking(xmlString, validTools) {
@@ -83452,6 +83597,9 @@ var init_ProbeAgent = __esm({
           if (wrappedTools.createToolInstance && isToolAllowed("create")) {
             this.toolImplementations.create = wrappedTools.createToolInstance;
           }
+          if (wrappedTools.multiEditToolInstance && isToolAllowed("multi_edit")) {
+            this.toolImplementations.multi_edit = wrappedTools.multiEditToolInstance;
+          }
         }
         this.wrappedTools = wrappedTools;
         if (this.debug) {
@@ -84741,6 +84889,10 @@ Workspace: ${this.allowedFolders.join(", ")}`;
         }
         if (this.allowEdit && isToolAllowed("create")) {
           toolDefinitions += `${createToolDefinition}
+`;
+        }
+        if (this.allowEdit && isToolAllowed("multi_edit")) {
+          toolDefinitions += `${multiEditToolDefinition}
 `;
         }
         if (this.enableBash && isToolAllowed("bash")) {
@@ -84837,6 +84989,9 @@ The configuration is loaded from src/config.js lines 15-25 which contains the da
         if (this.allowEdit && isToolAllowed("create")) {
           availableToolsList += "- create: Create new files with specified content.\n";
         }
+        if (this.allowEdit && isToolAllowed("multi_edit")) {
+          availableToolsList += "- multi_edit: Apply multiple file edits in one call using a JSON array of operations.\n";
+        }
         if (this.enableDelegate && isToolAllowed("delegate")) {
           availableToolsList += "- delegate: Delegate big distinct tasks to specialized probe subagents.\n";
         }
@@ -85431,6 +85586,9 @@ You are working with a workspace. Available paths: ${workspaceDesc}
               if (this.allowEdit && this.allowedTools.isEnabled("create")) {
                 validTools.push("create");
               }
+              if (this.allowEdit && this.allowedTools.isEnabled("multi_edit")) {
+                validTools.push("multi_edit");
+              }
               if (this.enableBash && this.allowedTools.isEnabled("bash")) {
                 validTools.push("bash");
               }

package/build/agent/probeTool.js

@@ -256,6 +256,15 @@ export function createWrappedTools(baseTools) {
     );
   }
 
+  // Wrap multi_edit tool
+  if (baseTools.multiEditTool) {
+    wrappedTools.multiEditToolInstance = wrapToolWithEmitter(
+      baseTools.multiEditTool,
+      'multi_edit',
+      baseTools.multiEditTool.execute
+    );
+  }
+
   return wrappedTools;
 }
 

package/build/agent/tools.js

@@ -10,6 +10,7 @@ import {
   bashTool,
   editTool,
   createTool,
+  multiEditTool,
   DEFAULT_SYSTEM_MESSAGE,
   attemptCompletionSchema,
   attemptCompletionToolDefinition,
@@ -23,6 +24,7 @@ import {
   bashSchema,
   editSchema,
   createSchema,
+  multiEditSchema,
   searchToolDefinition,
   queryToolDefinition,
   extractToolDefinition,
@@ -33,6 +35,7 @@ import {
   bashToolDefinition,
   editToolDefinition,
   createToolDefinition,
+  multiEditToolDefinition,
   googleSearchToolDefinition,
   urlContextToolDefinition,
   parseXmlToolCall
@@ -87,6 +90,9 @@ export function createTools(configOptions) {
   if (configOptions.allowEdit && isToolAllowed('create')) {
     tools.createTool = createTool(configOptions);
   }
+  if (configOptions.allowEdit && isToolAllowed('multi_edit')) {
+    tools.multiEditTool = multiEditTool(configOptions);
+  }
   return tools;
 }
 
@@ -114,6 +120,7 @@ export {
   bashSchema,
   editSchema,
   createSchema,
+  multiEditSchema,
   attemptCompletionSchema,
   searchToolDefinition,
   queryToolDefinition,
@@ -125,6 +132,7 @@ export {
   bashToolDefinition,
   editToolDefinition,
   createToolDefinition,
+  multiEditToolDefinition,
   attemptCompletionToolDefinition,
   googleSearchToolDefinition,
   urlContextToolDefinition,

package/build/index.js

@@ -44,13 +44,15 @@ import {
 import {
 	editSchema,
 	createSchema,
+	multiEditSchema,
 	editToolDefinition,
-	createToolDefinition
+	createToolDefinition,
+	multiEditToolDefinition
 } from './tools/edit.js';
 import { searchTool, queryTool, extractTool, delegateTool, analyzeAllTool } from './tools/vercel.js';
 import { createExecutePlanTool, getExecutePlanToolDefinition, createCleanupExecutePlanTool, getCleanupExecutePlanToolDefinition } from './tools/executePlan.js';
 import { bashTool } from './tools/bash.js';
-import { editTool, createTool } from './tools/edit.js';
+import { editTool, createTool, multiEditTool } from './tools/edit.js';
 import { FileTracker } from './tools/fileTracker.js';
 import { ProbeAgent } from './agent/ProbeAgent.js';
 import { SimpleTelemetry, SimpleAppTracer, initializeSimpleTelemetryFromOptions } from './agent/simpleTelemetry.js';
@@ -99,6 +101,7 @@ export {
 	bashTool,
 	editTool,
 	createTool,
+	multiEditTool,
 	FileTracker,
 	// Export tool instances
 	listFilesToolInstance,
@@ -115,6 +118,7 @@ export {
 	bashSchema,
 	editSchema,
 	createSchema,
+	multiEditSchema,
 	// Export tool definitions
 	searchToolDefinition,
 	queryToolDefinition,
@@ -127,6 +131,7 @@ export {
 	bashToolDefinition,
 	editToolDefinition,
 	createToolDefinition,
+	multiEditToolDefinition,
 	googleSearchToolDefinition,
 	urlContextToolDefinition,
 	// Export parser function

package/build/tools/common.js

@@ -5,7 +5,7 @@
 
 import { z } from 'zod';
 import { resolve, isAbsolute } from 'path';
-import { editSchema, createSchema } from './edit.js';
+import { editSchema, createSchema, multiEditSchema } from './edit.js';
 import { taskSchema } from '../agent/tasks/taskTool.js';
 
 // Common schemas for tool parameters (used for internal execution after XML parsing)
@@ -492,7 +492,8 @@ function getValidParamsForTool(toolName) {
 		task: taskSchema,
 		attempt_completion: attemptCompletionSchema,
 		edit: editSchema,
-		create: createSchema
+		create: createSchema,
+		multi_edit: multiEditSchema
 	};
 
 	const schema = schemaMap[toolName];
@@ -538,6 +539,15 @@ export function unescapeXmlEntities(str) {
 		.replace(/&/g, '&');
 }
 
+// Parameters that contain arbitrary code/file content — use lastIndexOf for closing tag
+// to handle cases where the content itself contains the closing tag string.
+const RAW_CONTENT_PARAMS = new Set(['content', 'new_string', 'old_string']);
+
+// Tools whose content can include their own closing tag string (e.g., file content
+// containing </create> or </edit>). Use lastIndexOf for outer tag boundary, same
+// strategy already used for attempt_completion.
+const LAST_INDEX_TOOLS = new Set(['attempt_completion', 'create', 'edit']);
+
 // Simple XML parser helper - safer string-based approach
 export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 	// Find the tool that appears EARLIEST in the string
@@ -564,13 +574,13 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 	const closeTag = `</${toolName}>`;
 	const openIndex = earliestOpenIndex;
 
-	// For attempt_completion, use lastIndexOf to find the LAST occurrence of closing tag
-	// This prevents issues where the content contains the closing tag string (e.g., in regex patterns)
-	// For other tools, use indexOf from the opening tag position
+	// For tools that contain arbitrary content (file content, code), use lastIndexOf
+	// to find the LAST occurrence of the closing tag. This prevents issues where the
+	// content itself contains the closing tag string (e.g., file content with </create>).
+	// For other tools, use indexOf from the opening tag position.
 	let closeIndex;
-	if (toolName === 'attempt_completion') {
+	if (LAST_INDEX_TOOLS.has(toolName)) {
 		// Find the last occurrence of the closing tag in the entire string
-		// This assumes attempt_completion doesn't have nested tags of the same name
 		closeIndex = xmlString.lastIndexOf(closeTag);
 		// Make sure the closing tag is after the opening tag
 		if (closeIndex !== -1 && closeIndex <= openIndex + openTag.length) {
@@ -610,7 +620,19 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 			continue; // Parameter not found
 		}
 
-		let paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
+		// For raw content params (file content, code), use lastIndexOf to find the
+		// LAST closing tag — the content itself may contain the closing tag string.
+		// For other params (file_path, overwrite, etc.), use indexOf (first match).
+		let paramCloseIndex;
+		if (RAW_CONTENT_PARAMS.has(paramName)) {
+			paramCloseIndex = innerContent.lastIndexOf(paramCloseTag);
+			// Ensure it's after the opening tag
+			if (paramCloseIndex !== -1 && paramCloseIndex <= paramOpenIndex + paramOpenTag.length) {
+				paramCloseIndex = -1;
+			}
+		} else {
+			paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
+		}
 
 		// Handle unclosed parameter tags - use content until next tag or end of content
 		if (paramCloseIndex === -1) {
@@ -626,23 +648,34 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 			paramCloseIndex = nextTagIndex;
 		}
 
-		let paramValue = unescapeXmlEntities(innerContent.substring(
+		const rawValue = innerContent.substring(
 			paramOpenIndex + paramOpenTag.length,
 			paramCloseIndex
-		).trim());
-
-		// Basic type inference (can be improved)
-		if (paramValue.toLowerCase() === 'true') {
-			paramValue = true;
-		} else if (paramValue.toLowerCase() === 'false') {
-			paramValue = false;
-		} else if (!isNaN(paramValue) && paramValue.trim() !== '') {
-			// Check if it's potentially a number (handle integers and floats)
-			const num = Number(paramValue);
-			if (Number.isFinite(num)) { // Use Number.isFinite to avoid Infinity/NaN
-				paramValue = num;
+		);
+
+		// For raw content params, preserve whitespace (only strip XML formatting newlines).
+		// For other params, trim all whitespace.
+		let paramValue;
+		if (RAW_CONTENT_PARAMS.has(paramName)) {
+			paramValue = unescapeXmlEntities(rawValue.replace(/^\n/, '').replace(/\n$/, ''));
+		} else {
+			paramValue = unescapeXmlEntities(rawValue.trim());
+		}
+
+		// Type coercion for non-content params only (content/new_string/old_string must stay strings)
+		if (!RAW_CONTENT_PARAMS.has(paramName)) {
+			if (paramValue.toLowerCase() === 'true') {
+				paramValue = true;
+			} else if (paramValue.toLowerCase() === 'false') {
+				paramValue = false;
+			} else if (!isNaN(paramValue) && paramValue.trim() !== '') {
+				// Check if it's potentially a number (handle integers and floats)
+				const num = Number(paramValue);
+				if (Number.isFinite(num)) { // Use Number.isFinite to avoid Infinity/NaN
+					paramValue = num;
+				}
+				// Keep as string if not a valid finite number
 			}
-			// Keep as string if not a valid finite number
 		}
 
 		params[paramName] = paramValue;
@@ -707,7 +740,7 @@ export function detectUnrecognizedToolCall(xmlString, validTools) {
 	const knownToolNames = [
 		'search', 'query', 'extract', 'listFiles', 'searchFiles',
 		'listSkills', 'useSkill', 'readImage', 'edit',
-		'create', 'delegate', 'bash', 'task', 'attempt_completion',
+		'create', 'multi_edit', 'delegate', 'bash', 'task', 'attempt_completion',
 		'attempt_complete', 'read_file', 'write_file', 'run_command',
 		'grep', 'find', 'cat', 'list_directory'
 	];