@aragon-agent/cli 0.6.14 → 0.6.15

package/dist/ui/BottomStatusRow.d.ts

@@ -1,15 +1,10 @@
-/** The permanent action/feedback row. StatusBar owns all activity animation. */
+/** Renders an already allocated detail row; it never chooses visibility or animation. */
 import React from 'react';
 import type { Theme } from './theme.js';
-import type { Toast } from '../agent/reducer.js';
-import { type ActionHintInput } from './interaction-hints.js';
+import type { StatusLinePlan } from './layout/status-layout.js';
 export interface BottomStatusRowProps {
-    toasts: Toast[];
-    hints?: ActionHintInput;
-    /** Legacy assembly props are accepted but never mount an activity spinner. */
-    activity?: React.ReactNode;
-    activityGlyph?: React.ReactElement | null;
-    update?: React.ReactNode;
+    plan: StatusLinePlan;
+    columns: number;
     theme: Theme;
 }
-export declare function BottomStatusRow(props: BottomStatusRowProps): React.ReactElement;
+export declare function BottomStatusRow({ plan, columns, theme }: BottomStatusRowProps): React.ReactElement;

package/dist/ui/BottomStatusRow.js

@@ -1,12 +1,8 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { Box, Text, useStdout } from 'ink';
-import { buildActionClauses } from './interaction-hints.js';
-export function BottomStatusRow(props) {
-    const { stdout } = useStdout();
-    const toast = props.toasts[props.toasts.length - 1];
-    const hints = props.hints ?? { cols: stdout?.columns ?? 80,
-        interactionPhase: props.activity ? 'running' : 'idle' };
-    const clauses = buildActionClauses({ ...hints, toast: hints.toast ?? toast?.text,
-        updateAvailable: hints.updateAvailable ?? Boolean(props.update) });
-    return _jsx(Box, { height: 1, width: hints.cols, flexShrink: 0, children: _jsxs(Text, { color: toast?.level === 'error' ? props.theme.noticeError : props.theme.muted, children: [' ', clauses.join(' | ')] }) });
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/** Renders an already allocated detail row; it never chooses visibility or animation. */
+import React from 'react';
+import { Box, Text } from 'ink';
+export function BottomStatusRow({ plan, columns, theme }) {
+    const tones = { normal: theme.primary, muted: theme.muted, warning: theme.noticeWarn, error: theme.noticeError };
+    return _jsxs(Box, { height: 1, width: columns, flexShrink: 0, overflow: "hidden", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: " " }) }), plan.fields.map((field, index) => _jsxs(React.Fragment, { children: [index > 0 && _jsx(Box, { width: plan.separatorCells, flexShrink: 0, children: _jsx(Text, { color: theme.muted, children: plan.separator }) }), _jsx(Box, { width: field.cells, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", color: tones[field.tone], children: field.text }) })] }, field.id))] });
 }

package/dist/ui/Composer.d.ts

@@ -20,6 +20,8 @@ export interface ComposerProps {
     /** Compatibility prop; activity is now rendered by the global StatusBar. */
     runRow?: RunRowProps | null;
     cols?: number;
+    terminalRows?: number;
+    statusExpanded?: boolean;
     deleteDisambiguated?: boolean;
     onCompletionContextChange?: (context: 'none' | 'slash' | 'file') => void;
     cursorVisible?: boolean;
@@ -47,7 +49,7 @@ export interface ComposerProps {
     popupMaxRows?: number;
     popupMaxHeight?: number;
     onPopupRowsChange?: (rows: number) => void;
-    /** Rows of newer output below the viewport, forwarded to the input's scroll chip. */
+    /** Compatibility prop; history position is displayed by Header. */
     scrolledLines?: number;
     /** Compatibility prop; the global status and action rows show live services. */
     services?: number;
@@ -86,5 +88,5 @@ declare function hintText(opts: {
 }): string;
 /** Compatibility export for existing hint contract tests. */
 export declare const hintTextForTest: typeof hintText;
-export declare function Composer({ deleteDisambiguated, onCompletionContextChange, cols, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, agentMode, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }: ComposerProps): React.ReactElement;
+export declare function Composer({ deleteDisambiguated, onCompletionContextChange, cols, terminalRows, statusExpanded, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, agentMode, popupMaxRows, popupMaxHeight, onPopupRowsChange, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }: ComposerProps): React.ReactElement;
 export {};

package/dist/ui/Composer.js

@@ -36,7 +36,7 @@ function hintText(opts) {
 }
 /** Compatibility export for existing hint contract tests. */
 export const hintTextForTest = hintText;
-export function Composer({ deleteDisambiguated, onCompletionContextChange, cols, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, agentMode, popupMaxRows, popupMaxHeight, onPopupRowsChange, scrolledLines = 0, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }) {
+export function Composer({ deleteDisambiguated, onCompletionContextChange, cols, terminalRows, statusExpanded, cursorVisible, onInteraction, measureRef, isActive, reducedMotion, onEscape, onEscapeDismiss, running, history, commands, cwd, agentMode, popupMaxRows, popupMaxHeight, onPopupRowsChange, onDraftRows, onNotice, theme, caps, onSubmit, onHelp, }) {
     const [hasDraft, setHasDraft] = useState(false);
     const onDraftChange = useCallback((next) => {
         setHasDraft(next.hasDraft);
@@ -54,5 +54,5 @@ export function Composer({ deleteDisambiguated, onCompletionContextChange, cols,
                 : hasDraft
                     ? theme.focusBorder ?? theme.primary
                     : theme.idleBorder ?? theme.border;
-    return (_jsx(Box, { ref: measureRef, flexDirection: "column", flexShrink: 0, children: _jsx(PromptInput, { deleteDisambiguated: deleteDisambiguated, onCompletionContextChange: onCompletionContextChange, 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 }) }));
+    return (_jsx(Box, { ref: measureRef, width: cols, flexDirection: "column", flexShrink: 0, children: _jsx(PromptInput, { deleteDisambiguated: deleteDisambiguated, onCompletionContextChange: onCompletionContextChange, cols: cols, terminalRows: terminalRows, statusExpanded: statusExpanded, 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 }) }));
 }

package/dist/ui/Header.d.ts

@@ -1,4 +1,4 @@
-/** One-row brand bar, with a compact variant for narrow terminals. */
+/** One-row brand bar with a fixed-width history and detail affordance. */
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
@@ -11,6 +11,10 @@ interface HeaderProps {
     variant: HeaderVariant;
     theme: Theme;
     caps: TermCapabilities;
+    columns?: number;
+    statusExpanded?: boolean;
+    scrolledLines?: number;
+    overlayOpen?: boolean;
 }
-export declare function Header({ cwd, provider, model, hasKey, variant, theme, caps, }: HeaderProps): React.ReactElement;
+export declare function Header({ cwd, provider, model, hasKey, variant, theme, caps, columns, statusExpanded, scrolledLines, overlayOpen }: HeaderProps): React.ReactElement;
 export {};

package/dist/ui/Header.js

@@ -1,10 +1,11 @@
-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";
 import { basename } from 'node:path';
 import { Box, Text } from 'ink';
 import { Logo } from './Logo.js';
-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 }) }) }));
-    }
-    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] })] }) }));
+export function Header({ cwd, provider, model, hasKey, variant, theme, caps, columns = 80, statusExpanded = false, scrolledLines = 0, overlayOpen = false }) {
+    const scroll = Number.isFinite(scrolledLines) && scrolledLines > 0
+        ? (scrolledLines > 9999 ? '^9999+' : '^' + Math.floor(scrolledLines)) + (overlayOpen ? ' ' : '  ') : '';
+    const detail = overlayOpen ? (statusExpanded ? 'Details on' : 'Details off')
+        : '^G ' + (statusExpanded ? 'less' : 'more');
+    return _jsxs(Box, { flexDirection: "row", height: 1, width: columns, flexShrink: 0, overflow: "hidden", children: [_jsx(Box, { width: Math.max(0, columns - 18), flexShrink: 0, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", children: [_jsx(Logo, { variant: variant === 'mini' ? 'mini' : 'bar', theme: theme, caps: caps }), variant !== 'mini' && _jsxs(_Fragment, { children: [_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] })] })] }) }), _jsx(Box, { width: 18, flexShrink: 0, justifyContent: "flex-end", children: _jsx(Text, { color: theme.muted, wrap: "truncate", children: scroll + detail }) })] });
 }

package/dist/ui/PromptInput.d.ts

@@ -33,6 +33,8 @@ export interface CommandOption {
 }
 interface PromptInputProps {
     cols?: number;
+    terminalRows?: number;
+    statusExpanded?: boolean;
     cursorVisible?: boolean;
     onInteraction?: () => void;
     isActive: boolean;
@@ -157,5 +159,5 @@ export declare function fileTokenAt(buffer: string, cursor: number): {
     end: number;
     query: string;
 } | null;
-export declare function PromptInput({ cols: colsProp, cursorVisible, onInteraction, isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, onCompletionContextChange, deleteDisambiguated, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion, borderColor, onDraftChange, onNotice, scrolledLines, }: PromptInputProps): React.ReactElement;
+export declare function PromptInput({ cols: colsProp, terminalRows: terminalRowsProp, statusExpanded, cursorVisible, onInteraction, isActive, running, history, commands, cwd, theme, caps, popupMaxRows, popupMaxHeight, onPopupRowsChange, onCompletionContextChange, deleteDisambiguated, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion, borderColor, onDraftChange, onNotice, }: PromptInputProps): React.ReactElement;
 export {};

package/dist/ui/PromptInput.js

@@ -21,6 +21,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  */
 import { useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
+import { popupCapacity } from './layout/budget.js';
 import { glob as tinyGlob } from 'tinyglobby';
 import { pickGlyphs } from './glyphs.js';
 import { PromptCaret } from './PromptCaret.js';
@@ -243,7 +244,7 @@ function isControlSeq(input) {
 // ---------------------------------------------------------------------------
 // Component
 // ---------------------------------------------------------------------------
-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, }) {
+export function PromptInput({ cols: colsProp, terminalRows: terminalRowsProp, statusExpanded = false, 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, }) {
     const { stdout } = useStdout();
     const [editor, dispatch] = useReducer(editorReducer, INITIAL_EDITOR_STATE);
     const { buffer, cursor, historyIndex, dismissed, sel } = editor;
@@ -260,30 +261,6 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
             ? fileMatches.map((p) => ({ label: p }))
             : [];
     const clampedSel = popupItems.length > 0 ? Math.min(sel, popupItems.length - 1) : 0;
-    const popupLayout = buildAutocompleteLayout({
-        itemCount: isActive ? popupItems.length : 0,
-        selected: clampedSel,
-        maxRows: popupMaxRows,
-        maxHeight: popupMaxHeight,
-    });
-    const popupVisible = isActive && popupLayout.rowCount > 0;
-    // Report on every mount, including zero. Cleanup belongs to a separate
-    // effect so changing height does not publish an intermediate zero budget.
-    useLayoutEffect(() => {
-        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) {
@@ -322,13 +299,12 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     // the trap `BottomStatusRow.tsx:5-27` documents.
     const glyphs = pickGlyphs(caps);
     const cols = colsProp ?? stdout?.columns ?? 80;
-    const terminalRows = stdout?.rows ?? 24;
-    const chip = scrollChip(scrolledLines, cols, glyphs);
+    const terminalRows = terminalRowsProp ?? stdout?.rows ?? 24;
     // Err NARROW. Wrapping wider than the box Ink gives us would make Ink wrap a
     // second time, and then `layout.rows.length` is a lie — which is the one thing
     // this module may not be.
     const chromeCols = 2 /* border */ + 2 /* paddingX */ + 2 /* marker */;
-    const baseCols = Math.max(8, cols - chromeCols - (chip ? chip.cells + 1 : 0));
+    const baseCols = Math.max(8, cols - chromeCols);
     const measure = (wrapCols) => layoutComposer({
         buffer,
         cursor,
@@ -356,6 +332,31 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     const preferredColumnWidth = useRef();
     useLayoutEffect(() => { preferredColumnWidth.current = undefined; }, [usableCols]);
     const draftRowCount = Math.max(1, layout.rows.length);
+    const menuCapacity = Math.min(popupMaxHeight ?? Infinity, popupCapacity(terminalRows, draftRowCount, statusExpanded));
+    const popupLayout = buildAutocompleteLayout({
+        itemCount: isActive ? popupItems.length : 0,
+        selected: clampedSel,
+        maxRows: popupMaxRows,
+        maxHeight: menuCapacity,
+    });
+    const popupVisible = isActive && popupLayout.rowCount > 0;
+    // Report on every mount, including zero. Cleanup belongs to a separate
+    // effect so changing height does not publish an intermediate zero budget.
+    useLayoutEffect(() => {
+        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'), []);
     const caretResetKey = useMemo(() => ({}), [buffer, cursor, isActive, usableCols]);
     // --- Draft presence and height, reported only on a transition. -----------
     // Notifying on every keystroke would re-render the whole App tree per key. The
@@ -363,7 +364,7 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
     // (R-6), so widening this callback does not widen how often it fires.
     const hasDraft = buffer.length > 0;
     const lastReportedDraft = useRef(null);
-    useEffect(() => {
+    useLayoutEffect(() => {
         if (!onDraftChange)
             return;
         const last = lastReportedDraft.current;
@@ -385,7 +386,7 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
         const selectedIndex = Math.min(state.sel, (suggestions?.length ?? 0) - 1);
         const suggestionLayout = buildAutocompleteLayout({
             itemCount: isActive ? suggestions?.length ?? 0 : 0,
-            selected: selectedIndex, maxRows: popupMaxRows, maxHeight: popupMaxHeight,
+            selected: selectedIndex, maxRows: popupMaxRows, maxHeight: menuCapacity,
         });
         const selected = suggestionLayout.rowCount > 0 ? suggestions?.[selectedIndex] : undefined;
         const text = selected?.label ?? expandPastes(state.buffer, state.pastes);
@@ -605,16 +606,6 @@ export function PromptInput({ cols: colsProp, cursorVisible = true, onInteractio
                 // The overflow indicator rides the LAST rendered row rather than
                 // taking one of its own: an extra row would put the composer's
                 // real height one above the `draftRows` it just reported (I-8).
-                _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { children: node }) }), _jsx(Box, { flexShrink: 0, width: overflow.cells, justifyContent: "flex-end", children: _jsx(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: overflow.text }) })] }, i)) : (_jsx(Text, { children: node }, i)))) }), chip && (
-            // `alignSelf="flex-start"` pins the chip to the FIRST row of a multi-line
-            // draft. Yoga's default `stretch` sizes this box to the full height of the
-            // editor; it renders on the top row either way today, and relying on that
-            // is how a later `justifyContent` edit moves it without failing anything.
-            //
-            // `width={chip.cells}` is a FIXED cell, not the chip's natural width
-            // (P2-4). The chip is the only thing on this row whose width changes while
-            // the user is typing — `↓ 9` becomes `↓ 10` becomes `↓ 100` — and every
-            // change would otherwise re-wrap a draft that fills the line.
-            _jsx(Box, { flexShrink: 0, alignSelf: "flex-start", marginLeft: 1, width: chip.cells, justifyContent: "flex-end", children: _jsx(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: chip.text }) }))] }));
+                _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { children: node }) }), _jsx(Box, { flexShrink: 0, width: overflow.cells, justifyContent: "flex-end", children: _jsx(Text, { wrap: "truncate", color: theme.hintFg ?? theme.muted, children: overflow.text }) })] }, i)) : (_jsx(Text, { children: node }, i)))) })] }));
     return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [popupVisible && (_jsx(AutocompletePopup, { items: popupItems, selected: clampedSel, theme: theme, caps: caps, maxRows: popupMaxRows, layout: popupLayout })), (_jsx(Box, { flexDirection: "column", flexShrink: 0, borderStyle: glyphs.boxStyle, borderColor: borderColor, paddingX: 1, children: inputRow }))] }));
 }

