@namzu/cli 19.0.0 → 21.0.0

package/dist/tui/App.js

@@ -25,11 +25,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 { appendMemory, composeMemoryPrompt, readMemory } from '../memory/store.js';
-import { permissionModeDescription } from '../permissions/mode.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';
@@ -45,7 +46,7 @@ import { TaskList } from './TaskList.js';
 import { TextPrompt } from './TextPrompt.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';
@@ -54,6 +55,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';
@@ -61,7 +64,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';
@@ -586,20 +589,22 @@ 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;
         if (!surface)
             return;
-        const activeCohorts = activeSubagentCohorts(next);
-        if (activeCohorts.length === 0) {
+        if (next.length === 0) {
             setAgentSurface(null);
             return;
         }
-        if (activeCohorts.some((agent) => agent.viewId === surface.selectedId))
+        if (next.some((agent) => agent.viewId === surface.selectedId))
             return;
-        const phases = agentPhases(activeCohorts);
-        const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? phases[0];
+        const phases = agentPhases(next);
+        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);
@@ -613,8 +618,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         });
     }, [setAgentSurface]);
     const openAgentCockpit = useCallback(() => {
-        const agents = activeSubagentCohorts(subagentsRef.current);
-        const firstPhase = agentPhases(agents)[0];
+        const agents = subagentsRef.current;
+        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 +629,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 +639,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. */
@@ -727,13 +746,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
@@ -837,6 +857,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' ||
@@ -941,7 +974,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     }, [nextId]);
     const applyPermissionMode = useCallback((mode) => {
         if (!session?.hasProvider) {
-            pushMessage('system', 'No active session — pick a provider before changing permissions.');
+            pushMessage('system', 'Choose a model before changing permissions.');
             return;
         }
         if (state !== 'idle' ||
@@ -950,28 +983,32 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             queuedRef.current.length > 0 ||
             permissionResolveRef.current !== null ||
             compactingRef.current) {
-            pushMessage('system', 'Permission mode was not changed: wait for the active turn, prompt, compaction, and queued work to settle.');
+            pushMessage('system', 'Permissions were not changed. Finish or stop the current work first.');
             return;
         }
         if (!session.resetApprovalLatch) {
-            pushMessage('system', 'Permission mode was not changed: this embedded session cannot revoke an earlier "approve all" choice. Reconnect it before changing modes.');
+            pushMessage('system', 'This session cannot reset approvals. Reconnect before changing permissions.');
             return;
         }
         session.resetApprovalLatch();
         permissionModeRef.current = mode;
         permissionModeSourceRef.current = 'session';
         setPermissionModeState(mode);
-        pushMessage('system', `Permission mode changed to ${mode}. Any earlier "approve all" choice was revoked. Declarative deny rules and the built-in safety gate still take precedence.`);
+        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 +1016,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 +1024,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;
@@ -1452,6 +1489,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         if (picker.kind === 'permission-mode') {
+            if (value === 'more') {
+                const child = permissionPicker(permissionModeRef.current, session?.approvalLatched() ?? false, true);
+                setSelectedChoice(Math.max(0, child.options.findIndex((option) => option.current)));
+                setChoicePicker({ ...child, back: picker });
+                return;
+            }
+            if (value === 'rules') {
+                commandPickerSubmitRef.current('/permissions details');
+                return;
+            }
             applyPermissionMode(value);
             return;
         }
@@ -1467,7 +1514,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             removeStoredCredential(value);
             return;
         }
-        applyReasoningEffort(value);
+        applyReasoningEffort(value, picker.selectedSession);
     }, [
         activateSkill,
         advanceQueueContinuation,
@@ -1482,7 +1529,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         removeStoredCredential,
         runConversationExport,
         setChoicePicker,
+        setSelectedChoice,
         setTextPrompt,
+        session,
     ]);
     const sendCopyRequest = useCallback((index) => {
         const picker = copyPickerRef.current;
@@ -1660,7 +1709,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();
@@ -1670,22 +1720,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();
@@ -1704,6 +1759,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.
@@ -1732,6 +1788,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         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;
@@ -1748,13 +1810,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.
@@ -1787,7 +1847,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.
      *
@@ -1823,7 +1891,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;
         }
@@ -1882,7 +1950,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';
         }
