@aragon-agent/cli 0.6.11 → 0.6.13

package/dist/ui/BottomStatusRow.d.ts

@@ -1,95 +1,15 @@
-/**
- * The bottom status row — the one already-budgeted row above the composer, now
- * shared by two occupants (agent-activity-presentation §3.2.3 / D-17 / P0-1).
- *
- * THE ACTIVITY LINE IS NOT A NEW `AppShell` SLOT, AND THIS FILE IS WHY.
- *
- * `viewportRows()` (`layout/budget.ts`) is the ONE function that says how many
- * rows the viewport gets, and it enumerates exactly `header + toast + composer +
- * status`. In full-screen `AppShell`'s root is `height={frameHeight(rows)}` with
- * `overflow="hidden"`, the bottom chrome box is `flexShrink={0}` and the viewport
- * box is its only `flexShrink={1}` child — so an extra chrome row does not make
- * the frame taller, Yoga takes the row out of the TRANSCRIPT. Meanwhile
- * `viewportRows()` keeps returning the old number to `ScrollViewport`,
- * `selectWindow`'s spacers, `overlayMaxRows`, `popupMaxRows` and `buildTodoRailLayout`.
- * The transcript would draw one row shorter than every consumer believes, ONLY
- * WHILE A RUN IS IN FLIGHT, so the layout would shift on submit and shift back on
- * `agent_end`.
- *
- * `ToastStack.tsx` already legislates this for itself: *"in `fullscreen` this
- * ALWAYS occupies exactly one row — an empty row when there is nothing to say.
- * Rendering conditionally would make the viewport height (and therefore the whole
- * transcript) jump every time a toast appears or expires."* A run starts and ends
- * far more often than a toast appears and expires, so the activity line is the
- * STRONGER case for that rule, not an exception to it.
- *
- * Sharing the row means `budget.ts` and `AppShell.tsx` come out of this round
- * UNMODIFIED — and `budget.test.ts` asserts that they did (AC-8a, DoD #8).
- *
- * PRECEDENCE: toast > activity > update > blank. A toast wins because a
- * transient ack is a RESPONSE TO THE USER, and the row nearest the input belongs
- * to it. The update line is LAST because it is the only one of the three that is
- * PERSISTENT (cli-auto-update D-2): it loses nothing by waiting for the run to
- * end, whereas an activity line deferred is an activity line that never renders.
- * That also means a user who is actively working never sees the updater at all
- * until they stop, which is the whole of the silence requirement.
- *
- * THE TOAST TAKES THE ROW BUT NOT THE SPINNER
- * (`activity-spinner-vanishes-behind-toast`). "Toast wins" used to mean the
- * activity line was never mounted while an ack was up — and because `App`
- * suppresses the other seven animated sites for exactly as long as it BELIEVES
- * this row is showing one, a mid-run toast left the whole frame with ZERO
- * animations for its 2.5 s TTL, indistinguishable from a hung process. Steering
- * and plan approval both ack mid-run, so a long run hit it repeatedly.
- *
- * The row still belongs to the toast: the spinner joins it as a bare glyph, no
- * phrase and no clock, so `bottom-status-row.test.tsx`'s "the ack keeps its
- * words" assertion and the toast's own width are both untouched. A row-direction
- * box holding two one-row children is STILL ONE ROW, which is what the note
- * above actually forbids disturbing — `budget.ts` and `AppShell.tsx` stay out of
- * it. And because the glyph is mounted under precisely the condition `App` uses
- * to suppress the others, "the line is up" and "every other site is still" agree
- * again by construction rather than by enumeration of what can pre-empt the row.
- */
+/** The permanent action/feedback row. StatusBar owns all activity 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';
 export interface BottomStatusRowProps {
     toasts: Toast[];
-    /** `<ActivityLine>` while a run owns the screen, else `null`. */
-    activity: React.ReactNode;
-    /**
-     * The bare animated spinner (`liveSpinner`), or `null` when it would be a
-     * STATIC glyph — an ASCII terminal, or `reducedMotion`.
-     *
-     * IT IS NOT A SECOND MOUNT CONDITION. `activity` alone decides whether a life
-     * signal belongs on this row; this prop only says which FORM the signal takes,
-     * and it is read only when `activity` is non-null. So a caller cannot make the
-     * two disagree, which is the failure mode that produced this prop.
-     *
-     * `null` means PREFIX NOTHING, not "prefix the still glyph". A static `·` in
-     * front of every toast would be a visible change to ASCII terminals and to
-     * users who asked for stillness — neither of whom ever had the dead-frame bug,
-     * and both of whom must come out byte-identical.
-     */
+    hints?: ActionHintInput;
+    /** Legacy assembly props are accepted but never mount an activity spinner. */
+    activity?: React.ReactNode;
     activityGlyph?: React.ReactElement | null;
