@namzu/cli 13.0.0 → 14.1.0

package/dist/tui/App.js

@@ -5,51 +5,53 @@ 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 { DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, SessionGoalActivation, StaleGoalError, kernelHostCommands, createAssistantMessage, createUserMessage, generateRunId, isCompactionMessage, } from '@namzu/sdk';
-import { Box, Text, useApp, useInput, useStdout } from 'ink';
 import { join, relative } from 'node:path';
+import { DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, SessionGoalActivation, StaleGoalError, createAssistantMessage, createUserMessage, generateRunId, isCompactionMessage, kernelHostCommands, } from '@namzu/sdk';
+import { Box, Text, useApp, useInput, useStdout } from 'ink';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { visibleProjectInstructionPath } from '../context/project-path.js';
 import { pinTrustedProjectPath, resolveTrustedProjectContext, } from '../config/trusted-project-context.js';
-import { beginSubscriptionLogin, clearStoredSubscriptionCredential, credentialsPath, primaryProvider, readStoredSubscriptionCredential, writePreferences, } from '../integrations/providers/index.js';
+import { visibleProjectInstructionPath } from '../context/project-path.js';
 import { writeClipboardText } from '../integrations/clipboard/text.js';
 import { terminalNotificationEnabled, writeTerminalNotification, } from '../integrations/notifications/terminal.js';
-import { describeLoginOutcome, describeLoginStart, describeLogout } from './login-prompt.js';
-import { openInBrowser } from './open-browser.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';
+import { checkUpdates } from '../integrations/updates.js';
 import { appendMemory, composeMemoryPrompt, readMemory } from '../memory/store.js';
 import { composeSkillsPrompt, discoverSkills, loadSkillBody } from '../skills/store.js';
-import { checkUpdates } from '../integrations/updates.js';
-import { LiveActivity, formatElapsed } from './LiveActivity.js';
-import { bottomSpacerRows } from './bottom-spacer.js';
-import { expandFileMentions } from './mentions.js';
+import { discoverUserCommands } from '../user-commands/store.js';
 import { Composer } from './Composer.js';
+import { CopyPicker } from './CopyPicker.js';
 import { EditPromptPicker } from './EditPromptPicker.js';
-import { TrustPrompt } from './TrustPrompt.js';
-import { NAMZU_MARK, NAMZU_MARK_COLOR, NAMZU_WORDMARK, NAMZU_WORDMARK_GRADIENT, NAMZU_WORDMARK_MIN_WIDTH, } from './logo.js';
+import { LiveActivity, formatElapsed } from './LiveActivity.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
-import { approvalIsDeliberate } from './consent-timing.js';
 import { Picker } from './Picker.js';
+import { ResumePicker } from './ResumePicker.js';
 import { StatusBar } from './StatusBar.js';
 import { Transcript, willCollapse } from './Transcript.js';
-import { liveWindow, transcriptLines } from './live-window.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 { TrustPrompt } from './TrustPrompt.js';
 import { createAgentSession, probeAgentSession, } from './agent.js';
-import { ResumePicker } from './ResumePicker.js';
-import { editablePrompts } from './edit-prompts.js';
+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 { discoverUserCommands } from '../user-commands/store.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';
+import { NAMZU_MARK, NAMZU_MARK_COLOR, NAMZU_WORDMARK, NAMZU_WORDMARK_GRADIENT, NAMZU_WORDMARK_MIN_WIDTH, } from './logo.js';
+import { expandFileMentions } from './mentions.js';
+import { openInBrowser } from './open-browser.js';
 import { hostCommandNames, kernelCommandDescriptors, mergeHostCommands, renderOutcome, reviewPrompt, runSlash, } from './slashCommands.js';
 import { splitCompleteBlocks } from './stream-blocks.js';
 import { theme } from './theme.js';
-import { keepRecentRows } from './compact-transcript.js';
 import { renderWorkspaceDiff, workspaceDiff } from './workspace-diff.js';
 /** Last non-empty assistant text in a durable conversation, newest first. */
 function latestAssistantOutput(messages) {
@@ -213,6 +215,12 @@ export function App({ ctx: initialCtx }) {
      * chosen yet would be answering a question that was not asked.
      */
     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);
     /**
@@ -312,6 +320,14 @@ 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);
+    }, []);
     const [composerDraft, setComposerDraft] = useState(null);
     const composerDraftTokenRef = useRef(0);
     const exitArmedRef = useRef(false);
@@ -328,12 +344,18 @@ export function App({ ctx: initialCtx }) {
      * which the code that comes back cannot be exchanged for anything.
      */
     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;
         loginRef.current?.cancel();
         loginRef.current = null;
+        codexLoginRef.current?.cancel();
+        codexLoginRef.current = null;
     }, []);
     const runProbeRef = useRef(null);
     useEffect(() => cancelPendingLogin, [cancelPendingLogin]);
