@namzu/cli 21.0.0 → 22.0.0

package/dist/tui/App.js

@@ -11,6 +11,9 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *   4. Otherwise show <Picker/>. An explicit picker choice is persisted;
  *      automatic reuse is not mistaken for a durable operator preference.
  */
+import { discoverProviders } from '../integrations/providers/discover.js';
+import { ProviderSetup } from './ProviderSetup.js';
+import { ToolOutputViewer } from './ToolOutputViewer.js';
 import { join, relative } from 'node:path';
 import { DEFAULT_MAX_GOAL_ROUNDS, DefaultPathBuilder, DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, RunCancelled, SessionGoalActivation, StaleGoalError, asSessionId, createAssistantMessage, createUserMessage, generateRunId, generateSessionId, isCompactionMessage, kernelHostCommands, } from '@namzu/sdk';
 import { Box, Text, useApp, useInput, useStdout, useWindowSize } from 'ink';
@@ -44,6 +47,7 @@ import { ResumePicker } from './ResumePicker.js';
 import { StatusBar } from './StatusBar.js';
 import { TaskList } from './TaskList.js';
 import { TextPrompt } from './TextPrompt.js';
+import { modelCatalogueView } from './model-catalogue-view.js';
 import { Transcript, willCollapse } from './Transcript.js';
 import { TrustPrompt } from './TrustPrompt.js';
 import { createAgentSession, describeProviderModels, probeAgentSession, } from './agent.js';
@@ -277,6 +281,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const [messages, setMessages] = useState([]);
     /** Plain, copy-friendly rendering of the same retained transcript rows. */
     const [rawOutput, setRawOutput] = useState(false);
+    const [outputViewer, setOutputViewer] = useState(null);
     /**
      * The conversation sent to the model, in the SDK's own lossless shape.
      *
@@ -533,6 +538,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         copyPickerCommittedRef.current = copyPicker;
     }, [copyPicker]);
     /** Finite slash-command choice owned synchronously until apply or cancel. */
+    const [providerSetup, setProviderSetup] = useState(false);
     const [choicePicker, setChoicePickerState] = useState(null);
     const choicePickerRef = useRef(null);
     const [choiceQuery, setChoiceQuery] = useState('');
@@ -708,6 +714,18 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setActiveTools([]);
     }, []);
     const permissionResolveRef = useRef(null);
