@namzu/cli 32.0.0 → 33.0.0

package/dist/tui/App.js

@@ -25,9 +25,10 @@ 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, clearStoredCodexCredential, clearStoredSubscriptionCredential, credentialsPath, parsePastedInput, primaryProvider, readStoredCodexCredential, readStoredSubscriptionCredential, signedInSubscriptionProviders, writePreferences, } from '../integrations/providers/index.js';
-import { activeConversationTurn, archiveConversation, forkConversation, forkConversationBeforeUser, listRecent, loadConversation, loadResumableConversation, openSessions, requireWritableConversation, setTitle, startConversation, titleOf, } from '../integrations/sessions/store.js';
+import { beginCodexDeviceLogin, beginSubscriptionLogin, clearAllStoredCredentials, clearStoredCodexCredential, clearStoredGeminiApiKey as clearStoredGoogleApiKey, clearStoredSubscriptionCredential, credentialsPath, googleApiKeyPath, parsePastedInput, primaryProvider, readStoredCodexCredential, readStoredGeminiApiKey as readStoredGoogleApiKey, readStoredSubscriptionCredential, signedInSubscriptionProviders, writePreferences, writeStoredGeminiApiKey as writeStoredGoogleApiKey, } from '../integrations/providers/index.js';
+import { ConversationIndexRefreshError, activeConversationTurn, archiveConversation, forkConversation, forkConversationBeforeUser, listArchived, listRecent, loadConversation, loadResumableConversation, openSessions, requireWritableConversation, setTitle, startConversation, titleOf, unarchiveConversation, } from '../integrations/sessions/store.js';
 import { conversationMarkdown, writeConversationExport, } from '../integrations/sessions/transcript-export.js';
+import { openManagedWorktrees, worktreeOpenHint } from '../integrations/worktrees/managed.js';
 import { NARRATION_TOOL_NAME } from '../integrations/subagents/runtime.js';
 import { agentsSlashCommand } from '../integrations/subagents/slash.js';
 import { isTrusted, trustDir } from '../integrations/trust/store.js';
@@ -88,7 +89,7 @@ import { checklistInView, liveWindow, settledBeforeStreaming } from './live-wind
 import { ViewportBound } from './ViewportBound.js';
 import { resolveModelSwitch, } from './model-switch.js';
 import { parseModelSelectionIntent, resolveModelSelectionIntent } from './model-selection-intent.js';
-import { describeCodexDeviceLoginStart, describeLoginOutcome, describeLoginStart, describeLogout, describeProviderLogout, } from './login-prompt.js';
+import { describeCodexDeviceLoginStart, describeLoginOutcome, describeLoginStart, describeAllCredentialsLogout, describeProviderLogout, } from './login-prompt.js';
 import { selectPrimaryProvider } from './provider-selection.js';
 import { eraseLastChoiceGrapheme } from './terminal-choice-text.js';
 import { renderCheckpoints, renderRestore } from '../checkpoints/store.js';
@@ -101,6 +102,7 @@ import { moveSelection } from './selection-window.js';
 import { describeShellEscape, describeShellEscapeForModel, runShellEscape, shellEscapeCommand, } from './shell-escape.js';
 import { baseBranchReviewPrompt, commitReviewPrompt, hostCommandNames, kernelCommandDescriptors, mergeHostCommands, renderAgents, renderOutcome, reviewPrompt, runSlash, } from './slashCommands.js';
 import { splitCompleteBlocks, splitSafeCut } from './stream-blocks.js';
+import { terminalDisplayText } from './terminal-display.js';
 import { terminalSupportsHyperlinks } from './terminal-hyperlinks.js';
 import { theme } from './theme.js';
 import { useSelectionIndex } from './use-selection-index.js';
@@ -1165,9 +1167,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // outlived the row it named would resolve `/expand 3` to output the operator
     // can no longer see anywhere, which is the failure this surface is being
     // cleaned of, one layer up.
