@namzu/cli 14.0.0 → 14.2.0

package/dist/tui/App.js

@@ -5,11 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *
  * Session lifecycle:
  *   1. Mount → probeAgentSession() (readPreferences + discoverProviders).
- *   2. If a v2 preferences file exists → createAgentSession(prefs, detected) → ready.
- *   3. If preferences missing OR v1 (legacy) → show <Picker/>.
- *      After picker submit, writePreferences + hydrate session.
- *   4. If discovery returned zero providers → show <Picker/> in
- *      empty-state mode (explains where to put credentials).
+ *   2. If a current preferences file exists → createAgentSession(prefs, detected) → ready.
+ *   3. With no preferences, reuse one signed-in installed-harness subscription
+ *      directly, or ask between available subscriptions when there is a choice.
+ *   4. Otherwise show <Picker/>. An explicit picker choice is persisted;
+ *      automatic reuse is not mistaken for a durable operator preference.
  */
 import { join, relative } from 'node:path';
 import { DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, SessionGoalActivation, StaleGoalError, createAssistantMessage, createUserMessage, generateRunId, isCompactionMessage, kernelHostCommands, } from '@namzu/sdk';
@@ -19,7 +19,7 @@ import { pinTrustedProjectPath, resolveTrustedProjectContext, } from '../config/
 import { visibleProjectInstructionPath } from '../context/project-path.js';
 import { writeClipboardText } from '../integrations/clipboard/text.js';
 import { terminalNotificationEnabled, writeTerminalNotification, } from '../integrations/notifications/terminal.js';
