@pugi/cli 0.1.0-alpha.9 → 0.1.0-beta.1

package/dist/tui/repl-render.js

@@ -19,8 +19,12 @@
 import React from 'react';
 import { render } from 'ink';
 import { Repl } from './repl.js';
+import { printPugMascotPreInk } from './repl-splash-mascot.js';
 import { ReplSession, } from '../core/repl/session.js';
 import { resolveWorkspaceContext } from '../core/repl/workspace-context.js';
+import { SqliteSessionStore } from '../core/repl/store/index.js';
+import { slugForCwd } from '../core/repl/history.js';
+import { WorkingSet, buildRepoSkeleton, loadPugiIgnore, PugiWatcher, } from '../core/context/index.js';
 /**
  * Mount the REPL and resolve when the user exits via Ctrl+C × 2 or
  * `/quit`. The session is closed (server-side stays alive; resume via
@@ -33,6 +37,26 @@ export async function renderRepl(options) {
     // best-effort — any FS error falls back to a basename-only summary,
     // never blocks REPL launch. Wave 4 fix 2026-05-25.
     const workspace = options.workspace ?? resolveWorkspaceContext(process.cwd());
+    // α6.4: open the local SessionStore for `/resume` persistence. The
+    // store lives under `~/.pugi/projects/<slug>/`; failure is fail-safe
+    // — we log a one-line warning to stderr and continue with the REPL
+    // in memory-only mode. Lock-busy errors get the friendliest message
+    // so an operator running two REPLs in the same project understands
+    // the constraint.
+    const projectSlug = slugForCwd(process.cwd());
+    const { store, openedSessionId } = await openLocalStore({
+        projectSlug,
+        workspaceRoot: process.cwd(),
+        resumeLocalSessionId: options.resumeLocalSessionId,
+    });
+    // α6.5 three-tier context bootstrap. The skeleton + working set
+    // + watcher are local-first and best-effort: every step is wrapped
+    // in try/catch so an unreadable workspace never blocks REPL launch.
+    // Opt-out via PUGI_DISABLE_CONTEXT=1 for hermetic test runs.
+    const { skeleton, workingSet, watcher } = await bootstrapContext({
+        cwd: process.cwd(),
+        env: process.env,
+    });
     const session = new ReplSession({
         apiUrl: options.apiUrl,
         apiKey: options.apiKey,
@@ -40,21 +64,154 @@ export async function renderRepl(options) {
         cliVersion: options.cliVersion,
         transport,
         workspace,
+        store,
+        localSessionId: openedSessionId,
+        repoSkeleton: skeleton,
+        workingSet,
+        watcher,
     });
+    // Restore the transcript from the JSONL log if we resumed an
+    // existing session. The restore is idempotent and bypasses persist
+    // (no double-write of replayed rows).
+    if (store && openedSessionId && options.resumeLocalSessionId) {
+        try {
+            const events = await store.loadEvents(openedSessionId, { limit: 500 });
+            session.restoreTranscript(events);
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            process.stderr.write(`[pugi] Could not restore session ${openedSessionId.slice(0, 13)}: ${msg}\n`);
+        }
+    }
     // Kick off the connect; the Repl renders the connecting state until
     // the session pushes `connection: 'on_watch'` from the SSE onOpen.
     void session.start();
+    // α6.14.2 wave 5: paint the chafa-baked brand-pug ANSI render to
+    // stdout BEFORE Ink mounts. Ink's layout engine would mis-measure
+    // the truecolor escape sequences, so the pug must land verbatim.
+    // The flag is passed into <Repl /> so the splash component knows to
+    // skip its own hand-crafted PUG_MASCOT column — otherwise the
+    // operator sees both the chafa pug AND the ASCII fallback stacked.
+    // When skipSplash is true (operator opted out via --no-splash), we
+    // suppress the pre-print too so the boot stays silent.
+    const mascotPrePrinted = options.skipSplash === true ? false : printPugMascotPreInk(process.stdout);
     const instance = render(React.createElement(Repl, {
         session,
         updateBanner: options.updateBanner ?? null,
         skipSplash: options.skipSplash === true,
+        hideToolStream: options.hideToolStream === true,
+        mascotPrePrinted,
     }));
     try {
         await instance.waitUntilExit();
     }
     finally {
         session.close();
+        if (store) {
+            try {
+                await store.close();
+            }
+            catch {
+                /* idempotent — already closed */
+            }
+        }
+        if (watcher) {
+            try {
+                await watcher.close();
+            }
+            catch {
+                /* idempotent — chokidar may already be torn down */
+            }
+        }
+    }
+}
+/**
+ * Open the local SessionStore for the REPL bootstrap. Returns
+ * `{ store: null, openedSessionId: undefined }` on any error so the
+ * caller falls through to memory-only mode rather than failing the
+ * launch. The one error we surface verbatim is the lock-busy case —
+ * that one is operator-actionable.
+ */
+async function openLocalStore(input) {
+    // Honour an explicit opt-out for offline-strict environments / CI.
+    // PUGI_DISABLE_SESSION_STORE=1 wipes the integration to zero. Useful
+    // for hermetic test runs and for operators who do not want any
+    // persistence under $HOME.
+    if (process.env.PUGI_DISABLE_SESSION_STORE === '1') {
+        return { store: null, openedSessionId: undefined };
+    }
+    try {
+        const store = new SqliteSessionStore({ projectSlug: input.projectSlug });
+        const row = await store.open({
+            id: input.resumeLocalSessionId,
+            workspaceRoot: input.workspaceRoot,
+            projectSlug: input.projectSlug,
+        });
+        return { store, openedSessionId: row.id };
+    }
+    catch (error) {
+        const code = error?.code;
+        const msg = error instanceof Error ? error.message : String(error);
+        if (code === 'EBUSY_SESSION_LOCK') {
+            process.stderr.write(`[pugi] ${msg} Continuing without local session persistence.\n`);
+        }
+        else {
+            process.stderr.write(`[pugi] Local session store unavailable (${msg}). Continuing in memory-only mode.\n`);
+        }
+        return { store: null, openedSessionId: undefined };
+    }
+}
+/**
+ * Bootstrap the α6.5 three-tier context primitives:
+ *
+ *   - Tier 0: `RepoSkeleton` (~5KB ASCII tree + meta) for prompt injection.
+ *   - Tier 1: `WorkingSet` LRU bounded at 50 entries.
+ *   - Filewatch: chokidar started against cwd, ignore-filtered.
+ *
+ * The bootstrap is fail-safe: every primitive is wrapped so the REPL
+ * still launches when (e.g.) chokidar refuses to start on a
+ * permission-blocked dir. The PUGI_DISABLE_CONTEXT=1 env var skips
+ * the bootstrap entirely for hermetic test runs and for operators
+ * who want a zero-touch REPL.
+ */
+async function bootstrapContext(input) {
+    if (input.env.PUGI_DISABLE_CONTEXT === '1') {
+        return { skeleton: null, workingSet: null, watcher: null };
+    }
+    let ignore;
+    try {
+        ignore = loadPugiIgnore(input.cwd);
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        process.stderr.write(`[pugi] Three-tier context bootstrap skipped (ignore matcher failed: ${msg}).\n`);
+        return { skeleton: null, workingSet: null, watcher: null };
+    }
+    let skeleton = null;
+    try {
+        skeleton = buildRepoSkeleton(input.cwd, { ignore });
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        process.stderr.write(`[pugi] Repo skeleton bootstrap failed (${msg}). Continuing without Tier 0.\n`);
+    }
+    const workingSet = new WorkingSet();
+    let watcher = null;
+    // chokidar opt-out: PUGI_DISABLE_FILEWATCH=1 keeps Tier 0/1 wired
+    // but skips the live-update channel. Useful on CI runners and on
+    // network mounts where fsevents misbehaves.
+    if (input.env.PUGI_DISABLE_FILEWATCH !== '1') {
+        try {
+            const w = new PugiWatcher({ cwd: input.cwd, ignore });
+            await w.start();
+            watcher = w;
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            process.stderr.write(`[pugi] Filewatch bootstrap failed (${msg}). Continuing without live updates.\n`);
+        }
     }
+    return { skeleton, workingSet, watcher };
 }
 /* ------------------------------------------------------------------ */
 /* Production transport                                               */