package/dist/ui/StatusBar.d.ts

@@ -7,7 +7,13 @@ import type { ContextUsageSnapshot } from '../compaction/types.js';
 import type { AgentMode } from '../agent/agent-mode.js';
 import type { PendingSteering } from '../agent/queued-messages.js';
 import { type RunPhase } from './layout/status-layout.js';
+import type { EscapeAction, StatusFeedback } from './status-feedback.js';
 export interface StatusBarProps {
+    columns: number;
+    speedKnown: boolean;
+    feedback?: StatusFeedback;
+    escapeAction?: EscapeAction;
+    interruptPhase?: 'ready' | 'armed' | 'stopping';
     runPhase?: RunPhase;
     activeTool?: {
         name: string;

package/dist/ui/StatusBar.js

@@ -1,24 +1,25 @@
 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 { Box, Text } from 'ink';
 import { pickGlyphs } from './glyphs.js';
 import { liveSpinner } from './ActivityLine.js';
-import { planStatusFields } from './layout/status-layout.js';
+import { planPrimaryStatusFields } 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 { stdout } = useStdout();
-    const cols = stdout?.columns ?? 80;
+    const cols = props.columns;
     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({
+    const plan = planPrimaryStatusFields({
         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 : '',
+        activeTool: props.activeTool, runOutcome: props.runOutcome, spinner: glyph,
+        speedKnown: props.speedKnown, feedback: props.feedback, escapeAction: props.escapeAction,
+        interruptPhase: props.interruptPhase,
         waitingForConfirmation: props.waitingForConfirmation, stopping: props.stopping,
         compacting: props.compactionActive?.inFlight, retryActive: props.retryActive,
         mode: props.agentMode, pendingMode: props.pendingAgentMode, servicesActive: props.servicesActive,
@@ -27,7 +28,7 @@ export function StatusBar(props) {
     });
     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
+    return _jsxs(Box, { width: cols, height: 1, flexShrink: 0, flexDirection: "row", overflow: "hidden", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: redrawChar(props.redrawNonce ?? 0) }) }), plan.fields.map((item, index) => _jsxs(React.Fragment, { children: [index > 0 && _jsx(Box, { width: plan.separatorCells, flexShrink: 0, children: _jsx(Text, { color: props.theme.muted, children: plan.separator }) }), _jsx(Box, { width: item.cells, flexShrink: 0, children: _jsx(Text, { color: tones[item.tone], wrap: "truncate", children: item.id === 'phase' && active
                                 ? _jsxs(_Fragment, { children: [spinner ?? glyph, item.text.slice(glyph.length)] })
                                 : item.text }) })] }, item.id))] });
 }

