Merge legacy multi file edit tool removal into main

igorcosta · Autohand Evolve · igorcosta · commit 18e07eee1b93 · 2026-05-07T11:30:39.000+12:00
Co-authored-by: Autohand Evolve &lt;code-noreply@autohand.ai&gt;
diff --git a/README.md b/README.md
@@ -297,7 +297,7 @@ Autohand Code CLI includes 40+ tools for autonomous coding:
 
 ### File Operations
 
-`read_file`, `write_file`, `append_file`, `apply_patch`, `search`, `search_replace`, `semantic_search`, `list_tree`, `create_directory`, `delete_path`, `rename_path`, `copy_path`, `multi_file_edit`
+`read_file`, `write_file`, `append_file`, `apply_patch`, `search`, `search_replace`, `semantic_search`, `list_tree`, `create_directory`, `delete_path`, `rename_path`, `copy_path`
 
 ### Git Operations
 
diff --git a/docs/agent-skills.md b/docs/agent-skills.md
@@ -182,7 +182,6 @@ Skills can specify which tools they need via the `allowed-tools` field. Availabl
 | `delete_path` | Delete files/directories |
 | `rename_path` | Rename/move files |
 | `copy_path` | Copy files/directories |
-| `multi_file_edit` | Edit multiple files atomically |
 
 ### Git Operations
 
diff --git a/docs/cc-src-tool-gap-analysis.md b/docs/cc-src-tool-gap-analysis.md
@@ -31,7 +31,7 @@ The main gaps versus `cc-src` are not basic file/shell tools. They are orchestra
 | cc-src tool/category | Autohand equivalent | Gap | Priority |
 | --- | --- | --- | --- |
 | `FILE_READ_TOOL_NAME` | `read_file` | Covered | Low |
-| `FILE_EDIT_TOOL_NAME` | `apply_patch`, `multi_file_edit` style edits via executor paths | Covered, but naming differs | Low |
+| `FILE_EDIT_TOOL_NAME` | `apply_patch` style edits via executor paths | Covered, but naming differs | Low |
 | `FILE_WRITE_TOOL_NAME` | `write_file`, `append_file` | Covered | Low |
 | `GLOB_TOOL_NAME` | `glob` | Covered | Low |
 | `GREP_TOOL_NAME` | `find`, `search`, `search_with_context` | Covered, and broader | Low |
diff --git a/docs/config-reference.md b/docs/config-reference.md
@@ -599,7 +599,7 @@ When you approve a file operation (edit, write, delete), it's automatically save
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -616,7 +616,7 @@ When you approve a file operation (edit, write, delete), it's automatically save
 
 **Pattern format:**
 
-- `tool_name:path` - For file operations (e.g., `multi_file_edit:src/file.ts`)
+- `tool_name:path` - For file operations (e.g., `apply_patch:src/file.ts`)
 - `tool_name:command args` - For commands (e.g., `run_command:npm test`)
 
 ### Viewing Permissions
diff --git a/docs/config-reference_es.md b/docs/config-reference_es.md
@@ -492,7 +492,7 @@ Cuando apruebas una operación de archivo (editar, escribir, eliminar), se guard
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -509,7 +509,7 @@ Cuando apruebas una operación de archivo (editar, escribir, eliminar), se guard
 
 **Formato de patrón:**
 
-- `nombre_herramienta:ruta` - Para operaciones de archivo (ej. `multi_file_edit:src/file.ts`)
+- `nombre_herramienta:ruta` - Para operaciones de archivo (ej. `apply_patch:src/file.ts`)
 - `nombre_herramienta:comando args` - Para comandos (ej. `run_command:npm test`)
 
 ### Visualizando Permisos
diff --git a/docs/config-reference_hi.md b/docs/config-reference_hi.md
@@ -493,7 +493,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -510,7 +510,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
 
 **पैटर्न फॉर्मेट:**
 