-    /**
-     * `<UpdateLine>` when the updater has something to say, else `null` — AND THE
-     * CALLER DECIDES WHICH (C-15 / cli-auto-update P0-1).
-     *
-     * `if (update)` below tests a REACT ELEMENT, and an element whose own render
-     * returns `null` is still truthy: that branch would emit a box of ZERO rows,
-     * the frame would keep its fixed height, Yoga would hand the row to the
-     * transcript, and `viewportRows()` would go on reporting the old number to
-     * five consumers. So `UpdateLine` is typed `React.ReactElement` and `App`
-     * gates it with `shouldRenderUpdateLine(snapshot)`.
-     *
-     * OPTIONAL, because `bottom-status-row.test.tsx` and the `App.tsx` fixtures
-     * construct this component without it and the test tree is inside
-     * `tsconfig.test.json` (`typecheck-scope.test.ts`); a required prop turns
-     * `npm run typecheck` red for a reason unrelated to this feature (P2-1).
-     */
     update?: React.ReactNode;
     theme: Theme;
 }
-export declare function BottomStatusRow({ toasts, activity, activityGlyph, update, theme, }: BottomStatusRowProps): React.ReactElement | null;
+export declare function BottomStatusRow(props: BottomStatusRowProps): React.ReactElement;

package/dist/ui/BottomStatusRow.js

@@ -1,27 +1,12 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text } from 'ink';
-import { ToastStack } from './ToastStack.js';
-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 });
-        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
-        // being true. Left implicit, it reads as an oversight next to the child
-        // 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, 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 }) })] }));
-    }
-    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 });
+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(' | ')] }) });
 }

package/dist/ui/Composer.d.ts

@@ -1,31 +1,14 @@
-/**
- * Composer (spec §4.7) — the thin shell around the existing `PromptInput`.
- *
- * Owns exactly two things: the semantic border color and the hint row. The
- * editor's pure helpers (`applyEdit` / `moveVertical` / `slashSuggestions` /
- * `fileTokenAt`) are untouched, so `input.test.ts` keeps passing.
- *
- * The draft flag is held HERE rather than in `App`: the border has to react to
- * "the input is no longer empty", and routing that through App would re-render
- * the transcript on the first keystroke of every message.
- *
- * The fixed status row retains emergency and history-navigation hints while
- * this footer scrolls outside the viewport. Editor state stays mounted.
- */
+/** Input border and draft shell. Global action hints and activity live below the viewport. */
 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 { ComposerSubmitResult } from './composer-input.js';
 import { type CommandOption } from './PromptInput.js';