package/dist/ui/Transcript.js

@@ -98,7 +98,7 @@ function EntryViewImpl({ entry, prev, expanded, thinkingVisible, reducedMotion,
         case 'fast':
             return frame(entry.status === 'failed' ? glyphs.toolError : glyphs.teamAgent, fastCardColor(entry.status, theme), _jsx(FastCard, { reviewIndex: entry.reviewIndex, model: entry.model, status: entry.status, text: entry.text, detail: entry.detail, turn: entry.turn, durationMs: entry.durationMs, live: entry.live, reducedMotion: reducedMotion, theme: theme, caps: caps }));
         case 'compaction':
-            return frame(entry.applied || entry.live ? glyphs.compaction : glyphs.toolError, compactionCardColor(entry, theme), _jsx(CompactionCard, { index: entry.index, trigger: entry.trigger, mode: entry.mode, applied: entry.applied, reason: entry.reason, messagesBefore: entry.messagesBefore, messagesAfter: entry.messagesAfter, tokensBefore: entry.tokensBefore, tokensAfter: entry.tokensAfter, summary: entry.summary, model: entry.model, durationMs: entry.durationMs, tailRelief: entry.tailRelief, 
+            return frame(entry.applied || entry.live ? glyphs.compaction : glyphs.toolError, compactionCardColor(entry, theme), _jsx(CompactionCard, { index: entry.index, decision: entry.decision, memoryVersion: entry.memoryVersion, trigger: entry.trigger, mode: entry.mode, applied: entry.applied, reason: entry.reason, messagesBefore: entry.messagesBefore, messagesAfter: entry.messagesAfter, tokensBefore: entry.tokensBefore, tokensAfter: entry.tokensAfter, summary: entry.summary, model: entry.model, durationMs: entry.durationMs, tailRelief: entry.tailRelief, 
                 // ONLY WHILE LIVE, and only when the clock has ticked at least once:
                 // `nowSec` is `undefined` until then, and a settled card must keep
                 // rendering `durationMs` rather than a figure that would drift.

package/dist/ui/entries/CompactionCard.d.ts

@@ -22,8 +22,10 @@
 import React from 'react';
 import type { Theme } from '../theme.js';
 import type { TermCapabilities } from '../capabilities.js';
-import type { CompactionMode, CompactionUiTrigger } from '../../compaction/types.js';
+import type { CompactionDecision, CompactionMode, CompactionUiTrigger } from '../../compaction/types.js';
 export interface CompactionCardProps {
+    decision?: CompactionDecision;
+    memoryVersion?: 2;
     index: number;
     trigger: CompactionUiTrigger;
     mode: CompactionMode;

package/dist/ui/entries/CompactionCard.js

@@ -59,7 +59,7 @@ function headline(props, arrow, dot) {
             ? `compacting context #${index}${dot}${props.model}${elapsed}`
             : `compacting context #${index}${elapsed}`;
     }
-    if (!props.applied) {
+    if (!props.applied || props.tokensAfter >= props.tokensBefore) {
         const why = props.reason ? `: ${props.reason}` : '';
         return `context not compacted #${index}${why}`;
     }
@@ -90,8 +90,8 @@ function detailLine(props) {
             return '';
         return `summarizing with ${props.model} - esc to cancel`;
     }
-    if (!props.applied)
-        return props.mode === 'none' && !props.reason ? 'nothing was changed' : '';
+    if (!props.applied || props.tokensAfter >= props.tokensBefore)
+        return 'History preserved.';
     const dropped = Math.max(0, props.messagesBefore - props.messagesAfter);
     if (props.mode === 'relieved') {
         const n = props.tailRelief?.messages ?? 0;
@@ -138,7 +138,8 @@ function CompactionCardImpl(props) {
     const head = headline(props, glyphs.arrowRight, dot);
     const detail = detailLine(props);
     const relief = reliefLine(props);
-    const rows = summary ? summaryRows(summary, expanded === true) : [];
+    const showMemory = props.memoryVersion !== 2 || expanded === true;
+    const rows = summary && showMemory ? summaryRows(summary, expanded === true) : [];
     const totalRows = summary ? summary.split('\n').filter((l) => l.trim().length > 0).length : 0;
     const hidden = Math.max(0, totalRows - rows.length);
     // COLOUR TRACKS `live`, MOTION TRACKS `animate` — one headline, two separate
@@ -147,7 +148,8 @@ function CompactionCardImpl(props) {
     // every run, and folding the two together would grey out every live card for
     // the whole run, losing the status colour along with the motion.
     const animate = live && reducedMotion !== true && caps.unicode;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: theme.accent, bold: true, children: "compact" }), _jsxs(Text, { color: live ? color : theme.muted, wrap: "truncate", children: ['  ', animate ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { type: "dots" }), ' '] })) : live ? (`${glyphs.spinnerStill} `) : (''), head] })] }), detail.length > 0 && (_jsx(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, children: _jsx(Text, { color: color, wrap: "truncate", children: detail }) })), relief.length > 0 && (_jsx(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, children: _jsx(Text, { color: theme.noticeWarn, children: relief }) })), rows.length > 0 && (_jsxs(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, ...railBorderProps(glyphs.railVertical, theme.border), children: [rows.map((line, index) => (_jsx(Text, { color: theme.primary, children: line }, index))), hidden > 0 && (_jsxs(Text, { color: theme.muted, children: [glyphs.railEnd, " +", hidden, " more lines (ctrl+o to expand)"] })), hidden === 0 && expanded === true && totalRows > COMPACTION_LIMITS.cardTextRows && (_jsxs(Text, { color: theme.muted, children: [glyphs.railEnd, " ctrl+o to collapse"] }))] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.accent, bold: true, children: props.trigger === 'manual' ? 'Manual compaction' : props.trigger === 'overflow'
+                            ? 'Overflow: threshold reached' : 'Automatic: threshold reached' }), _jsxs(Text, { color: live ? color : theme.muted, wrap: caps.unicode ? 'truncate' : 'wrap', children: [animate ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { type: "dots" }), ' '] })) : live ? (`${glyphs.spinnerStill} `) : (''), head] })] }), props.memoryVersion === 2 && (_jsxs(Text, { color: theme.muted, children: ["Task memory v2", expanded ? '' : ' (ctrl+o to expand)'] })), detail.length > 0 && (_jsx(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, children: _jsx(Text, { color: color, wrap: caps.unicode ? 'truncate' : 'wrap', children: detail }) })), relief.length > 0 && (_jsx(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, children: _jsx(Text, { color: theme.noticeWarn, children: relief }) })), rows.length > 0 && (_jsxs(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, ...railBorderProps(glyphs.railVertical, theme.border), children: [rows.map((line, index) => (_jsx(Text, { color: theme.primary, children: line }, index))), hidden > 0 && (_jsxs(Text, { color: theme.muted, children: [glyphs.railEnd, " +", hidden, " more lines (ctrl+o to expand)"] })), hidden === 0 && expanded === true && totalRows > COMPACTION_LIMITS.cardTextRows && (_jsxs(Text, { color: theme.muted, children: [glyphs.railEnd, " ctrl+o to collapse"] }))] }))] }));
 }
 /**
  * `React.memo` with the DEFAULT comparator (tui-render-performance L2 / R3).

package/dist/ui/frame-differ.js

@@ -64,6 +64,18 @@ const ERASE_DOWN = `${CSI}J`;
 /** DEC private mode 2026 — begin/end synchronized update (F2, §3.3). */
 const SYNC_BEGIN = `${CSI}?2026h`;
 const SYNC_END = `${CSI}?2026l`;