@@ -495,6 +517,42 @@ export function App({ ctx: initialCtx }) {
         ]);
         return id;
     }, [nextId]);
+    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;
@@ -651,9 +709,9 @@ export function App({ ctx: initialCtx }) {
     /**
      * Sign in to a subscription without leaving namzu.
      *
-     * Two calls, one command. Bare `/login` starts an attempt and parks it in
-     * `loginRef`; `/login <address>` finishes that one. Nothing here parses the
-     * argument — `slashCommands` already decided which of the two this is.
+     * A bare `/login` no longer guesses a provider: it mounts the subscription
+     * picker first. The argument form remains the paste-completion half of the
+     * browser-callback attempt already in flight.
      *
      * ## Why it re-probes instead of installing the credential directly
      *
@@ -681,46 +739,19 @@ export function App({ ctx: initialCtx }) {
             loginAbortCleanupRef.current?.();
             loginAbortCleanupRef.current = null;
             pushMessage('system', describeLoginOutcome(outcome));
-            if (outcome.ok)
+            if (outcome.ok) {
+                setPickerInitialView('providers');
                 await runProbeRef.current?.();
+            }
             return;
         }
         cancelPendingLogin();
-        let start;
-        try {
-            start = await beginSubscriptionLogin();
-        }
-        catch (err) {
-            pushMessage('system', `Could not start a sign-in: ${err instanceof Error ? err.message : String(err)}`);
-            return;
-        }
-        loginRef.current = start;
-        pushMessage('system', describeLoginStart({
-            url: start.url,
-            loopback: start.loopback,
-            browserOpened: openInBrowser(start.url),
-        }));
-        // The automatic half, when there is one. Not awaited by the caller:
-        // the composer stays live throughout, so the operator can paste
-        // instead — or type anything else — while this waits.
-        const waiting = start.waitForCallback();
-        if (!waiting)
-            return;
-        const outcome = await waiting;
-        if (loginRef.current !== start)
-            return; // superseded, or finished by paste
-        loginRef.current = null;
-        loginAbortCleanupRef.current?.();
-        loginAbortCleanupRef.current = null;
-        start.cancel();
-        // A cancelled listener resolves to a refusal, and saying "sign-in
-        // failed" when the operator finished it another way would be a lie
-        // about their own successful login.
-        if (!outcome.ok && outcome.reason.includes('cancelled'))
-            return;
-        pushMessage('system', describeLoginOutcome(outcome));
-        if (outcome.ok)
-            await runProbeRef.current?.();
+        setPickerNotice(null);
+        setKeyEntryFor(null);
+        setPickerDetected(null);
+        setPickerSelectionKind('provider-and-model');
+        setPickerInitialView('subscriptions');
+        setPhase('picker');
     }, [cancelPendingLogin, pushMessage]);
     /**
      * Sign in from the PICKER, where the transcript does not exist.
@@ -737,10 +768,43 @@ export function App({ ctx: initialCtx }) {
      * no-browser case is handed to `namzu login`, which reads the pasted
      * address from standard input and exists for exactly that machine.
      */
-    const startLoginFromPicker = useCallback(async (signal) => {
+    const startLoginFromPicker = useCallback(async (provider, signal) => {
         if (signal.aborted)
             return;
         cancelPendingLogin();
+        if (provider === 'codex') {
+            let start;
+            try {
+                start = await beginCodexDeviceLogin({ signal });
+            }
+            catch (error) {
+                if (!signal.aborted) {
+                    setPickerNotice(`Could not start Codex sign-in: ${error instanceof Error ? error.message : String(error)}`);
+                }
+                return;
+            }
+            if (signal.aborted) {
+                start.cancel();
+                return;
+            }
+            codexLoginRef.current = start;
+            setPickerNotice(describeCodexDeviceLoginStart({
+                url: start.url,
+                userCode: start.userCode,
+                browserOpened: openInBrowser(start.url),
+            }));
+            const outcome = await start.waitForCompletion();
+            if (codexLoginRef.current !== start || signal.aborted)
+                return;
+            codexLoginRef.current = null;
+            start.cancel();
+            setPickerNotice(describeLoginOutcome(outcome));
+            if (outcome.ok) {
+                setPickerInitialView('providers');
+                await runProbeRef.current?.(signal);
+            }
+            return;
+        }
         let start;
         try {
             start = await beginSubscriptionLogin({ signal });
@@ -793,8 +857,10 @@ export function App({ ctx: initialCtx }) {
         if (!outcome.ok && outcome.reason.includes('cancelled'))
             return;
         setPickerNotice(describeLoginOutcome(outcome));
-        if (outcome.ok)
+        if (outcome.ok) {
+            setPickerInitialView('providers');
             await runProbeRef.current?.(signal);
+        }
     }, [cancelPendingLogin]);
     const runProbe = useCallback(async (signal) => {
         try {
@@ -805,6 +871,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');
@@ -821,6 +890,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);
@@ -828,9 +900,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) {
@@ -839,7 +953,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.
@@ -1948,6 +2062,9 @@ 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': {
@@ -2007,9 +2124,9 @@ export function App({ ctx: initialCtx }) {
                     return;
                 case 'logout': {
                     const path = credentialsPath();
-                    const had = readStoredSubscriptionCredential() !== null;
+                    const had = readStoredSubscriptionCredential() !== null || readStoredCodexCredential() !== null;
                     try {
-                        clearStoredSubscriptionCredential();
+                        clearAllStoredCredentials();
                     }
                     catch (err) {
                         pushMessage('system', `Could not remove ${path}: ${err instanceof Error ? err.message : String(err)}`);
@@ -2380,30 +2497,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': {
@@ -2498,6 +2596,7 @@ export function App({ ctx: initialCtx }) {
         pushMessage,
         rawOutput,
         resetTranscript,
+        setCopyPicker,
         setReasoningEffort,
         slashCtx,
         startFreshConversation,
@@ -2523,6 +2622,7 @@ export function App({ ctx: initialCtx }) {
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
+            copyPickerRef.current ||
             goalCommandInFlightRef.current) {
             return;
         }
@@ -2547,6 +2647,7 @@ export function App({ ctx: initialCtx }) {
                     conversationMutationRef.current ||
                     exportingRef.current ||
                     compactingRef.current ||
+                    copyPickerRef.current ||
                     goalCommandInFlightRef.current ||
                     queuedRef.current.length > 0 ||
                     !goalActivation.isArmed(sessionId, armed)) {
@@ -2604,6 +2705,7 @@ export function App({ ctx: initialCtx }) {
         conversationMutation,
         session,
         state,
+        copyPicker,
         wakeGoalDriver,
     ]);
     // Drain the queue: when a turn settles (idle) and nothing is running,
@@ -2618,6 +2720,7 @@ export function App({ ctx: initialCtx }) {
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
+            copyPickerRef.current ||
             goalCommandInFlightRef.current)
             return;
         // Read and remove from the synchronous source of truth. `queued` is the
@@ -2627,7 +2730,16 @@ 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,
+        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);
@@ -2642,7 +2754,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);
         }
@@ -2652,6 +2764,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]);
@@ -2667,6 +2784,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);
@@ -2708,7 +2827,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.
@@ -2729,6 +2850,9 @@ export function App({ ctx: initialCtx }) {
      * what the empty picker's own footer has always claimed `esc` does.
      */
     const handlePickerCancel = useCallback(() => {
+        setPickerInitialView('providers');
+        setPickerDetected(null);
+        setPickerSelectionKind('provider-and-model');
         if (session?.hasProvider) {
             setPhase('ready');
             return;
@@ -2854,6 +2978,34 @@ export function App({ ctx: initialCtx }) {
                 resolvePermission({ kind: 'approve-all' });
             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) {
@@ -2930,12 +3082,15 @@ 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, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: (signal) => void startLoginFromPicker(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 })) : copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
+                                    phase === 'ready' &&
+                                    conversationMutation === null &&
+                                    copyPicker === null, hidden: permission !== null || copyPicker !== null, children: [queued.length > 0 && permission === 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 || 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
@@ -2948,7 +3103,11 @@ 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)
+                                                : copyPicker
+                                                    ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
+                                                    : hintForPhase(phase, state, session?.hasProvider === true), usage: usage, context: context }) })] })] }));
 }
 function Banner({ version, session, permissionMode, cwd, }) {
     const cols = process.stdout.columns ?? 80;