@aragon-agent/cli 0.6.12 → 0.6.13

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,17 +1,4 @@
-/**
- * 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';
@@ -19,14 +6,9 @@ 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. */
@@ -35,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>;
@@ -52,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
@@ -113,27 +69,12 @@ export interface ComposerProps {
     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;
@@ -143,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

@@ -52,6 +52,9 @@ interface PromptInputProps {
     /** Total menu rows, including borders and the overflow hint. */
     popupMaxHeight?: number;
     onPopupRowsChange?: (rows: number) => 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;
@@ -154,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 {};

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) {
@@ -347,6 +351,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 +452,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 +523,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 +552,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 +587,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))