@pentoshi/clai 4.11.28 → 4.12.0

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

@@ -1,13 +1,16 @@
-import { collapsedFileChangeLabel, presentFileChangePreview, syntaxColor, } from "../../ui-core/rendering/file-diff-view.js";
+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, padStartToWidth, padToWidth, sealStyle, trimTrailingSpaces } from "../render/ansi-text.js";
-import { clipRow, joinMeta, SUFFIX_MIN_COLUMNS } from "./block-context.js";
-import { outputToggleLabel, toolGlyph } from "./tool-lines.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;
-const GUTTER_WIDTH = 4;
-export const DIFF_CODE_COLUMN = GUTTER_WIDTH + 4;
+export const WRITE_MANY_LISTED_FILES = 12;
+export const DIFF_INDENT = 2;
+export const DIFF_TAB_WIDTH = 4;
+const GUTTER_RULE_WIDTH = 3;
+const CLICK_HINT = " · click for full";
 const STATUS_TOKEN = {
     queued: "muted",
     running: "activity",
@@ -15,35 +18,88 @@ const STATUS_TOKEN = {
     failed: "diffDel",
     blocked: "activity",
 };
-function washOk(ctx) {
-    return ctx.ink.colorMode === "truecolor" || ctx.ink.colorMode === "256";
+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 rowStyle(ctx, tone) {
+function washToken(tone) {
     if (tone === "add")
-        return { fg: "diffAdd", bg: washOk(ctx) ? "diffAddBg" : undefined };
+        return "diffAddBg";
     if (tone === "del")
-        return { fg: "diffDel", bg: washOk(ctx) ? "diffDelBg" : undefined };
-    if (tone === "gap")
-        return { fg: "muted" };
-    if (tone === "header")
-        return { fg: "muted", bold: true };
-    return {};
-}
-function codeText(ctx, row, budget) {
-    const wash = washOk(ctx) && (row.tone === "add" || row.tone === "del");
-    const body = wash ? padToWidth(row.displayText, budget) : row.displayText;
-    if (row.tone !== "context")
-        return ctx.ink.style(body, rowStyle(ctx, row.tone));
+        return "diffDelBg";
+    return undefined;
+}
+function syntaxCode(ctx, row) {
     if (ctx.ink.colorMode === "none")
-        return body;
+        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);
+}
 export function diffStatsSuffix(ctx, change) {
     const minus = ctx.ink.unicode ? "−" : "-";
-    return `${ctx.ink.fg("diffAdd", `+${change.stats.added}`)} ${ctx.ink.fg("diffDel", `${minus}${change.stats.removed}`)}`;
+    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}`;
+}
+function totalStats(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;
+    }
+    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);
@@ -57,56 +113,59 @@ export function diffStatsRow(ctx, change) {
         return undefined;
     return clipRow(ctx, `  ${diffStatsSuffix(ctx, change)}`);
 }
-function diffRowLine(ctx, row) {
-    const marker = row.prefix === "−" && !ctx.ink.unicode ? "-" : row.prefix;
-    const gutter = ctx.ink.fg("diffGutter", padStartToWidth(row.gutter, GUTTER_WIDTH));
-    const budget = Math.max(1, ctx.width - DIFF_CODE_COLUMN);
-    const head = `${gutter} ${ctx.ink.style(marker, rowStyle(ctx, row.tone))}  `;
-    return trimTrailingSpaces(sealStyle(`${head}${codeText(ctx, row, budget)}`));
+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"}`)}`);
 }
 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 lines = [diffTitleLine(ctx, item, primary)];
-    if (primary) {
-        const statsRow = diffStatsRow(ctx, primary);
+    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) {
-            lines.push(clipRow(ctx, `  ${ctx.ink.fg("muted", collapsedFileChangeLabel(primary))}`));
+        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));
         }
-        lines.push(clipRow(ctx, `  ${ctx.ink.fg("muted", outputToggleLabel(outputExpanded))}`));
+        lines.push(...hintRows(ctx, "  ", outputToggleLabel(outputExpanded)));
         return lines;
     }
-    const maxRows = changes.length > 1 ? WRITE_MANY_PREVIEW_ROWS : SINGLE_FILE_PREVIEW_ROWS;
-    const maxLineChars = Math.max(16, ctx.width - DIFF_CODE_COLUMN);
-    let emitted = 0;
-    for (const change of changes) {
-        if (emitted >= maxRows)
-            break;
-        if (changes.length > 1) {
-            lines.push(clipRow(ctx, `  ${ctx.ink.fg("cyan", change.path)} ${diffStatsSuffix(ctx, change)}`));
-        }
-        for (const row of presentFileChangePreview(change, { maxLineChars, maxRows })) {
-            if (emitted >= maxRows)
-                break;
+    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));
-            emitted += 1;
-        }
     }
-    const total = changes.reduce((sum, c) => sum + c.stats.added + c.stats.removed, 0);
-    const hidden = Math.max(0, total - emitted);
-    const body = joinMeta(ctx, [
-        outputToggleLabel(outputExpanded),
-        hidden > 0
-            ? `${ctx.glyphs.ellipsis} +${hidden} line${hidden === 1 ? "" : "s"}`
-            : undefined,
-    ]);
-    lines.push(clipRow(ctx, `  ${ctx.ink.fg("muted", body)}`));
+    if (hiddenFiles > 0)
+        lines.push(moreFilesRow(ctx, hiddenFiles));
+    lines.push(...hintRows(ctx, "  ", outputToggleLabel(outputExpanded)));
     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":"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"}
+{"version":3,"file":"diff-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/diff-lines.ts"],"names":[],"mappings":"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"}

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

@@ -14,7 +14,7 @@ export function buildThinkingLines(ctx, item) {
     const expanded = isItemExpanded(ctx.state, item);
     const content = sanitizeDisplayText(item.content);
     const elapsed = thinkingElapsedLabel(item, ctx.now);
-    const header = () => clipRow(ctx, `${gutter}${ctx.ink.style(joinMeta(ctx, [
+    const header = () => wrapWithPrefixes(joinMeta(ctx, [
         "thinking",
         elapsed,
         `${thinkingTokenEstimate(content).toLocaleString()} tokens`,
@@ -25,18 +25,18 @@ export function buildThinkingLines(ctx, item) {
             : expanded
                 ? "Ctrl+T to hide"
                 : "Ctrl+T to expand",
-    ]), { fg: "thinking" })}`);
+    ]), { 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)];
+            return header();
+        return [...header(), ...bodyRows(tail)];
     }
     if (!content.trim())
         return [];
     if (!expanded)
-        return [header()];
-    return [header(), ...bodyRows(content)];
+        return header();
+    return [...header(), ...bodyRows(content)];
 }
 //# sourceMappingURL=thinking-lines.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"thinking-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/thinking-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAqB,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAqB,MAAM,oBAAoB,CAAC;AAE1E,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAiB,EAAE,IAAkB;IACtE,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,GAAG,EAAE;QAC5D,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,GAAW,EAAE,CAC1B,OAAO,CACL,GAAG,EACH,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CACvB,QAAQ,CAAC,GAAG,EAAE;QACZ,UAAU;QACV,OAAO;QACP,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,SAAS;QAC3D,IAAI,CAAC,SAAS;YACZ,CAAC,CAAC,QAAQ;gBACR,CAAC,CAAC,qCAAqC;gBACvC,CAAC,CAAC,4BAA4B;YAChC,CAAC,CAAC,QAAQ;gBACR,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,kBAAkB;KACzB,CAAC,EACF,EAAE,EAAE,EAAE,UAAU,EAAE,CACnB,EAAE,CACJ,CAAC;IAEJ,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAY,EAAE,CAC1C,gBAAgB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC3D,OAAO,CACL,GAAG,EACH,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CACnE,CACF,CAAC;IAEJ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACpC,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAC/B,IAAI,CAAC,QAAQ;QAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"thinking-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/thinking-lines.ts"],"names":[],"mappings":"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"}

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

@@ -6,6 +6,7 @@ export declare const TOOL_LIVE_BODY_ROWS = 8;
 export declare function toolGlyph(ctx: BlockContext, status: ToolStatus): string;
 export declare function toolElapsed(ctx: BlockContext, item: ToolItem): string | undefined;
 export declare function toolSuffix(ctx: BlockContext, item: ToolItem, statusLabel: string): string;
+export declare function hintRows(ctx: BlockContext, indent: string, text: string): string[];
 export declare function toolHeaderLines(ctx: BlockContext, item: ToolItem): string[];
 export interface ToolBodyOptions {
     readonly maxRows?: number | undefined;

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

@@ -1,15 +1,19 @@
 import { isItemExpanded, } from "../../ui-core/state/transcript-types.js";
 import { presentFsReadArgs, presentOutput, presentTool, TOOL_PREVIEW_HEAD_LINES, TOOL_PREVIEW_TAIL_LINES, } from "../../ui-core/rendering/tool-presenter.js";
+import { fsSearchHitsLabel, presentFsSearchOutput } from "../../ui-core/rendering/fs-search-summary.js";
 import { shouldShowToolElapsed } from "../../ui-core/rendering/duration.js";
+import { relativeDisplayPath } from "../../ui-core/rendering/file-diff-view.js";
 import { clipToWidth, trimTrailingSpaces } from "../render/ansi-text.js";
 import { adaptPresenterGlyphs } from "../render/glyphs.js";
 import { wrapAnsiLine } from "../render/wrap.js";
 import { layoutWidth } from "../render/measure.js";
-import { clipRow, formatElapsed, joinMeta, SUFFIX_MIN_COLUMNS, } from "./block-context.js";
+import { clipRow, COLLAPSED_LINE_ROWS, EXPANDED_LINE_ROWS, FIELD_LINE_ROWS, formatElapsed, joinMeta, separator, wrapBoundedRows, } from "./block-context.js";
 export const TOOL_COLLAPSED_BODY_ROWS = TOOL_PREVIEW_HEAD_LINES + TOOL_PREVIEW_TAIL_LINES + 1;
 export const TOOL_EXPANDED_BODY_ROWS = 40;
 export const TOOL_LIVE_BODY_ROWS = 8;
 const BODY_INDENT = 4;
+const FIELD_INDENT = "  ";
+const SUMMARY_TOOLS = new Set(["fs.read", "fs.search"]);
 const STATUS_TOKEN = {
     queued: "muted",
     running: "activity",
@@ -17,6 +21,13 @@ const STATUS_TOKEN = {
     failed: "diffDel",
     blocked: "activity",
 };
+const META_TOKEN = {
+    queued: "muted",
+    running: "activity",
+    ok: "hint",
+    failed: "diffDel",
+    blocked: "activity",
+};
 export function toolGlyph(ctx, status) {
     const glyphs = ctx.glyphs;
     switch (status) {
@@ -42,100 +53,150 @@ export function toolElapsed(ctx, item) {
     return label === "" ? undefined : label;
 }
 export function toolSuffix(ctx, item, statusLabel) {
-    if (ctx.width + 2 < SUFFIX_MIN_COLUMNS)
-        return "";
-    const body = joinMeta(ctx, [statusLabel, toolElapsed(ctx, item)]);
-    return body === "" ? "" : ctx.ink.fg(STATUS_TOKEN[item.status], body);
+    const label = item.status === "ok" ? undefined : statusLabel;
+    const body = joinMeta(ctx, [label, toolElapsed(ctx, item)]);
+    return body === "" ? "" : ctx.ink.fg(META_TOKEN[item.status], body);
+}
+export function hintRows(ctx, indent, text) {
+    const budget = Math.max(1, ctx.width - layoutWidth(indent));
+    return wrapAnsiLine(text, budget).map((row) => clipRow(ctx, `${indent}${ctx.ink.fg("hint", row)}`));
 }
-function toolHeadline(ctx, item, presented) {
+function argLines(presented) {
+    return (presented.argsDisplay ?? "")
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+}
+function toolTitle(ctx, item, presented) {
     const glyph = ctx.ink.fg(STATUS_TOKEN[item.status], toolGlyph(ctx, item.status));
-    const name = ctx.ink.style(presented.name, { fg: "cyan", bold: true });
-    const head = `${glyph} ${name}`;
+    return `${glyph} ${ctx.ink.style(presented.name, { fg: "cyan", bold: true })}`;
+}
+function metaSuffix(ctx, item, presented) {
     const suffix = toolSuffix(ctx, item, presented.statusLabel);
-    if (!suffix)
-        return clipToWidth(head, ctx.width, ctx.glyphs.ellipsis);
-    const budget = Math.max(8, ctx.width - layoutWidth(suffix) - 3);
-    const clipped = clipToWidth(head, budget, ctx.glyphs.ellipsis);
-    const line = `${clipped}  ${suffix}`;
-    return layoutWidth(line) > ctx.width ? clipToWidth(line, ctx.width, ctx.glyphs.ellipsis) : line;
-}
-function fsReadFieldLines(ctx, label, value, token) {
-    const prefix = `  ${ctx.ink.fg("muted", `${label}: `)}`;
+    return suffix === "" ? "" : `${ctx.ink.fg("hint", separator(ctx))}${suffix}`;
+}
+function headline(ctx, item, presented, inline) {
+    const title = toolTitle(ctx, item, presented);
+    const args = inline === undefined ? "" : ` ${ctx.ink.fg("muted", `(${inline})`)}`;
+    const meta = metaSuffix(ctx, item, presented);
+    const line = `${title}${args}${meta}`;
+    if (layoutWidth(line) <= ctx.width)
+        return [line];
+    const head = clipToWidth(`${title}${args}`, ctx.width, ctx.glyphs.ellipsis);
+    const suffix = toolSuffix(ctx, item, presented.statusLabel);
+    if (suffix === "")
+        return [head];
+    const budget = Math.max(1, ctx.width - FIELD_INDENT.length);
+    return [head, ...wrapAnsiLine(suffix, budget).map((row) => clipRow(ctx, `${FIELD_INDENT}${row}`))];
+}
+function inlineFits(ctx, item, presented, args) {
+    const used = layoutWidth(toolTitle(ctx, item, presented)) + layoutWidth(args) + 3;
+    return used + layoutWidth(metaSuffix(ctx, item, presented)) <= ctx.width;
+}
+function fieldLines(ctx, label, value, token) {
+    const prefix = `${FIELD_INDENT}${ctx.ink.fg("muted", `${label}: `)}`;
     const budget = Math.max(8, ctx.width - layoutWidth(prefix));
-    return wrapAnsiLine(ctx.ink.fg(token, value), budget).map((row, index) => clipRow(ctx, index === 0 ? `${prefix}${row}` : `  ${row}`));
+    return wrapBoundedRows(ctx, ctx.ink.fg(token, value), budget, FIELD_LINE_ROWS).map((row, index) => clipRow(ctx, index === 0 ? `${prefix}${row}` : `${" ".repeat(layoutWidth(prefix))}${row}`));
 }
 function fsReadHeaderLines(ctx, item, presented) {
     const args = presentFsReadArgs(presented.argsDisplay);
-    const lines = [toolHeadline(ctx, item, presented)];
+    const lines = headline(ctx, item, presented, undefined);
     if (args.options)
-        lines.push(...fsReadFieldLines(ctx, "options", args.options, "inputBorder"));
+        lines.push(...fieldLines(ctx, "options", args.options, "inputBorder"));
     if (args.path)
-        lines.push(...fsReadFieldLines(ctx, "file", args.path, "inputBorder"));
+        lines.push(...fieldLines(ctx, "file", args.path, "inputBorder"));
+    return lines;
+}
+function fsSearchHeaderLines(ctx, item, presented) {
+    const summary = presentFsSearchOutput(ctx.spool.tail(item.toolCallId), presented.argsDisplay);
+    const lines = headline(ctx, item, presented, undefined);
+    if (summary.pattern)
+        lines.push(...fieldLines(ctx, "pattern", summary.pattern, "inputBorder"));
+    if (summary.path)
+        lines.push(...fieldLines(ctx, "path", summary.path, "inputBorder"));
+    if (item.status === "ok") {
+        lines.push(...fieldLines(ctx, "hits", fsSearchHitsLabel(summary), summary.hits > 0 ? "success" : "muted"));
+    }
+    for (const note of summary.notes)
+        lines.push(...fieldLines(ctx, "note", note, "activity"));
     return lines;
 }
 export function toolHeaderLines(ctx, item) {
     const presented = presentTool(item);
     if (item.name === "fs.read")
         return fsReadHeaderLines(ctx, item, presented);
-    const head = toolHeadline(ctx, item, presented);
-    const suffix = toolSuffix(ctx, item, presented.statusLabel);
-    if (!suffix) {
-        const argsLines = (presented.argsDisplay ?? "").split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
-        if (argsLines.length === 0)
-            return [head];
-        const budget = Math.max(8, ctx.width - 2);
-        const rows = argsLines.flatMap((l) => wrapAnsiLine(ctx.ink.fg("muted", `(${l})`), budget));
-        return [head, ...rows.map((r) => trimTrailingSpaces(`  ${r}`))];
+    if (item.name === "fs.search")
+        return fsSearchHeaderLines(ctx, item, presented);
+    const args = argLines(presented);
+    if (args.length === 1 && inlineFits(ctx, item, presented, args[0])) {
+        return headline(ctx, item, presented, args[0]);
     }
-    const argsLines = (presented.argsDisplay ?? "").split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
-    if (argsLines.length === 0)
-        return [head];
-    const argsBudget = Math.max(8, ctx.width - 2);
-    const argRows = argsLines.flatMap((l) => wrapAnsiLine(ctx.ink.fg("muted", `(${l})`), argsBudget));
-    return [head, ...argRows.map((r) => trimTrailingSpaces(`  ${r}`))];
+    const head = headline(ctx, item, presented, undefined);
+    if (args.length === 0)
+        return head;
+    const budget = Math.max(8, ctx.width - FIELD_INDENT.length);
+    const rows = args.flatMap((line) => wrapBoundedRows(ctx, ctx.ink.fg("muted", `(${line})`), budget, FIELD_LINE_ROWS));
+    return [...head, ...rows.map((row) => trimTrailingSpaces(`${FIELD_INDENT}${row}`))];
 }
 export function outputToggleLabel(expanded) {
     return expanded ? "Ctrl+O to minimize" : "Ctrl+O to expand";
 }
-export function buildToolBodyLines(ctx, item, options = {}) {
-    const expanded = isItemExpanded(ctx.state, item);
-    if (item.name === "fs.read" && !expanded) {
-        return [clipRow(ctx, `  ${ctx.ink.fg("muted", outputToggleLabel(false))}`)];
-    }
+function bodySource(ctx, item) {
     const tail = ctx.spool.tail(item.toolCallId);
+    if (item.name === "fs.search" && tail.trim().length > 0) {
+        return presentFsSearchOutput(tail).body.join("\n");
+    }
     const detail = item.status === "blocked" ? item.reason : item.summary;
-    const source = tail.trim().length > 0 ? tail : (detail ?? "");
+    return tail.trim().length > 0 ? tail : (detail ?? "");
+}
+const SEARCH_HIT = /^(.+?)([:-])(\d+)\2(.*)$/;
+function paintBodyLine(ctx, item, raw) {
+    const text = adaptPresenterGlyphs(raw, ctx.ink.unicode);
+    const hit = item.name === "fs.search" ? SEARCH_HIT.exec(text) : null;
+    if (!hit)
+        return ctx.ink.fg("toolText", text);
+    const [, path, mark, line, rest] = hit;
+    const location = `${ctx.ink.fg("inputBorder", relativeDisplayPath(path))}${ctx.ink.fg("hint", `${mark}${line}${mark}`)}`;
+    return `${location}${ctx.ink.fg(mark === ":" ? "toolText" : "muted", rest)}`;
+}
+export function buildToolBodyLines(ctx, item, options = {}) {
+    const expanded = isItemExpanded(ctx.state, item);
     const indent = " ".repeat(BODY_INDENT);
+    const failed = item.status === "failed" || item.status === "blocked";
+    if (SUMMARY_TOOLS.has(item.name) && !expanded && !failed) {
+        return hintRows(ctx, FIELD_INDENT, outputToggleLabel(false));
+    }
+    const source = bodySource(ctx, item);
     if (source.trim().length === 0) {
-        return [clipRow(ctx, `${indent}${ctx.ink.fg("muted", outputToggleLabel(expanded))}`)];
+        return hintRows(ctx, indent, outputToggleLabel(expanded));
     }
     const presented = presentOutput(source, ctx.spool.state(item.toolCallId), expanded, item.name);
     const cap = options.maxRows ??
         (expanded ? TOOL_EXPANDED_BODY_ROWS : TOOL_COLLAPSED_BODY_ROWS);
     const kept = presented.lines.slice(0, Math.max(0, cap));
     const hidden = presented.lines.length - kept.length + presented.hiddenAboveCount;
-    const branch = ctx.ink.fg("muted", `  ${ctx.glyphs.bodyBranch} `);
+    const branch = ctx.ink.fg("hint", `  ${ctx.glyphs.bodyBranch} `);
     const budget = Math.max(1, ctx.width - BODY_INDENT);
+    const lineRows = expanded ? EXPANDED_LINE_ROWS : COLLAPSED_LINE_ROWS;
     const lines = [];
     for (const [index, raw] of kept.entries()) {
-        const text = adaptPresenterGlyphs(raw, ctx.ink.unicode);
-        for (const [row, chunk] of wrapAnsiLine(text, budget).entries()) {
+        const painted = paintBodyLine(ctx, item, raw);
+        for (const [row, chunk] of wrapBoundedRows(ctx, painted, budget, lineRows).entries()) {
             const prefix = index === 0 && row === 0 ? branch : indent;
-            lines.push(trimTrailingSpaces(`${prefix}${ctx.ink.fg("foreground", chunk)}`));
+            lines.push(trimTrailingSpaces(`${prefix}${chunk}`));
         }
     }
-    const artifact = item.artifactPath ? "saved" : undefined;
     if (presented.truncatedNotice) {
-        lines.push(clipRow(ctx, `${indent}${ctx.ink.fg("muted", presented.truncatedNotice)}`));
+        lines.push(...hintRows(ctx, indent, presented.truncatedNotice));
     }
     const body = joinMeta(ctx, [
-        outputToggleLabel(expanded),
         hidden > 0
             ? `${ctx.glyphs.ellipsis} +${hidden} line${hidden === 1 ? "" : "s"}`
             : undefined,
-        artifact,
+        outputToggleLabel(expanded),
+        item.artifactPath ? "saved" : undefined,
     ]);
-    lines.push(clipRow(ctx, `${indent}${ctx.ink.fg("muted", body)}`));
+    lines.push(...hintRows(ctx, indent, body));
     return lines;
 }
 export function buildToolLines(ctx, item, options = {}) {

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

@@ -1 +1 @@
-{"version":3,"file":"tool-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/tool-lines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EACL,OAAO,EACP,aAAa,EACb,QAAQ,EACR,kBAAkB,GAEnB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,MAAM,wBAAwB,GACnC,uBAAuB,GAAG,uBAAuB,GAAG,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AACrC,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB,MAAM,YAAY,GAAmC;IACnD,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,UAAU;IACnB,EAAE,EAAE,SAAS;IACb,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,UAAU;CACpB,CAAC;AAEF,MAAM,UAAU,SAAS,CAAC,GAAiB,EAAE,MAAkB;IAC7D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC,WAAW,CAAC;QAC5B,KAAK,IAAI;YACP,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B;YACE,OAAO,MAAM,CAAC,WAAW,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAiB,EAAE,IAAc;IAC3D,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;IACnE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;IAC7F,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,GAAiB,EACjB,IAAc,EACd,WAAmB;IAEnB,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,kBAAkB;QAAE,OAAO,EAAE,CAAC;IAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,YAAY,CACnB,GAAiB,EACjB,IAAc,EACd,SAAyC;IAEzC,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,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM;QAAE,OAAO,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC;IACrC,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClG,CAAC;AAED,SAAS,gBAAgB,CACvB,GAAiB,EACjB,KAAa,EACb,KAAa,EACb,KAAiB;IAEjB,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,OAAO,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CACvE,OAAO,CAAC,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAC3D,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,GAAiB,EACjB,IAAc,EACd,SAAyC;IAEzC,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,OAAO;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/F,IAAI,IAAI,CAAC,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;IACtF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAiB,EAAE,IAAc;IAC/D,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7G,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3F,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7G,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IAClG,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAMD,MAAM,UAAU,iBAAiB,CAAC,QAAiB;IACjD,OAAO,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,GAAiB,EACjB,IAAc,EACd,UAA2B,EAAE;IAE7B,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,SAAS,GAAG,aAAa,CAC7B,MAAM,EACN,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAChC,QAAQ,EACR,IAAI,CAAC,IAAI,CACV,CAAC;IACF,MAAM,GAAG,GACP,OAAO,CAAC,OAAO;QACf,CAAC,QAAQ,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAClE,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAEjF,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,KAAK,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1D,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACzD,IAAI,SAAS,CAAC,eAAe,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CACR,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAC3E,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE;QACzB,iBAAiB,CAAC,QAAQ,CAAC;QAC3B,MAAM,GAAG,CAAC;YACR,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,QAAQ,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE;YACpE,CAAC,CAAC,SAAS;QACb,QAAQ;KACT,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAClE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,GAAiB,EACjB,IAAc,EACd,UAA2B,EAAE;IAE7B,OAAO;QACL,GAAG,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC;QAC7B,GAAG,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC;KAC1C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tool-lines.js","sourceRoot":"","sources":["../../../src/classic/blocks/tool-lines.ts"],"names":[],"mappings":"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"}