@aragon-agent/cli 0.6.7 → 0.6.9

package/dist/ui/BottomStatusRow.d.ts

@@ -54,9 +54,7 @@
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { Toast } from '../agent/reducer.js';
-import type { RenderMode } from './layout/frame.js';
 export interface BottomStatusRowProps {
-    mode: RenderMode;
     toasts: Toast[];
     /** `<ActivityLine>` while a run owns the screen, else `null`. */
     activity: React.ReactNode;
@@ -94,4 +92,4 @@ export interface BottomStatusRowProps {
     update?: React.ReactNode;
     theme: Theme;
 }
-export declare function BottomStatusRow({ mode, toasts, activity, activityGlyph, update, theme, }: BottomStatusRowProps): React.ReactElement | null;
+export declare function BottomStatusRow({ toasts, activity, activityGlyph, update, theme, }: BottomStatusRowProps): React.ReactElement | null;

package/dist/ui/BottomStatusRow.js

@@ -1,15 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 import { ToastStack } from './ToastStack.js';
-export function BottomStatusRow({ mode, toasts, activity, activityGlyph, update, theme, }) {
+export function BottomStatusRow({ toasts, activity, activityGlyph, update, theme, }) {
     // A toast wins the row outright — but a run in flight keeps its spinner on it.
     if (toasts.length > 0) {
         const spinner = activity ? activityGlyph : null;
         // Byte-identical to the old branch whenever there is no live spinner to
         // carry: no run, an ASCII terminal, or `reducedMotion`.
         if (!spinner)
-            return _jsx(ToastStack, { toasts: toasts, theme: theme, mode: mode });
-        const fullscreen = mode === 'fullscreen';
+            return _jsx(ToastStack, { toasts: toasts, theme: theme });
         return (
         // `flexDirection` SPELLED OUT even though `row` is Yoga's default: it is
         // what keeps two children on ONE row, and the header above turns on that
@@ -17,15 +16,12 @@ export function BottomStatusRow({ mode, toasts, activity, activityGlyph, update,
         // below that declares `column` — and "make them match" is a one-word edit
         // that doubles the row, takes it from the transcript, and desynchronises
         // every `viewportRows()` consumer without failing a type or a lint.
-        _jsxs(Box, { flexDirection: "row", flexShrink: 0, children: [_jsx(Box, { flexShrink: 0, marginTop: fullscreen ? 0 : 1, children: _jsxs(Text, { color: theme.thinking, children: [fullscreen ? ' ' : '', spinner, fullscreen ? '' : ' '] }) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(ToastStack, { toasts: toasts, theme: theme, mode: mode }) })] }));
+        _jsxs(Box, { flexDirection: "row", flexShrink: 0, children: [_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { color: theme.thinking, children: [' ', spinner] }) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(ToastStack, { toasts: toasts, theme: theme }) })] }));
     }
-    // Inline has no frame and therefore nothing to protect: `ToastStack`'s inline
-    // branch is already a conditional 0-3 row stack, and these are simply one more
-    // conditional row above it.
     if (activity)
         return _jsx(Box, { flexShrink: 0, children: activity });
     if (update)
         return _jsx(Box, { flexShrink: 0, children: update });
     // The blank full-screen row that IS the budget must keep being emitted.
-    return _jsx(ToastStack, { toasts: toasts, theme: theme, mode: mode });
+    return _jsx(ToastStack, { toasts: toasts, theme: theme });
 }

package/dist/ui/Composer.d.ts

@@ -9,20 +9,42 @@
  * "the input is no longer empty", and routing that through App would re-render
  * the transcript on the first keystroke of every message.
  *
- * As of v0.4.0 this is the ONLY place keybinding hints are shown — the status
- * bar's duplicate cluster is gone (§4.6). Two hints for the same keys, one of
- * them 31 columns wide, were both redundant and the reason the status bar had a
- * `cols >= 110` breakpoint.
+ * The fixed status row retains emergency and history-navigation hints while
+ * this footer scrolls outside the viewport. Editor state stays mounted.
  */
 import React from 'react';
+import { type DOMElement } from 'ink';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
 import { pickGlyphs } from './glyphs.js';
 import { type CommandOption } from './PromptInput.js';