-    const resetTranscript = useCallback(() => {
+    const resetTranscript = useCallback((options = {}) => {
         if (stdout.isTTY)
             writeStdout('\x1b[2J\x1b[3J\x1b[H');
+        if (!options.preserveOutputViewer)
+            setOutputViewer(null);
         // The scrollback floor goes with the log it counted. <Static> is remounted
         // by the key below and has emitted nothing again; a floor that survived
         // would keep the next conversation's rows out of the live window.
@@ -1179,12 +1183,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const previous = previousTerminalRef.current;
         previousTerminalRef.current = terminal;
         if (externalEditorRequestRef.current === null &&
-            (terminal.columns < previous.columns || terminal.rows < previous.rows)) {
-            // A contraction can reflow live rows into native scrollback before Ink
-            // receives resize. Its old row count cannot erase those rows. Rebuild
-            // Namzu's normal-buffer view at the committed size, retaining the same
-            // messages, draft and selected child. Regular frames remain incremental.
-            resetTranscript();
+            (terminal.columns !== previous.columns || terminal.rows < previous.rows)) {
+            // A contraction can move live rows into native scrollback before Ink
+            // receives resize; expansion leaves already-printed Static rows wrapped
+            // at their old width. Rebuild the normal-buffer transcript at the new
+            // width, retaining messages, draft and selected child. Regular frames
+            // remain incremental.
+            resetTranscript({ preserveOutputViewer: true });
         }
     }, [terminal, resetTranscript]);
     const requestExternalEditor = useCallback((seed) => {
@@ -1802,26 +1807,44 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
     }, [conversationLearning, ctx.cwd, ctx.skills, pushMessage]);
     const removeStoredCredential = useCallback((target) => {
-        const path = credentialsPath();
+        const path = target === 'google' ? googleApiKeyPath() : credentialsPath();
         const hadClaude = readStoredSubscriptionCredential() !== null;
         const hadCodex = readStoredCodexCredential() !== null;
+        const hadGoogleKey = readStoredGoogleApiKey() !== null;
+        if (target === 'all') {
+            const failures = [];
+            try {
+                clearAllStoredCredentials();
+            }
+            catch (error) {
+                failures.push(`${credentialsPath()}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            try {
+                clearStoredGoogleApiKey();
+            }
+            catch (error) {
+                failures.push(`${googleApiKeyPath()}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            if (failures.length > 0) {
+                pushMessage('system', `Some stored credentials could not be removed: ${failures.join('; ')}. Check both stores before retrying.`);
+                return;
+            }
+            pushMessage('system', describeAllCredentialsLogout(path, googleApiKeyPath(), hadClaude || hadCodex || hadGoogleKey));
+            return;
+        }
         try {
             if (target === 'anthropic')
                 clearStoredSubscriptionCredential();
             else if (target === 'codex')
                 clearStoredCodexCredential();
             else
-                clearAllStoredCredentials();
+                clearStoredGoogleApiKey();
         }
         catch (error) {
             pushMessage('system', `Could not remove ${path}: ${error instanceof Error ? error.message : String(error)}`);
             return;
         }
-        if (target === 'all') {
-            pushMessage('system', describeLogout(path, hadClaude || hadCodex));
-            return;
-        }
-        pushMessage('system', describeProviderLogout(path, target, target === 'anthropic' ? hadClaude : hadCodex));
+        pushMessage('system', describeProviderLogout(path, target, target === 'anthropic' ? hadClaude : target === 'codex' ? hadCodex : hadGoogleKey));
     }, [pushMessage]);
     /** Publish one recoverable, read-only tombstone before leaving the TUI. */
     const archiveCurrentConversation = useCallback(() => {
@@ -1864,7 +1887,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 closeAndExit();
             }
             catch (error) {
-                pushMessage('system', `Could not archive this conversation: ${error instanceof Error ? error.message : String(error)}`);
+                pushMessage('system', error instanceof ConversationIndexRefreshError
+                    ? error.message
+                    : `Could not archive this conversation: ${error instanceof Error ? error.message : String(error)}`);
             }
             finally {
                 if (!archived && conversationMutationRef.current === 'archive') {
@@ -2648,10 +2673,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 setMentionCandidates(files);
         });
         setCurrentProvider(primaryProvider(prefs).id);
-        // A picker-owned, usable provider switch is an explicit recovery from a
-        // paused failed turn. Failed and superseded candidates return above and
-        // therefore cannot release its dependent queue.
-        if (signal !== undefined)
+        // Failed and superseded provider choices returned above. A usable
+        // provider change can recover a failed turn's dependent queue, but a
+        // paused turn still owns the conversation's durable active slot. Keep
+        // that queue held until its checkpoint is resumed and settles.
+        if (signal !== undefined && queuePauseRef.current?.outcome !== 'paused')
             advanceQueueContinuation();
         if (s.hasProvider) {
             setTranscriptOwned(true);
@@ -3044,9 +3070,6 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // terminal scrollback; the live tail stays deliberately small so an activity
     // tick never repaints the whole conversation.
     //
-    useEffect(() => {
-        setOutputViewer(null);
-    }, [resetKey]);
     useEffect(() => {
         if (permission !== null)
             setOutputViewer(null);
@@ -3185,7 +3208,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const scope = scopeRef.current;
         if (!sessions || !scope || !conversationMaterializedRef.current || !session?.hasProvider)
             return false;
-        const active = await activeConversationTurn(sessions, scope.sessionId).catch(() => undefined);
+        const resumedSessionId = scope.sessionId;
+        const active = await activeConversationTurn(sessions, resumedSessionId).catch(() => undefined);
         if (!active)
             return false;
         if (abortRef.current || state !== 'idle') {
@@ -3266,7 +3290,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 finalizeMessage(st.assistantId);
             // The resumed segment was appended to the log; the fold is the context
             // the next prompt continues from.
-            modelHistoryRef.current = await loadConversation(sessions, scope.sessionId);
+            modelHistoryRef.current = await loadConversation(sessions, resumedSessionId);
+            // A successfully completed checkpoint frees the conversation's active
+            // slot. Only then may prompts queued behind the paused turn start. A
+            // repeated pause, failed resume, unreadable log, or conversation switch
+            // keeps dependent work held for an explicit operator decision.
+            if (st.completed &&
+                queuePauseRef.current?.outcome === 'paused' &&
+                scopeRef.current?.sessionId === resumedSessionId &&
+                (await activeConversationTurn(sessions, resumedSessionId)
+                    .then((next) => next === undefined)
+                    .catch(() => false))) {
+                advanceQueueContinuation();
+            }
         }
         catch (err) {
             pushMessage('system', `Could not resume the turn: ${err instanceof Error ? err.message : String(err)}`);
@@ -3283,7 +3319,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             await restoreBrowser?.().catch(() => undefined);
         }
         return true;
-    }, [detected, finalizeMessage, flushStream, pushMessage, session, setHandoffPark, state]);
+    }, [advanceQueueContinuation, detected, finalizeMessage, flushStream, pushMessage, session, setHandoffPark, state]);
     // `namzu resume <id>` of a scheduled run parked on a decision: what the
     // notification and `/schedule` tell the operator to run. Continue it once
     // the screen is ready, exactly as `/resume` would, so the parked call is on
@@ -3331,6 +3367,35 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pushMessage('system', `Could not list conversations: ${err instanceof Error ? err.message : String(err)}`);
         }
     }, [ensureSessions, pushMessage, resumeActiveTurn]);
+    const doUnarchive = useCallback(async () => {
+        if (state !== 'idle' ||
+            abortRef.current !== null ||
+            hasUnsettledTurn() ||
+            queuedRef.current.length > 0 ||
+            compactingRef.current ||
+            exportingRef.current) {
+            pushMessage('system', 'Finish the current turn and queued work before restoring a conversation.');
+            return;
+        }
+        const sessions = sessionsRef.current ?? (await ensureSessions(), sessionsRef.current);
+        if (!sessions) {
+            pushMessage('system', 'Conversation history is unavailable in this folder.');
+            return;
+        }
+        try {
+            const archived = await listArchived(sessions, 100);
+            if (archived.length === 0) {
+                pushMessage('system', 'No archived conversations in this project.');
+                return;
+            }
+            setResumeList(archived);
+            setSelectedResume(0);
+            setPhase('unarchive');
+        }
+        catch (err) {
+            pushMessage('system', `Could not list archived conversations: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }, [ensureSessions, hasUnsettledTurn, pushMessage, state]);
     // Resolve a pending permission prompt with the user's decision and tear
     // down the overlay. No-op if nothing is pending.
     const resolvePermission = useCallback((decision) => {
@@ -3511,6 +3576,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         resumeCommittedRef.current = true;
         let msgs;
         try {
+            await requireWritableConversation(sessions, conv.id, 'resume conversation');
             msgs = await loadConversation(sessions, conv.id);
         }
         catch (err) {
@@ -3580,6 +3646,42 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         resetTranscript,
         wakeGoalDriver,
     ]);
+    const restoreArchivedConversation = useCallback(async (conv) => {
+        const sessions = sessionsRef.current;
+        if (!sessions) {
+            setPhase('ready');
+            return;
+        }
+        if (state !== 'idle' ||
+            abortRef.current !== null ||
+            hasUnsettledTurn() ||
+            queuedRef.current.length > 0 ||
+            compactingRef.current ||
+            exportingRef.current) {
+            setPhase('ready');
+            pushMessage('system', 'Finish the current turn and queued work before restoring a conversation.');
+            return;
+        }
+        resumeCommittedRef.current = true;
+        try {
+            await unarchiveConversation(sessions, conv.id);
+        }
+        catch (err) {
+            resumeCommittedRef.current = false;
+            setPhase('ready');
+            pushMessage('system', err instanceof ConversationIndexRefreshError
+                ? err.message
+                : `Could not restore: ${err instanceof Error ? err.message : String(err)}`);
+            return;
+        }
+        pushMessage('system', `Restored: ${conv.title}`);
+        try {
+            await resumeConversation(conv);
+        }
+        finally {
+            resumeCommittedRef.current = false;
+        }
+    }, [hasUnsettledTurn, pushMessage, resumeConversation, state]);
     /**
      * Start a new conversation without deleting the one being left.
      *
@@ -4539,8 +4641,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         `${describeTurnInterruption(event)}\nWhen that is done, press Enter to continue · Esc to stop.`, false, '‖');
                     setHandoffPark({ turnId: event.turnId, reason: event.handoff.reason });
                 }
-                else
-                    pushMessage('system', describeTurnInterruption(event), false, '‖');
+                else {
+                    pushMessage('system', `${describeTurnInterruption(event)}\nUse /resume to continue this checkpoint on the selected provider, or /abandon to start a new turn.`, false, '‖');
+                }
                 break;
             case 'error':
                 closeAssistant();
@@ -5816,6 +5919,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     const choices = [
                         ...(readStoredSubscriptionCredential() ? ['anthropic'] : []),
                         ...(readStoredCodexCredential() ? ['codex'] : []),
+                        ...(readStoredGoogleApiKey() ? ['google'] : []),
                     ];
                     if (choices.length === 0) {
                         removeStoredCredential('all');
@@ -5828,14 +5932,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     setSelectedChoice(0);
                     setChoicePicker({
                         kind: 'credential-logout',
-                        title: 'Choose a stored subscription to remove',
+                        title: 'Choose a stored credential to remove',
                         notice: 'Only credentials created by Namzu are listed. Device sessions owned by other tools are left alone.',
                         values: choices,
                         options: choices.map((choice) => ({
-                            label: choice === 'anthropic' ? 'Claude' : 'Codex',
+                            label: choice === 'anthropic' ? 'Claude' : choice === 'codex' ? 'Codex' : 'Gemini API key',
                             description: choice === 'anthropic'
                                 ? 'Remove only Namzu’s Claude subscription.'
-                                : 'Remove only Namzu’s Codex subscription.',
+                                : choice === 'codex'
+                                    ? 'Remove only Namzu’s Codex subscription.'
+                                    : 'Remove only Namzu’s saved Gemini API key.',
                         })),
                     });
                     return;
@@ -5992,12 +6098,80 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 case 'resume':
                     void doResume();
                     return;
+                case 'unarchive':
+                    void doUnarchive();
+                    return;
                 case 'title':
                     void doTitle(slash.title, slash.clear);
                     return;
                 case 'fork':
                     void doFork();
                     return;
+                case 'worktree': {
+                    const [verb = 'list', label, extra] = slash.args;
+                    const notice = (content) => pushMessage('system', terminalDisplayText(content));
+                    if (!((verb === 'list' && label === undefined) ||
+                        (verb === 'create' && extra === undefined) ||
+                        (verb === 'fork' && extra === undefined) ||
+                        (verb === 'resume' &&
+                            label !== undefined &&
+                            extra === undefined))) {
+                        pushMessage('system', 'Usage: /worktree [list|create [name]|fork [name]|resume <name>]');
+                        return;
+                    }
+                    if (verb === 'fork' &&
+                        (abortRef.current ||
+                            hasUnsettledTurn() ||
+                            queuedRef.current.length > 0)) {
+                        pushMessage('system', 'Wait for the current turn and queued prompts to finish before forking to a worktree.');
+                        return;
+                    }
+                    if (conversationMutationRef.current)
+                        return;
+                    if (verb === 'fork') {
+                        conversationMutationRef.current = 'fork';
+                        setConversationMutation('fork');
+                    }
+                    void (async () => {
+                        try {
+                            const manager = await openManagedWorktrees(ctx.cwd);
+                            if (verb === 'list') {
+                                const items = await manager.list();
+                                notice(items.length === 0
+                                    ? 'No managed worktrees in this repository.'
+                                    : items
+                                        .map((item) => `${item.label}: ${item.path}${item.dirty ? ' (uncommitted files)' : ''}`)
+                                        .join('\n'));
+                            }
+                            else if (verb === 'create') {
+                                const created = await manager.create(label);
+                                notice(`Created ${created.branch}. Open it in a new terminal: ${worktreeOpenHint(created.path)}${created.sourceDirty ? '\nUncommitted files stayed in this checkout.' : ''}`);
+                            }
+                            else if (verb === 'fork') {
+                                const scope = await materializeConversation();
+                                if (!scope)
+                                    throw new Error('Conversation history is unavailable in this folder.');
+                                await persistenceTailRef.current;
+                                const forked = await manager.fork(scope.sessionId, label);
+                                notice(`Forked ${forked.copied} messages into ${forked.title}. Open the new checkout in a new terminal: ${worktreeOpenHint(forked.path, forked.conversationId)}${forked.sourceDirty ? '\nUncommitted files stayed in this checkout.' : ''}`);
+                            }
+                            else if (label) {
+                                const target = await manager.resume(label);
+                                notice(`Open ${label} in a new terminal: ${worktreeOpenHint(target.worktree.path, target.conversationId)}`);
+                            }
+                        }
+                        catch (error) {
+                            notice(`Worktree: ${error instanceof Error ? error.message : String(error)}`);
+                        }
+                        finally {
+                            if (verb === 'fork') {
+                                conversationMutationRef.current = null;
+                                setConversationMutation(null);
+                            }
+                        }
+                    })();
+                    return;
+                }
                 case 'restore':
                     void doRestore(slash.turn);
                     return;
@@ -6448,12 +6622,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         appLifetime,
         ctx.cwd,
         doResume,
+        doUnarchive,
         enqueueQueued,
         exitWithSummary,
         hasUnsettledTurn,
         goalActivation,
         goalStatus,
         hostCommands,
+        materializeConversation,
         nextId,
         openAgentCockpit,
         runAgentsCommand,
@@ -6778,29 +6954,24 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 announce: true,
                 chooseReasoningEffort: options.chooseReasoningEffort,
             });
+            return !signal.aborted;
         }
         catch (err) {
             // A superseded choice no longer owns even its failure message. Its
             // eventual session object is disposed inside `hydrateSession`; a live
             // choice stays on the picker with the actionable construction error.
             if (signal.aborted)
-                return;
+                return false;
             if (options.revealAllOnFailure) {
                 setPickerDetected(null);
                 setPickerSelectionKind('provider-and-model');
                 setPickerInitialView('providers');
             }
             setPickerNotice(`Could not start the selected provider: ${err instanceof Error ? err.message : String(err)}`);
+            return false;
         }
     }, [hydrateSession]);
-    /**
-     * A credential the operator typed. Held in memory for this process only.
-     *
-     * Deliberately does NOT call `writePreferences`: preferences are a file, and
-     * the whole contract of this entry point is that nothing lands on disk. The
-     * provider choice is not persisted either, because persisting it would leave
-     * a preference pointing at a credential that will not exist next launch.
-     */
+    /** A typed Google API key is saved only after its provider session opens. */
     const handleTypedCredential = useCallback((credential, disposition, signal) => {
         const next = [credential, ...detected.filter((d) => d.entry.id !== credential.entry.id)];
         setDetected(next);
@@ -6816,7 +6987,32 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const prefs = saved && primaryProvider(saved).id === credential.entry.id
             ? saved
             : selectPrimaryProvider(saved, { id: credential.entry.id });
-        void hydrateFromPicker(prefs, next, signal);
+        void (async () => {
+            const started = await hydrateFromPicker(prefs, next, signal);
+            if (!started || credential.entry.id !== 'google')
+                return;
+            let path;
+            try {
+                path = writeStoredGoogleApiKey(credential.apiKey ?? '');
+            }
+            catch (error) {
+                pushMessage('system', `Gemini is connected, but its API key could not be saved privately: ${error instanceof Error ? error.message : String(error)}. It is usable only in this session.`);
+                return;
+            }
+            setDetected((current) => current.map((provider) => provider.entry.id === 'google' &&
+                provider.source.kind === 'session' &&
+                provider.apiKey === credential.apiKey
+                ? { ...provider, source: { kind: 'stored-gemini-key', path } }
+                : provider));
+            try {
+                writePreferences(prefs);
+            }
+            catch (error) {
+                pushMessage('system', `Gemini API key was saved privately at ${path}, but the provider preference could not be saved: ${error instanceof Error ? error.message : String(error)}. Run /logout gemini to remove the key.`);
+                return;
+            }
+            pushMessage('system', `Gemini API key saved privately at ${path} for future launches. Run /logout gemini to remove it.`);
+        })();
     }, [detected, hydrateFromPicker, pushMessage]);
     const handlePickerSubmit = useCallback((selection, signal) => {
         const prefs = selectPrimaryProvider(savedPrefsRef.current, {
@@ -6923,7 +7119,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         // Resume picker owns the keyboard while open.
-        if (phase === 'resume') {
+        if (phase === 'resume' || phase === 'unarchive') {
             // Once a conversation is being read, the keyboard does nothing here.
             // The choice is already being acted on; a second Enter would start a
             // second read and an Esc would hand back a screen that is about to be
@@ -6940,7 +7136,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             else if (key.return) {
                 const conv = resumeList[selectedResumeRef.current];
                 if (conv)
-                    void resumeConversation(conv);
+                    void (phase === 'unarchive' ? restoreArchivedConversation(conv) : resumeConversation(conv));
             }
             else if (key.escape || (key.ctrl && input === 'c'))
                 setPhase('ready');
@@ -7461,6 +7657,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const lifecycleOwnsViewport = outputViewer !== null ||
         phase === 'trust' ||
         phase === 'resume' ||
+        phase === 'unarchive' ||
         phase === 'edit' ||
         phase === 'picker' ||
         agentSurface !== null;
@@ -7568,7 +7765,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         setPickerSelectionKind('provider-and-model');
                         setPhase('picker');
                         void discoverProviders({ skipProbes: true }).then(setPickerDetected).catch((error) => setPickerNotice(String(error)));
-                    } })) : phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'unhealthy' ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.status.error, bold: true, children: "Startup stopped" }), _jsx(Text, { color: theme.text.secondary, children: "Resolve the error above, then restart Namzu." })] })) : 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, onSetup: () => setProviderSetup(true), onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice, 
+                    } })) : phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'unhealthy' ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.status.error, bold: true, children: "Startup stopped" }), _jsx(Text, { color: theme.text.secondary, children: "Resolve the error above, then restart Namzu." })] })) : phase === 'resume' || phase === 'unarchive' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume, mode: phase === 'unarchive' ? 'restore' : 'resume' })) : 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, onSetup: () => setProviderSetup(true), onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice, 
                     // The same condition `handlePickerCancel` branches on, read
                     // where it is decided rather than guessed on the screen: with no
                     // session behind the picker, esc exits namzu and the footer says
@@ -7687,6 +7884,8 @@ hasDraft = false) {
         return 'y trust this folder · n / esc exit';
     if (phase === 'resume')
         return '↑↓ navigate · enter resume · esc cancel';
+    if (phase === 'unarchive')
+        return '↑↓ navigate · enter restore · esc cancel';
     if (phase === 'edit')
         return '← older · → newer · enter fork and edit · esc cancel';
     if (phase === 'probing')