@vincemakes/kiso-tui 0.1.35 → 0.1.37

package/dist/components.d.ts

@@ -15,7 +15,7 @@
  * (untouched); render.ts supplies the original text (palette, escape,
  * tint, fold wording).
  */
-import { foldThinking, foldResult, renderToolSummary } from "./render.js";
+import { foldThinking, foldResult, renderToolSummary, type ResumeMeta } from "./render.js";
 /** The spinner glyphs, cycled by the compositor's on-demand tick. */
 export declare const SPINNER: string[];
 /** The frame context the compositor passes down — the pieces of time
@@ -24,6 +24,10 @@ export declare const SPINNER: string[];
 export interface FrameCtx {
     readonly spinnerI: number;
     readonly now: number;
+    /** The terminal height (rows) — the banner cell's tier input (W1:
+     *  the tier table reads H, so a resize RE-TIERS instead of
+     *  re-folding frozen rows). */
+    readonly height: number;
 }
 /** ONE screen line a component emits (raw, SGR included). */
 export type RenderLine = string;
@@ -43,7 +47,19 @@ export declare function visibleWidth(line: string): number;
 export interface Component {
     render(width: number, ctx: FrameCtx): string[];
 }
-/** The container — vertical concatenation of its children. */
+/** The W11 spacing formula — "a row gets one blank line above it when
+ *  the row is itself a block, or when the previous sibling was taller
+ *  than one row". One-row siblings pack tight; anything multi-row
+ *  breathes on both sides. The FIRST cell never gets the blank (it sits
+ *  at the body's top — the banner would otherwise start one row down).
+ *  `prev` is the previous sibling's OWN rows (raw — a cell's own blank
+ *  must never count toward its height). The blank is a JOIN artifact:
+ *  the cell's own render stays blank-free, so per-cell accounting
+ *  (heights, the fold cache) never sees a fake row. */
+export declare function bodySpacing(prev: readonly string[] | null, rows: readonly string[]): string[];
+/** The container — vertical concatenation with the W11 formula. No
+ *  component decides its own spacing: every blank in the body is the
+ *  container's. */
 export declare class Container implements Component {
     private readonly children;
     constructor(children: Component[]);
@@ -61,6 +77,7 @@ export type BodyCell = {
     kind: "tool";
     name: string;
     input: string;
+    childRoles: string[];
     state: "pending" | "approval" | "running" | "done";
     isError: boolean;
     resultText: string;
@@ -78,6 +95,12 @@ export type BodyCell = {
     kind: "notice";
     text: string;
     done: true;
+} | {
+    kind: "banner";
+    version: string;
+    extensionsText: string;
+    resume: ResumeMeta[];
+    done: true;
 } | {
     kind: "raw";
     lines: string[];
@@ -105,7 +128,7 @@ export declare function cellComponent(cell: BodyCell): Component;
  *  the hint CUT FIRST when the width is short (the #16g rule); when
  *  the STATUS ITSELF cannot fit, it cuts with a "…" — the last resort,
  *  enforced by invariant ① (the old code let the status soft-wrap). */
-export declare function statusLine(status: string, tail: string, question: boolean, W: number): string;
+export declare function statusLine(status: string, tail: string, question: boolean, W: number, hint?: string): string;
 /** The footer — the ONE dotted row (the old two-row chrome is gone;
  *  the wall cannot return by construction). */
 export declare function footerLine(W: number): string;

package/dist/components.js

@@ -16,7 +16,7 @@
  * tint, fold wording).
  */
 import { displayWidth } from "./editor.js";
-import { escapeTerminal, foldThinking, foldResult, colorInlineCode, renderTerminalGap, renderToolSummary, palette, } from "./render.js";
+import { bannerLines, escapeTerminal, foldThinking, foldResult, colorInlineCode, renderTerminalGap, renderToolSummary, palette, } from "./render.js";
 /** The spinner glyphs, cycled by the compositor's on-demand tick. */
 export const SPINNER = ["▖", "▘", "▝", "▗"];
 /**
@@ -106,14 +106,39 @@ export function visibleWidth(line) {
     }
     return w;
 }
-/** The container — vertical concatenation of its children. */
+/** The W11 spacing formula — "a row gets one blank line above it when
+ *  the row is itself a block, or when the previous sibling was taller
+ *  than one row". One-row siblings pack tight; anything multi-row
+ *  breathes on both sides. The FIRST cell never gets the blank (it sits
+ *  at the body's top — the banner would otherwise start one row down).
+ *  `prev` is the previous sibling's OWN rows (raw — a cell's own blank
+ *  must never count toward its height). The blank is a JOIN artifact:
+ *  the cell's own render stays blank-free, so per-cell accounting
+ *  (heights, the fold cache) never sees a fake row. */
+export function bodySpacing(prev, rows) {
+    if (rows.length === 0 || prev === null || prev.length === 0)
+        return rows;
+    if (rows.length > 1 || prev.length > 1)
+        return ["", ...rows];
+    return rows;
+}
+/** The container — vertical concatenation with the W11 formula. No
+ *  component decides its own spacing: every blank in the body is the
+ *  container's. */
 export class Container {
     children;
     constructor(children) {
         this.children = children;
     }
     render(width, ctx) {
-        return this.children.flatMap((c) => c.render(width, ctx));
+        const out = [];
+        let prev = null;
+        for (const c of this.children) {
+            const rows = c.render(width, ctx);
+            out.push(...bodySpacing(prev, rows));
+            prev = rows;
+        }
+        return out;
     }
 }
 const TOOL_SUMMARY_MAX = 60; // the tool line's parameter summary, chars
@@ -131,6 +156,8 @@ export function cellComponent(cell) {
             return new AssistantMessage(cell);
         case "notice":
             return new ErrorLine(cell);
+        case "banner":
+            return new Banner(cell);
         case "raw":
             return new RawBlock(cell);
         case "terminal":
@@ -141,10 +168,18 @@ export function cellComponent(cell) {
 }
 /**
  * The user message — the left rail (bright-white BOLD ▍ per row, the
- * v4.1 design). The text folds at W−2 (the rail + space) so every row
- * carries the rail and NO row exceeds the width (the v5 code split on
- * "\n" only — a long line soft-wrapped and its continuation row had no
- * rail).
+ * v4.1 design) + the W16 inset chip. The chip folds the text at W−6
+ * (the rail + the indent + the side pads), then pads EVERY row to the
+ * longest row's DISPLAY width + one space each side, indented two: the
+ * block is only as wide as what was said (never the full-width band —
+ * a short message like /think would paint a bar across the terminal).
+ * The padding is by cells (charWidth is the width authority), so a CJK
+ * row pads by width, never by chars, and the chip never overruns its
+ * fold. SGR 7 closed with SGR 27 — never SGR 0, the chip composes
+ * with a surrounding span — and NEVER dim: reverse video inverts the
+ * CURRENT colours, so dimmed text would invert into a dimmed block
+ * with no contrast. The ▍ rail stays: SGR is an emphasis on top, the
+ * rail is the structural fallback that survives a pipe.
  */
 class UserMessage {
     cell;
@@ -154,12 +189,15 @@ class UserMessage {
     render(W, _ctx) {
         const p = palette();
         const rail = `${p.bold}▍${p.reset} `;
-        const textW = Math.max(1, W - 2);
+        const chipW = Math.max(1, W - 6);
         const rows = [];
         for (const para of this.cell.text.split("\n")) {
-            const folded = foldLine(escapeTerminal(para), textW);
-            for (const row of folded)
-                rows.push(`${rail}${row}`);
+            const folded = foldLine(escapeTerminal(para), chipW);
+            const inner = Math.max(...folded.map((r) => displayWidth(r)));
+            for (const row of folded) {
+                const pad = inner - displayWidth(row);
+                rows.push(`${rail}  ${p.rv} ${row}${" ".repeat(pad)} ${p.rvEnd}`);
+            }
         }
         return rows.length > 0 ? rows : [rail.trimEnd()];
     }
@@ -168,7 +206,8 @@ class UserMessage {
  *  rides the fold's own row (the #17 fix's slice, componentized). The
  *  slice is DISPLAY-WIDTH-based (the char-based slice overflowed with
  *  CJK — 2 cells per char — and tripped invariant ① on a real
- *  Chinese session). */
+ *  Chinese session). W2: the leading ⋯ is the thinking gutter — the
+ *  midline mark (the state), never the text ellipsis (the truncation). */
 class ThinkingFold {
     cell;
     constructor(cell) {
@@ -182,14 +221,102 @@ class ThinkingFold {
         // UNFOLDED and tripped invariant ① (the crash class still live on
         // npm for short /think blocks after a resize).
         if (trimmed.length <= 100)
-            return [`${palette().dim}…${widthCut(trimmed, Math.max(1, W - 1))}${palette().reset}`];
+            return [`${palette().dim}⋯${widthCut(trimmed, Math.max(1, W - 1))}${palette().reset}`];
         const suffix = ` (${block.length} chars · /think)`;
         const slice = Math.max(1, W - 1 - suffix.length);
-        return [`${palette().dim}…${widthCut(trimmed, slice)}${suffix}${palette().reset}`];
+        return [`${palette().dim}⋯${widthCut(trimmed, slice)}${suffix}${palette().reset}`];
     }
 }
-/** The tool execution line + the approval mini-diff — every state is
- *  its own render; the lines fold (the summary gives way first). */
+/** Fold a line's CONTENT at W−2 and prefix EVERY row with the gutter
+ *  (W2: a wrapped tool row keeps its state mark — the left edge alone
+ *  distinguishes the states at --plain; the UserMessage rail precedent,
+ *  v5 #16f). The gutter carries its own SGR (e.g. the bold ✓). */
+function gutterFold(gutter, line, W) {
+    const textW = Math.max(1, W - 2);
+    return foldLine(line, textW).map((r) => `${gutter}${r}`);
+}
+/** Lines without the phantom empty line after a trailing newline. */
+function countLines(text) {
+    if (text === "")
+        return 0;
+    const parts = text.split("\n");
+    return parts[parts.length - 1] === "" ? parts.length - 1 : parts.length;
+}
+/** W4: the settled-row metadata — the human summary in parentheses. The
+ *  separation NEVER relies on dim: a pipe drops the SGR, and the shapes
+ *  below read at full strength with the palette off. read → the line
+ *  count ("912 lines"; "200 of 3412 lines" when the tool cut it — the
+ *  note names the remainder; ≥1000 k-formats, "2.4k lines"); write/edit
+ *  → the ± diff stats (the approval diff's counts — an auto-allowed
+ *  write never computed one, so the input's own counts fall back, then
+ *  the result's line count); shell → the exit code (parsed from the
+ *  failure text — the tool names it — 0 on success); a non-shell error
+ *  → the error text's first line; anything else → the result's line
+ *  count. */
+function settledMeta(c) {
+    if (c.isError) {
+        // a shell EXECUTION failure names its code first ("exit 1: …") —
+        // that IS the metadata, and the body shows the full text. A
+        // shell without the code (a denial, a precondition) is not an
+        // exit failure: the first line stays the metadata, exactly like
+        // any other error.
+        if (c.name === "shell" && /^exit \d+/.test(c.resultText))
+            return `exit ${/^exit (\d+)/.exec(c.resultText)[1]}`;
+        return c.resultText.split("\n")[0].slice(0, 60);
+    }
+    if (c.name === "read_file") {
+        const noteAt = c.resultText.lastIndexOf("\n… ");
+        const shown = countLines(noteAt >= 0 ? c.resultText.slice(0, noteAt) : c.resultText);
+        const more = noteAt >= 0 ? /(\d+) more lines?/.exec(c.resultText.slice(noteAt)) : null;
+        const k = (n) => (n >= 1000 ? `${(n / 1000).toFixed(1).replace(/\.0$/, "")}k` : String(n));
+        if (more !== null) {
+            const total = shown + Number(more[1]);
+            return `${shown} of ${total} line${total === 1 ? "" : "s"}`;
+        }
+        return `${k(shown)} line${shown === 1 ? "" : "s"}`;
+    }
+    if (c.name === "write_file" || c.name === "edit_file") {
+        if (c.added + c.removed > 0)
+            return `+${c.added} -${c.removed}`;
+        // no approval diff (an auto-allowed write): the input summary may
+        // be sliced at TOOL_SUMMARY_MAX — best-effort, then the last resort
+        let parsed = null;
+        try {
+            parsed = JSON.parse(c.input);
+        }
+        catch {
+            parsed = null;
+        }
+        if (c.name === "write_file" && parsed !== null && typeof parsed.content === "string") {
+            return `+${countLines(parsed.content)}`;
+        }
+        if (c.name === "edit_file" && parsed !== null && typeof parsed.search === "string" && typeof parsed.replace === "string") {
+            const added = countLines(parsed.replace);
+            const removed = countLines(parsed.search);
+            if (added + removed > 0)
+                return `+${added} -${removed}`;
+        }
+    }
+    if (c.name === "shell")
+        return "exit 0";
+    const n = countLines(c.resultText);
+    return `${n} line${n === 1 ? "" : "s"}`;
+}
+/** The tool execution line + the bounded block — every state is its
+ *  own render; the lines fold (the summary gives way first). W7 (the
+ *  flow contract): the block's BODY (the rows below the header) is
+ *  capped in SCREEN rows AFTER the fold, at the current width — the
+ *  renderer-cut row (`└ +N … · ctrl+r`) sits INSIDE the cap (a
+ *  truncated block is cap−1 output rows + the cut row); the TOOL-cut
+ *  row (`└ capped by …` — the tool's OWN truncation note, W10) is a
+ *  DIFFERENT fact, never counted in the output cap. W3: the verb is
+ *  stripped of its "_file" suffix and padded to 5 columns — the target
+ *  paths line up (the pipe path strips the same suffix, render.ts —
+ *  both paths print the same verb; a verb ≥ 5 columns is not padded).
+ *  The block's cut note keeps the RAW name (it names the tool the
+ *  model should call again). W4: the settled row's parentheses hold
+ *  the human metadata (settledMeta) — the input summary lived in the
+ *  running row; the OUTCOME is what the settled row says. */
 class ToolExecution {
     cell;
     constructor(cell) {
@@ -198,35 +325,241 @@ class ToolExecution {
     render(W, ctx) {
         const p = palette();
         const c = this.cell;
-        const name = escapeTerminal(c.name);
+        const verb = escapeTerminal(c.name.replace("_file", ""));
+        const verbCol = verb.length < 5 ? `${verb}${" ".repeat(5 - verb.length)}` : verb;
         const summary = escapeTerminal(c.input);
         if (c.state === "done") {
             const elapsed = c.startedAt !== null && c.doneAt !== null ? ((c.doneAt - c.startedAt) / 1000).toFixed(1) : "?";
-            const line = c.isError
-                ? `${p.red}✗ ${name} (${escapeTerminal(c.resultText.split("\n")[0].slice(0, 60))}, ${elapsed}s)${p.reset}`
-                : `${p.bold}✓ ${name}${p.reset} (${summary}${c.added + c.removed > 0 ? `, +${c.added} -${c.removed}` : ""}, ${elapsed}s)`;
-            return foldLine(line, W);
+            const meta = escapeTerminal(settledMeta(c));
+            const out = c.isError
+                ? gutterFold(`${p.red}✗${p.reset} `, `${p.red}${verbCol} (${meta}, ${elapsed}s)${p.reset}`, W)
+                : gutterFold(`${p.bold}✓${p.reset} `, `${verbCol} (${meta}, ${elapsed}s)`, W);
+            out.push(...toolBlockBody(c, W));
+            return out;
         }
         if (c.state === "approval") {
-            const lines = foldLine(`→ ${name} ${summary} ${p.bold}⏸${p.reset}`, W);
-            if (c.diff !== null) {
-                for (const d of c.diff) {
-                    const body = d.kind === "-"
-                        ? `${p.red}- ${escapeTerminal(d.text)}${p.reset}`
-                        : d.kind === "+"
-                            ? `${p.green}+ ${escapeTerminal(d.text)}${p.reset}`
-                            : `${p.dim}  ${escapeTerminal(d.text)}${p.reset}`;
-                    lines.push(...foldLine(`${p.bold}▎${p.reset}${body}`, W));
-                }
-            }
-            return lines;
+            // W2: the ⏸ is the GUTTER (the left edge), never the line's tail
+            const out = gutterFold(`${p.bold}⏸${p.reset} `, `${verbCol} ${summary}`, W);
+            out.push(...toolBlockBody(c, W));
+            return out;
         }
         if (c.state === "running") {
+            // W2: the spinner IS the gutter (the left edge); the elapsed
+            // rides the summary's tail
             const elapsed = c.startedAt !== null ? Math.max(1, Math.round((ctx.now - c.startedAt) / 1000)) : 1;
-            return foldLine(`→ ${name} ${summary} ${p.bold}${SPINNER[ctx.spinnerI % SPINNER.length]}${p.reset} ${elapsed}s`, W);
+            const out = gutterFold(`${p.bold}${SPINNER[ctx.spinnerI % SPINNER.length]}${p.reset} `, `${verbCol} ${summary} ${elapsed}s`, W);
+            out.push(...toolBlockBody(c, W));
+            return out;
         }
-        return foldLine(`→ ${name} ${summary}`, W);
+        // W2: ◦ replaces → for QUEUED — · is the separator inside every
+        // metadata group; a queued marker that is also the separator
+        // glyph reads as noise
+        return gutterFold(`${p.dim}◦${p.reset} `, `${verbCol} ${summary}`, W);
+    }
+}
+// ---- the bounded-block flow contract (W7, W8, W10) ----
+/** The caps — screen rows counted AFTER the fold, at the current width
+ *  (the W7 table). The renderer-cut row is inside the cap. */
+const CAP_SHELL_SETTLED = 5; // the shell output tail, settled
+const CAP_LIVE_WINDOW = 3; // the running tool's FIXED window (W8)
+const CAP_DIFF = 12; // the approval diff: head + the named middle + tail
+const CAP_ERROR = 3; // the error text head
+/** The block body rows' prefixes (W2's gutter table): │ a bounded
+ *  block's body, └ the block's last row — what was cut, where the rest
+ *  is — at the LEFT EDGE (the gutter column: the left edge alone
+ *  distinguishes the states at --plain). Structural (constraint 1). */
+const BODY_ROW = "│ ";
+const CUT_ROW = "└ ";
+const blockMemo = new WeakMap();
+/** The block's body rows below the header (memoized, W9). */
+function toolBlockBody(c, W) {
+    const memo = blockMemo.get(c);
+    const state = `${c.state}:${c.isError}:${c.name}`;
+    const content = c.state === "approval" ? (c.diff ?? null) : c.resultText;
+    if (memo !== undefined && memo.width === W && memo.state === state && memo.content === content)
+        return memo.rows;
+    const p = palette();
+    const rows = c.state === "done"
+        ? c.isError
+            ? errorBody(c, W)
+            : c.name === "delegate"
+                ? delegateSettled(c, W)
+                : c.name.startsWith("shell")
+                    ? shellTail(c.resultText, W)
+                    : []
+        : c.state === "running"
+            ? c.name === "delegate"
+                ? delegateRunning(c, W)
+                : liveWindow(c.resultText, W)
+            : c.state === "approval"
+                ? diffBody(c.diff, W)
+                : [];
+    const note = toolCutNote(c.name, c.resultText);
+    if (note !== null)
+        rows.push(...foldLine(`${p.dim}${CUT_ROW}${note}${p.reset}`, W));
+    blockMemo.set(c, { width: W, state, content, rows });
+    return rows;
+}
+/** Fold result text into dim body rows (the BODY_ROW prefix): escape,
+ *  split, fold each line at W−prefix; trailing empty rows (the result's
+ *  final newline) drop. */
+function blockRows(text, W) {
+    const p = palette();
+    const textW = Math.max(1, W - visibleWidth(BODY_ROW));
+    const rows = [];
+    for (const raw of escapeTerminal(text).split("\n")) {
+        for (const row of foldLine(raw, textW))
+            rows.push(`${p.dim}${BODY_ROW}${row}${p.reset}`);
+    }
+    while (rows.length > 0 && visibleWidth(rows[rows.length - 1]) === visibleWidth(BODY_ROW))
+        rows.pop();
+    return rows;
+}
+/** The shell output tail, settled: the LAST rows, capped at 5 — the
+ *  renderer cut at the block's bottom ("earlier rows" — the conclusion
+ *  is at the end, pi's truncateToVisualLines direction). */
+function shellTail(text, W) {
+    const p = palette();
+    const rows = blockRows(text, W);
+    if (rows.length <= CAP_SHELL_SETTLED)
+        return rows;
+    const kept = CAP_SHELL_SETTLED - 1;
+    const cut = foldLine(`${p.dim}${CUT_ROW}+${rows.length - kept} earlier rows · ctrl+r${p.reset}`, W);
+    return [...rows.slice(rows.length - kept), ...cut];
+}
+/** The error text head: the FIRST rows, capped at 3 — the answer is at
+ *  the start (opencode's collapseToolOutput direction). The header row
+ *  already summarizes the first line, so the body starts at line 2. */
+function errorBody(c, W) {
+    const p = palette();
+    // W4: a shell EXECUTION failure's line 0 ("exit 1: …") no longer
+    // rides the header — the parsed code does — so the body keeps the
+    // FULL text. Any other error keeps the pre-W4 split: line 0 is the
+    // header's metadata, the body shows the rest.
+    const skipFirst = c.name === "shell" && /^exit \d+/.test(c.resultText) ? 0 : 1;
+    const rows = blockRows(c.resultText.split("\n").slice(skipFirst).join("\n"), W);
+    if (rows.length <= CAP_ERROR)
+        return rows;
+    const cut = foldLine(`${p.dim}${CUT_ROW}+${rows.length - (CAP_ERROR - 1)} more · ctrl+r${p.reset}`, W);
+    return [...rows.slice(0, CAP_ERROR - 1), ...cut];
+}
+/** The running tool's FIXED-height window (W8): exactly 3 rows from
+ *  the FIRST frame — blank-padded before output arrives, the renderer
+ *  cut inside the window. The height changes exactly once, at settle —
+ *  a cell that grows mid-list would shift every row after it on every
+ *  delta (the parallel-tools jitter). */
+function liveWindow(text, W) {
+    const p = palette();
+    if (text === "") {
+        return [`${p.dim}${BODY_ROW}${p.reset}`, `${p.dim}${BODY_ROW}${p.reset}`, `${p.dim}${CUT_ROW}waiting for output${p.reset}`];
+    }
+    const rows = blockRows(text, W);
+    if (rows.length <= CAP_LIVE_WINDOW) {
+        while (rows.length < CAP_LIVE_WINDOW)
+            rows.push(`${p.dim}${BODY_ROW}${p.reset}`);
+        return rows;
     }
+    const cut = foldLine(`${p.dim}${CUT_ROW}+${rows.length - (CAP_LIVE_WINDOW - 1)} earlier rows · ctrl+r${p.reset}`, W);
+    return [...rows.slice(rows.length - (CAP_LIVE_WINDOW - 1)), ...cut];
+}
+/** W12: the delegate's child sessions collapse to the tool row plus ONE
+ *  line — the height NEVER changes (running → settled replaces the row
+ *  in place). The running row derives from the INPUT: the parent has no
+ *  live channel to a running child (ToolContext carries only
+ *  signal/sessionId; execute returns ONE result), so the roles are the
+ *  honest current data — the spec's "<child's current tool>" has no
+ *  event source. The settled row parses the extension's summary marker
+ *  (the blob's first line) — its absence falls back to no body (an old
+ *  extension's output still renders). The one-line shape is shared with
+ *  W18's status row (the work order: "implement them with one helper"). */
+function delegateRunning(c, W) {
+    const p = palette();
+    const n = c.childRoles.length;
+    const text = n === 0 ? "children running…" : `${n === 1 ? "1 child" : `${n} children`} · ${c.childRoles.join(" · ")}`;
+    return [oneLineRow(p, text, W)];
+}
+function delegateSettled(c, W) {
+    const p = palette();
+    const m = /^summary: (.+)$/m.exec(c.resultText);
+    if (m === null)
+        return [];
+    return [oneLineRow(p, `${m[1]} · /last for the report`, W)];
+}
+/** ONE row at the left gutter, truncated to fit the width — never a
+ *  fold (a fold would wrap into TWO rows and break the one-line height
+ *  contract). */
+function oneLineRow(p, text, W) {
+    const esc = escapeTerminal(text);
+    if (visibleWidth(`${p.dim}${CUT_ROW}${esc}${p.reset}`) <= W)
+        return `${p.dim}${CUT_ROW}${esc}${p.reset}`;
+    const w = Math.max(1, W - visibleWidth(`${p.dim}${CUT_ROW}${p.reset}`));
+    return `${p.dim}${CUT_ROW}${esc.slice(0, w - 1)}…${p.reset}`;
+}
+/** The approval mini-diff (W7): capped at 12 folded rows — the head +
+ *  the named middle (the renderer cut — what was cut, how to expand) +
+ *  the tail. The rows are folded at the current width BEFORE the cap —
+ *  the R1 measured bug: truncateDiff capped at 40 ENTRIES while the
+ *  fold turned them into 73 SCREEN rows at W≤80 (a 44-row terminal's
+ *  content cap is H−4 = 40 — the approval force-committed a third of
+ *  the screen into scrollback inside one frame).
+ *  W17: the cap is a ROW budget at every width — the └ cut is ONE line
+ *  (a folded cut pushed the total past 12 at narrow widths), and below
+ *  a floor of 3 SOURCE lines visible the head/tail pair is noise (each
+ *  fragment a sliver of a long line): drop to the head only — the head
+ *  takes the whole budget — and the └ row carries the rest. */
+function diffBody(diff, W) {
+    const p = palette();
+    if (diff === null)
+        return [];
+    const rows = [];
+    // W17: each line's fold START row (the running total) — the pair
+    // floor reads it for the head/tail SOURCE-line counts below.
+    const starts = [0];
+    for (const d of diff) {
+        const body = d.kind === "-"
+            ? `${p.red}- ${escapeTerminal(d.text)}${p.reset}`
+            : d.kind === "+"
+                ? `${p.green}+ ${escapeTerminal(d.text)}${p.reset}`
+                : `${p.dim}  ${escapeTerminal(d.text)}${p.reset}`;
+        // W2: the diff body is a bounded block's body — the │ gutter
+        // (dim), never the old bold ▎ rail (the table lists no ▎); the
+        // +/- marks and their colors ride the content
+        rows.push(...gutterFold(`${p.dim}│${p.reset} `, body, W));
+        starts.push(rows.length);
+    }
+    if (rows.length <= CAP_DIFF)
+        return rows;
+    const head = Math.floor((CAP_DIFF - 1) / 2);
+    const tail = CAP_DIFF - 1 - head;
+    // W17: the └ cut is ONE row at every width — the count leads, the
+    // expand affordances are cuttable (the same one-line shape as W12's
+    // delegate row and W18's status row).
+    const cut = (n) => oneLineRow(p, `+${n} rows · ctrl+r to expand · /last for the full diff`, W);
+    // W17: the floor — the head window shows the lines whose fold starts
+    // before `head` rows; the tail window the lines whose fold ENDS after
+    // `rows.length - tail` (starts[i+1] is line i's end). When the pair
+    // shows fewer than 3 SOURCE lines together, it is noise at this width
+    // (each fragment a sliver of a long line): drop to the head only —
+    // the head takes the whole budget, the └ row carries the rest.
+    if (starts.filter((s) => s < head).length + starts.slice(1).filter((s) => s > rows.length - tail).length < 3)
+        return [...rows.slice(0, CAP_DIFF - 1), cut(rows.length - (CAP_DIFF - 1))];
+    return [...rows.slice(0, head), cut(rows.length - head - tail), ...rows.slice(rows.length - tail)];
+}
+/** The TOOL's OWN truncation note (W10) — a different fact from the
+ *  renderer's cut: the tools truncate and append a continuation note
+ *  (packages/tools-node/src/index.ts — read_file's "call again with
+ *  offset=N", the output cap, list_dir's entry cap). The note reaches
+ *  the MODEL and never the human — this row surfaces it. Detected in
+ *  the result's TAIL (the note is appended at the end); returns null
+ *  when the tool did not truncate. */
+function toolCutNote(name, resultText) {
+    const tail = resultText.slice(-300);
+    const m = /offset=(\d+)/.exec(tail);
+    if (m !== null)
+        return `capped by ${escapeTerminal(name)} · offset=${m[1]} for the rest`;
+    if (/…\[truncated\]/.test(tail) || /… \+?\d+ more (?:lines|entries)/.test(tail))
+        return `capped by ${escapeTerminal(name)} · /last for the rest`;
+    return null;
 }
 /** The assistant body text — wrapped at W, the inline-code tint per
  *  row (the #16e rule: a span never matches across rows). */
@@ -264,17 +597,32 @@ class RawBlock {
         return this.cell.lines.flatMap((l) => foldLine(l, W));
     }
 }
-/** The terminal label + the status line + the rhythm gap blank. */
+/** The terminal label + the status line. W11: the rhythm gap blank is
+ *  gone — the container's formula breathes below a multi-row cell (the
+ *  terminal is always multi-row when labelled), never the component. */
 class TerminalBlock {
     cell;
     constructor(cell) {
         this.cell = cell;
     }
     render(W, _ctx) {
-        const lines = [...foldLine(this.cell.label, W), ...foldLine(this.cell.line, W)];
-        if (this.cell.label !== "")
-            lines.push("");
-        return lines;
+        return [...foldLine(this.cell.label, W), ...foldLine(this.cell.line, W)];
+    }
+}
+/** The startup banner — a LIVE cell: every render re-derives the tier
+ *  from the CURRENT width AND height (bannerLines), so a resize re-tiers
+ *  the art instead of re-folding frozen rows (the W1 tier table: below
+ *  40 cols the logo never paints). W11: no trailing blank — the
+ *  container's formula breathes below the (always multi-row) banner. */
+class Banner {
+    cell;
+    constructor(cell) {
+        this.cell = cell;
+    }
+    render(W, ctx) {
+        const p = palette();
+        const rows = bannerLines(W, ctx.height, this.cell.version, this.cell.extensionsText, this.cell.resume, ctx.now);
+        return rows.map((r) => `${p.dim}${r}${p.reset}`);
     }
 }
 /** The durable checklist — the ▞ header + one brick-glyph row per item. */
@@ -299,20 +647,24 @@ class Checklist {
  *  the hint CUT FIRST when the width is short (the #16g rule); when
  *  the STATUS ITSELF cannot fit, it cuts with a "…" — the last resort,
  *  enforced by invariant ① (the old code let the status soft-wrap). */
-export function statusLine(status, tail, question, W) {
+export function statusLine(status, tail, question, W, hint) {
     const p = palette();
     const text = `${status}${tail === "" ? "" : ` · ${tail}`}`;
     if (question)
         return `${p.dim}${widthCut(text, W)}${p.reset}`;
-    const hint = " / commands · ↑ history";
+    // W18: the hint is a parameter — the compacting row right-aligns its
+    // "esc to cancel" (the same one-line-bounded shape as W12's delegate
+    // row; the #16g rule still cuts the HINT first, then the status with
+    // a "…" — never a fold).
+    const hintText = hint ?? " / commands · ↑ history";
     const statusW = visibleWidth(text);
     if (statusW > W) {
         return `${p.dim}${widthCut(text, W - 1)}…${p.reset}`;
     }
-    const hintW = visibleWidth(hint);
+    const hintW = visibleWidth(hintText);
     if (statusW + hintW > W)
         return `${p.dim}${text}${p.reset}`;
-    return `${p.dim}${text}${" ".repeat(Math.max(0, W - statusW - hintW))}${hint}${p.reset}`;
+    return `${p.dim}${text}${" ".repeat(Math.max(0, W - statusW - hintW))}${hintText}${p.reset}`;
 }
 /** The display-width prefix of a plain (SGR-free) text. */
 function widthCut(text, max) {