+    const permissionQueueRef = useRef([]);
+    const [queuedPermissionCount, setQueuedPermissionCount] = useState(0);
+    useEffect(() => () => {
+        const decision = {
+            kind: 'reject',
+            feedback: 'The approval screen closed.',
+        };
+        permissionResolveRef.current?.(decision);
+        permissionResolveRef.current = null;
+        for (const pending of permissionQueueRef.current.splice(0))
+            pending.resolve(decision);
+    }, []);
     /**
      * When the pending prompt took the screen, or `null` with none open.
      *
@@ -767,6 +785,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const goalDriveInFlightRef = useRef(false);
     const [goalDriveVersion, setGoalDriveVersion] = useState(0);
     const [goalStatus, setGoalStatus] = useState(null);
+    const pendingGoalResumeRef = useRef(null);
     const wakeGoalDriver = useCallback(() => setGoalDriveVersion((version) => version + 1), []);
     /**
      * Conversation writes in the order the operator produced them.
@@ -940,7 +959,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         externalEditorRequestRef.current = null;
         request.controller.abort(new Error('the terminal session closed'));
     }, []);
-    const pushMessage = useCallback((role, content, pending = false, glyph, detail, glyphColor, meta) => {
+    const pushMessage = useCallback((role, content, pending = false, glyph, detail, glyphColor, meta, activity) => {
         const id = nextId();
         setMessages((prev) => [
             ...prev,
@@ -953,6 +972,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 detail,
                 glyphColor,
                 meta,
+                activity,
                 // Numbered only if this body will actually be COLLAPSED — the
                 // number exists to be read off a hint, and a body that fits
                 // prints no hint. Numbering every body instead would leave gaps
@@ -963,7 +983,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 //
                 // Derived from `prev` rather than a counter, so the number is a
                 // fact about the transcript rather than a second record of it.
-                ...(willCollapse(detail)
+                ...((activity && detail?.length) || willCollapse(detail)
                     ? {
                         detailRef: prev.filter((m) => m.detailRef !== undefined).length + 1,
                     }
@@ -972,6 +992,29 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         ]);
         return id;
     }, [nextId]);
+    const reportedAgentsRef = useRef(new Set());
+    useEffect(() => {
+        reportedAgentsRef.current.clear();
+    }, [session]);
+    useEffect(() => {
+        const current = session?.subagents?.getSnapshot() ?? [];
+        for (const agent of subagents) {
+            if (!current.some((item) => item.viewId === agent.viewId &&
+                item.workflowId === agent.workflowId &&
+                item.status === agent.status))
+                continue;
+            if (!['completed', 'failed', 'cancelled'].includes(agent.status))
+                continue;
+            if (reportedAgentsRef.current.has(agent.viewId))
+                continue;
+            reportedAgentsRef.current.add(agent.viewId);
+            const completed = agent.status === 'completed';
+            const status = completed
+                ? 'Completed'
+                : (agent.latestActivity ?? (agent.status === 'cancelled' ? 'Cancelled' : 'Failed'));
+            pushMessage('tool', `${agent.description} · ${status}`, false, completed ? '✓' : '✗', undefined, completed ? theme.status.ok : theme.status.error, 'ctrl+t · agent details');
+        }
+    }, [subagents, pushMessage, session]);
     const applyPermissionMode = useCallback((mode) => {
         if (!session?.hasProvider) {
             pushMessage('system', 'Choose a model before changing permissions.');
@@ -1449,6 +1492,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         setChoicePicker(null);
+        if (picker.kind === 'resume-goal') {
+            if (value === 'resume' && scopeRef.current?.sessionId === picker.sessionId)
+                commandPickerSubmitRef.current('/goal resume');
+            return;
+        }
         if (picker.kind === 'command') {
             const command = value;
             if (command.problem) {
@@ -1646,6 +1694,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             lastCompletedOutputRef.current = persistedOutput
                 ? { text: persistedOutput, provenance: 'persisted' }
                 : null;
+            pendingGoalResumeRef.current = requestedConversationId;
             initialConversationIdRef.current = undefined;
             conversationMaterializedRef.current = true;
         }
@@ -1785,6 +1834,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // Re-hydration (a provider switch via /model) builds a second session;
         // without this the first one's tool-server child processes stay alive
         // for the rest of the TUI's life.
+        const previousInstructionFiles = previousSessionRef.current?.instructionFiles;
         void previousSessionRef.current?.close();
         previousSessionRef.current = s;
         setSession(s);
@@ -1826,7 +1876,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // they did not expect — an instructions file in a parent directory
             // they forgot about is exactly the thing that makes the agent
             // behave oddly for no visible reason.
-            if (s.instructionFiles.length > 0) {
+            if (s.instructionFiles.length > 0 &&
+                JSON.stringify([...s.instructionFiles].sort()) !==
+                    JSON.stringify(previousInstructionFiles ? [...previousInstructionFiles].sort() : undefined)) {
                 pushMessage('system', `Project instructions: ${s.instructionFiles.map((p) => relative(activeCtx.cwd, p) || p).join(', ')}`);
             }
             for (const skip of s.skippedInstructionFiles) {
@@ -2107,7 +2159,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 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.');
+                setPickerNotice('Multiple model sessions are already signed in on this device. Choose which one Namzu should use.');
                 setPhase('picker');
                 return;
             }
@@ -2177,6 +2229,13 @@ 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);
+    }, [permission]);
     // A ref, and mutated during render, because the split has to be MONOTONIC:
     // a row that has been printed to scrollback can never come back, and `max`
     // is idempotent, so a repeated render reaches the same answer.
@@ -2192,9 +2251,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // Freeze the parent's Static floor while it is open; otherwise a parent turn
     // settling in the background prints through the child screen. Returning
     // advances the floor once and emits those finalized rows exactly once.
-    if (agentSurface === null)
+    if (agentSurface === null && outputViewer === null)
         settledRef.current = window.settled;
-    const renderedSettled = agentSurface === null ? window.settled : settledRef.current;
+    const renderedSettled = agentSurface === null && outputViewer === null ? window.settled : settledRef.current;
     // One merged vocabulary for the session: this host's own commands plus
     // whatever the kernel's registry reports. Built here so `/help`, the
     // autocomplete and the dispatcher all answer from the same list — three
@@ -2260,6 +2319,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         instructionFiles: session?.instructionFiles ?? [],
         userCommands,
         configDebug: ctx.configDebug ?? null,
+        webSearchSummary: session?.webSearchSummary,
+        columns: terminal.columns,
+        sessionId: scopeRef.current?.sessionId,
     };
     // `/resume`: open the picker with this folder's recent conversations.
     const doResume = useCallback(async () => {
@@ -2304,6 +2366,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             setState('thinking');
             resolve(decision);
         }
+        if (decision.kind === 'approve-all') {
+            for (const pending of permissionQueueRef.current.splice(0))
+                pending.resolve(decision);
+        }
+        const next = permissionQueueRef.current.shift();
+        setQueuedPermissionCount(permissionQueueRef.current.length);
+        if (next) {
+            permissionResolveRef.current = next.resolve;
+            permissionOpenedAtRef.current = Date.now();
+            setPermissionDetailsOpen(!next.permission.summary.complete);
+            setPermission(next.permission);
+            setState('awaiting-permission');
+        }
     }, [setPermissionDetailsOpen, setPermissionReviewOffset]);
     /**
      * Stop the running turn, and hand the screen back in a usable state.
@@ -2325,6 +2400,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      */
     const interruptTurn = useCallback(() => {
         const cancelledSwitch = cancelPendingModelSwitch();
+        for (const pending of permissionQueueRef.current.splice(0)) {
+            pending.resolve({ kind: 'reject', feedback: 'User interrupted.' });
+        }
+        setQueuedPermissionCount(0);
         if (permissionResolveRef.current)
             resolvePermission({ kind: 'reject', feedback: 'User interrupted.' });
         const ac = abortRef.current;
@@ -2445,6 +2524,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         lastCompletedOutputRef.current = persistedOutput
             ? { text: persistedOutput, provenance: 'persisted' }
             : null;
+        pendingGoalResumeRef.current = conv.id;
         scope.sessionId = conv.id; // new turns now attribute to the resumed session
         conversationMaterializedRef.current = true;
         pushMessage('system', `Resumed: ${conv.title}`);
@@ -2859,6 +2939,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         const summary = buildPermissionSummary(review.text);
         return new Promise((resolve) => {
+            if (permissionResolveRef.current) {
+                permissionQueueRef.current.push({
+                    permission: { ...req, review: review.text, summary },
+                    resolve,
+                });
+                setQueuedPermissionCount(permissionQueueRef.current.length);
+                return;
+            }
             permissionResolveRef.current = resolve;
             permissionOpenedAtRef.current = Date.now();
             setPermissionReviewOffset(0);
@@ -2937,6 +3025,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         switch (event.kind) {
             case 'delta': {
+                if (event.messageId && st.sourceMessageId !== event.messageId) {
+                    if (st.sourceMessageId !== undefined)
+                        closeAssistant();
+                    st.sourceMessageId = event.messageId;
+                }
                 setState('thinking');
                 if (event.messageId && event.runId && st.sessionId) {
                     lastAssistantMessage.current = {
@@ -2981,11 +3074,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 closeAssistant();
                 setThinking(null);
                 setState('tool');
+                const waitingAgent = event.toolName === 'wait_for_task' && event.taskId
+                    ? subagentsRef.current.find((agent) => agent.taskId === event.taskId &&
+                        (event.runId === undefined || agent.workflowId === event.runId))
+                    : undefined;
                 const tool = {
+                    ...(waitingAgent ? { taskId: waitingAgent.taskId } : {}),
                     id: event.toolUseId,
                     ...(event.runId ? { runId: event.runId } : {}),
                     toolName: event.toolName,
-                    label: formatToolCall(event.toolName, event.summary, event.standalone),
+                    activity: event.activity,
+                    label: waitingAgent
+                        ? `Waiting · ${waitingAgent.description}`
+                        : formatToolCall(event.toolName, event.summary, event.standalone),
                     startedAt: Date.now(),
                     detail: event.detail,
                 };
@@ -3029,6 +3130,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     activeToolsRef.current = [...running.slice(0, i), ...running.slice(i + 1)];
                     setActiveTools(activeToolsRef.current);
                 }
+                // Lifecycle updates own completion rows, even when the model never waits.
+                // Keep unknown waits and errors visible; never hide an unrepresented task.
+                const inspectableWait = done?.taskId && subagentsRef.current.some((agent) => agent.taskId === done.taskId &&
+                    (event.runId === undefined || agent.workflowId === event.runId) &&
+                    agent.transcript.some((row) => row.kind === 'assistant' && row.text.trim().length > 0));
+                if (!event.isError && inspectableWait && event.toolName === 'wait_for_task') {
+                    setState(activeToolsRef.current.length > 0 ? 'tool' : 'thinking');
+                    break;
+                }
                 const representedSuccessfulAgent = !event.isError &&
                     event.toolName.toLowerCase() === 'agent' &&
                     subagentsRef.current.some((agent) => agent.toolUseId === event.toolUseId &&
@@ -3041,6 +3151,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     setState(activeToolsRef.current.length > 0 ? 'tool' : 'thinking');
                     break;
                 }
+                if (!event.isError && done?.activity === 'exploration') {
+                    // Preserve the result, including the summary removed from detail by the adapter.
+                    const output = event.output !== undefined
+                        ? event.output.split('\n')
+                        : [...(event.summary ? [event.summary] : []), ...(event.detail ?? [])];
+                    pushMessage('tool', done.label, false, '└', output, theme.text.muted, output.length > 0 ? 'ctrl+o output' : undefined, 'exploration');
+                    setState(activeToolsRef.current.length > 0 ? 'tool' : 'thinking');
+                    break;
+                }
+                const catalogue = !event.isError && event.toolName === 'agent_models' && event.output !== undefined
+                    ? modelCatalogueView(event.output) : undefined;
+                if (catalogue !== undefined) {
+                    pushMessage('tool', catalogue, false, '✓', event.output?.split('\n'), theme.status.ok, 'ctrl+o details', 'catalogue');
+                    setState(activeToolsRef.current.length > 0 ? 'tool' : 'thinking');
+                    break;
+                }
                 pushMessage('tool', done?.label ?? formatToolCall(event.toolName, event.summary), false, event.isError ? '✗' : '✓', done?.detail, event.isError ? theme.status.error : theme.status.ok, event.durationMs !== undefined
                     ? formatElapsed(event.durationMs)
                     : done
@@ -3636,6 +3762,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 abortRef.current = null;
                 if (ownsTurn)
                     activeTurnTokenRef.current = null;
+                permissionResolveRef.current?.({ kind: 'reject', feedback: 'The owning turn ended.' });
+                for (const pending of permissionQueueRef.current.splice(0))
+                    pending.resolve({ kind: 'reject', feedback: 'The owning turn ended.' });
+                setQueuedPermissionCount(0);
                 permissionResolveRef.current = null;
                 permissionOpenedAtRef.current = null;
                 setPermission(null);
@@ -3959,7 +4089,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         if (slash) {
             switch (slash.kind) {
                 case 'message':
-                    pushMessage(slash.role, slash.content);
+                    if (slash.statusRows) {
+                        setMessages((previous) => [...previous, {
+                                id: nextId(),
+                                role: slash.role,
+                                content: slash.content,
+                                statusRows: slash.statusRows,
+                            }]);
+                    }
+                    else
+                        pushMessage(slash.role, slash.content);
                     return;
                 case 'command-picker': {
                     if (slash.commands.length === 0) {
@@ -3989,6 +4128,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     }
                     return;
                 }
+                case 'provider-setup':
+                    if (state !== 'idle' || permission || choicePickerRef.current) {
+                        pushMessage('system', 'Provider setup is available once the active turn and prompts finish.');
+                        return;
+                    }
+                    setProviderSetup(true);
+                    return;
                 case 'settings-picker': {
                     const commands = [
                         {
@@ -4010,16 +4156,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                             description: `${permissionModeLabel(effectivePermissionMode(permissionModeRef.current, session?.approvalLatched() ?? false))} · this session.`,
                         },
                         {
-                            name: 'status config',
-                            label: 'Configuration',
+                            name: 'status',
+                            label: 'Web & session',
+                            description: `${session?.webSearchSummary ?? 'Not resolved'} · view tools, workspace and usage.`,
+                        },
+                        { name: 'setup', label: 'Provider setup', description: 'Check installed CLIs and access; connect or install without leaving Namzu.' },
+                        {
+                            name: 'config sources',
+                            label: 'Setting sources',
                             description: 'Show which configuration files and overrides are in use.',
                         },
                     ];
                     setSelectedChoice(0);
                     setChoicePicker({
                         kind: 'command',
-                        title: 'Settings',
-                        notice: 'Select a setting to view or change it.',
+                        title: 'Configuration',
+                        notice: 'Model, reasoning and permission changes apply to this session.',
                         values: commands,
                         options: commands.map((command) => ({
                             label: command.label,
@@ -4779,6 +4931,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             }
             setGoalStatus(goal);
+            if (pendingGoalResumeRef.current === sessionId && phase === 'ready' && !choicePickerRef.current) {
+                pendingGoalResumeRef.current = null;
+                if (goal && (goal.phase === 'active' || goal.phase === 'paused')) {
+                    setSelectedChoice(0);
+                    setChoicePicker({ kind: 'resume-goal', title: 'Continue the saved goal?',
+                        notice: goal.objective, sessionId, values: ['resume', 'later'],
+                        options: [
+                            { label: 'Resume goal', description: 'Continue automatic work toward this objective.' },
+                            { label: 'Not now', description: 'Keep automatic work stopped; resume later with /goal resume.' },
+                        ],
+                    });
+                }
+            }
         })
             .catch(() => {
             if (!disposed && conversationGenRef.current === generation)
@@ -4787,7 +4952,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         return () => {
             disposed = true;
         };
-    }, [goalDriveVersion, phase, session]);
+    }, [goalDriveVersion, phase, session, setChoicePicker]);
     // 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
@@ -5049,6 +5214,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         exitWithSummary();
     }, [session, exitWithSummary]);
     useInput((input, key) => {
+        if (outputViewer !== null)
+            return;
         // Startup has refused admission, so there is no draft or active turn to
         // protect with the ready screen's two-press exit ladder.
         if (phase === 'unhealthy') {
@@ -5169,9 +5336,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             if (permission && (key.pageUp || key.pageDown || key.home || key.end)) {
                 const source = permissionDetailsOpenRef.current
                     ? permission.review
-                    : permission.summary.text;
+                    : (permission.summary.compactText ?? permission.summary.text);
                 const count = permissionReviewRows(source, terminal.columns).length;
-                const pageRows = permissionReviewPageRows(terminal.rows);
+                const pageRows = Math.max(1, permissionReviewPageRows(terminal.rows) - (permission.runId ? 1 : 0));
                 const maxOffset = Math.max(0, count - pageRows);
                 const current = Math.min(permissionReviewOffsetRef.current, maxOffset);
                 const next = key.home
@@ -5187,8 +5354,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // Refusing is never deferred or gated — it is the direction a
             // mistake is recoverable in, so it answers on the first press.
             if (key.ctrl && input === 'c') {
-                resolvePermission({ kind: 'reject', feedback: 'User interrupted.' });
-                abortRef.current?.abort(new RunCancelled('user'));
+                interruptTurn();
                 return;
             }
             if (ch === 'n' || key.escape) {
@@ -5508,64 +5674,27 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pushMessage('system', 'Interrupted.');
             return;
         }
-        // Ctrl+O expands the collapsed bodies that are still redrawable.
-        //
-        // It was advertised — on every collapsed body — as toggling full
-        // expansion for everything, and in that use it did nothing: finalized
-        // rows went through `<Static>`, which renders `items.slice(index)` and
-        // calls the render function only for items it has not emitted yet, so
-        // output already on screen was beyond its reach. Measured, with a
-        // twelve-line body up: pressing it produced one further frame whose
-        // transcript region was byte-identical to the one before.
-        //
-        // The rows at the end of the transcript are now drawn live rather than
-        // printed once, so for those the key does what it always claimed —
-        // flipping the flag re-renders the row where it already is. It reaches
-        // exactly as far back as the window does, and says so when that is
-        // nowhere. It does not quietly fall back to appending a copy: `/expand`
-        // is that, deliberately and visibly, and a key that sometimes redraws
-        // in place and sometimes prints a second copy further down would be two
-        // commands wearing one name.
+        // Small expansions stay in place. Older or oversized bodies open a viewer.
         if (key.ctrl && input === 'o') {
-            // Taken outside the updater so both branches use the same one.
-            const id = nextId();
-            setMessages((prev) => {
-                const live = prev.filter((m) => !m.pending).slice(settledRef.current);
-                const collapsible = live.filter((m) => willCollapse(m.detail));
-                if (collapsible.length === 0) {
-                    // Nothing redrawable is collapsed, so this reprints the most recent
-                    // collapsed body as a new row — the rows above have been printed
-                    // to the terminal's own scrollback, which cannot be rewritten.
-                    const blocks = prev.filter((m) => m.detailRef !== undefined);
-                    const block = blocks[blocks.length - 1];
-                    if (!block) {
-                        return [
-                            ...prev,
-                            {
-                                id,
-                                role: 'system',
-                                content: 'Nothing to expand yet. Tool output longer than six lines collapses with a "… +N lines · ctrl+o" hint; Ctrl+O opens it in place while it is still on screen, and reprints the most recent one in full once it has scrolled away.',
-                            },
-                        ];
-                    }
-                    return [
-                        ...prev,
-                        {
-                            id,
-                            role: 'system',
-                            content: `${block.content} — in full (${block.detail?.length ?? 0} lines)`,
-                            glyph: '⤢',
-                            detail: block.detail,
-                            detailExpanded: true,
-                        },
-                    ];
-                }
-                // Expanded unless they are all open already, in which case this
-                // closes them again — the toggle it was always described as.
-                const expanding = collapsible.some((m) => m.detailExpanded !== true);
-                const ids = new Set(collapsible.map((m) => m.id));
-                return prev.map((m) => (ids.has(m.id) ? { ...m, detailExpanded: expanding } : m));
-            });
+            const live = messages.filter((m) => !m.pending).slice(settledRef.current);
+            const collapsible = live.filter((m) => (m.activity && (m.detail?.length ?? 0) > 0) || willCollapse(m.detail));
+            const blocks = messages.filter((m) => m.detailRef !== undefined && (m.detail?.length ?? 0) > 0);
+            const block = collapsible.at(-1) ?? blocks.at(-1);
+            if (!block) {
+                pushMessage('system', 'Nothing to expand yet. Ctrl+O opens retained tool output when available.');
+                return;
+            }
+            const expanding = collapsible.some((m) => m.detailExpanded !== true);
+            const ids = new Set(collapsible.map((m) => m.id));
+            const proposed = messages.map((m) => ids.has(m.id) ? { ...m, detailExpanded: expanding } : m);
+            const projected = liveWindow({ messages: proposed.filter((m) => !m.pending), rows: terminal.rows,
+                columns: terminal.columns, furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture,
+                settled: settledRef.current, raw: rawOutput });
+            if (collapsible.length === 0 || (expanding && projected.settled > settledRef.current)) {
+                setOutputViewer(block);
+            }
+            else
+                setMessages(proposed);
             return;
         }
         if (key.ctrl && input === 'c') {
@@ -5590,7 +5719,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // Active on every phase. It was gated off during the picker, which is what
     // left that screen without a usable exit; the picker branch above returns
     // immediately, so the Picker still owns everything except Ctrl+C.
-    { isActive: externalEditorRequest === null });
+    { isActive: externalEditorRequest === null && !providerSetup });
     // 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.
@@ -5607,10 +5736,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         !(tool.runId
             ? representedSubagentTools.has(JSON.stringify([tool.runId, tool.id]))
             : representedUnscopedSubagentToolUseIds.has(tool.id)));
+    const outputBlocks = outputViewer
+        ? messages.filter((m) => m.detailRef !== undefined && (m.detail?.length ?? 0) > 0)
+        : [];
+    const outputIndex = outputBlocks.findIndex((m) => m.id === outputViewer?.id);
     const selectedSubagent = agentSurface
         ? subagents.find((agent) => agent.viewId === agentSurface.selectedId)
         : undefined;
-    const lifecycleOwnsViewport = phase === 'trust' ||
+    const lifecycleOwnsViewport = outputViewer !== null ||
+        phase === 'trust' ||
         phase === 'resume' ||
         phase === 'edit' ||
         phase === 'picker' ||
@@ -5624,7 +5758,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         choicePicker === null &&
         copyPicker === null &&
         agentSurface === null
-        ? goalStatusLabel(goalStatus)
+        ? goalStatusLabel(goalStatus, goalStatus ? goalActivation.isArmed(goalStatus.sessionId, goalStatus) : false)
         : null;
     const statusHint = conversationMutation === 'fork'
         ? 'forking conversation — input is paused'
@@ -5657,8 +5791,21 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 : goalStatus && phase === 'ready' && state === 'idle'
                                                     ? undefined
                                                     : hintForPhase(phase, state, session?.hasProvider === true, composerHasDraft);
+    const permissionOwner = permission?.runId
+        ? subagents.find((agent) => agent.runId === permission.runId)
+        : undefined;
+    const permissionSourceLabel = permission?.runId
+        ? permissionOwner ? `Agent: ${permissionOwner.description}` : `Run: ${permission.runId}`
+        : undefined;
     const displayedPermissionMode = effectivePermissionMode(permissionMode, session?.approvalLatched() ?? false);
-    return (_jsx(Box, { flexDirection: "column", display: externalEditorRequest ? 'none' : 'flex', children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: transcriptOwned ? renderedSettled : 0, resetKey: resetKey, raw: rawOutput, hyperlinks: hyperlinks, showLive: !lifecycleOwnsViewport, header: transcriptOwned ? (_jsx(BrandHeader, { version: ctx.version, permissionMode: displayedPermissionMode })) : undefined }) }), 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, onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [agentSurface === null ? (_jsx(LiveActivity, { compact: compactWork, activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true, thinking: thinking })) : null, agentSurface === null && permission === null ? (_jsx(TaskList, { tasks: tasks, compact: compactWork })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, choice: permissionChoice, columns: terminal.columns, rows: terminal.rows })) : null, textPrompt ? (_jsx(TextPrompt, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || agentSurface !== null, onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && agentSurface === null && choicePicker ? (_jsx(ChoicePicker, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: choicePicker.title, notice: choicePicker.notice, options: filterChoiceOptions(choicePicker.options, choiceQuery), query: choicePickerSearchable(choicePicker) ? choiceQuery : undefined, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && agentSurface === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { working: state === 'thinking' || state === 'tool' || visibleActiveTools.length > 0, focus: phase === 'ready' &&
+    return (_jsx(Box, { flexDirection: "column", display: externalEditorRequest ? 'none' : 'flex', children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: transcriptOwned ? renderedSettled : 0, resetKey: resetKey, raw: rawOutput, hyperlinks: hyperlinks, showLive: !lifecycleOwnsViewport, header: transcriptOwned ? (_jsx(BrandHeader, { version: ctx.version, permissionMode: displayedPermissionMode })) : undefined }) }), providerSetup ? (_jsx(ProviderSetup, { cwd: ctx.cwd, onClose: () => setProviderSetup(false), onConnect: () => {
+                        setProviderSetup(false);
+                        setPickerInitialView('providers');
+                        setPickerDetected(null);
+                        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 })) : (_jsxs(_Fragment, { children: [agentSurface === null && outputViewer === null ? (_jsx(LiveActivity, { compact: compactWork, activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true, thinking: thinking })) : null, agentSurface === null && outputViewer === null && permission === null ? (_jsx(TaskList, { tasks: tasks, compact: compactWork })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, choice: permissionChoice, queuedCount: queuedPermissionCount, sourceLabel: permissionSourceLabel, columns: terminal.columns, rows: terminal.rows })) : null, textPrompt ? (_jsx(TextPrompt, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || (agentSurface !== null || outputViewer !== null), onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && agentSurface === null && outputViewer === null && choicePicker ? (_jsx(ChoicePicker, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: choicePicker.title, notice: choicePicker.notice, options: filterChoiceOptions(choicePicker.options, choiceQuery), query: choicePickerSearchable(choicePicker) ? choiceQuery : undefined, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && agentSurface === null && outputViewer === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { working: state === 'thinking' || state === 'tool' || visibleActiveTools.length > 0, focus: phase === 'ready' &&
                                 state !== 'awaiting-permission' &&
                                 !compacting &&
                                 externalEditorRequest === null &&
@@ -5666,41 +5813,48 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 textPrompt === null &&
                                 choicePicker === null &&
                                 copyPicker === null &&
-                                agentSurface === null, hidden: permission !== null ||
+                                agentSurface === null && outputViewer === null, hidden: permission !== null ||
                                 textPrompt !== null ||
                                 choicePicker !== null ||
                                 copyPicker !== null ||
-                                agentSurface?.kind === 'transcript', children: [pendingSteers.length > 0 &&
+                                (agentSurface !== null || outputViewer !== null), children: [pendingSteers.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
                                     copyPicker === null &&
-                                    agentSurface === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
+                                    agentSurface === null && outputViewer === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
                                     copyPicker === null &&
-                                    agentSurface === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
+                                    agentSurface === null && outputViewer === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
                                                 ? queuePause.outcome === 'paused'
                                                     ? 'held after a resumable run paused; wait for recovery, change model, or send a message to release it'
                                                     : `paused after a ${queuePause.outcome} turn; send a message or change model to continue`
-                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { reasoningEffortLevels: session?.reasoningEffortLevels, permissionMode: displayedPermissionMode, onCycleMode: cyclePermissionMode, disabled: phase !== 'ready' ||
+                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { reasoningEffortLevels: session?.reasoningEffortLevels, permissionMode: displayedPermissionMode, onCycleMode: cyclePermissionMode, disabled: outputViewer !== null ||
+                                        phase !== 'ready' ||
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
                                         externalEditorRequest !== null ||
-                                        agentSurface !== null, hidden: permission !== null ||
+                                        (agentSurface !== null || outputViewer !== null), hidden: permission !== null ||
                                         textPrompt !== null ||
                                         choicePicker !== null ||
                                         copyPicker !== null ||
-                                        agentSurface?.kind === 'transcript', 
+                                        (agentSurface !== null || outputViewer !== null), 
                                     // A turn is running, so Esc is the interrupt and not
                                     // the composer's clear.
                                     escapeInterrupts: !compacting &&
                                         (state === 'thinking' || state === 'tool' || pendingModelSwitchRef.current !== null), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), onDraftPresenceChange: setComposerHasDraft, onOpenAgentPanel: openAgentCockpit, userCommands: userCommands, builtins: hostCommands.map((command) => ({
                                         ...command,
                                         description: command.unavailable?.(slashCtx) ?? command.description,
-                                    })), mentionCandidates: mentionCandidates, history: history })] }), permission === null && agentSurface === null && liveSubagents.length > 0 ? (_jsx(AgentTaskPanel, { agents: liveSubagents, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'cockpit' ? (_jsx(AgentCockpit, { agents: subagents, selectedPhaseId: agentSurface.selectedPhaseId, selectedId: agentSurface.selectedId, focus: agentSurface.focus, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'transcript' && selectedSubagent ? (_jsx(AgentTranscript, { agent: selectedSubagent, tailOffset: agentSurface.tailOffset, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : null] })), _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: statusGoal, state: state, hint: statusHint }) })] }) }));
+                                    })), mentionCandidates: mentionCandidates, history: history })] }), permission === null && agentSurface === null && outputViewer === null && liveSubagents.length > 0 ? (_jsx(AgentTaskPanel, { agents: liveSubagents, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'cockpit' ? (_jsx(AgentCockpit, { agents: subagents, selectedPhaseId: agentSurface.selectedPhaseId, selectedId: agentSurface.selectedId, focus: agentSurface.focus, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'transcript' && selectedSubagent ? (_jsx(AgentTranscript, { agent: selectedSubagent, tailOffset: agentSurface.tailOffset, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : null] })), outputViewer && permission === null ? (_jsx(ToolOutputViewer, { onPrevious: () => {
+                        if (outputIndex > 0)
+                            setOutputViewer(outputBlocks[outputIndex - 1]);
+                    }, onNext: () => {
+                        if (outputIndex >= 0 && outputIndex + 1 < outputBlocks.length)
+                            setOutputViewer(outputBlocks[outputIndex + 1]);
+                    }, title: outputViewer.content, lines: outputViewer.detail ?? [], rows: terminal.rows, columns: terminal.columns, onClose: () => setOutputViewer(null) }, outputViewer.id)) : null, _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: statusGoal, state: state, hint: statusHint }) })] }) }));
 }
 /** One line for a background job that ended, for the transcript and the next turn. */
 function describeJobExit(job) {
@@ -5759,12 +5913,12 @@ hasDraft = false) {
     // screen; only state-specific actions belong in the footer.
     return '';
 }
-function goalStatusLabel(goal) {
+function goalStatusLabel(goal, armed) {
     if (!goal)
         return null;
     switch (goal.phase) {
         case 'active':
-            return 'Pursuing goal';
+            return armed ? 'Pursuing goal' : 'Goal paused (/goal resume)';
         case 'paused':
             return 'Goal paused (/goal resume)';
         case 'blocked':