-import { beginCodexDeviceLogin, beginSubscriptionLogin, clearAllStoredCredentials, credentialsPath, primaryProvider, readStoredCodexCredential, readStoredSubscriptionCredential, writePreferences, } from '../integrations/providers/index.js';
+import { beginCodexDeviceLogin, beginSubscriptionLogin, clearAllStoredCredentials, credentialsPath, 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';
@@ -27,7 +27,9 @@ import { checkUpdates } from '../integrations/updates.js';
 import { appendMemory, composeMemoryPrompt, readMemory } from '../memory/store.js';
 import { composeSkillsPrompt, discoverSkills, loadSkillBody } from '../skills/store.js';
 import { discoverUserCommands } from '../user-commands/store.js';
+import { ChoicePicker } from './ChoicePicker.js';
 import { Composer } from './Composer.js';
+import { CopyPicker } from './CopyPicker.js';
 import { EditPromptPicker } from './EditPromptPicker.js';
 import { LiveActivity, formatElapsed } from './LiveActivity.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
@@ -41,6 +43,7 @@ import { bottomSpacerRows } from './bottom-spacer.js';
 import { keepRecentRows } from './compact-transcript.js';
 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 { describeCodexDeviceLoginStart, describeLoginOutcome, describeLoginStart, describeLogout, } from './login-prompt.js';
@@ -215,6 +218,10 @@ export function App({ ctx: initialCtx }) {
     const [keyEntryFor, setKeyEntryFor] = useState(null);
     /** Which decision owns the next picker mount. */
     const [pickerInitialView, setPickerInitialView] = useState('providers');
+    /** A narrowed first-run roster; null keeps the complete discovered list. */
+    const [pickerDetected, setPickerDetected] = useState(null);
+    /** Whether Enter accepts the provider directly or continues to model choice. */
+    const [pickerSelectionKind, setPickerSelectionKind] = useState('provider-and-model');
     /** The chain read from disk, held while the picker repairs its credential. */
     const savedPrefsRef = useRef(null);
     /**
@@ -314,6 +321,22 @@ export function App({ ctx: initialCtx }) {
     const [editList, setEditList] = useState([]);
     const [selectedEdit, setSelectedEdit] = useState(0);
     const editCommittedRef = useRef(false);
+    /** `/copy` owns this exact response snapshot until selection or cancellation. */
+    const [copyPicker, setCopyPickerState] = useState(null);
+    const copyPickerRef = useRef(null);
+    const [selectedCopy, setSelectedCopy] = useState(0);
+    const setCopyPicker = useCallback((next) => {
+        copyPickerRef.current = next;
+        setCopyPickerState(next);
+    }, []);
+    /** Finite slash-command choice owned synchronously until apply or cancel. */
+    const [choicePicker, setChoicePickerState] = useState(null);
+    const choicePickerRef = useRef(null);
+    const [selectedChoice, setSelectedChoice] = useState(0);
+    const setChoicePicker = useCallback((next) => {
+        choicePickerRef.current = next;
+        setChoicePickerState(next);
+    }, []);
     const [composerDraft, setComposerDraft] = useState(null);
     const composerDraftTokenRef = useRef(0);
     const exitArmedRef = useRef(false);
@@ -332,6 +355,9 @@ export function App({ ctx: initialCtx }) {
     const loginRef = useRef(null);
     const codexLoginRef = useRef(null);
     const loginAbortCleanupRef = useRef(null);
+    /** Revokes automatic first-run construction when this App no longer exists. */
+    const [appLifetime] = useState(() => new AbortController());
+    useEffect(() => () => appLifetime.abort(new Error('The Namzu TUI was closed.')), [appLifetime]);
     const cancelPendingLogin = useCallback(() => {
         loginAbortCleanupRef.current?.();
         loginAbortCleanupRef.current = null;
@@ -382,6 +408,7 @@ export function App({ ctx: initialCtx }) {
     const [goalActivation] = useState(() => new SessionGoalActivation());
     const goalDriveInFlightRef = useRef(false);
     const [goalDriveVersion, setGoalDriveVersion] = useState(0);
+    const [goalStatus, setGoalStatus] = useState(null);
     const wakeGoalDriver = useCallback(() => setGoalDriveVersion((version) => version + 1), []);
     /**
      * Conversation writes in the order the operator produced them.
@@ -500,6 +527,106 @@ export function App({ ctx: initialCtx }) {
         ]);
         return id;
     }, [nextId]);
+    const applyPermissionMode = useCallback((mode) => {
+        if (!session?.hasProvider) {
+            pushMessage('system', 'No active session — pick a provider before changing permissions.');
+            return;
+        }
+        if (state !== 'idle' ||
+            abortRef.current !== null ||
+            hasUnsettledTurn() ||
+            queuedRef.current.length > 0 ||
+            permissionResolveRef.current !== null ||
+            compactingRef.current) {
+            pushMessage('system', 'Permission mode was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
+            return;
+        }
+        if (!session.resetApprovalLatch) {
+            pushMessage('system', 'Permission mode was not changed: this embedded session cannot revoke an earlier "approve all" choice. Reconnect it before changing modes.');
+            return;
+        }
+        session.resetApprovalLatch();
+        permissionModeRef.current = mode;
+        permissionModeSourceRef.current = 'session';
+        setPermissionModeState(mode);
+        pushMessage('system', `Permission mode changed to ${mode}. Any earlier "approve all" choice was revoked. Declarative deny rules and the built-in safety gate still take precedence.`);
+    }, [hasUnsettledTurn, pushMessage, session, state]);
+    const applyReasoningEffort = useCallback((effort) => {
+        if (!session?.hasProvider) {
+            pushMessage('system', 'No active session — pick a provider before changing reasoning effort.');
+            return;
+        }
+        if (state !== 'idle' ||
+            abortRef.current !== null ||
+            hasUnsettledTurn() ||
+            queuedRef.current.length > 0 ||
+            permissionResolveRef.current !== null ||
+            compactingRef.current) {
+            pushMessage('system', 'Reasoning effort was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
+            return;
+        }
+        if (effort === undefined) {
+            setReasoningEffort(undefined);
+            pushMessage('system', 'Reasoning effort reset to the provider default for future main-query turns.');
+            return;
+        }
+        if (!session.reasoningEffortLevels?.includes(effort)) {
+            pushMessage('system', `Reasoning effort was not changed: ${effort} is not offered by every usable provider-chain member for this model.`);
+            return;
+        }
+        setReasoningEffort(effort);
+        pushMessage('system', `Reasoning effort changed to ${effort} for future main-query turns in this session.`);
+    }, [hasUnsettledTurn, pushMessage, session, setReasoningEffort, state]);
+    const applyChoiceSelection = useCallback((index) => {
+        const picker = choicePickerRef.current;
+        if (!picker)
+            return;
+        const value = picker.values[index];
+        if (index < 0 || index >= picker.values.length)
+            return;
+        setChoicePicker(null);
+        if (picker.kind === 'permission-mode') {
+            applyPermissionMode(value);
+            return;
+        }
+        applyReasoningEffort(value);
+    }, [applyPermissionMode, applyReasoningEffort, setChoicePicker]);
+    const sendCopyRequest = useCallback((index) => {
+        const picker = copyPickerRef.current;
+        const target = picker?.targets[index];
+        if (!picker || !target)
+            return;
+        // Release the overlay synchronously before its transcript notice lands.
+        // The queue pump still observes React state and can proceed only after
+        // this event has finished publishing the result.
+        setCopyPicker(null);
+        const result = writeClipboardText(target.text, {
+            isTTY: stdout.isTTY,
+            write: writeStdout,
+        });
+        const origin = picker.provenance === 'persisted'
+            ? 'the latest persisted assistant output'
+            : 'the latest normally completed answer';
+        const selection = target.kind === 'whole' ? origin : `${target.label} from ${origin}`;
+        switch (result.kind) {
+            case 'request-sent':
+                pushMessage('system', `Copy request sent for ${selection} (${result.bytes.toLocaleString()} bytes). Terminal, multiplexer or remote-session policy may ignore OSC 52; if the clipboard did not change, enable terminal clipboard access.`);
+                break;
+            case 'unavailable':
+                pushMessage('system', `Cannot send a copy request here — ${result.detail}. /copy needs an interactive terminal with OSC 52 clipboard support.`);
+                break;
+            case 'too-large':
+                pushMessage('system', `Cannot send this selection to the terminal clipboard — it is ${result.bytes.toLocaleString()} bytes and the OSC 52 safety limit is ${result.limit.toLocaleString()}. Nothing was truncated.`);
+                break;
+            case 'write-failed':
+                pushMessage('system', `Could not send the terminal copy request: ${result.detail}`);
+                break;
+            default: {
+                const exhaustive = result;
+                void exhaustive;
+            }
+        }
+    }, [pushMessage, setCopyPicker, stdout.isTTY, writeStdout]);
     const sendTerminalNotification = useCallback((notification) => {
         if (!terminalNotificationEnabled(ctx.tui?.notifications, notification))
             return;
@@ -695,6 +822,8 @@ export function App({ ctx: initialCtx }) {
         cancelPendingLogin();
         setPickerNotice(null);
         setKeyEntryFor(null);
+        setPickerDetected(null);
+        setPickerSelectionKind('provider-and-model');
         setPickerInitialView('subscriptions');
         setPhase('picker');
     }, [cancelPendingLogin, pushMessage]);
@@ -816,6 +945,9 @@ export function App({ ctx: initialCtx }) {
                 return;
             setDetected(probe.detected);
             if (probe.needsRepickReason) {
+                setPickerDetected(null);
+                setPickerSelectionKind('provider-and-model');
+                setPickerInitialView('providers');
                 pushMessage('system', probe.needsRepickReason);
                 setPickerNotice(probe.needsRepickReason);
                 setPhase('picker');
@@ -832,6 +964,9 @@ export function App({ ctx: initialCtx }) {
                 // so the chain it declares — model pins and fallbacks included — is
                 // still the operator's answer once one is supplied.
                 savedPrefsRef.current = probe.preferences;
+                setPickerDetected(null);
+                setPickerSelectionKind('provider-and-model');
+                setPickerInitialView('providers');
                 setKeyEntryFor(probe.credentialGap.providerId);
                 pushMessage('system', probe.credentialGap.reason);
                 setPickerNotice(probe.credentialGap.reason);
@@ -839,9 +974,51 @@ export function App({ ctx: initialCtx }) {
                 return;
             }
             if (probe.preferences) {
+                setPickerDetected(null);
+                setPickerSelectionKind('provider-and-model');
                 await hydrateSession(probe.preferences, probe.detected, signal);
                 return;
             }
+            const signedIn = signedInSubscriptionProviders(probe.detected);
+            if (signedIn.length === 1) {
+                const chosen = signedIn[0];
+                if (!chosen)
+                    throw new Error('A signed-in provider disappeared during discovery.');
+                const automaticPreferences = {
+                    version: 3,
+                    providers: [{ id: chosen.entry.id }],
+                    subagents: { active: [] },
+                };
+                // Use the picker-grade transactional admission even though no picker had
+                // to be drawn. A provider-less candidate must leave an actionable choice,
+                // not strand first run on the disabled unhealthy screen.
+                const admissionSignal = signal ?? appLifetime.signal;
+                try {
+                    await hydrateSession(automaticPreferences, probe.detected, admissionSignal);
+                    return;
+                }
+                catch (error) {
+                    if (admissionSignal.aborted)
+                        return;
+                    setPickerDetected(null);
+                    setPickerSelectionKind('provider-and-model');
+                    setPickerInitialView('providers');
+                    setPickerNotice(`The signed-in ${chosen.entry.label} session could not start: ${error instanceof Error ? error.message : String(error)}`);
+                    setPhase('picker');
+                    return;
+                }
+            }
+            if (signedIn.length > 1) {
+                setPickerDetected(signedIn);
+                setPickerSelectionKind('signed-in-subscription');
+                setPickerInitialView('providers');
+                setPickerNotice('Claude and Codex subscriptions are already signed in on this device. Choose which one Namzu should use.');
+                setPhase('picker');
+                return;
+            }
+            setPickerDetected(null);
+            setPickerSelectionKind('provider-and-model');
+            setPickerInitialView('providers');
             setPhase('picker');
         }
         catch (err) {
@@ -850,7 +1027,7 @@ export function App({ ctx: initialCtx }) {
             setPhase('unhealthy');
             pushMessage('system', `Failed to probe agents: ${err instanceof Error ? err.message : String(err)}`);
         }
-    }, [hydrateSession, pushMessage]);
+    }, [appLifetime.signal, hydrateSession, pushMessage]);
     // `startOrFinishLogin` is declared above `runProbe` and calls it, so it
     // reads the current one through a ref rather than closing over a stale
     // binding or forcing the two into a declaration order that reads backwards.
@@ -1959,10 +2136,16 @@ export function App({ ctx: initialCtx }) {
                     // been solved — the session behind this picker is running.
                     setPickerNotice(null);
                     setKeyEntryFor(null);
+                    setPickerDetected(null);
+                    setPickerSelectionKind('provider-and-model');
                     setPickerInitialView('providers');
                     setPhase('picker');
                     return;
                 case 'permission-mode': {
+                    applyPermissionMode(slash.mode);
+                    return;
+                }
+                case 'permission-mode-picker': {
                     if (!session?.hasProvider) {
                         pushMessage('system', 'No active session — pick a provider before changing permissions.');
                         return;
@@ -1972,24 +2155,34 @@ export function App({ ctx: initialCtx }) {
                         hasUnsettledTurn() ||
                         queuedRef.current.length > 0 ||
                         permissionResolveRef.current !== null ||
-                        compactingRef.current) {
-                        pushMessage('system', 'Permission mode was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
-                        return;
-                    }
-                    if (!session.resetApprovalLatch) {
-                        pushMessage('system', 'Permission mode was not changed: this embedded session cannot revoke an earlier "approve all" choice. Reconnect it before changing modes.');
+                        compactingRef.current ||
+                        !session.resetApprovalLatch) {
+                        pushMessage('system', 'Permission choices are unavailable until the active turn, prompt, compaction, queued work, or embedded-session approval latch can be safely settled.');
                         return;
                     }
-                    session.resetApprovalLatch();
-                    permissionModeRef.current = slash.mode;
-                    permissionModeSourceRef.current = 'session';
-                    setPermissionModeState(slash.mode);
-                    pushMessage('system', `Permission mode changed to ${slash.mode}. Any earlier "approve all" choice was revoked. Declarative deny rules and the built-in safety gate still take precedence.`);
+                    const values = ['prompt', 'auto', 'strict'];
+                    setSelectedChoice(Math.max(0, values.indexOf(permissionModeRef.current)));
+                    setChoicePicker({
+                        kind: 'permission-mode',
+                        title: 'Select Permission Mode',
+                        notice: permissionPickerNotice(session),
+                        values,
+                        options: values.map((mode) => ({
+                            label: mode,
+                            description: permissionModeDescription(mode),
+                            current: mode === permissionModeRef.current,
+                        })),
+                    });
                     return;
                 }
                 case 'reasoning-effort': {
-                    if (!session?.hasProvider) {
-                        pushMessage('system', 'No active session — pick a provider before changing reasoning effort.');
+                    applyReasoningEffort(slash.effort ?? undefined);
+                    return;
+                }
+                case 'reasoning-effort-picker': {
+                    const levels = session?.reasoningEffortLevels;
+                    if (!session?.hasProvider || levels === undefined) {
+                        pushMessage('system', 'No exact reasoning-effort menu is available for the current session.');
                         return;
                     }
                     if (state !== 'idle' ||
@@ -1998,20 +2191,22 @@ export function App({ ctx: initialCtx }) {
                         queuedRef.current.length > 0 ||
                         permissionResolveRef.current !== null ||
                         compactingRef.current) {
-                        pushMessage('system', 'Reasoning effort was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
-                        return;
-                    }
-                    if (slash.effort === null) {
-                        setReasoningEffort(undefined);
-                        pushMessage('system', 'Reasoning effort reset to the provider default for future main-query turns.');
-                        return;
-                    }
-                    if (!session.reasoningEffortLevels?.includes(slash.effort)) {
-                        pushMessage('system', `Reasoning effort was not changed: ${slash.effort} is not offered by every usable provider-chain member for this model.`);
+                        pushMessage('system', 'Reasoning-effort choices are unavailable until the active turn, prompt, compaction, and queued work settle.');
                         return;
                     }
-                    setReasoningEffort(slash.effort);
-                    pushMessage('system', `Reasoning effort changed to ${slash.effort} for future main-query turns in this session.`);
+                    const values = [undefined, ...levels];
+                    const current = reasoningEffortRef.current;
+                    setSelectedChoice(Math.max(0, values.findIndex((value) => value === current)));
+                    setChoicePicker({
+                        kind: 'reasoning-effort',
+                        title: `Select Reasoning Level for ${session.modelSummary ?? 'current model'}`,
+                        values,
+                        options: values.map((effort) => ({
+                            label: effort ?? 'default',
+                            description: reasoningEffortDescription(effort),
+                            current: effort === current,
+                        })),
+                    });
                     return;
                 }
                 case 'login':
@@ -2392,30 +2587,11 @@ export function App({ ctx: initialCtx }) {
                         pushMessage('system', 'Nothing to copy yet — /copy applies to the latest assistant answer that finished normally.');
                         return;
                     }
-                    const result = writeClipboardText(target.text, {
-                        isTTY: stdout.isTTY,
-                        write: writeStdout,
+                    setSelectedCopy(0);
+                    setCopyPicker({
+                        targets: copyTargetsForResponse(target.text),
+                        provenance: target.provenance,
                     });
-                    switch (result.kind) {
-                        case 'request-sent':
-                            pushMessage('system', `Copy request sent for the ${target.provenance === 'persisted'
-                                ? 'latest persisted assistant output'
-                                : 'latest normally completed answer'} (${result.bytes.toLocaleString()} bytes). Terminal, multiplexer or remote-session policy may ignore OSC 52; if the clipboard did not change, enable terminal clipboard access.`);
-                            break;
-                        case 'unavailable':
-                            pushMessage('system', `Cannot send a copy request here — ${result.detail}. /copy needs an interactive terminal with OSC 52 clipboard support.`);
-                            break;
-                        case 'too-large':
-                            pushMessage('system', `Cannot send this answer to the terminal clipboard — it is ${result.bytes.toLocaleString()} bytes and the OSC 52 safety limit is ${result.limit.toLocaleString()}. Nothing was truncated.`);
-                            break;
-                        case 'write-failed':
-                            pushMessage('system', `Could not send the terminal copy request: ${result.detail}`);
-                            break;
-                        default: {
-                            const exhaustive = result;
-                            void exhaustive;
-                        }
-                    }
                     return;
                 }
                 case 'raw': {
@@ -2501,6 +2677,8 @@ export function App({ ctx: initialCtx }) {
     }, [
         activeSkills,
         advanceQueueContinuation,
+        applyPermissionMode,
+        applyReasoningEffort,
         ctx.cwd,
         doResume,
         enqueueQueued,
@@ -2510,11 +2688,45 @@ export function App({ ctx: initialCtx }) {
         pushMessage,
         rawOutput,
         resetTranscript,
+        setChoicePicker,
+        setCopyPicker,
         setReasoningEffort,
         slashCtx,
         startFreshConversation,
         state,
     ]);
+    // Keep the footer on the same durable goal record the driver mutates. A ref
+    // alone cannot repaint React, so every goal mutation bumps goalDriveVersion;
+    // generation/session checks stop a late disk read labelling a resumed chat.
+    useEffect(() => {
+        void goalDriveVersion;
+        const sessions = sessionsRef.current;
+        const scope = scopeRef.current;
+        if (!sessions?.goals || !scope) {
+            setGoalStatus(null);
+            return;
+        }
+        const generation = conversationGenRef.current;
+        const sessionId = scope.sessionId;
+        let disposed = false;
+        void sessions.goals
+            .getGoal(sessionId, sessions.tenantId)
+            .then((goal) => {
+            if (disposed ||
+                conversationGenRef.current !== generation ||
+                scopeRef.current?.sessionId !== sessionId) {
+                return;
+            }
+            setGoalStatus(goal);
+        })
+            .catch(() => {
+            if (!disposed && conversationGenRef.current === generation)
+                setGoalStatus(null);
+        });
+        return () => {
+            disposed = true;
+        };
+    }, [goalDriveVersion, phase, session]);
     // Admit automatic work only at a whole-App durable boundary. This effect
     // reserves; it never starts a turn itself. The one queue pump below remains
     // the sole starter, which is what keeps a human prompt that arrives during
@@ -2535,6 +2747,8 @@ export function App({ ctx: initialCtx }) {
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
+            choicePickerRef.current ||
+            copyPickerRef.current ||
             goalCommandInFlightRef.current) {
             return;
         }
@@ -2559,6 +2773,8 @@ export function App({ ctx: initialCtx }) {
                     conversationMutationRef.current ||
                     exportingRef.current ||
                     compactingRef.current ||
+                    choicePickerRef.current ||
+                    copyPickerRef.current ||
                     goalCommandInFlightRef.current ||
                     queuedRef.current.length > 0 ||
                     !goalActivation.isArmed(sessionId, armed)) {
@@ -2616,6 +2832,8 @@ export function App({ ctx: initialCtx }) {
         conversationMutation,
         session,
         state,
+        choicePicker,
+        copyPicker,
         wakeGoalDriver,
     ]);
     // Drain the queue: when a turn settles (idle) and nothing is running,
@@ -2630,6 +2848,8 @@ export function App({ ctx: initialCtx }) {
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
+            choicePickerRef.current ||
+            copyPickerRef.current ||
             goalCommandInFlightRef.current)
             return;
         // Read and remove from the synchronous source of truth. `queued` is the
@@ -2639,7 +2859,17 @@ export function App({ ctx: initialCtx }) {
         const next = dequeueQueued();
         if (next !== undefined)
             void runTurn(next);
-    }, [state, phase, queued, queuePause, dequeueQueued, hasUnsettledTurn, runTurn]);
+    }, [
+        state,
+        phase,
+        queued,
+        queuePause,
+        choicePicker,
+        copyPicker,
+        dequeueQueued,
+        hasUnsettledTurn,
+        runTurn,
+    ]);
     // One-shot update check on launch.
     // Best-effort; surfaces a single notice when something newer is out.
     const updateCheckedRef = useRef(false);
@@ -2654,7 +2884,7 @@ export function App({ ctx: initialCtx }) {
             pushMessage('system', `⬆ Update available:\n${lines.join('\n')}`);
         });
     }, [phase, ctx.version, pushMessage]);
-    const hydrateFromPicker = useCallback(async (prefs, detectedNow, signal) => {
+    const hydrateFromPicker = useCallback(async (prefs, detectedNow, signal, revealAllOnFailure = false) => {
         try {
             await hydrateSession(prefs, detectedNow, signal);
         }
@@ -2664,6 +2894,11 @@ export function App({ ctx: initialCtx }) {
             // choice stays on the picker with the actionable construction error.
             if (signal.aborted)
                 return;
+            if (revealAllOnFailure) {
+                setPickerDetected(null);
+                setPickerSelectionKind('provider-and-model');
+                setPickerInitialView('providers');
+            }
             setPickerNotice(`Could not start the selected provider: ${err instanceof Error ? err.message : String(err)}`);
         }
     }, [hydrateSession]);
@@ -2679,6 +2914,8 @@ export function App({ ctx: initialCtx }) {
         const next = [credential, ...detected.filter((d) => d.entry.id !== credential.entry.id)];
         setDetected(next);
         setKeyEntryFor(null);
+        setPickerDetected(null);
+        setPickerSelectionKind('provider-and-model');
         setPickerNotice(null);
         // The disposition, not the key. `credential` never reaches a message.
         pushMessage('system', disposition);
@@ -2720,7 +2957,9 @@ export function App({ ctx: initialCtx }) {
             pushMessage('system', `Could not save preferences: ${err instanceof Error ? err.message : String(err)}`);
             return;
         }
-        void hydrateFromPicker(prefs, detected, signal);
+        // Keep a narrowed signed-in roster stable while construction is pending.
+        // Only a real refusal broadens back to the general, sign-in-capable picker.
+        void hydrateFromPicker(prefs, detected, signal, true);
     }, [detected, hydrateFromPicker, pushMessage]);
     /**
      * Leaving the picker returns to whatever was on screen before it.
@@ -2742,6 +2981,8 @@ export function App({ ctx: initialCtx }) {
      */
     const handlePickerCancel = useCallback(() => {
         setPickerInitialView('providers');
+        setPickerDetected(null);
+        setPickerSelectionKind('provider-and-model');
         if (session?.hasProvider) {
             setPhase('ready');
             return;
@@ -2867,6 +3108,62 @@ export function App({ ctx: initialCtx }) {
                 resolvePermission({ kind: 'approve-all' });
             return;
         }
+        // Finite slash-command choices own the keyboard below a live permission
+        // 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;
+            if (key.escape || (key.ctrl && input === 'c')) {
+                setChoicePicker(null);
+                return;
+            }
+            if (key.upArrow) {
+                setSelectedChoice((index) => Math.max(0, index - 1));
+                return;
+            }
+            if (key.downArrow) {
+                setSelectedChoice((index) => Math.min(options.length - 1, index + 1));
+                return;
+            }
+            if (key.return) {
+                applyChoiceSelection(selectedChoice);
+                return;
+            }
+            if (/^[1-9]$/.test(input)) {
+                const index = Number(input) - 1;
+                if (options[index])
+                    applyChoiceSelection(index);
+            }
+            return;
+        }
+        // `/copy` holds a source snapshot, not a lifecycle phase. Permission
+        // stays above it in this handler so an approval request that arrives
+        // while the picker is open cannot have its keys stolen by the chooser.
+        if (copyPickerRef.current) {
+            const targets = copyPickerRef.current.targets;
+            if (key.escape || (key.ctrl && input === 'c')) {
+                setCopyPicker(null);
+                return;
+            }
+            if (key.upArrow) {
+                setSelectedCopy((index) => Math.max(0, index - 1));
+                return;
+            }
+            if (key.downArrow) {
+                setSelectedCopy((index) => Math.min(targets.length - 1, index + 1));
+                return;
+            }
+            if (key.return) {
+                sendCopyRequest(selectedCopy);
+                return;
+            }
+            if (/^[1-9]$/.test(input)) {
+                const index = Number(input) - 1;
+                if (targets[index])
+                    sendCopyRequest(index);
+            }
+            return;
+        }
         // Esc interrupts a running turn (Ctrl+C stays reserved for exit). Mirrors
         // the Ctrl+C interrupt path: abort, drop the queue, one "Interrupted." line.
         if (key.escape && abortRef.current) {
@@ -2943,16 +3240,29 @@ 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: detected, currentProvider: currentProvider, 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 }) : null, _jsxs(ComposerFrame, { focus: state === 'idle' && phase === 'ready' && conversationMutation === null, hidden: permission !== null, children: [queued.length > 0 && permission === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
+    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, 
+                                            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
-                                ? `${session.modelSummary}${reasoningEffort ? ` · effort ${reasoningEffort}` : ''}`
+                                        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'
@@ -2961,7 +3271,15 @@ export function App({ ctx: initialCtx }) {
                                         ? 'starting a fresh conversation — input is paused'
                                         : compacting
                                             ? 'compacting conversation — input is paused'
-                                            : hintForPhase(phase, state, session?.hasProvider === true), usage: usage, context: context }) })] })] }));
+                                            : 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;
@@ -3019,6 +3337,62 @@ canReturn = false) {
         return 'agent is working — esc to interrupt';
     return '/help · Esc×2 edit previous · @file / Ctrl+V attach · Ctrl+C ×2 to exit';
 }