-- `tool_name:path` - फाइल ऑपरेशन के लिए (जैसे `multi_file_edit:src/file.ts`)
+- `tool_name:path` - फाइल ऑपरेशन के लिए (जैसे `apply_patch:src/file.ts`)
 - `tool_name:command args` - कमांड के लिए (जैसे `run_command:npm test`)
 
 ### अनुमतियां देखना
diff --git a/docs/config-reference_id.md b/docs/config-reference_id.md
@@ -464,7 +464,7 @@ Ketika Anda menyetujui operasi file (edit, tulis, hapus), secara otomatis disimp
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -481,7 +481,7 @@ Ketika Anda menyetujui operasi file (edit, tulis, hapus), secara otomatis disimp
 
 **Format pola:**
 
-- `nama_tool:path` - Untuk operasi file (mis. `multi_file_edit:src/file.ts`)
+- `nama_tool:path` - Untuk operasi file (mis. `apply_patch:src/file.ts`)
 - `nama_tool:perintah args` - Untuk perintah (mis. `run_command:npm test`)
 
 ### Melihat Izin
diff --git a/docs/config-reference_ja.md b/docs/config-reference_ja.md
@@ -506,7 +506,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -523,7 +523,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
 
 **パターン形式：**
 
-- `tool_name:path` - ファイル操作用（例：`multi_file_edit:src/file.ts`）
+- `tool_name:path` - ファイル操作用（例：`apply_patch:src/file.ts`）
 - `tool_name:command args` - コマンド用（例：`run_command:npm test`）
 
 ### 権限の表示
diff --git a/docs/config-reference_ko.md b/docs/config-reference_ko.md
@@ -493,7 +493,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -510,7 +510,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
 
 **패턴 형식:**
 
-- `도구_이름:경로` - 파일 작업용 (예: `multi_file_edit:src/file.ts`)
+- `도구_이름:경로` - 파일 작업용 (예: `apply_patch:src/file.ts`)
 - `도구_이름:명령 인수` - 명령어용 (예: `run_command:npm test`)
 
 ---
diff --git a/docs/config-reference_ptBR.md b/docs/config-reference_ptBR.md
@@ -507,7 +507,7 @@ Quando você aprova uma operação de arquivo (editar, escrever, excluir), ela 
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -524,7 +524,7 @@ Quando você aprova uma operação de arquivo (editar, escrever, excluir), ela 
 
 **Formato do padrão:**
 
-- `nome_ferramenta:caminho` - Para operações de arquivo (ex: `multi_file_edit:src/file.ts`)
+- `nome_ferramenta:caminho` - Para operações de arquivo (ex: `apply_patch:src/file.ts`)
 - `nome_ferramenta:comando args` - Para comandos (ex: `run_command:npm test`)
 
 ### Visualizando Permissões