package/dist/tui/repl-splash-mascot.js

@@ -0,0 +1,130 @@
+/**
+ * Chafa-validated brand-pug ANSI loader (α6.14.4 wave 6, mascot regen).
+ *
+ * CEO dogfood 2026-05-25 (first pass, α6.14.2 wave 5): the hand-crafted
+ * 9-row ASCII pug in `repl-splash-art.ts` reads as "точно не похожа" —
+ * too abstract to carry the brand at boot. This module loads a pre-baked
+ * truecolor ANSI render of the canonical hero-pug PNG (cyber-zoo pug
+ * face with cyan eyes + circuit + chip) so the splash matches the brand
+ * glyph the operator already sees on pugi.io.
+ *
+ * CEO dogfood 2026-05-25 (α6.14.4): the first chafa bake at 32x16 still
+ * read as "monitor on stand", not pug — too few rows to resolve the
+ * snout / eyes / wrinkles. The vertical resolution was the bottleneck:
+ * 16 char rows ≈ 16 pixel rows with the block symbol set. The fresh
+ * bake uses `vhalf` (vertical half blocks ▀ / ▄ with independent fg+bg
+ * colours per cell) which doubles the vertical resolution per character
+ * cell, at an 80x40 frame which is 2.5× the prior dimensions. End
+ * result: ~80×80 effective pixel resolution — enough to read the
+ * snout, eye sockets, ear lines, and the circuit board accent the
+ * brand glyph carries. File grew from 8.8KB to ~40KB; ship budget
+ * gates at 100KB so we stay well under cap.
+ *
+ * Generation (operator-side, one-shot):
+ *   chafa --size 80x40 --symbols=vhalf --colors=full \
+ *     apps/clawhost-web/public/brand/hero-pug.png \
+ *     > apps/pugi-cli/assets/pugi-mascot.ansi
+ *
+ * The output is committed verbatim to the repo and shipped inside the
+ * `@pugi/cli` npm tarball under `assets/pugi-mascot.ansi` (the
+ * `package.json` `files` allowlist explicitly opts in). Runtime does
+ * NOT need `chafa` installed — we just read the file bytes and write
+ * them to stdout. If the file is missing (degraded install, tarball
+ * corruption, dev cwd drift), the splash falls back to the hand-crafted
+ * `PUG_MASCOT` art so the boot never crashes.
+ *
+ * The pre-Ink write convention mirrors the Claude Code Chrome plugin
+ * splash pattern: raw bytes go to `process.stdout` BEFORE the Ink
+ * render mount, so the terminal interprets the truecolor escapes
+ * directly instead of Ink trying to layout-engine over them.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, resolve as resolvePath } from 'node:path';
+import { fileURLToPath } from 'node:url';
+/**
+ * Resolve the on-disk path to `pugi-mascot.ansi` relative to the
+ * compiled module. The CLI ships to `node_modules/@pugi/cli/dist/tui/`
+ * so the asset lives at `node_modules/@pugi/cli/assets/pugi-mascot.ansi`
+ * — two directory hops up from this file. In a local `pnpm dev`
+ * checkout the structure is the same (`src/tui/` ⇒ `../../assets/`)
+ * because tsx re-resolves the same relative tree.
+ */
+export function pugMascotAssetPath() {
+    const here = dirname(fileURLToPath(import.meta.url));
+    return resolvePath(here, '..', '..', 'assets', 'pugi-mascot.ansi');
+}
+/**
+ * Read the chafa-baked ANSI render of the brand pug. Returns the raw
+ * bytes verbatim (UTF-8 string) — the terminal interprets the truecolor
+ * escapes directly. Returns null when the file is missing, unreadable,
+ * or trivially empty so the caller can fall back to `PUG_MASCOT`.
+ *
+ * `chafa --colors=full` wraps the render with cursor-hide (`\e[?25l`)
+ * on the head and cursor-show (`\e[?25h`) on the tail. We strip those
+ * so the splash does not accidentally hide the cursor across the rest
+ * of the REPL boot (Ink itself manages the cursor once it mounts).
+ *
+ * The asset is supply-chain controlled (committed in-repo, shipped in
+ * the npm tarball) so an arbitrary attacker cannot inject escapes
+ * today. The defence-in-depth strip below still drops categories of
+ * escapes that the splash has no legitimate need to emit — OSC window
+ * title sets, mouse-tracking enables, screen clears, cursor-position
+ * reports — so a future swap of the asset (or a corrupt tarball) cannot
+ * disrupt the terminal beyond the splash region. Truecolor (`CSI 38;2;
+ * R;G;B m`), reset (`CSI 0 m`), and explicit forms of cursor / line
+ * motion the render needs are left in.
+ */
+export function loadPugMascotAnsi() {
+    const path = pugMascotAssetPath();
+    try {
+        if (!existsSync(path))
+            return null;
+        const raw = readFileSync(path, 'utf8');
+        if (!raw || raw.length === 0)
+            return null;
+        // 1. Drop OSC sequences. Two terminator forms:
+        //      ESC ] ... BEL          (0x1b 0x5d ... 0x07)
+        //      ESC ] ... ESC \        (0x1b 0x5d ... 0x1b 0x5c, the ST form)
+        //    A truecolor splash never needs OSC (those are for window title,
+        //    icon, clipboard, hyperlinks, color-palette change). Drop them
+        //    so a corrupted asset cannot rename the operator's terminal tab
+        //    or smuggle a hyperlink into the splash region.
+        // 2. Drop CSI ? <mode> [hl] for mouse-tracking and screen-buffer
+        //    switch modes (1000, 1001, 1002, 1003, 1004, 1005, 1006, 1015,
+        //    1049, 47, 1047, 1048). These would either start swallowing
+        //    mouse input or flip the terminal into the alternate screen.
+        // 3. Drop CSI 6 n (cursor-position report). Would inject a fake
+        //    CPR into the operator's stdin stream.
+        // 4. Drop CSI [23]J / CSI [23]K (full screen / line clear). A
+        //    chafa render uses cursor-positioning per row, not bulk
+        //    erases; bulk clears would wipe whatever the operator already
+        //    had on screen above the splash.
+        // The cursor-hide/show wrappers (CSI ? 25 [lh]) are handled by
+        // the same CSI-?-mode pattern as the mouse / alt-screen modes.
+        const stripped = raw
+            .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '')
+            .replace(/\x1b\[\?(?:25|47|1000|1001|1002|1003|1004|1005|1006|1015|1047|1048|1049)[lh]/g, '')
+            .replace(/\x1b\[6n/g, '')
+            .replace(/\x1b\[[23]?[JK]/g, '');
+        if (stripped.trim().length === 0)
+            return null;
+        return stripped;
+    }
+    catch {
+        // Best-effort: any FS / decode error returns null so the splash
+        // falls back to the hand-crafted ASCII art. Never throws.
+        return null;
+    }
+}
+export function printPugMascotPreInk(sink) {
+    const ansi = loadPugMascotAnsi();
+    if (ansi === null)
+        return false;
+    // Trailing newline so the Ink header lands on a fresh row rather
+    // than smashing into the last pug row.
+    sink.write(ansi);
+    if (!ansi.endsWith('\n'))
+        sink.write('\n');
+    return true;
+}
+//# sourceMappingURL=repl-splash-mascot.js.map

package/dist/tui/repl-splash.js

@@ -61,7 +61,13 @@ export function ReplSplash(props) {
     if (props.skipSplash) {
         return null;
     }
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(MascotColumn, {}), _jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Pugi" }), _jsx(Text, { bold: true, color: "cyan", children: ".io" }), _jsx(Text, { dimColor: true, children: `  v${props.cliVersion}` })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(HeaderRow, { label: "Plan", value: props.plan ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Model", value: props.model ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Tenant", value: props.tenant ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Workspace", value: props.workspaceLabel })] })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: '─'.repeat(40) }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "Tips for getting started:" }), _jsx(TipRow, { index: 1, text: "Type a brief, the workforce dispatches" }), _jsx(TipRow, { index: 2, text: "/help for slash commands, /web <url> to pull a page" }), _jsx(TipRow, { index: 3, text: "/skills install <name> for Anthropic / OpenClaw skills" })] })] }));
+    // α6.14.2 wave 5: when the host pre-printed the chafa-baked brand-pug
+    // ANSI render to stdout before Ink mounted, suppress the hand-crafted
+    // PUG_MASCOT column here so the operator does not see two stacked
+    // pugs. The header card still renders inline so wordmark + status
+    // rows stay attached to the splash flow.
+    const showHandCraftedMascot = props.mascotPrePrinted !== true;
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { flexDirection: "row", children: [showHandCraftedMascot ? _jsx(MascotColumn, {}) : null, _jsxs(Box, { flexDirection: "column", marginLeft: showHandCraftedMascot ? 2 : 0, marginTop: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Pugi" }), _jsx(Text, { bold: true, color: "cyan", children: ".io" }), _jsx(Text, { dimColor: true, children: `  v${props.cliVersion}` })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(HeaderRow, { label: "Plan", value: props.plan ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Model", value: props.model ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Tenant", value: props.tenant ?? PLACEHOLDER }), _jsx(HeaderRow, { label: "Workspace", value: props.workspaceLabel })] })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: '─'.repeat(40) }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "Tips for getting started:" }), _jsx(TipRow, { index: 1, text: "Type a brief, the workforce dispatches" }), _jsx(TipRow, { index: 2, text: "/help for slash commands, /web <url> to pull a page" }), _jsx(TipRow, { index: 3, text: "/skills install <name> for Anthropic / OpenClaw skills" })] })] }));
 }
 /**
  * Renders the multi-line ASCII pug. Each row is split into colored

package/dist/tui/repl.js

@@ -20,22 +20,32 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import { PUGI_TAGLINE, THE_TEN } from '@pugi/personas';
-import { AgentTree } from './agent-tree.js';
+import { AgentTreePane } from './agent-tree-pane.js';
+import { AskModal, PlanReviewModal } from './ask-modal.js';
 import { ConversationPane } from './conversation-pane.js';
 import { InputBox } from './input-box.js';
 import { ReplSplash } from './repl-splash.js';
 import { StatusBar } from './status-bar.js';
+import { ToolStreamPane } from './tool-stream-pane.js';
 import { UpdateBanner } from './update-banner.js';
 import { collectWorkspaceContext } from './workspace-context.js';
 import { slugForCwd } from '../core/repl/history.js';
 import { SLASH_COMMAND_HELP, SLASH_COMMAND_GROUPS } from '../core/repl/slash-commands.js';
 const TICK_INTERVAL_MS = 200;
 const PULSE_INTERVAL_MS = 700;
+// α6.12: maximum transcript rows the conversation pane renders at once.
+// Older rows scroll off the top; full history stays in session state.
+const CONVERSATION_WINDOW = 12;
 export function Repl(props) {
     const [state, setState] = useState(props.session.getState());
     const [overlay, setOverlay] = useState('none');
     const [pulsePhase, setPulsePhase] = useState(0);
     const [tickNow, setTickNow] = useState((props.now ?? Date.now)());
+    // α6.12: operator-driven collapse for the tool stream pane. The CLI
+    // host can hide the pane entirely via `--no-tool-stream`; this state
+    // is the runtime toggle (Ctrl+T) for operators who want the pane on
+    // screen but folded to a single row while they read a long reply.
+    const [toolStreamCollapsed, setToolStreamCollapsed] = useState(false);
     // α6.14 wave 3: boot splash visible until first input, first
     // `agent.spawned` event, or 10s idle. The host gates the initial
     // visibility on `--no-splash` / PUGI_SKIP_SPLASH via `skipSplash`.
@@ -122,22 +132,78 @@ export function Repl(props) {
             setOverlay('none');
         }
     }, { isActive: overlay === 'help' || overlay === 'roster' });
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [props.updateBanner ? _jsx(UpdateBanner, { result: props.updateBanner }) : null, splashVisible ? (_jsx(ReplSplash, { cliVersion: state.cliVersion, workspaceLabel: state.workspaceLabel, plan: props.splashPlan, model: props.splashModel, tenant: props.splashTenant, onDismiss: dismissSplash })) : null, _jsx(Header, { state: state }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: overlay === 'help' ? (_jsx(HelpOverlay, {})) : overlay === 'roster' ? (_jsx(RosterOverlay, {})) : overlay === 'farewell' ? (_jsx(FarewellOverlay, {})) : (_jsx(MainArea, { state: state, personaNames: personaNames, nowEpochMs: tickNow })) }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [overlay === 'farewell' ? null : (_jsx(InputBox, { onSubmit: handleSubmit, onExit: handleExit, now: props.now, 
+    // α6.12: Ctrl+T toggles the tool stream pane between expanded and
+    // collapsed states. Active only while no overlay is open, so the
+    // toggle never fights the help/roster dismiss handler. The input box
+    // owns its own raw-input mode, so this listener only fires on the
+    // global Ctrl+T binding rather than every printable keystroke.
+    useInput((input, key) => {
+        if (key.ctrl && input === 't') {
+            setToolStreamCollapsed((prev) => !prev);
+        }
+    }, { isActive: overlay === 'none' && props.hideToolStream !== true });
+    // α6.3 office-hours: a pending ask or plan-review modal pauses input
+    // until the operator resolves it. The modal owns its own useInput
+    // hook, so the InputBox unmounts while a modal is open to avoid two
+    // raw-input listeners competing for the same keystroke. Resolution
+    // forwards through ReplSession.resolveAsk / resolvePlanReview.
+    const askPending = state.pendingAsk !== null;
+    const planPending = state.pendingPlanReview !== null;
+    const modalActive = askPending || planPending;
+    const handleAskResolve = useCallback((verdict) => {
+        void props.session.resolveAsk(verdict);
+    }, [props.session]);
+    const handlePlanReviewResolve = useCallback((result) => {
+        void props.session.resolvePlanReview(result);
+    }, [props.session]);
+    // α6.9: Ctrl+C abort handler. Forwards to ReplSession.cancel() which
+    // aborts the in-flight dispatch, closes the SSE stream, and surfaces
+    // "Aborted." in the transcript.
+    //
+    // Return contract (consumed by InputBox):
+    //   - true        - dispatch was cancelled (keep the buffer + DO arm
+    //                   the press-again-to-exit timer; second Ctrl+C in
+    //                   the window exits).
+    //   - false       - idle / nothing to cancel (legacy: clear buffer +
+    //                   arm the exit timer so the operator sees the hint
+    //                   and can confirm exit on the next press).
+    //   - undefined   - bypassed entirely (e.g. a modal owns the input).
+    //                   InputBox MUST NOT arm the exit timer and MUST
+    //                   NOT clear the buffer. P2 fix: previously this
+    //                   returned `false` and the buffer-clear path wiped
+    //                   the operator's mid-typed modal text on the first
+    //                   Ctrl+C, costing a press of work.
+    const handleCancel = useCallback(() => {
+        if (modalActive)
+            return undefined;
+        return props.session.cancel();
+    }, [props.session, modalActive]);
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [props.updateBanner ? _jsx(UpdateBanner, { result: props.updateBanner }) : null, splashVisible ? (_jsx(ReplSplash, { cliVersion: state.cliVersion, workspaceLabel: state.workspaceLabel, plan: props.splashPlan, model: props.splashModel, tenant: props.splashTenant, onDismiss: dismissSplash, mascotPrePrinted: props.mascotPrePrinted === true })) : null, _jsx(Header, { state: state }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: overlay === 'help' ? (_jsx(HelpOverlay, {})) : overlay === 'roster' ? (_jsx(RosterOverlay, {})) : overlay === 'farewell' ? (_jsx(FarewellOverlay, {})) : (_jsx(MainArea, { state: state, personaNames: personaNames, nowEpochMs: tickNow, hideToolStream: props.hideToolStream === true, toolStreamCollapsed: toolStreamCollapsed })) }), state.pendingAsk ? (_jsx(Box, { marginTop: 1, children: _jsx(AskModal, { tag: state.pendingAsk, onResolve: handleAskResolve }) })) : null, state.pendingPlanReview ? (_jsx(Box, { marginTop: 1, children: _jsx(PlanReviewModal, { tag: state.pendingPlanReview, onResolve: handlePlanReviewResolve }) })) : null, _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [overlay === 'farewell' || modalActive ? null : (_jsx(InputBox, { onSubmit: handleSubmit, onExit: handleExit, onCancel: handleCancel, now: props.now, 
                         // Slug from process.cwd() (full path) so two workspaces with
                         // the same basename do not share history. state.workspaceLabel
                         // is the basename only. Codex review P2.
-                        workspaceSlug: slugForCwd(process.cwd()) })), _jsx(StatusBar, { connection: state.connection, activeAgentCount: countActive(state), tokensDownstreamTotal: state.tokensDownstreamTotal, briefStartedAtEpochMs: state.briefStartedAtEpochMs, nowEpochMs: tickNow, pulsePhase: pulsePhase, pugiMdCount: workspaceContext.pugiMdCount, mcpServerCount: workspaceContext.mcpServerCount, skillCount: workspaceContext.skillCount, quotaPct: props.quotaPct })] })] }));
+                        workspaceSlug: slugForCwd(process.cwd()) })), _jsx(StatusBar, { connection: state.connection, activeAgentCount: countActive(state), tokensDownstreamTotal: state.tokensDownstreamTotal, briefStartedAtEpochMs: state.briefStartedAtEpochMs, nowEpochMs: tickNow, pulsePhase: pulsePhase, pugiMdCount: workspaceContext.pugiMdCount, mcpServerCount: workspaceContext.mcpServerCount, skillCount: workspaceContext.skillCount, quotaPct: props.quotaPct, dispatchState: state.dispatchState, dispatchToolLabel: state.dispatchToolLabel })] })] }));
 }
 function Header({ state }) {
     return (_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Pugi" }), _jsx(Text, { bold: true, color: "cyan", children: ".io" }), _jsx(Text, { dimColor: true, children: `  ·  workspace: ${state.workspaceLabel}  ·  v${state.cliVersion}  ·  ` }), _jsx(Text, { color: "cyan", children: state.connection === 'on_watch' ? 'on watch' : state.connection.replace('_', ' ') })] }));
 }
-function MainArea({ state, personaNames, nowEpochMs, }) {
-    // Show the last 12 transcript rows in the conversation slot so the
-    // bottom of the frame stays anchored to the input box. The agent
-    // tree drops below the transcript; new agents push the operator
-    // line up the screen, mirroring Claude Code / Codex CLI.
-    const conversationSlice = state.transcript.slice(-12);
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(ConversationPane, { rows: conversationSlice, personaNames: personaNames }), _jsx(Box, { marginTop: 1, children: _jsx(AgentTree, { agents: state.agents, nowEpochMs: nowEpochMs }) })] }));
+function MainArea({ state, personaNames, nowEpochMs, hideToolStream, toolStreamCollapsed, }) {
+    // α6.12: three vertical panes stacked above the input box.
+    //
+    //   1. Conversation pane (top)  - transcript with Markdown render.
+    //   2. Tool stream pane (mid)   - live Read/Edit/Bash/Grep lines.
+    //                                  Hidden when `--no-tool-stream` is
+    //                                  set; collapsed via Ctrl+T while
+    //                                  the pane is visible.
+    //   3. Agent tree pane (bottom) - Cyber-Zoo roster with persona /
+    //                                  status / duration / token counts.
+    //
+    // The window over the transcript is small (last 12 rows) so the
+    // bottom of the frame stays anchored to the input box. New agents
+    // push the operator line up the screen, mirroring Claude Code /
+    // Codex CLI / Gemini CLI rendering.
+    const conversationSlice = state.transcript.slice(-CONVERSATION_WINDOW);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(ConversationPane, { rows: conversationSlice, personaNames: personaNames }), hideToolStream ? null : (_jsx(Box, { marginTop: 1, children: _jsx(ToolStreamPane, { calls: state.toolCalls, collapsed: toolStreamCollapsed }) })), _jsx(Box, { marginTop: 1, children: _jsx(AgentTreePane, { agents: state.agents, nowEpochMs: nowEpochMs }) })] }));
 }
 function HelpOverlay() {
     // Group commands by their `group` field so the operator scans the
@@ -187,12 +253,17 @@ function applyVerdictSideEffects(verdict, handlers) {
         case 'clear':
         case 'version':
         case 'jobs':
+        case 'ask':
+        case 'consensus':
         case 'diff':
         case 'cost':
         case 'status':
+        case 'resume':
         case 'stub':
             // All non-overlay verdicts: the session module already appended
-            // any operator-visible system lines. No further UI side effect.
+            // any operator-visible system lines (and, for `ask`, set
+            // pendingAsk so the modal renders on the next frame). No further
+            // UI side effect needed here.
             return;
     }
 }

package/dist/tui/status-bar.js

@@ -12,7 +12,12 @@ export function StatusBar(props) {
     const tokenLabel = formatTokens(props.tokensDownstreamTotal);
     const phase = clampPhase(props.pulsePhase);
     const glyph = PULSE_DOTS[Math.min(phase, PULSE_DOTS.length - 1)] ?? PULSE_DOTS[0];
-    const status = connectionLabel(props.connection);
+    // α6.9: composite status label — connection problems trump dispatch
+    // state because the operator needs to know about a dropped admin-api
+    // first. When the connection is healthy (`on_watch` / `connecting`),
+    // the FSM dispatch state takes over to show the dispatch lifecycle
+    // (`dispatching` / `tool: read` / `aborting` / etc.).
+    const status = composeStatusLabel(props.connection, props.dispatchState, props.dispatchToolLabel);
     return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: status.color, children: `${glyph ?? '●'} ${status.label}` }), _jsx(Text, { dimColor: true, children: `  ·  ${props.activeAgentCount} agents  ·  ` }), _jsx(Text, { children: `↓ ${tokenLabel} tokens` }), _jsx(Text, { dimColor: true, children: `  ·  ${elapsedLabel}` })] }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `${formatCount(props.pugiMdCount)} PUGI.md  ·  ${formatCount(props.mcpServerCount)} MCP  ·  ${formatCount(props.skillCount)} skills  ·  ${formatQuota(props.quotaPct)} quota` }) })] }));
 }
 /**
@@ -28,10 +33,17 @@ function formatQuota(pct) {
         return '—';
     return `${Math.round(pct)}%`;
 }
-function connectionLabel(connection) {
+// Exported for test introspection (status-bar-fsm.spec.tsx asserts
+// connecting vs on_watch render in distinct colors; ink-testing-library
+// strips ANSI from lastFrame() so we read the resolved color directly).
+export function connectionLabel(connection) {
     switch (connection) {
         case 'connecting':
-            return { label: 'connecting', color: 'cyan' };
+            // P2 fix: was 'cyan', same as 'on_watch' - operator could not
+            // tell boot from stable. Magenta is distinct from every other
+            // state in this palette (cyan steady, yellow reconnect, gray
+            // offline) so a brief flicker through this state stands out.
+            return { label: 'connecting', color: 'magenta' };
         case 'on_watch':
             return { label: 'on watch', color: 'cyan' };
         case 'reconnecting':
@@ -40,6 +52,54 @@ function connectionLabel(connection) {
             return { label: 'offline', color: 'gray' };
     }
 }
+/**
+ * α6.9: compose the visible status label from connection + FSM state.
+ *
+ * Priority order:
+ *
+ *   1. `offline` / `reconnecting` — transport health wins; the
+ *      operator needs to know about a dropped stream before anything
+ *      about the dispatch.
+ *   2. `aborting` / `aborted` / `failed` — operator-visible terminal
+ *      states the FSM reached; the colour shifts to amber/red so the
+ *      anomaly stands out vs the calm cyan baseline.
+ *   3. `tool_running` — surfaces the tool label when available
+ *      (`tool: read`), falls back to `tool` when not.
+ *   4. `awaiting_response` — `dispatching` (matches Codex CLI's verb
+ *      for the same state).
+ *   5. `completed` — `shipped` (matches the agent tree status glyph
+ *      so the operator's eye links the two surfaces).
+ *   6. `idle` / unknown — connection label (`on watch` / `connecting`).
+ *
+ * The dispatch label `dispatchToolLabel` is already shaped as
+ * `tool: <kind>` upstream so we just concatenate; null falls through
+ * to the bare `tool` placeholder.
+ */
+function composeStatusLabel(connection, dispatchState, toolLabel) {
+    // Transport health wins.
+    if (connection === 'offline' || connection === 'reconnecting') {
+        return connectionLabel(connection);
+    }
+    // FSM dispatch state overlay (only when the FSM was wired).
+    switch (dispatchState) {
+        case 'aborting':
+            return { label: 'aborting', color: 'yellow' };
+        case 'aborted':
+            return { label: 'aborted', color: 'gray' };
+        case 'failed':
+            return { label: 'failed', color: 'red' };
+        case 'tool_running':
+            return { label: toolLabel ?? 'tool', color: 'cyan' };
+        case 'awaiting_response':
+            return { label: 'dispatching', color: 'cyan' };
+        case 'completed':
+            return { label: 'shipped', color: 'green' };
+        case 'idle':
+        case undefined:
+        default:
+            return connectionLabel(connection);
+    }
+}
 function formatElapsed(startedAt, now) {
     if (typeof startedAt !== 'number')
         return 'idle';