open-agents-ai 0.12.0 → 0.12.2

package/dist/index.js

@@ -1170,7 +1170,7 @@ var init_shell = __esm({
         const timeout = args["timeout"] ?? this.defaultTimeout;
         const stdinInput = args["stdin"];
         const start = performance.now();
-        return new Promise((resolve14) => {
+        return new Promise((resolve15) => {
           const child = spawn("bash", ["-c", command], {
             cwd: this.workingDir,
             env: {
@@ -1223,7 +1223,7 @@ var init_shell = __esm({
               const combined = stdout + stderr;
               const looksInteractive = /\? .+[›>]|y\/n|yes\/no|\(Y\/n\)|\[y\/N\]/i.test(combined);
               const hint = looksInteractive ? " The command appears to be waiting for interactive input. Use non-interactive flags (e.g., --yes, --no-input) or provide input via the stdin parameter." : "";
-              resolve14({
+              resolve15({
                 success: false,
                 output: stdout,
                 error: `Command timed out after ${timeout}ms.${hint}`,
@@ -1232,7 +1232,7 @@ var init_shell = __esm({
               return;
             }
             const success = code === 0;
-            resolve14({
+            resolve15({
               success,
               output: stdout + (stderr && success ? `
 STDERR:
@@ -1243,7 +1243,7 @@ ${stderr}` : ""),
           });
           child.on("error", (err) => {
             clearTimeout(timer);
-            resolve14({
+            resolve15({
               success: false,
               output: stdout,
               error: err.message,
@@ -1747,24 +1747,50 @@ var init_web_search = __esm({
 // packages/execution/dist/tools/file-edit.js
 import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { resolve as resolve5 } from "node:path";
+function countOccurrences(haystack, needle) {
+  let count = 0;
+  let pos = 0;
+  while ((pos = haystack.indexOf(needle, pos)) !== -1) {
+    count++;
+    pos += needle.length;
+  }
+  return count;
+}
+function findMatchLines(haystack, needle) {
+  const lines = [];
+  let pos = 0;
+  while ((pos = haystack.indexOf(needle, pos)) !== -1) {
+    const lineNumber = haystack.slice(0, pos).split("\n").length;
+    lines.push(lineNumber);
+    pos += needle.length;
+  }
+  return lines;
+}
+function replaceAllOccurrences(haystack, needle, replacement) {
+  return haystack.split(needle).join(replacement);
+}
 var FileEditTool;
 var init_file_edit = __esm({
   "packages/execution/dist/tools/file-edit.js"() {
     "use strict";
     FileEditTool = class {
       name = "file_edit";
-      description = "Make a precise edit to a file by replacing an exact string match. More efficient than rewriting the entire file.";
+      description = "Make a precise edit to a file by replacing an exact string match. The old_string must be unique in the file unless replace_all is true. Use replace_all to rename variables or change repeated patterns throughout the file.";
       parameters = {
         type: "object",
         properties: {
           path: { type: "string", description: "Absolute or relative file path" },
           old_string: {
             type: "string",
-            description: "The exact string to search for and replace"
+            description: "The exact string to search for and replace. Must be unique in the file (or use replace_all)."
           },
           new_string: {
             type: "string",
             description: "The replacement string"
+          },
+          replace_all: {
+            type: "boolean",
+            description: "Replace ALL occurrences instead of just the first. Use for variable renames, import path changes, etc. Default: false"
           }
         },
         required: ["path", "old_string", "new_string"]
@@ -1777,25 +1803,45 @@ var init_file_edit = __esm({
         const filePath = args["path"];
         const oldString = args["old_string"];
         const newString = args["new_string"];
+        const replaceAll = args["replace_all"] === true;
         const start = performance.now();
         try {
           const fullPath = resolve5(this.workingDir, filePath);
           const content = await readFile2(fullPath, "utf-8");
-          const index = content.indexOf(oldString);
-          if (index === -1) {
+          const occurrences = countOccurrences(content, oldString);
+          if (occurrences === 0) {
+            return {
+              success: false,
+              output: "",
+              error: `old_string not found in ${filePath}. Read the file first to verify the exact content.`,
+              durationMs: performance.now() - start
+            };
+          }
+          if (!replaceAll && occurrences > 1) {
+            const matchLines = findMatchLines(content, oldString);
             return {
               success: false,
               output: "",
-              error: `old_string not found in ${fullPath}`,
+              error: `old_string is not unique \u2014 found ${occurrences} occurrences at lines ${matchLines.join(", ")}. Either include more surrounding context to make old_string unique, or set replace_all=true to replace all ${occurrences} occurrences.`,
               durationMs: performance.now() - start
             };
           }
-          const lineNumber = content.slice(0, index).split("\n").length;
-          const updated = content.slice(0, index) + newString + content.slice(index + oldString.length);
+          let updated;
+          let editedLines;
+          if (replaceAll) {
+            editedLines = findMatchLines(content, oldString);
+            updated = replaceAllOccurrences(content, oldString, newString);
+          } else {
+            const index = content.indexOf(oldString);
+            const lineNumber = content.slice(0, index).split("\n").length;
+            editedLines = [lineNumber];
+            updated = content.slice(0, index) + newString + content.slice(index + oldString.length);
+          }
           await writeFile2(fullPath, updated, "utf-8");
+          const linesInfo = editedLines.length === 1 ? `line ${editedLines[0]}` : `${editedLines.length} locations (lines ${editedLines.join(", ")})`;
           return {
             success: true,
-            output: `Edited ${fullPath} at line ${lineNumber}`,
+            output: `Edited ${filePath} at ${linesInfo}`,
             durationMs: performance.now() - start
           };
         } catch (error) {
@@ -2437,15 +2483,24 @@ var init_aiwg_workflow = __esm({
 });
 
 // packages/execution/dist/tools/batch-edit.js
-import { readFile as readFile5, writeFile as writeFile4, mkdir as mkdir3 } from "node:fs/promises";
-import { resolve as resolve9, dirname as dirname2 } from "node:path";
+import { readFile as readFile5, writeFile as writeFile4 } from "node:fs/promises";
+import { resolve as resolve9 } from "node:path";
+function countOccurrences2(haystack, needle) {
+  let count = 0;
+  let pos = 0;
+  while ((pos = haystack.indexOf(needle, pos)) !== -1) {
+    count++;
+    pos += needle.length;
+  }
+  return count;
+}
 var BatchEditTool;
 var init_batch_edit = __esm({
   "packages/execution/dist/tools/batch-edit.js"() {
     "use strict";
     BatchEditTool = class {
       name = "batch_edit";
-      description = "Make multiple precise edits across one or more files in a single call. More efficient than calling file_edit repeatedly. Each edit replaces an exact string match. Edits are applied in order within each file.";
+      description = "Make multiple precise edits across one or more files in a single call. More efficient than calling file_edit repeatedly. Each edit replaces an exact string match with uniqueness validation. Edits are applied in order within each file. Set replace_all on individual edits for bulk renames.";
       parameters = {
         type: "object",
         properties: {
@@ -2455,9 +2510,22 @@ var init_batch_edit = __esm({
             items: {
               type: "object",
               properties: {
-                path: { type: "string", description: "File path relative to project root" },
-                old_string: { type: "string", description: "Exact string to find and replace" },
-                new_string: { type: "string", description: "Replacement string" }
+                path: {
+                  type: "string",
+                  description: "File path relative to project root"
+                },
+                old_string: {
+                  type: "string",
+                  description: "Exact string to find and replace (must be unique unless replace_all)"
+                },
+                new_string: {
+                  type: "string",
+                  description: "Replacement string"
+                },
+                replace_all: {
+                  type: "boolean",
+                  description: "Replace all occurrences (for renames). Default: false"
+                }
               },
               required: ["path", "old_string", "new_string"]
             }
@@ -2485,7 +2553,12 @@ var init_batch_edit = __esm({
           const fullPath = resolve9(this.workingDir, edit.path);
           if (!byFile.has(fullPath))
             byFile.set(fullPath, []);
-          byFile.get(fullPath).push({ old_string: edit.old_string, new_string: edit.new_string });
+          byFile.get(fullPath).push({
+            old_string: edit.old_string,
+            new_string: edit.new_string,
+            replace_all: edit.replace_all,
+            relPath: edit.path
+          });
         }
         const results = [];
         let successCount = 0;
@@ -2494,15 +2567,26 @@ var init_batch_edit = __esm({
           try {
             let content = await readFile5(fullPath, "utf-8");
             for (const edit of fileEdits) {
-              const index = content.indexOf(edit.old_string);
-              if (index === -1) {
-                results.push(`SKIP: old_string not found in ${fullPath}`);
+              const occurrences = countOccurrences2(content, edit.old_string);
+              if (occurrences === 0) {
+                results.push(`SKIP: old_string not found in ${edit.relPath}`);
                 failCount++;
                 continue;
               }
-              const lineNumber = content.slice(0, index).split("\n").length;
-              content = content.slice(0, index) + edit.new_string + content.slice(index + edit.old_string.length);
-              results.push(`EDIT: ${fullPath} line ${lineNumber}`);
+              if (!edit.replace_all && occurrences > 1) {
+                results.push(`AMBIGUOUS: old_string has ${occurrences} matches in ${edit.relPath} \u2014 add more context or use replace_all`);
+                failCount++;
+                continue;
+              }
+              if (edit.replace_all) {
+                content = content.split(edit.old_string).join(edit.new_string);
+                results.push(`EDIT: ${edit.relPath} (${occurrences} replacements)`);
+              } else {
+                const index = content.indexOf(edit.old_string);
+                const lineNumber = content.slice(0, index).split("\n").length;
+                content = content.slice(0, index) + edit.new_string + content.slice(index + edit.old_string.length);
+                results.push(`EDIT: ${edit.relPath} line ${lineNumber}`);
+              }
               successCount++;
             }
             await writeFile4(fullPath, content, "utf-8");
@@ -2524,6 +2608,178 @@ ${results.join("\n")}`,
   }
 });
 
+// packages/execution/dist/tools/file-patch.js
+import { readFile as readFile6, writeFile as writeFile5, copyFile } from "node:fs/promises";
+import { resolve as resolve10 } from "node:path";
+var FilePatchTool;
+var init_file_patch = __esm({
+  "packages/execution/dist/tools/file-patch.js"() {
+    "use strict";
+    FilePatchTool = class {
+      name = "file_patch";
+      description = "Edit specific line ranges in a file. More precise than string matching for large files. Modes: 'replace' replaces lines start_line..end_line with new_content, 'insert_before' inserts before start_line, 'insert_after' inserts after start_line, 'delete' removes lines start_line..end_line. Use dry_run to preview changes.";
+      parameters = {
+        type: "object",
+        properties: {
+          path: {
+            type: "string",
+            description: "File path relative to project root"
+          },
+          start_line: {
+            type: "number",
+            description: "Starting line number (1-based, inclusive)"
+          },
+          end_line: {
+            type: "number",
+            description: "Ending line number (1-based, inclusive). Required for replace and delete modes. For single-line edits, set equal to start_line."
+          },
+          new_content: {
+            type: "string",
+            description: "Replacement content (for replace mode) or content to insert (for insert modes). Not needed for delete mode."
+          },
+          mode: {
+            type: "string",
+            enum: ["replace", "insert_before", "insert_after", "delete"],
+            description: "Edit mode. Default: replace"
+          },
+          dry_run: {
+            type: "boolean",
+            description: "Preview the diff without writing. Returns what would change. Default: false"
+          }
+        },
+        required: ["path", "start_line"]
+      };
+      workingDir;
+      constructor(workingDir) {
+        this.workingDir = workingDir;
+      }
+      async execute(args) {
+        const filePath = args["path"];
+        const startLine = args["start_line"];
+        const endLine = args["end_line"] ?? startLine;
+        const newContent = args["new_content"] ?? "";
+        const mode = args["mode"] ?? "replace";
+        const dryRun = args["dry_run"] === true;
+        const start = performance.now();
+        try {
+          if (!Number.isInteger(startLine) || startLine < 1) {
+            return {
+              success: false,
+              output: "",
+              error: "start_line must be a positive integer (1-based)",
+              durationMs: performance.now() - start
+            };
+          }
+          if (!Number.isInteger(endLine) || endLine < startLine) {
+            return {
+              success: false,
+              output: "",
+              error: `end_line (${endLine}) must be >= start_line (${startLine})`,
+              durationMs: performance.now() - start
+            };
+          }
+          const fullPath = resolve10(this.workingDir, filePath);
+          const content = await readFile6(fullPath, "utf-8");
+          const lines = content.split("\n");
+          const totalLines = lines.length;
+          if (startLine > totalLines) {
+            return {
+              success: false,
+              output: "",
+              error: `start_line ${startLine} exceeds file length (${totalLines} lines)`,
+              durationMs: performance.now() - start
+            };
+          }
+          const effectiveEnd = Math.min(endLine, totalLines);
+          const startIdx = startLine - 1;
+          const endIdx = effectiveEnd;
+          const newLines = newContent.length > 0 ? newContent.split("\n") : [];
+          let resultLines;
+          let description;
+          switch (mode) {
+            case "replace": {
+              const removedLines = lines.slice(startIdx, endIdx);
+              resultLines = [
+                ...lines.slice(0, startIdx),
+                ...newLines,
+                ...lines.slice(endIdx)
+              ];
+              description = `Replaced lines ${startLine}-${effectiveEnd} (${removedLines.length} lines \u2192 ${newLines.length} lines)`;
+              break;
+            }
+            case "insert_before": {
+              resultLines = [
+                ...lines.slice(0, startIdx),
+                ...newLines,
+                ...lines.slice(startIdx)
+              ];
+              description = `Inserted ${newLines.length} lines before line ${startLine}`;
+              break;
+            }
+            case "insert_after": {
+              resultLines = [
+                ...lines.slice(0, startIdx + 1),
+                ...newLines,
+                ...lines.slice(startIdx + 1)
+              ];
+              description = `Inserted ${newLines.length} lines after line ${startLine}`;
+              break;
+            }
+            case "delete": {
+              const removedLines = lines.slice(startIdx, endIdx);
+              resultLines = [...lines.slice(0, startIdx), ...lines.slice(endIdx)];
+              description = `Deleted lines ${startLine}-${effectiveEnd} (${removedLines.length} lines removed)`;
+              break;
+            }
+            default:
+              return {
+                success: false,
+                output: "",
+                error: `Unknown mode: ${mode}. Use replace, insert_before, insert_after, or delete.`,
+                durationMs: performance.now() - start
+              };
+          }
+          const oldSection = lines.slice(Math.max(0, startIdx - 2), Math.min(totalLines, endIdx + 2)).map((l, i) => `- ${String(Math.max(1, startLine - 2) + i).padStart(4)} | ${l}`).join("\n");
+          const newSectionStart = Math.max(0, startIdx - 2);
+          const newSectionEnd = Math.min(resultLines.length, startIdx + newLines.length + 2);
+          const newSection = resultLines.slice(newSectionStart, newSectionEnd).map((l, i) => `+ ${String(newSectionStart + 1 + i).padStart(4)} | ${l}`).join("\n");
+          const diff = `${description}
+
+Before:
+${oldSection}
+
+After:
+${newSection}`;
+          if (dryRun) {
+            return {
+              success: true,
+              output: `[DRY RUN] ${diff}
+
+File NOT modified. Remove dry_run to apply.`,
+              durationMs: performance.now() - start
+            };
+          }
+          await writeFile5(fullPath, resultLines.join("\n"), "utf-8");
+          return {
+            success: true,
+            output: `${filePath}: ${description} (${totalLines} \u2192 ${resultLines.length} total lines)
+
+${diff}`,
+            durationMs: performance.now() - start
+          };
+        } catch (error) {
+          return {
+            success: false,
+            output: "",
+            error: error instanceof Error ? error.message : String(error),
+            durationMs: performance.now() - start
+          };
+        }
+      }
+    };
+  }
+});
+
 // packages/execution/dist/tools/codebase-map.js
 import { readdirSync as readdirSync3, statSync as statSync3, readFileSync as readFileSync4, existsSync as existsSync4 } from "node:fs";
 import { join as join7, relative, extname } from "node:path";
@@ -3378,7 +3634,7 @@ Exit code: ${task.exitCode ?? "N/A"}`,
 
 // packages/execution/dist/tools/image.js
 import { existsSync as existsSync7, readFileSync as readFileSync6, statSync as statSync4 } from "node:fs";
-import { resolve as resolve10, extname as extname2, basename } from "node:path";
+import { resolve as resolve11, extname as extname2, basename } from "node:path";
 import { execSync as execSync7 } from "node:child_process";
 import { tmpdir } from "node:os";
 import { join as join10 } from "node:path";
@@ -3487,7 +3743,7 @@ var init_image = __esm({
         if (!rawPath) {
           return { success: false, output: "", error: "path is required", durationMs: 0 };
         }
-        const fullPath = resolve10(this.workingDir, rawPath);
+        const fullPath = resolve11(this.workingDir, rawPath);
         if (!existsSync7(fullPath)) {
           return { success: false, output: "", error: `File not found: ${rawPath}`, durationMs: Date.now() - start };
         }
@@ -3556,7 +3812,7 @@ ${ocrText}`);
       }
       async execute(args) {
         const start = Date.now();
-        const outputPath = args["output_path"] ? resolve10(this.workingDir, String(args["output_path"])) : join10(tmpdir(), `oa-screenshot-${Date.now()}.png`);
+        const outputPath = args["output_path"] ? resolve11(this.workingDir, String(args["output_path"])) : join10(tmpdir(), `oa-screenshot-${Date.now()}.png`);
         const delayMs = typeof args["delay_ms"] === "number" ? args["delay_ms"] : 0;
         const region = String(args["region"] ?? "full");
         if (delayMs > 0) {
@@ -3679,7 +3935,7 @@ ${ocrText}`);
         if (!rawPath) {
           return { success: false, output: "", error: "path is required", durationMs: 0 };
         }
-        const fullPath = resolve10(this.workingDir, rawPath);
+        const fullPath = resolve11(this.workingDir, rawPath);
         if (!existsSync7(fullPath)) {
           return { success: false, output: "", error: `File not found: ${rawPath}`, durationMs: Date.now() - start };
         }
@@ -3892,7 +4148,7 @@ var init_custom_tool = __esm({
       }
       /** Execute a single shell command and return output */
       runCommand(command) {
-        return new Promise((resolve14) => {
+        return new Promise((resolve15) => {
           const child = spawn3("bash", ["-c", command], {
             cwd: this.workingDir,
             env: { ...process.env, CI: "true", NO_COLOR: "1" },
@@ -3917,11 +4173,11 @@ var init_custom_tool = __esm({
               child.kill("SIGTERM");
             } catch {
             }
-            resolve14({ success: false, output: stdout, error: "Command timed out after 60s" });
+            resolve15({ success: false, output: stdout, error: "Command timed out after 60s" });
           }, 6e4);
           child.on("close", (code) => {
             clearTimeout(timer);
-            resolve14({
+            resolve15({
               success: code === 0,
               output: stdout + (stderr && code === 0 ? `
 STDERR:
@@ -3931,7 +4187,7 @@ ${stderr}` : ""),
           });
           child.on("error", (err) => {
             clearTimeout(timer);
-            resolve14({ success: false, output: stdout, error: err.message });
+            resolve15({ success: false, output: stdout, error: err.message });
           });
         });
       }
@@ -4327,6 +4583,7 @@ var init_dist2 = __esm({
     init_aiwg_health();
     init_aiwg_workflow();
     init_batch_edit();
+    init_file_patch();
     init_codebase_map();
     init_diagnostic();
     init_git_info();
@@ -5448,8 +5705,8 @@ var init_code_retriever = __esm({
         });
       }
       async getFileContent(filePath, startLine, endLine) {
-        const { readFile: readFile9 } = await import("node:fs/promises");
-        const content = await readFile9(filePath, "utf-8");
+        const { readFile: readFile10 } = await import("node:fs/promises");
+        const content = await readFile10(filePath, "utf-8");
         if (startLine === void 0)
           return content;
         const lines = content.split("\n");
@@ -5464,7 +5721,7 @@ var init_code_retriever = __esm({
 // packages/retrieval/dist/lexicalSearch.js
 import { execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
-import { readFile as readFile6, readdir, stat } from "node:fs/promises";
+import { readFile as readFile7, readdir, stat } from "node:fs/promises";
 import { join as join12, extname as extname3 } from "node:path";
 async function searchByPath(pathPattern, options) {
   const allFiles = await collectFiles(options.rootDir, options.includeGlobs ?? DEFAULT_INCLUDE_GLOBS, options.excludeGlobs ?? DEFAULT_EXCLUDE_GLOBS);
@@ -5570,7 +5827,7 @@ async function searchWithNodeFallback(pattern, kind, options) {
     if (results.length >= maxMatches)
       break;
     try {
-      const content = await readFile6(filePath, "utf-8");
+      const content = await readFile7(filePath, "utf-8");
       const contentLines = content.split("\n");
       for (let i = 0; i < contentLines.length; i++) {
         if (results.length >= maxMatches)
@@ -5781,7 +6038,7 @@ var init_graphExpand = __esm({
 });
 
 // packages/retrieval/dist/snippetPacker.js
-import { readFile as readFile7 } from "node:fs/promises";
+import { readFile as readFile8 } from "node:fs/promises";
 import { join as join13 } from "node:path";
 async function packSnippets(requests, opts = {}) {
   const maxTokens = opts.maxTokens ?? DEFAULT_MAX_TOKENS;
@@ -5811,7 +6068,7 @@ async function extractSnippet(req, repoRoot, contextLines = DEFAULT_CONTEXT_LINE
   const absPath = req.filePath.startsWith("/") ? req.filePath : join13(repoRoot, req.filePath);
   let content;
   try {
-    content = await readFile7(absPath, "utf-8");
+    content = await readFile8(absPath, "utf-8");
   } catch {
     return null;
   }
@@ -6970,7 +7227,8 @@ var init_agenticRunner = __esm({
 
 - file_read: Read file contents (always read before editing). Supports path, offset, limit.
 - file_write: Create or overwrite a file with complete content
-- file_edit: Make a precise string replacement in a file (preferred over rewriting). Uses old_string/new_string.
+- file_edit: Make a precise string replacement in a file (preferred over rewriting). Uses old_string/new_string. old_string must be unique unless replace_all=true. Use replace_all for variable renames.
+- file_patch: Edit specific line ranges in large files. Modes: replace (swap lines), insert_before, insert_after, delete. Use dry_run to preview. Best for large files (500+ lines) where string matching is fragile.
 - find_files: Find files by name pattern (glob). Searches recursively, excludes node_modules/.git.
 - grep_search: Search file contents with regex. Returns matching lines with paths and line numbers.
 - shell: Execute any shell command (tests, builds, git, npm, etc.). Supports stdin parameter for input. Commands run with CI=true for non-interactive mode.
@@ -7104,7 +7362,11 @@ If you notice you're performing the SAME multi-step sequence for the 3rd time or
 
 - Use grep_search to find specific code instead of reading many files
 - Use file_edit for targeted changes instead of full file rewrites
-- When files are long, use file_read with offset/limit to read specific sections
+- Use file_edit with replace_all=true for variable/function renames across a file
+- If file_edit fails with "not unique", include more surrounding context in old_string
+- For large files (500+ lines): use file_read with offset/limit, then file_patch with line numbers
+- file_patch with dry_run=true lets you preview changes before applying them
+- batch_edit to apply multiple edits across files in one call (reduces turns)
 - Focus on error messages in shell output \u2014 skip verbose build logs
 - Don't read files you don't need to modify`;
     AgenticRunner = class {
@@ -7472,6 +7734,8 @@ ${marker}` : marker);
       // Context compaction
       // -------------------------------------------------------------------------
       compactMessages(messages) {
+        if (messages.length < 3)
+          return messages;
         const totalChars = messages.reduce((sum, m) => {
           if (typeof m.content === "string")
             return sum + m.content.length;
@@ -7486,8 +7750,22 @@ ${marker}` : marker);
         }
         const keepRecent = 12;
         const head = messages.slice(0, 2);
-        const recent = messages.slice(-keepRecent);
-        const middle = messages.slice(2, -keepRecent);
+        if (messages.length <= 2 + keepRecent)
+          return messages;
+        let recentStart = messages.length - keepRecent;
+        while (recentStart > 2) {
+          const msg = messages[recentStart];
+          if (msg && msg.role === "tool") {
+            recentStart--;
+          } else {
+            break;
+          }
+        }
+        if (recentStart > 2 && messages[recentStart]?.role === "tool") {
+          recentStart = Math.max(2, recentStart - 1);
+        }
+        const recent = messages.slice(recentStart);
+        const middle = messages.slice(2, recentStart);
         if (middle.length === 0)
           return messages;
         let previousSummary = "";
@@ -7514,7 +7792,10 @@ ${combinedSummary}
 
 [Continue from the recent context below. Do not repeat work already completed above.]`
         };
-        return [...head, compactionMsg, ...recent];
+        const result = [...head, compactionMsg, ...recent];
+        if (result.length < 2)
+          return messages;
+        return result;
       }
       /**
        * Progressive summarization: merge an older compacted summary with a newer one.
@@ -8490,6 +8771,7 @@ var init_render = __esm({
       "file_read",
       "file_write",
       "file_edit",
+      "file_patch",
       "shell",
       "grep_search",
       "find_files",
@@ -8769,14 +9051,14 @@ async function handleUpdate() {
   try {
     const { createRequire: createRequire4 } = await import("node:module");
     const { fileURLToPath: fileURLToPath3 } = await import("node:url");
-    const { dirname: dirname5, join: join23 } = await import("node:path");
+    const { dirname: dirname4, join: join24 } = await import("node:path");
     const { existsSync: existsSync15 } = await import("node:fs");
     const req = createRequire4(import.meta.url);
-    const thisDir = dirname5(fileURLToPath3(import.meta.url));
+    const thisDir = dirname4(fileURLToPath3(import.meta.url));
     const candidates = [
-      join23(thisDir, "..", "package.json"),
-      join23(thisDir, "..", "..", "package.json"),
-      join23(thisDir, "..", "..", "..", "package.json")
+      join24(thisDir, "..", "package.json"),
+      join24(thisDir, "..", "..", "package.json"),
+      join24(thisDir, "..", "..", "..", "package.json")
     ];
     for (const pkgPath of candidates) {
       if (existsSync15(pkgPath)) {
@@ -8941,8 +9223,8 @@ function modelSupportsToolCalling(modelName) {
   return false;
 }
 function ask(rl, question) {
-  return new Promise((resolve14) => {
-    rl.question(question, (answer) => resolve14(answer.trim()));
+  return new Promise((resolve15) => {
+    rl.question(question, (answer) => resolve15(answer.trim()));
   });
 }
 function pullModelWithAutoUpdate(tag) {
@@ -10688,6 +10970,8 @@ function describeToolCall(toolName, args) {
       return `Writing ${file}`;
     case "file_edit":
       return `Editing ${file}`;
+    case "file_patch":
+      return `Patching ${file}`;
     case "shell": {
       const cmd = String(args["command"] ?? "");
       if (/npm\s+test|vitest|jest|mocha/.test(cmd))
@@ -11038,7 +11322,7 @@ var init_voice = __esm({
         const cmd = this.getPlayCommand(path);
         if (!cmd)
           return;
-        return new Promise((resolve14) => {
+        return new Promise((resolve15) => {
           const child = nodeSpawn(cmd[0], cmd.slice(1), {
             stdio: "ignore",
             detached: false
@@ -11047,12 +11331,12 @@ var init_voice = __esm({
           child.on("close", () => {
             if (this.currentPlayback === child)
               this.currentPlayback = null;
-            resolve14();
+            resolve15();
           });
           child.on("error", () => {
             if (this.currentPlayback === child)
               this.currentPlayback = null;
-            resolve14();
+            resolve15();
           });
           setTimeout(() => {
             if (this.currentPlayback === child) {
@@ -11062,7 +11346,7 @@ var init_voice = __esm({
               }
               this.currentPlayback = null;
             }
-            resolve14();
+            resolve15();
           }, 15e3);
         });
       }
@@ -11492,10 +11776,125 @@ var init_stream_renderer = __esm({
   }
 });
 
+// packages/cli/dist/tui/edit-history.js
+import { appendFileSync, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join18 } from "node:path";
+function createEditHistoryLogger(repoRoot, sessionId) {
+  const historyDir = join18(repoRoot, ".oa", "history");
+  const logPath = join18(historyDir, "edits.jsonl");
+  try {
+    mkdirSync7(historyDir, { recursive: true });
+  } catch {
+  }
+  function logToolCall(toolName, toolArgs, success) {
+    if (!EDIT_TOOLS.has(toolName))
+      return;
+    const entry = {
+      ts: (/* @__PURE__ */ new Date()).toISOString(),
+      tool: toolName,
+      files: extractFilePaths(toolName, toolArgs),
+      summary: buildSummary(toolName, toolArgs),
+      success,
+      session: sessionId,
+      args: sanitizeArgs(toolName, toolArgs)
+    };
+    try {
+      appendFileSync(logPath, JSON.stringify(entry) + "\n", "utf-8");
+    } catch {
+    }
+  }
+  return { logToolCall, logPath };
+}
+function extractFilePaths(tool, args) {
+  if (tool === "batch_edit") {
+    const edits = args["edits"];
+    if (Array.isArray(edits)) {
+      const paths = new Set(edits.map((e) => e.path).filter(Boolean));
+      return [...paths];
+    }
+    return [];
+  }
+  const path = args["path"];
+  return path ? [path] : [];
+}
+function buildSummary(tool, args) {
+  switch (tool) {
+    case "file_edit": {
+      const old = args["old_string"] ?? "";
+      const replaceAll = args["replace_all"] === true;
+      const preview = old.length > 60 ? old.slice(0, 60) + "..." : old;
+      return replaceAll ? `Replace all "${preview}"` : `Edit: "${preview}" \u2192 new`;
+    }
+    case "file_write": {
+      const content = args["content"] ?? "";
+      return `Write ${content.length} bytes`;
+    }
+    case "file_patch": {
+      const mode = args["mode"] ?? "replace";
+      const start = args["start_line"];
+      const end = args["end_line"];
+      const dryRun = args["dry_run"] === true;
+      return `${dryRun ? "[dry-run] " : ""}${mode} lines ${start}${end ? `-${end}` : ""}`;
+    }
+    case "batch_edit": {
+      const edits = args["edits"];
+      return `Batch: ${Array.isArray(edits) ? edits.length : 0} edits`;
+    }
+    default:
+      return tool;
+  }
+}
+function sanitizeArgs(tool, args) {
+  const sanitized = { ...args };
+  if (tool === "file_write" && typeof sanitized["content"] === "string") {
+    const content = sanitized["content"];
+    sanitized["content"] = `[${content.length} bytes]`;
+  }
+  if (typeof sanitized["old_string"] === "string") {
+    const s = sanitized["old_string"];
+    sanitized["old_string"] = s.length > 120 ? s.slice(0, 120) + "..." : s;
+  }
+  if (typeof sanitized["new_string"] === "string") {
+    const s = sanitized["new_string"];
+    sanitized["new_string"] = s.length > 120 ? s.slice(0, 120) + "..." : s;
+  }
+  if (typeof sanitized["new_content"] === "string") {
+    const s = sanitized["new_content"];
+    sanitized["new_content"] = s.length > 120 ? s.slice(0, 120) + "..." : s;
+  }
+  if (tool === "batch_edit" && Array.isArray(sanitized["edits"])) {
+    sanitized["edits"] = sanitized["edits"].map((e) => {
+      const se = { ...e };
+      if (typeof se["old_string"] === "string") {
+        const s = se["old_string"];
+        se["old_string"] = s.length > 80 ? s.slice(0, 80) + "..." : s;
+      }
+      if (typeof se["new_string"] === "string") {
+        const s = se["new_string"];
+        se["new_string"] = s.length > 80 ? s.slice(0, 80) + "..." : s;
+      }
+      return se;
+    });
+  }
+  return sanitized;
+}
+var EDIT_TOOLS;
+var init_edit_history = __esm({
+  "packages/cli/dist/tui/edit-history.js"() {
+    "use strict";
+    EDIT_TOOLS = /* @__PURE__ */ new Set([
+      "file_edit",
+      "file_write",
+      "file_patch",
+      "batch_edit"
+    ]);
+  }
+});
+
 // packages/cli/dist/tui/interactive.js
 import * as readline2 from "node:readline";
 import { cwd } from "node:process";
-import { resolve as resolve11, join as join18, dirname as dirname3 } from "node:path";
+import { resolve as resolve12, join as join19, dirname as dirname2 } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 import { fileURLToPath } from "node:url";
 import { readFileSync as readFileSync11 } from "node:fs";
@@ -11504,11 +11903,11 @@ import { extname as extname5 } from "node:path";
 function getVersion() {
   try {
     const require2 = createRequire2(import.meta.url);
-    const thisDir = dirname3(fileURLToPath(import.meta.url));
+    const thisDir = dirname2(fileURLToPath(import.meta.url));
     const candidates = [
-      join18(thisDir, "..", "package.json"),
-      join18(thisDir, "..", "..", "package.json"),
-      join18(thisDir, "..", "..", "..", "package.json")
+      join19(thisDir, "..", "package.json"),
+      join19(thisDir, "..", "..", "package.json"),
+      join19(thisDir, "..", "..", "..", "package.json")
     ];
     for (const pkgPath of candidates) {
       if (existsSync13(pkgPath)) {
@@ -11568,6 +11967,7 @@ function buildTools(repoRoot, config) {
     new AiwgWorkflowTool(repoRoot),
     // Advanced tools (mirroring Claude Code capabilities)
     new BatchEditTool(repoRoot),
+    new FilePatchTool(repoRoot),
     new CodebaseMapTool(repoRoot),
     new DiagnosticTool(repoRoot),
     new GitInfoTool(repoRoot),
@@ -11682,6 +12082,9 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
   runner.registerTools(buildTools(repoRoot, config));
   const filesTouched = /* @__PURE__ */ new Set();
   const toolSequence = [];
+  const editSessionId = `task-${Date.now()}`;
+  const editHistory = createEditHistoryLogger(repoRoot, editSessionId);
+  let lastToolCall = null;
   runner.onEvent((event) => {
     switch (event.type) {
       case "tool_call":
@@ -11691,10 +12094,11 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
         });
         if (event.toolArgs?.path && typeof event.toolArgs.path === "string") {
           const name = event.toolName ?? "";
-          if (name === "file_write" || name === "file_edit" || name === "batch_edit") {
+          if (name === "file_write" || name === "file_edit" || name === "file_patch" || name === "batch_edit") {
             filesTouched.add(event.toolArgs.path);
           }
         }
+        lastToolCall = { name: event.toolName ?? "unknown", args: event.toolArgs ?? {} };
         if (voice?.enabled) {
           const desc = describeToolCall(event.toolName ?? "unknown", event.toolArgs ?? {});
           renderVoiceText(desc);
@@ -11703,6 +12107,10 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
         renderToolCallStart(event.toolName ?? "unknown", event.toolArgs ?? {});
         break;
       case "tool_result":
+        if (lastToolCall) {
+          editHistory.logToolCall(lastToolCall.name, lastToolCall.args, event.success ?? false);
+          lastToolCall = null;
+        }
         renderToolResult(event.toolName ?? "unknown", event.success ?? false, event.content ?? "");
         if (voice?.enabled && !(event.success ?? true)) {
           const desc = describeToolResult(event.toolName ?? "unknown", false);
@@ -11801,7 +12209,7 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
   return { runner, promise };
 }
 async function startInteractive(config, repoPath) {
-  const repoRoot = resolve11(repoPath ?? cwd());
+  const repoRoot = resolve12(repoPath ?? cwd());
   const isResumed = !!process.env.__OA_RESUMED;
   if (isResumed) {
     delete process.env.__OA_RESUMED;
@@ -12015,11 +12423,11 @@ ${c2.dim("Goodbye!")}
       }
     }
     const cleanPath = input.replace(/^['"]|['"]$/g, "").trim();
-    const isImage = isImagePath(cleanPath) && existsSync13(resolve11(repoRoot, cleanPath));
+    const isImage = isImagePath(cleanPath) && existsSync13(resolve12(repoRoot, cleanPath));
     if (activeTask) {
       if (isImage) {
         try {
-          const imgPath = resolve11(repoRoot, cleanPath);
+          const imgPath = resolve12(repoRoot, cleanPath);
           const imgBuffer = readFileSync11(imgPath);
           const base64 = imgBuffer.toString("base64");
           const ext = extname5(cleanPath).toLowerCase();
@@ -12130,7 +12538,7 @@ ${c2.dim("(Use /quit to exit)")}
   });
 }
 async function runWithTUI(task, config, repoPath) {
-  const repoRoot = resolve11(repoPath ?? cwd());
+  const repoRoot = resolve12(repoPath ?? cwd());
   const needsSetup = isFirstRun() || !await isModelAvailable(config);
   if (needsSetup && config.backendType === "ollama") {
     const setupModel = await runSetupWizard(config);
@@ -12177,6 +12585,7 @@ var init_interactive = __esm({
     init_carousel();
     init_voice();
     init_stream_renderer();
+    init_edit_history();
     taskManager = new BackgroundTaskManager();
   }
 });
@@ -12210,9 +12619,9 @@ var init_run = __esm({
 // packages/indexer/dist/codebase-indexer.js
 import { glob } from "glob";
 import ignore from "ignore";
-import { readFile as readFile8, stat as stat2 } from "node:fs/promises";
+import { readFile as readFile9, stat as stat2 } from "node:fs/promises";
 import { createHash } from "node:crypto";
-import { join as join19, relative as relative3, extname as extname6, basename as basename4 } from "node:path";
+import { join as join20, relative as relative3, extname as extname6, basename as basename4 } from "node:path";
 var DEFAULT_EXCLUDE, LANGUAGE_MAP, CodebaseIndexer;
 var init_codebase_indexer = __esm({
   "packages/indexer/dist/codebase-indexer.js"() {
@@ -12256,7 +12665,7 @@ var init_codebase_indexer = __esm({
         const ig = ignore.default();
         if (this.config.respectGitignore) {
           try {
-            const gitignoreContent = await readFile8(join19(this.config.rootDir, ".gitignore"), "utf-8");
+            const gitignoreContent = await readFile9(join20(this.config.rootDir, ".gitignore"), "utf-8");
             ig.add(gitignoreContent);
           } catch {
           }
@@ -12271,12 +12680,12 @@ var init_codebase_indexer = __esm({
         for (const relativePath of files) {
           if (ig.ignores(relativePath))
             continue;
-          const fullPath = join19(this.config.rootDir, relativePath);
+          const fullPath = join20(this.config.rootDir, relativePath);
           try {
             const fileStat = await stat2(fullPath);
             if (fileStat.size > this.config.maxFileSize)
               continue;
-            const content = await readFile8(fullPath);
+            const content = await readFile9(fullPath);
             const hash = createHash("sha256").update(content).digest("hex");
             const ext = extname6(relativePath);
             indexed.push({
@@ -12317,7 +12726,7 @@ var init_codebase_indexer = __esm({
               if (!child) {
                 child = {
                   name: part,
-                  path: join19(current.path, part),
+                  path: join20(current.path, part),
                   type: "directory",
                   children: []
                 };
@@ -12391,11 +12800,11 @@ var index_repo_exports = {};
 __export(index_repo_exports, {
   indexRepoCommand: () => indexRepoCommand
 });
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 import { existsSync as existsSync14, statSync as statSync6 } from "node:fs";
 import { cwd as cwd2 } from "node:process";
 async function indexRepoCommand(opts, _config) {
-  const repoRoot = resolve12(opts.repoPath ?? cwd2());
+  const repoRoot = resolve13(opts.repoPath ?? cwd2());
   printHeader("Index Repository");
   printInfo(`Indexing: ${repoRoot}`);
   if (!existsSync14(repoRoot)) {
@@ -12644,7 +13053,7 @@ var config_exports = {};
 __export(config_exports, {
   configCommand: () => configCommand
 });
-import { join as join20, resolve as resolve13 } from "node:path";
+import { join as join21, resolve as resolve14 } from "node:path";
 import { homedir as homedir8 } from "node:os";
 import { cwd as cwd3 } from "node:process";
 function coerceForSettings(key, value) {
@@ -12665,7 +13074,7 @@ async function configCommand(opts, config) {
   return handleShow(opts, config);
 }
 function handleShow(opts, config) {
-  const repoRoot = resolve13(opts.repoPath ?? cwd3());
+  const repoRoot = resolve14(opts.repoPath ?? cwd3());
   printHeader("Configuration");
   printSection("Active Settings (merged)");
   printKeyValue("backendUrl", config.backendUrl, 2);
@@ -12697,7 +13106,7 @@ function handleShow(opts, config) {
     }
   }
   printSection("Config File");
-  printInfo(`~/.open-agents/config.json (${join20(homedir8(), ".open-agents", "config.json")})`);
+  printInfo(`~/.open-agents/config.json (${join21(homedir8(), ".open-agents", "config.json")})`);
   printSection("Priority Chain");
   printInfo("  1. CLI flags (--model, --backend-url, etc.)");
   printInfo("  2. Project .oa/settings.json (--local)");
@@ -12730,13 +13139,13 @@ function handleSet(opts, _config) {
     process.exit(1);
   }
   if (opts.local) {
-    const repoRoot = resolve13(opts.repoPath ?? cwd3());
+    const repoRoot = resolve14(opts.repoPath ?? cwd3());
     try {
       initOaDirectory(repoRoot);
       const coerced = coerceForSettings(key, value);
       saveProjectSettings(repoRoot, { [key]: coerced });
       printSuccess(`Project override set: ${key} = ${value}`);
-      printInfo(`Saved to ${join20(repoRoot, ".oa", "settings.json")}`);
+      printInfo(`Saved to ${join21(repoRoot, ".oa", "settings.json")}`);
       printInfo("This override applies only when running in this workspace.");
     } catch (err) {
       printError(`Failed to save: ${err instanceof Error ? err.message : String(err)}`);
@@ -12888,7 +13297,7 @@ async function serveVllm(opts, config) {
   await runVllmServer(args, opts.verbose ?? false);
 }
 async function runVllmServer(args, verbose) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve15, reject) => {
     const child = spawn4("python", args, {
       stdio: verbose ? "inherit" : ["ignore", "pipe", "pipe"],
       env: { ...process.env }
@@ -12923,10 +13332,10 @@ async function runVllmServer(args, verbose) {
     child.once("exit", (code, signal) => {
       if (signal) {
         printInfo(`vLLM server stopped by signal ${signal}`);
-        resolve14();
+        resolve15();
       } else if (code === 0) {
         printSuccess("vLLM server exited cleanly");
-        resolve14();
+        resolve15();
       } else {
         printError(`vLLM server exited with code ${code}`);
         reject(new Error(`vLLM exited with code ${code}`));
@@ -12954,8 +13363,8 @@ __export(eval_exports, {
   evalCommand: () => evalCommand
 });
 import { tmpdir as tmpdir3 } from "node:os";
-import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join21 } from "node:path";
+import { mkdirSync as mkdirSync8, writeFileSync as writeFileSync7 } from "node:fs";
+import { join as join22 } from "node:path";
 async function evalCommand(opts, config) {
   const suiteName = opts.suite ?? "basic";
   const suite = SUITES[suiteName];
@@ -13076,9 +13485,9 @@ async function evalCommand(opts, config) {
   process.exit(failed > 0 ? 1 : 0);
 }
 function createTempEvalRepo() {
-  const dir = join21(tmpdir3(), `open-agents-eval-${Date.now()}`);
-  mkdirSync7(dir, { recursive: true });
-  writeFileSync7(join21(dir, "package.json"), JSON.stringify({ name: "eval-repo", version: "0.0.0" }, null, 2) + "\n", "utf8");
+  const dir = join22(tmpdir3(), `open-agents-eval-${Date.now()}`);
+  mkdirSync8(dir, { recursive: true });
+  writeFileSync7(join22(dir, "package.json"), JSON.stringify({ name: "eval-repo", version: "0.0.0" }, null, 2) + "\n", "utf8");
   return dir;
 }
 var BASIC_SUITE, FULL_SUITE, SUITES;
@@ -13138,7 +13547,7 @@ init_updater();
 import { parseArgs as nodeParseArgs2 } from "node:util";
 import { createRequire as createRequire3 } from "node:module";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { dirname as dirname4, join as join22 } from "node:path";
+import { dirname as dirname3, join as join23 } from "node:path";
 
 // packages/cli/dist/cli.js
 import { createInterface } from "node:readline";
@@ -13245,7 +13654,7 @@ init_output();
 function getVersion2() {
   try {
     const require2 = createRequire3(import.meta.url);
-    const pkgPath = join22(dirname4(fileURLToPath2(import.meta.url)), "..", "package.json");
+    const pkgPath = join23(dirname3(fileURLToPath2(import.meta.url)), "..", "package.json");
     const pkg = require2(pkgPath);
     return pkg.version;
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",