@aragon-agent/cli 0.6.12 → 0.6.14

package/dist/ui/PromptInput.js

@@ -34,6 +34,8 @@ import { planComposerInput } from './composer-input.js';
 import { allocatePasteId, expandPastes, expandRangeOverTokens } from './paste-tokens.js';
 import { draftMaxRows } from './composer-limits.js';
 import { layoutComposer, splitRowAtColumn } from './composer-rows.js';
+import { moveVisualCursor, snapGrapheme, stepGrapheme } from './editor-navigation.js';
+import { interactionCopy } from './interaction-copy.js';
 import { PASTE_DRAFT_MAX_BYTES, PASTE_MAX_BLOCKS, formatPasteSize, } from '../input/limits.js';
 // ---------------------------------------------------------------------------
 // The scroll chip (§4.2)
@@ -133,6 +135,8 @@ export function draftLimitRefusal(segments, editor) {
 // ---------------------------------------------------------------------------
 const isSpace = (ch) => !!ch && /\s/.test(ch);
 function lineStart(buffer, cursor) {
+    if (cursor <= 0)
+        return 0;
     const nl = buffer.lastIndexOf('\n', cursor - 1);
     return nl === -1 ? 0 : nl + 1;
 }
@@ -166,23 +170,23 @@ function nextWord(buffer, cursor) {
  * label the user then sends INSTEAD of the text it stands for.
  */
 function killRange(buffer, from, to) {
-    const range = expandRangeOverTokens(buffer, from, to);
+    const range = expandRangeOverTokens(buffer, snapGrapheme(buffer, from), snapGrapheme(buffer, to, true));
     return { buffer: buffer.slice(0, range.from) + buffer.slice(range.to), cursor: range.from };
 }
 /** Apply an edit intent as a pure buffer/cursor transform. */
 export function applyEdit(buffer, cursor, intent) {
+    cursor = snapGrapheme(buffer, cursor);
     switch (intent) {
-        // Cursor MOVEMENT is deliberately not token-aware (D-8): arrows, Home/End
-        // and word jumps step by character, because re-deriving `moveVertical` around
-        // a synthetic unit buys a correctness the user cannot notice.
+        // Navigation may enter a token label; insertion and range deletion retain
+        // the existing token snapping and expansion contracts.
         case 'home':
             return { buffer, cursor: lineStart(buffer, cursor) };
         case 'end':
             return { buffer, cursor: lineEnd(buffer, cursor) };
         case 'wordLeft':
-            return { buffer, cursor: prevWord(buffer, cursor) };
+            return { buffer, cursor: snapGrapheme(buffer, prevWord(buffer, cursor)) };
         case 'wordRight':
-            return { buffer, cursor: nextWord(buffer, cursor) };
+            return { buffer, cursor: snapGrapheme(buffer, nextWord(buffer, cursor), true) };
         case 'deleteWordBack':
             return killRange(buffer, prevWord(buffer, cursor), cursor);
         case 'killToStart':
@@ -197,19 +201,8 @@ export function applyEdit(buffer, cursor, intent) {
  * prompt-history recall.
  */
 export function moveVertical(buffer, cursor, dir) {
-    const lines = buffer.split('\n');
-    if (lines.length < 2)
-        return null;
-    const before = buffer.slice(0, cursor);
-    const idx = before.split('\n').length - 1;
-    const col = before.length - (before.lastIndexOf('\n') + 1);
-    const target = dir === 'up' ? idx - 1 : idx + 1;
-    if (target < 0 || target >= lines.length)
-        return null;
-    let start = 0;
-    for (let i = 0; i < target; i += 1)
-        start += lines[i].length + 1;
-    return { cursor: start + Math.min(col, lines[target].length) };
+    const moved = moveVisualCursor({ buffer, cursor, direction: dir, cols: Number.MAX_SAFE_INTEGER });
+    return moved ? { cursor: moved.cursor } : null;
 }
 /**
  * Slash-command suggestions when the buffer is a bare `/word` (no space yet).
@@ -250,7 +243,7 @@ function isControlSeq(input) {
 // ---------------------------------------------------------------------------
 // Component
 // ---------------------------------------------------------------------------
-export function PromptInput({ cols: colsProp, cursorVisible = true, onInteraction, isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion = false, borderColor, onDraftChange, onNotice, scrolledLines = 0, }) {
+export function PromptInput({ cols: colsProp, cursorVisible = true, onInteraction, isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, onCompletionContextChange, deleteDisambiguated = false, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion = false, borderColor, onDraftChange, onNotice, scrolledLines = 0, }) {
     const { stdout } = useStdout();
     const [editor, dispatch] = useReducer(editorReducer, INITIAL_EDITOR_STATE);
     const { buffer, cursor, historyIndex, dismissed, sel } = editor;
@@ -280,6 +273,17 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
         onPopupRowsChange?.(popupLayout.rowCount);
     }, [onPopupRowsChange, popupLayout.rowCount]);
     useLayoutEffect(() => () => onPopupRowsChange?.(0), [onPopupRowsChange]);
+    const completion = popupVisible ? popupKind ?? 'none' : 'none';
+    const completionCallback = useRef(onCompletionContextChange);
+    completionCallback.current = onCompletionContextChange;
+    const lastCompletion = useRef();
+    useLayoutEffect(() => {
+        if (!onCompletionContextChange || lastCompletion.current === completion)
+            return;
+        lastCompletion.current = completion;
+        onCompletionContextChange?.(completion);
+    }, [onCompletionContextChange, completion]);
+    useLayoutEffect(() => () => completionCallback.current?.('none'), []);
     // --- Debounced `@file` scan. ---------------------------------------------
     useEffect(() => {
         if (fileQuery === null || fileQuery.length < 1) {
@@ -330,7 +334,9 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
         cursor,
         cols: wrapCols,
         maxRows: draftMaxRows(terminalRows),
-        active: isActive && cursorVisible,
+        // Scrolling may hide the caret, but must not change the measured draft.
+        // Otherwise visibility can toggle wrapping and feed back into scrolling.
+        active: isActive,
     });
     // TWO PASSES, AND THE SECOND ONE IS LOAD-BEARING (I-8). The overflow indicator
     // rides the last rendered row INSIDE the box the draft wraps in, so its cells
@@ -347,6 +353,8 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     const overflows = wide.hiddenAbove > 0 || wide.hiddenBelow > 0;
     const usableCols = overflows ? Math.max(8, baseCols - OVERFLOW_CELLS - 1) : baseCols;
     const layout = overflows ? measure(usableCols) : wide;
+    const preferredColumnWidth = useRef();
+    useLayoutEffect(() => { preferredColumnWidth.current = undefined; }, [usableCols]);
     const draftRowCount = Math.max(1, layout.rows.length);
     const caretResetKey = useMemo(() => ({}), [buffer, cursor, isActive, usableCols]);
     // --- Draft presence and height, reported only on a transition. -----------
@@ -446,9 +454,12 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     };
     const verticalOrHistory = (dir) => {
         onInteraction?.();
-        const moved = moveVertical(buffer, cursor, dir);
+        const moved = moveVisualCursor({ buffer, cursor, cols: usableCols, direction: dir,
+            preferredVisualColumn: preferredColumnWidth.current === usableCols
+                ? editor.preferredVisualColumn : undefined });
         if (moved) {
-            dispatch({ type: 'moveCursor', cursor: moved.cursor });
+            preferredColumnWidth.current = usableCols;
+            dispatch({ type: 'moveCursor', ...moved });
             return;
         }
         // At an edge: recall history only from an empty buffer or while already
@@ -514,11 +525,15 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
             return;
         }
         // Line-editing intents (Home/End/word/kill) recognized from raw keys.
-        const intent = recognize(input, key);
+        const intent = key.meta && (key.backspace || key.delete)
+            ? 'deleteWordBack' : recognize(input, key);
         if (intent) {
             onInteraction?.();
             const next = applyEdit(buffer, cursor, intent);
-            dispatch({ type: 'replace', buffer: next.buffer, cursor: next.cursor });
+            const moving = intent === 'home' || intent === 'end'
+                || intent === 'wordLeft' || intent === 'wordRight';
+            dispatch(moving ? { type: 'moveCursor', cursor: next.cursor }
+                : { type: 'replace', buffer: next.buffer, cursor: next.cursor });
             return;
         }
         if (key.ctrl)
@@ -539,19 +554,17 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
             // unconditional dispatch and a no-op at the left edge returns the same
             // state object — which React bails out on, exactly as the old
             // `if (cursor > 0)` skipped the `setState`s.
-            dispatch({ type: 'backspace' });
+            dispatch({ type: key.delete && deleteDisambiguated ? 'delete' : 'backspace' });
             return;
         }
         if (key.leftArrow) {
             onInteraction?.();
-            const step = cursor >= 2 && (buffer.codePointAt(cursor - 2) ?? 0) > 0xffff ? 2 : 1;
-            dispatch({ type: 'moveCursor', cursor: Math.max(0, cursor - step) });
+            dispatch({ type: 'moveCursor', cursor: stepGrapheme(buffer, cursor, 'left') });
             return;
         }
         if (key.rightArrow) {
             onInteraction?.();
-            const step = (buffer.codePointAt(cursor) ?? 0) > 0xffff ? 2 : 1;
-            dispatch({ type: 'moveCursor', cursor: Math.min(buffer.length, cursor + step) });
+            dispatch({ type: 'moveCursor', cursor: stepGrapheme(buffer, cursor, 'right') });
             return;
         }
         // `!key.shift` is load-bearing: Shift+↑/↓ is the viewport's line-scroll
@@ -576,11 +589,7 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     }, { isActive });
     const marker = running ? glyphs.steer : glyphs.caret;
     const markerColor = running ? theme.toolRunning : theme.primary;
-    const placeholder = running
-        ? `Type to queue a message, Esc twice to interrupt${glyphs.ellipsis}`
-        : agentMode === 'plan'
-            ? `Describe what you want to build; I'll research and plan it first${glyphs.ellipsis}`
-            : `Send a message (/ for commands, @ for files)${glyphs.ellipsis}`;
+    const placeholder = running ? interactionCopy.runningPlaceholder : interactionCopy.idlePlaceholder;
     const overflow = overflowChip(layout.hiddenAbove, layout.hiddenBelow, glyphs);
     const tokenColor = theme.hintFg ?? theme.muted;
     const renderSegments = (segments, keyPrefix) => segments.map((segment, i) => (_jsx(Text, { color: segment.kind === 'token' ? tokenColor : undefined, children: segment.text }, `${keyPrefix}${i}`)));

package/dist/ui/QueuePanel.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { QueueLayout } from './layout/queue-layout.js';
+import type { Theme } from './theme.js';
+/** Persistent receipt-backed footer, with no timer or separate queue state. */
+export declare const QueuePanel: React.NamedExoticComponent<{
+    layout: QueueLayout;
+    theme: Theme;
+}>;

package/dist/ui/QueuePanel.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, Text } from 'ink';
+/** Persistent receipt-backed footer, with no timer or separate queue state. */
+export const QueuePanel = React.memo(function QueuePanel({ layout, theme }) {
+    if (!layout.rows)
+        return null;
+    return _jsxs(Box, { flexDirection: "column", flexShrink: 0, height: layout.rows, children: [_jsx(Text, { color: theme.accent, wrap: "truncate", children: layout.title }), layout.rows > 1 && layout.items.map((item) => _jsx(Text, { color: theme.muted, wrap: "truncate", children: item.label }, item.queueId))] });
+});

package/dist/ui/QueueStatusRow.d.ts

@@ -12,6 +12,8 @@ export interface QueueStatusRowProps {
 }
 /** Return the first nonempty logical line without terminal control characters. */
 export declare function queueSummary(text: string): string;
+/** Truncate at a whole grapheme, reserving the ellipsis in the same cell budget. */
+export declare function truncateSummary(text: string, columns: number, ellipsis: string): string;
 /** Format a queue using only the columns assigned by the status bar. */
 export declare function formatQueueStatus(props: Omit<QueueStatusRowProps, 'theme'>): {
     prefix: string;

package/dist/ui/QueueStatusRow.js

@@ -11,7 +11,7 @@ export function queueSummary(text) {
         .find(Boolean) ?? '(empty)';
 }
 /** Truncate at a whole grapheme, reserving the ellipsis in the same cell budget. */
-function truncateSummary(text, columns, ellipsis) {
+export function truncateSummary(text, columns, ellipsis) {
     if (stringWidth(text) <= columns)
         return text;
     if (columns < stringWidth(ellipsis))

package/dist/ui/StatusBar.d.ts

@@ -1,42 +1,27 @@
-/**
- * Status bar (spec §4.8). Width-aware, borderless, EXACTLY one row: a left
- * cluster (run status, model, thinking level) and a right cluster (context
- * gauge, occupancy pair, session total, cost, tokens/sec + elapsed while
- * running, off-bottom `↑N`). Clusters drop out gracefully on narrow terminals.
- *
- * THE RIGHT CLUSTER'S WIDTH LADDER (context-usage-gauge-accuracy §3.6):
- *
- *   >= 96   [####....] 43%  86.0k/200.0k  total 1.2M^ 48.0k v  $3.21  12 tok/s  1m02s
- *   72-95   [####....] 43%  86.0k/200.0k  $3.21
- *   60-71   [####....] 43%  $3.21
- *   < 60    43%  $3.21
- *
- * Dropping the round border here buys back 3 rows of a 24-row terminal — an
- * eighth of the screen was being spent framing a single line of text.
- */
+/** A single row of complete, measured status fields. */
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
 import type { UsageTotal } from '../agent/reducer.js';
 import type { ContextUsageSnapshot } from '../compaction/types.js';
-import { type AgentMode } from '../agent/agent-mode.js';
+import type { AgentMode } from '../agent/agent-mode.js';
 import type { PendingSteering } from '../agent/queued-messages.js';
-interface StatusBarProps {
+import { type RunPhase } from './layout/status-layout.js';
+export interface StatusBarProps {
+    runPhase?: RunPhase;
+    activeTool?: {
+        name: string;
+        toolCallId: string;
+    } | null;
+    runOutcome?: "none" | "ended" | "interrupted" | "failed";
+    reducedMotion?: boolean;
+    waitingForConfirmation?: boolean;
+    stopping?: boolean;
     pendingSteering?: readonly PendingSteering[];
     interruptHint?: string;
     model: string;
     provider: string;
     usageTotal: UsageTotal;
-    /**
-     * Context occupancy, as one object (context-usage-gauge-accuracy §4.3).
-     *
-     * IT REPLACED FOUR PARALLEL PROPS - `contextTokens`, `contextWindow`,
-     * `contextWindowKnown`, `contextEstimated`. Four props describing one reading
-     * are four chances for a caller to update three of them, which is the props-
-     * layer form of the "many writers" defect this feature removed from the
-     * reducer. `usageTotal` stays separate because it genuinely IS another
-     * quantity: session spend, not occupancy.
-     */
     context: ContextUsageSnapshot;
     status: 'idle' | 'running';
     elapsedMs: number;
@@ -44,157 +29,36 @@ interface StatusBarProps {
     tokPerSec: number;
     theme: Theme;
     caps: TermCapabilities;
-    /**
-     * Lines scrolled off the bottom; > 0 renders `↑N`. Inline mode has no
-     * self-drawn viewport, so it simply never sends anything but 0 — the bar
-     * needs no render-mode branch of its own.
-     */
     scrolledLines?: number;
-    /**
-     * Ctrl+L redraw carrier — invariant I-5 (spec §4.13). See `redrawChar`.
-     */
     redrawNonce?: number;
     agentMode?: AgentMode;
-    /** Non-null while a deferred `plan -> build` waits for `agent_end`. */
     pendingAgentMode?: AgentMode | null;
-    /**
-     * Live subagent counts (team-subagents §6.2), or absent when no dispatch is
-     * running — an ordinary session's bar is then unchanged.
-     *
-     * LEFT CLUSTER, and it degrades (D-20 / P2-1). The left cluster is
-     * `flexShrink={0}`, so every column it takes comes out of the context gauge
-     * and the cost readout opposite it; on an 80-column terminal the full
-     * `agents 3/5` visibly squeezes them, and the gauge is how a user notices they
-     * are about to run out of context. Below `TEAM_LIMITS.statusCompactCols` this
-     * therefore renders as `[3]` — the running count alone.
-     *
-     * This does NOT contradict the "no `cols >= N` breakpoint" rule above: that
-     * rule is written about `agentMode`, whose reason is that the mode must never
-     * be unreportable. The team counter has a second, fuller home in `TeamPanel`
-     * and a third in `TeamCard`; it is the one readout on this bar that can afford
-     * to degrade.
-     */
     teamActive?: {
         running: number;
         total: number;
     };
-    /**
-     * Live todo counts (todo-plan-execution §6.3), or absent.
-     *
-     * `App` sends this ONLY when a list exists AND the rail does not: with the
-     * rail on screen the numbers are already there in a larger typeface, and
-     * duplicating them costs the context gauge columns it cannot spare. This is
-     * therefore the INLINE-MODE and NARROW-TERMINAL fallback for R-d, which is
-     * exactly why it is here rather than being folded into the rail's own gate.
-     *
-     * Degrades below `TODO_LIMITS.statusCompactCols` from `todo 2/7` to `[2/7]`,
-     * the same treatment and the same justification as the team counter's
-     * `agents 3/5` -> `[3]`. See the note on `agentMode` for why that rule does
-     * NOT apply to the mode word.
-     */
     todoActive?: {
         done: number;
         total: number;
     };
-    /**
-     * Live background services (background-service-supervision §3.8), or absent
-     * when none are running — an ordinary session's bar is then unchanged.
-     *
-     * LEFT CLUSTER, after the todo chip, and it DEGRADES rather than hiding below
-     * `PROC_LIMITS.statusCompactCols`. That is the `todoActive` / `teamActive`
-     * ladder rather than `compactionActive`'s hide-below-threshold one, and the
-     * choice is deliberate: `compact` and `fast` describe something the CLI is
-     * doing to itself, whereas this is a PROCESS ON THE USER'S MACHINE HOLDING A
-     * PORT. A narrow terminal is a reason to shorten it, never a reason to stop
-     * saying it.
-     *
-     * `live` counts `starting | ready | running`. The transcript records events
-     * about a service (D-11); this is where "what is running right now" lives,
-     * alongside `/bg` and `bash_output`.
-     */
     servicesActive?: {
         live: number;
     };
-    /**
-     * Live retry state (llm-api-retry-backoff §6.6), or absent when nothing is
-     * retrying — an ordinary session's bar is then unchanged.
-     *
-     * LEFT CLUSTER, after `teamActive`, and it DEGRADES. It is a run-state fact like
-     * `agents 3/5`, and the left cluster is `flexShrink={0}` so every column it takes
-     * comes out of the context gauge; below `RETRY_UI.statusCompactCols` it renders
-     * as `[r3]`.
-     *
-     * This does NOT contradict the "no `cols >= N` breakpoint" rule on `agentMode`
-     * above: that rule exists because the MODE must never be unreportable. The retry
-     * has a second, fuller home in the transcript card, which is exactly why it is
-     * the kind of readout that can afford to shrink.
-     */
     retryActive?: {
         attempt: number;
         max: number;
         secondsLeft: number;
     };
-    /**
-     * Render-governor rung (tui-render-performance L4). `> 0` renders a muted
-     * `eco` chip.
-     *
-     * I-L4-2 — THE GOVERNOR IS USER-VISIBLE, and this is where. A user who cannot
-     * see why the stream got chunkier will conclude the model got slower, and
-     * degrading silently is the one thing a claim of robustness cannot afford.
-     * It sits in the RIGHT cluster next to the other derived numbers and is
-     * suppressed on a narrow terminal, which is the `teamActive` treatment rather
-     * than the `agentMode` one: the mode must never be unreportable, whereas an
-     * eco chip on a 50-column terminal costs the context gauge more than it says.
-     */
     ecoRung?: number;
-    /**
-     * The live fast tier (fast-model-tier §6), or absent when it is off for this
-     * session — in which case an ordinary session's bar is byte-identical.
-     *
-     * RIGHT CLUSTER, next to `eco`, and it DEGRADES below
-     * `FAST_LIMITS.statusCompactCols`. This is the `teamActive` / `ecoRung`
-     * treatment rather than the `agentMode` one, and the distinction is the note
-     * on `agentMode` above: the mode must never be unreportable, whereas the fast
-     * tier has a fuller home in `/fast status` — which is the GUARANTEED reporting
-     * surface — and a chip on a 60-column terminal costs the context gauge more
-     * than it says.
-     *
-     * `inFlight` renders `fast*`, so a review that is taking a while is visible
-     * without a spinner competing with the run's own.
-     */
     fastActive?: {
         inFlight: boolean;
     };
-    /**
-     * Live context compaction (context-auto-compaction §6.2), or absent when it is
-     * off for this session — in which case an ordinary session's bar is unchanged.
-     *
-     * RIGHT CLUSTER, next to `fast` and `eco`, and it DEGRADES below
-     * `COMPACTION_LIMITS.statusCompactCols`. The `teamActive` / `ecoRung` /
-     * `fastActive` treatment rather than the `agentMode` one, for the reason the
-     * note on `agentMode` gives: the mode must never be unreportable, whereas
-     * compaction has a fuller home in `/compact status` — the GUARANTEED reporting
-     * surface (§6.5) — and a chip on a 60-column terminal costs the context gauge
-     * more than it says.
-     *
-     * `inFlight` renders `compacting`, so a summarization that is taking a while is
-     * visible on this row without a spinner competing with the activity line's.
-     */
     compactionActive?: {
         inFlight: boolean;
     };
-    /**
-     * Where the gauge turns amber and red (§6.2).
-     *
-     * ABSENT means today's hardcoded `{ warn: 60, high: 85 }`, so a session with
-     * compaction off renders a byte-identical bar. When present these are
-     * `warnThreshold * 100` and `threshold * 100`, which is what makes the colour
-     * the user sees agree with the number the trigger fires on.
-     */
     gaugeMarks?: {
         warn: number;
         high: number;
     };
 }
 export declare function StatusBar(props: StatusBarProps): React.ReactElement;
-export {};

package/dist/ui/StatusBar.js

@@ -1,148 +1,33 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import stringWidth from 'string-width';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/** A single row of complete, measured status fields. */
+import React from 'react';
 import { Box, Text, useStdout } from 'ink';
 import { pickGlyphs } from './glyphs.js';
-import { formatCost, formatTokens, formatDuration, promptTokensOf } from '../agent/usage.js';
-import { buildGauge } from './gauge.js';
-import { MODE_LABEL } from '../agent/agent-mode.js';
-import { formatRetryChip } from '../agent/retry-view.js';
-import { FAST_LIMITS } from '../fast/limits.js';
-import { COMPACTION_LIMITS } from '../compaction/limits.js';
-import { TEAM_LIMITS } from '../team/limits.js';
-import { TODO_LIMITS } from '../todo/limits.js';
-import { PROC_LIMITS } from '../proc/limits.js';
-import { QueueStatusRow } from './QueueStatusRow.js';
-/** Below this the `eco` chip costs the context gauge more than it is worth. */
-const ECO_MIN_COLS = 72;
-/**
- * Where `86k/200k` starts being shown (context-usage-gauge-accuracy §3.6 / W5).
- *
- * IT TAKES THE COLUMNS THE SESSION TOTAL USED TO HAVE, and the ordering is the
- * point rather than a layout accident (D-6). "How full am I, out of how much" is
- * the question a user asks the gauge; "what has this session cost in tokens" is
- * a different one, and putting the second in front of the first spends the
- * scarce columns on the number the user is more likely to MISREAD - the total
- * looks like an occupancy until you notice it exceeds the window.
- */
-const ABSOLUTE_PAIR_MIN_COLS = 72;
-/**
- * Where the session total returns, now prefixed.
- *
- * `total ` IS AN ASCII WORD, NOT A SIGMA. `ui/**` is inside the glyph scanner's
- * scope, so a new symbol would need an entry in `glyphs.ts` with an ASCII
- * fallback for a legacy `cmd.exe` - a real cost for a three-character prefix
- * that reads worse.
- */
-const SESSION_TOTAL_MIN_COLS = 96;
-/**
- * I-5 — DO NOT "CLEAN THIS UP". Ink short-circuits identical output at TWO
- * gates (`ink.js:132` and `log-update.js:13`), so a fixed frame whose React
- * output has not changed is never repainted. `Ctrl+L` therefore cannot work by
- * writing an escape sequence; it works by making the rendered STRING differ.
- * This alternates the status bar's left gutter between U+0020 and U+00A0: both
- * render one invisible column, so there is zero visual or layout difference,
- * but the bytes differ and both gates open.
- *
- * It must sit at the START of the line: Ink `trimEnd()`s every row (output.js),
- * and JS `trimEnd` strips U+00A0 too — a trailing carrier would be deleted and
- * Ctrl+L would degrade to a silent no-op.
- */
-/** Built by code point so no formatter can normalize it back to a plain space. */
-const NBSP = String.fromCharCode(0x00a0);
-function redrawChar(nonce) {
-    return nonce % 2 === 0 ? ' ' : NBSP;
-}
-function queueStateLabels(props, compact) {
-    const mode = props.agentMode ?? 'build';
-    const next = props.pendingAgentMode;
-    const modeLabel = compact ? mode[0].toUpperCase() : mode;
-    const nextLabel = next ? (compact ? next[0].toUpperCase() : next) : '';
-    const stopping = /force|again/i.test(props.interruptHint ?? '');
-    return [
-        nextLabel ? `${modeLabel}>${nextLabel}` : modeLabel,
-        stopping ? (compact ? 'E!' : 'Esc!')
-            : props.status === 'running' ? (compact ? 'E2' : 'Esc x2') : '',
-        props.servicesActive?.live ? (compact ? 'S+' : `svc ${props.servicesActive.live}`) : '',
-        props.todoActive?.total ? (compact ? 'T+'
-            : `todo ${props.todoActive.done}/${props.todoActive.total}`) : '',
-    ].filter(Boolean).join(' ') + ' ';
-}
-function QueueStatusBar(props) {
-    const pending = props.pendingSteering;
-    const normal = queueStateLabels(props, false);
-    const paused = props.status !== 'running';
-    const suffix = pending.length > 1 ? ` (+${pending.length - 1} more)` : '';
-    const minimum = stringWidth((paused ? 'Queue (paused): ' : 'Queue: ') + suffix)
-        + stringWidth(pickGlyphs(props.caps).ellipsis);
-    const compact = stringWidth(normal) + minimum + 1 > props.columns;
-    const labels = compact ? queueStateLabels(props, true) : normal;
-    const columns = props.columns - 1 - stringWidth(labels);
-    return _jsxs(Box, { width: props.columns, height: 1, flexShrink: 0, children: [_jsx(Text, { children: redrawChar(props.redrawNonce ?? 0) }), _jsx(Text, { color: props.theme.noticeWarn, children: labels }), _jsx(QueueStatusRow, { pending: pending, paused: paused, columns: columns, compact: compact, theme: props.theme, caps: props.caps })] });
-}
+import { liveSpinner } from './ActivityLine.js';
+import { planStatusFields } from './layout/status-layout.js';
+/** An invisible leading byte change forces Ink to repaint on Ctrl+L. */
+const redrawChar = (nonce) => nonce % 2 ? String.fromCharCode(0x00a0) : ' ';
 export function StatusBar(props) {
-    const { model, provider, usageTotal, context, status, elapsedMs, thinkingLevel, tokPerSec, theme, caps, scrolledLines = 0, redrawNonce = 0, agentMode = 'build', pendingAgentMode = null, teamActive, todoActive, servicesActive, retryActive, ecoRung = 0, fastActive, compactionActive, gaugeMarks, } = props;
     const { stdout } = useStdout();
     const cols = stdout?.columns ?? 80;
-    const running = status === 'running';
-    if (props.pendingSteering?.length)
-        return _jsx(QueueStatusBar, { ...props, columns: cols });
-    const glyphs = pickGlyphs(caps);
-    // THE PERCENTAGE IS NOT RECOMPUTED HERE ANY MORE. It arrives already divided
-    // and clamped by the same code the compaction trigger reads, which is the
-    // whole of AC-2: a user watching 78 % and a `/compact status` reporting 91 %
-    // would rightly conclude one of them is lying.
-    const pct = context.pct;
-    // `gaugeMarks` is spread rather than passed as `undefined`, so a session with
-    // compaction off takes `buildGauge`'s own default and the bar is byte-identical
-    // to the pre-feature build.
-    const gauge = gaugeMarks
-        ? buildGauge(pct, cols < 72 ? 8 : 12, theme, caps, gaugeMarks)
-        : buildGauge(pct, cols < 72 ? 8 : 12, theme, caps);
-    // `~` BELONGS TO THE NUMERATOR, `?` TO THE DENOMINATOR (P2-7). One glyph used
-    // to carry three meanings - the window is a guess, the occupancy is a guess,
-    // the occupancy contains an appended-message estimate - and a user could not
-    // tell from it which half to distrust. The `~` keeps every case it had: an
-    // unknown window still produces it, so a session that never touches the new
-    // absolute pair sees the identical string it saw before.
-    const occupancyApproximate = context.source === 'estimate' || context.deltaTokens > 0;
-    const pctLabel = `${context.windowKnown && !occupancyApproximate ? '' : '~'}${gauge.pct}%`;
-    // `?` ON THE WINDOW, AND ONLY ON THE NEW READOUT. `windowKnown` is false
-    // exactly when `buildRuntimeModel` invented the 128k placeholder, and saying
-    // `128k?` is the difference between a denominator the user can act on and one
-    // they will assume came from their model card.
-    const windowLabel = `${formatTokens(context.window)}${context.windowKnown ? '' : '?'}`;
-    const absolutePair = `${formatTokens(context.occupied)}/${windowLabel}`;
-    // THE PROMPT-SIDE TOTAL, NOT `inputTokens` (P1-3 / AC-11). Anthropic reports
-    // `input_tokens` EXCLUDING cached tokens, so the old expression under-reported
-    // for anyone behind a caching gateway - on the same row as a `$` that has
-    // always priced the cache. Any session with cache hits sees this number grow,
-    // and that is the fix rather than a regression.
-    const tokens = `total ${formatTokens(promptTokensOf(usageTotal))}${glyphs.arrowUp} ${formatTokens(usageTotal.outputTokens)}${glyphs.arrowDown}`;
-    const statusGlyph = running ? theme.symbols.toolRunning : theme.symbols.toolPending;
-    // Nothing at all in build mode with nothing pending: the default posture is
-    // not news, and a permanent word here would be furniture.
-    const modeWord = agentMode === 'build' && !pendingAgentMode
-        ? ''
-        : pendingAgentMode
-            ? `${MODE_LABEL[agentMode]} ${glyphs.arrowRight} ${MODE_LABEL[pendingAgentMode]}`
-            : MODE_LABEL[agentMode];
-    const actionHints = [running ? (props.interruptHint ?? 'Esc abort') : '',
-        servicesActive ? `Ctrl+C stop ${servicesActive.live}` : '',
-        scrolledLines > 0 ? 'PgDn down' : ''].filter(Boolean).join(' | ');
-    const hintCols = actionHints ? Math.min(Math.max(0, cols - 1), stringWidth(actionHints) + 2) : 0;
-    const detailCols = Math.max(0, cols - 1 - hintCols);
-    return (
-    // `flexShrink={0}` on the left cluster is not cosmetic. When the two clusters
-    // over-subscribe the row, yoga shrinks the flexible children and Ink's text
-    // measurement drops a character from EACH of them — the bar renders "idl"
-    // and "? hel" rather than truncating cleanly at one end. Pinning the left
-    // cluster keeps the run status and model intact and makes the degradation
-    // land in one predictable place.
-    _jsxs(Box, { width: cols, flexDirection: "row", justifyContent: "space-between", flexShrink: 0, height: 1, overflow: "hidden", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: redrawChar(redrawNonce) }) }), hintCols > 0 && (_jsx(Box, { width: hintCols, flexShrink: 0, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: theme.noticeWarn, children: [actionHints, '  '] }) })), _jsxs(Box, { display: detailCols > 0 ? 'flex' : 'none', width: detailCols, flexShrink: 0, flexDirection: "row", justifyContent: "space-between", overflow: "hidden", children: [_jsxs(Box, { flexDirection: "row", flexShrink: 0, overflow: "hidden", children: [_jsxs(Text, { color: running ? theme.toolRunning : theme.toolDone, children: [statusGlyph, " ", running ? 'running' : 'idle'] }), modeWord && (_jsxs(Text, { color: theme.accent, bold: true, children: ['  ', modeWord] })), teamActive && (_jsxs(Text, { color: theme.toolRunning, bold: true, children: ['  ', cols >= TEAM_LIMITS.statusCompactCols
-                                        ? `agents ${teamActive.running}/${teamActive.total}`
-                                        : `[${teamActive.running}]`] })), retryActive && (_jsxs(Text, { color: theme.noticeWarn, bold: true, children: ['  ', formatRetryChip(retryActive, cols)] })), todoActive && (_jsxs(Text, { color: theme.accent, children: ['  ', cols >= TODO_LIMITS.statusCompactCols
-                                        ? `todo ${todoActive.done}/${todoActive.total}`
-                                        : `[${todoActive.done}/${todoActive.total}]`] })), servicesActive && (_jsxs(Text, { color: theme.accent, children: ['  ', cols >= PROC_LIMITS.statusCompactCols
-                                        ? `svc ${servicesActive.live}`
-                                        : `[${servicesActive.live}]`] })), cols >= 60 && (cols >= 110 || (!running && !servicesActive && scrolledLines === 0)) && (_jsxs(Text, { color: theme.muted, children: ['  ', provider, ":", model] })), thinkingLevel !== 'off' && cols >= 72 && (_jsxs(Text, { color: theme.accent, children: ["  think:", thinkingLevel] }))] }), _jsxs(Box, { flexDirection: "row", children: [compactionActive && cols >= COMPACTION_LIMITS.statusCompactCols && (_jsxs(Text, { color: compactionActive.inFlight ? theme.accent : theme.muted, children: [compactionActive.inFlight ? 'compacting' : 'compact', '  '] })), fastActive && cols >= FAST_LIMITS.statusCompactCols && (_jsxs(Text, { color: theme.muted, children: ["fast", fastActive.inFlight ? '*' : '', '  '] })), ecoRung > 0 && cols >= ECO_MIN_COLS && (_jsxs(Text, { color: theme.muted, children: ["eco", '  '] })), scrolledLines > 0 && (_jsxs(Text, { color: theme.noticeWarn, children: [glyphs.arrowUp, scrolledLines, '  '] })), cols >= 60 && (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: "[" }), _jsx(Text, { color: gauge.fillColor, children: gauge.filled }), _jsx(Text, { color: gauge.trackColor, children: gauge.empty }), _jsx(Text, { color: theme.muted, children: "] " })] })), _jsx(Text, { color: theme.muted, children: pctLabel }), cols >= ABSOLUTE_PAIR_MIN_COLS && (_jsxs(Text, { color: theme.muted, children: ["  ", absolutePair] })), cols >= SESSION_TOTAL_MIN_COLS && _jsxs(Text, { color: theme.muted, children: ["  ", tokens] }), _jsxs(Text, { color: theme.muted, children: ["  ", formatCost(usageTotal.costUsd)] }), running && (_jsxs(Text, { color: theme.muted, children: [tokPerSec > 0 && cols >= 72 ? `  ${tokPerSec} tok/s` : '', "  ", formatDuration(elapsedMs)] }))] })] })] }));
+    const phase = props.runPhase ?? (props.status === 'running' ? 'waiting' : 'idle');
+    const active = phase !== 'idle' || !!props.compactionActive?.inFlight;
+    const glyph = pickGlyphs(props.caps).spinnerStill;
+    const spinner = active ? liveSpinner(props.reducedMotion ?? false, props.caps) : null;
+    const fields = planStatusFields({
+        columns: cols, phase, pendingCount: props.pendingSteering?.length ?? 0,
+        context: props.context, usageTotal: props.usageTotal,
+        thinkingLevel: props.thinkingLevel, elapsedMs: props.elapsedMs, tokPerSec: props.tokPerSec,
+        activeTool: props.activeTool, runOutcome: props.runOutcome, spinner: active ? glyph : '',
+        waitingForConfirmation: props.waitingForConfirmation, stopping: props.stopping,
+        compacting: props.compactionActive?.inFlight, retryActive: props.retryActive,
+        mode: props.agentMode, pendingMode: props.pendingAgentMode, servicesActive: props.servicesActive,
+        teamActive: props.teamActive, todoActive: props.todoActive,
+        ecoRung: props.ecoRung, fastActive: props.fastActive, scrolledLines: props.scrolledLines,
+    });
+    const tones = { normal: props.theme.primary, muted: props.theme.muted,
+        warning: props.theme.noticeWarn, error: props.theme.noticeError };
+    return _jsxs(Box, { width: cols, height: 1, flexShrink: 0, flexDirection: "row", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: redrawChar(props.redrawNonce ?? 0) }) }), fields.map((item, index) => _jsxs(React.Fragment, { children: [index > 0 && _jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { color: props.theme.muted, children: " | " }) }), _jsx(Box, { width: item.cells, flexShrink: 0, children: _jsx(Text, { color: tones[item.tone], children: item.id === 'phase' && active
+                                ? _jsxs(_Fragment, { children: [spinner ?? glyph, item.text.slice(glyph.length)] })
+                                : item.text }) })] }, item.id))] });
 }

package/dist/ui/capabilities.d.ts

@@ -22,4 +22,6 @@ interface StdoutLike {
  * for future TTY-aware refinements and kept in the signature for callers.
  */
 export declare function detectCapabilities(env: EnvLike, _stdout?: StdoutLike): TermCapabilities;
+/** Full TUI styling is a policy, not a guess based on inherited shell markers. */
+export declare function resolveTuiCapabilities(env: EnvLike, color?: boolean): TermCapabilities;
 export {};

package/dist/ui/capabilities.js

@@ -57,3 +57,9 @@ export function detectCapabilities(env, _stdout) {
         unicode: detectUnicode(env),
     };
 }
+/** Full TUI styling is a policy, not a guess based on inherited shell markers. */
+export function resolveTuiCapabilities(env, color) {
+    const disabled = color === false || env.NO_COLOR !== undefined ||
+        env.FORCE_COLOR === '0' || env.FORCE_COLOR === 'false';
+    return { unicode: true, colorLevel: disabled ? 0 : 3 };
+}