@vincemakes/kiso-tui-cells 0.47.3 → 0.49.0

package/dist/components.js

@@ -639,9 +639,10 @@ function settledMeta(c) {
         if (c.name === "write_file" && parsed !== null && typeof parsed.content === "string") {
             return `+${countLines(parsed.content)}`;
         }
-        if (c.name === "edit_file" && parsed !== null && typeof parsed.search === "string" && typeof parsed.replace === "string") {
-            const added = countLines(parsed.replace);
-            const removed = countLines(parsed.search);
+        const hunks = c.name === "edit_file" && parsed !== null ? hunksOf(parsed) : null;
+        if (hunks !== null) {
+            const added = hunks.reduce((n, h) => n + countLines(h.replace), 0);
+            const removed = hunks.reduce((n, h) => n + countLines(h.search), 0);
             if (added + removed > 0)
                 return `+${added} -${removed}`;
         }

package/dist/diff.d.ts

@@ -85,9 +85,12 @@ export declare function editFileDiff(oldContent: string, search: string, replace
 /** write_file: a new file is all +; an existing file diffs row-level
  *  against its old content. */
 export declare function writeFileDiff(oldContent: string | null, newContent: string): DiffResult;
-/** The hunks an edit_file call carries: its `edits`, or its one
- *  `search`/`replace` pair. Null when the input has neither (the tool
- *  refuses such a call, so there is nothing to draw). */
+/** The hunks an edit_file call carries, in either vocabulary the tool
+ *  takes (ADR-0061): `edits` of `{oldText, newText}` or of legacy
+ *  `{search, replace}`, or the legacy top-level pair. A log written before
+ *  the rename keeps the old names, so a reader must take both. Null when
+ *  the tool would refuse the shape (nothing, or a hunk mixing the two) —
+ *  there is nothing to draw. */
 export declare function hunksOf(input: Record<string, unknown>): Hunk[] | null;
 /** Graphite §6 (R2a) — what an edit CHANGED, drawn from the call's own
  *  hunks: per hunk a line LCS of `search` against `replace`, the lines

package/dist/diff.js

@@ -152,21 +152,30 @@ export function writeFileDiff(oldContent, newContent) {
     const lines = withContext(lcsDiff(oldContent.split("\n"), newContent.split("\n")));
     return { lines, ...stats(lines), outcome: "diff" };
 }
-/** The hunks an edit_file call carries: its `edits`, or its one
- *  `search`/`replace` pair. Null when the input has neither (the tool
- *  refuses such a call, so there is nothing to draw). */
+/** The hunks an edit_file call carries, in either vocabulary the tool
+ *  takes (ADR-0061): `edits` of `{oldText, newText}` or of legacy
+ *  `{search, replace}`, or the legacy top-level pair. A log written before
+ *  the rename keeps the old names, so a reader must take both. Null when
+ *  the tool would refuse the shape (nothing, or a hunk mixing the two) —
+ *  there is nothing to draw. */
 export function hunksOf(input) {
-    const pair = (x) => {
+    const pair = (x, current) => {
         if (typeof x !== "object" || x === null)
             return null;
-        const { search, replace } = x;
+        const { oldText, newText, search, replace } = x;
+        const hasCurrent = oldText !== undefined || newText !== undefined;
+        const hasLegacy = search !== undefined || replace !== undefined;
+        if (hasCurrent && (hasLegacy || !current))
+            return null;
+        if (hasCurrent)
+            return typeof oldText === "string" && typeof newText === "string" ? { search: oldText, replace: newText } : null;
         return typeof search === "string" && typeof replace === "string" ? { search, replace } : null;
     };
     if (Array.isArray(input.edits)) {
-        const hunks = input.edits.map(pair);
+        const hunks = input.edits.map((h) => pair(h, true));
         return hunks.length > 0 && hunks.every((h) => h !== null) ? hunks : null;
     }
-    const one = pair(input);
+    const one = pair(input, false);
     return one === null ? null : [one];
 }
 /** Graphite §6 (R2a) — what an edit CHANGED, drawn from the call's own

package/dist/render.js

@@ -6,6 +6,7 @@
  * dependencies (the tui-cells package has none).
  */
 import { charWidth, displayWidth, visibleWidth, widthCut } from "./width.js";
+import { hunksOf } from "./diff.js";
 import { bg, breathRamp, fg, graphiteColours, mix, terminalTier } from "./graphite.js";
 const BASE = { bold: "\x1b[1m", dim: "\x1b[2m", red: "\x1b[31m", green: "\x1b[32m", warn: "\x1b[33m", italic: "\x1b[3m", italicEnd: "\x1b[23m", underline: "\x1b[4m", underlineEnd: "\x1b[24m", rv: "\x1b[7m", rvEnd: "\x1b[27m", reset: "\x1b[0m" };
 /**
@@ -364,8 +365,9 @@ function toolSummaryDetail(name, input, result) {
         }
         case "edit_file": {
             const path = String(input.path ?? "?");
-            const removed = lines(String(input.search ?? ""));
-            const added = lines(String(input.replace ?? ""));
+            const hunks = hunksOf(input) ?? [];
+            const removed = hunks.reduce((n, h) => n + lines(h.search), 0);
+            const added = hunks.reduce((n, h) => n + lines(h.replace), 0);
             return `${path} (+${added} -${removed})`;
         }
         case "shell": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vincemakes/kiso-tui-cells",
-	"version": "0.47.3",
+	"version": "0.49.0",
 	"description": "kiso tui-cells \u2014 the components cell renderer (components, diff, width, the render slice). Zero runtime dependencies: input is data, output is bytes.",
 	"type": "module",
 	"license": "MIT",