+function goalStatusLabel(goal) {
+    if (!goal)
+        return null;
+    switch (goal.phase) {
+        case 'active':
+            return 'Pursuing goal';
+        case 'paused':
+            return 'Goal paused (/goal resume)';
+        case 'blocked':
+            return 'Goal stalled (/goal resume)';
+        case 'complete':
+            return 'Goal achieved';
+    }
+}
+function permissionModeDescription(mode) {
+    switch (mode) {
+        case 'prompt':
+            return 'Ask before an undecided tool call runs';
+        case 'auto':
+            return 'Approve undecided calls unless a rule or safety gate refuses';
+        case 'strict':
+            return 'Refuse undecided calls; explicit allow rules still work';
+    }
+}
+function permissionPickerNotice(session) {
+    const notices = [];
+    if (session.approvalLatched()) {
+        notices.push('Approve all is active; applying any mode revokes it.');
+    }
+    const exempt = session.promptExemptTools();
+    if (exempt.length > 0)
+        notices.push(`Never prompted: ${exempt.join(', ')}.`);
+    return notices.length > 0 ? notices.join(' ') : undefined;
+}
+function reasoningEffortDescription(effort) {
+    switch (effort) {
+        case undefined:
+            return 'Use the provider and model default';
+        case 'none':
+            return 'No deliberate reasoning where the model supports it';
+        case 'minimal':
+            return 'Fastest responses with minimal reasoning';
+        case 'low':
+            return 'Fast responses with light reasoning';
+        case 'medium':
+            return 'Balance speed and reasoning depth';
+        case 'high':
+            return 'Deeper reasoning for complex problems';
+        case 'xhigh':
+            return 'Very deep reasoning for hard problems';
+        case 'max':
+            return 'Maximum reasoning depth offered by this model';
+        case 'ultra':
+            return 'Highest host-level reasoning setting when supported';
+    }
+}
 /**
  * The summary text, as collapsible detail under the compaction row.
  *