+import { type RunActivity } from './run-status-row.js';
 import { type AgentMode } from '../agent/agent-mode.js';
+/**
+ * The run status row (tui-scrollbar-edge-and-run-row §3.3): the spinner, the phrase
+ * and the `steer / interrupt / exit` clauses on ONE row above the input box.
+ * `App` passes it only while a run is in flight AND the idle hint row would have
+ * been shown, so enabling it never changes the footer's height.
+ */
+export interface RunRowProps {
+    activity: RunActivity;
+    /** The row is in the viewport with no overlay: draw the animated spinner. */
+    live: boolean;
+    /** Measured by `ScrollViewport` to learn whether the row has scrolled away. */
+    rowRef?: React.RefObject<DOMElement>;
+}
 export interface ComposerProps {
+    /** Present only while the run status row replaces the hint row below the input. */
+    runRow?: RunRowProps | null;
+    cols?: number;
+    cursorVisible?: boolean;
+    onInteraction?: () => void;
+    measureRef?: React.RefObject<DOMElement>;
     /** False while an overlay owns the keyboard (the input is visually blurred). */
     isActive: boolean;
+    reducedMotion?: boolean;
+    onEscape?: () => void;
+    onEscapeDismiss?: () => void;
     running: boolean;
     history: string[];
     commands: CommandOption[];
@@ -90,6 +112,17 @@ export interface ComposerProps {
     onSubmit: (text: string) => void;
     onHelp?: () => void;
 }
+/**
+ * The running-state hint as separate clauses, most urgent first.
+ *
+ * `hintText` joins them (its output is pinned by AC-43), and the run status row
+ * consumes the SAME array so it can drop whole clauses from the tail on a narrow
+ * terminal instead of cutting `interrupt` in half. One source, two consumers.
+ */
+export declare function runningHintClauses(opts: {
+    glyphs: ReturnType<typeof pickGlyphs>;
+    services: number;
+}): string[];
 /**
  * Build the hint row.
  *
@@ -119,5 +152,5 @@ declare function hintText(opts: {
  * than fishing the string out of a rendered frame.
  */
 export declare const hintTextForTest: typeof hintText;
-export declare function Composer({ isActive, running, history, commands, cwd, showHint, submitCount, hintsEnabled, agentMode, services, modeToggleKey, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }: ComposerProps): React.ReactElement;
+export declare function Composer({ runRow, cols, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, showHint, submitCount, hintsEnabled, agentMode, services, modeToggleKey, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }: ComposerProps): React.ReactElement;
 export {};

package/dist/ui/Composer.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * Composer (spec §4.7) — the thin shell around the existing `PromptInput`.
  *
@@ -10,18 +10,35 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * "the input is no longer empty", and routing that through App would re-render
  * the transcript on the first keystroke of every message.
  *
- * As of v0.4.0 this is the ONLY place keybinding hints are shown — the status
- * bar's duplicate cluster is gone (§4.6). Two hints for the same keys, one of
- * them 31 columns wide, were both redundant and the reason the status bar had a
- * `cols >= 110` breakpoint.
+ * The fixed status row retains emergency and history-navigation hints while
+ * this footer scrolls outside the viewport. Editor state stays mounted.
  */
 import { useCallback, useState } from 'react';
 import { Box, Text } from 'ink';
+import stringWidth from 'string-width';
 import { pickGlyphs } from './glyphs.js';
 import { HINT_FADE_AFTER } from '../config/schema.js';
 import { PromptInput } from './PromptInput.js';
-import { ModeChip } from './ModeChip.js';
+import { ModeChip, modeChipCols } from './ModeChip.js';
+import { ActivityLabel, resolveActivityLabel } from './ActivityLine.js';
+import { RUN_ROW_LEAD, planRunRow } from './run-status-row.js';
 import { MODE_LABEL, MODE_TOGGLE_KEYS, nextMode } from '../agent/agent-mode.js';
+/**
+ * The running-state hint as separate clauses, most urgent first.
+ *
+ * `hintText` joins them (its output is pinned by AC-43), and the run status row
+ * consumes the SAME array so it can drop whole clauses from the tail on a narrow
+ * terminal instead of cutting `interrupt` in half. One source, two consumers.
+ */
+export function runningHintClauses(opts) {
+    const { glyphs, services } = opts;
+    const clauses = [`${glyphs.enterKey} steer`, `esc${glyphs.times}2 interrupt`];
+    // Confirmation is named even when service controls also need space.
+    if (services > 0)
+        clauses.push(`ctrl+c stop ${services}`);
+    clauses.push(`ctrl+c${glyphs.times}2 exit`);
+    return clauses;
+}
 /**
  * Build the hint row.
  *
@@ -42,20 +59,8 @@ function hintText(opts) {
     // clauses are shown; the row is `wrap="truncate"` and they are ordered
     // most-urgent-first, so a terminal too narrow for all of them drops the exit
     // clause last rather than the abort key.
-    if (running) {
-        if (services > 0) {
-            return [
-                `${glyphs.enterKey} steer`,
-                // Rung two is named because the whole point of the ladder is that the
-                // first press can fail; a user who does not know there is a second press
-                // is left exactly where the reported screenshot left them.
-                `esc abort${glyphs.times}2 force`,
-                `ctrl+c stop ${services}`,
-                `ctrl+c${glyphs.times}2 exit`,
-            ].join(dot);
-        }
-        return [`${glyphs.enterKey} steer`, 'esc abort', `ctrl+c${glyphs.times}2 exit`].join(dot);
-    }
+    if (running)
+        return runningHintClauses({ glyphs, services }).join(dot);
     // The hint names the DESTINATION, not the current state — the correct label
     // for a toggle affordance, and the reason the mode word here is the OPPOSITE
     // of the one on the chip beside it.
@@ -90,7 +95,21 @@ function hintText(opts) {
  * than fishing the string out of a rendered frame.
  */
 export const hintTextForTest = hintText;
-export function Composer({ isActive, running, history, commands, cwd, showHint, submitCount, hintsEnabled, agentMode, services = 0, modeToggleKey = MODE_TOGGLE_KEYS.primary, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines = 0, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }) {
+function RunRow({ runRow, cols, services, agentMode, theme, caps, }) {
+    const glyphs = pickGlyphs(caps);
+    const separator = ` ${glyphs.midDot} `;
+    const clauses = runningHintClauses({ glyphs, services });
+    const plan = planRunRow({
+        cols,
+        // Spinner glyph + the space after it, then the label.
+        labelCols: 2 + stringWidth(resolveActivityLabel(runRow.activity, glyphs)),
+        hintClauseCols: clauses.map((clause) => stringWidth(clause)),
+        separatorCols: stringWidth(separator),
+        chipCols: modeChipCols(agentMode),
+    });
+    return (_jsxs(Box, { ref: runRow.rowRef, flexDirection: "row", flexShrink: 0, children: [_jsx(Box, { width: RUN_ROW_LEAD, flexShrink: 0, children: _jsx(Text, { children: ' ' }) }), _jsx(Box, { width: plan.labelCols, flexShrink: 0, children: _jsx(ActivityLabel, { ...runRow.activity, spinnerLive: runRow.live, theme: theme, caps: caps }) }), plan.hintClauses > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: [separator, clauses.slice(0, plan.hintClauses).join(separator)] })), plan.chip && (_jsxs(_Fragment, { children: [_jsx(Box, { flexGrow: 1 }), _jsx(ModeChip, { mode: agentMode, theme: theme, caps: caps })] }))] }));
+}
+export function Composer({ runRow, cols, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, showHint, submitCount, hintsEnabled, agentMode, services = 0, modeToggleKey = MODE_TOGGLE_KEYS.primary, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines = 0, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }) {
     const [hasDraft, setHasDraft] = useState(false);
     const onDraftChange = useCallback((next) => {
         setHasDraft(next.hasDraft);
@@ -109,8 +128,11 @@ export function Composer({ isActive, running, history, commands, cwd, showHint,
                     ? theme.focusBorder ?? theme.primary
                     : theme.idleBorder ?? theme.border;
     const glyphs = pickGlyphs(caps);
-    const visible = showHint && hintsEnabled;
-    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(PromptInput, { isActive: isActive, running: running, history: history, commands: commands, cwd: cwd, theme: theme, caps: caps, popupMaxRows: popupMaxRows, popupMaxHeight: popupMaxHeight, onPopupRowsChange: onPopupRowsChange, onSubmit: onSubmit, onHelp: onHelp, agentMode: agentMode, bordered: { color: borderColor }, onDraftChange: onDraftChange, onNotice: onNotice, scrolledLines: scrolledLines }), visible && (
+    // While the run row is up it REPLACES the hint row below the input (same row
+    // count, so starting a run never moves the layout).
+    const runRowActive = running && !!runRow;
+    const visible = showHint && hintsEnabled && !runRowActive;
+    return (_jsxs(Box, { ref: measureRef, flexDirection: "column", flexShrink: 0, children: [runRowActive && (_jsx(RunRow, { runRow: runRow, cols: cols ?? process.stdout.columns ?? 80, services: services, agentMode: agentMode, theme: theme, caps: caps })), _jsx(PromptInput, { cols: cols, cursorVisible: cursorVisible, onInteraction: onInteraction, isActive: isActive, reducedMotion: reducedMotion, onEscape: onEscape, onEscapeDismiss: onEscapeDismiss, running: running, history: history, commands: commands, cwd: cwd, theme: theme, caps: caps, popupMaxRows: popupMaxRows, popupMaxHeight: popupMaxHeight, onPopupRowsChange: onPopupRowsChange, onSubmit: onSubmit, onHelp: onHelp, agentMode: agentMode, borderColor: borderColor, onDraftChange: onDraftChange, onNotice: onNotice, scrolledLines: scrolledLines }), visible && (
             // The chip rides the EXISTING hint row rather than adding one, so it
             // costs zero rows on a 24-row terminal.
             _jsxs(Box, { flexDirection: "row", flexShrink: 0, children: [_jsx(Text, { children: '  ' }), _jsx(ModeChip, { mode: agentMode, theme: theme, caps: caps }), _jsx(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: hintText({

package/dist/ui/Header.d.ts

@@ -1,23 +1,9 @@
-/**
- * Header (spec §4.2) — the always-present brand bar.
- *
- * In full-screen this is EXACTLY ONE ROW at every size, which is what makes the
- * viewport height monotonic in `rows` and the first submit jump-free. The 6-row
- * wordmark it used to host now lives in `SessionOpener`, inside the viewport.
- *
- * `banner` survives for the inline path only (`App.tsx` picks it with a local
- * ternary and never calls `pickHeaderVariant`), so inline keeps its v0.3.0
- * geometry. `art` is no longer reachable from here.
- *
- * Every line is `wrap="truncate"`: a long cwd silently costing a second row
- * would push the bottom chrome off-frame and break R2.
- */
+/** One-row brand bar, with a compact variant for narrow terminals. */
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
 import { type HeaderVariant } from './Logo.js';
 interface HeaderProps {
-    version: string;
     cwd: string;
     provider: string;
     model: string;
@@ -26,5 +12,5 @@ interface HeaderProps {
     theme: Theme;
     caps: TermCapabilities;
 }
-export declare function Header({ version, cwd, provider, model, hasKey, variant, theme, caps, }: HeaderProps): React.ReactElement;
+export declare function Header({ cwd, provider, model, hasKey, variant, theme, caps, }: HeaderProps): React.ReactElement;
 export {};

package/dist/ui/Header.js

@@ -1,25 +1,10 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { homedir } from 'node:os';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { basename } from 'node:path';
 import { Box, Text } from 'ink';
 import { Logo } from './Logo.js';
-/** Collapse the home directory to `~` for a shorter path display. */
-function tildeCwd(cwd) {
-    const home = homedir();
-    if (home && cwd.startsWith(home))
-        return `~${cwd.slice(home.length)}`;
-    return cwd;
-}
-function KeyDot({ hasKey, theme }) {
-    return (_jsxs(Text, { color: hasKey ? theme.toolDone : theme.toolRunning, children: [hasKey ? theme.symbols.keyOn : theme.symbols.keyOff, " ", hasKey ? 'key set' : 'no key'] }));
-}
-export function Header({ version, cwd, provider, model, hasKey, variant, theme, caps, }) {
+export function Header({ cwd, provider, model, hasKey, variant, theme, caps, }) {
     if (variant === 'mini') {
         return (_jsx(Box, { flexDirection: "column", flexShrink: 0, children: _jsx(Text, { wrap: "truncate", children: _jsx(Logo, { variant: "mini", theme: theme, caps: caps }) }) }));
     }
-    if (variant === 'bar') {
-        return (_jsx(Box, { flexDirection: "column", flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", children: [_jsx(Logo, { variant: "bar", theme: theme, caps: caps }), _jsxs(Text, { color: theme.accent, children: ['  ', provider, ":", model] }), _jsxs(Text, { color: theme.muted, children: ['  ', basename(cwd) || cwd] }), _jsxs(Text, { color: hasKey ? theme.toolDone : theme.toolRunning, children: ['  ', hasKey ? theme.symbols.keyOn : theme.symbols.keyOff] })] }) }));
-    }
-    // `banner` (inline only): wordmark row + meta row.
-    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(Logo, { variant: variant, theme: theme, caps: caps }), _jsxs(Text, { wrap: "truncate", children: [_jsxs(Text, { color: theme.muted, children: ["v", version] }), _jsxs(Text, { color: theme.accent, children: ['   ', provider, ":", model] }), _jsx(Text, { children: '   ' }), _jsx(KeyDot, { hasKey: hasKey, theme: theme }), _jsxs(Text, { color: theme.muted, children: ['   ', tildeCwd(cwd)] })] })] }));
+    return (_jsx(Box, { flexDirection: "column", flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", children: [_jsx(Logo, { variant: "bar", theme: theme, caps: caps }), _jsxs(Text, { color: theme.accent, children: ['  ', provider, ":", model] }), _jsxs(Text, { color: theme.muted, children: ['  ', basename(cwd) || cwd] }), _jsxs(Text, { color: hasKey ? theme.toolDone : theme.toolRunning, children: ['  ', hasKey ? theme.symbols.keyOn : theme.symbols.keyOff] })] }) }));
 }

package/dist/ui/Logo.d.ts

@@ -8,25 +8,9 @@ import type { TermCapabilities } from './capabilities.js';
 /** 6 rows × 52 columns, every row equal width (pinned by logo.test.ts). */
 export declare const LOGO_ART: readonly string[];
 export declare const LOGO_ART_WIDTH = 52;
-export type HeaderVariant = 'art' | 'banner' | 'bar' | 'mini';
+export type HeaderVariant = 'bar' | 'mini';
 /** How the one-off opening wordmark renders inside the viewport (§4.2). */
 export type OpenerVariant = 'art' | 'banner' | 'none';
-/**
- * Pick the header tier (spec §4.2).
- *
- * `cols` is the only input, and that is the point. The old signature also took
- * `empty` and `rows` and could return `art`, so the brand region was 8 rows tall
- * on an empty session and 1 row afterwards: sending the first message made the
- * viewport jump by 7 rows, and widening a 27-row terminal to 28 rows made the
- * visible content SHRINK. A constant-height brand bar removes both, which is
- * what lets `budget.ts::viewportRows` be monotonic (A-3/A-4/A-9).
- *
- * The wordmark did not disappear — it moved into the viewport as
- * `SessionOpener`, where it scrolls away like any other content.
- *
- * NOTE: `Header` still renders `banner`; the inline path picks it directly at
- * `App.tsx` and does not call this function.
- */
 export declare function pickHeaderVariant(cols: number): HeaderVariant;
 /**
  * Pick the opening wordmark tier.

package/dist/ui/Logo.js

@@ -22,22 +22,6 @@ const ART_MIN_VIEWPORT_ROWS = 14;
 const ART_MIN_COLS = LOGO_ART_WIDTH + 4;
 const BANNER_MIN_COLS = 48;
 const BAR_MIN_COLS = 40;
-/**
- * Pick the header tier (spec §4.2).
- *
- * `cols` is the only input, and that is the point. The old signature also took
- * `empty` and `rows` and could return `art`, so the brand region was 8 rows tall
- * on an empty session and 1 row afterwards: sending the first message made the
- * viewport jump by 7 rows, and widening a 27-row terminal to 28 rows made the
- * visible content SHRINK. A constant-height brand bar removes both, which is
- * what lets `budget.ts::viewportRows` be monotonic (A-3/A-4/A-9).
- *
- * The wordmark did not disappear — it moved into the viewport as
- * `SessionOpener`, where it scrolls away like any other content.
- *
- * NOTE: `Header` still renders `banner`; the inline path picks it directly at
- * `App.tsx` and does not call this function.
- */
 export function pickHeaderVariant(cols) {
     return cols >= BAR_MIN_COLS ? 'bar' : 'mini';
 }

package/dist/ui/ModeChip.d.ts

@@ -1,21 +1,3 @@
-/**
- * ModeChip — the `PLAN` badge on the composer's hint row (plan-mode §6.1).
- *
- * `theme.chip = { fg, bg }` exists in every palette and was, until now, unused.
- * A mode badge is what it was for.
- *
- * SHOWN ONLY IN PLAN MODE. `BUILD` is the default, and a badge that is always on
- * is furniture rather than signal; it also means the Build-mode composer renders
- * exactly as it did before this feature existed.
- *
- * THE CHIP IS AN ENHANCEMENT, NOT THE GUARANTEE (P1-6). It rides the hint row,
- * which disappears on a short terminal (`showHint`), under `hints: false`, and
- * in inline render mode (which mounts a bare `PromptInput` and never mounts
- * `Composer` at all). The GUARANTEED carrier is the status-bar word, which
- * renders in both `AppShell` branches and has no opt-out. If you ever move the
- * mode indicator, that is the constraint to preserve: the status bar must always
- * name a non-default mode; the chip may.
- */
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
@@ -25,5 +7,12 @@ interface ModeChipProps {
     theme: Theme;
     caps: TermCapabilities;
 }
+/**
+ * Columns `ModeChip` occupies, including its trailing gap (plan => label + 3, any
+ * other mode 0). Both render branches (padded background chip, bracketed text)
+ * come to the same width, which is what lets the run status row budget for it
+ * without measuring a rendered element.
+ */
+export declare function modeChipCols(mode: AgentMode): number;
 export declare function ModeChip({ mode, theme, caps }: ModeChipProps): React.ReactElement | null;
 export {};

package/dist/ui/ModeChip.js

@@ -1,6 +1,15 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 import { MODE_LABEL } from '../agent/agent-mode.js';
+/**
+ * Columns `ModeChip` occupies, including its trailing gap (plan => label + 3, any
+ * other mode 0). Both render branches (padded background chip, bracketed text)
+ * come to the same width, which is what lets the run status row budget for it
+ * without measuring a rendered element.
+ */
+export function modeChipCols(mode) {
+    return mode === 'plan' ? MODE_LABEL[mode].length + 3 : 0;
+}
 export function ModeChip({ mode, theme, caps }) {
     if (mode !== 'plan')
         return null;

package/dist/ui/PromptCaret.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+export interface PromptCaretProps {
+    text: string;
+    active: boolean;
+    reducedMotion: boolean;
+    colorLevel: 0 | 1 | 2 | 3;
+    color?: string;
+    resetKey: object;
+}
+/** The only blinking state belongs to this leaf, never to the editor. */
+export declare function PromptCaret({ text, active, reducedMotion, colorLevel, color, resetKey, }: PromptCaretProps): React.ReactElement;

package/dist/ui/PromptCaret.js

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useLayoutEffect, useState } from 'react';
+import { Text } from 'ink';
+import { displayWidth } from './composer-rows.js';
+function monochromeMarker(text) {
+    // Ink's output grid advances for combining marks, even though they have no
+    // terminal width. Retain them in both phases so its cell count stays stable.
+    const replace = (marker) => Array.from(text, (point) => {
+        const width = displayWidth(point);
+        return width > 0 ? marker.repeat(width) : point;
+    }).join('');
+    const underline = replace('_');
+    return underline === text ? replace('^') : underline;
+}
+/** The only blinking state belongs to this leaf, never to the editor. */
+export function PromptCaret({ text, active, reducedMotion, colorLevel, color, resetKey, }) {
+    const [visible, setVisible] = useState(true);
+    useLayoutEffect(() => {
+        setVisible(true);
+        if (!active || reducedMotion)
+            return;
+        const timer = setInterval(() => setVisible((previous) => !previous), 500);
+        return () => clearInterval(timer);
+    }, [resetKey, active, reducedMotion]);
+    const bright = active && (reducedMotion || visible);
+    let content = text;
+    if (bright && colorLevel === 0) {
+        content = monochromeMarker(text);
+    }
+    return _jsx(Text, { color: color, inverse: bright && colorLevel > 0, children: content });
+}

package/dist/ui/PromptInput.d.ts

@@ -31,6 +31,9 @@ export interface CommandOption {
     description: string;
 }
 interface PromptInputProps {
+    cols?: number;
+    cursorVisible?: boolean;
+    onInteraction?: () => void;
     isActive: boolean;
     running: boolean;
     history: string[];
@@ -41,11 +44,8 @@ interface PromptInputProps {
     /**
      * Row budget for the completion popup (§5.2 / R-14).
      *
-     * The popup renders INSIDE this component, inside the shell's `flexShrink={0}`
-     * bottom chrome, and can add up to 9 rows. On a short terminal that pushes the
-     * status bar past the frame height, where the root box's `overflow: hidden`
-     * clips it away — the one piece of chrome R2 promises is always visible.
-     * `App` derives this from `budget.ts` so the popup shrinks instead.
+     * The popup shares the scrolling footer with the editor. Its height budget
+     * reserves visible message rows without changing the viewport or TODO rail.
      */
     popupMaxRows?: number;
     /** Total menu rows, including borders and the overflow hint. */
@@ -53,21 +53,16 @@ interface PromptInputProps {
     onPopupRowsChange?: (rows: number) => void;
     onSubmit: (text: string) => void;
     onHelp?: () => void;
+    onEscape?: () => void;
+    onEscapeDismiss?: () => void;
+    reducedMotion?: boolean;
     /**
      * Mirror of the session mode. Read for the placeholder only — the toggle
      * itself belongs to `App`, and this component's job is to get out of its way
      * (see the first statement of the input handler).
      */
     agentMode?: AgentMode;
-    /**
-     * Set by `Composer` in full-screen mode: draw the rounded frame around the
-     * input row only, so the autocomplete popup lands OUTSIDE it (spec §4.7)
-     * without lifting the editor's buffer/cursor state out of this component.
-     * Unset ⇒ the v0.2.0 borderless inline rendering.
-     */
-    bordered?: {
-        color?: string;
-    };
+    borderColor?: string;
     /**
      * Fires when the draft flips empty ⇄ non-empty (for the border color) OR when
      * its ROW COUNT changes (for `layout/budget.ts`) — never per keystroke.
@@ -92,24 +87,6 @@ interface PromptInputProps {
      * component is the only place that holds both facts.
      */
     onNotice?: (level: 'warn' | 'error', text: string) => void;
-    /**
-     * Rows of newer output hidden BELOW the viewport — `ScrollViewport`'s offset
-     * (tui-selection-and-scroll-follow §4.2 / G7).
-     *
-     * Rendered as a right-aligned chip ON THE INPUT ROW, INSIDE THE BORDER, which
-     * is what the requirement asks for (输入框内部) and what makes the hint cost
-     * zero rows. It used to take the viewport's own last row, which spent a line of
-     * the user's content exactly when the transcript was longest AND fed the number
-     * back into its own derivation (§3.3).
-     *
-     * IT IS STATE, NOT A HINT. It deliberately ignores `showHint` / `hintsEnabled`
-     * — those govern the teaching row BELOW the box, which fades with experience
-     * and is dropped on a short terminal. "You are 12 rows behind the newest
-     * output" must survive both (T-23).
-     *
-     * Only meaningful in full-screen mode, so it renders only when `bordered` is
-     * set: inline mode has no self-drawn viewport and this is always 0 there.
-     */
     scrolledLines?: number;
 }
 export interface ScrollChip {
@@ -176,5 +153,5 @@ export declare function fileTokenAt(buffer: string, cursor: number): {
     end: number;
     query: string;
 } | null;
-export declare function PromptInput({ isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, agentMode, onSubmit, onHelp, bordered, onDraftChange, onNotice, scrolledLines, }: PromptInputProps): React.ReactElement;
+export declare function PromptInput({ cols: colsProp, cursorVisible, onInteraction, isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion, borderColor, onDraftChange, onNotice, scrolledLines, }: PromptInputProps): React.ReactElement;
 export {};