@kenkaiiii/ggcoder 4.3.176 → 4.3.178

package/dist/tools/edit.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { z } from "zod";
 import { resolvePath, rejectSymlink } from "./path-utils.js";
-import { fuzzyFindText, countOccurrences, generateDiff, findClosestSnippet, findOccurrenceLines, } from "./edit-diff.js";
+import { fuzzyFindText, countOccurrences, generateDiff, findClosestSnippet, findOccurrenceLines, stripLeadingBlankLine, applyDotdotdots, applyMissingLeadingWhitespace, } from "./edit-diff.js";
 import { localOperations } from "./operations.js";
 import { assertFresh, recordWrite } from "./read-tracker.js";
 const EditItem = z.object({
@@ -31,20 +31,44 @@ const EditParams = z.object({
     file_path: z.string().describe("The file path to edit"),
     edits: z
         .preprocess(coerceStringifiedEdits, z.array(EditItem).min(1))
-        .describe("One or more edits applied in order. Each edit operates on the result of the previous one. " +
-        "Every old_text must uniquely match exactly one location in the file at the time it is applied."),
+        .describe("One or more edits applied in order. Each edit operates on the result of the previous one."),
+    atomic: z
+        .boolean()
+        .optional()
+        .describe("If true, fail the whole batch when any edit fails — no changes written. " +
+        "Default false: partial-apply, keep every successful edit and report failures " +
+        "for retry. Use atomic only when later edits depend on earlier ones in a way " +
+        "where a half-applied state would be worse than nothing."),
 });
+function tryMatch(working, old, next, replaceAll) {
+    if (old.length === 0)
+        return { ok: false, reason: "not_found" };
+    if (replaceAll && working.includes(old)) {
+        return { ok: true, newWorking: working.split(old).join(next) };
+    }
+    const occurrences = countOccurrences(working, old);
+    if (occurrences === 0)
+        return { ok: false, reason: "not_found" };
+    if (occurrences > 1)
+        return { ok: false, reason: "ambiguous", occurrences };
+    const match = fuzzyFindText(working, old);
+    if (!match.found)
+        return { ok: false, reason: "not_found" };
+    return {
+        ok: true,
+        newWorking: working.slice(0, match.index) + next + working.slice(match.index + match.matchLength),
+    };
+}
 export function createEditTool(cwd, readFiles, ops = localOperations, planModeRef) {
     return {
         name: "edit",
-        description: "Replace one or more text strings in a file. The file must be read first before editing. " +
-            "Pass `edits` as an array of { old_text, new_text, replace_all? } items; edits are applied " +
-            "sequentially so each subsequent match runs against the result of the prior edits. " +
-            "Each old_text must uniquely match exactly one location when applied — if it matches more, " +
-            "either include surrounding context to make the match unique or set replace_all: true to " +
-            "swap every occurrence (useful for renames). Returns a unified diff of the combined change.",
+        description: "Replace text in a file via { old_text, new_text } edits applied sequentially. Read the file first. " +
+            "Each old_text must uniquely match exactly one location — set replace_all: true to swap every occurrence (renames). " +
+            "For long blocks, a line containing only `...` in BOTH old_text and new_text elides a middle preserved verbatim. " +
+            "Partial-apply by default: failed edits are listed for retry, successful ones are still written — " +
+            "re-issue ONLY the listed failures, not the whole batch. Returns a unified diff.",
         parameters: EditParams,
-        async execute({ file_path, edits }) {
+        async execute({ file_path, edits, atomic = false }) {
             if (planModeRef?.current) {
                 return "Error: edit is restricted in plan mode. Use read-only tools to explore the codebase, then write your plan to .gg/plans/.";
             }
@@ -56,70 +80,148 @@ export function createEditTool(cwd, readFiles, ops = localOperations, planModeRe
             const originalNormalized = hasCRLF ? original.replace(/\r\n/g, "\n") : original;
             let working = originalNormalized;
             const fileName = path.basename(resolved);
-            const errors = [];
+            const outcomes = new Array(edits.length);
             for (let i = 0; i < edits.length; i++) {
                 const { old_text, new_text, replace_all } = edits[i];
                 const normalizedOld = hasCRLF ? old_text.replace(/\r\n/g, "\n") : old_text;
                 const normalizedNew = hasCRLF ? new_text.replace(/\r\n/g, "\n") : new_text;
-                const label = edits.length > 1 ? ` (edit ${i + 1}/${edits.length})` : "";
-                // replace_all path: if there is at least one literal match, swap them
-                // all at once and skip the uniqueness check. Falls through to the
-                // normal not-found error when no exact matches exist (so the model
-                // gets the closest-snippet hint instead of a silent no-op).
-                if (replace_all && normalizedOld.length > 0 && working.includes(normalizedOld)) {
-                    working = working.split(normalizedOld).join(normalizedNew);
+                const replaceAll = replace_all ?? false;
+                // Reject no-op edits before they consume a write or silently "succeed"
+                // — usually the model paraphrased the new_text to be identical to old.
+                if (normalizedOld === normalizedNew) {
+                    outcomes[i] = { ok: false, failure: { reason: "noop" } };
                     continue;
                 }
-                const occurrences = countOccurrences(working, normalizedOld);
-                if (occurrences === 0) {
-                    const hint = findClosestSnippet(working, normalizedOld);
-                    const hintLine = hint ? `\nClosest match in file:\n${hint}` : "";
-                    errors.push(`old_text not found in ${fileName}${label}. ` +
-                        "Text must match verbatim — do not paraphrase. Re-read the file if unsure." +
-                        hintLine);
+                // Aider's full fallback ladder, run only when the primary match
+                // returns "not_found". Ambiguous matches deliberately don't fall
+                // through — the model needs to add context, not paraphrase further.
+                // Order mirrors aider/coders/editblock_coder.py:
+                //   1. exact + smart-quote/dash fuzzy (in tryMatch)
+                //   2. indent-flex (model omitted/shortened leading whitespace)
+                //   3. drop leading blank line, retry 1+2
+                //   4. dotdotdots (`...` elision with preserved middle)
+                let result = tryMatch(working, normalizedOld, normalizedNew, replaceAll);
+                const tryFallbacks = (oldText) => {
+                    const flexed = applyMissingLeadingWhitespace(working, oldText, normalizedNew);
+                    if (flexed !== null)
+                        return flexed;
+                    // Re-run primary matcher on the stripped variant as a cheap retry.
+                    const exact = tryMatch(working, oldText, normalizedNew, replaceAll);
+                    if (exact.ok)
+                        return exact.newWorking;
+                    return null;
+                };
+                if (!result.ok && result.reason === "not_found") {
+                    const indentFlexed = applyMissingLeadingWhitespace(working, normalizedOld, normalizedNew);
+                    if (indentFlexed !== null) {
+                        result = { ok: true, newWorking: indentFlexed };
+                    }
+                }
+                if (!result.ok && result.reason === "not_found") {
+                    const stripped = stripLeadingBlankLine(normalizedOld);
+                    if (stripped !== null) {
+                        const candidate = tryFallbacks(stripped);
+                        if (candidate !== null)
+                            result = { ok: true, newWorking: candidate };
+                    }
+                }
+                if (!result.ok && result.reason === "not_found") {
+                    const elided = applyDotdotdots(working, normalizedOld, normalizedNew);
+                    if (elided !== null)
+                        result = { ok: true, newWorking: elided };
+                }
+                if (result.ok) {
+                    working = result.newWorking;
+                    outcomes[i] = { ok: true };
                     continue;
                 }
-                if (occurrences > 1) {
+                if (result.reason === "not_found") {
+                    // Capture the closest-match snippet eagerly against the current
+                    // working buffer; we'll decide whether to render it post-loop based
+                    // on whether other edits in this batch succeeded.
+                    outcomes[i] = {
+                        ok: false,
+                        failure: {
+                            reason: "not_found",
+                            closestSnippet: findClosestSnippet(working, normalizedOld),
+                        },
+                    };
+                }
+                else {
+                    const occurrences = result.occurrences ?? 0;
                     const matches = findOccurrenceLines(working, normalizedOld);
                     const matchLines = matches.map((m) => `  line ${m.line}: ${m.preview}`).join("\n");
                     const more = occurrences > matches.length ? `\n  …and ${occurrences - matches.length} more` : "";
-                    errors.push(`old_text found ${occurrences} times in ${fileName}${label}. ` +
+                    outcomes[i] = {
+                        ok: false,
+                        failure: { reason: "ambiguous", occurrences, matchLines, more },
+                    };
+                }
+            }
+            const failures = outcomes
+                .map((o, i) => (o.ok || !o.failure ? null : { index: i, failure: o.failure }))
+                .filter((x) => x !== null);
+            const successCount = outcomes.length - failures.length;
+            // Closest-match snippets only get suppressed when successes will ACTUALLY
+            // be persisted (partial-apply with at least one win). In atomic mode we
+            // throw before writing, so the model retries against an unchanged file
+            // and the snippet is its only guidance — keep it.
+            const willPersistSuccesses = successCount > 0 && !atomic;
+            const formatFailureMessage = (f) => {
+                if (f.reason === "noop") {
+                    return `old_text and new_text are identical in ${fileName} — this edit would be a no-op. Either fix new_text or drop this edit.`;
+                }
+                if (f.reason === "ambiguous") {
+                    return (`old_text found ${f.occurrences} times in ${fileName}. ` +
                         "Include more surrounding context to make the match unique, " +
                         "or set replace_all: true to swap every occurrence.\n" +
                         "Matches at:\n" +
-                        matchLines +
-                        more);
-                    continue;
+                        f.matchLines +
+                        f.more);
                 }
-                const match = fuzzyFindText(working, normalizedOld);
-                if (!match.found) {
-                    errors.push(`old_text not found in ${fileName}${label}.`);
-                    continue;
+                const base = `old_text not found in ${fileName}. ` +
+                    "Text must match verbatim — do not paraphrase. Re-read the file if unsure.";
+                if (willPersistSuccesses || !f.closestSnippet)
+                    return base;
+                return `${base}\nClosest match in file:\n${f.closestSnippet}`;
+            };
+            const formatFailures = () => {
+                if (failures.length === 1 && edits.length === 1) {
+                    return formatFailureMessage(failures[0].failure);
                 }
-                working =
-                    working.slice(0, match.index) +
-                        normalizedNew +
-                        working.slice(match.index + match.matchLength);
-            }
-            if (errors.length > 0) {
-                const header = errors.length === 1
-                    ? errors[0]
-                    : `${errors.length} of ${edits.length} edits failed; no changes written.\n\n` +
-                        errors.map((e, i) => `[${i + 1}] ${e}`).join("\n\n");
-                throw new Error(header);
+                return failures
+                    .map((f) => `[edit ${f.index + 1}/${edits.length}] ${formatFailureMessage(f.failure)}`)
+                    .join("\n\n");
+            };
+            // Atomic-mode failure, OR partial-mode failure where literally nothing
+            // succeeded. Either way nothing should be written and we throw to make
+            // the model retry the whole batch.
+            if (failures.length > 0 && (atomic || successCount === 0)) {
+                const header = atomic && failures.length > 0
+                    ? `${failures.length} of ${edits.length} edit${edits.length === 1 ? "" : "s"} failed; no changes written (atomic).\n\n`
+                    : edits.length > 1
+                        ? `${failures.length} of ${edits.length} edits failed; no changes written.\n\n`
+                        : "";
+                throw new Error(header + formatFailures());
             }
             const finalContent = hasCRLF ? working.replace(/\n/g, "\r\n") : working;
             await ops.writeFile(resolved, finalContent);
             await recordWrite(readFiles, resolved, finalContent, ops);
             const relPath = path.relative(cwd, resolved);
             const diff = generateDiff(originalNormalized, working, relPath);
-            const summary = edits.length > 1
-                ? `Successfully applied ${edits.length} edits to ${relPath}.`
-                : `Successfully replaced text in ${relPath}.`;
-            return {
-                content: summary,
-                details: { diff },
-            };
+            if (failures.length === 0) {
+                const summary = edits.length > 1
+                    ? `Successfully applied ${edits.length} edits to ${relPath}.`
+                    : `Successfully replaced text in ${relPath}.`;
+                return { content: summary, details: { diff } };
+            }
+            // Partial success — the loud header is deliberate: the model has to know
+            // that work was saved AND that only the listed edits need to be retried.
+            const noun = failures.length === 1 ? "edit" : "edits";
+            const content = `Applied ${successCount} of ${edits.length} edits to ${relPath}.\n` +
+                `${failures.length} ${noun} skipped — re-issue ONLY these (the rest are already done, do not redo them):\n\n` +
+                formatFailures();
+            return { content, details: { diff } };
         },
     };
 }

package/dist/tools/edit.js.map

@@ -1 +1 @@
-{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"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"}

package/dist/tools/edit.test.js

@@ -67,7 +67,7 @@ describe("createEditTool", () => {
         const written = await fs.readFile(filePath, "utf-8");
         expect(written).toBe("baz\n");
     });
-    it("reports edit index on failure within a multi-edit batch", async () => {
+    it("reports edit index on failure within a multi-edit batch (atomic mode)", async () => {
         const filePath = path.join(tmpDir, "batch.txt");
         await fs.writeFile(filePath, "one two three\n");
         const tool = createEditTool(tmpDir);
@@ -77,6 +77,7 @@ describe("createEditTool", () => {
                 { old_text: "one", new_text: "1" },
                 { old_text: "missing", new_text: "x" },
             ],
+            atomic: true,
         }, { signal: new AbortController().signal, toolCallId: "test-batch" })).rejects.toThrow(/edit 2\/2/);
         // Nothing should have been written — atomic
         const written = await fs.readFile(filePath, "utf-8");
@@ -151,7 +152,7 @@ describe("createEditTool", () => {
             ],
         }, { signal: new AbortController().signal, toolCallId: "test-snippet" })).rejects.toThrow(/Closest match in file:[\s\S]*useState\(0\)/);
     });
-    it("aggregates multiple edit failures into one error", async () => {
+    it("aggregates multiple edit failures into one error (atomic mode)", async () => {
         const filePath = path.join(tmpDir, "agg.txt");
         await fs.writeFile(filePath, "alpha\nbeta\ngamma\n");
         const tool = createEditTool(tmpDir);
@@ -162,11 +163,259 @@ describe("createEditTool", () => {
                 { old_text: "MISSING", new_text: "X" },
                 { old_text: "ALSO_MISSING", new_text: "Y" },
             ],
-        }, { signal: new AbortController().signal, toolCallId: "test-agg" })).rejects.toThrow(/2 of 3 edits failed[\s\S]*\[1\][\s\S]*\[2\]/);
+            atomic: true,
+        }, { signal: new AbortController().signal, toolCallId: "test-agg" })).rejects.toThrow(/2 of 3 edits failed[\s\S]*edit 2\/3[\s\S]*edit 3\/3/);
         // Atomic — nothing written.
         const written = await fs.readFile(filePath, "utf-8");
         expect(written).toBe("alpha\nbeta\ngamma\n");
     });
+    it("partial-apply (default): keeps successful edits and reports failures for retry", async () => {
+        const filePath = path.join(tmpDir, "partial.txt");
+        await fs.writeFile(filePath, "alpha\nbeta\ngamma\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "partial.txt",
+            edits: [
+                { old_text: "alpha", new_text: "ALPHA" },
+                { old_text: "MISSING", new_text: "X" },
+                { old_text: "gamma", new_text: "GAMMA" },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-partial" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Applied 2 of 3 edits/);
+        expect(summary).toMatch(/re-issue ONLY these/);
+        expect(summary).toMatch(/edit 2\/3/);
+        expect(summary).not.toMatch(/edit 1\/3/);
+        expect(summary).not.toMatch(/edit 3\/3/);
+        // Successful edits landed; failed one didn't.
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("ALPHA\nbeta\nGAMMA\n");
+    });
+    it("partial-apply on a 19-edit batch with 2 failures lands the other 17", async () => {
+        const filePath = path.join(tmpDir, "big.css");
+        const lines = Array.from({ length: 19 }, (_, i) => `.cls${i} { color: red; }`);
+        await fs.writeFile(filePath, lines.join("\n") + "\n");
+        const edits = lines.map((line, i) => ({
+            old_text: line,
+            // Two of them deliberately drift so the batch sees real failures.
+            new_text: i === 7 || i === 13
+                ? line.replace("color: red", "color: blue")
+                : line.replace("red", "green"),
+        }));
+        // Corrupt edits 8 (index 7) and 14 (index 13) by paraphrasing old_text.
+        edits[7] = { old_text: ".cls7 { colour: red; }", new_text: ".cls7 { color: blue; }" };
+        edits[13] = { old_text: ".cls13 { colur: red; }", new_text: ".cls13 { color: blue; }" };
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({ file_path: "big.css", edits }, { signal: new AbortController().signal, toolCallId: "test-19" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Applied 17 of 19 edits/);
+        expect(summary).toMatch(/edit 8\/19/);
+        expect(summary).toMatch(/edit 14\/19/);
+        const written = await fs.readFile(filePath, "utf-8");
+        // 17 lines should have green, the two failed ones still red.
+        expect((written.match(/color: green/g) ?? []).length).toBe(17);
+        expect(written).toContain(".cls7 { color: red; }");
+        expect(written).toContain(".cls13 { color: red; }");
+    });
+    it("throws when every edit fails even in partial-apply mode", async () => {
+        const filePath = path.join(tmpDir, "all-fail.txt");
+        await fs.writeFile(filePath, "untouched\n");
+        const tool = createEditTool(tmpDir);
+        await expect(tool.execute({
+            file_path: "all-fail.txt",
+            edits: [
+                { old_text: "MISSING1", new_text: "X" },
+                { old_text: "MISSING2", new_text: "Y" },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-all-fail" })).rejects.toThrow(/2 of 2 edits failed/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("untouched\n");
+    });
+    it("suppresses Closest-match snippet in partial-apply when other edits succeeded", async () => {
+        // Mirrors the StartingYourAgency.tsx scenario: token-heavy lines where
+        // findClosestSnippet returns noisy top-of-file regions. When 17 of 19
+        // edits succeed, those diffs already give the model context — the
+        // snippet would just be noise.
+        const filePath = path.join(tmpDir, "noisy.tsx");
+        const lines = Array.from({ length: 6 }, (_, i) => `      <div className="card-${i}">Section ${i}</div>`);
+        await fs.writeFile(filePath, lines.join("\n") + "\n");
+        const edits = lines.map((line) => ({
+            old_text: line,
+            new_text: line.replace("card-", "glass-card-"),
+        }));
+        // Drift edit 4 — paraphrase the case so it doesn't match.
+        edits[3] = {
+            old_text: `      <div className="Card-3">Section 3</div>`,
+            new_text: `      <div className="glass-card-3">Section 3</div>`,
+        };
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({ file_path: "noisy.tsx", edits }, { signal: new AbortController().signal, toolCallId: "test-suppress" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Applied 5 of 6/);
+        expect(summary).toMatch(/edit 4\/6/);
+        // The snippet would be ~3-7 lines starting with "Closest match in file:".
+        // In partial-apply with successes, we suppress it.
+        expect(summary).not.toMatch(/Closest match in file:/);
+    });
+    it("keeps Closest-match snippet when no other edit succeeded", async () => {
+        // Single-edit call — no surrounding context for the model, so the snippet
+        // is genuinely useful and must remain. Use overlapping tokens so the
+        // closest-snippet heuristic actually fires.
+        const filePath = path.join(tmpDir, "lonely.tsx");
+        await fs.writeFile(filePath, "function Counter() {\n  const [count, setCount] = useState(0);\n  return count;\n}\n");
+        const tool = createEditTool(tmpDir);
+        await expect(tool.execute({
+            file_path: "lonely.tsx",
+            edits: [
+                {
+                    old_text: "const [count, setCount] = useState(1);",
+                    new_text: "const [count, setCount] = useState(2);",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-keep" })).rejects.toThrow(/Closest match in file:[\s\S]*useState\(0\)/);
+    });
+    it("atomic mode keeps Closest-match snippet (model retries against unchanged file)", async () => {
+        const filePath = path.join(tmpDir, "atomic-snippet.tsx");
+        const lines = Array.from({ length: 4 }, (_, i) => `      <div className="card-${i}">Section ${i}</div>`);
+        await fs.writeFile(filePath, lines.join("\n") + "\n");
+        const edits = lines.map((line) => ({
+            old_text: line,
+            new_text: line.replace("card-", "glass-card-"),
+        }));
+        edits[2] = {
+            old_text: `      <div className="Card-2">Section 2</div>`,
+            new_text: `      <div className="glass-card-2">Section 2</div>`,
+        };
+        const tool = createEditTool(tmpDir);
+        await expect(tool.execute({ file_path: "atomic-snippet.tsx", edits, atomic: true }, { signal: new AbortController().signal, toolCallId: "test-atomic-snippet" })).rejects.toThrow(/Closest match in file:/);
+    });
+    it("indent-flex: model omits indentation entirely; file has 4-space prefix — applies it", async () => {
+        const filePath = path.join(tmpDir, "indent.ts");
+        await fs.writeFile(filePath, "    const x = 1;\n    const y = 2;\n    const z = 3;\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "indent.ts",
+            edits: [
+                {
+                    old_text: "const x = 1;\nconst y = 2;\nconst z = 3;",
+                    new_text: "const x = 10;\nconst y = 20;\nconst z = 30;",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-indent-flex" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Successfully/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("    const x = 10;\n    const y = 20;\n    const z = 30;\n");
+    });
+    it("indent-flex: model used 2-space but file uses 4 — outdents both, re-indents new", async () => {
+        const filePath = path.join(tmpDir, "mixed-indent.ts");
+        await fs.writeFile(filePath, "    if (x) {\n      return y;\n    }\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "mixed-indent.ts",
+            edits: [
+                {
+                    old_text: "  if (x) {\n    return y;\n  }",
+                    new_text: "  if (x) {\n    return z;\n  }",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-mixed-indent" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Successfully/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("    if (x) {\n      return z;\n    }\n");
+    });
+    it("dotdotdots: model elides middle with `...`, edit lands and middle preserved", async () => {
+        const filePath = path.join(tmpDir, "elide.ts");
+        await fs.writeFile(filePath, [
+            "function pomodoro() {",
+            "  const timer = startTimer();",
+            "  trackPomodoro(timer);",
+            "  scheduleBreak();",
+            "  return timer;",
+            "}",
+        ].join("\n") + "\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "elide.ts",
+            edits: [
+                {
+                    old_text: "function pomodoro() {\n  ...\n  return timer;\n}",
+                    new_text: "function pomodoro(): Timer {\n  ...\n  return timer;\n}",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-elide" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Successfully/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toContain("function pomodoro(): Timer {");
+        // Middle preserved verbatim.
+        expect(written).toContain("trackPomodoro(timer);");
+        expect(written).toContain("scheduleBreak();");
+    });
+    it("dotdotdots: failed elision falls through to standard not_found error", async () => {
+        const filePath = path.join(tmpDir, "elide-fail.ts");
+        await fs.writeFile(filePath, "function actuallyExists() { return 1; }\n");
+        const tool = createEditTool(tmpDir);
+        await expect(tool.execute({
+            file_path: "elide-fail.ts",
+            edits: [
+                {
+                    // Bookends don't exist in the file.
+                    old_text: "function nonexistent() {\n  ...\n  return x;\n}",
+                    new_text: "function nonexistent() {\n  ...\n  return y;\n}",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-elide-fail" })).rejects.toThrow(/old_text not found/);
+    });
+    it("rejects no-op edits where old_text equals new_text", async () => {
+        const filePath = path.join(tmpDir, "noop.txt");
+        await fs.writeFile(filePath, "hello world\n");
+        const tool = createEditTool(tmpDir);
+        await expect(tool.execute({
+            file_path: "noop.txt",
+            edits: [{ old_text: "hello", new_text: "hello" }],
+        }, { signal: new AbortController().signal, toolCallId: "test-noop" })).rejects.toThrow(/identical[\s\S]*no-op/);
+        // File untouched — confirms we didn't write a no-op.
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("hello world\n");
+    });
+    it("no-op edit in a partial-apply batch still lets the other edits land", async () => {
+        const filePath = path.join(tmpDir, "noop-batch.txt");
+        await fs.writeFile(filePath, "alpha\nbeta\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "noop-batch.txt",
+            edits: [
+                { old_text: "alpha", new_text: "ALPHA" },
+                { old_text: "beta", new_text: "beta" }, // no-op
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-noop-batch" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Applied 1 of 2/);
+        expect(summary).toMatch(/identical[\s\S]*no-op/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("ALPHA\nbeta\n");
+    });
+    it("strips a spurious leading blank line in old_text and still matches", async () => {
+        const filePath = path.join(tmpDir, "blank.ts");
+        await fs.writeFile(filePath, "function foo() {\n  return 42;\n}\n");
+        const tool = createEditTool(tmpDir);
+        const result = await tool.execute({
+            file_path: "blank.ts",
+            edits: [
+                {
+                    // Note the leading blank line — the model often pastes one in.
+                    old_text: "\n  return 42;",
+                    new_text: "\n  return 100;",
+                },
+            ],
+        }, { signal: new AbortController().signal, toolCallId: "test-blank" });
+        const summary = typeof result === "string" ? result : result.content;
+        expect(summary).toMatch(/Successfully/);
+        const written = await fs.readFile(filePath, "utf-8");
+        expect(written).toBe("function foo() {\n  return 100;\n}\n");
+    });
     it("throws when old_text is not found", async () => {
         const filePath = path.join(tmpDir, "missing.txt");
         await fs.writeFile(filePath, "some content here\n");