+/**
+ * `ansiEscapes.clearTerminal` — Ink's tall-frame write (`ink.js:121`).
+ *
+ * When `outputHeight >= stdout.rows` Ink abandons log-update and writes
+ * `clearTerminal + frame` in one chunk: no erase-lines prefix, no trailing
+ * `\n`. That happens on ANY height shrink, because Ink re-renders
+ * synchronously from its own `'resize'` handler while the React tree still
+ * holds the pre-resize height (`useTerminalSize` debounces 50 ms). Without
+ * recognition the chunk lands in the prefix-less branch and counts as a
+ * foreign write — the same §5.6 notice, one ordinary window-drag later.
+ */
+const CLEAR_TERMINAL = `${CSI}2J${CSI}3J${CSI}H`;
 function cursorTo(row) {
     return `${CSI}${row};1H`;
 }
@@ -294,6 +306,21 @@ export function createFrameDiffer(options) {
         return wrapSync(out.join(''));
     };
     const transform = (chunk) => {
+        // A+ · Ink's tall-frame write (see CLEAR_TERMINAL above): a shrink makes
+        // `outputHeight >= stdout.rows` while the tree still holds the old height,
+        // so Ink bypasses log-update and writes clearTerminal + frame in one chunk.
+        // The chunk paints the whole frame by itself, so it needs no parsing: pass
+        // it through, drop the cache (the screen it described is gone), and do NOT
+        // count it — this is Ink's own write at a moment absolute addressing cannot
+        // cover, not something behind Ink's back. The next log-update frame lands
+        // on an empty cache and is a full repaint, exactly what a cleared screen
+        // needs. Checked BEFORE the seed bookkeeping — and it must be, because the
+        // tall-frame write bypasses `this.log`: log-update's own
+        // `previousLineCount` stays 0, so the first log-update frame after it still
+        // carries no erase prefix. THAT write is the session's genuine seed frame
+        // (P1-1), and a control write arriving first must not spend its exemption.
+        if (chunk.startsWith(CLEAR_TERMINAL))
+            return passThrough(false);
         const firstChunk = !seenAnyChunk;
         seenAnyChunk = true;
         const rows = usableRows();

package/dist/ui/frame-observer.js

@@ -9,16 +9,25 @@ function summarizeFrame(chunk, rows, cols) {
     const unicode = pickGlyphs({ unicode: true, colorLevel: 0 });
     const cells = new Set(['|', '#', unicode.scrollTrack, unicode.scrollThumb]);
     const plain = lines.map((line) => stripAnsi(line));
-    const track = plain.slice(1, rows - 3);
-    if (plain.some((line) => stringWidth(line) > cols) ||
-        !track.every((line) => stringWidth(line) === cols && cells.has(line.slice(-1))))
+    if (plain.some((line) => stringWidth(line) > cols))
         return null;
-    return { columns: cols, rows, trackTop: 2, trackRows: rows - 4 };
+    let trackRows = 0;
+    // Fixed composer/status slots have no last-column rail. Discover the actual
+    // message track, then acknowledge it only against the published Yoga geometry.
+    for (const line of plain.slice(1)) {
+        if (stringWidth(line) !== cols || !cells.has(line.slice(-1)))
+            break;
+        trackRows++;
+    }
+    if (trackRows < 1)
+        return null;
+    return { columns: cols, rows, trackTop: 2, trackRows };
 }
 /** Observe before differ transformation, but acknowledge only after downstream write returns. */
 export function createFrameObserver(options) {
     const { stdout, terminal, scrollbar } = options;
     let summary = null;
+    let summaryRevision;
     let disposed = false;
     let resizeTimer = null;
     const invalidate = () => { summary = null; scrollbar.invalidate(); };
@@ -37,12 +46,16 @@ export function createFrameObserver(options) {
     };
     const match = () => {
         const g = scrollbar.geometry;
+        if (summary && g && summaryRevision === undefined)
+            summaryRevision = g.revision;
         scrollbar.frameReady = !!summary && !!g && summary.columns === terminal.columns &&
             summary.rows === terminal.rows && g.trackCol === summary.columns &&
-            g.trackTop === summary.trackTop && g.trackRows === summary.trackRows;
+            g.trackTop === summary.trackTop && g.trackRows === summary.trackRows &&
+            g.revision === summaryRevision;
     };
     const observe = (chunk) => {
         summary = summarizeFrame(chunk, terminal.rows, terminal.columns);
+        summaryRevision = scrollbar.geometry?.revision;
         if (!summary) {
             invalidate();
             return;