@@ -1942,11 +2010,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;
@@ -1999,7 +2068,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);
@@ -2017,7 +2086,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) {
@@ -2252,11 +2324,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * sends at that prompt, for the same reason.
      */
     const interruptTurn = useCallback(() => {
+        const cancelledSwitch = cancelPendingModelSwitch();
         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)
@@ -2272,7 +2348,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.
      *
@@ -2345,6 +2428,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         discardQueued();
         goalActivation.clear();
         wakeGoalDriver();
+        cancelPendingModelSwitch();
         conversationGenRef.current += 1;
         resetSubagentActivity();
         session?.resetTaskStore?.();
@@ -2381,6 +2465,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         interruptTurn,
         nextId,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -2421,6 +2506,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             discardQueued();
             goalActivation.clear();
             wakeGoalDriver();
+            cancelPendingModelSwitch();
             conversationGenRef.current += 1;
             resetSubagentActivity();
             session?.resetTaskStore?.();
@@ -2462,6 +2548,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         goalActivation,
         interruptTurn,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -2710,6 +2797,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?.();
@@ -2753,6 +2841,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         hasUnsettledTurn,
         nextId,
         pushMessage,
+        cancelPendingModelSwitch,
         resetSubagentActivity,
         session,
         resetTranscript,
@@ -3054,12 +3143,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
@@ -3072,7 +3161,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
@@ -3089,7 +3182,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;
@@ -3097,6 +3190,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;
@@ -3220,8 +3321,75 @@ 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();
         const inbox = {
             accept(input) {
                 if (!inboxOpen ||
@@ -3232,8 +3400,32 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     return false;
                 inboxEntries.push(input);
                 setPendingSteers([...inboxEntries]);
+                for (const wake of [...inputWaiters])
+                    wake();
                 return true;
             },
+            waitForInbound(signal) {
+                if (signal.aborted)
+                    return Promise.reject(signal.reason);
+                if (!inboxOpen || inboxEntries.length > 0)
+                    return Promise.resolve();
+                return new Promise((resolve, reject) => {
+                    const cleanup = () => {
+                        inputWaiters.delete(wake);
+                        signal.removeEventListener('abort', abort);
+                    };
+                    const wake = () => {
+                        cleanup();
+                        resolve();
+                    };
+                    const abort = () => {
+                        cleanup();
+                        reject(signal.reason);
+                    };
+                    inputWaiters.add(wake);
+                    signal.addEventListener('abort', abort, { once: true });
+                });
+            },
             drain() {
                 if (!inboxOpen ||
                     ac.signal.aborted ||
@@ -3261,6 +3453,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             },
             close() {
                 inboxOpen = false;
+                for (const wake of [...inputWaiters])
+                    wake();
                 return inboxEntries.splice(0, inboxEntries.length);
             },
         };
@@ -3329,7 +3523,9 @@ 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()]
                         .filter((part) => Boolean(part))
                         .join('\n\n') || undefined,
@@ -3509,15 +3705,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,
@@ -3527,6 +3784,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.');
@@ -3550,14 +3910,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)}`);
@@ -3628,10 +3993,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     const commands = [
                         {
                             name: 'model',
+                            label: 'Model',
                             description: `${session?.providerSummary ?? 'No provider'} · ${session?.modelSummary ?? 'No model'}. Change model or provider.`,
                         },
                         {
                             name: 'effort',
+                            label: 'Reasoning effort',
                             description: `${reasoningEffortRef.current ?? session?.reasoningEffortDefault ?? 'Model default'} · applies to future turns in this session.`,
                             ...(session?.reasoningEffortLevels === undefined
                                 ? { problem: 'This model does not publish reasoning choices.' }
@@ -3639,10 +4006,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         },
                         {
                             name: 'permissions',
-                            description: `${permissionModeRef.current} · applies to future turns in this session.`,
+                            label: 'Permissions',
+                            description: `${permissionModeLabel(effectivePermissionMode(permissionModeRef.current, session?.approvalLatched() ?? false))} · this session.`,
                         },
                         {
                             name: 'status config',
+                            label: 'Configuration',
                             description: 'Show which configuration files and overrides are in use.',
                         },
                     ];
@@ -3653,7 +4022,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         notice: 'Select a setting to view or change it.',
                         values: commands,
                         options: commands.map((command) => ({
-                            label: `/${command.name}`,
+                            label: command.label,
                             description: command.description,
                             disabledReason: command.problem,
                         })),
@@ -3822,6 +4191,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) ||
@@ -3848,7 +4218,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 case 'permission-mode-picker': {
                     if (!session?.hasProvider) {
-                        pushMessage('system', 'No active session — pick a provider before changing permissions.');
+                        pushMessage('system', 'Choose a model before changing permissions.');
                         return;
                     }
                     if (state !== 'idle' ||
@@ -3858,22 +4228,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         permissionResolveRef.current !== null ||
                         compactingRef.current ||
                         !session.resetApprovalLatch) {
-                        pushMessage('system', 'Permission choices are unavailable until the active turn, prompt, compaction, queued work, or embedded-session approval latch can be safely settled.');
+                        pushMessage('system', !session.resetApprovalLatch
+                            ? 'This session cannot reset approvals. Reconnect before changing permissions.'
+                            : 'Finish or stop the current work before changing permissions.');
                         return;
                     }
-                    const values = ['prompt', 'accept-edits', 'auto', 'strict', 'plan'];
-                    setSelectedChoice(Math.max(0, values.indexOf(permissionModeRef.current)));
-                    setChoicePicker({
-                        kind: 'permission-mode',
-                        title: 'Select Permission Mode',
-                        notice: permissionPickerNotice(session),
-                        values,
-                        options: values.map((mode) => ({
-                            label: mode,
-                            description: permissionModeDescription(mode),
-                            current: mode === permissionModeRef.current,
-                        })),
-                    });
+                    const picker = permissionPicker(permissionModeRef.current, session.approvalLatched());
+                    setSelectedChoice(Math.max(0, picker.options.findIndex((option) => option.current)));
+                    setChoicePicker(picker);
                     return;
                 }
                 case 'reasoning-effort': {
@@ -3898,17 +4260,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':
@@ -3948,17 +4300,15 @@ 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)}`);
                     }
                     return;
                 case 'show-memory': {
-                    const mem = composeMemoryPrompt(readMemory(undefined, ctx.cwd));
-                    pushMessage('system', mem ??
-                        'Nothing remembered yet. #note or /memory <text> saves a fact about this project (.namzu/MEMORY.md); /memory --user <text> saves one for every project (~/.namzu/MEMORY.md).');
+                    pushMessage('system', renderMemoryReport(readMemory(undefined, ctx.cwd), { cwd: ctx.cwd }));
                     return;
                 }
                 case 'list-skills': {
@@ -3977,7 +4327,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;
@@ -4391,6 +4741,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         resetTranscript,
         runConversationExport,
         session,
+        selectModelIntent,
         setChoicePicker,
         setCopyPicker,
         setReasoningEffort,
@@ -4454,6 +4805,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             queuedRef.current.length > 0 ||
             abortRef.current ||
             hasUnsettledTurn() ||
+            pendingModelSwitchRef.current ||
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
@@ -4481,6 +4833,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     state !== 'idle' ||
                     abortRef.current ||
                     hasUnsettledTurn(generation) ||
+                    pendingModelSwitchRef.current ||
                     conversationMutationRef.current ||
                     exportingRef.current ||
                     compactingRef.current ||
@@ -4506,6 +4859,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)) {
@@ -4538,6 +4892,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         enqueueQueued,
         goalActivation,
         goalDriveVersion,
+        modelSwitchVersion,
         hasUnsettledTurn,
         phase,
         pushMessage,
@@ -4558,6 +4913,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             queuePauseRef.current !== null ||
             abortRef.current ||
             hasUnsettledTurn() ||
+            pendingModelSwitchRef.current ||
             conversationMutationRef.current ||
             exportingRef.current ||
             compactingRef.current ||
@@ -4577,6 +4933,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         state,
         phase,
         queued,
+        modelSwitchVersion,
         queuePause,
         textPrompt,
         choicePicker,
@@ -4601,7 +4958,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
@@ -4653,6 +5015,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',
         });
