@heyhuynhgiabuu/pi-diff 0.6.4 → 0.6.6

package/README.md

@@ -25,8 +25,8 @@ A [pi](https://pi.dev) extension that replaces the default `write` and `edit` to
 - **Adaptive layout** — auto-detects terminal width; wraps intelligently on wide terminals, truncates on narrow ones
 - **LRU cache** — singleton Shiki highlighter with 192-entry cache for fast re-renders
 - **Large diff fallback** — gracefully degrades (skips highlighting, still shows diff structure) for files > 80k chars
-- **Review context export** — `pi-diff-review` exports Git changes as agent-ready markdown for Warp-style local code review
 - **Fully customizable** — every color and threshold is overridable via environment variables
+- **Edit guard** — blocks `edit` tool calls whose `oldText` is no longer in the target file, forcing the model to re-read before retrying (prevents stale-`oldText` retry loops)
 
 ## Install
 
@@ -42,170 +42,6 @@ Or load directly for development:
 pi -e ./src/index.ts
 ```
 
-## Git Review in Pi TUI
-
-pi-diff provides two review surfaces:
-
-1. **`/review-diff`** — the primary interactive local-review command. If [Hunk](https://github.com/modem-dev/hunk) is installed, pi-diff opens Hunk's review-first TUI.
-2. **`review_git_diff`** — a read-only markdown/tool path for agent context and scripted review.
-
-### Install Hunk for `/review-diff`
-
-`/review-diff` works best with Hunk installed:
-
-```bash
-# npm
-npm i -g hunkdiff
-
-# or Homebrew
-brew install modem-dev/tap/hunk
-```
-
-Verify Hunk is available:
-
-```bash
-hunk --version
-```
-
-If Hunk is not installed, pi-diff falls back to its built-in legacy review overlay and shows a warning.
-
-### `/review-diff` — Hunk-backed interactive review
-
-Run inside Pi:
-
-```text
-/review-diff
-/review-diff --base main
-/review-diff working-tree
-/review-diff feature/base-branch
-```
-
-What happens:
-
-```text
-/review-diff
-  → pi-diff reads the current Git diff
-  → pipes the patch to `hunk patch -`
-  → Hunk opens its sidebar + diff review TUI
-  → when you exit Hunk, pi-diff returns to Pi
-```
-
-You can test the same Hunk view outside Pi:
-
-```bash
-git diff | hunk patch -
-# or
-hunk diff
-```
-
-Hunk is responsible for the review UI: multi-file sidebar, split/stack layouts, keyboard navigation, mouse support, and agent-note/comment workflows. pi-diff intentionally does **not** maintain a second in-memory comment system.
-
-### Hunk configuration
-
-Hunk reads config from:
-
-```text
-~/.config/hunk/config.toml   # global defaults
-.hunk/config.toml            # repo-local override
-```
-
-Recommended global starter config:
-
-```toml
-# ~/.config/hunk/config.toml
-
-theme = "midnight"      # graphite, midnight, paper, ember, catppuccin-latte, catppuccin-mocha, custom
-mode = "auto"           # auto, split, stack
-vcs = "git"
-watch = false
-
-line_numbers = true
-wrap_lines = false
-agent_notes = true
-exclude_untracked = false
-```
-
-Example repo-local override:
-
-```bash
-mkdir -p .hunk
-$EDITOR .hunk/config.toml
-```
-
-```toml
-# .hunk/config.toml
-
-theme = "graphite"
-mode = "split"
-line_numbers = true
-wrap_lines = false
-agent_notes = true
-```
-
-Hunk also supports custom themes:
-
-```toml
-theme = "custom"
-
-[custom_theme]
-base = "graphite"
-label = "Pi Diff"
-accent = "#7fd1ff"
-panel = "#10161d"
-noteBorder = "#c49bff"
-
-[custom_theme.syntax]
-keyword = "#8ed4ff"
-string = "#c7b4ff"
-comment = "#6e85a7"
-```
-
-All custom theme colors must be `#rrggbb` hex values.
-
-### `review_git_diff` — read-only markdown review tool
-
-`review_git_diff` remains available for agent/tool use and for non-destructive markdown exports.
-
-```ts
-// Open the read-only review markdown for working-tree changes, including untracked files
-review_git_diff({});
-
-// Review branch changes as main...HEAD
-review_git_diff({ base: "main" });
-
-// Focus a file from the changed-file list
-review_git_diff({ file: "src/index.ts" });
-
-// Focus a hunk ID shown by the panel
-review_git_diff({ file: "src/index.ts", hunkId: "src/index.ts:10:12" });
-
-// Return the older full markdown export with raw unified diff included
-review_git_diff({ base: "main", includeRawDiff: true });
-```
-
-- No `base` means working-tree review, including untracked files.
-- `base: "main"` means `main...HEAD` branch review.
-- `includeRawDiff` returns the older full review export with raw unified diff.
-- `maxLinesPerHunk`, `maxFiles`, and `maxHunks` cap large markdown reviews.
-- The tool path is intentionally non-destructive: it never reverts, stages, commits, discards, or edits files.
-
-## Review Export CLI
-
-`pi-diff-review` exports the same Git review context as markdown for use outside Pi TUI.
-
-```bash
-# Review uncommitted working-tree changes
-pi-diff-review
-
-# Review branch changes like a pull request
-pi-diff-review --base main
-
-# Include the raw git diff after the structured summary
-pi-diff-review --raw
-```
-
-The export includes changed files, hunk headers, changed-line numbers, and review instructions focused on correctness, regressions, security, tests, and maintainability.
-
 ## How It Works
 
 pi-diff wraps the built-in `write` and `edit` tools from the pi SDK, including single-edit and multi-edit `edit` calls. When the agent writes or edits a file:
@@ -215,6 +51,8 @@ pi-diff wraps the built-in `write` and `edit` tools from the pi SDK, including s
 3. **After the write** — computes a structured diff between old and new content
 4. **Renders** the diff with syntax highlighting and word-level emphasis
 
+For `edit` calls, a `tool_call` handler runs **before** the tool executes and verifies that every `oldText` in the request is still present in the target file. If any `oldText` is missing, the call is blocked with a clear `VERIFY before EDIT` error, preventing the model from re-trying with stale text from a prior read.
+
 The rendering pipeline:
 
 ```
@@ -360,21 +198,35 @@ export DIFF_SPLIT_MIN_WIDTH=120
 
 ```
 src/
-└── index.ts    # Extension entry point — wraps write/edit tools with diff rendering
+├── index.ts            # Extension entry point — wraps write/edit tools with diff rendering
+├── edit-guard.ts       # tool_call handler that blocks stale oldText in edit calls
+├── edit-guard.test.ts  # Unit tests for the edit guard
+├── core/               # Pure data layer: diff parsing, conflict detection, line resolution
+│   ├── config.ts
+│   ├── conflicts.ts
+│   ├── diff.ts         # parseDiff, parsePatchFiles, resolveSepStyle
+│   ├── replace.ts      # safe in-place text replacement
+│   ├── resolve-lines.ts
+│   └── *.test.ts
+└── review/             # Shared diff-rendering primitives used by the main extension
+    ├── git.ts          # read git diffs from disk (execFileSync)
+    └── hunk-preview.ts # renderSplit, renderUnified, theme helpers (re-exported via __testing)
 ```
 
 ### Key internals
 
-| Component            | Purpose                                                                          |
-| -------------------- | -------------------------------------------------------------------------------- |
-| `parseDiff()`        | Converts old/new content to structured `DiffLine[]` using `diff.structuredPatch` |
-| `hlBlock()`          | Shiki ANSI highlighting with LRU cache (192 entries)                             |
-| `injectBg()`         | Composites diff backgrounds into Shiki ANSI output (fg + bg layering)            |
-| `wordDiffAnalysis()` | Single-pass word diff → similarity score + character ranges                      |
-| `renderSplit()`      | Side-by-side renderer with diagonal stripe fillers                               |
-| `renderUnified()`    | Stacked single-column renderer                                                   |
-| `wrapAnsi()`         | ANSI-aware line wrapping with state carry-forward                                |
-| `shouldUseSplit()`   | Heuristic: split vs unified based on terminal width and wrap ratio               |
+All listed symbols are exposed under the `__testing` export for unit tests:
+
+| Symbol                     | Source                  | Purpose                                                                 |
+| -------------------------- | ----------------------- | ----------------------------------------------------------------------- |
+| `parseDiff()`              | `core/diff.ts`          | Convert old/new content to structured `DiffLine[]` (added/removed/chars) |
+| `parsePatchFiles()`        | `core/diff.ts`          | Parse a full `git apply` patch into per-file diff objects               |
+| `resolveSepStyle()`        | `core/diff.ts`          | Pick the per-side separator style (` │ ` vs `╱`) for split view         |
+| `getSepStyle()`            | `review/hunk-preview.ts`| Same as above for the shared rendering layer                            |
+| `computeHunkBlocks()`      | `review/hunk-preview.ts`| Build add/remove/modify line blocks with column ranges for split view   |
+| `renderSplit()`            | `review/hunk-preview.ts`| Side-by-side renderer with diagonal stripe fillers                      |
+| `renderUnified()`          | `review/hunk-preview.ts`| Stacked single-column renderer                                          |
+| `normalizeShikiContrast()` | `review/hunk-preview.ts` | Lighten/darken Shiki output to match the surrounding TUI theme        |
 
 ### Rendering constants
 
@@ -423,12 +275,13 @@ pi install .
 pi-diff is a **pi extension** — a TypeScript file that exports a default function receiving the pi API:
 
 ```typescript
-export default function piDiffExtension(pi: any): void {
-  // Get SDK tools
+import { registerEditGuard } from "./edit-guard.js";
+
+export default function piDiffExtension(pi: ExtensionAPI): void {
+  // Wrap the built-in write/edit tools with diff rendering
   const origWrite = createWriteTool(cwd);
   const origEdit = createEditTool(cwd);
 
-  // Register enhanced versions
   pi.registerTool({
     ...origWrite,
     name: "write",
@@ -436,15 +289,18 @@ export default function piDiffExtension(pi: any): void {
     renderCall: (...) => { /* preview */ },
     renderResult: (...) => { /* render diff */ },
   });
+
+  // Block stale-oldText edit calls before they run
+  registerEditGuard(pi);
 }
 ```
 
 Extensions can:
 
 - **Register tools** — `pi.registerTool(definition)`
-- **Listen to events** — `pi.on("session_start" | "input" | "before_tool_call" | ...)`
+- **Listen to events** — `pi.on("session_start" | "input" | "tool_call" | "session_shutdown" | ...)`
+  - `tool_call` handlers can `block: true` to prevent the call from running
 - **Register commands** — `pi.registerCommand("/name", handler)`
-- **Register providers** — `pi.registerProvider("name", config)`
 
 See the [pi docs](https://pi.dev) for the full extension API.
 

package/dist/edit-guard.d.ts

@@ -0,0 +1,2 @@
+export declare function registerEditGuard(pi: unknown): void;
+//# sourceMappingURL=edit-guard.d.ts.map

package/dist/edit-guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit-guard.d.ts","sourceRoot":"","sources":["../src/edit-guard.ts"],"names":[],"mappings":"AAkCA,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAQnD"}

package/dist/edit-guard.js

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+// Block edit tool calls when oldText is not present in the target file.
+// Forces the model to re-read the file before editing instead of guessing
+// stale oldText and getting caught in repeated retry loops.
+import { readFileSync } from "node:fs";
+const guardEditToolCall = async (event, _ctx) => {
+    const { path, edits } = event.input;
+    if (!edits || !Array.isArray(edits))
+        return;
+    let fileContent;
+    try {
+        fileContent = readFileSync(path, "utf8");
+    }
+    catch {
+        return;
+    }
+    for (const edit of edits) {
+        if (!fileContent.includes(edit.oldText)) {
+            return {
+                block: true,
+                reason: `oldText not found in ${path}. Re-read the file and copy the exact text (edit protocol: VERIFY before EDIT).`,
+            };
+        }
+    }
+};
+export function registerEditGuard(pi) {
+    if (pi == null)
+        return;
+    const on = pi.on;
+    if (typeof on !== "function")
+        return;
+    pi.on("tool_call", guardEditToolCall);
+}
+//# sourceMappingURL=edit-guard.js.map

package/dist/edit-guard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit-guard.js","sourceRoot":"","sources":["../src/edit-guard.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wEAAwE;AACxE,0EAA0E;AAC1E,4DAA4D;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOvC,MAAM,iBAAiB,GAA6D,KAAK,EACxF,KAAK,EACL,IAAI,EACH,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;IACpC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO;IAC5C,IAAI,WAAmB,CAAC;IACxB,IAAI,CAAC;QACJ,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACR,OAAO;IACR,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,OAAO;gBACN,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,wBAAwB,IAAI,iFAAiF;aACrH,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,EAAW;IAC5C,IAAI,EAAE,IAAI,IAAI;QAAE,OAAO;IACvB,MAAM,EAAE,GAAI,EAAuB,CAAC,EAAE,CAAC;IACvC,IAAI,OAAO,EAAE,KAAK,UAAU;QAAE,OAAO;IACpC,EAAyE,CAAC,EAAE,CAC5E,WAAW,EACX,iBAAiB,CACjB,CAAC;AACH,CAAC"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EACL,iBAAiB,EAEjB,WAAW,EACX,KAAK,UAAU,EACf,SAAS,EACT,eAAe,EACf,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAaxB,KAAK,eAAe,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAgdxD,oFAAoF;AACpF,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAuKD,iBAAS,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAoWD,iBAAe,aAAa,CAC1B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAmB,EACtB,EAAE,GAAE,UAAgC,GACnC,OAAO,CAAC,MAAM,CAAC,CAkIjB;AAMD,iBAAe,WAAW,CACxB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAoB,EACvB,EAAE,GAAE,UAAgC,GACnC,OAAO,CAAC,MAAM,CAAC,CA2KjB;AAMD,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAC;AAEF,wBAA8B,qBAAqB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoxBnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH,OAAO,KAAK,EAEX,YAAY,EAGZ,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EACL,iBAAiB,EAEjB,WAAW,EACX,KAAK,UAAU,EACf,SAAS,EACT,eAAe,EACf,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAYxB,KAAK,eAAe,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAgdxD,oFAAoF;AACpF,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAuKD,iBAAS,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAoWD,iBAAe,aAAa,CAC1B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAmB,EACtB,EAAE,GAAE,UAAgC,GACnC,OAAO,CAAC,MAAM,CAAC,CAkIjB;AAMD,iBAAe,WAAW,CACxB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAoB,EACvB,EAAE,GAAE,UAAgC,GACnC,OAAO,CAAC,MAAM,CAAC,CA2KjB;AAMD,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAC;AAEF,wBAA8B,qBAAqB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAipBnF"}

package/dist/index.js

@@ -27,8 +27,7 @@ import * as Diff from "diff";
 import { configIndicatorStyle } from "./core/config.js";
 import { computeHunkBlocks, getSepStyle, parseDiff, parsePatchFiles, resolveSepStyle, sepLabelSplit, sepLabelUnified, } from "./core/diff.js";
 import { replace } from "./core/replace.js";
-import { resolveLinesFromPatch } from "./core/resolve-lines.js";
-import { registerReviewDiffCommand } from "./review/command.js";
+import { registerEditGuard } from "./edit-guard.js";
 import { applyDiffPalette as applySharedDiffPalette, lang as detectDiffLanguage, renderSplit as renderSharedSplit, resolveDiffColors as resolveSharedDiffColors, themeCacheKey as sharedThemeCacheKey, } from "./review/hunk-preview.js";
 const DIFF_PRESETS = {
     default: {
@@ -1300,152 +1299,6 @@ export default async function diffRendererExtension(pi) {
         };
         return text;
     }
-    registerReviewDiffCommand(pi, cwd);
-    // ── resolve_lines tool ────────────────────────────────────────────────
-    pi.registerTool({
-        name: "resolve_lines",
-        label: "Resolve Lines",
-        description: `Resolve line numbers for an LLM code-review comment by matching its existing_code snippet against the git diff hunks. Uses a three-tier algorithm: new-side hunk match, old-side hunk match, then full file-content scan. Returns \`startLine\` and \`endLine\` when found, or \`unresolved: true\` when the snippet cannot be located.
-
-Three-tier resolution:
-  1. Match against diff hunks (new-file side) — context + added lines
-  2. Match against diff hunks (old-file side) — context + deleted lines
-  3. Scan full file content for a consecutive line match
-
-Use after receiving a review comment with \`existing_code\` but zero or drifted line numbers. The tool fetches the current git diff for the file automatically when \`patchText\` is omitted.
-
-Examples:
-  resolve_lines({ existingCode: "const x = 1;", filePath: "src/index.ts" })
-  resolve_lines({ existingCode: "function foo() {", filePath: "src/utils.ts", patchText: "@@ -1,3 +1,4 @@..." })`,
-        promptSnippet: "Resolve line numbers for an LLM review comment by matching existing_code against git diff hunks.",
-        parameters: {
-            type: "object",
-            properties: {
-                existingCode: {
-                    type: "string",
-                    description: "The code snippet from the LLM review comment that shows the problematic code. Required.",
-                },
-                filePath: {
-                    type: "string",
-                    description: "Path to the file this comment is about, relative to repo root. Required.",
-                },
-                patchText: {
-                    type: "string",
-                    description: "Optional raw unified diff text for the file. When omitted, pi-diff fetches the git diff automatically.",
-                },
-                fileContent: {
-                    type: "string",
-                    description: "Optional full new-file content for fallback line scan after hunk matching fails.",
-                },
-            },
-            required: ["existingCode", "filePath"],
-            additionalProperties: false,
-        },
-        async execute(_tid, params = {}) {
-            try {
-                const { existingCode, filePath, patchText, fileContent } = params ?? {};
-                if (!existingCode || !filePath) {
-                    return {
-                        content: [
-                            { type: "text", text: "Error: existingCode and filePath are required" },
-                        ],
-                    };
-                }
-                // Fetch git diff if patchText not provided
-                let patch = patchText;
-                if (!patch) {
-                    const { execFileSync } = await import("node:child_process");
-                    try {
-                        patch = execFileSync("git", ["diff", "--no-ext-diff", "HEAD", "--", filePath], {
-                            cwd,
-                            encoding: "utf8",
-                            maxBuffer: 1024 * 1024,
-                            stdio: ["ignore", "pipe", "pipe"],
-                        }).trim();
-                        // Also try unstaged diff
-                        const unstaged = execFileSync("git", ["diff", "--no-ext-diff", "--", filePath], {
-                            cwd,
-                            encoding: "utf8",
-                            maxBuffer: 1024 * 1024,
-                            stdio: ["ignore", "pipe", "pipe"],
-                        }).trim();
-                        if (unstaged) {
-                            patch = patch ? [patch, unstaged].filter(Boolean).join("\n") : unstaged;
-                        }
-                    }
-                    catch {
-                        return {
-                            content: [
-                                { type: "text", text: `Error: could not read git diff for ${filePath}` },
-                            ],
-                        };
-                    }
-                }
-                if (!patch) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `No diff found for ${filePath} — file may not have changes`,
-                            },
-                        ],
-                        details: { unresolved: true },
-                    };
-                }
-                const result = resolveLinesFromPatch(existingCode, patch, fileContent);
-                if ("unresolved" in result) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `Could not resolve line numbers for existing_code in ${filePath}`,
-                            },
-                        ],
-                        details: { unresolved: true },
-                    };
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Resolved ${filePath}:${result.startLine}-${result.endLine}`,
-                        },
-                    ],
-                    details: { startLine: result.startLine, endLine: result.endLine },
-                };
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                return {
-                    content: [{ type: "text", text: `Error: ${message}` }],
-                    details: { unresolved: true, error: message },
-                };
-            }
-        },
-        renderCall(args, theme, ctx) {
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            const fp = typeof args?.filePath === "string" ? args.filePath : "";
-            text.setText(`${theme.fg("toolTitle", theme.bold("resolve_lines"))} ${theme.fg("accent", fp)}`);
-            return text;
-        },
-        renderResult(result, _opt, theme, ctx) {
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            if (ctx.isError || result.details?.error) {
-                text.setText(`\n${theme.fg("error", result.details?.error ?? "resolve_lines failed")}`);
-                return text;
-            }
-            if (result.details?.unresolved) {
-                text.setText(`  ${theme.fg("muted", "unresolved")}`);
-                return text;
-            }
-            if (result.details?.startLine != null) {
-                text.setText(`  ${theme.fg("success", `lines ${result.details.startLine}-${result.details.endLine}`)}`);
-                return text;
-            }
-            text.setText(`  ${theme.fg("dim", String(result?.content?.[0]?.text ?? "").slice(0, 120))}`);
-            return text;
-        },
-    });
     // =======================================================================
     // write
     // =======================================================================
@@ -1676,7 +1529,7 @@ Examples:
                                 content: [{ type: "text", text: `Edited ${sp(fp)}` }],
                                 details: {
                                     _type: "editInfo",
-                                    summary,
+                                    summary: editLine > 0 ? `${summary} at line ${editLine}` : summary,
                                     filePath: fp,
                                     editLine,
                                     diff: diffData,
@@ -1687,6 +1540,15 @@ Examples:
                                 },
                             };
                         }
+                        // Compute the line of the first edit for the title summary
+                        const firstEditLine = (() => {
+                            if (!operations[0]?.newText)
+                                return 0;
+                            const idx = content.indexOf(operations[0].newText);
+                            if (idx < 0)
+                                return 0;
+                            return content.slice(0, idx).split("\n").length;
+                        })();
                         // Merge all diffs into one combined view for rendering
                         const merged = {
                             lines: diffs.flatMap((diff, i) => [
@@ -1710,7 +1572,7 @@ Examples:
                             content: [{ type: "text", text: `Edited ${sp(fp)}` }],
                             details: {
                                 _type: "multiEditInfo",
-                                summary,
+                                summary: firstEditLine > 0 ? `${summary} at line ${firstEditLine}` : summary,
                                 filePath: fp,
                                 editCount: operations.length,
                                 diffLineCount: merged.lines.length,
@@ -1749,7 +1611,7 @@ Examples:
                     : diffs[0];
                 result.details = {
                     _type: "editInfo",
-                    summary,
+                    summary: editLine > 0 ? `${summary} at line ${editLine}` : summary,
                     filePath: fp,
                     editLine,
                     diff: diffData,
@@ -1779,9 +1641,21 @@ Examples:
                 removed: diffs.reduce((sum, diff) => sum + diff.removed, 0),
                 chars: diffs.reduce((sum, diff) => sum + diff.chars, 0),
             };
+            let firstEditLine = 0;
+            try {
+                if (fp) {
+                    const f = readFileSync(fp, "utf8");
+                    const idx = f.indexOf(operations[0].newText);
+                    if (idx >= 0)
+                        firstEditLine = f.slice(0, idx).split("\n").length;
+                }
+            }
+            catch {
+                firstEditLine = 0;
+            }
             result.details = {
                 _type: "multiEditInfo",
-                summary,
+                summary: firstEditLine > 0 ? `${summary} at line ${firstEditLine}` : summary,
                 filePath: fp,
                 editCount: operations.length,
                 diffLineCount: merged.lines.length,
@@ -1797,7 +1671,24 @@ Examples:
             resolvePreviewDiffColors(theme);
             if (ctx.argsComplete && operations.length > 0) {
                 const { totalAdded, totalRemoved } = summarizeEditOperations(operations);
-                text.setText(formatToolTitle("edit", fp, theme, termW(), `  ${theme.fg("muted", summarize(totalAdded, totalRemoved))}`));
+                // Compute the line number for the call preview by reading the
+                // file and finding the first oldText. This lets the title show
+                // "at line N" even before the edit executes, matching what the
+                // result title will show.
+                let previewLine = 0;
+                try {
+                    if (fp && existsSync(fp)) {
+                        const cur = readFileSync(fp, "utf-8");
+                        const idx = cur.indexOf(operations[0].oldText);
+                        if (idx >= 0)
+                            previewLine = cur.slice(0, idx).split("\n").length;
+                    }
+                }
+                catch {
+                    previewLine = 0;
+                }
+                const loc = previewLine > 0 ? ` ${theme.fg("muted", `at line ${previewLine}`)}` : "";
+                text.setText(formatToolTitle("edit", fp, theme, termW(), `  ${theme.fg("muted", summarize(totalAdded, totalRemoved))}${loc}`));
             }
             else {
                 text.setText(formatToolTitle("edit", fp, theme, termW()));
@@ -1817,19 +1708,16 @@ Examples:
             }
             const d = result.details;
             if (d?._type === "editInfo" && d.diff) {
-                const loc = d.editLine > 0 ? ` ${theme.fg("muted", `at line ${d.editLine}`)}` : "";
-                setDiffPreviewTask(text, "ed", `${d.summary}${loc}`, d.diff, d.language, MAX_PREVIEW_LINES, theme, ctx);
+                setDiffPreviewTask(text, "ed", "", d.diff, d.language, MAX_PREVIEW_LINES, theme, ctx);
                 return text;
             }
             if (d?._type === "editInfo") {
-                const { summary: s, editLine } = d;
-                const loc = editLine > 0 ? ` ${theme.fg("muted", `at line ${editLine}`)}` : "";
-                setToolHeaderText(text, `${s}${loc}`, theme);
+                setToolHeaderText(text, "", theme);
                 return text;
             }
             if (d?._type === "multiEditInfo") {
-                const { summary: s, editCount, diffLineCount, diff, language } = d;
-                const meta = `${editCount} edits ${s}${diffLineCountLabel(diffLineCount, theme)}`;
+                const { editCount, diffLineCount, diff, language } = d;
+                const meta = `${editCount} edits${diffLineCountLabel(diffLineCount, theme)}`;
                 if (diff) {
                     setDiffPreviewTask(text, "me", meta, diff, language, MAX_PREVIEW_LINES, theme, ctx);
                     return text;
@@ -1842,5 +1730,6 @@ Examples:
             return text;
         },
     });
+    registerEditGuard(pi);
 }
 //# sourceMappingURL=index.js.map