@pentoshi/clai 4.14.5 → 4.15.0

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

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

@@ -1 +1 @@
-{"version":3,"file":"diff-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/diff-lines.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,WAAW,EACX,wBAAwB,EACxB,mBAAmB,EACnB,WAAW,GAEZ,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,cAAc,GAEf,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE/F,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAqB,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEzE,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,CAAC;AAC3C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC;AAC7B,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAChC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAEvC,MAAM,YAAY,GAA2C;IAC3D,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,UAAU;IACnB,EAAE,EAAE,SAAS;IACb,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,UAAU;CACpB,CAAC;AAIF,SAAS,UAAU,CAAC,GAAiB,EAAE,IAAgB;IACrD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC9D,IAAI,IAAI,KAAK,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAClE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;AAC7D,CAAC;AAED,SAAS,SAAS,CAAC,IAA8B;IAC/C,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,WAAW,CAAC;IACvC,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,WAAW,CAAC;IACvC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,UAAU,CAAC,GAAiB,EAAE,GAAqB;IAC1D,IAAI,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM;QAAE,OAAO,GAAG,CAAC,WAAW,CAAC;IACzD,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK;QAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACnG,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,SAAS,CAAC,GAAiB,EAAE,IAAY;IAChD,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,UAAU,CAAC,GAAiB,EAAE,GAAqB;IAC1D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;IAC5F,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;AAC1G,CAAC;AAED,SAAS,SAAS,CAAC,GAAqB;IACtC,OAAO,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;AACxF,CAAC;AAED,SAAS,SAAS,CAAC,GAAiB,EAAE,GAAqB,EAAE,QAAgB;IAC3E,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5F,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClE,CAAC;AAED,SAAS,SAAS,CAAC,GAAiB,EAAE,GAAqB,EAAE,QAAgB;IAC3E,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,OAAO,WAAW,CAAC,GAAG,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxF,CAAC;AAED,SAAS,UAAU,CAAC,GAAiB,EAAE,GAAqB;IAC1D,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAC/D,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK;QAAE,OAAO,KAAK,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAC3F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,KAAK,GAAe,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;AACvF,CAAC;AAED,SAAS,WAAW,CAAC,GAAiB,EAAE,GAAqB;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC/F,OAAO,kBAAkB,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,UAAU,CAAC,GAAiB,EAAE,MAAkB;IACvD,MAAM,MAAM,GAAG,CAAC,CAAC;IACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAC;AACjG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAiB,EAAE,MAAkB;IACnE,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChG,OAAO,GAAG,KAAK,IAAI,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,SAAS,UAAU,CAAC,OAA8B;IAChD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC;IACnD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAC5B,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;IAClC,CAAC;IACD,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,YAAY,CAAC,OAA8B;IAClD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAiB,EACjB,IAAc,EACd,MAA8B;IAE9B,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,OAAO,SAAS,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAiB,EAAE,MAAkB;IAChE,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,kBAAkB;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO,OAAO,CAAC,GAAG,EAAE,KAAK,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,OAAO,CAAC,GAAiB,EAAE,MAAkB;IACpD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACzE,OAAO,OAAO,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,QAAQ,CAAC,GAAiB,EAAE,MAAkB;IACrD,OAAO,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAChH,CAAC;AAED,SAAS,YAAY,CAAC,GAAiB,EAAE,MAAc;IACrD,OAAO,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,aAAa,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;AAC3H,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAiB,EAAE,IAAc;IAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACjC,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAExD,MAAM,KAAK,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3E,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAEnD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,IAAI,OAAO,IAAI,CAAC,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,MAAM,MAAM,IAAI,MAAM;gBAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YAC9D,IAAI,WAAW,GAAG,CAAC;gBAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,wBAAwB,CAAC;IAC3E,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC5B,IAAI,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,EAAE;YAC5C,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;YACrC,OAAO;YACP,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;QACH,KAAK,MAAM,GAAG,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,WAAW,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;IAEhE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"diff-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/diff-lines.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,16 @@
+import type { BlockContext } from "./block-context.js";
+export interface BlockDisclosure {
+    readonly lineIndex: number;
+    readonly column: number;
+    readonly width: number;
+    readonly action?: "output";
+}
+export declare function outputToggleLabel(expanded: boolean): string;
+export declare function appendDisclosure(ctx: BlockContext, lines: string[], expanded: boolean, options?: {
+    hidden?: number;
+    chord?: string;
+    indent?: number;
+    label?: string;
+    action?: "output";
+    inline?: boolean;
+}): void;

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

@@ -0,0 +1,20 @@
+import { clipToWidth } from "../render/ansi-text.js";
+import { layoutWidth } from "../render/measure.js";
+export function outputToggleLabel(expanded) {
+    return expanded ? "- click to collapse" : "+ click to expand";
+}
+export function appendDisclosure(ctx, lines, expanded, options = {}) {
+    const text = options.label ?? outputToggleLabel(expanded);
+    const hidden = !expanded && options.hidden ? ` (${options.hidden} lines)` : "";
+    const hint = `${hidden} ${ctx.glyphs.separator} ${options.chord ?? "Ctrl+O"}`;
+    const head = options.inline ? lines.pop() ?? "" : "";
+    const headBudget = Math.max(1, ctx.width - layoutWidth(text + hint) - 3);
+    const prefix = options.inline ? `${clipToWidth(head, headBudget, ctx.glyphs.ellipsis)} ${ctx.glyphs.separator} ` : "";
+    const column = options.inline ? layoutWidth(prefix) : Math.min(options.indent ?? 4, Math.max(0, ctx.width - 11));
+    const label = clipToWidth(text, Math.max(0, ctx.width - column), ctx.glyphs.ellipsis);
+    const suffix = clipToWidth(hint, Math.max(0, ctx.width - column - layoutWidth(label)), "");
+    const lineIndex = (ctx.lineOffset ?? 0) + lines.length;
+    lines.push(`${prefix || " ".repeat(column)}${ctx.ink.fg("hint", label)}${ctx.ink.fg("hint", suffix)}`.trimEnd());
+    ctx.disclosures?.push({ lineIndex, column, width: layoutWidth(label), ...(options.action ? { action: options.action } : {}) });
+}
+//# sourceMappingURL=disclosure-lines.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"disclosure-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/disclosure-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAUnD,MAAM,UAAU,iBAAiB,CAAC,QAAiB;IACjD,OAAO,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,mBAAmB,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAAiB,EACjB,KAAe,EACf,QAAiB,EACjB,UAAqH,EAAE;IAEvH,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,MAAM,IAAI,GAAG,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,OAAO,CAAC,KAAK,IAAI,QAAQ,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtH,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC;IACjH,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3F,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IACvD,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACjH,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACjI,CAAC"}

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

@@ -1,4 +1,5 @@
 import { renderIntroHeaderLines } from "../../ui-core/rendering/intro-header.js";
+import { CARD_BORDER_HEX } from "../../ui-core/rendering/card-style.js";
 import { clipToWidth } from "../render/ansi-text.js";
 import { stripAnsi } from "../render/measure.js";
 export function buildIntroLines(ctx, input) {
@@ -11,6 +12,7 @@ export function buildIntroLines(ctx, input) {
         permissions: input.permissions,
         workdir: input.workdir,
         variant: input.variant,
+        paintBorder: (text) => ctx.ink.hex(CARD_BORDER_HEX, text),
     });
     const plain = ctx.ink.colorMode === "none";
     return rendered.map((line) => clipToWidth(plain ? stripAnsi(line) : line, ctx.width, ""));

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

@@ -1 +1 @@
-{"version":3,"file":"intro-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/intro-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAajD,MAAM,UAAU,eAAe,CAAC,GAAiB,EAAE,KAAsB;IACvE,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC;IAC3C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"intro-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/intro-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAajD,MAAM,UAAU,eAAe,CAAC,GAAiB,EAAE,KAAsB;IACvE,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC;KAC1D,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC;IAC3C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;AACJ,CAAC"}

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

@@ -1,22 +1,10 @@
 import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
 import { wrapWithPrefixes } from "../render/wrap.js";
 import { clipRow } from "./block-context.js";
-const PLATE_LABEL = {
-    warn: " WARN ",
-    error: " ERR  ",
-    info: " INFO ",
-};
-const PLATE_TOKEN = {
-    warn: "activityBg",
-    error: "failedBg",
-    info: "chip",
-};
-const BODY_COLUMN = 7;
 export function buildNoticeLines(ctx, item) {
-    const plate = ctx.ink.plate(PLATE_TOKEN[item.level], PLATE_LABEL[item.level]);
-    const text = sanitizeDisplayText(item.text);
-    const rows = wrapWithPrefixes(text, { width: Math.max(1, ctx.width - BODY_COLUMN) });
-    const indent = " ".repeat(BODY_COLUMN);
-    return rows.map((row, index) => clipRow(ctx, index === 0 ? `${plate} ${row}` : `${indent}${row}`));
+    const token = item.level === "error" ? "diffDel" : item.level === "warn" ? "activity" : "muted";
+    const mark = item.level === "warn" ? ctx.glyphs.warning : ctx.ink.unicode ? "•" : "*";
+    return wrapWithPrefixes(sanitizeDisplayText(item.text), { width: ctx.width, firstPrefix: `${mark} `, nextPrefix: "  " })
+        .map((row) => clipRow(ctx, ctx.ink.fg(token, row)));
 }
 //# sourceMappingURL=notice-lines.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"notice-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/notice-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAGlF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAqB,MAAM,oBAAoB,CAAC;AAEhE,MAAM,WAAW,GAAgC;IAC/C,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,QAAQ;IACf,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,MAAM,WAAW,GAAoC;IACnD,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB,MAAM,UAAU,gBAAgB,CAAC,GAAiB,EAAE,IAAgB;IAClE,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACvC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAC7B,OAAO,CAAC,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC,CAClE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"notice-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/notice-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAqB,MAAM,oBAAoB,CAAC;AAEhE,MAAM,UAAU,gBAAgB,CAAC,GAAiB,EAAE,IAAgB;IAClE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC;IAChG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACtF,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;SACrH,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC"}

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

@@ -0,0 +1,10 @@
+import type { ThemeToken } from "../render/ink-theme.js";
+import type { BlockContext } from "./block-context.js";
+export declare const OUTPUT_PREVIEW_LINES = 3;
+export declare const PREVIEW_LINE_CHARS: number;
+export declare function logicalOutputLines(raw: string, name?: string): string[];
+export declare function outputBodyRows(ctx: BlockContext, source: readonly string[], expanded: boolean, options?: {
+    token?: ThemeToken;
+    maxLines?: number;
+    branch?: boolean;
+}): string[];

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

@@ -0,0 +1,35 @@
+import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
+import { terminalOutputLines } from "../../ui-core/rendering/terminal-output.js";
+import { clipToWidth, expandTabs, trimTrailingSpaces } from "../render/ansi-text.js";
+import { layoutWidth } from "../render/measure.js";
+import { wrapAnsiLine } from "../render/wrap.js";
+export const OUTPUT_PREVIEW_LINES = 3;
+export const PREVIEW_LINE_CHARS = 16 * 1024;
+export function logicalOutputLines(raw, name = "") {
+    const terminal = terminalOutputLines(raw, name);
+    const safe = terminal ? [...terminal] : sanitizeDisplayText(raw).replace(/\^\[\[[0-9;?]*[ -/]*[@-~]/g, "").split("\n");
+    while (safe.length > 0 && safe.at(-1) === "")
+        safe.pop();
+    return safe;
+}
+export function outputBodyRows(ctx, source, expanded, options = {}) {
+    const token = options.token ?? "toolOutput";
+    const shown = expanded ? source : source.slice(0, options.maxLines ?? OUTPUT_PREVIEW_LINES);
+    const budget = Math.max(1, ctx.width - 4);
+    const rows = [];
+    for (const [index, raw] of shown.entries()) {
+        const bounded = expanded ? raw : raw.slice(0, PREVIEW_LINE_CHARS);
+        const text = expandTabs(bounded);
+        const chunks = expanded ? wrapAnsiLine(text, budget) : [clipToWidth(text, budget, ctx.glyphs.ellipsis)];
+        if (!expanded && raw.length > bounded.length && layoutWidth(chunks[0]) < budget) {
+            chunks[0] = clipToWidth(`${chunks[0]}${ctx.glyphs.ellipsis}`, budget, ctx.glyphs.ellipsis);
+        }
+        for (const [row, chunk] of chunks.entries()) {
+            const first = options.branch !== false && index === 0 && row === 0;
+            const prefix = first ? ctx.ink.fg(token, `  ${ctx.glyphs.bodyBranch} `) : "    ";
+            rows.push(trimTrailingSpaces(`${prefix}${ctx.ink.fg(token, chunk)}`));
+        }
+    }
+    return rows;
+}
+//# sourceMappingURL=output-lines.js.map

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

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

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

@@ -1,4 +1,3 @@
 import { type ThinkingItem } from "../../ui-core/state/transcript-types.js";
 import { type BlockContext } from "./block-context.js";
-export declare function thinkingTokenEstimate(content: string): number;
 export declare function buildThinkingLines(ctx: BlockContext, item: ThinkingItem): string[];

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

@@ -1,42 +1,25 @@
 import { sanitizeDisplayText } from "../../ui-core/rendering/sanitize-display.js";
 import { thinkingElapsedLabel } from "../../ui-core/rendering/duration.js";
-import { liveThinkingDisplay } from "../../ui-core/rendering/thinking-tail.js";
 import { isItemExpanded } from "../../ui-core/state/transcript-types.js";
-import { wrapWithPrefixes } from "../render/wrap.js";
 import { clipRow, joinMeta } from "./block-context.js";
-export function thinkingTokenEstimate(content) {
-    return Math.max(1, Math.round(content.trim().length / 4));
-}
+import { appendDisclosure } from "./disclosure-lines.js";
+import { logicalOutputLines, outputBodyRows } from "./output-lines.js";
 export function buildThinkingLines(ctx, item) {
-    const gutter = ctx.ink.style(`${ctx.glyphs.thinkingGutter} `, {
-        fg: "thinking",
-    });
-    const expanded = isItemExpanded(ctx.state, item);
     const content = sanitizeDisplayText(item.content);
+    if (!content.trim() && !item.streaming)
+        return [];
+    const expanded = isItemExpanded(ctx.state, item);
     const elapsed = thinkingElapsedLabel(item, ctx.now);
-    const header = () => wrapWithPrefixes(joinMeta(ctx, [
-        "thinking",
-        elapsed,
-        `${thinkingTokenEstimate(content).toLocaleString()} tokens`,
-        item.streaming
-            ? expanded
-                ? "live · Ctrl+T to collapse when done"
-                : "live · Ctrl+T to keep open"
-            : expanded
-                ? "Ctrl+T to hide"
-                : "Ctrl+T to expand",
-    ]), { width: Math.max(1, ctx.width - 2) }).map((row) => clipRow(ctx, `${gutter}${ctx.ink.style(row, { fg: "thinking" })}`));
-    const bodyRows = (text) => wrapWithPrefixes(text, { width: ctx.width - 2 }).map((row) => clipRow(ctx, `${gutter}${ctx.ink.style(row, { fg: "thinking", italic: true })}`));
-    if (item.streaming) {
-        const tail = liveThinkingDisplay(content);
-        if (!tail.trim())
-            return header();
-        return [...header(), ...bodyRows(tail)];
+    const mark = ctx.ink.unicode ? "•" : "*";
+    const title = ctx.ink.style(`${mark} ${item.streaming ? "Thinking" : "Reasoning"}`, { fg: "thinking", bold: true });
+    const head = joinMeta(ctx, [title, elapsed ? ctx.ink.fg("userBorder", elapsed) : undefined]);
+    const lines = [clipRow(ctx, head)];
+    if (!item.streaming)
+        appendDisclosure(ctx, lines, expanded, { chord: "Ctrl+T", inline: true });
+    if (expanded || item.streaming) {
+        const body = outputBodyRows(ctx, logicalOutputLines(content), true, { token: "thinking", branch: false });
+        lines.push(...body);
     }
-    if (!content.trim())
-        return [];
-    if (!expanded)
-        return header();
-    return [...header(), ...bodyRows(content)];
+    return lines;
 }
 //# sourceMappingURL=thinking-lines.js.map