-import { type RunActivity } from './run-status-row.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 `queue / 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.
- */
+/** Legacy caller shape retained for source compatibility; Composer no longer mounts it. */
 export interface RunRowProps {
     activity: RunActivity;
     /** The row is in the viewport with no overlay: draw the animated spinner. */
@@ -34,9 +17,11 @@ export interface RunRowProps {
     rowRef?: React.RefObject<DOMElement>;
 }
 export interface ComposerProps {
-    /** Present only while the run status row replaces the hint row below the input. */
+    /** Compatibility prop; activity is now rendered by the global StatusBar. */
     runRow?: RunRowProps | null;
     cols?: number;
+    deleteDisambiguated?: boolean;
+    onCompletionContextChange?: (context: 'none' | 'slash' | 'file') => void;
     cursorVisible?: boolean;
     onInteraction?: () => void;
     measureRef?: React.RefObject<DOMElement>;
@@ -51,48 +36,20 @@ export interface ComposerProps {
     cwd: string;
     /** Dropped on short terminals to buy back a row (§5.4). */
     showHint: boolean;
-    /** Lifetime submissions; drives progressive disclosure of the idle hint. */
+    /** Compatibility prop; submission count no longer hides essential actions. */
     submitCount: number;
-    /** User opt-out (`--no-hints` / `hints: false`). */
+    /** Compatibility prop; App owns secondary teaching-hint visibility. */
     hintsEnabled: boolean;
-    /** Mirror of the controller's effective mode; drives the chip and the border. */
+    /** Mirror of the controller's effective mode; drives the border. */
     agentMode: AgentMode;
-    /**
-     * Which key this hint should NAME for the mode toggle
-     * (shift-tab-mode-toggle-still-dead-on-windows, C3-1).
-     *
-     * A PROP RATHER THAN A CONSTANT because on some consoles the constant is a
-     * lie. This row used to render `shift+tab` unconditionally, with no link to
-     * the capability check three files away, so the machines where that key is
-     * swallowed were the ones being told to press it - permanently, on every
-     * frame, while the one warning they got scrolled out of the transcript
-     * minutes earlier (analysis section 3.7). Defaults to the primary key, which
-     * is what every unaffected machine renders.
-     */
+    /** Compatibility prop; the global action row names the effective mode key. */
     modeToggleKey?: string;
     popupMaxRows?: number;
     popupMaxHeight?: number;
     onPopupRowsChange?: (rows: number) => void;
-    /**
-     * Rows of newer output below the viewport, forwarded to the input row's chip
-     * (tui-selection-and-scroll-follow §4.2 / G7).
-     *
-     * IT IS STATE, NOT A FADEABLE HINT, and it therefore does NOT pass through the
-     * `showHint` / `hintsEnabled` gate below. Those two govern the teaching row —
-     * which retires keys the user has demonstrably learned and is dropped outright
-     * on a short terminal — and "you are 12 rows behind the newest output" is
-     * neither learnable nor optional. Same argument that keeps `esc abort`
-     * un-faded in `hintText`.
-     */
+    /** Rows of newer output below the viewport, forwarded to the input's scroll chip. */
     scrolledLines?: number;
-    /**
-     * Live background services (background-service-supervision §3.8), 0 when none.
-     *
-     * IT IS STATE, NOT A FADEABLE HINT, exactly like `scrolledLines` above: the
-     * clause it adds is the only visible way to stop something, and `hintText`
-     * below keeps it out of the faded form for the same reason `esc abort` is kept
-     * there.
-     */
+    /** Compatibility prop; the global status and action rows show live services. */
     services?: number;
     /**
      * The composer's DRAFT row count, forwarded upward (tui-paste-handling
@@ -109,30 +66,15 @@ export interface ComposerProps {
     onNotice?: (level: 'warn' | 'error', text: string) => void;
     theme: Theme;
     caps: TermCapabilities;
-    onSubmit: (text: string) => void;
+    onSubmit: (text: string) => ComposerSubmitResult;
     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.
- */
+/** Legacy helper retained for consumers and contract tests; not rendered by Composer. */
 export declare function runningHintClauses(opts: {
     glyphs: ReturnType<typeof pickGlyphs>;
     services: number;
 }): string[];
-/**
- * Build the hint row.
- *
- * The `running` branch is NEVER abbreviated, no matter how experienced the user
- * is. Once the status bar's hint cluster was removed, the composer became the
- * only place that names the abort key — and fading that out after eight
- * submissions would leave a long-running task with no visible way to stop it.
- * Progressive disclosure is for teaching discoverable things, not for retiring
- * an emergency exit (§4.6 / A-14 / M-10b).
- */
+/** Compatibility formatter. Product hints use interaction-hints.ts. */
 declare function hintText(opts: {
     running: boolean;
     submitCount: number;
@@ -142,15 +84,7 @@ declare function hintText(opts: {
     /** Live background services; 0 leaves both rows byte-identical to today's. */
     services: number;
 }): string;
-/**
- * `hintText`, for the interrupt-ladder tests (AC-43).
- *
- * EXPORTED UNDER A TEST-FACING NAME rather than exporting `hintText` itself, so
- * the private helper stays private in the module graph and nothing in `src/`
- * grows a second caller by accident. The row is the ONLY visible way to stop a
- * process the agent left running, so it is worth asserting on directly rather
- * than fishing the string out of a rendered frame.
- */
+/** Compatibility export for existing hint contract tests. */
 export declare const hintTextForTest: typeof hintText;
-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 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 {};

package/dist/ui/Composer.js

@@ -1,80 +1,26 @@
-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`.
- *
- * Owns exactly two things: the semantic border color and the hint row. The
- * editor's pure helpers (`applyEdit` / `moveVertical` / `slashSuggestions` /
- * `fileTokenAt`) are untouched, so `input.test.ts` keeps passing.
- *
- * The draft flag is held HERE rather than in `App`: the border has to react to
- * "the input is no longer empty", and routing that through App would re-render
- * the transcript on the first keystroke of every message.
- *
- * The fixed status row retains emergency and history-navigation hints while
- * this footer scrolls outside the viewport. Editor state stays mounted.
- */
+import { jsx as _jsx } from "react/jsx-runtime";
+/** Input border and draft shell. Global action hints and activity live below the viewport. */
 import { useCallback, useState } from 'react';
-import { Box, Text } from 'ink';
-import stringWidth from 'string-width';
-import { pickGlyphs } from './glyphs.js';
+import { Box } from 'ink';
 import { HINT_FADE_AFTER } from '../config/schema.js';
 import { PromptInput } from './PromptInput.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.
- */
+import { MODE_LABEL, nextMode } from '../agent/agent-mode.js';
+/** Legacy helper retained for consumers and contract tests; not rendered by Composer. */
 export function runningHintClauses(opts) {
     const { glyphs, services } = opts;
-    // `queue`, NOT `steer` (tui-shift-enter-copy-queue 5.5): the gesture's
-    // consequence now has a name in the transcript (`Queue: ...`), and one
-    // behaviour with two names is undiscoverable.
     const clauses = [`${glyphs.enterKey} queue`, `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.
- *
- * The `running` branch is NEVER abbreviated, no matter how experienced the user
- * is. Once the status bar's hint cluster was removed, the composer became the
- * only place that names the abort key — and fading that out after eight
- * submissions would leave a long-running task with no visible way to stop it.
- * Progressive disclosure is for teaching discoverable things, not for retiring
- * an emergency exit (§4.6 / A-14 / M-10b).
- */
+/** Compatibility formatter. Product hints use interaction-hints.ts. */
 function hintText(opts) {
     const { running, submitCount, glyphs, mode, toggleKey, services } = opts;
     const dot = ` ${glyphs.midDot} `;
-    // THE EXIT CLAUSE SURVIVES IN BOTH ROWS (P1-4). The obvious edit here is to
-    // replace `ctrl+c*2 exit` with `ctrl+c stop N` — and that would delete the
-    // only visible way to quit at exactly the moment Ctrl+C stops meaning "quit",
-    // on the screen a user reaches when something has already gone wrong. Both
-    // 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)
         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.
     const toggle = `${toggleKey} ${MODE_LABEL[nextMode(mode)].toLowerCase()}`;
-    // The faded form KEEPS the mode toggle. Progressive disclosure exists to
-    // retire things the user has demonstrably learned, and `submitCount` counts
-    // submissions — a user can send fifty messages without ever discovering
-    // Shift+Tab. Same argument that keeps `esc abort` un-faded above.
-    // NEVER FADED, for the reason the props doc gives: it is the only visible way
-    // to stop a process the agent left running, and progressive disclosure retires
-    // things the user has demonstrably learned — not emergency exits.
     const stop = services > 0 ? [`ctrl+c stop ${services}`] : [];
     if (submitCount >= HINT_FADE_AFTER)
         return [...stop, toggle, '? help'].join(dot);
@@ -88,31 +34,9 @@ function hintText(opts) {
         '? help',
     ].join(dot);
 }
-/**
- * `hintText`, for the interrupt-ladder tests (AC-43).
- *
- * EXPORTED UNDER A TEST-FACING NAME rather than exporting `hintText` itself, so
- * the private helper stays private in the module graph and nothing in `src/`
- * grows a second caller by accident. The row is the ONLY visible way to stop a
- * process the agent left running, so it is worth asserting on directly rather
- * than fishing the string out of a rendered frame.
- */
+/** Compatibility export for existing hint contract tests. */
 export const hintTextForTest = hintText;
-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, }) {
+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, }) {
     const [hasDraft, setHasDraft] = useState(false);
     const onDraftChange = useCallback((next) => {
         setHasDraft(next.hasDraft);
@@ -130,20 +54,5 @@ export function Composer({ runRow, cols, cursorVisible, onInteraction, measureRe
                 : hasDraft
                     ? theme.focusBorder ?? theme.primary
                     : theme.idleBorder ?? theme.border;
-    const glyphs = pickGlyphs(caps);
-    // 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({
-                            running,
-                            submitCount,
-                            glyphs,
-                            mode: agentMode,
-                            toggleKey: modeToggleKey,
-                            services,
-                        }) })] }))] }));
+    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 }) }));
 }

