aiden-runtime 4.7.0 → 4.8.1

package/dist/cli/v4/display.js

@@ -41,6 +41,7 @@ const marked_1 = require("marked");
 const TerminalRenderer = require('marked-terminal').default ?? require('marked-terminal');
 const skinEngine_1 = require("./skinEngine");
 const box_1 = require("./box");
+const tokens_1 = require("./design/tokens");
 const toolTrail_1 = require("./display/toolTrail");
 // v4.1.3-essentials — capability card renderer (auth/platform failures).
 const capabilityCard_1 = require("./display/capabilityCard");
@@ -231,6 +232,16 @@ class Display {
         // reprints the formatted output.
         this.streamBuffer = '';
         this.streamLineCount = 0;
+        // v4.8.0 Phase 2.3 — task_id → label map for in-flight ui_task_update
+        // rows. ui_task_done looks up the label so the completion row can
+        // echo it even when the model only sends task_id + status. Cleared
+        // on done. Map is per-Display-instance; one REPL session.
+        this.uiTaskRows = new Map();
+        // v4.8.0 Phase 2.3 fix — set true by renderUiEvent; tryRerenderInPlace
+        // early-returns when set so the cursor-up + erase-to-end-of-screen
+        // sequence can't wipe our ui_* rows. Reset at stream lifecycle
+        // boundaries (streamPartial first-delta init + streamComplete).
+        this.uiEventsFiredThisTurn = false;
         this.skin = opts.skin ?? (0, skinEngine_1.getSkinEngine)();
         this.out = opts.stdout ?? process.stdout;
         this.err = opts.stderr ?? process.stderr;
@@ -345,12 +356,16 @@ class Display {
      * Returns one indented line with a trailing newline.
      */
     agentHeader() {
-        const bar = this.skin.applyColors('┃', 'brand');
+        // v4.8.0 Slice 7 hotfix — replace v4.7 ┃ heavy-vertical with the
+        // Slice 4 framedPanel bar `▎` so reply chrome matches /help,
+        // approval prompt, and other Slice 4+ surfaces. Trailing `\n\n`
+        // (was `\n`) puts one blank between header and first content row.
+        const bar = this.skin.applyColors(tokens_1.glyphs.panel.bar, 'brand');
         const head = this.skin.applyColors('Aiden', 'brand');
         if (process.env.AIDEN_UI_TIMESTAMPS === '1') {
-            return `${this.timestampPrefix()}  ${bar} ${head}\n`;
+            return `${this.timestampPrefix()}  ${bar} ${head}\n\n`;
         }
-        return `  ${bar} ${head}\n`;
+        return `  ${bar} ${head}\n\n`;
     }
     /**
      * Phase 26.2.3 — turn boundary marker. Writes a thin muted rule
@@ -360,7 +375,12 @@ class Display {
      * surface.
      */
     printTurnSeparator() {
-        this.out.write(`  ${this.rule()}\n\n`);
+        // v4.8.0 Slice 7 hotfix — drop the trailing blank line. Inquirer's
+        // own prompt leading newline + the Aiden header's leading 2-space
+        // indent provide enough breathing room; the extra blank was
+        // stacking with other emit points to produce 3+ blank lines
+        // between user prompt and reply.
+        this.out.write(`  ${this.rule()}\n`);
     }
     /**
      * Render the v3-style boot status line:
@@ -500,55 +520,61 @@ class Display {
      * across lines.
      */
     scrollFooter() {
+        // v4.8.0 Slice 10d — rounded heavy frame for identity / credits.
+        // The Slice 10b/c orange-bar chrome lacked visual containment for
+        // an identity surface (the bar reads as panel-content, not as a
+        // credits card). This restores a heavy frame — but with rounded
+        // corners (╭╮╰╯) sourced from glyphs.box, and muted chrome so the
+        // brand `♥` + brand kv labels carry the visual weight inside.
         const sk = this.skin;
         const m = (s) => sk.applyColors(s, 'muted');
         const lab = (s) => sk.applyColors(s, 'brand');
         const val = (s) => sk.applyColors(s, 'agent');
         const heart = sk.applyColors('♥', 'brand');
         if (this.cols() < 80) {
-            // Tier-3.1b: single-line credits at narrow widths so the boot
-            // card stays compact. The 4-line plain fallback shipped earlier
-            // wastes vertical space when terminals already squeeze content.
+            // Narrow fallback unchanged — single-line credits stays compact.
             return `  ${heart} ${m('built solo · github.com/taracodlabs/aiden · aiden.taracod.com')}`;
         }
-        // Parchment.
-        const INTERIOR = 63;
-        const wallIndent = '     '; // 5 spaces — column where the | sits
-        const lidIndent = '      '; // 6 spaces — lid floats one past the wall
-        const pipe = m('|');
-        const lid = m('_'.repeat(INTERIOR));
-        const padInner = (text) => {
-            const v = (0, box_1.visibleLength)(text);
-            if (v >= INTERIOR)
-                return (0, box_1.truncateVisible)(text, INTERIOR);
-            return text + ' '.repeat(INTERIOR - v);
+        const indent = '  ';
+        const innerW = Math.min(this.cols() - 4, 70);
+        const tL = m(tokens_1.glyphs.box.topLeft);
+        const tR = m(tokens_1.glyphs.box.topRight);
+        const bL = m(tokens_1.glyphs.box.bottomLeft);
+        const bR = m(tokens_1.glyphs.box.bottomRight);
+        const side = m(tokens_1.glyphs.chrome.vLine);
+        const hRun = m(tokens_1.glyphs.chrome.hLine.repeat(innerW));
+        const pad = (visible, width) => {
+            const v = (0, box_1.visibleLength)(visible);
+            return visible + ' '.repeat(Math.max(0, width - v));
         };
-        // v4.5 TUI polish — add a leading + trailing blank line so the
-        // box has visual breathing room from the lines above/below, and
-        // a trailing interior blank so contact info doesn't crowd the
-        // bottom border.
+        const row = (content) => `${indent}${side} ${pad(content, innerW - 2)} ${side}`;
         return [
             '',
-            lidIndent + lid,
-            wallIndent + pipe + ' '.repeat(INTERIOR) + pipe,
-            wallIndent + pipe + padInner(`   ${heart}  ${val('Built solo')}`) + pipe,
-            wallIndent + pipe + padInner(`   ${lab('GitHub:')}  ${val('github.com/taracodlabs/aiden')}`) + pipe,
-            wallIndent + pipe + padInner(`   ${lab('Web:')}     ${val('aiden.taracod.com')}`) + pipe,
-            wallIndent + pipe + padInner(`   ${lab('Contact:')} ${val('contact@taracod.com')}`) + pipe,
-            wallIndent + pipe + ' '.repeat(INTERIOR) + pipe,
-            wallIndent + pipe + lid + pipe,
+            `${indent}${tL}${hRun}${tR}`,
+            row(`${heart}  ${val('Built solo')}`),
+            row(''),
+            row(`${lab('GitHub:'.padEnd(10))}${val('github.com/taracodlabs/aiden')}`),
+            row(`${lab('Web:'.padEnd(10))}${val('aiden.taracod.com')}`),
+            row(`${lab('Contact:'.padEnd(10))}${val('contact@taracod.com')}`),
+            `${indent}${bL}${hRun}${bR}`,
             '',
         ].join('\n');
     }
     /**
      * Bottom prompt hint that replaces the prior `ready ▸  /help` +
-     * `✦ Tip:` lines. `▲` in brand, body in muted.
+     * `✦ Tip:` lines.
+     *
+     * v4.8.0 Slice 11 — dropped the leading `▲` glyph. The inquirer
+     * prompt that paints immediately below this hint already carries
+     * the brand triangle as its input prefix (`display.promptPrefix()`),
+     * so the hint's own `▲` read as a duplicate orphan sitting one row
+     * above the active cursor. Hint is now text-only-muted; `▲` stays
+     * exclusively as the user-input identity glyph.
      */
     bottomPromptHint() {
         const sk = this.skin;
-        const tri = sk.applyColors('▲', 'brand');
         const text = sk.applyColors('Type your message · /help for commands · /skills to add more', 'muted');
-        return `  ${tri} ${text}`;
+        return `    ${text}`;
     }
     /**
      * v3-style "ready" line:
@@ -564,33 +590,96 @@ class Display {
         return `  ${ready} ${arrow}  ${sk.applyColors(hint, 'muted')}`;
     }
     /**
-     * v3-style post-turn status footer:
+     * v3-style post-turn status footer, extended in v4.8.0 Slice 7 with
+     * packed info density (turn counter, session uptime, per-turn state
+     * dot) and progressive disclosure based on terminal width.
      *
-     *   ▲ groq · llama-3.3-70b  │  ▓▓▓░░░░░░░ 12.4K/128K  │  2s
+     * Layout tiers:
+     *   ≥120 cols: ▲ provider · model │ N/M <bar> N% │ ⌘ N │ ⏱ Hms │ ● state
+     *   ≥100 cols: ▲ provider · model │ N/M <bar> N% │ ⌘ N │ Ns
+     *   < 100:     ▲ provider · model │ <bar> N% │ Ns
      *
-     * Width-bounded (10-cell context bar), always one line.  Provider
-     * appears in muted, model bold, ctx bar colour-graded by % full,
-     * elapsed in muted.  Returns string sans trailing newline.
+     * `turnCount`, `sessionMs`, `state` are optional for backward compat;
+     * old call sites continue to work unchanged.
      */
     statusFooter(args) {
         const sk = this.skin;
         const SEP = sk.applyColors(' │ ', 'muted');
         const tri = this.triangle();
+        // v4.8.0 Slice 7 hotfix #2 — per-metric accent palette.
+        // Model: cyan (tool kind). Token counts: amber (warn). Bar/pct:
+        // semantic tier. Turn: purple (metric_turn). Timer: teal (success).
         const provModel = `${tri} ${sk.applyColors(args.provider, 'muted')}` +
             `${sk.applyColors(' · ', 'muted')}` +
-            sk.applyColors(args.model, 'agent');
+            sk.applyColors(args.model, 'tool');
         const pct = args.ctxMax > 0
             ? Math.min(100, Math.round((args.ctxUsed / args.ctxMax) * 100))
             : 0;
-        const barW = 10;
+        // 5-cell bar with single-space separators — reads as discrete dots
+        // rather than a continuous line. Total visible width ≈ 9 cells,
+        // similar to the prior 10-cell solid bar so 80-col tier stays tight.
+        const barW = 5;
         const filled = Math.round((pct / 100) * barW);
         const ctxKind = pct < 60 ? 'success' : pct < 85 ? 'warn' : 'error';
-        const bar = sk.applyColors('▓'.repeat(filled), ctxKind) +
-            sk.applyColors('░'.repeat(barW - filled), 'muted');
-        const ctxLabel = `${formatCompactTokens(args.ctxUsed)}/${formatCompactTokens(args.ctxMax)}`;
-        const ctxSeg = `${bar} ${sk.applyColors(ctxLabel, ctxKind)}`;
-        const elapsed = sk.applyColors(formatElapsedShort(args.elapsedMs), 'muted');
-        return `  ${provModel}${SEP}${ctxSeg}${SEP}${elapsed}`;
+        const cells = Array.from({ length: barW }, (_, i) => i < filled ? tokens_1.glyphs.bar.filled : tokens_1.glyphs.bar.empty);
+        const bar = sk.applyColors(cells.join(' '), ctxKind);
+        const ctxRatio = sk.applyColors(`${formatCompactTokens(args.ctxUsed)}/${formatCompactTokens(args.ctxMax)}`, 'warn');
+        const ctxPctText = sk.applyColors(`${pct}%`, ctxKind);
+        const elapsed = sk.applyColors(formatElapsedShort(args.elapsedMs), 'success');
+        // Progressive disclosure: pick layout based on RAW terminal width.
+        // `this.cols()` caps at 100 (frame budget for body content), but
+        // the footer wants the full physical width to choose its tier.
+        const cols = (typeof this.out.columns === 'number' && this.out.columns >= 1)
+            ? this.out.columns
+            : 100;
+        // Tier ≥120: full density (ratio + bar + pct + turn + session + state).
+        // Tier ≥100: ratio + bar + pct + turn + elapsed.
+        // Tier <100: bar + pct + elapsed.
+        const stateDot = args.state
+            ? sk.applyColors(tokens_1.glyphs.status.dot, this.stateKind(args.state))
+            : '';
+        // v4.8.0 Slice 9 hotfix — turn glyph dropped; bare colored number
+        // matches the timer pattern. Color alone (purple metric_turn)
+        // carries the semantic.
+        const turnSeg = args.turnCount !== undefined
+            ? sk.applyColors(String(args.turnCount), 'metric_turn')
+            : '';
+        // v4.8.0 Slice 9 hotfix — ⌛ restored ahead of the bare elapsed
+        // string. Wider font support than the retired ⏱. `sessionMs` arg
+        // stays plumbed-but-unused for backward compat with the field name.
+        const sessionSeg = args.elapsedMs !== undefined
+            ? `${sk.applyColors(tokens_1.glyphs.status.timer, 'success')} ${sk.applyColors(formatElapsedShort(args.elapsedMs), 'success')}`
+            : '';
+        // ctxRatio + ctxPctText are pre-painted (warn + ctxKind respectively).
+        const ctxSegFull = `${ctxRatio} ${bar} ${ctxPctText}`;
+        const ctxSegCompact = `${bar} ${ctxPctText}`;
+        let segments;
+        if (cols >= 120 && stateDot && turnSeg && sessionSeg) {
+            segments = [provModel, ctxSegFull, turnSeg, sessionSeg, stateDot];
+        }
+        else if (cols >= 100 && turnSeg) {
+            // v4.8.1 Slice 2 hotfix — was `elapsed` (bare); now uses
+            // `sessionSeg` which includes the ⌛ timer glyph. The previous
+            // mid-tier dropped the glyph for "denser" packing, but Shiva's
+            // smoke at 80–110 cols showed only ` 5.1s` (leading space, no
+            // glyph). The glyph is single-cell, cheap, and load-bearing as
+            // the timer's identity affordance.
+            segments = [provModel, ctxSegFull, turnSeg, sessionSeg || elapsed];
+        }
+        else {
+            segments = [provModel, ctxSegCompact, sessionSeg || elapsed];
+        }
+        return `  ${segments.join(SEP)}`;
+    }
+    /** Map a per-turn outcome to the colour kind used by the state dot. */
+    stateKind(state) {
+        if (state === 'ok')
+            return 'success';
+        if (state === 'warn')
+            return 'warn';
+        if (state === 'error')
+            return 'error';
+        return 'muted';
     }
     /**
      * Tier-3.1 (v4.1-tier3.1): pre-prompt status line.
@@ -682,11 +771,15 @@ class Display {
      * `12:41:02  ▲ <input>`. Default OFF preserves `▲ <input>`.
      */
     promptPrefix() {
+        // v4.8.0 Slice 7 hotfix #2 — 2-space lead matches the rest of the
+        // surface family (▎ Aiden header, status footer, bottom hint).
+        // Timestamp variant unchanged — the timestamp gutter already
+        // provides its own consistent left edge.
         const tri = this.skin.applyColors('▲', 'brand');
         if (process.env.AIDEN_UI_TIMESTAMPS === '1') {
             return `${this.timestampPrefix()}  ${tri} `;
         }
-        return `${tri} `;
+        return `  ${tri} `;
     }
     /**
      * Phase 26.2.6 — pick a random phrase from `SPINNER_PHRASES`,
@@ -805,6 +898,13 @@ class Display {
         let stopped = false;
         let printed = false;
         let tickTimer = null;
+        // v4.8.1 Slice 2 hotfix #4 — true once the indicator has paused
+        // and resumed at least once (i.e. a tool row interrupted it). When
+        // false at stop() time, the indicator is still in its initial-paint
+        // row immediately below the leading blank, so stop()'s erase can
+        // safely consume BOTH rows. When true, the leading blank is far
+        // above and stop() erases only the current indicator row.
+        let movedFromInitial = false;
         // Tunable cadence. v4.1.4 Phase 3b' (Issue G): bumped from 400ms
         // to 250ms after visual smoke — 400ms felt sluggish, made the
         // indicator look static between seconds. 250ms gives ~4 dot
@@ -812,69 +912,65 @@ class Display {
         // (Ns) counter hasn't ticked. Slow enough not to flicker on SSH
         // / slow ConPTY refresh.
         const TICK_MS = 250;
-        // ▲ glyph in brand orange — the user's primary motif. Dots and
-        // elapsed counter paint muted to keep visual weight on the verb.
+        // v4.8.0 Slice 11 — leading glyph is no longer a static `⌛` (or
+        // a separate 2nd-row wave bar). Now it's a single-row sliding
+        // shimmer: a 4-cell brand-orange `█` segment that scrolls L→R
+        // across a muted `─` track, wrapping at the right edge. The dots
+        // pulse + (Ns) timer keep their roles as secondary motion cues;
+        // the shimmer is the primary "something is happening" affordance
+        // in TTFT space. Token-sourced from `glyphs.shimmer` so the glyph
+        // pair lives next to the rest of the v4.8.0 design system.
         //
-        // v4.1.4 Phase 3b' (Issue F): the inline "▸▸ Ctrl+C cancel" hint
-        // shipped with Phase 3a was visually noisy on the activity line
-        // and collided with planner-debug dim writes. Dropped per user
-        // feedback; a separate bottom-of-screen footer can be added in
-        // v4.1.5 if wanted, but it must NOT be glued to the indicator.
-        const glyph = sk.applyColors('▲', 'brand');
-        // v4.1.5 Issue K — wave-bar state. Snake-scroll: a 3-cell `▰`
-        // block slides across 10 cells, wrapping at the right edge. Same
-        // 250ms tick as the verb dot pulse — one timer drives both rows.
-        const waveBarEnabled = opts.waveBar !== false; // default true
-        const WAVE_CELLS = 10;
-        const WAVE_BLOCK = 3;
-        let waveFrame = 0;
-        const buildLine = () => {
-            const dots = '.'.repeat(dotFrame); // 0..3 dots
-            const elapsedSec = Math.floor((Date.now() - startTime) / 1000);
-            const elapsedStr = elapsedSec >= 1
-                ? ` ${sk.applyColors(`(${elapsedSec}s)`, 'muted')}`
-                : '';
-            // `▲ {verb}{dots-padded-to-3}{elapsed?}`
-            return `${glyph} ${verb}${dots.padEnd(3, ' ')}${elapsedStr}`;
-        };
+        // `opts.waveBar` is preserved as a back-compat option that maps
+        // to "shimmer enabled". Pass `{ waveBar: false }` to drop the
+        // shimmer cluster and render the bare verb row (the legacy
+        // v4.1.4 single-row indicator). Default ON.
+        const shimmerEnabled = opts.waveBar !== false;
+        const SHIMMER_CELLS = 10;
+        const SHIMMER_BLOCK = 4;
+        let shimmerFrame = 0;
         /**
-         * v4.1.5 Issue K — render the wave-bar row. A 3-cell `▰` block at
-         * positions `[waveFrame, waveFrame+1, waveFrame+2]` mod 10. The
-         * filled cells paint brand orange, empty cells paint warm-muted.
-         * Same width + glyph set as the token progress bar so the two
-         * rows feel like a coherent palette (one is heartbeat, the other
-         * is real progress).
+         * v4.8.0 Slice 11 — render the sliding-block shimmer. A 4-cell
+         * `█` (U+2588 FULL BLOCK) segment at positions `[frame,
+         * frame+1, frame+2, frame+3]` mod 10, on a muted `─` track.
+         * Brand-orange block, muted track. Token-sourced glyphs;
+         * cell-by-cell paint keeps glyph order true to position so
+         * the wrap visibly slides rather than jumping.
          *
-         * Heartbeat semantics: this is NOT progress. The wave moves at a
-         * constant 250ms cadence regardless of any backend metric. It
-         * exists purely so the user sees motion during the unobservable
-         * TTFT (time-to-first-token) wait. The verb row above carries
-         * any real lifecycle signal via `setVerb()`.
+         * Heartbeat semantics: this is NOT progress. The block moves
+         * at a constant 250ms cadence regardless of any backend metric.
+         * It exists purely so the user sees motion during the
+         * unobservable TTFT (time-to-first-token) wait. The verb +
+         * dot pulse + (Ns) timer carry the real lifecycle signal.
          */
-        const buildWave = () => {
-            // v4.1.5 Phase 1d (Q-P1) — glyph palette switch. Was `▰`/`▱`
-            // (U+25B0/B1, Geometric Shapes) which legacy Windows console
-            // fonts render as tofu. Now `▓`/`░` (U+2593/91, Block Elements
-            // — in CP437, universally supported). Matches the existing
-            // statusFooter chrome that's shipped since v3 without ever
-            // being garbled.
+        const buildShimmer = () => {
             const filled = new Set();
-            for (let i = 0; i < WAVE_BLOCK; i += 1) {
-                filled.add((waveFrame + i) % WAVE_CELLS);
+            for (let i = 0; i < SHIMMER_BLOCK; i += 1) {
+                filled.add((shimmerFrame + i) % SHIMMER_CELLS);
             }
-            // Render cells in order so the snake-scroll visually slides:
-            // we paint cell-by-cell with the right color, joined into one
-            // string. ANSI runs reset per cell — slight overhead but keeps
-            // glyph order true to position. Brand orange filled, warm-muted
-            // empty.
             const cells = [];
-            for (let c = 0; c < WAVE_CELLS; c += 1) {
+            for (let c = 0; c < SHIMMER_CELLS; c += 1) {
                 cells.push(filled.has(c)
-                    ? sk.applyColors('▓', 'brand')
-                    : sk.applyColors('░', 'muted'));
+                    ? sk.applyColors(tokens_1.glyphs.shimmer.block, 'brand')
+                    : sk.applyColors(tokens_1.glyphs.shimmer.track, 'muted'));
             }
             return cells.join('');
         };
+        const buildLine = () => {
+            const dots = '.'.repeat(dotFrame); // 0..3 dots
+            const elapsedSec = Math.floor((Date.now() - startTime) / 1000);
+            const elapsedStr = elapsedSec >= 1
+                ? ` ${sk.applyColors(`(${elapsedSec}s)`, 'muted')}`
+                : '';
+            // Shimmer prefix (or none, when opts.waveBar === false).
+            const prefix = shimmerEnabled ? `${buildShimmer()} ` : '';
+            // v4.8.1 Slice 2 hotfix #4 — 2-space leading indent so the
+            // indicator line aligns at col 2, matching `▎ Aiden`, the
+            // user-prompt `  ▲ `, the panel `  │ ` bar, and every other
+            // structured surface. Prior buildLine started at col 0 which
+            // read as misaligned against the rest of the v4.8 chrome.
+            return `  ${prefix}${verb}${dots.padEnd(3, ' ')}${elapsedStr}`;
+        };
         // v4.1.5 Part 1a — Issue M (Windows ConPTY buffering fix).
         //
         // Prior pattern wrote `\r\x1b[K{indicator}` with NO trailing
@@ -905,24 +1001,15 @@ class Display {
             if (stopped || paused || !isTty)
                 return;
             dotFrame = (dotFrame + 1) % 4;
-            // v4.1.5 Issue K — wave snake-scroll advances 1 cell per tick.
-            // Same 250ms cadence as the dot pulse, so both rows move in
-            // visible lockstep. Modulo WAVE_CELLS wraps the leading block
-            // back to the left edge.
-            waveFrame = (waveFrame + 1) % WAVE_CELLS;
-            if (waveBarEnabled) {
-                // 2-row layout: walk up TWO rows (two separate up-1+erase
-                // sequences, which keeps the `\x1b[1A\x1b[2K` substring
-                // assertion-compatible), repaint both, drop newlines so the
-                // cursor lands on the row below the wave bar.
-                out.write(`${ANSI_UP_ERASE}${ANSI_UP_ERASE}` +
-                    `${buildLine()}\n` +
-                    `${buildWave()}\n`);
-            }
-            else {
-                // Single-row layout (back-compat with v4.1.4 tests).
-                out.write(`${ANSI_UP_ERASE}${buildLine()}\n`);
-            }
+            // v4.8.0 Slice 11 — shimmer slides 1 cell per tick. Same 250ms
+            // cadence as the dot pulse, so block + dots move in visible
+            // lockstep. Modulo SHIMMER_CELLS wraps the leading block back
+            // to the left edge.
+            shimmerFrame = (shimmerFrame + 1) % SHIMMER_CELLS;
+            // Single-row layout: walk up 1, erase, repaint, newline. Cursor
+            // lands on the row below the indicator, ready for the next
+            // tick to walk back up.
+            out.write(`${ANSI_UP_ERASE}${buildLine()}\n`);
         };
         const startTick = () => {
             if (stopped || !isTty || tickTimer !== null)
@@ -936,41 +1023,27 @@ class Display {
             }
         };
         const eraseLine = () => {
-            // Walk up to the indicator's row(s) + erase, then drop ONE
-            // newline so the cursor lands on a blank line BELOW the
-            // indicator's old footprint. v4.1.6 polish: previous behavior
-            // left the cursor at col 0 of the just-erased row so caller
-            // writes (agentHeader, tool row, etc.) sat tight against where
-            // the indicator had been. v4.1.5 visual smoke flagged the
-            // wave-bar→`┃ Aiden` proximity as feeling cramped. The
-            // trailing `\n` gains one visible blank row of breathing space
-            // AND adds another Windows ConPTY flush trigger (Issue M).
-            //
-            // v4.1.5 Issue K — with wave bar enabled, walk up 2 rows (two
-            // up-1+erase sequences). Without the bar, walk up 1 row.
+            // Walk up 1 row + erase + drop a newline so the cursor lands
+            // on a blank line BELOW the indicator's old footprint. The
+            // trailing `\n` provides one visible blank row of breathing
+            // space and acts as a Windows ConPTY flush trigger (v4.1.5
+            // Issue M). Slice 11 collapsed the prior 2-row layout to 1.
             if (!isTty || !printed)
                 return;
-            if (waveBarEnabled) {
-                out.write(`${ANSI_UP_ERASE}${ANSI_UP_ERASE}\n`);
-            }
-            else {
-                out.write(`${ANSI_UP_ERASE}\n`);
-            }
+            out.write(`${ANSI_UP_ERASE}\n`);
         };
-        // Initial paint — only on TTY. Indicator + `\n` so the buffer
-        // flushes and the cursor sits on the row below, ready for the
-        // first tick to walk back up.
+        // Initial paint — only on TTY.
         //
-        // v4.1.5 Issue K — when wave bar is enabled, paint TWO rows:
-        // verb row + wave row, each with trailing `\n`. Cursor lands on
-        // the row below the wave bar. The first tick will walk up 2.
+        // v4.8.1 Slice 2 hotfix #4 — leading `\n` restored to give one
+        // blank row between the user-input row and the indicator (hotfix
+        // #3 dropped the dim rule that previously provided that gap).
+        // To keep the post-stop layout at "exactly one blank between
+        // user input and ▎ Aiden", stop() now walks up TWO rows when
+        // the indicator never moved (no pause/resume), consuming both
+        // the indicator row AND the leading blank. The `movedFromInitial`
+        // flag below tracks that state.
         if (isTty) {
-            if (waveBarEnabled) {
-                out.write(`${buildLine()}\n${buildWave()}\n`);
-            }
-            else {
-                out.write(`${buildLine()}\n`);
-            }
+            out.write(`\n${buildLine()}\n`);
             printed = true;
             startTick();
         }
@@ -980,6 +1053,12 @@ class Display {
                     return;
                 paused = true;
                 stopTick();
+                // v4.8.1 Slice 2 hotfix #4 — mark the indicator as "moved" so
+                // a subsequent stop() does NOT walk up 2 rows. The leading
+                // blank from initial paint is now far above the current row
+                // and shouldn't be consumed; doing so would erase tool-row
+                // content instead.
+                movedFromInitial = true;
                 eraseLine();
                 // After erase the cursor is at column 0 of the indicator's
                 // (now empty) line. Caller is expected to write its own
@@ -998,17 +1077,16 @@ class Display {
                 // Caller has just finished writing its own content (typically
                 // ending with `\n`), so the cursor is on a fresh line below
                 // whatever was there. Paint the indicator + `\n` to claim the
-                // current row(s) and leave the cursor on the row below — same
+                // current row and leave the cursor on the row below — same
                 // invariant the initial paint and tick maintain. Trailing `\n`
                 // also flushes Windows ConPTY buffering (Issue M).
                 //
-                // v4.1.5 Issue K — repaint BOTH rows when wave bar enabled.
-                if (waveBarEnabled) {
-                    out.write(`${buildLine()}\n${buildWave()}\n`);
-                }
-                else {
-                    out.write(`${buildLine()}\n`);
-                }
+                // v4.8.0 Slice 11 — single-row layout: paint one row only.
+                // (Initial paint includes a leading `\n` for breathing space;
+                // resume omits it because the caller has already written its
+                // own content above this point and an extra blank would
+                // double up.)
+                out.write(`${buildLine()}\n`);
                 printed = true;
                 startTick();
             },
@@ -1021,7 +1099,20 @@ class Display {
                     return;
                 stopped = true;
                 stopTick();
-                eraseLine();
+                // v4.8.1 Slice 2 hotfix #4 — when the indicator never moved
+                // (no pause/resume happened during the turn), walk up TWO
+                // rows: erase the indicator row AND the leading blank above
+                // it. The trailing `\n` then lands the cursor exactly one
+                // row below the user-input echo, so the next writer
+                // (agentHeader → ▎ Aiden) produces a clean single-blank gap.
+                if (!printed || !isTty)
+                    return;
+                if (movedFromInitial) {
+                    out.write(`${ANSI_UP_ERASE}\n`);
+                }
+                else {
+                    out.write(`${ANSI_UP_ERASE}${ANSI_UP_ERASE}\n`);
+                }
             },
             isPaused: () => paused,
             isStopped: () => stopped,
@@ -1088,18 +1179,25 @@ class Display {
         // Running row — muted pipe, raw icon, tool-colored verb, muted detail.
         // The optional `running Ns…` tail appears once the tool crosses the
         // 1-second mark; the tick interval below redraws this row every 1s.
+        //
+        // v4.8.0 Slice 11c — double-space between `${glyph}` and `${padVerb}`.
+        // Emoji-class icons (`👁️`, `✏️`, `📋`, `🌐`, etc.) render 2-cell-wide
+        // visually on Windows ConPTY but the cursor/column tracker treats
+        // them as 1 cell, so a single trailing space is visually swallowed
+        // by the emoji's right cell. Two spaces guarantees one visible gap
+        // regardless of how the terminal measures the glyph.
         const runningRow = () => {
             const elapsed = Date.now() - startedAt;
             const liveSuffix = elapsed >= 1000
                 ? `  ${sk.applyColors(`running ${formatToolDuration(elapsed)}…`, 'muted')}`
                 : '';
-            return `${sk.applyColors(toolTrail_1.TRAIL_PIPE, 'muted')} ${glyph} ` +
+            return `${sk.applyColors(toolTrail_1.TRAIL_PIPE, 'muted')} ${glyph}  ` +
                 `${sk.applyColors((0, toolTrail_1.padVerb)(verb), 'tool')} ` +
                 `${sk.applyColors(detail, 'muted')}${liveSuffix}\n`;
         };
         // Outcome row — entire line colored by outcome kind.
         const outcomeRow = (suffix, kind) => {
-            const content = `${toolTrail_1.TRAIL_PIPE} ${glyph} ${(0, toolTrail_1.padVerb)(verb)} ${detail}` +
+            const content = `${toolTrail_1.TRAIL_PIPE} ${glyph}  ${(0, toolTrail_1.padVerb)(verb)} ${detail}` +
                 (suffix ? `  ${suffix}` : '');
             return `${sk.applyColors(content, kind)}\n`;
         };
@@ -1211,8 +1309,10 @@ class Display {
                 // back over the retry counter with `running Ns…`.
                 stopTick();
                 // Update the running row with retry count.
+                // v4.8.0 Slice 11c — double-space between glyph and verb (see
+                // runningRow comment above for the emoji-width rationale).
                 eraseLast();
-                const content = `${toolTrail_1.TRAIL_PIPE} ${glyph} ${(0, toolTrail_1.padVerb)(verb)} ${detail}  retry ${n}/${m} …`;
+                const content = `${toolTrail_1.TRAIL_PIPE} ${glyph}  ${(0, toolTrail_1.padVerb)(verb)} ${detail}  retry ${n}/${m} …`;
                 out.write(sk.applyColors(content, 'warn') + '\n');
                 printed = true;
             },
@@ -1326,7 +1426,12 @@ class Display {
      * (post-stream rerender) so both paths produce identical output.
      */
     applyFrameToRendered(rawBody) {
-        const indent = (0, frame_1.getIndent)(0);
+        // v4.8.0 Slice 7 hotfix #2 — override frame.GUTTER (3) to 2 cells
+        // locally so Aiden reply prose aligns with the ▎ bar of agentHeader
+        // (col 2). The GUTTER constant stays at 3 for other consumers
+        // (markdown list/blockquote/code-block renderers in frame.ts) where
+        // a 3-cell gutter is part of their own visual algebra.
+        const indent = '  ';
         const bw = (0, frame_1.getBodyWidth)(this.out);
         return rawBody
             .split('\n')
@@ -1507,15 +1612,31 @@ class Display {
         if (!text)
             return;
         if (!this.streamHeaderShown) {
-            // Phase 26.2.3 — share the single-line `┃ Aiden` header with
-            // non-streaming agentTurn so streamed and non-streamed responses
-            // open identically.
+            // Phase 26.2.3 — share the `▎ Aiden` header with non-streaming
+            // agentTurn so streamed + non-streamed responses open identically.
             this.out.write(this.agentHeader());
             this.streamHeaderShown = true;
             this.streamBuffer = '';
             this.streamLineCount = 0;
+            this.uiEventsFiredThisTurn = false;
+            // agentHeader emits trailing `\n\n`; cursor is at col 0 of a fresh
+            // line, so the very next chunk needs the leading indent.
+            this.streamLastEndedNewline = true;
         }
-        this.out.write(text);
+        // v4.8.0 Slice 7 hotfix #3 — inject a 2-cell indent at every line
+        // start so streamed content aligns with the ▎ bar in agentHeader.
+        // Pre-this-fix the raw chunk wrote at col 0; the post-stream
+        // rerender in applyFrameToRendered would indent eventually, but
+        // mid-stream the user saw col-0 content. streamBuffer stays raw
+        // (the rerender path applies its own indent).
+        const indent = '  ';
+        let toWrite = text;
+        if (this.streamLastEndedNewline)
+            toWrite = indent + toWrite;
+        const endsNl = toWrite.endsWith('\n');
+        const body = endsNl ? toWrite.slice(0, -1) : toWrite;
+        toWrite = body.replace(/\n/g, '\n' + indent) + (endsNl ? '\n' : '');
+        this.out.write(toWrite);
         this.streamLastEndedNewline = text.endsWith('\n');
         // Phase v4.1-reply-formatting: track buffer + line count for the
         // post-stream re-render.
@@ -1620,6 +1741,15 @@ class Display {
             return;
         if (lines === 0)
             return;
+        // v4.8.0 Phase 2.3 fix — when ui_* events painted this turn, skip the
+        // cursor-up + erase-to-end-of-screen rerender. The eraser wipes
+        // anything below where the stream started, including our event rows.
+        // Tradeoff: assistant text on a ui-event turn stays raw (no in-place
+        // markdown beautification). Acceptable — when the model is using
+        // structured ui events, it's signalling state, not relying on prose
+        // formatting.
+        if (this.uiEventsFiredThisTurn)
+            return;
         // Cheap structural heuristic — only re-render when formatting
         // actually helps. Plain prose chunks stay raw (no flicker).
         //
@@ -1781,6 +1911,8 @@ class Display {
         this.streamLineCount = 0;
         this.streamHeaderShown = false;
         this.streamLastEndedNewline = false;
+        // v4.8.0 Phase 2.3 fix — turn ends; clear the ui-fired flag.
+        this.uiEventsFiredThisTurn = false;
     }
     /**
      * Phase v4.1-reply-formatting: render the optional "Sources"
@@ -1815,6 +1947,199 @@ class Display {
         this.out.write(`${sk.applyColors(`${arrow} ${name}…`, 'tool')}\n`);
         this.streamLastEndedNewline = true;
     }
+    /**
+     * v4.8.0 Phase 2.3 — render a semantic ui_* event signalled by the
+     * model via a uiOnly tool call. Append-only: each event paints one
+     * row; in-place mutation is a v4.8.x upgrade if UX demands it.
+     *
+     * Currently handles `ui_task_update` and `ui_task_done`; other 5
+     * names land in Phase 2.4 (silent ignore until then). Non-TTY out
+     * surfaces silent — matches the activityIndicator precedent.
+     */
+    /**
+     * v4.8.0 Phase 2.3 fix-2 — reset the per-turn ui-event flag. Called
+     * by chatSession at the top of each turn. The existing reset sites
+     * (streamPartial first-delta + streamComplete) only fire when the
+     * turn actually streamed text deltas. Tool-only turns never reset,
+     * leaving the flag sticky into subsequent turns. This is the
+     * authoritative reset for turn-start.
+     */
+    resetUiTurnState() {
+        this.uiEventsFiredThisTurn = false;
+    }
+    renderUiEvent(name, args) {
+        if (!this.out.isTTY)
+            return;
+        // v4.8.0 Phase 2.3 fix — Option C. The post-stream markdown rerender
+        // (`tryRerenderInPlace`) does `cursor-up-N + erase-to-end-of-screen`,
+        // which wipes anything painted between stream start and stream end —
+        // including our ui_* rows. Mark the turn so the rerender skips this
+        // turn entirely. Resets when the next streaming turn begins (see
+        // streamPartial header init) and on streamComplete cleanup.
+        this.uiEventsFiredThisTurn = true;
+        if (name === 'ui_task_update') {
+            this.renderUiTaskUpdate(args);
+            return;
+        }
+        if (name === 'ui_task_done') {
+            this.renderUiTaskDone(args);
+            return;
+        }
+        if (name === 'ui_command_result') {
+            this.renderUiCommandResult(args);
+            return;
+        }
+        if (name === 'ui_test_result') {
+            this.renderUiTestResult(args);
+            return;
+        }
+        if (name === 'ui_approval_request') {
+            this.renderUiApprovalRequest(args);
+            return;
+        }
+        if (name === 'ui_toast') {
+            this.renderUiToast(args);
+            return;
+        }
+        if (name === 'ui_artifact_created') {
+            this.renderUiArtifactCreated(args);
+            return;
+        }
+        // Unknown event names silent-ignore (defensive — future registrations).
+    }
+    /**
+     * v4.8.0 Phase 2.4 polish — build one trail-gutter row matching the
+     * `toolRow` chrome (muted `┊` + space + colored content + `\n`).
+     * Splits on embedded newlines so multi-line surfaces (capped stdout,
+     * preview tails, optional reasons) carry the gutter on every line.
+     */
+    uiTrailRow(content, kind) {
+        const pipe = this.skin.applyColors(toolTrail_1.TRAIL_PIPE, 'muted');
+        return content.split('\n').map(l => `${pipe} ${this.skin.applyColors(l, kind)}\n`).join('');
+    }
+    renderUiTaskUpdate(args) {
+        const taskId = typeof args.task_id === 'string' ? args.task_id : '';
+        const label = typeof args.label === 'string' ? args.label : '';
+        const status = typeof args.status === 'string' ? args.status : '';
+        const kindArg = typeof args.kind === 'string' ? args.kind : 'task';
+        const depth = typeof args.depth === 'number' && args.depth > 0 ? args.depth : 0;
+        if (!taskId || !label)
+            return;
+        this.commitStreamChunk();
+        const glyph = status === 'paused' ? '⏸' : status === 'blocked' ? '⛔' : '⟳';
+        const colorKind = status === 'running' ? 'tool' : 'warn';
+        this.uiTaskRows.set(taskId, { label });
+        const short = label.length > 80 ? label.slice(0, 79) + '…' : label;
+        // v4.8.0 Phase 2.4 — subagent kind: indent by depth inside the
+        // gutter so nested rows tier below their parent.
+        const indent = kindArg === 'subagent' ? '  '.repeat(depth) : '';
+        this.out.write(this.uiTrailRow(`${indent}${glyph} ${short}`, colorKind));
+        this.streamLastEndedNewline = true;
+    }
+    renderUiTaskDone(args) {
+        const taskId = typeof args.task_id === 'string' ? args.task_id : '';
+        const status = typeof args.status === 'string' ? args.status : '';
+        const summary = typeof args.summary === 'string' ? args.summary : '';
+        if (!taskId)
+            return;
+        this.commitStreamChunk();
+        const tracked = this.uiTaskRows.get(taskId);
+        const label = tracked?.label ?? taskId;
+        this.uiTaskRows.delete(taskId);
+        const glyph = status === 'success' ? '✓' : status === 'failure' ? '✗' : '⊘';
+        const kind = status === 'success' ? 'success' :
+            status === 'failure' ? 'error' : 'warn';
+        const shortLabel = label.length > 80 ? label.slice(0, 79) + '…' : label;
+        const shortSum = summary.length > 120 ? summary.slice(0, 119) + '…' : summary;
+        const tail = shortSum ? ` — ${shortSum}` : '';
+        this.out.write(this.uiTrailRow(`${glyph} ${shortLabel}${tail}`, kind));
+        this.streamLastEndedNewline = true;
+    }
+    renderUiCommandResult(args) {
+        const command = typeof args.command === 'string' ? args.command : '';
+        if (!command)
+            return;
+        const stdout = typeof args.stdout === 'string' ? args.stdout : '';
+        const stderr = typeof args.stderr === 'string' ? args.stderr : '';
+        const exitCode = typeof args.exit_code === 'number' ? args.exit_code : 0;
+        this.commitStreamChunk();
+        const ok = exitCode === 0;
+        const cap = (t) => t.split('\n').slice(0, 5).join('\n');
+        let out = this.uiTrailRow(`▸ ${command}`, ok ? 'success' : 'error');
+        if (stdout)
+            out += this.uiTrailRow(cap(stdout), 'muted');
+        if (stderr)
+            out += this.uiTrailRow(cap(stderr), 'error');
+        if (!ok)
+            out += this.uiTrailRow(`(exit ${exitCode})`, 'error');
+        this.out.write(out);
+        this.streamLastEndedNewline = true;
+    }
+    renderUiTestResult(args) {
+        const framework = typeof args.framework === 'string' ? args.framework : '';
+        if (!framework)
+            return;
+        const passed = typeof args.passed === 'number' ? args.passed : 0;
+        const failed = typeof args.failed === 'number' ? args.failed : 0;
+        const skipped = typeof args.skipped === 'number' ? args.skipped : 0;
+        const durationMs = typeof args.duration_ms === 'number' ? args.duration_ms : 0;
+        this.commitStreamChunk();
+        const ok = failed === 0;
+        const parts = [`${passed} passed`, `${failed} failed`];
+        if (skipped > 0)
+            parts.push(`${skipped} skipped`);
+        const dur = durationMs > 0 ? ` in ${durationMs}ms` : '';
+        this.out.write(this.uiTrailRow(`${ok ? '✓' : '✗'} ${framework}: ${parts.join(', ')}${dur}`, ok ? 'success' : 'error'));
+        this.streamLastEndedNewline = true;
+    }
+    renderUiApprovalRequest(_args) {
+        // v4.8.1 Slice 1 — silent no-op. The Phase 2.5 wiring fires both
+        // `ui_approval_request` (this method) AND `callbacks.promptApproval`
+        // (which paints the framed approval panel via `renderApprovalBox`)
+        // for every single approval request. The intent was complementary —
+        // succinct event row above, structured kv panel below — but in live
+        // smoke the two surfaces stack as a visual duplicate ("Approval
+        // needed: file_write {...}" event row + "│ tool / │ reason / │ args"
+        // panel). The panel is the canonical, information-rich surface; this
+        // event-row paint is redundant.
+        //
+        // Behavioural change is renderer-side only: `approvalEngine` still
+        // fires `onUiEvent('ui_approval_request', ...)` so any future
+        // telemetry / daemon-side run_events subscriber will still see the
+        // event. Nothing paints to the chat surface from this method.
+        //
+        // The `_args` parameter is retained for the dispatch signature
+        // contract (`renderUiEvent` calls it positionally) and for the day
+        // we re-introduce a single-paint surface keyed off args.risk_tier.
+    }
+    renderUiToast(args) {
+        const message = typeof args.message === 'string' ? args.message : '';
+        if (!message)
+            return;
+        const kindArg = typeof args.kind === 'string' ? args.kind : 'info';
+        this.commitStreamChunk();
+        const glyph = kindArg === 'success' ? '✓' : kindArg === 'warning' ? '⚠' : kindArg === 'error' ? '✗' : 'ℹ';
+        const kind = kindArg === 'success' ? 'success' : kindArg === 'warning' ? 'warn' : kindArg === 'error' ? 'error' : 'tool';
+        const short = message.length > 120 ? message.slice(0, 119) + '…' : message;
+        this.out.write(this.uiTrailRow(`${glyph} ${short}`, kind));
+        this.streamLastEndedNewline = true;
+    }
+    renderUiArtifactCreated(args) {
+        const path = typeof args.path === 'string' ? args.path : '';
+        if (!path)
+            return;
+        const kindArg = typeof args.kind === 'string' ? args.kind : 'file';
+        const preview = typeof args.preview === 'string' ? args.preview : '';
+        this.commitStreamChunk();
+        const glyph = kindArg === 'skill' ? '🛠' : kindArg === 'directory' ? '📁' : '📄';
+        let out = this.uiTrailRow(`${glyph} Created: ${path}`, 'accent');
+        if (preview) {
+            const shortP = preview.length > 200 ? preview.slice(0, 199) + '…' : preview;
+            out += this.uiTrailRow(`  ${shortP}`, 'muted');
+        }
+        this.out.write(out);
+        this.streamLastEndedNewline = true;
+    }
 }
 exports.Display = Display;
 /**