@namzu/cli 20.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';
@@ -25,12 +28,12 @@ import { appendMessages, archiveConversation, forkConversation, forkConversation
 import { conversationMarkdown, writeConversationExport, } from '../integrations/sessions/transcript-export.js';
 import { isTrusted, trustDir } from '../integrations/trust/store.js';
 import { checkUpdates } from '../integrations/updates.js';
-import { renderMemoryReport } from '../memory/presentation.js';
-import { appendMemory, readMemory } from '../memory/store.js';
+import { renderMemoryReport, renderMemorySaveResult } from '../memory/presentation.js';
+import { appendMemoryWithStatus, readMemory } from '../memory/store.js';
 import { effectivePermissionMode, permissionModeDescription, permissionModeLabel, } from '../permissions/mode.js';
 import { composeSkillsPrompt, discoverSkills, loadSkillBody } from '../skills/store.js';
 import { discoverUserCommands } from '../user-commands/store.js';
-import { AgentCockpit, AgentTaskPanel, AgentTranscript, activeSubagentCohorts, agentCockpitIsWide, agentPhasePageSize, agentPhases, agentPickerPageSize, agentTranscriptPageSize, maxAgentTranscriptTailOffset, } from './AgentExplorer.js';
+import { AgentCockpit, AgentTaskPanel, AgentTranscript, activeSubagentCohorts, agentCockpitIsWide, agentPhasePageSize, agentPhases, agentPickerPageSize, agentTranscriptPageSize, agentWorkflowPageSize, agentWorkflows, maxAgentTranscriptTailOffset, } from './AgentExplorer.js';
 import { BrandHeader } from './BrandHeader.js';
 import { ChoicePicker } from './ChoicePicker.js';
 import { Composer, suggestionWindowSize, } from './Composer.js';
@@ -44,9 +47,10 @@ 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, probeAgentSession, } from './agent.js';
+import { createAgentSession, describeProviderModels, probeAgentSession, } from './agent.js';
 import { choicePickerWindowSize, filterChoiceOptions, moveChoiceSelection, } from './choice-selection.js';
 import { keepRecentRows } from './compact-transcript.js';
 import { approvalIsDeliberate } from './consent-timing.js';
@@ -55,6 +59,8 @@ import { copyTargetsForResponse } from './copy-targets.js';
 import { editablePrompts } from './edit-prompts.js';
 import { editDraftInExternalEditor } from './external-editor.js';
 import { liveWindow } from './live-window.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 { selectPrimaryProvider } from './provider-selection.js';
 import { eraseLastChoiceGrapheme } from './terminal-choice-text.js';
@@ -62,7 +68,7 @@ import { renderCheckpoints, renderRestore } from '../checkpoints/store.js';
 import { expandFileMentions, listMentionableFiles } from './mentions.js';
 import { openInBrowser } from './open-browser.js';
 import { buildPermissionReview, buildPermissionSummary, permissionReviewPageRows, permissionReviewRefusal, permissionReviewRows, } from './permission-review.js';
-import { describeRunInterruption } from './run-interruption.js';
+import { describeRunInterruption, describeRunStop } from './run-interruption.js';
 import { moveSelection } from './selection-window.js';
 import { describeShellEscape, describeShellEscapeForModel, runShellEscape, shellEscapeCommand, } from './shell-escape.js';
 import { baseBranchReviewPrompt, commitReviewPrompt, hostCommandNames, kernelCommandDescriptors, mergeHostCommands, renderOutcome, reviewPrompt, runSlash, } from './slashCommands.js';
@@ -275,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.
      *
@@ -531,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('');
@@ -587,6 +595,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         agentSurfaceCommittedRef.current = agentSurface;
     }, [agentSurface]);
     const replaceSubagents = useCallback((next) => {
+        const previous = subagentsRef.current;
         subagentsRef.current = next;
         setSubagentsState(next);
         const surface = agentSurfaceRef.current;
@@ -599,7 +608,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         if (next.some((agent) => agent.viewId === surface.selectedId))
             return;
         const phases = agentPhases(next);
-        const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? phases[0];
+        const previousGroupId = previous.find((agent) => agent.viewId === surface.selectedId)?.workflowGroupId;
+        const sameWorkflow = agentWorkflows(next).find((workflow) => workflow.id === previousGroupId);
+        const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? sameWorkflow?.phases[0] ?? phases[0];
         const fallbackAgent = fallbackPhase?.agents[0];
         if (!fallbackPhase || !fallbackAgent) {
             setAgentSurface(null);
@@ -614,7 +625,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     }, [setAgentSurface]);
     const openAgentCockpit = useCallback(() => {
         const agents = subagentsRef.current;
-        const firstPhase = agentPhases(agents)[0];
+        const workflows = agentWorkflows(agents);
+        const currentWorkflow = [...workflows].reverse().find((workflow) => workflow.agents.some((agent) => agent.status === 'starting' || agent.status === 'queued' || agent.status === 'working')) ?? workflows.at(-1);
+        const firstPhase = currentWorkflow?.phases[0];
         const firstAgent = firstPhase?.agents[0];
         if (!firstPhase || !firstAgent)
             return false;
@@ -622,7 +635,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             kind: 'cockpit',
             selectedPhaseId: firstPhase.id,
             selectedId: firstAgent.viewId,
-            focus: 'agents',
+            focus: workflows.length > 1 ? 'workflows' : 'agents',
         });
         return true;
     }, [setAgentSurface]);