diff --git a/docs/config-reference_zh.md b/docs/config-reference_zh.md
@@ -493,7 +493,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
   "version": 1,
   "permissions": {
     "whitelist": [
-      "multi_file_edit:src/components/Button.tsx",
+      "apply_patch:src/components/Button.tsx",
       "write_file:package.json",
       "run_command:bun test"
     ]
@@ -510,7 +510,7 @@ export AUTOHAND_SKIP_UPDATE_CHECK=1
 
 **模式格式：**
 
-- `工具名:路径` - 用于文件操作（例如：`multi_file_edit:src/file.ts`）
+- `工具名:路径` - 用于文件操作（例如：`apply_patch:src/file.ts`）
 - `工具名:命令 参数` - 用于命令（例如：`run_command:npm test`）
 
 ### 查看权限
diff --git a/src/core/agent/SystemPromptBuilder.ts b/src/core/agent/SystemPromptBuilder.ts
@@ -130,7 +130,7 @@ export class SystemPromptBuilder {
       '  - Content search: `fff_grep(query="UserController")` or `fff_grep(query="async function.*login")`',
       '',
       '### Phase 3: Implementation',
-      '1. Write code using `write_file`, `search_replace`, `apply_patch`, or `multi_file_edit`.',
+      '1. Write code using `apply_patch`, `write_file`, or `search_replace`.',
       '2. Make small, logical changes with clear reasoning in your "thought" field.',
       '3. Destructive operations (delete_path, run_command with rm/sudo) require explicit user approval. Clearly justify them.',
       '',
diff --git a/src/core/toolManager.ts b/src/core/toolManager.ts
@@ -799,31 +799,6 @@ export const DEFAULT_TOOL_DEFINITIONS: ToolDefinition[] = [
       required: ['name', 'command']
     }
   },
-  {
-    name: 'multi_file_edit',
-    description: 'Apply multiple edits to a file',
-    parameters: {
-      type: 'object',
-      properties: {
-        file_path: { type: 'string', description: 'Relative path to the file' },
-        edits: {
-          type: 'array',
-          description: 'Array of {old_string, new_string, replace_all?}',
-          items: {
-            type: 'object',
-            properties: {
-              old_string: { type: 'string', description: 'Text to replace' },
-              new_string: { type: 'string', description: 'Replacement text' },
-              replace_all: { type: 'boolean', description: 'Replace all occurrences (default: false)' }
-            },
-            required: ['old_string', 'new_string']
-          }
-        }
-      },
-      required: ['file_path', 'edits']
-    },
-    requiresApproval: true
-  },
   {
     name: 'todo_write',
     description: 'Persist and update the todo list. Send the COMPLETE updated todo list each time (not incremental changes).',
diff --git a/src/permissions/yoloMode.ts b/src/permissions/yoloMode.ts
@@ -22,7 +22,6 @@ export interface YoloPattern {
 const DEFAULT_YOLO_FILE_TOOLS = [
   'read_file',
   'write_file',
-  'multi_file_edit',
   'list_dir',
   'file_search',
   'grep_search',
diff --git a/src/skills/autoSkill.ts b/src/skills/autoSkill.ts
@@ -33,7 +33,6 @@ export const AVAILABLE_TOOLS = {
     'delete_path',
     'rename_path',
     'copy_path',
-    'multi_file_edit',
   ],
   git: [
     'git_status',
diff --git a/tests/core/agent/SystemPromptBuilder.test.ts b/tests/core/agent/SystemPromptBuilder.test.ts
@@ -44,5 +44,7 @@ describe('SystemPromptBuilder', () => {
     expect(prompt).not.toContain('Text or pattern to find');
     expect(prompt).toContain('Exact tool schemas are selected per request');
     expect(prompt).toContain('Reflect Before Acting');
+    expect(prompt).toContain('Write code using `apply_patch`');
+    expect(prompt).not.toContain('multi_file_edit');
   });
 });
diff --git a/tests/skills/autoSkill.spec.ts b/tests/skills/autoSkill.spec.ts
@@ -25,6 +25,8 @@ describe('AVAILABLE_TOOLS', () => {
   it('exports categorized tool lists', () => {
     expect(AVAILABLE_TOOLS.file).toContain('read_file');
     expect(AVAILABLE_TOOLS.file).toContain('write_file');
+    expect(AVAILABLE_TOOLS.file).toContain('apply_patch');
+    expect(AVAILABLE_TOOLS.file).not.toContain('multi_file_edit');
     expect(AVAILABLE_TOOLS.git).toContain('git_status');
     expect(AVAILABLE_TOOLS.git).toContain('git_commit');
     expect(AVAILABLE_TOOLS.command).toContain('run_command');
diff --git a/tests/toolManager.spec.ts b/tests/toolManager.spec.ts
@@ -60,6 +60,13 @@ describe('ToolManager', () => {
     expect(names.has('glob')).toBe(false);
   });
 
+  it('does not expose legacy multi_file_edit by default', () => {
+    const names = new Set(DEFAULT_TOOL_DEFINITIONS.map((tool) => tool.name));
+
+    expect(names.has('apply_patch')).toBe(true);
+    expect(names.has('multi_file_edit')).toBe(false);
+  });
+
   it('exports PLAN_TOOL_DEFINITION as standalone constant', () => {
     expect(PLAN_TOOL_DEFINITION).toBeDefined();
     expect(PLAN_TOOL_DEFINITION.name).toBe('plan');
