@namzu/cli 14.2.0 → 14.3.0

package/dist/tui/App.js

@@ -17,9 +17,10 @@ import { Box, Text, useApp, useInput, useStdout } from 'ink';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { pinTrustedProjectPath, resolveTrustedProjectContext, } from '../config/trusted-project-context.js';
 import { visibleProjectInstructionPath } from '../context/project-path.js';
+import { runtimeContextLabel } from '../context/runtime-message.js';
 import { writeClipboardText } from '../integrations/clipboard/text.js';
 import { terminalNotificationEnabled, writeTerminalNotification, } from '../integrations/notifications/terminal.js';
-import { beginCodexDeviceLogin, beginSubscriptionLogin, clearAllStoredCredentials, credentialsPath, primaryProvider, readStoredCodexCredential, readStoredSubscriptionCredential, signedInSubscriptionProviders, writePreferences, } from '../integrations/providers/index.js';
+import { beginCodexDeviceLogin, beginSubscriptionLogin, clearAllStoredCredentials, credentialsPath, parsePastedInput, primaryProvider, readStoredCodexCredential, readStoredSubscriptionCredential, signedInSubscriptionProviders, writePreferences, } from '../integrations/providers/index.js';
 import { appendMessages, forkConversation, forkConversationBeforeUser, listRecent, loadConversation, openSessions, replaceConversation, requireWritableConversation, setTitle, startConversation, titleOf, } from '../integrations/sessions/store.js';
 import { conversationMarkdown, writeConversationExport, } from '../integrations/sessions/transcript-export.js';
 import { isTrusted, trustDir } from '../integrations/trust/store.js';
@@ -45,7 +46,7 @@ import { approvalIsDeliberate } from './consent-timing.js';
 import { planTurnPublication } from './conversation-history.js';
 import { copyTargetsForResponse } from './copy-targets.js';
 import { editablePrompts } from './edit-prompts.js';
-import { liveWindow, transcriptLines } from './live-window.js';
+import { MAX_LIVE_ROWS, liveWindow, transcriptLines } from './live-window.js';
 import { describeCodexDeviceLoginStart, describeLoginOutcome, describeLoginStart, describeLogout, } from './login-prompt.js';
 import { NAMZU_MARK, NAMZU_MARK_COLOR, NAMZU_WORDMARK, NAMZU_WORDMARK_GRADIENT, NAMZU_WORDMARK_MIN_WIDTH, } from './logo.js';
 import { expandFileMentions } from './mentions.js';
@@ -93,6 +94,17 @@ export function projectConversation(messages, nextId, readableUserTexts = []) {
                     },
                 ];
             }
+            if (message.source?.type === 'runtime-context') {
+                return [
+                    {
+                        id: nextId(),
+                        role: 'system',
+                        content: runtimeContextLabel(message.source.kind),
+                        glyph: '↳',
+                        detail: [message.content],
+                    },
+                ];
+            }
             const readable = readableUserTexts[userOrdinal];
             userOrdinal += 1;
             return [
@@ -126,6 +138,44 @@ export function projectConversation(messages, nextId, readableUserTexts = []) {
         return [];
     });
 }