package/dist/ui/PromptInput.d.ts

@@ -25,6 +25,7 @@ import { pickGlyphs } from './glyphs.js';
 import { type EditIntent } from '../input/keymap.js';
 import { type Suggestion } from './AutocompletePopup.js';
 import { type EditorState, type InputSegment } from './editor-reducer.js';
+import { type ComposerSubmitResult } from './composer-input.js';
 import type { AgentMode } from '../agent/agent-mode.js';
 export interface CommandOption {
     name: string;
@@ -51,7 +52,10 @@ interface PromptInputProps {
     /** Total menu rows, including borders and the overflow hint. */
     popupMaxHeight?: number;
     onPopupRowsChange?: (rows: number) => void;
-    onSubmit: (text: string) => void;
+    onCompletionContextChange?: (context: 'none' | 'slash' | 'file') => void;
+    /** True only when the stdin filter normalized DEL before Ink parsed it. */
+    deleteDisambiguated?: boolean;
+    onSubmit: (text: string) => ComposerSubmitResult;
     onHelp?: () => void;
     onEscape?: () => void;
     onEscapeDismiss?: () => void;
@@ -153,5 +157,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, agentMode, onSubmit, onHelp, onEscape, onEscapeDismiss, reducedMotion, borderColor, onDraftChange, onNotice, scrolledLines, }: PromptInputProps): React.ReactElement;
+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 {};