@vincemakes/kiso-tui 0.1.32 → 0.1.34

package/dist/components.js

@@ -165,7 +165,10 @@ class UserMessage {
     }
 }
 /** The thinking fold — one dim line, width-capped so the /think suffix
- *  rides the fold's own row (the #17 fix's slice, componentized). */
+ *  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). */
 class ThinkingFold {
     cell;
     constructor(cell) {
@@ -178,7 +181,7 @@ class ThinkingFold {
             return [`${palette().dim}…${trimmed}${palette().reset}`];
         const suffix = ` (${block.length} chars · /think)`;
         const slice = Math.max(1, W - 1 - suffix.length);
-        return [`${palette().dim}…${trimmed.slice(0, slice)}${suffix}${palette().reset}`];
+        return [`${palette().dim}…${widthCut(trimmed, slice)}${suffix}${palette().reset}`];
     }
 }
 /** The tool execution line + the approval mini-diff — every state is

package/dist/compositor.d.ts

@@ -14,10 +14,10 @@
  *    re-emitted — the native scrollback gets them, reflow-safe, and
  *    the user's shell history is never touched (zero \x1b[3J, zero
  *    replay);
- *  - the live region (content + status + editor + footer + menu) is
- *    hard-capped at H−1 lines; overflow FORCE-commits the oldest live
- *    line regardless of done-ness — the one sharp edge this round
- *    introduces (asserted by the VT-emulator gate);
+ *  - the live region (content + chrome + menu) is hard-capped: the
+ *    content at H−4 (V6-3 — the four-row chrome); overflow FORCE-
+ *    commits the oldest live line regardless of done-ness — the one
+ *    sharp edge (asserted by the VT-emulator gate);
  *  - two crash invariants: ① every emitted line's visible width ≤ W
  *    (components fold; a violation THROWS with diagnostics — pi
  *    tui-main-screen.ts:447-473, no silent truncate); ② within the
@@ -32,9 +32,10 @@
  *    scheduler — a one-shot setTimeout re-armed only while a running
  *    tool exists (the #14/#15 zero-output contract is structural).
  *
- * Layout at H rows: content rows 1..H−3, status H−2, editor (the slot)
- * H−1, footer ╌ at H. Pipes / NO_COLOR: the passthrough branches below
- * keep the v2a/v2b line-mode bytes byte-for-byte (the e2e guards them).
+ * Layout at H rows (V6-3 — the design §03 chrome): content rows
+ * 1..H−4, upper ╌ H−3, editor (the slot) H−2, lower ╌ H−1, status H.
+ * Pipes / NO_COLOR: the passthrough branches below keep the v2a/v2b
+ * line-mode bytes byte-for-byte (the e2e guards them).
  */
 import { type MenuItem } from "./editor.js";
 /** The cursor marker — an APC private sequence the focus component

package/dist/compositor.js

@@ -14,10 +14,10 @@
  *    re-emitted — the native scrollback gets them, reflow-safe, and
  *    the user's shell history is never touched (zero \x1b[3J, zero
  *    replay);
- *  - the live region (content + status + editor + footer + menu) is
- *    hard-capped at H−1 lines; overflow FORCE-commits the oldest live
- *    line regardless of done-ness — the one sharp edge this round
- *    introduces (asserted by the VT-emulator gate);
+ *  - the live region (content + chrome + menu) is hard-capped: the
+ *    content at H−4 (V6-3 — the four-row chrome); overflow FORCE-
+ *    commits the oldest live line regardless of done-ness — the one
+ *    sharp edge (asserted by the VT-emulator gate);
  *  - two crash invariants: ① every emitted line's visible width ≤ W
  *    (components fold; a violation THROWS with diagnostics — pi
  *    tui-main-screen.ts:447-473, no silent truncate); ② within the
@@ -32,9 +32,10 @@
  *    scheduler — a one-shot setTimeout re-armed only while a running
  *    tool exists (the #14/#15 zero-output contract is structural).
  *
- * Layout at H rows: content rows 1..H−3, status H−2, editor (the slot)
- * H−1, footer ╌ at H. Pipes / NO_COLOR: the passthrough branches below
- * keep the v2a/v2b line-mode bytes byte-for-byte (the e2e guards them).
+ * Layout at H rows (V6-3 — the design §03 chrome): content rows
+ * 1..H−4, upper ╌ H−3, editor (the slot) H−2, lower ╌ H−1, status H.
+ * Pipes / NO_COLOR: the passthrough branches below keep the v2a/v2b
+ * line-mode bytes byte-for-byte (the e2e guards them).
  */
 import { truncateDiff } from "./diff.js";
 import { displayWidth } from "./editor.js";
@@ -46,7 +47,7 @@ import { escapeTerminal, foldResult, foldThinking, palette, renderTerminalGap, r
 export const CURSOR_MARKER = "\x1b_[kiso-cur]\x1b\\";
 const FRAME_MS = 16; // state changes coalesce to ≥16ms frames
 const SPINNER_MS = 200; // the spinner cadence — a ONE-SHOT re-armed on demand
-const CHROME_ROWS = 3; // status + editor + footer — the cap's constant part
+const CHROME_ROWS = 4; // upper ╌ + input + lower ╌ + status — the design §03 chrome (V6-3)
 /** The one compositor — implements the Body façade AND the Dock chrome
  *  API (see the class comments on each method group). */
 export class Body {
@@ -332,7 +333,7 @@ export class Body {
         const H = this.#lastH > 0 ? this.#lastH : process.stdout.rows ?? 24;
         const out = [];
         out.push("\x1b[r");
-        for (let row = H - 2; row <= H; row += 1) {
+        for (let row = H - 3; row <= H; row += 1) { // V6-3: the four chrome rows
             out.push(`\x1b[${row};1H\x1b[0K`); // clear the three chrome rows
         }
         out.push(`\x1b[${Math.max(1, H - 1)};1H`);
@@ -470,6 +471,21 @@ export class Body {
             return;
         this.#lastH = H;
         const ctx = { spinnerI: this.#spinnerI, now: Date.now() };
+        // V6-1 (the screen-state == frame-state rule): the resize's first
+        // frame — the terminal's reflow re-wrapped the committed content at
+        // the NEW width, so the cached folds are stale. Re-fold the
+        // committed cells so the every-row draw below re-paints them at the
+        // current geometry — the frame's model and the screen agree.
+        if (this.#fullRedraw) {
+            this.#lineCache = this.#lineCache.map(() => null);
+            this.#committedLines = 0;
+            for (let i = 0; i < this.#committed; i += 1) {
+                const cell = this.#cells[i];
+                const lines = cellComponent(cell).render(W, ctx);
+                this.#lineCache[i] = lines;
+                this.#committedLines += lines.length;
+            }
+        }
         // 1. the natural commits — the leading DONE cells freeze: their
         //    lines leave the live region, the scrolls + the committed
         //    writes below place them (the #17 "freeze as a real line",
@@ -490,7 +506,7 @@ export class Body {
         // 3. the FORCE commits — the live region's hard cap H−1: overflow
         //    commits the oldest live cell UNCONDITIONALLY (the one sharp
         //    edge — the cap scalar is asserted by the gates).
-        while (liveLines.length + chromeRows > H - 1 && this.#committed < this.#cells.length) {
+        while (liveLines.length > H - 4 && this.#committed < this.#cells.length) { // V6-3: the content cap H−4
             this.#commitCell(this.#committed, W, ctx);
             liveLines = [];
             for (const cell of this.#cells.slice(this.#committed)) {
@@ -601,28 +617,53 @@ export class Body {
     }
     /** The full-redraw path (the first frame, the resize repaint) — CUP
      *  allowed here; zero LF; zero \x1b[3J; zero replay. The committed
-     *  lines (this frame's) write at [liveTop−N .. liveTop−1]. */
+     *  lines (this frame's) write at [liveTop−N .. liveTop−1].
+     *
+     *  V6-1 (the screen-state == frame-state rule): every row 1..H is
+     *  covered — the committed/live/chrome writes AND the EL-only rows
+     *  (above the committed section, the gap). The terminal's reflow
+     *  re-wraps the old content at the new size — its shifted copies
+     *  survive anywhere the draw does not touch; a draw that covers
+     *  EVERY row is idempotent: N consecutive resizes end with the same
+     *  screen as a single jump to the same size. */
     #drawFull(out, W, H, liveTop, liveLines, menuRows, ctx) {
         const committed = this.#committedLinesThisFrame;
-        let r = Math.max(1, liveTop - committed.length);
+        // 0. the FROZEN rows — the re-folded committed content (re-flowed
+        //    at the new width by the terminal): re-painted at [1..frozen],
+        //    so the reflow's shifted copies can never ghost.
+        const frozen = this.#lineCache.slice(0, this.#committed - committed.length).flat().filter((l) => l !== null);
+        let r = 1;
+        for (const line of frozen) {
+            out.push(`\x1b[${r};1H\x1b[0K${this.#checked(line, W)}`);
+            r += 1;
+        }
+        // 1. the committed lines (this frame's).
         for (const line of committed) {
             out.push(`\x1b[${r};1H\x1b[0K${this.#checked(line, W)}`);
             r += 1;
         }
+        // 2. the live lines.
         for (const line of liveLines) {
             out.push(`\x1b[${r};1H\x1b[0K${this.#checked(line, W)}`);
             r += 1;
         }
-        const menuTop = H - 2 - menuRows.length;
+        // 3. the GAP rows (between the live content and the chrome) — EL.
+        for (let rr = r; rr <= H - 4; rr += 1) {
+            out.push(`\x1b[${rr};1H\x1b[0K`);
+        }
+        const menuTop = H - 3 - menuRows.length;
         for (let i = 0; i < menuRows.length; i += 1) {
             out.push(`\x1b[${menuTop + i};1H\x1b[0K${this.#checked(menuRows[i], W)}`);
         }
-        out.push(`\x1b[${H - 2};1H\x1b[0K${this.#checked(statusLine(this.#status, this.#tail, this.#question !== null, W), W)}`);
+        // V6-3: the design §03 chrome — upper ╌ (H−3), input (H−2),
+        // lower ╌ (H−1), status (H).
+        out.push(`\x1b[${H - 3};1H\x1b[0K${footerLine(W)}`);
         const editor = this.#inputRow(W, ctx);
-        out.push(`\x1b[${H - 1};1H\x1b[0K${this.#checked(editor.stripped, W)}`);
-        out.push(`\x1b[${H};1H\x1b[0K${footerLine(W)}`);
-        // the cursor: up one (the editor row) + left to the marker column
-        out.push("\x1b[1A");
+        out.push(`\x1b[${H - 2};1H\x1b[0K${this.#checked(editor.stripped, W)}`);
+        out.push(`\x1b[${H - 1};1H\x1b[0K${footerLine(W)}`);
+        out.push(`\x1b[${H};1H\x1b[0K${this.#checked(statusLine(this.#status, this.#tail, this.#question !== null, W), W)}`);
+        // the cursor: up two (the input row at H−2) + left to the marker
+        out.push("\x1b[2A");
         if (editor.afterW > 0)
             out.push(`\x1b[${editor.afterW}D`);
     }
@@ -640,12 +681,16 @@ export class Body {
                 out.push("\n");
         }
         else {
-            out.push("\x1b[1B"); // to the footer row
-        }
-        // the bottom-up repaint, from the last row up
-        out.push(`\x1b[1G\x1b[0K${footerLine(W)}`); // H
-        out.push(`\x1b[1A\x1b[1G\x1b[0K${this.#checked(editor.stripped, W)}`); // H−1 — the editor
-        out.push(`\x1b[1A\x1b[1G\x1b[0K${this.#checked(statusLine(this.#status, this.#tail, this.#question !== null, W), W)}`); // H−2
+            // no commits — jump from the anchor (H−2) straight to the
+            // bottom row H (the commit path's LFs left the cursor there)
+            out.push("\x1b[2B");
+        }
+        // the bottom-up repaint, from the last row up — V6-3: the design
+        // §03 chrome: status (H), lower ╌ (H−1), input (H−2), upper ╌ (H−3)
+        out.push(`\x1b[1G\x1b[0K${this.#checked(statusLine(this.#status, this.#tail, this.#question !== null, W), W)}`); // H — the status
+        out.push(`\x1b[1A\x1b[1G\x1b[0K${footerLine(W)}`); // H−1 — the lower ╌
+        out.push(`\x1b[1A\x1b[1G\x1b[0K${this.#checked(editor.stripped, W)}`); // H−2 — the input
+        out.push(`\x1b[1A\x1b[1G\x1b[0K${footerLine(W)}`); // H−3 — the upper ╌
         for (let i = menuRows.length - 1; i >= 0; i -= 1) {
             out.push(`\x1b[1A\x1b[1G\x1b[0K${this.#checked(menuRows[i], W)}`);
         }
@@ -659,7 +704,7 @@ export class Body {
         // CRLF) cannot misplace them the way a relative march could).
         // 1. the GAP rows (between the live content and the chrome) — EL'd
         //    so the old content there cannot ghost.
-        for (let r = liveTop + liveLines.length; r <= H - 3; r += 1) {
+        for (let r = liveTop + liveLines.length; r <= H - 4; r += 1) {
             out.push(`\x1b[${r};1H\x1b[0K`);
         }
         // 2. the STALE rows above the committed section — the scrolled old
@@ -675,11 +720,11 @@ export class Body {
         for (let i = 0; i < committed.length; i += 1) {
             out.push(`\x1b[${Math.max(1, liveTop - committed.length + i)};1H\x1b[0K${this.#checked(committed[i], W)}`);
         }
-        // the cursor: down to the anchor (H−1) + left to the marker column —
+        // the cursor: down to the anchor (H−2, the input row) + left to the marker —
         // the down-distance from the LAST written row (the committed bottom,
         // the stale bottom, or the gap bottom when nothing else wrote).
-        const lastRow = committed.length > 0 ? liveTop - 1 : staleFrom < liveTop ? liveTop - 1 : H - 3;
-        const down = H - 1 - lastRow;
+        const lastRow = committed.length > 0 ? liveTop - 1 : staleFrom < liveTop ? liveTop - 1 : H - 4;
+        const down = H - 2 - lastRow; // the anchor: the input row (H−2)
         if (down > 0)
             out.push(`\x1b[${down}B`);
         if (editor.afterW > 0)

package/dist/render.d.ts

@@ -202,17 +202,20 @@ export declare function renderStatusLine(turn: number, usage: RunUsage, ctxRatio
  */
 export declare function renderTerminalGap(statusLine: string | null): string;
 /**
- * v3 §01 — the banner, block-split. The logo is three INDEPENDENT rows
- * (TOP / the tagline / BOTTOM), then TWO info rows (version,
- * extensions). Every row truncates at the terminal width with a " (+N)"
- * marker (N = the hidden display width); a window narrower than 40
- * columns skips the logo entirely — only the info rows. Pure.
+ * v3 §01 (V6-2) — the banner, block-split. The logo is THREE BRICK rows
+ * (the logo.svg pixel form — K I S O), then a BLANK, then the info rows:
+ * "kiso vX — tagline" + extensions. The tagline rides the version line
+ * (the old logo MIDDLE row was the tagline — a text row masquerading as
+ * the logo's centre). Every row truncates at the terminal width with a
+ * " (+N)" marker (N = the hidden display width); a window narrower than
+ * 40 columns skips the logo + the blank entirely — only the info rows.
+ * Pure.
  */
 export declare const TAGLINE = "the coding agent that survives kill -9";
 /** v3 §01: truncate a row at `width`, marking the hidden span " (+N)". */
 export declare function truncateRow(row: string, width: number): string;
-/** v3 §01: the banner lines for a width W — logo (skipped under 40
- *  columns) + version + extensions. */
+/** v3 §01 (V6-2): the banner lines for a width W — logo (skipped under
+ *  40 columns) + blank + "kiso vX — tagline" + extensions. */
 export declare function bannerLines(W: number, version: string, extensionsText: string): string[];
 /** v3 §02 — the recap line that ends a run, replacing the "done" label +
  *  the old status line. All fields derive LOCALLY from the event stream

package/dist/render.js

@@ -283,14 +283,17 @@ export function renderTerminalGap(statusLine) {
     return `${statusLine === null ? "" : `${statusLine}\n`}\n`;
 }
 /**
- * v3 §01 — the banner, block-split. The logo is three INDEPENDENT rows
- * (TOP / the tagline / BOTTOM), then TWO info rows (version,
- * extensions). Every row truncates at the terminal width with a " (+N)"
- * marker (N = the hidden display width); a window narrower than 40
- * columns skips the logo entirely — only the info rows. Pure.
+ * v3 §01 (V6-2) — the banner, block-split. The logo is THREE BRICK rows
+ * (the logo.svg pixel form — K I S O), then a BLANK, then the info rows:
+ * "kiso vX — tagline" + extensions. The tagline rides the version line
+ * (the old logo MIDDLE row was the tagline — a text row masquerading as
+ * the logo's centre). Every row truncates at the terminal width with a
+ * " (+N)" marker (N = the hidden display width); a window narrower than
+ * 40 columns skips the logo + the blank entirely — only the info rows.
+ * Pure.
  */
 export const TAGLINE = "the coding agent that survives kill -9";
-const LOGO_ROWS = ["█ █ ▀█▀ █▀▀ █▀█", TAGLINE, "▀ ▀ ▀▀▀ ▀▀▀ ▀▀▀"];
+const LOGO_ROWS = ["█ █ ▀█▀ █▀▀ █▀█", "█▀▄  █  ▀▀█ █ █", "▀ ▀ ▀▀▀ ▀▀▀ ▀▀▀"];
 /** Display width of a row (1-cell ASCII; 2-cell CJK/wide). */
 function displayW(row) {
     let w = 0;
@@ -315,14 +318,16 @@ export function truncateRow(row, width) {
     }
     return `${row.slice(0, i)} (+${displayW(row) - w})`;
 }
-/** v3 §01: the banner lines for a width W — logo (skipped under 40
- *  columns) + version + extensions. */
+/** v3 §01 (V6-2): the banner lines for a width W — logo (skipped under
+ *  40 columns) + blank + "kiso vX — tagline" + extensions. */
 export function bannerLines(W, version, extensionsText) {
     const rows = [];
-    if (W >= 40)
+    if (W >= 40) {
         for (const r of LOGO_ROWS)
             rows.push(truncateRow(r, W));
-    rows.push(truncateRow(`v${version}`, W));
+        rows.push("");
+    }
+    rows.push(truncateRow(`kiso v${version} — ${TAGLINE}`, W));
     if (extensionsText !== "")
         rows.push(truncateRow(extensionsText, W));
     return rows;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincemakes/kiso-tui",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "kiso tui — the pure terminal layer (cell renderer, dock, raw editor, diff, palette). Zero runtime dependencies: input is data, output is bytes.",
   "type": "module",
   "license": "MIT",