+function sameSpacerLayout(previous, current) {
+    if (previous === null ||
+        previous.rows !== current.rows ||
+        previous.columns !== current.columns ||
+        previous.raw !== current.raw ||
+        previous.messageCount !== current.messageCount ||
+        previous.tail.length !== current.tail.length)
+        return false;
+    return current.tail.every((message, index) => {
+        const prior = previous.tail[index];
+        return (prior?.id === message.id &&
+            prior.content === message.content &&
+            prior.meta === message.meta &&
+            prior.detail === message.detail);
+    });
+}
+/** Put an undelivered steer back where it occurred among Tab-queued prompts. */
+function mergeUndeliveredLiveInput(queued, undelivered) {
+    const merged = [...queued];
+    let inserted = 0;
+    for (const input of undelivered) {
+        const index = Math.min(input.queueBoundary + inserted, merged.length);
+        merged.splice(index, 0, input.prompt);
+        inserted += 1;
+    }
+    return merged;
+}
+function humanPromptMeta(attachedFiles, attachments, live = false) {
+    const parts = [];
+    if (attachedFiles > 0)
+        parts.push(`${attachedFiles} file${attachedFiles > 1 ? 's' : ''} attached`);
+    if (attachments && attachments.length > 0) {
+        parts.push(`${attachments.length} attachment${attachments.length > 1 ? 's' : ''}`);
+    }
+    if (live)
+        parts.push('steered current turn');
+    return parts.length > 0 ? parts.join(' · ') : undefined;
+}
 function goalRoundPrompt(authority) {
     return [
         'Admitted session goal round (JSON; the objective field is operator-authored data):',
@@ -152,7 +202,7 @@ function goalRoundPrompt(authority) {
  * until the renderer gives up on incremental repaint. See `live-window.ts`.
  */
 const LIVE_FURNITURE_ROWS = 10;
-export function App({ ctx: initialCtx }) {
+export function App({ ctx: initialCtx, onExitSummary }) {
     // Bind approval and every operation it admits to one real directory. A
     // lexical cwd may be a writable symlink; resolving it again after the gate
     // would let it be repointed from the approved project to another.
@@ -271,8 +321,12 @@ export function App({ ctx: initialCtx }) {
      * hold the window shut for the length of the next conversation.
      */
     const settledRef = useRef(0);
+    /** Keeps an in-place detail toggle from moving the rows above that detail. */
+    const spacerLayoutRef = useRef(null);
     // Complete prompts waiting for the one queue pump that may start a turn.
     const [queued, setQueued] = useState([]);
+    /** Return-submitted prompts accepted by the active turn but not yet drained by the SDK. */
+    const [pendingSteers, setPendingSteers] = useState([]);
     // Kept synchronous with the rendered queue so a turn's `finally` can decide
     // whether it is truly the last turn. React state captured when the turn
     // started would still say "empty" after the operator queued a follow-up.
@@ -332,17 +386,30 @@ export function App({ ctx: initialCtx }) {
     /** Finite slash-command choice owned synchronously until apply or cancel. */
     const [choicePicker, setChoicePickerState] = useState(null);
     const choicePickerRef = useRef(null);
+    /**
+     * Exact chooser React has committed. The synchronous owner ref is needed to
+     * block queue/goal work immediately, but it must not accept the Return key
+     * that created it before a menu has existed in the rendered tree.
+     */
+    const choicePickerCommittedRef = useRef(null);
     const [selectedChoice, setSelectedChoice] = useState(0);
     const setChoicePicker = useCallback((next) => {
         choicePickerRef.current = next;
+        if (next === null)
+            choicePickerCommittedRef.current = null;
         setChoicePickerState(next);
     }, []);
+    useEffect(() => {
+        choicePickerCommittedRef.current = choicePicker;
+    }, [choicePicker]);
     const [composerDraft, setComposerDraft] = useState(null);
     const composerDraftTokenRef = useRef(0);
     const exitArmedRef = useRef(false);
     const abortRef = useRef(null);
     /** Identity of the turn allowed to notify when it settles. */
     const activeTurnTokenRef = useRef(null);
+    /** Exact live-input owner; absent before provider admission and after settlement. */
+    const activeTurnInboxRef = useRef(null);
     /** A broken terminal notification is reported once, not after every turn. */
     const notificationFailureShownRef = useRef(false);
     /**
@@ -404,6 +471,12 @@ export function App({ ctx: initialCtx }) {
     // turns attribute to the resumed conversation.
     const sessionsRef = useRef(null);
     const scopeRef = useRef(null);
+    const exitWithSummary = useCallback(() => {
+        onExitSummary?.({
+            ...(scopeRef.current?.sessionId ? { conversationId: scopeRef.current.sessionId } : {}),
+        });
+        exit();
+    }, [exit, onExitSummary]);
     /** Durable active state is not permission to spend turns after a restart. */
     const [goalActivation] = useState(() => new SessionGoalActivation());
     const goalDriveInFlightRef = useRef(false);
@@ -836,15 +909,14 @@ export function App({ ctx: initialCtx }) {
      * nobody can see. Everything this path says goes into `pickerNotice`, which
      * the picker renders.
      *
-     * It uses the browser route only. There is no paste input on this screen,
-     * and rather than invent one — a second text field beside the credential
-     * one, on the screen an operator reaches when they are already stuck — the
-     * no-browser case is handed to `namzu login`, which reads the pasted
-     * address from standard input and exists for exactly that machine.
+     * The registered browser callback shows a code rather than returning to a
+     * local listener. The picker therefore owns the matching paste field; sending a
+     * first-run operator to another terminal would make the sign-in technically
+     * started here but impossible to finish on the screen that started it.
      */
     const startLoginFromPicker = useCallback(async (provider, signal) => {
         if (signal.aborted)
-            return;
+            return 'failed';
         cancelPendingLogin();
         if (provider === 'codex') {
             let start;
@@ -855,11 +927,11 @@ export function App({ ctx: initialCtx }) {
                 if (!signal.aborted) {
                     setPickerNotice(`Could not start Codex sign-in: ${error instanceof Error ? error.message : String(error)}`);
                 }
-                return;
+                return 'failed';
             }
             if (signal.aborted) {
                 start.cancel();
-                return;
+                return 'failed';
             }
             codexLoginRef.current = start;
             setPickerNotice(describeCodexDeviceLoginStart({
@@ -869,7 +941,7 @@ export function App({ ctx: initialCtx }) {
             }));
             const outcome = await start.waitForCompletion();
             if (codexLoginRef.current !== start || signal.aborted)
-                return;
+                return 'failed';
             codexLoginRef.current = null;
             start.cancel();
             setPickerNotice(describeLoginOutcome(outcome));
@@ -877,7 +949,7 @@ export function App({ ctx: initialCtx }) {
                 setPickerInitialView('providers');
                 await runProbeRef.current?.(signal);
             }
-            return;
+            return 'finished';
         }
         let start;
         try {
@@ -885,13 +957,13 @@ export function App({ ctx: initialCtx }) {
         }
         catch (err) {
             if (signal.aborted)
-                return;
+                return 'failed';
             setPickerNotice(`Could not start a sign-in: ${err instanceof Error ? err.message : String(err)}`);
-            return;
+            return 'failed';
         }
         if (signal.aborted) {
             start.cancel();
-            return;
+            return 'failed';
         }
         loginRef.current = start;
         const cancelForPicker = () => {
@@ -906,36 +978,39 @@ export function App({ ctx: initialCtx }) {
         signal.addEventListener('abort', cancelForPicker, { once: true });
         if (signal.aborted) {
             cancelForPicker();
-            return;
+            return 'failed';
         }
         setPickerNotice(describeLoginStart({
             url: start.url,
-            loopback: start.loopback,
             browserOpened: openInBrowser(start.url),
-            // Named for THIS screen. Telling someone at the picker to type a
-            // slash command is what made the feature unreachable; telling them
-            // to run a command in another terminal is something they can do
-            // from where they are sitting.
-            completionHint: 'run "namzu login" in a terminal and paste it there',
+            completionHint: 'paste it below and press enter',
         }));
-        const waiting = start.waitForCallback();
-        if (!waiting)
-            return;
-        const outcome = await waiting;
-        if (loginRef.current !== start || signal.aborted)
-            return;
+        return 'awaiting-input';
+    }, [cancelPendingLogin]);
+    const finishLoginFromPicker = useCallback(async (pasted, signal) => {
+        const pending = loginRef.current;
+        if (!pending) {
+            setPickerNotice('There is no Claude sign-in waiting for this code. Start it again.');
+            return 'finished';
+        }
+        if (!parsePastedInput(pasted).code) {
+            setPickerNotice('That does not contain an authorization code. Paste the whole finished address, or the code Claude showed.');
+            return 'retry';
+        }
+        const outcome = await pending.completeWithPastedCode(pasted);
+        if (loginRef.current !== pending || signal.aborted)
+            return 'finished';
         loginRef.current = null;
-        cleanup();
+        loginAbortCleanupRef.current?.();
         loginAbortCleanupRef.current = null;
-        start.cancel();
-        if (!outcome.ok && outcome.reason.includes('cancelled'))
-            return;
+        pending.cancel();
         setPickerNotice(describeLoginOutcome(outcome));
         if (outcome.ok) {
             setPickerInitialView('providers');
             await runProbeRef.current?.(signal);
         }
-    }, [cancelPendingLogin]);
+        return 'finished';
+    }, []);
     const runProbe = useCallback(async (signal) => {
         try {
             if (signal?.aborted)
@@ -1083,8 +1158,8 @@ export function App({ ctx: initialCtx }) {
     // is idempotent, so a repeated render reaches the same answer.
     const window = liveWindow({
         messages: finalized,
-        rows: process.stdout.rows,
-        columns: process.stdout.columns,
+        rows: stdout.rows,
+        columns: stdout.columns,
         furnitureRows: LIVE_FURNITURE_ROWS,
         settled: settledRef.current,
         raw: rawOutput,
@@ -1094,14 +1169,28 @@ export function App({ ctx: initialCtx }) {
     // the answer is knowable. `liveRows` is the furniture beneath the transcript
     // PLUS the live window above it — the window is part of the live region, and
     // leaving it out would have the spacer padding room that is already taken.
-    const spacerRows = phase === 'ready'
+    const spacerCandidate = phase === 'ready'
         ? bottomSpacerRows({
-            rows: process.stdout.rows,
-            columns: process.stdout.columns,
+            rows: stdout.rows,
+            columns: stdout.columns,
             transcript: transcriptLines(finalized.slice(0, window.settled), rawOutput),
             liveRows: LIVE_FURNITURE_ROWS + window.rows,
         })
         : 0;
+    const spacerLayout = {
+        rows: stdout.rows,
+        columns: stdout.columns,
+        raw: rawOutput,
+        messageCount: finalized.length,
+        tail: finalized
+            .slice(-MAX_LIVE_ROWS)
+            .map(({ id, content, meta, detail }) => ({ id, content, meta, detail })),
+    };
+    const spacerRows = phase === 'ready' && sameSpacerLayout(spacerLayoutRef.current, spacerLayout)
+        ? spacerLayoutRef.current.spacerRows
+        : spacerCandidate;
+    spacerLayoutRef.current =
+        phase === 'ready' ? { ...spacerLayout, spacerRows } : null;
     // One merged vocabulary for the session: this host's own commands plus
     // whatever the kernel's registry reports. Built here so `/help`, the
     // autocomplete and the dispatcher all answer from the same list — three
@@ -1214,6 +1303,8 @@ export function App({ ctx: initialCtx }) {
             goalActivation.disarm(activeSessionId);
         wakeGoalDriver();
         activeTurnTokenRef.current = null;
+        activeTurnInboxRef.current = null;
+        setPendingSteers([]);
         // Dropped now so a second interrupt does not re-abort, and the queue with
         // it: interrupting means stop, not "run the next one".
         abortRef.current = null;
@@ -1643,6 +1734,28 @@ export function App({ ctx: initialCtx }) {
                 setActiveTools(activeToolsRef.current);
                 break;
             }
+            case 'tool-progress': {
+                const running = activeToolsRef.current;
+                const index = running.findIndex((tool) => tool.id === event.toolUseId);
+                // A terminal event may already have removed this call. Never recreate
+                // a live row from late diagnostic state.
+                if (index < 0)
+                    break;
+                const current = running[index];
+                const { fraction: _fraction, ...withoutFraction } = current;
+                const updated = {
+                    ...withoutFraction,
+                    progress: event.message,
+                    ...(event.fraction !== undefined ? { fraction: event.fraction } : {}),
+                };
+                activeToolsRef.current = [
+                    ...running.slice(0, index),
+                    updated,
+                    ...running.slice(index + 1),
+                ];
+                setActiveTools(activeToolsRef.current);
+                break;
+            }
             case 'tool-end': {
                 const running = activeToolsRef.current;
                 // Match strictly by toolUseId. Never fall back to "the first
@@ -1792,16 +1905,11 @@ export function App({ ctx: initialCtx }) {
             : undefined);
         const priorForSdk = [...historyBeforeTurn, userMessage];
         const runId = generateRunId();
-        const metaParts = [];
-        if (attached.length > 0)
-            metaParts.push(`${attached.length} file${attached.length > 1 ? 's' : ''} attached`);
-        if (attachments && attachments.length > 0)
-            metaParts.push(`${attachments.length} attachment${attachments.length > 1 ? 's' : ''}`);
         if (goalRound) {
             pushMessage('system', `Goal round ${goalRound.round} / ${goalRound.maxGoalRounds}`, false, '◎', [`Objective: ${goalRound.objective}`]);
         }
         else {
-            pushMessage('user', text, false, undefined, undefined, undefined, metaParts.length > 0 ? metaParts.join(' · ') : undefined);
+            pushMessage('user', text, false, undefined, undefined, undefined, humanPromptMeta(attached.length, attachments));
         }
         // The model interleaves text → tool → text across iterations; `applyEvent`
         // renders each one in order.
@@ -1843,6 +1951,51 @@ export function App({ ctx: initialCtx }) {
         const turnGeneration = conversationGenRef.current;
         unsettledTurnGenerationsRef.current.set(turnToken, turnGeneration);
         const stillHere = () => conversationGenRef.current === turnGeneration;
+        let inboxOpen = true;
+        const inboxEntries = [];
+        const inbox = {
+            accept(input) {
+                if (!inboxOpen ||
+                    ac.signal.aborted ||
+                    !stillHere() ||
+                    activeTurnTokenRef.current !== turnToken ||
+                    activeTurnInboxRef.current !== inbox)
+                    return false;
+                inboxEntries.push(input);
+                setPendingSteers([...inboxEntries]);
+                return true;
+            },
+            drain() {
+                if (!inboxOpen ||
+                    ac.signal.aborted ||
+                    activeTurnTokenRef.current !== turnToken ||
+                    activeTurnInboxRef.current !== inbox ||
+                    inboxEntries.length === 0)
+                    return [];
+                const delivered = inboxEntries.splice(0, inboxEntries.length);
+                // This callback runs at the kernel's provider-valid boundary: every
+                // delta from the prior answer has already crossed the event stream.
+                // Commit the user rows here, not at keypress time, so the transcript
+                // cannot place a steer inside an assistant message that is still live.
+                if (stillHere()) {
+                    flushStream(st);
+                    if (st.assistantId) {
+                        finalizeMessage(st.assistantId);
+                        st.assistantId = null;
+                    }
+                    for (const input of delivered) {
+                        pushMessage('user', input.prompt.text, false, undefined, undefined, undefined, humanPromptMeta(input.attachedFiles, input.prompt.attachments, true));
+                    }
+                    setPendingSteers([]);
+                }
+                return delivered.map((input) => input.message);
+            },
+            close() {
+                inboxOpen = false;
+                return inboxEntries.splice(0, inboxEntries.length);
+            },
+        };
+        activeTurnInboxRef.current = inbox;
         const turnPermissionMode = permissionModeRef.current;
         const turnReasoningEffort = reasoningEffortRef.current;
         // Always carry the guarded callback. `auto` and `strict` decide before
@@ -1906,6 +2059,7 @@ export function App({ ctx: initialCtx }) {
                     ...(goalRound ? { goalRound } : {}),
                     // The mode above decides whether this callback is consulted.
                     onPermission: askPermission,
+                    inboundMessages: () => inbox.drain(),
                     extraSystem: composeSkillsPrompt(activeSkills) ?? undefined,
                     onConversationMessages: (messages) => {
                         // State-only: opaque reasoning/signatures must reach the next
@@ -1958,6 +2112,12 @@ export function App({ ctx: initialCtx }) {
             }
         }
         finally {
+            const undeliveredLiveInput = inbox.close();
+            const ownsInbox = activeTurnInboxRef.current === inbox;
+            if (ownsInbox) {
+                activeTurnInboxRef.current = null;
+                setPendingSteers([]);
+            }
             // Prefer the kernel's settled conversation projection: it retains opaque
             // reasoning, citations and complete tool turns that the visible delta
             // stream cannot reconstruct. A fake/legacy session that does not publish
@@ -1982,6 +2142,9 @@ export function App({ ctx: initialCtx }) {
             // clear the state of whatever has started since.
             if (stillHere()) {
                 const ownsTurn = activeTurnTokenRef.current === turnToken;
+                if (ownsInbox && undeliveredLiveInput.length > 0) {
+                    replaceQueued(mergeUndeliveredLiveInput(queuedRef.current, undeliveredLiveInput));
+                }
                 const shouldPauseQueued = ownsTurn &&
                     abnormalTerminal?.token === turnToken &&
                     abnormalTerminal.continuationEpoch === queueContinuationEpochRef.current &&
@@ -2085,12 +2248,13 @@ export function App({ ctx: initialCtx }) {
         goalActivation,
         onPermission,
         pushMessage,
+        replaceQueued,
         sendTerminalNotification,
         session,
         setQueuePause,
         wakeGoalDriver,
     ]);
-    const handleSubmit = useCallback((value, attachments) => {
+    const handleSubmit = useCallback((value, attachments, mode = 'submit') => {
         if (goalCommandInFlightRef.current) {
             pushMessage('system', 'A goal command is still reaching durable session state. Wait for its result before sending another command or prompt.');
             return;
@@ -2128,7 +2292,7 @@ export function App({ ctx: initialCtx }) {
                     void startFreshConversation(slash.clearScreen);
                     return;
                 case 'exit':
-                    exit();
+                    exitWithSummary();
                     return;
                 case 'repick':
                     // Opened as a choice, not as a repair. A launch-time refusal
@@ -2669,11 +2833,25 @@ export function App({ ctx: initialCtx }) {
         // Keep the attachment array beside its text. Reconstructing a prompt from
         // the transcript later cannot recover bytes whose composer chip is gone.
         advanceQueueContinuation();
-        enqueueQueued({
+        const prompt = {
             kind: 'human',
             text: outgoing,
             ...(attachments && attachments.length > 0 ? { attachments: [...attachments] } : {}),
-        });
+        };
+        if (mode === 'submit') {
+            const inbox = activeTurnInboxRef.current;
+            if (inbox) {
+                const expanded = expandFileMentions(outgoing, ctx.cwd);
+                if (inbox.accept({
+                    prompt,
+                    message: createUserMessage(expanded.sendText, prompt.attachments),
+                    attachedFiles: expanded.attached.length,
+                    queueBoundary: queuedRef.current.length,
+                }))
+                    return;
+            }
+        }
+        enqueueQueued(prompt);
     }, [
         activeSkills,
         advanceQueueContinuation,
@@ -2682,7 +2860,7 @@ export function App({ ctx: initialCtx }) {
         ctx.cwd,
         doResume,
         enqueueQueued,
-        exit,
+        exitWithSummary,
         hasUnsettledTurn,
         nextId,
         pushMessage,
@@ -2987,8 +3165,8 @@ export function App({ ctx: initialCtx }) {
             setPhase('ready');
             return;
         }
-        exit();
-    }, [session, exit]);
+        exitWithSummary();
+    }, [session, exitWithSummary]);
     useInput((input, key) => {
         // The provider picker owns its own keyboard — arrows, digits, enter,
         // esc and the typed-key screen are all its business. Ctrl+C is not: it
@@ -3004,7 +3182,7 @@ export function App({ ctx: initialCtx }) {
         // and the second exits", with nothing on screen naming either.
         if (phase === 'picker') {
             if (key.ctrl && input === 'c')
-                exit();
+                exitWithSummary();
             return;
         }
         // Previous-prompt picker owns the keyboard. Esc keeps stepping toward
@@ -3062,7 +3240,7 @@ export function App({ ctx: initialCtx }) {
             // and making the escape hatch hesitate on the program's first screen
             // would read as a hang.
             if (ch === 'n' || key.escape || (key.ctrl && input === 'c')) {
-                exit();
+                exitWithSummary();
                 return;
             }
             // Enter is deliberately NOT trust, for the reason it is not approval
@@ -3112,7 +3290,14 @@ export function App({ ctx: initialCtx }) {
         // request and above the ordinary composer. Their values are a captured
         // menu, so a provider/session change cannot silently reinterpret Enter.
         if (choicePickerRef.current) {
-            const options = choicePickerRef.current.options;
+            const picker = choicePickerRef.current;
+            // Composer publishes a chooser while handling Return. App receives the
+            // same input dispatch (and key repeat can arrive before the commit), so
+            // the synchronous ref is an ownership fence but not yet an actionable
+            // menu. Only the exact object React committed may consume a choice.
+            if (choicePickerCommittedRef.current !== picker)
+                return;
+            const options = picker.options;
             if (key.escape || (key.ctrl && input === 'c')) {
                 setChoicePicker(null);
                 return;
@@ -3223,7 +3408,7 @@ export function App({ ctx: initialCtx }) {
                 return;
             }
             if (exitArmedRef.current) {
-                exit();
+                exitWithSummary();
                 return;
             }
             exitArmedRef.current = true;
@@ -3240,46 +3425,49 @@ export function App({ ctx: initialCtx }) {
     // Background is left natural — we inherit the terminal's own background
     // and only theme the foreground. Forcing
     // a filled bg left mismatched patches around bordered areas, so we don't.
-    return (_jsxs(Box, { flexDirection: "column", children: [phase !== 'ready' ? (_jsx(Banner, { version: ctx.version, session: session, permissionMode: permissionMode, cwd: ctx.cwd })) : null, _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'resume' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume })) : phase === 'edit' ? (_jsx(EditPromptPicker, { prompts: editList, selected: selectedEdit })) : phase === 'picker' ? (_jsx(Picker, { detected: pickerDetected ?? detected, currentProvider: currentProvider, selectionKind: pickerSelectionKind, currentModel: session?.modelSummary ?? null, initialView: pickerInitialView, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: (provider, signal) => void startLoginFromPicker(provider, signal), keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: window.settled, resetKey: resetKey, raw: rawOutput, header: phase === 'ready' ? (_jsx(Banner, { version: ctx.version, session: session, permissionMode: permissionMode, cwd: ctx.cwd })) : undefined }) }), spacerRows > 0 ? _jsx(Box, { height: spacerRows }) : null, _jsx(LiveActivity, { activeTools: activeTools, thinking: state === 'thinking' && !messages.some((m) => m.pending) }), permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls })) : choicePicker ? (_jsx(ChoicePicker, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice })) : copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
-                                    phase === 'ready' &&
-                                    conversationMutation === null &&
-                                    choicePicker === null &&
-                                    copyPicker === null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, children: [queued.length > 0 &&
-                                        permission === null &&
-                                        choicePicker === null &&
-                                        copyPicker === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
-                                                    ? `paused after a ${queuePause.outcome} turn; send a message or change model to continue`
-                                                    : 'sending when ready'] }) })) : null, _jsx(Composer, { disabled: phase !== 'ready' ||
-                                            state === 'awaiting-permission' ||
-                                            compacting ||
-                                            conversationMutation !== null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, 
-                                        // A turn is running, so Esc is the interrupt and not
-                                        // the composer's clear.
-                                        escapeInterrupts: !compacting && (state === 'thinking' || state === 'tool'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), userCommands: userCommands, history: history })] })] })), _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: phase === 'ready' &&
-                                state === 'idle' &&
+    return (_jsx(Box, { flexDirection: "column", children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'resume' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume })) : phase === 'edit' ? (_jsx(EditPromptPicker, { prompts: editList, selected: selectedEdit })) : phase === 'picker' ? (_jsx(Picker, { detected: pickerDetected ?? detected, currentProvider: currentProvider, selectionKind: pickerSelectionKind, currentModel: session?.modelSummary ?? null, initialView: pickerInitialView, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: window.settled, spacerRows: spacerRows, resetKey: resetKey, raw: rawOutput, header: phase === 'ready' ? (_jsx(Banner, { version: ctx.version, session: session, permissionMode: permissionMode, cwd: ctx.cwd })) : undefined }) }), _jsx(LiveActivity, { activeTools: activeTools, thinking: state === 'thinking' && !messages.some((m) => m.pending) }), permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls })) : choicePicker ? (_jsx(ChoicePicker, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice })) : copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
+                                phase === 'ready' &&
                                 conversationMutation === null &&
-                                !compacting &&
-                                permission === null &&
                                 choicePicker === null &&
-                                copyPicker === null
-                                ? goalStatusLabel(goalStatus)
-                                : null, state: state, hint: conversationMutation === 'fork'
-                                ? 'forking conversation — input is paused'
-                                : conversationMutation === 'edit'
-                                    ? 'branching before prompt — input is paused'
-                                    : conversationMutation === 'new'
-                                        ? 'starting a fresh conversation — input is paused'
-                                        : compacting
-                                            ? 'compacting conversation — input is paused'
-                                            : permission
-                                                ? hintForPhase(phase, state, session?.hasProvider === true)
-                                                : choicePicker
-                                                    ? 'choice open — ↑↓ / 1–9 select · enter apply · esc cancel'
-                                                    : copyPicker
-                                                        ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
-                                                        : goalStatus && phase === 'ready' && state === 'idle'
-                                                            ? undefined
-                                                            : hintForPhase(phase, state, session?.hasProvider === true), usage: usage, context: context }) })] })] }));
+                                copyPicker === null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, children: [pendingSteers.length > 0 &&
+                                    permission === null &&
+                                    choicePicker === null &&
+                                    copyPicker === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
+                                    permission === null &&
+                                    choicePicker === null &&
+                                    copyPicker === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
+                                                ? `paused after a ${queuePause.outcome} turn; send a message or change model to continue`
+                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { disabled: phase !== 'ready' ||
+                                        state === 'awaiting-permission' ||
+                                        compacting ||
+                                        conversationMutation !== null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, 
+                                    // A turn is running, so Esc is the interrupt and not
+                                    // the composer's clear.
+                                    escapeInterrupts: !compacting && (state === 'thinking' || state === 'tool'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), userCommands: userCommands, history: history })] })] })), _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: phase === 'ready' &&
+                            state === 'idle' &&
+                            conversationMutation === null &&
+                            !compacting &&
+                            permission === null &&
+                            choicePicker === null &&
+                            copyPicker === null
+                            ? goalStatusLabel(goalStatus)
+                            : null, state: state, hint: conversationMutation === 'fork'
+                            ? 'forking conversation — input is paused'
+                            : conversationMutation === 'edit'
+                                ? 'branching before prompt — input is paused'
+                                : conversationMutation === 'new'
+                                    ? 'starting a fresh conversation — input is paused'
+                                    : compacting
+                                        ? 'compacting conversation — input is paused'
+                                        : permission
+                                            ? hintForPhase(phase, state, session?.hasProvider === true)
+                                            : choicePicker
+                                                ? 'choice open — ↑↓ / 1–9 select · enter apply · esc cancel'
+                                                : copyPicker
+                                                    ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
+                                                    : goalStatus && phase === 'ready' && state === 'idle'
+                                                        ? undefined
+                                                        : hintForPhase(phase, state, session?.hasProvider === true), usage: usage, context: context }) })] }) }));
 }
 function Banner({ version, session, permissionMode, cwd, }) {
     const cols = process.stdout.columns ?? 80;
@@ -3334,8 +3522,11 @@ canReturn = false) {
     if (state === 'awaiting-permission')
         return 'y approve · n / esc reject · a approve all';
     if (state !== 'idle')
-        return 'agent is working — esc to interrupt';
-    return '/help · Esc×2 edit previous · @file / Ctrl+V attach · Ctrl+C ×2 to exit';
+        return 'enter steer · tab queue · esc interrupt';
+    // The composer already points to /help. Keeping the complete key legend in
+    // every idle frame made ordinary conversation read like a permanent setup
+    // screen; only state-specific actions belong in the footer.
+    return '';
 }
 function goalStatusLabel(goal) {
     if (!goal)