@pentoshi/clai 4.14.4 → 4.15.0

package/dist/classic/blocks/batch-lines.js

@@ -1,28 +1,14 @@
-import { batchSummaryLine, buildBatchCardsFromSpool, parseBatchSections, presentBatchSection, } from "../../ui-core/rendering/batch-sections.js";
+import { buildBatchCardsFromSpool, parseBatchSections, batchSummaryLine } from "../../ui-core/rendering/batch-sections.js";
 import { isItemExpanded } from "../../ui-core/state/transcript-types.js";
+import { parseFsReadSections } from "../../tools/fs/read-sections.js";
+import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
 import { adaptPresenterGlyphs } from "../render/glyphs.js";
-import { alignEnds, trimTrailingSpaces } from "../render/ansi-text.js";
-import { EXPANDED_LINE_ROWS, joinMeta, SUFFIX_MIN_COLUMNS, wrapBoundedRows, } from "./block-context.js";
-import { hintRows, outputToggleLabel, toolHeaderLines } from "./tool-lines.js";
-import { isFsReadMultiOutput } from "../../tools/fs/read-sections.js";
-export const BATCH_COLLAPSED_ROWS = 8;
-const SUB_INDENT = 2;
-const SUB_BODY_INDENT = 4;
-const SECTION_TOKEN = {
-    running: "activity",
-    ok: "success",
-    fail: "diffDel",
-    cancelled: "activity",
-};
-function sectionGlyph(ctx, status) {
-    if (status === "running")
-        return ctx.glyphs.toolRunning;
-    if (status === "ok")
-        return ctx.glyphs.toolOk;
-    if (status === "cancelled")
-        return ctx.glyphs.toolBlocked;
-    return ctx.glyphs.toolFailed;
-}
+import { clipRow } from "./block-context.js";
+import { appendDisclosure } from "./disclosure-lines.js";
+import { classicToolLabel } from "./tool-label.js";
+import { logicalOutputLines, outputBodyRows } from "./output-lines.js";
+import { buildToolLines, toolHeaderLines, toolGlyph, TOOL_STATUS_TOKEN } from "./tool-lines.js";
+export const BATCH_COLLAPSED_ROWS = 3;
 export function batchSectionsFor(ctx, item) {
     const tail = ctx.spool.tail(item.toolCallId);
     const open = item.status === "running" || item.status === "queued";
@@ -31,48 +17,50 @@ export function batchSectionsFor(ctx, item) {
     const parsed = parseBatchSections(tail);
     return parsed.length > 0 ? parsed : buildBatchCardsFromSpool(tail);
 }
+function readPathLine(ctx, path, ok) {
+    const label = ctx.ink.fg(ok ? "inputBorder" : "diffDel", sanitizeDisplayText(path).replace(/\n/g, " "));
+    return clipRow(ctx, `    ${ctx.ink.fg("toolOutput", "Read")} ${label}`);
+}
+function compactReadLines(ctx, section) {
+    const files = parseFsReadSections(section.body);
+    if (files.length === 0) {
+        const path = section.body.match(/^# fs\.read path=(.+?)(?= (?:lines|pattern|bytes)=|$)/m)?.[1];
+        if (path)
+            return [readPathLine(ctx, path, section.ok)];
+        return outputBodyRows(ctx, logicalOutputLines(section.body, section.name), false, { branch: false });
+    }
+    return files.flatMap((file) => {
+        const lines = [readPathLine(ctx, file.path, file.ok)];
+        if (!file.ok)
+            lines.push(...outputBodyRows(ctx, logicalOutputLines(file.body, section.name), false, { token: "diffDel", branch: false }));
+        return lines;
+    });
+}
 export function buildBatchLines(ctx, item) {
     const expanded = isItemExpanded(ctx.state, item);
     const sections = batchSectionsFor(ctx, item);
+    if (sections.length === 0)
+        return buildToolLines(ctx, item);
     const lines = toolHeaderLines(ctx, item);
-    const subIndent = " ".repeat(SUB_INDENT);
-    if (sections.length === 0) {
-        lines.push(...hintRows(ctx, subIndent, outputToggleLabel(expanded)));
-        return lines;
-    }
     const shown = expanded ? sections : sections.slice(0, BATCH_COLLAPSED_ROWS);
-    const bodyIndent = " ".repeat(SUB_BODY_INDENT);
-    for (const section of shown) {
-        const status = section.status ?? (section.ok ? "ok" : "fail");
-        const token = SECTION_TOKEN[status] ?? "muted";
-        const multiRead = section.name === "fs.read" && isFsReadMultiOutput(section.body);
-        const presented = presentBatchSection(section, multiRead ? false : expanded, ctx.width - SUB_BODY_INDENT);
-        const glyph = ctx.ink.fg(token, sectionGlyph(ctx, status));
-        const name = ctx.ink.fg("cyan", section.name);
-        const suffix = ctx.width + 2 >= SUFFIX_MIN_COLUMNS && status === "running"
-            ? ctx.ink.fg(token, presented.statusLabel)
-            : "";
-        lines.push(alignEnds(`${subIndent}${glyph} ${name}`, suffix, ctx.width, ctx.glyphs.ellipsis));
-        if ((!expanded && !multiRead) || !presented.hasBody)
-            continue;
-        const budget = Math.max(1, ctx.width - SUB_BODY_INDENT);
-        const rows = multiRead ? presented.lines : presented.lines.filter((line) => line.trim().length > 0).slice(0, 1);
-        for (const row of rows) {
-            const text = adaptPresenterGlyphs(row, ctx.ink.unicode);
-            for (const chunk of wrapBoundedRows(ctx, text, budget, EXPANDED_LINE_ROWS)) {
-                lines.push(trimTrailingSpaces(`${bodyIndent}${ctx.ink.fg("toolText", chunk)}`));
-            }
-        }
+    for (const [index, section] of shown.entries()) {
+        const status = section.status === "fail" ? "failed" : section.status === "cancelled" ? "blocked" : section.status;
+        const token = section.status === "cancelled" ? "muted" : TOOL_STATUS_TOKEN[status];
+        const tool = { ...item, name: section.name, status };
+        const name = ctx.ink.fg(token, classicToolLabel(tool));
+        const glyph = ctx.ink.fg(token, toolGlyph(ctx, status));
+        const prefix = index === 0 ? `  ${ctx.glyphs.bodyBranch} ` : "    ";
+        const exit = section.exitCode && section.exitCode !== 0 ? ` (exit ${section.exitCode})` : "";
+        lines.push(clipRow(ctx, `${prefix}${glyph} ${name}${exit}`));
+        if (expanded)
+            lines.push(...outputBodyRows(ctx, logicalOutputLines(section.body, section.name), true, { branch: false }));
+        else if (section.name === "fs.read")
+            lines.push(...compactReadLines(ctx, section));
     }
-    const hidden = sections.length - shown.length;
-    const summary = batchSummaryLine(sections);
-    const footer = joinMeta(ctx, [
-        outputToggleLabel(expanded),
-        summary === "" ? undefined : summary,
-        hidden > 0 ? `${ctx.glyphs.ellipsis} +${hidden} more` : undefined,
-    ]);
-    if (footer !== "")
-        lines.push(...hintRows(ctx, subIndent, footer));
+    const summary = adaptPresenterGlyphs(batchSummaryLine(sections, "glyph"), ctx.ink.unicode);
+    if (summary)
+        lines.push(clipRow(ctx, `    ${ctx.ink.fg("hint", summary)}`));
+    appendDisclosure(ctx, lines, expanded, { hidden: Math.max(0, sections.length - shown.length) });
     return lines;
 }
 //# sourceMappingURL=batch-lines.js.map

package/dist/classic/blocks/batch-lines.js.map

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

package/dist/classic/blocks/block-context.d.ts

@@ -1,13 +1,18 @@
 import type { ToolCallId } from "../../app/events/app-event.js";
 import type { BoundedTextState } from "../../app/events/event-buffer.js";
+import type { FileChange } from "../../tools/file-diff.js";
 import type { MarkdownStreamCache } from "../../ui-core/rendering/streaming-markdown.js";
 import type { TranscriptState } from "../../ui-core/state/transcript-types.js";
 import type { Glyphs } from "../render/glyphs.js";
 import type { InkTheme } from "../render/ink-theme.js";
+import type { BlockDisclosure } from "./disclosure-lines.js";
 export interface SpoolReader {
     tail(toolCallId: ToolCallId): string;
     state(toolCallId: ToolCallId): BoundedTextState | undefined;
-    version?(toolCallId: ToolCallId): number;
+    version?(toolCallId: ToolCallId): number | string;
+    notice?(toolCallId: ToolCallId): string | undefined;
+    fileChange?(change: FileChange): FileChange;
+    fileChangeNotice?(change: FileChange): string | undefined;
 }
 export declare const EMPTY_SPOOL: SpoolReader;
 export interface BlockContext {
@@ -18,6 +23,8 @@ export interface BlockContext {
     readonly state: TranscriptState;
     readonly spool: SpoolReader;
     readonly markdownCache: MarkdownStreamCache | undefined;
+    readonly disclosures?: BlockDisclosure[];
+    readonly lineOffset?: number;
 }
 export declare const SUFFIX_MIN_COLUMNS = 44;
 export declare const COLLAPSED_LINE_ROWS = 4;

package/dist/classic/blocks/block-context.js.map

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

package/dist/classic/blocks/compacted-lines.d.ts

@@ -1,4 +1,3 @@
 import { type CompactedItem } from "../../ui-core/state/transcript-types.js";
 import { type BlockContext } from "./block-context.js";
-export declare const COMPACTED_PREVIEW_ROWS = 4;
 export declare function buildCompactedLines(ctx: BlockContext, item: CompactedItem): string[];

package/dist/classic/blocks/compacted-lines.js

@@ -1,56 +1,24 @@
 import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
 import { compactionElapsedLabel } from "../../ui-core/rendering/duration.js";
 import { liveCompactionHeadTail } from "../../ui-core/rendering/thinking-tail.js";
-import { compactionTokenLabel, isItemExpanded, } from "../../ui-core/state/transcript-types.js";
-import { trimTrailingSpaces } from "../render/ansi-text.js";
+import { compactionTokenLabel, isItemExpanded } from "../../ui-core/state/transcript-types.js";
 import { wrapWithPrefixes } from "../render/wrap.js";
 import { joinMeta } from "./block-context.js";
-import { hintRows, outputToggleLabel } from "./tool-lines.js";
-export const COMPACTED_PREVIEW_ROWS = 4;
-const BODY_INDENT = 4;
+import { appendDisclosure } from "./disclosure-lines.js";
+import { logicalOutputLines, outputBodyRows, OUTPUT_PREVIEW_LINES } from "./output-lines.js";
 export function buildCompactedLines(ctx, item) {
     const expanded = isItemExpanded(ctx.state, item);
     const label = compactionTokenLabel(item);
     const elapsed = compactionElapsedLabel(item, ctx.now);
-    const glyph = ctx.ink.fg("cyan", ctx.glyphs.compacted);
-    const head = joinMeta(ctx, [
-        item.error ? "Compaction failed" : "Compacted context",
-        elapsed,
-        label === "" ? undefined : label,
-    ]);
-    const headRows = wrapWithPrefixes(head, { width: Math.max(1, ctx.width - 2) });
-    const lines = headRows.map((row, index) => trimTrailingSpaces(`${index === 0 ? `${glyph} ` : "  "}${ctx.ink.fg(item.error ? "activity" : "cyan", row)}`));
-    const indent = " ".repeat(BODY_INDENT);
-    if (item.error) {
-        const branch = ctx.ink.fg("muted", `  ${ctx.glyphs.bodyBranch} `);
-        const indent = " ".repeat(BODY_INDENT);
-        const errorRows = wrapWithPrefixes(sanitizeDisplayText(item.error), {
-            width: Math.max(1, ctx.width - BODY_INDENT),
-        });
-        for (const [index, row] of errorRows.entries()) {
-            lines.push(trimTrailingSpaces(`${index === 0 ? branch : indent}${ctx.ink.fg("activity", row)}`));
-        }
-        lines.push(...hintRows(ctx, indent, outputToggleLabel(expanded)));
-        return lines;
-    }
-    const summary = sanitizeDisplayText(item.streaming ? liveCompactionHeadTail(item.summary) : item.summary).trim();
-    if (summary === "") {
-        lines.push(...hintRows(ctx, indent, outputToggleLabel(expanded)));
-        return lines;
-    }
-    const budget = Math.max(1, ctx.width - BODY_INDENT);
-    const rows = wrapWithPrefixes(summary, { width: budget });
-    const cap = expanded ? rows.length : COMPACTED_PREVIEW_ROWS;
-    const shown = rows.slice(0, cap);
-    const branch = ctx.ink.fg("hint", `  ${ctx.glyphs.bodyBranch} `);
-    for (const [index, row] of shown.entries()) {
-        lines.push(trimTrailingSpaces(`${index === 0 ? branch : indent}${ctx.ink.fg("muted", row)}`));
-    }
-    const footer = joinMeta(ctx, [
-        outputToggleLabel(expanded),
-        rows.length > shown.length ? `${ctx.glyphs.ellipsis} full memory` : undefined,
-    ]);
-    lines.push(...hintRows(ctx, indent, footer));
+    const token = item.error ? "activity" : "cyan";
+    const mark = ctx.ink.unicode ? "•" : "*";
+    const head = joinMeta(ctx, [item.error ? "Compaction failed" : "Compacted context", elapsed, label || undefined]);
+    const lines = wrapWithPrefixes(head, { width: ctx.width, firstPrefix: `${mark} `, nextPrefix: "  " })
+        .map((row) => ctx.ink.fg(token, row));
+    const summary = item.error ?? (item.streaming && !expanded ? liveCompactionHeadTail(item.summary) : item.summary);
+    const source = logicalOutputLines(sanitizeDisplayText(summary));
+    lines.push(...outputBodyRows(ctx, source, expanded, { token: item.error ? "activity" : "muted" }));
+    appendDisclosure(ctx, lines, expanded, { hidden: Math.max(0, source.length - OUTPUT_PREVIEW_LINES) });
     return lines;
 }
 //# sourceMappingURL=compacted-lines.js.map

package/dist/classic/blocks/compacted-lines.js.map

@@ -1 +1 @@
-{"version":3,"file":"compacted-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/compacted-lines.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compacted-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/compacted-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAsB,MAAM,yCAAyC,CAAC;AACnH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAqB,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE7F,MAAM,UAAU,mBAAmB,CAAC,GAAiB,EAAE,IAAmB;IACxE,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,EAAE,OAAO,EAAE,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC;IAClH,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;SAClG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClH,MAAM,MAAM,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnG,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;IACtG,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/classic/blocks/diff-lines.d.ts

@@ -1,12 +1,10 @@
 import type { FileChange } from "../../tools/file-diff.js";
 import { type ToolItem } from "../../ui-core/state/transcript-types.js";
 import { type BlockContext } from "./block-context.js";
-export declare const SINGLE_FILE_PREVIEW_ROWS = 40;
-export declare const WRITE_MANY_PREVIEW_ROWS = 8;
+export declare const DIFF_PREVIEW_LINES = 3;
 export declare const WRITE_MANY_LISTED_FILES = 12;
-export declare const DIFF_INDENT = 2;
+export declare const DIFF_INDENT = 4;
 export declare const DIFF_TAB_WIDTH = 4;
-export declare function diffStatsSuffix(ctx: BlockContext, change: FileChange): string;
+export declare function diffStatsSuffix(ctx: BlockContext, change: Pick<FileChange, "stats">): string;
 export declare function diffTitleLine(ctx: BlockContext, item: ToolItem, change: FileChange | undefined): string;
-export declare function diffStatsRow(ctx: BlockContext, change: FileChange): string | undefined;
 export declare function buildDiffLines(ctx: BlockContext, item: ToolItem): string[];

package/dist/classic/blocks/diff-lines.js

@@ -1,171 +1,132 @@
-import { collapsedFileChangeLabel, gutterWidth, presentFileChangePreview, relativeDisplayPath, syntaxColor, } from "../../ui-core/rendering/file-diff-view.js";
-import { presentTool } from "../../ui-core/rendering/tool-presenter.js";
-import { isFileDiffExpanded, isItemExpanded, } from "../../ui-core/state/transcript-types.js";
-import { alignEnds, clipToWidth, sealStyle, trimTrailingSpaces } from "../render/ansi-text.js";
-import { clipRow, SUFFIX_MIN_COLUMNS } from "./block-context.js";
-import { hintRows, outputToggleLabel, toolGlyph } from "./tool-lines.js";
-export const SINGLE_FILE_PREVIEW_ROWS = 40;
-export const WRITE_MANY_PREVIEW_ROWS = 8;
+import { buildModalLines, changeVerb } from "../../tools/file-diff.js";
+import { relativeDisplayPath, syntaxColor } from "../../ui-core/rendering/file-diff-view.js";
+import { emptyCarry, highlightLineForPath } from "../../ui-core/rendering/syntax-highlight.js";
+import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
+import { isFileDiffExpanded, isItemExpanded } from "../../ui-core/state/transcript-types.js";
+import { clipToWidth, expandTabs, sealStyle, trimTrailingSpaces } from "../render/ansi-text.js";
+import { layoutWidth } from "../render/measure.js";
+import { wrapAnsiLine } from "../render/wrap.js";
+import { clipRow } from "./block-context.js";
+import { appendDisclosure } from "./disclosure-lines.js";
+import { buildToolBodyLines, hintRows, toolGlyph, TOOL_STATUS_TOKEN } from "./tool-lines.js";
+export const DIFF_PREVIEW_LINES = 3;
 export const WRITE_MANY_LISTED_FILES = 12;
-export const DIFF_INDENT = 2;
+export const DIFF_INDENT = 4;
 export const DIFF_TAB_WIDTH = 4;
-const GUTTER_RULE_WIDTH = 3;
-const CLICK_HINT = " · click for full";
-const STATUS_TOKEN = {
-    queued: "muted",
-    running: "activity",
-    ok: "success",
-    failed: "diffDel",
-    blocked: "activity",
-};
-function changeMark(ctx, kind) {
-    if (kind === "create")
-        return { mark: "+", token: "success" };
-    if (kind === "overwrite")
-        return { mark: "~", token: "activity" };
-    return { mark: ctx.glyphs.separator, token: "toolOutput" };
-}
-function washToken(tone) {
-    if (tone === "add")
-        return "diffAddBg";
-    if (tone === "del")
-        return "diffDelBg";
-    return undefined;
-}
-function syntaxCode(ctx, row) {
-    if (ctx.ink.colorMode === "none")
-        return row.displayText;
-    let out = "";
-    for (const span of row.spans)
-        out += ctx.ink.hex(syntaxColor(span.kind, ctx.ink.theme), span.text);
-    return out;
-}
-function mutedCode(ctx, text) {
-    return ctx.ink.style(text, { fg: "muted", dim: true });
-}
-function gutterCell(ctx, row) {
-    const rail = row.tone === "add" ? "diffAdd" : row.tone === "del" ? "diffDel" : "diffGutter";
-    return `${ctx.ink.fg("diffGutter", `${row.gutter} `)}${ctx.ink.fg(rail, `${ctx.glyphs.boxVertical} `)}`;
-}
-function quietText(row) {
-    return row.tone === "gap" ? row.displayText.replace(CLICK_HINT, "") : row.displayText;
-}
-function washedRow(ctx, row, rowWidth) {
-    const gutter = gutterCell(ctx, row);
-    const line = clipToWidth(`${gutter}${markedBody(ctx, row)}`, rowWidth, ctx.glyphs.ellipsis);
-    const wash = washToken(row.tone);
-    return wash ? ctx.ink.band(line, rowWidth, { bg: wash }) : line;
-}
-function markedRow(ctx, row, rowWidth) {
-    const gutter = gutterCell(ctx, row);
-    return clipToWidth(`${gutter}${markedBody(ctx, row)}`, rowWidth, ctx.glyphs.ellipsis);
-}
-function markedBody(ctx, row) {
-    if (row.tone === "context")
-        return `  ${syntaxCode(ctx, row)}`;
-    if (row.tone !== "add" && row.tone !== "del")
-        return `  ${mutedCode(ctx, quietText(row))}`;
-    const marker = row.prefix === "−" ? "-" : row.prefix;
-    const token = row.tone === "add" ? "diffAdd" : "diffDel";
-    return `${ctx.ink.style(marker, { fg: token, bold: true })} ${syntaxCode(ctx, row)}`;
-}
-function diffRowLine(ctx, row) {
-    const rowWidth = Math.max(1, ctx.width - DIFF_INDENT);
-    const body = ctx.ink.washColor ? washedRow(ctx, row, rowWidth) : markedRow(ctx, row, rowWidth);
-    return trimTrailingSpaces(sealStyle(`${" ".repeat(DIFF_INDENT)}${body}`));
-}
-function codeBudget(ctx, change) {
-    const marker = 2;
-    return Math.max(8, ctx.width - DIFF_INDENT - gutterWidth(change) - GUTTER_RULE_WIDTH - marker);
+function verb(item, change) {
+    const kind = change?.kind ?? "edit";
+    const status = item.status === "failed" || item.status === "blocked" ? "failed" : item.status === "ok" ? "ok" : "running";
+    if (kind === "create" && status !== "failed")
+        return status === "ok" ? "Added" : "Adding";
+    if (kind === "overwrite" || kind === "append")
+        return status === "ok" ? "Edited" : changeVerb(kind, status);
+    return changeVerb(kind, status);
 }
 export function diffStatsSuffix(ctx, change) {
-    const minus = ctx.ink.unicode ? "−" : "-";
     const added = ctx.ink.style(`+${change.stats.added}`, { fg: "success", bold: true });
-    const removed = ctx.ink.style(`${minus}${change.stats.removed}`, { fg: "diffDel", bold: true });
-    return `${added} ${removed}`;
+    const removed = ctx.ink.style(`-${change.stats.removed}`, { fg: "diffDel", bold: true });
+    return `(${added} ${removed})`;
 }
-function totalStats(changes) {
+export function diffTitleLine(ctx, item, change) {
+    const changes = item.fileChanges ?? [];
+    const token = TOOL_STATUS_TOKEN[item.status];
+    const title = ctx.ink.style(verb(item, changes[0] ?? change), { fg: token, bold: true });
+    const path = changes.length > 1 ? `${changes.length} files` : relativeDisplayPath(change?.path ?? item.argsDisplay);
+    const label = ctx.ink.fg("inputBorder", sanitizeDisplayText(path));
+    const suffix = change ? ` ${diffStatsSuffix(ctx, change)}` : "";
+    const head = `${ctx.ink.fg(token, toolGlyph(ctx, item.status))} ${title} ${label}`;
+    const budget = Math.max(1, ctx.width - layoutWidth(suffix));
+    return clipRow(ctx, `${clipToWidth(head, budget, ctx.glyphs.ellipsis)}${suffix}`);
+}
+function carrier(changes) {
     if (changes.length === 0)
         return undefined;
-    if (changes.length === 1)
-        return changes[0].stats;
-    let added = 0;
-    let removed = 0;
-    for (const change of changes) {
-        added += change.stats.added;
-        removed += change.stats.removed;
+    const added = changes.reduce((sum, change) => sum + change.stats.added, 0);
+    const removed = changes.reduce((sum, change) => sum + change.stats.removed, 0);
+    return { ...changes[0], stats: { ...changes[0].stats, added, removed } };
+}
+function sourceLines(change, expanded) {
+    if (expanded && change.afterText !== undefined && change.truncated) {
+        const allAdded = change.stats.added === change.stats.newLines;
+        return buildModalLines(change).map((line) => ({
+            op: allAdded && line.op === "context" ? "add" : line.op,
+            text: line.text, oldLine: line.oldLineNo, newLine: line.lineNo,
+        }));
     }
-    return { ...changes[0].stats, added, removed };
-}
-function statsCarrier(changes) {
-    const stats = totalStats(changes);
-    return stats ? { ...changes[0], stats } : undefined;
-}
-export function diffTitleLine(ctx, item, change) {
-    const presented = presentTool(item);
-    const glyph = ctx.ink.fg(STATUS_TOKEN[item.status], toolGlyph(ctx, item.status));
-    const title = ctx.ink.style(presented.name, { fg: "cyan", bold: true });
-    const suffix = change && ctx.width + 2 >= SUFFIX_MIN_COLUMNS ? diffStatsSuffix(ctx, change) : "";
-    return alignEnds(`${glyph} ${title}`, suffix, ctx.width, ctx.glyphs.ellipsis);
+    return change.previewHunks.flatMap((hunk) => hunk.lines);
+}
+function codeText(ctx, spans) {
+    return spans.map((span) => ctx.ink.hex(syntaxColor(span.kind, ctx.ink.theme), span.text)).join("");
+}
+function diffRows(ctx, change, expanded) {
+    if (change.binary)
+        return [clipRow(ctx, "    (binary file)")];
+    const source = sourceLines(change, expanded);
+    if (source.length === 0)
+        return [clipRow(ctx, "    (no line changes)")];
+    const width = String(Math.max(change.stats.oldLines, change.stats.newLines, 1)).length;
+    const carry = emptyCarry();
+    const rows = [];
+    const shown = expanded ? source : source.slice(0, DIFF_PREVIEW_LINES);
+    for (const line of shown) {
+        const number = line.op === "del" ? line.oldLine : line.newLine ?? line.oldLine;
+        const gutter = number === undefined ? " ".repeat(width) : String(number).padStart(width, " ");
+        const marker = line.op === "add" ? "+" : line.op === "del" ? "-" : " ";
+        const token = line.op === "add" ? "diffAdd" : line.op === "del" ? "diffDel" : "diffGutter";
+        const text = expandTabs(sanitizeDisplayText(line.text), DIFF_TAB_WIDTH);
+        const spans = highlightLineForPath(text, change.path, carry);
+        const code = codeText(ctx, spans);
+        const codeWidth = Math.max(1, ctx.width - DIFF_INDENT - width - 3);
+        const chunks = expanded ? wrapAnsiLine(code, codeWidth) : [clipToWidth(code, codeWidth, ctx.glyphs.ellipsis)];
+        for (const [index, chunk] of chunks.entries()) {
+            const prefix = index === 0 ? `${gutter} ${marker} ` : " ".repeat(width + 3);
+            const body = `${" ".repeat(DIFF_INDENT)}${ctx.ink.fg(token, prefix)}${chunk}`;
+            const wash = line.op === "add" ? "diffAddBg" : line.op === "del" ? "diffDelBg" : undefined;
+            rows.push(trimTrailingSpaces(sealStyle(ctx.ink.washColor && wash ? ctx.ink.band(body, ctx.width, { bg: wash }) : body)));
+        }
+    }
+    return rows;
 }
-export function diffStatsRow(ctx, change) {
-    if (ctx.width + 2 >= SUFFIX_MIN_COLUMNS)
+function diffNotice(ctx, change) {
+    if (!change.truncated || change.binary)
         return undefined;
-    return clipRow(ctx, `  ${diffStatsSuffix(ctx, change)}`);
-}
-function fileRow(ctx, change) {
-    const { mark, token } = changeMark(ctx, change.kind);
-    const path = ctx.ink.fg("inputBorder", relativeDisplayPath(change.path));
-    return clipRow(ctx, ` ${ctx.ink.fg(token, mark)} ${path}`);
-}
-function labelRow(ctx, change) {
-    return clipRow(ctx, `  ${ctx.ink.style(collapsedFileChangeLabel(change), { fg: "foreground", bold: true })}`);
-}
-function moreFilesRow(ctx, hidden) {
-    return clipRow(ctx, `  ${ctx.ink.fg("muted", `${ctx.glyphs.ellipsis} +${hidden} more file${hidden === 1 ? "" : "s"}`)}`);
+    if (change.afterText === undefined) {
+        return ctx.spool.fileChangeNotice?.(change) ?? "Full diff unavailable · retained preview shown";
+    }
+    const removed = change.deletedAt.reduce((count, segment) => count + segment.lines.length, 0);
+    const missingMarkers = change.stats.added > change.addedNewLines.length && change.stats.added !== change.stats.newLines;
+    if (removed < change.stats.removed || missingMarkers)
+        return "Some diff details were not retained · full file shown";
+    return undefined;
 }
 export function buildDiffLines(ctx, item) {
-    const changes = item.fileChanges ?? [];
-    const primary = changes[0];
-    const multi = changes.length > 1;
-    const diffExpanded = isFileDiffExpanded(ctx.state, item.id);
-    const outputExpanded = isItemExpanded(ctx.state, item);
-    const carrier = multi ? statsCarrier(changes) : primary;
-    const lines = [diffTitleLine(ctx, item, carrier)];
-    if (carrier) {
-        const statsRow = diffStatsRow(ctx, carrier);
-        if (statsRow)
-            lines.push(statsRow);
-    }
-    const listed = multi ? changes.slice(0, WRITE_MANY_LISTED_FILES) : changes;
-    const hiddenFiles = changes.length - listed.length;
-    if (!diffExpanded) {
-        if (primary && !multi)
-            lines.push(labelRow(ctx, primary));
-        if (multi) {
-            for (const change of listed)
-                lines.push(fileRow(ctx, change));
-            if (hiddenFiles > 0)
-                lines.push(moreFilesRow(ctx, hiddenFiles));
+    const changes = (item.fileChanges ?? []).map((change) => ctx.spool.fileChange?.(change) ?? change);
+    const expanded = isItemExpanded(ctx.state, item);
+    const showDiff = isFileDiffExpanded(ctx.state, item.id);
+    const lines = [diffTitleLine(ctx, item, carrier(changes))];
+    if (changes.length === 0)
+        return [...lines, ...buildToolBodyLines({ ...ctx, lineOffset: lines.length }, item)];
+    const listed = expanded ? changes : changes.slice(0, WRITE_MANY_LISTED_FILES);
+    for (const [index, change] of listed.entries()) {
+        if (changes.length > 1) {
+            if (index > 0)
+                lines.push("");
+            const path = ctx.ink.fg("inputBorder", sanitizeDisplayText(relativeDisplayPath(change.path)));
+            lines.push(clipRow(ctx, `  ${ctx.glyphs.bodyBranch} ${path} ${diffStatsSuffix(ctx, change)}`));
         }
-        lines.push(...hintRows(ctx, "  ", outputToggleLabel(outputExpanded)));
-        return lines;
+        if (showDiff || expanded)
+            lines.push(...diffRows(ctx, change, expanded));
+        const notice = expanded ? diffNotice(ctx, change) : undefined;
+        if (notice)
+            lines.push(...hintRows(ctx, "    ", notice));
     }
-    const maxRows = multi ? WRITE_MANY_PREVIEW_ROWS : SINGLE_FILE_PREVIEW_ROWS;
-    for (const change of listed) {
-        if (multi)
-            lines.push(fileRow(ctx, change));
-        const rows = presentFileChangePreview(change, {
-            maxLineChars: codeBudget(ctx, change),
-            maxRows,
-            tabWidth: DIFF_TAB_WIDTH,
-        });
-        for (const row of rows)
-            lines.push(diffRowLine(ctx, row));
+    if (changes.length > listed.length)
+        lines.push(clipRow(ctx, `    ${ctx.ink.fg("hint", `${changes.length - listed.length} more files`)}`));
+    if (item.status === "failed" || item.status === "blocked") {
+        return [...lines, ...buildToolBodyLines({ ...ctx, lineOffset: lines.length }, item)];
     }
-    if (hiddenFiles > 0)
-        lines.push(moreFilesRow(ctx, hiddenFiles));
-    lines.push(...hintRows(ctx, "  ", outputToggleLabel(outputExpanded)));
+    const hidden = changes.reduce((sum, change) => sum + Math.max(0, sourceLines(change, false).length - DIFF_PREVIEW_LINES), 0);
+    appendDisclosure(ctx, lines, expanded, { hidden });
     return lines;
 }
 //# sourceMappingURL=diff-lines.js.map