@@ -4869,9 +5232,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // highlighted child before the list has appeared on screen.
             if (agentSurfaceCommittedRef.current !== agentView)
                 return;
-            const agents = activeSubagentCohorts(subagentsRef.current);
+            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 ?? [];
@@ -4881,11 +5247,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
@@ -4897,6 +5279,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;
@@ -4922,7 +5308,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];
@@ -5105,7 +5503,7 @@ 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;
@@ -5210,7 +5608,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             ? representedSubagentTools.has(JSON.stringify([tool.runId, tool.id]))
             : representedUnscopedSubagentToolUseIds.has(tool.id)));
     const selectedSubagent = agentSurface
-        ? liveSubagents.find((agent) => agent.viewId === agentSurface.selectedId)
+        ? subagents.find((agent) => agent.viewId === agentSurface.selectedId)
         : undefined;
     const lifecycleOwnsViewport = phase === 'trust' ||
         phase === 'resume' ||
@@ -5241,9 +5639,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
@@ -5257,7 +5657,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 : goalStatus && phase === 'ready' && state === 'idle'
                                                     ? undefined
                                                     : hintForPhase(phase, state, session?.hasProvider === true, composerHasDraft);
-    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: permissionMode, 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' &&
+    const displayedPermissionMode = effectivePermissionMode(permissionMode, session?.approvalLatched() ?? false);
+    return (_jsx(Box, { flexDirection: "column", display: externalEditorRequest ? 'none' : 'flex', children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: transcriptOwned ? renderedSettled : 0, resetKey: resetKey, raw: rawOutput, hyperlinks: hyperlinks, showLive: !lifecycleOwnsViewport, header: transcriptOwned ? (_jsx(BrandHeader, { version: ctx.version, permissionMode: displayedPermissionMode })) : undefined }) }), phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'unhealthy' ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.status.error, bold: true, children: "Startup stopped" }), _jsx(Text, { color: theme.text.secondary, children: "Resolve the error above, then restart Namzu." })] })) : phase === 'resume' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume })) : phase === 'edit' ? (_jsx(EditPromptPicker, { prompts: editList, selected: selectedEdit })) : phase === 'picker' ? (_jsx(Picker, { detected: pickerDetected ?? detected, currentProvider: currentProvider, selectionKind: pickerSelectionKind, currentModel: session?.modelSummary ?? null, initialView: pickerInitialView, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [agentSurface === null ? (_jsx(LiveActivity, { compact: compactWork, activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true, thinking: thinking })) : null, agentSurface === null && permission === null ? (_jsx(TaskList, { tasks: tasks, compact: compactWork })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, choice: permissionChoice, columns: terminal.columns, rows: terminal.rows })) : null, textPrompt ? (_jsx(TextPrompt, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || agentSurface !== null, onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && agentSurface === null && choicePicker ? (_jsx(ChoicePicker, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: choicePicker.title, notice: choicePicker.notice, options: filterChoiceOptions(choicePicker.options, choiceQuery), query: choicePickerSearchable(choicePicker) ? choiceQuery : undefined, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && agentSurface === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { working: state === 'thinking' || state === 'tool' || visibleActiveTools.length > 0, focus: phase === 'ready' &&
                                 state !== 'awaiting-permission' &&
                                 !compacting &&
                                 externalEditorRequest === null &&
@@ -5268,7 +5669,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 agentSurface === null, hidden: permission !== null ||
                                 textPrompt !== null ||
                                 choicePicker !== null ||
-                                copyPicker !== null, children: [pendingSteers.length > 0 &&
+                                copyPicker !== null ||
+                                agentSurface?.kind === 'transcript', children: [pendingSteers.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
@@ -5282,7 +5684,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 ? 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: permissionMode, onCycleMode: cyclePermissionMode, disabled: phase !== 'ready' ||
+                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { reasoningEffortLevels: session?.reasoningEffortLevels, permissionMode: displayedPermissionMode, onCycleMode: cyclePermissionMode, disabled: phase !== 'ready' ||
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
@@ -5290,13 +5692,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                         agentSurface !== null, hidden: permission !== null ||
                                         textPrompt !== null ||
                                         choicePicker !== null ||
-                                        copyPicker !== null, 
+                                        copyPicker !== null ||
+                                        agentSurface?.kind === 'transcript', 
                                     // 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: liveSubagents, 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 && 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 }) })] }) }));
 }
 /** One line for a background job that ended, for the transcript and the next turn. */
 function describeJobExit(job) {
@@ -5376,15 +5780,58 @@ function labelOfOption(question, optionId) {
 function choicePickerSearchable(picker) {
     return ['command', 'skill', 'review-branch', 'review-commit'].includes(picker.kind);
 }
-function permissionPickerNotice(session) {
-    const notices = [];
-    if (session.approvalLatched()) {
-        notices.push('Approve all is active; applying any mode revokes it.');
-    }
-    const exempt = session.promptExemptTools();
-    if (exempt.length > 0)
-        notices.push(`Never prompted: ${exempt.join(', ')}.`);
-    return notices.length > 0 ? notices.join(' ') : undefined;
+function permissionPicker(mode, approvedAll, more = false) {
+    const current = effectivePermissionMode(mode, approvedAll);
+    const values = more
+        ? ['auto', 'strict', 'rules']
+        : ['prompt', 'accept-edits', 'plan', 'more'];
+    return {
+        kind: 'permission-mode',
+        title: more ? 'More permission options' : 'Permissions',
+        notice: `Current: ${permissionModeLabel(current)} · this session`,
+        values,
+        options: values.map((value) => {
+            if (value === 'more')
+                return {
+                    label: 'More options',
+                    description: 'Other approval modes and permission rules',
+                    current: current === 'auto' || current === 'strict',
+                };
+            if (value === 'rules')
+                return {
+                    label: 'View rules',
+                    description: 'Show the permission rules in use',
+                };
+            return {
+                label: permissionModeLabel(value),
+                description: permissionModeDescription(value),
+                current: value === current,
+            };
+        }),
+    };
+}
+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) {