@@ -632,6 +645,18 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const abortRef = useRef(null);
     /** Identity of the turn allowed to notify when it settles. */
     const activeTurnTokenRef = useRef(null);
+    /** A tool can reserve a switch; only the owning turn's finalizer may publish it. */
+    const pendingModelSwitchRef = useRef(null);
+    const [modelSwitchVersion, setModelSwitchVersion] = useState(0);
+    const cancelPendingModelSwitch = useCallback(() => {
+        const pending = pendingModelSwitchRef.current;
+        if (!pending)
+            return false;
+        pendingModelSwitchRef.current = null;
+        pending.controller.abort(new Error('The pending model switch was cancelled.'));
+        setModelSwitchVersion((version) => version + 1);
+        return true;
+    }, []);
     /** Exact live-input owner; absent before provider admission and after settlement. */
     const activeTurnInboxRef = useRef(null);
     /** A broken terminal notification is reported once, not after every turn. */
@@ -689,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.
      *
@@ -727,13 +764,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * hook never ran.
      */
     const closeAndExit = useCallback(() => {
+        cancelPendingModelSwitch();
         const closing = session?.close() ?? Promise.resolve();
         const bounded = Promise.race([
             closing,
             new Promise((resolve) => setTimeout(resolve, SESSION_CLOSE_ON_EXIT_MS).unref?.()),
         ]);
         void bounded.catch(() => undefined).finally(() => exit());
-    }, [exit, session]);
+    }, [cancelPendingModelSwitch, exit, session]);
     const exitWithSummary = useCallback(() => {
         onExitSummary?.({
             ...(conversationMaterializedRef.current && scopeRef.current?.sessionId
@@ -747,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.
@@ -837,6 +876,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         settledRef.current = 0;
         setResetKey((k) => k + 1);
     }, [stdout.isTTY, writeStdout]);
+    const previousTerminalRef = useRef(terminal);
+    useEffect(() => {
+        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, resetTranscript]);
     const requestExternalEditor = useCallback((seed) => {
         if (phase !== 'ready' ||
             state !== 'idle' ||
@@ -907,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,
@@ -920,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
@@ -930,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,
                     }
@@ -939,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.');
@@ -963,15 +1039,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setPermissionModeState(mode);
         pushMessage('system', `Permissions: ${permissionModeLabel(mode)} for this session. ${permissionModeDescription(mode)}`);
     }, [hasUnsettledTurn, pushMessage, session, state]);
-    const applyReasoningEffort = useCallback((effort) => {
+    const applyReasoningEffort = useCallback((effort, selectedSession) => {
         if (!session?.hasProvider) {
             pushMessage('system', 'No active session — pick a provider before changing reasoning effort.');
             return;
         }
+        if (selectedSession !== undefined && selectedSession !== session) {
+            pushMessage('system', 'Reasoning effort was not changed: the selected model is no longer active.');
+            return;
+        }
         if (state !== 'idle' ||
             abortRef.current !== null ||
             hasUnsettledTurn() ||
-            queuedRef.current.length > 0 ||
+            (queuedRef.current.length > 0 && selectedSession !== session) ||
             permissionResolveRef.current !== null ||
             compactingRef.current) {
             pushMessage('system', 'Reasoning effort was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
@@ -979,7 +1059,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         if (effort === undefined) {
             setReasoningEffort(undefined);
-            pushMessage('system', 'Reasoning effort reset to the provider default for future main-query turns.');
+            pushMessage('system', 'Reasoning: provider default.');
             return;
         }
         if (!session.reasoningEffortLevels?.includes(effort)) {
@@ -987,7 +1067,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         setReasoningEffort(effort);
-        pushMessage('system', `Reasoning effort changed to ${effort} for future main-query turns in this session.`);
+        pushMessage('system', `Reasoning: ${effort} (this session).`);
     }, [hasUnsettledTurn, pushMessage, session, setReasoningEffort, state]);
     const stepReasoningEffort = useCallback((direction) => {
         const levels = session?.reasoningEffortLevels;
@@ -1412,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) {
@@ -1477,7 +1562,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             removeStoredCredential(value);
             return;
         }
-        applyReasoningEffort(value);
+        applyReasoningEffort(value, picker.selectedSession);
     }, [
         activateSkill,
         advanceQueueContinuation,
@@ -1609,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;
         }
@@ -1672,7 +1758,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 materializationRef.current = null;
         }
     }, [ensureSessions]);
-    const hydrateSession = useCallback(async (prefs, detectedNow, signal, persistSelection = false) => {
+    const hydrateSession = useCallback(async (prefs, detectedNow, options = {}) => {
+        const { signal, persistSelection = false, announce = false } = options;
         if (signal?.aborted)
             return;
         const scope = await ensureSessions();
@@ -1682,22 +1769,27 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const s = await createAgentSession(prefs, detectedNow, {
             scope,
             cwd: activeCtx.cwd,
+            ...(activeCtx.structuredOutput ? { structuredOutput: activeCtx.structuredOutput } : {}),
             ...(activeCtx.additionalDirectories
                 ? { additionalDirectories: activeCtx.additionalDirectories }
                 : {}),
             ...(sessionsRef.current ? { stateRoot: sessionsRef.current.root } : {}),
             enableComputerUse: true,
             rules: activeCtx.rules,
-            ...(sessionsRef.current ? { sessionGoals: sessionsRef.current.goals } : {}),
+            ...(sessionsRef.current
+                ? { sessionGoals: sessionsRef.current.goals, conversationSessions: sessionsRef.current }
+                : {}),
             ...(activeCtx.mcpServers ? { mcpServers: activeCtx.mcpServers } : {}),
             ...(activeCtx.plugins ? { plugins: activeCtx.plugins } : {}),
             ...(activeCtx.web ? { web: activeCtx.web } : {}),
             ...(activeCtx.hooks ? { hooks: activeCtx.hooks } : {}),
             ...(activeCtx.compaction ? { compaction: activeCtx.compaction } : {}),
+            ...(activeCtx.memory ? { memory: activeCtx.memory } : {}),
             ...(activeCtx.sandbox ? { sandbox: activeCtx.sandbox } : {}),
             // Somebody is at this terminal, so the model may ask them one
             // question when a decision is genuinely theirs.
             askUser: true,
+            allowModelSwitch: true,
         });
         if (signal?.aborted) {
             void s.close();
@@ -1716,6 +1808,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         let commands;
         try {
+            options.beforePublish?.();
             commands = discoverUserCommands({ cwd: activeCtx.cwd, reserved: hostCommandNames() });
             // Construction and validation precede the saved change. There is no
             // await between this atomic write and publishing the usable session.
@@ -1741,9 +1834,16 @@ 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);
+        if (options.chooseReasoningEffort && s.reasoningEffortLevels?.length) {
+            // Own input before publishing ready or releasing a paused queue. The
+            // menu closes only after choosing an effort or keeping the new default.
+            setSelectedChoice(0);
+            setChoicePicker(reasoningEffortPicker(s, undefined, true) ?? null);
+        }
         setUserCommands(commands);
         const mentionLoadOwner = {};
         mentionLoadOwnerRef.current = mentionLoadOwner;
@@ -1760,13 +1860,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         if (s.hasProvider) {
             setTranscriptOwned(true);
             setPhase('ready');
-            pushMessage('system', 
-            // Counted here, at connect. The number is deliberately the one true
-            // at this moment rather than the one that will be true after the
-            // first turn registers the deferred tools — a line reporting that a
-            // connection just happened should describe the connection that just
-            // happened. `/tools` is the present-tense question and asks later.
-            `Connected to ${s.providerSummary}${s.modelSummary ? ` · ${s.modelSummary}` : ''} · ${s.toolNames().length} tools`);
+            // Startup identity already lives in the footer. Confirm an explicit
+            // picker selection, but do not add a routine connection log to chat.
+            if (announce) {
+                pushMessage('system', `Connected to ${s.providerSummary}${s.modelSummary ? ` · ${s.modelSummary}` : ''}`);
+            }
             // Before the rest: a limitation the operator accepted once and has
             // been living with since is the thing they are least likely to
             // remember and most likely to be surprised by.
@@ -1778,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) {
@@ -1799,7 +1899,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             if (s.errorHint)
                 pushMessage('system', s.errorHint);
         }
-    }, [appLifetime.signal, advanceQueueContinuation, ensureSessions, pushMessage, setReasoningEffort]);
+    }, [
+        appLifetime.signal,
+        advanceQueueContinuation,
+        ensureSessions,
+        pushMessage,
+        setChoicePicker,
+        setReasoningEffort,
+        setSelectedChoice,
+    ]);
     /**
      * Sign in to a subscription without leaving namzu.
      *
@@ -1835,7 +1943,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pushMessage('system', describeLoginOutcome(outcome));
             if (outcome.ok) {
                 setPickerInitialView('providers');
-                await runProbeRef.current?.();
+                await runProbeRef.current?.({ announce: true });
             }
             return;
         }
@@ -1894,7 +2002,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             setPickerNotice(describeLoginOutcome(outcome));
             if (outcome.ok) {
                 setPickerInitialView('providers');
-                await runProbeRef.current?.(signal);
+                await runProbeRef.current?.({ signal, announce: true });
             }
             return 'finished';
         }
@@ -1954,11 +2062,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setPickerNotice(describeLoginOutcome(outcome));
         if (outcome.ok) {
             setPickerInitialView('providers');
-            await runProbeRef.current?.(signal);
+            await runProbeRef.current?.({ signal, announce: true });
         }
         return 'finished';
     }, []);
-    const runProbe = useCallback(async (signal) => {
+    const runProbe = useCallback(async (options = {}) => {
+        const { signal, announce = false } = options;
         try {
             if (signal?.aborted)
                 return;
@@ -2011,7 +2120,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             if (probe.preferences) {
                 setPickerDetected(null);
                 setPickerSelectionKind('provider-and-model');
-                await hydrateSession(probe.preferences, probe.detected, signal);
+                await hydrateSession(probe.preferences, probe.detected, { signal, announce });
                 return;
             }
             const signedIn = signedInSubscriptionProviders(probe.detected);
@@ -2029,7 +2138,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 // not strand first run on the disabled unhealthy screen.
                 const admissionSignal = signal ?? appLifetime.signal;
                 try {
-                    await hydrateSession(automaticPreferences, probe.detected, admissionSignal);
+                    await hydrateSession(automaticPreferences, probe.detected, {
+                        signal: admissionSignal,
+                        announce,
+                    });
                     return;
                 }
                 catch (error) {
@@ -2047,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;
             }
@@ -2117,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.
@@ -2132,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
@@ -2200,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 () => {
@@ -2244,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.
@@ -2264,11 +2399,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * sends at that prompt, for the same reason.
      */
     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;
-        if (!ac)
-            return false;
+        if (!ac) {
+            if (cancelledSwitch)
+                discardQueued();
+            return cancelledSwitch;
+        }
         ac.abort(new RunCancelled('user'));
         const activeSessionId = scopeRef.current?.sessionId;
         if (activeSessionId)
@@ -2284,7 +2427,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         clearActiveTools();
         setState('idle');
         return true;
-    }, [clearActiveTools, discardQueued, goalActivation, resolvePermission, wakeGoalDriver]);
+    }, [
+        cancelPendingModelSwitch,
+        clearActiveTools,
+        discardQueued,
+        goalActivation,
+        resolvePermission,
+        wakeGoalDriver,
+    ]);
     /**
      * Load the chosen conversation into the transcript and continue in it.
      *
@@ -2357,6 +2507,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         discardQueued();
         goalActivation.clear();
         wakeGoalDriver();
+        cancelPendingModelSwitch();
         conversationGenRef.current += 1;
         resetSubagentActivity();
         session?.resetTaskStore?.();
@@ -2373,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}`);
@@ -2393,6 +2545,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         interruptTurn,
         nextId,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -2433,6 +2586,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             discardQueued();
             goalActivation.clear();
             wakeGoalDriver();
+            cancelPendingModelSwitch();
             conversationGenRef.current += 1;
             resetSubagentActivity();
             session?.resetTaskStore?.();
@@ -2474,6 +2628,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         goalActivation,
         interruptTurn,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -2722,6 +2877,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             const readablePrefix = editList
                 .slice(0, target.userOrdinal)
                 .map((prompt) => prompt.displayText);
+            cancelPendingModelSwitch();
             conversationGenRef.current += 1;
             resetSubagentActivity();
             session?.resetTaskStore?.();
@@ -2765,6 +2921,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         hasUnsettledTurn,
         nextId,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -2782,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);
@@ -2860,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 = {
@@ -2904,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,
                 };
@@ -2952,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 &&
@@ -2964,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
@@ -3066,12 +3269,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 pushMessage('system', event.text, false, '⇄');
                 break;
             case 'capability-warning':
-                pushMessage('system', `Capability warning (${event.capability}${event.contentSource === 'tool-result' ? ' tool result' : ''}): ${event.text}`, false, '⚠');
+                pushMessage('system', `Capability warning (${event.capability}${event.contentSource === 'tool-result' ? ' tool result' : ''}): ${event.text}`, false, '!');
                 break;
             case 'history-repair':
-                pushMessage('system', `History warning (${event.source}): ${event.text}`, false, '⚠');
+                pushMessage('system', `History warning (${event.source}): ${event.text}`, false, '!');
                 break;
-            case 'done':
+            case 'done': {
                 // `run_completed` is not synonymous with success: budgets,
                 // cancellation and output guardrails arrive through this event too.
                 // Missing remains a normal end for older producers, matching the
@@ -3084,7 +3287,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     outcome: st.completed ? 'completed' : 'stopped',
                 };
                 closeAssistant();
+                const stopNotice = describeRunStop(event.stopReason);
+                if (stopNotice)
+                    pushMessage('system', stopNotice, false, '■');
                 break;
+            }
             case 'paused':
                 // Paused is a recoverable SDK verdict, not success and not failure.
                 // Conversation evidence has no paused member, so it records the
@@ -3101,7 +3308,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 st.outcome = event.message === 'aborted' ? 'cancelled' : 'failed';
                 if (event.message !== 'aborted') {
                     st.notification = { kind: 'turn-settled', outcome: 'failed' };
-                    pushMessage('system', describeRunInterruption(event), false, '⚠');
+                    pushMessage('system', describeRunInterruption(event), false, '!');
                 }
                 else
                     st.notification = null;
@@ -3109,6 +3316,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
     }, [appendToMessage, finalizeMessage, flushStream, pushMessage]);
     const runTurn = useCallback(async (prompt) => {
+        // A passive queue effect can still hold the previous render's session
+        // while a replacement is being committed. Keep FIFO ownership until
+        // the render and the resource-owning session agree.
+        const pendingAtAdmission = pendingModelSwitchRef.current;
+        if (pendingAtAdmission || previousSessionRef.current !== session) {
+            replaceQueued([prompt, ...queuedRef.current]);
+            return;
+        }
         if (!session || !session.hasProvider) {
             pushMessage('system', session?.errorHint ?? 'Agent is not ready yet — give it a moment.');
             return;
@@ -3232,6 +3447,72 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const turnGeneration = conversationGenRef.current;
         unsettledTurnGenerationsRef.current.set(turnToken, turnGeneration);
         const stillHere = () => conversationGenRef.current === turnGeneration;
+        const requestModelSwitch = async (request, requestSignal) => {
+            if (!currentProvider ||
+                !stillHere() ||
+                ac.signal.aborted ||
+                requestSignal?.aborted ||
+                appLifetime.signal.aborted ||
+                activeTurnTokenRef.current !== turnToken ||
+                previousSessionRef.current !== session) {
+                return { kind: 'rejected', reason: 'The requesting turn is no longer active.' };
+            }
+            const accepted = pendingModelSwitchRef.current;
+            if (accepted?.turnToken === turnToken &&
+                !accepted.signal.aborted &&
+                accepted.selection?.model === request.model.trim() &&
+                (!request.provider || accepted.selection.id === request.provider.trim())) {
+                return { kind: 'pending', selection: accepted.selection };
+            }
+            // A later request supersedes an earlier lookup even if its model list
+            // resolves first. Cancellation never changes the active provider.
+            cancelPendingModelSwitch();
+            const controller = new AbortController();
+            const pending = {
+                turnToken,
+                generation: turnGeneration,
+                sessionId: scopeRef.current?.sessionId,
+                ownerSession: session,
+                controller,
+                // A tool's lifetime can end before the turn. Once accepted, the
+                // switch belongs to the turn and host, not that completed tool call.
+                signal: AbortSignal.any([ac.signal, appLifetime.signal, controller.signal]),
+            };
+            pendingModelSwitchRef.current = pending;
+            setModelSwitchVersion((version) => version + 1);
+            try {
+                const result = await resolveModelSwitch(request, {
+                    currentProvider,
+                    detected,
+                    describeModels: describeProviderModels,
+                    signal: requestSignal ? AbortSignal.any([pending.signal, requestSignal]) : pending.signal,
+                });
+                if (pendingModelSwitchRef.current !== pending ||
+                    pending.signal.aborted ||
+                    requestSignal?.aborted ||
+                    !stillHere() ||
+                    activeTurnTokenRef.current !== turnToken) {
+                    return { kind: 'rejected', reason: 'The model switch was cancelled or superseded.' };
+                }
+                if (result.kind === 'rejected')
+                    return result;
+                pending.selection = result.selection;
+                return { kind: 'pending', selection: result.selection };
+            }
+            catch (error) {
+                return {
+                    kind: 'rejected',
+                    reason: pending.signal.aborted
+                        ? 'The model switch was cancelled.'
+                        : `Could not resolve the requested model: ${error instanceof Error ? error.message : String(error)}`,
+                };
+            }
+            finally {
+                if (!pending.selection && pendingModelSwitchRef.current === pending) {
+                    cancelPendingModelSwitch();
+                }
+            }
+        };
         let inboxOpen = true;
         const inboxEntries = [];
         const inputWaiters = new Set();
@@ -3368,6 +3649,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     // The mode above decides whether this callback is consulted.
                     onPermission: askPermission,
                     onQuestion: askQuestion,
+                    onModelSwitch: requestModelSwitch,
                     inboundMessages: () => inbox.drain(),
                     waitForInbound: (signal) => inbox.waitForInbound(signal),
                     extraSystem: [composeSkillsPrompt(activeSkills), drainIdleJobNotices(), drainOperatorShell()]
@@ -3480,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);
@@ -3549,15 +3835,76 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // operation that sees no current-generation entries can now await that
             // tail without a turn appearing behind its read later.
             unsettledTurnGenerationsRef.current.delete(turnToken);
+            const pending = pendingModelSwitchRef.current;
+            if (pending?.turnToken === turnToken && pending.selection) {
+                const selection = pending.selection;
+                const ownsSwitch = () => pendingModelSwitchRef.current === pending &&
+                    conversationGenRef.current === pending.generation &&
+                    scopeRef.current?.sessionId === pending.sessionId &&
+                    previousSessionRef.current === pending.ownerSession &&
+                    !pending.signal.aborted;
+                const beforePublish = () => {
+                    if (!ownsSwitch() ||
+                        conversationMutationRef.current ||
+                        hasUnsettledTurn(pending.generation) ||
+                        abortRef.current ||
+                        compactingRef.current ||
+                        exportingRef.current) {
+                        throw new Error('The active conversation changed before the model switch could complete.');
+                    }
+                    if (pending.ownerSession.subagents
+                        ?.getSnapshot()
+                        .some((agent) => agent.status === 'starting' ||
+                        agent.status === 'queued' ||
+                        agent.status === 'working')) {
+                        throw new Error('Delegated agents are still active. Wait for them to finish before switching models.');
+                    }
+                    if (pending.ownerSession.jobs?.().some((job) => job.status === 'running')) {
+                        throw new Error('Background jobs are still running. Wait for them to finish before switching models.');
+                    }
+                };
+                try {
+                    await persistenceTailRef.current;
+                    beforePublish();
+                    await hydrateSession(selectPrimaryProvider(savedPrefsRef.current, selection), detected, {
+                        signal: pending.signal,
+                        persistSelection: false,
+                        beforePublish,
+                    });
+                    if (pendingModelSwitchRef.current === pending &&
+                        !pending.signal.aborted &&
+                        previousSessionRef.current !== pending.ownerSession) {
+                        pushMessage('system', `Switched to ${selection.id} · ${selection.model} for this conversation.`);
+                    }
+                }
+                catch (error) {
+                    if (ownsSwitch()) {
+                        pushMessage('system', `Model switch failed: ${error instanceof Error ? error.message : String(error)} The current model is unchanged.`);
+                    }
+                }
+                finally {
+                    if (pendingModelSwitchRef.current === pending) {
+                        pendingModelSwitchRef.current = null;
+                        setModelSwitchVersion((version) => version + 1);
+                        wakeGoalDriver();
+                    }
+                }
+            }
         }
     }, [
         activeSkills,
+        appLifetime.signal,
         applyEvent,
+        cancelPendingModelSwitch,
         clearActiveTools,
+        currentProvider,
         ctx.cwd,
+        detected,
         finalizeMessage,
         flushStream,
         goalActivation,
+        hasUnsettledTurn,
+        hydrateSession,
         materializeConversation,
         onPermission,
         pushMessage,
@@ -3567,6 +3914,109 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setQueuePause,
         wakeGoalDriver,
     ]);
+    const selectModelIntent = useCallback(async (query) => {
+        if (!session ||
+            !currentProvider ||
+            state !== 'idle' ||
+            phase !== 'ready' ||
+            abortRef.current ||
+            hasUnsettledTurn() ||
+            pendingModelSwitchRef.current ||
+            queuedRef.current.length > 0 ||
+            permissionResolveRef.current ||
+            compactingRef.current ||
+            conversationMutationRef.current ||
+            exportingRef.current ||
+            goalDriveInFlightRef.current) {
+            pushMessage('system', 'Model selection is unavailable until the active work and queue reach a stable boundary.');
+            return;
+        }
+        const controller = new AbortController();
+        const pending = {
+            turnToken: {},
+            generation: conversationGenRef.current,
+            sessionId: scopeRef.current?.sessionId,
+            ownerSession: session,
+            controller,
+            signal: AbortSignal.any([appLifetime.signal, controller.signal]),
+        };
+        pendingModelSwitchRef.current = pending;
+        setModelSwitchVersion((version) => version + 1);
+        const owns = () => pendingModelSwitchRef.current === pending &&
+            !pending.signal.aborted &&
+            conversationGenRef.current === pending.generation &&
+            scopeRef.current?.sessionId === pending.sessionId &&
+            previousSessionRef.current === session;
+        const beforePublish = () => {
+            if (!owns() ||
+                abortRef.current ||
+                hasUnsettledTurn() ||
+                conversationMutationRef.current ||
+                compactingRef.current ||
+                exportingRef.current ||
+                permissionResolveRef.current ||
+                session.jobs?.().some((job) => job.status === 'running') ||
+                session.subagents
+                    ?.getSnapshot()
+                    .some((agent) => ['starting', 'queued', 'working'].includes(agent.status))) {
+                throw new Error('Active work or the conversation changed before model selection could complete.');
+            }
+        };
+        try {
+            beforePublish();
+            pushMessage('system', `Model requested: ${query}. Checking available catalogues…`);
+            const resolved = await resolveModelSelectionIntent(query, {
+                currentProvider,
+                detected,
+                describeModels: describeProviderModels,
+                signal: pending.signal,
+            });
+            if (!owns())
+                return;
+            if (resolved.kind === 'rejected') {
+                pushMessage('system', resolved.reason +
+                    (resolved.choices?.length
+                        ? ` Choices: ${resolved.choices.map((choice) => `${choice.provider}/${choice.model}`).join(', ')}.`
+                        : ''));
+                return;
+            }
+            pending.selection = resolved.selection;
+            await persistenceTailRef.current;
+            beforePublish();
+            await hydrateSession(selectPrimaryProvider(savedPrefsRef.current, resolved.selection), detected, {
+                signal: pending.signal,
+                persistSelection: false,
+                beforePublish,
+            });
+            if (pendingModelSwitchRef.current === pending &&
+                !pending.signal.aborted &&
+                previousSessionRef.current !== session) {
+                pushMessage('system', `Switched to ${resolved.selection.id} · ${resolved.selection.model} for this conversation.`);
+            }
+        }
+        catch (error) {
+            if (owns())
+                pushMessage('system', `Model selection failed: ${error instanceof Error ? error.message : String(error)} The current model is unchanged.`);
+        }
+        finally {
+            if (pendingModelSwitchRef.current === pending) {
+                pendingModelSwitchRef.current = null;
+                setModelSwitchVersion((version) => version + 1);
+                wakeGoalDriver();
+            }
+        }
+    }, [
+        session,
+        currentProvider,
+        state,
+        phase,
+        hasUnsettledTurn,
+        appLifetime.signal,
+        pushMessage,
+        detected,
+        hydrateSession,
+        wakeGoalDriver,
+    ]);
     const handleSubmit = useCallback((value, attachments, mode = 'submit') => {
         if (goalCommandInFlightRef.current) {
             pushMessage('system', 'A goal command is still reaching durable session state. Wait for its result before sending another command or prompt.');
@@ -3590,14 +4040,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         setHistory((prev) => [...prev, value]);
+        const selectionIntent = !attachments?.length ? parseModelSelectionIntent(value) : undefined;
+        if (selectionIntent) {
+            void selectModelIntent(selectionIntent.query);
+            return;
+        }
         // `#` remembers, `!` runs — neither is a prompt. Both are the
         // operator acting directly, the way other coding agents spell it,
         // and both leave a row the model reads on its next turn.
         if (value.startsWith('#') && value.slice(1).trim().length > 0) {
             const note = value.slice(1).trim();
             try {
-                const path = appendMemory(note, { scope: 'project', cwd: ctx.cwd });
-                pushMessage('system', `Remembered for this project (${path}): ${note}`);
+                const saved = appendMemoryWithStatus(note, { scope: 'project', cwd: ctx.cwd });
+                pushMessage('system', renderMemorySaveResult(saved, note));
             }
             catch (err) {
                 pushMessage('system', `Could not save memory: ${err instanceof Error ? err.message : String(err)}`);
@@ -3634,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) {
@@ -3664,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 = [
                         {
@@ -3685,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,
@@ -3866,6 +4343,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     return;
                 case 'repick':
                     if (state !== 'idle' ||
+                        pendingModelSwitchRef.current ||
                         abortRef.current !== null ||
                         hasUnsettledTurn() ||
                         (queuedRef.current.length > 0 && queuePauseRef.current === null) ||
@@ -3934,17 +4412,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     const values = [undefined, ...levels];
                     const current = reasoningEffortRef.current;
                     setSelectedChoice(Math.max(0, values.findIndex((value) => value === current)));
-                    setChoicePicker({
-                        kind: 'reasoning-effort',
-                        title: `Select Reasoning Level for ${session.modelSummary ?? 'current model'}`,
-                        values,
-                        options: values.map((effort) => ({
-                            label: effort ?? 'default',
-                            description: reasoningEffortDescription(effort),
-                            current: effort === current,
-                            default: effort === undefined,
-                        })),
-                    });
+                    setChoicePicker(reasoningEffortPicker(session, current) ?? null);
                     return;
                 }
                 case 'login':
@@ -3984,8 +4452,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 case 'remember':
                     try {
-                        const path = appendMemory(slash.text, { scope: slash.scope, cwd: ctx.cwd });
-                        pushMessage('system', `Remembered ${slash.scope === 'user' ? 'for every project' : 'for this project'} (${path}): ${slash.text}`);
+                        const saved = appendMemoryWithStatus(slash.text, { scope: slash.scope, cwd: ctx.cwd });
+                        pushMessage('system', renderMemorySaveResult(saved, slash.text));
                     }
                     catch (err) {
                         pushMessage('system', `Could not save memory: ${err instanceof Error ? err.message : String(err)}`);
@@ -4011,7 +4479,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     // Dropping it silently would leave someone wondering where a
                     // file they can see on disk went.
                     s.problem
-                        ? `⚠ ${s.name} — ${s.problem}`
+                        ? `! ${s.name} — ${s.problem}`
                         : `${activeNames.has(s.name) ? '● ' : '○ '}${s.name} — ${s.description}`);
                     pushMessage('system', `Skills (● active):\n  ${lines.join('\n  ')}`);
                     return;
@@ -4425,6 +4893,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         resetTranscript,
         runConversationExport,
         session,
+        selectModelIntent,
         setChoicePicker,
         setCopyPicker,
         setReasoningEffort,
@@ -4462,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)
@@ -4470,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
@@ -4488,6 +4970,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             queuedRef.current.length > 0 ||
             abortRef.current ||
             hasUnsettledTurn() ||
+            pendingModelSwitchRef.current ||
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
@@ -4515,6 +4998,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     state !== 'idle' ||
                     abortRef.current ||
                     hasUnsettledTurn(generation) ||
+                    pendingModelSwitchRef.current ||
                     conversationMutationRef.current ||
                     exportingRef.current ||
                     compactingRef.current ||
@@ -4540,6 +5024,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 // or goal command is different: it revoked this scheduling boundary.
                 if (conversationGenRef.current !== generation ||
                     scopeRef.current?.sessionId !== sessionId ||
+                    pendingModelSwitchRef.current ||
                     conversationMutationRef.current ||
                     goalCommandInFlightRef.current ||
                     !goalActivation.isArmed(sessionId, armed)) {
@@ -4572,6 +5057,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         enqueueQueued,
         goalActivation,
         goalDriveVersion,
+        modelSwitchVersion,
         hasUnsettledTurn,
         phase,
         pushMessage,
@@ -4592,6 +5078,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             queuePauseRef.current !== null ||
             abortRef.current ||
             hasUnsettledTurn() ||
+            pendingModelSwitchRef.current ||
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
@@ -4611,6 +5098,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         state,
         phase,
         queued,
+        modelSwitchVersion,
         queuePause,
         textPrompt,
         choicePicker,
@@ -4635,7 +5123,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     }, [phase, ctx.version, pushMessage]);
     const hydrateFromPicker = useCallback(async (prefs, detectedNow, signal, options = {}) => {
         try {
-            await hydrateSession(prefs, detectedNow, signal, options.persistSelection);
+            await hydrateSession(prefs, detectedNow, {
+                signal,
+                persistSelection: options.persistSelection,
+                announce: true,
+                chooseReasoningEffort: options.chooseReasoningEffort,
+            });
         }
         catch (err) {
             // A superseded choice no longer owns even its failure message. Its
@@ -4687,6 +5180,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // Only a real refusal broadens back to the general, sign-in-capable picker.
         void hydrateFromPicker(prefs, detected, signal, {
             revealAllOnFailure: true,
+            chooseReasoningEffort: selection.model !== undefined,
             persistSelection: detected.find((provider) => provider.entry.id === selection.provider)?.source.kind !==
                 'session',
         });
@@ -4720,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') {
@@ -4840,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
@@ -4858,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) {
@@ -4905,7 +5400,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             const agents = subagentsRef.current;
             if (agentView.kind === 'cockpit') {
-                const phases = agentPhases(agents);
+                const workflows = agentWorkflows(agents);
+                const workflowIndex = Math.max(0, workflows.findIndex((workflow) => workflow.phases.some((phase) => phase.id === agentView.selectedPhaseId)));
+                const workflow = workflows[workflowIndex];
+                const phases = workflow?.phases ?? [];
                 const phaseIndex = Math.max(0, phases.findIndex((phase) => phase.id === agentView.selectedPhaseId));
                 const phase = phases[phaseIndex];
                 const phaseAgents = phase?.agents ?? [];
@@ -4915,11 +5413,27 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     setAgentSurface(null);
                     return;
                 }
-                if (key.escape || (key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
+                if ((key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
                     setAgentSurface(null);
                     return;
                 }
+                if (key.escape) {
+                    setAgentSurface(workflows.length > 1 && agentView.focus !== 'workflows'
+                        ? { ...agentView, focus: 'workflows' }
+                        : null);
+                    return;
+                }
                 if (key.leftArrow || key.rightArrow || key.tab) {
+                    if (agentView.focus === 'workflows') {
+                        if (!key.leftArrow) {
+                            setAgentSurface({ ...agentView, focus: phases.length > 1 ? 'phases' : 'agents' });
+                        }
+                        return;
+                    }
+                    if (key.leftArrow && agentView.focus === 'phases' && workflows.length > 1) {
+                        setAgentSurface({ ...agentView, focus: 'workflows' });
+                        return;
+                    }
                     const focus = key.leftArrow
                         ? 'phases'
                         : key.rightArrow
@@ -4931,6 +5445,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     return;
                 }
                 if (key.return) {
+                    if (agentView.focus === 'workflows') {
+                        setAgentSurface({ ...agentView, focus: phases.length > 1 ? 'phases' : 'agents' });
+                        return;
+                    }
                     if (agentView.focus === 'phases') {
                         setAgentSurface({ ...agentView, focus: 'agents' });
                         return;
@@ -4956,7 +5474,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                     : key.upArrow
                                         ? 'previous'
                                         : 'next';
-                    if (agentView.focus === 'phases') {
+                    if (agentView.focus === 'workflows') {
+                        const next = moveSelection(workflowIndex, workflows.length, movement, agentWorkflowPageSize(terminal.rows));
+                        const targetPhase = workflows[next]?.phases[0];
+                        const targetAgent = targetPhase?.agents[0];
+                        if (targetPhase && targetAgent) {
+                            setAgentSurface({
+                                ...agentView,
+                                selectedPhaseId: targetPhase.id,
+                                selectedId: targetAgent.viewId,
+                            });
+                        }
+                    }
+                    else if (agentView.focus === 'phases') {
                         const next = moveSelection(phaseIndex, phases.length, movement, agentPhasePageSize(terminal.rows, agentCockpitIsWide(terminal.columns)));
                         const targetPhase = phases[next];
                         const targetAgent = targetPhase?.agents[0];
@@ -5139,69 +5669,32 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         // 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) {
+        if (key.escape && (abortRef.current || pendingModelSwitchRef.current)) {
             interruptTurn();
             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') {
@@ -5226,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.
@@ -5243,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' ||
@@ -5260,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'
@@ -5275,9 +5773,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         : permission
                             ? hintForPhase(phase, state, session?.hasProvider === true)
                             : agentSurface?.kind === 'cockpit'
-                                ? agentSurface.focus === 'phases'
-                                    ? 'agent phases — enter agents · esc return'
-                                    : 'agents — enter inspect · left phases · esc return'
+                                ? agentSurface.focus === 'workflows'
+                                    ? 'workflows — enter select · esc return'
+                                    : agentSurface.focus === 'phases'
+                                        ? 'agent phases — enter agents · esc return'
+                                        : 'agents — enter inspect · left phases · esc return'
                                 : agentSurface?.kind === 'transcript'
                                     ? 'observing agent — esc agents · q parent'
                                     : textPrompt
@@ -5291,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, provider: session?.providerSummary, model: session?.modelSummary, permissionMode: displayedPermissionMode, cwd: ctx.cwd })) : 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, { 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 &&
@@ -5300,40 +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, { 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'), 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) => ({
+                                    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) {
@@ -5392,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':
@@ -5443,6 +5964,29 @@ function permissionPicker(mode, approvedAll, more = false) {
         }),
     };
 }
+function reasoningEffortPicker(session, current, afterModelSelection = false) {
+    const levels = session.reasoningEffortLevels;
+    if (!session.hasProvider || levels === undefined)
+        return undefined;
+    const values = [undefined, ...levels];
+    return {
+        kind: 'reasoning-effort',
+        title: `Select Reasoning Level for ${session.modelSummary ?? 'current model'}`,
+        ...(afterModelSelection
+            ? {
+                selectedSession: session,
+                notice: 'Model selected. Esc keeps this model at its default effort.',
+            }
+            : {}),
+        values,
+        options: values.map((effort) => ({
+            label: effort ?? 'default',
+            description: reasoningEffortDescription(effort),
+            current: effort === current,
+            default: effort === undefined,
+        })),
+    };
+}
 function reasoningEffortDescription(effort) {
     switch (effort) {
         case undefined: