@namzu/cli 18.1.0 → 20.0.0

package/dist/tui/App.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *      automatic reuse is not mistaken for a durable operator preference.
  */
 import { join, relative } from 'node:path';
-import { DefaultPathBuilder, DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, RunCancelled, SessionGoalActivation, StaleGoalError, asSessionId, createAssistantMessage, createUserMessage, generateRunId, generateSessionId, isCompactionMessage, kernelHostCommands, } from '@namzu/sdk';
+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';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { pinTrustedProjectPath, resolveTrustedProjectContext, } from '../config/trusted-project-context.js';
@@ -25,24 +25,29 @@ 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 { renderMemoryReport } from '../memory/presentation.js';
+import { appendMemory, 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 { BrandHeader } from './BrandHeader.js';
 import { ChoicePicker } from './ChoicePicker.js';
 import { Composer, suggestionWindowSize, } from './Composer.js';
+import { ComposerFrame } from './ComposerFrame.js';
 import { CopyPicker } from './CopyPicker.js';
 import { EditPromptPicker } from './EditPromptPicker.js';
 import { LiveActivity, formatElapsed } from './LiveActivity.js';
-import { TaskList } from './TaskList.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
 import { Picker } from './Picker.js';
 import { ResumePicker } from './ResumePicker.js';
 import { StatusBar } from './StatusBar.js';
+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 { choicePickerWindowSize, filterChoiceOptions, moveChoiceSelection, } from './choice-selection.js';
 import { keepRecentRows } from './compact-transcript.js';
 import { approvalIsDeliberate } from './consent-timing.js';
 import { planTurnPublication } from './conversation-history.js';
@@ -51,12 +56,15 @@ import { editablePrompts } from './edit-prompts.js';
 import { editDraftInExternalEditor } from './external-editor.js';
 import { liveWindow } from './live-window.js';
 import { describeCodexDeviceLoginStart, describeLoginOutcome, describeLoginStart, describeLogout, describeProviderLogout, } from './login-prompt.js';
-import { NAMZU_MARK, NAMZU_MARK_COLOR, NAMZU_WORDMARK, NAMZU_WORDMARK_GRADIENT, NAMZU_WORDMARK_MIN_WIDTH, } from './logo.js';
+import { selectPrimaryProvider } from './provider-selection.js';
+import { eraseLastChoiceGrapheme } from './terminal-choice-text.js';
+import { renderCheckpoints, renderRestore } from '../checkpoints/store.js';
 import { expandFileMentions, listMentionableFiles } from './mentions.js';
 import { openInBrowser } from './open-browser.js';
-import { PERMISSION_REVIEW_PAGE_ROWS, buildPermissionReview, buildPermissionSummary, permissionReviewRefusal, permissionReviewRows, } from './permission-review.js';
+import { buildPermissionReview, buildPermissionSummary, permissionReviewPageRows, permissionReviewRefusal, permissionReviewRows, } from './permission-review.js';
 import { describeRunInterruption } 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';
 import { splitCompleteBlocks, splitSafeCut } from './stream-blocks.js';
 import { terminalSupportsHyperlinks } from './terminal-hyperlinks.js';
@@ -64,6 +72,8 @@ import { theme } from './theme.js';
 import { useSelectionIndex } from './use-selection-index.js';
 import { renderWorkspaceDiff, workspaceDiff } from './workspace-diff.js';
 import { listReviewBranches, listReviewCommits, reviewMergeBase, } from './workspace-review.js';
+/** How long `/exit` waits for the session to close before leaving anyway. */
+const SESSION_CLOSE_ON_EXIT_MS = 5_000;
 /** The value a question row carries: an option id, or the free-text escape. */
 const FREE_TEXT_ANSWER = '__free_text__';
 /**
@@ -305,7 +315,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const [pickerDetected, setPickerDetected] = useState(null);
     /** Whether Enter accepts the provider directly or continues to model choice. */
     const [pickerSelectionKind, setPickerSelectionKind] = useState('provider-and-model');
-    /** The chain read from disk, held while the picker repairs its credential. */
+    /** Active preferences, or the saved chain awaiting its missing credential. */
     const savedPrefsRef = useRef(null);
     /**
      * Why the picker is open, drawn ON the picker.
@@ -345,6 +355,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         permissionReviewOffsetRef.current = next;
         setPermissionReviewOffsetState(next);
     }, []);
+    // Which of the three answers the cursor is on. Opens on "Yes", as the
+    // prompt an operator knows from elsewhere does; Enter confirms it only
+    // after the same settle window `y` and `a` wait out.
+    const [permissionChoice, setPermissionChoiceState] = useState(0);
+    const permissionChoiceRef = useRef(0);
+    const setPermissionChoice = useCallback((next) => {
+        permissionChoiceRef.current = next;
+        setPermissionChoiceState(next);
+    }, []);
     // The launch bypass is an INITIAL selection, not permanent authority. A
     // typed /permissions command can narrow it back to prompt/strict without
     // rebuilding the provider, tools, plugins, or sandbox.
@@ -366,7 +385,62 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     /** Git-admitted file paths cached once per successful session hydration. */
     const [mentionCandidates, setMentionCandidates] = useState([]);
     const mentionLoadOwnerRef = useRef(null);
+    // What compaction has done this session, summed over passes; `/context`
+    // prints it. Reset with the session, never by a pass that declined.
+    const [compactionTally, setCompactionTally] = useState({
+        passes: 0,
+        clearedResults: 0,
+        stubbedNarrations: 0,
+        summaries: 0,
+        reclaimedTokens: 0,
+    });
+    // Jobs that ended while no turn was running. The kernel's notice needs a
+    // tool result to ride on, so between turns the exit is held here and
+    // handed to the next send as part of the system text; the transcript
+    // row is written at once.
+    const idleJobNoticesRef = useRef([]);
+    const drainIdleJobNotices = () => {
+        if (idleJobNoticesRef.current.length === 0)
+            return undefined;
+        const lines = idleJobNoticesRef.current;
+        idleJobNoticesRef.current = [];
+        return `Background jobs that ended since your last turn:\n${lines.map((l) => `- ${l}`).join('\n')}`;
+    };
+    // Commands the operator ran with `!` since the last turn. The model did
+    // not see them happen; it reads them here on its next turn.
+    const operatorShellRef = useRef([]);
+    const drainOperatorShell = () => {
+        if (operatorShellRef.current.length === 0)
+            return undefined;
+        const blocks = operatorShellRef.current;
+        operatorShellRef.current = [];
+        return `What the operator did outside you since your last turn — commands they ran in their own shell, files they put back — with the output:\n\n${blocks.join('\n\n')}`;
+    };
+    useEffect(() => {
+        if (!session?.onJobExit)
+            return;
+        return session.onJobExit((job) => {
+            if (abortRef.current !== null)
+                return;
+            const text = describeJobExit({
+                jobId: job.id,
+                command: job.command,
+                status: job.status === 'killed' ? 'killed' : 'exited',
+                ...(job.exitCode !== undefined ? { exitCode: job.exitCode } : {}),
+                ...(job.signal ? { signal: job.signal } : {}),
+            });
+            idleJobNoticesRef.current.push(text);
+            pushMessage('system', text, false, '⚙');
+        });
+    }, [session]);
     const [usage, setUsage] = useState(null);
+    /**
+     * The model's current reasoning, last line only, for the live region.
+     * Never appended to a message: the kernel keeps reasoning out of its
+     * own transcript, and this exists so a long think reads as work rather
+     * than as silence. Cleared by the first text or tool call that follows.
+     */
+    const [thinking, setThinking] = useState(null);
     // Tools currently executing — rendered live (spinner + elapsed) below the
     // transcript, then committed as static lines on completion.
     const [activeTools, setActiveTools] = useState([]);
@@ -459,6 +533,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     /** Finite slash-command choice owned synchronously until apply or cancel. */
     const [choicePicker, setChoicePickerState] = useState(null);
     const choicePickerRef = useRef(null);
+    const [choiceQuery, setChoiceQuery] = useState('');
+    const choiceQueryRef = useRef('');
     /**
      * Exact chooser React has committed. The synchronous owner ref is needed to
      * block queue/goal work immediately, but it must not accept the Return key
@@ -469,6 +545,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const { selection: selectedChoice, selectionRef: selectedChoiceRef, setSelection: setSelectedChoice, } = useSelectionIndex(0);
     const setChoicePicker = useCallback((next) => {
         choicePickerRef.current = next;
+        choiceQueryRef.current = '';
+        setChoiceQuery('');
         if (next === null)
             choicePickerCommittedRef.current = null;
         setChoicePickerState(next);
@@ -514,14 +592,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         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 phases = agentPhases(next);
         const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? phases[0];
         const fallbackAgent = fallbackPhase?.agents[0];
         if (!fallbackPhase || !fallbackAgent) {
@@ -536,7 +613,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         });
     }, [setAgentSurface]);
     const openAgentCockpit = useCallback(() => {
-        const agents = activeSubagentCohorts(subagentsRef.current);
+        const agents = subagentsRef.current;
         const firstPhase = agentPhases(agents)[0];
         const firstAgent = firstPhase?.agents[0];
         if (!firstPhase || !firstAgent)
@@ -642,14 +719,29 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      */
     const conversationMaterializedRef = useRef(false);
     const materializationRef = useRef(null);
+    /**
+     * The session owns processes — MCP servers, background jobs, the hooks'
+     * `session_end` — and Ink's exit does not close it. So the session is
+     * closed first, bounded, and the process leaves after: a server started
+     * with `run_in_background` used to outlive `/exit`, and a `session_end`
+     * hook never ran.
+     */
+    const closeAndExit = useCallback(() => {
+        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]);
     const exitWithSummary = useCallback(() => {
         onExitSummary?.({
             ...(conversationMaterializedRef.current && scopeRef.current?.sessionId
                 ? { conversationId: scopeRef.current.sessionId }
                 : {}),
         });
-        exit();
-    }, [exit, onExitSummary]);
+        closeAndExit();
+    }, [closeAndExit, onExitSummary]);
     /** Durable active state is not permission to spend turns after a restart. */
     const [goalActivation] = useState(() => new SessionGoalActivation());
     const goalDriveInFlightRef = useRef(false);
@@ -849,7 +941,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' ||
@@ -858,18 +950,18 @@ 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) => {
         if (!session?.hasProvider) {
@@ -1038,7 +1130,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 archived = true;
                 goalActivation.clear();
                 onExitSummary?.({});
-                exit();
+                closeAndExit();
             }
             catch (error) {
                 pushMessage('system', `Could not archive this conversation: ${error instanceof Error ? error.message : String(error)}`);
@@ -1147,6 +1239,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const value = picker.values[index];
         if (index < 0 || index >= picker.values.length)
             return;
+        if (picker.options[index]?.disabledReason)
+            return;
         if (picker.kind === 'review-preset') {
             if (reviewChoiceInFlightRef.current)
                 return;
@@ -1177,6 +1271,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         setSelectedChoice(0);
                         setChoicePicker({
                             kind: 'review-branch',
+                            back: picker,
                             title: 'Select a base branch',
                             notice: `Current branch: ${listing.current}`,
                             values: listing.branches,
@@ -1201,6 +1296,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         setSelectedChoice(0);
                         setChoicePicker({
                             kind: 'review-commit',
+                            back: picker,
                             title: 'Select a commit to review',
                             values: commits,
                             options: commits.map((commit) => ({
@@ -1323,6 +1419,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             }
             commandPickerSubmitRef.current(`/${command.name}`);
+            const child = choicePickerRef.current;
+            if (child)
+                setChoicePicker({ ...child, back: picker });
             return;
         }
         if (picker.kind === 'archive-conversation') {
@@ -1353,6 +1452,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;
         }
@@ -1383,7 +1492,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         removeStoredCredential,
         runConversationExport,
         setChoicePicker,
+        setSelectedChoice,
         setTextPrompt,
+        session,
     ]);
     const sendCopyRequest = useCallback((index) => {
         const picker = copyPickerRef.current;
@@ -1504,6 +1615,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         else {
             // Provider/tool startup needs stable project/tenant/topic ids, not a
             // durable conversation. The cursor is replaced on first admitted use.
+            // The conversation's id, chosen now; the conversation is written
+            // under it at first durable use. Nothing that saw this id before
+            // that moment — a hook, a log line, the screen — is later wrong.
             sessionId = generateSessionId();
         }
         sessionsRef.current = sessions;
@@ -1531,11 +1645,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return undefined;
             conversationMutationRef.current = 'materialize';
             try {
-                const sessionId = await startConversation(sessions);
+                const written = await startConversation(sessions, scope.sessionId);
                 if (scopeRef.current !== scope || conversationMaterializedRef.current) {
                     throw new Error('the active conversation changed while its first session was published');
                 }
-                scope.sessionId = sessionId;
+                // The store creates the conversation under the id chosen at open,
+                // so this is the same id; a store that cannot honour a chosen id
+                // is followed rather than contradicted.
+                if (written !== scope.sessionId)
+                    scope.sessionId = written;
                 conversationMaterializedRef.current = true;
                 return scope;
             }
@@ -1554,7 +1672,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 materializationRef.current = null;
         }
     }, [ensureSessions]);
-    const hydrateSession = useCallback(async (prefs, detectedNow, signal) => {
+    const hydrateSession = useCallback(async (prefs, detectedNow, signal, persistSelection = false) => {
         if (signal?.aborted)
             return;
         const scope = await ensureSessions();
@@ -1564,15 +1682,18 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const s = await createAgentSession(prefs, detectedNow, {
             scope,
             cwd: activeCtx.cwd,
-            ...(sessionsRef.current?.backend === 'central'
-                ? { stateRoot: sessionsRef.current.root }
+            ...(activeCtx.additionalDirectories
+                ? { additionalDirectories: activeCtx.additionalDirectories }
                 : {}),
+            ...(sessionsRef.current ? { stateRoot: sessionsRef.current.root } : {}),
             enableComputerUse: true,
             rules: activeCtx.rules,
             ...(sessionsRef.current ? { sessionGoals: sessionsRef.current.goals } : {}),
             ...(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.sandbox ? { sandbox: activeCtx.sandbox } : {}),
             // Somebody is at this terminal, so the model may ask them one
             // question when a decision is genuinely theirs.
@@ -1593,6 +1714,24 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
             throw new Error(reason);
         }
+        let commands;
+        try {
+            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.
+            if (persistSelection)
+                writePreferences(prefs);
+        }
+        catch (error) {
+            try {
+                await s.close();
+            }
+            catch {
+                // Preserve the admission/save error and the still-active old session.
+            }
+            throw error;
+        }
+        savedPrefsRef.current = prefs;
         // A picker-owned provider/model change is one state transition. Clear the
         // old model's effort selection before publishing the replacement session
         // or releasing any paused queue. Failed and superseded candidates returned
@@ -1605,13 +1744,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         void previousSessionRef.current?.close();
         previousSessionRef.current = s;
         setSession(s);
-        setUserCommands(discoverUserCommands({
-            cwd: activeCtx.cwd,
-            // Builtins are reserved: a `help.md` must not take over `/help`.
-            // Passing the names here is what lets the loader tell its author
-            // the file is shadowed instead of leaving it silently unused.
-            reserved: hostCommandNames(),
-        }));
+        setUserCommands(commands);
         const mentionLoadOwner = {};
         mentionLoadOwnerRef.current = mentionLoadOwner;
         void listMentionableFiles(activeCtx.cwd, appLifetime.signal).then((files) => {
@@ -1973,6 +2106,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
     }, [activateTrustedProject, pushMessage, runProbe]);
     const finalized = messages.filter((m) => !m.pending);
+    // Activity and the plan share the terminal with the draft. Collapse the two
+    // lists together only when their full previews would crowd the input area.
+    const fullTaskFurniture = tasks.length === 0 ? 0 : Math.min(tasks.length, 8) + 3;
+    const fullToolFurniture = activeTools.length === 0 ? 0 : Math.min(activeTools.length, 3) * 2 + 2;
+    const compactWork = LIVE_FURNITURE_ROWS + fullTaskFurniture + fullToolFurniture >= terminal.rows;
+    const taskFurniture = compactWork && fullTaskFurniture > 0 ? 2 : fullTaskFurniture;
+    const toolFurniture = compactWork && fullToolFurniture > 0 ? 2 : fullToolFurniture;
     // How much of the transcript is still redrawable. The rest belongs to native
     // terminal scrollback; the live tail stays deliberately small so an activity
     // tick never repaints the whole conversation.
@@ -1984,7 +2124,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         messages: finalized,
         rows: terminal.rows,
         columns: terminal.columns,
-        furnitureRows: LIVE_FURNITURE_ROWS,
+        furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture,
         settled: settledRef.current,
         raw: rawOutput,
     });
@@ -2003,6 +2143,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const hostCommands = mergeHostCommands(kernelCommandDescriptors());
     const slashCtx = {
         cwd: ctx.cwd,
+        jobs: () => session?.jobs?.() ?? [],
+        hooks: () => session?.hooks,
+        directories: () => session?.directories?.list() ?? [],
+        compaction: session
+            ? {
+                strategy: ctx.compaction?.strategy ?? 'salience',
+                softTarget: 0.5,
+                triggerThreshold: 0.7,
+                ...compactionTally,
+            }
+            : null,
         builtins: hostCommands,
         lastAssistantMessageId: () => lastAssistantMessage.current?.messageId ?? null,
         // Called when `/tools` renders, not read here — the same shape, and the
@@ -2081,6 +2232,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         permissionOpenedAtRef.current = null;
         setPermissionReviewOffset(0);
         setPermissionDetailsOpen(false);
+        setPermissionChoice(0);
         setPermission(null);
         if (resolve) {
             // The provider resumes asynchronously after the decision. Leaving the
@@ -2207,6 +2359,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         wakeGoalDriver();
         conversationGenRef.current += 1;
         resetSubagentActivity();
+        session?.resetTaskStore?.();
         activeTurnTokenRef.current = null;
         resetTranscript();
         setMessages(restored);
@@ -2241,6 +2394,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         nextId,
         pushMessage,
         resetSubagentActivity,
+        session,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -2281,6 +2435,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             wakeGoalDriver();
             conversationGenRef.current += 1;
             resetSubagentActivity();
+            session?.resetTaskStore?.();
             activeTurnTokenRef.current = null;
             modelHistoryRef.current = [];
             lastAssistantMessage.current = null;
@@ -2320,6 +2475,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         interruptTurn,
         pushMessage,
         resetSubagentActivity,
+        session,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -2382,9 +2538,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         const scope = scopeRef.current;
         if (!scope || scope.sessionId !== prompt.sessionId) {
-            pushMessage('system', prompt.kind === 'conversation-title'
-                ? 'The conversation changed while its name editor was open. Nothing was renamed; open /rename again.'
-                : 'The conversation changed while its export filename editor was open. Nothing was exported; open /export again.');
+            pushMessage('system', 'The conversation changed while this editor was open. Reopen the command in the current conversation.');
+            return;
+        }
+        if (prompt.kind === 'goal-create' || prompt.kind === 'goal-edit') {
+            if (value.trim())
+                commandPickerSubmitRef.current(`/goal ${prompt.kind === 'goal-create' ? 'set' : 'edit'} ${value.trim()}`);
             return;
         }
         if (prompt.kind === 'export-file') {
@@ -2461,6 +2620,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // is reloaded or reset. Only where the NEXT turn is written changes.
             scope.sessionId = forked.id;
             resetSubagentActivity();
+            session?.resetTaskStore?.();
             goalActivation.clear();
             wakeGoalDriver();
             pushMessage('system', `Forked into "${forked.title}" — ${forked.copied} message(s) copied. This screen continues in the copy; ${original} is unchanged and still in /resume.`);
@@ -2478,6 +2638,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         materializeConversation,
         pushMessage,
         resetSubagentActivity,
+        session,
         wakeGoalDriver,
     ]);
     /** Open the durable prompt picker after the composer's second empty Esc. */
@@ -2502,6 +2663,33 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         editCommittedRef.current = false;
         setPhase('edit');
     }, [hasUnsettledTurn, messages, pushMessage, state]);
+    /** `/restore`: list the file checkpoints, or put the tree back to before a turn. */
+    const doRestore = useCallback(async (turn) => {
+        const store = session?.checkpoints;
+        if (!store) {
+            pushMessage('system', 'This session keeps no file checkpoints.');
+            return;
+        }
+        if (turn === undefined) {
+            pushMessage('system', renderCheckpoints(store.list(), ctxRef.current.cwd));
+            return;
+        }
+        if (abortRef.current || state !== 'idle' || hasUnsettledTurn()) {
+            pushMessage('system', 'A turn is still running. Wait for it, or interrupt it, before restoring files.');
+            return;
+        }
+        try {
+            const report = await store.restore(turn);
+            const text = renderRestore(report, ctxRef.current.cwd);
+            pushMessage('system', text);
+            // The model's picture of those files is now wrong; it reads
+            // this before its next turn.
+            operatorShellRef.current.push(`/restore ${turn}\n${text}`);
+        }
+        catch (err) {
+            pushMessage('system', err instanceof Error ? err.message : String(err));
+        }
+    }, [hasUnsettledTurn, pushMessage, session, state]);
     /** Fork before the selected prompt, then reopen that prompt in the composer. */
     const confirmPromptEdit = useCallback(async (target) => {
         if (editCommittedRef.current || conversationMutationRef.current)
@@ -2536,6 +2724,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 .map((prompt) => prompt.displayText);
             conversationGenRef.current += 1;
             resetSubagentActivity();
+            session?.resetTaskStore?.();
             activeTurnTokenRef.current = null;
             goalActivation.clear();
             wakeGoalDriver();
@@ -2577,6 +2766,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         nextId,
         pushMessage,
         resetSubagentActivity,
+        session,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -2654,6 +2844,20 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 st.assistantId = null;
             }
         };
+        if (event.kind !== 'usage' && 'budget' in event && event.budget) {
+            const budget = event.budget;
+            const own = st.lastUsage;
+            setUsage((previous) => ({
+                totalTokens: budget.ownTokens,
+                budget,
+                cost: {
+                    ...(own?.cost ?? { totalCost: 0, cacheDiscount: 0, unpricedTokens: 0 }),
+                    unpricedTokens: (own?.cost.unpricedTokens ?? 0) +
+                        Math.max(0, budget.ownTokens - (own?.totalTokens ?? 0)),
+                },
+                ...(own && previous?.context ? { context: previous.context } : {}),
+            }));
+        }
         switch (event.kind) {
             case 'delta': {
                 setState('thinking');
@@ -2668,6 +2872,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 // turn: the wait before the first token is the model's, and
                 // counting it would release the opening sentence on arrival.
                 st.releasedAt ??= Date.now();
+                setThinking(null);
                 st.text += event.text;
                 // Held, not appended. Appending each delta is what produced text
                 // that types itself out — nothing animates it, but a few
@@ -2697,6 +2902,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
             case 'tool-start': {
                 closeAssistant();
+                setThinking(null);
                 setState('tool');
                 const tool = {
                     id: event.toolUseId,
@@ -2771,8 +2977,36 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 break;
             }
             case 'usage':
-                setUsage({ totalTokens: event.totalTokens, cost: event.cost });
+                st.lastUsage = event;
+                setUsage({
+                    totalTokens: event.totalTokens,
+                    ...(event.budget ? { budget: event.budget } : {}),
+                    cost: event.cost,
+                    ...(event.contextTokens !== undefined && event.contextWindowTokens !== undefined
+                        ? {
+                            context: {
+                                tokens: event.contextTokens,
+                                windowTokens: event.contextWindowTokens,
+                                measured: event.contextMeasuredBy === 'provider',
+                                windowAssumed: event.windowSource !== 'provider' && event.windowSource !== 'config',
+                            },
+                        }
+                        : {}),
+                });
                 break;
+            case 'reasoning': {
+                if (event.done)
+                    break;
+                setState('thinking');
+                // The last line only, bounded: a screen-wide row that changes as
+                // the model writes is a spinner with words, not a transcript.
+                setThinking((prev) => {
+                    const joined = `${prev ?? ''}${event.text}`;
+                    const lastLine = joined.slice(joined.lastIndexOf('\n') + 1);
+                    return lastLine.length > 160 ? `…${lastLine.slice(-159)}` : lastLine;
+                });
+                break;
+            }
             case 'task': {
                 // The live list gets every change; the transcript records the
                 // opening and the close, as it did before the list existed.
@@ -2801,6 +3035,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 break;
             }
+            case 'job':
+                // The kernel saw it end during a turn; the model reads the notice
+                // on its next tool result, the operator reads this row.
+                pushMessage('system', describeJobExit(event), false, '⚙');
+                break;
             case 'context':
                 // Into the TRANSCRIPT, not a status line. A status indicator is
                 // present while nothing is happening and gone afterwards, so
@@ -2808,6 +3047,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 // looking at was compacted. The event is a fact about the
                 // conversation and belongs in its record.
                 pushMessage('system', event.text, false, event.shed ? '⌫' : '⌦');
+                if (event.shed) {
+                    setCompactionTally((tally) => ({
+                        passes: tally.passes + 1,
+                        clearedResults: tally.clearedResults + (event.cleared ?? 0),
+                        stubbedNarrations: tally.stubbedNarrations + (event.stubbed ?? 0),
+                        summaries: tally.summaries + (event.summarised ? 1 : 0),
+                        reclaimedTokens: tally.reclaimedTokens + (event.reclaimedTokens ?? 0),
+                    }));
+                }
                 break;
             case 'provider-fallback':
                 // The transcript, for the reason compaction is in the transcript
@@ -2986,6 +3234,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const stillHere = () => conversationGenRef.current === turnGeneration;
         let inboxOpen = true;
         const inboxEntries = [];
+        const inputWaiters = new Set();
         const inbox = {
             accept(input) {
                 if (!inboxOpen ||
@@ -2996,8 +3245,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 ||
@@ -3025,6 +3298,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             },
             close() {
                 inboxOpen = false;
+                for (const wake of [...inputWaiters])
+                    wake();
                 return inboxEntries.splice(0, inboxEntries.length);
             },
         };
@@ -3094,7 +3369,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     onPermission: askPermission,
                     onQuestion: askQuestion,
                     inboundMessages: () => inbox.drain(),
-                    extraSystem: composeSkillsPrompt(activeSkills) ?? undefined,
+                    waitForInbound: (signal) => inbox.waitForInbound(signal),
+                    extraSystem: [composeSkillsPrompt(activeSkills), drainIdleJobNotices(), drainOperatorShell()]
+                        .filter((part) => Boolean(part))
+                        .join('\n\n') || undefined,
                     onConversationMessages: (messages) => {
                         // State-only: opaque reasoning/signatures must reach the next
                         // provider and durable store without becoming transcript text.
@@ -3312,6 +3590,41 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         setHistory((prev) => [...prev, value]);
+        // `#` 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}`);
+            }
+            catch (err) {
+                pushMessage('system', `Could not save memory: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            return;
+        }
+        const escaped = shellEscapeCommand(value);
+        if (escaped !== null) {
+            pushMessage('user', value);
+            const rowId = pushMessage('tool', `! ${escaped}`, true, '…');
+            void runShellEscape(escaped, { cwd: ctx.cwd }).then((result) => {
+                operatorShellRef.current.push(describeShellEscapeForModel(escaped, result));
+                const ok = result.exitCode === 0 && !result.timedOut;
+                const detail = result.output.length > 0 ? result.output.replace(/\n$/u, '').split('\n') : undefined;
+                setMessages((prev) => prev.map((m) => m.id === rowId
+                    ? {
+                        ...m,
+                        content: describeShellEscape(escaped, result),
+                        pending: false,
+                        glyph: ok ? '✓' : '✗',
+                        ...(ok ? {} : { glyphColor: theme.status.error }),
+                        ...(detail ? { detail } : {}),
+                    }
+                    : m));
+            });
+            return;
+        }
         // What actually gets sent. A `prompt` action replaces it with text the
         // command composed, and then takes the ordinary send path below —
         // including the queue — so a command-driven turn is not a second way
@@ -3339,6 +3652,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                             description: command.problem
                                 ? `Unavailable: ${command.problem}`
                                 : command.description,
+                            disabledReason: command.problem,
                         })),
                         windowSize: suggestionWindowSize(terminal.rows),
                     });
@@ -3346,10 +3660,160 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 case 'agent-cockpit': {
                     if (!openAgentCockpit()) {
-                        pushMessage('system', 'No delegated agents are active. When an Agent tool starts one, its live activity appears below the composer and this view can inspect it.');
+                        pushMessage('system', `No delegated agents in this conversation.${session?.agentIds.length ? `\nAvailable: ${session.agentIds.join(', ')}` : '\nNo agents are configured.'}`);
                     }
                     return;
                 }
+                case 'settings-picker': {
+                    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.' }
+                                : {}),
+                        },
+                        {
+                            name: 'permissions',
+                            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.',
+                        },
+                    ];
+                    setSelectedChoice(0);
+                    setChoicePicker({
+                        kind: 'command',
+                        title: 'Settings',
+                        notice: 'Select a setting to view or change it.',
+                        values: commands,
+                        options: commands.map((command) => ({
+                            label: command.label,
+                            description: command.description,
+                            disabledReason: command.problem,
+                        })),
+                        windowSize: 7,
+                    });
+                    return;
+                }
+                case 'goal-editor': {
+                    const scope = scopeRef.current;
+                    if (!scope || !sessionsRef.current) {
+                        pushMessage('system', 'Goals require conversation history to be available.');
+                        return;
+                    }
+                    textPromptTokenRef.current += 1;
+                    setTextPrompt({
+                        token: textPromptTokenRef.current,
+                        kind: slash.edit ? 'goal-edit' : 'goal-create',
+                        title: slash.edit ? 'Edit goal' : 'Set a goal',
+                        placeholder: `Up to ${goalStatus?.maxGoalRounds ?? DEFAULT_MAX_GOAL_ROUNDS} automatic turns; /goal pause stops continuation.`,
+                        emptyNotice: 'Describe the result you want, or press Esc to cancel.',
+                        initialValue: slash.edit ? (goalStatus?.objective ?? '') : '',
+                        sessionId: scope.sessionId,
+                    });
+                    return;
+                }
+                case 'goal-picker': {
+                    const generation = conversationGenRef.current;
+                    const request = {};
+                    setSelectedChoice(-1);
+                    setChoicePicker({
+                        kind: 'command',
+                        title: 'Goal',
+                        notice: 'Loading goal…',
+                        values: [],
+                        options: [],
+                        windowSize: 7,
+                        request,
+                    });
+                    void (async () => {
+                        try {
+                            const sessions = sessionsRef.current;
+                            const scope = scopeRef.current;
+                            if (!sessions || !scope) {
+                                setChoicePicker(null);
+                                pushMessage('system', 'Goals require conversation history to be available.');
+                                return;
+                            }
+                            const goal = conversationMaterializedRef.current
+                                ? await sessions.goals.getGoal(scope.sessionId, sessions.tenantId)
+                                : null;
+                            if (appLifetime.signal.aborted ||
+                                conversationGenRef.current !== generation ||
+                                choicePickerRef.current?.request !== request)
+                                return;
+                            setGoalStatus(goal);
+                            const commands = goal
+                                ? [
+                                    {
+                                        name: 'goal status',
+                                        description: 'View goal progress and continuation status.',
+                                    },
+                                    { name: 'goal edit', description: 'Change the objective.' },
+                                    ...(goal.phase === 'complete'
+                                        ? []
+                                        : [
+                                            goal.phase === 'active' && goalActivation.isArmed(scope.sessionId, goal)
+                                                ? {
+                                                    name: 'goal pause',
+                                                    description: 'Stop automatic continuation after the current turn.',
+                                                }
+                                                : {
+                                                    name: 'goal resume',
+                                                    description: 'Continue working automatically toward this goal.',
+                                                },
+                                        ]),
+                                    {
+                                        name: 'goal clear',
+                                        description: 'Remove this goal and stop its automatic continuation.',
+                                    },
+                                ]
+                                : [
+                                    {
+                                        name: 'goal set',
+                                        description: 'Set an objective and start automatic continuation.',
+                                    },
+                                ];
+                            setSelectedChoice(0);
+                            setChoicePicker({
+                                kind: 'command',
+                                back: choicePickerRef.current?.back,
+                                title: 'Goal',
+                                notice: goal
+                                    ? `${goal.phase} · ${goal.roundsAdmitted}/${goal.maxGoalRounds} automatic turns · ${goal.objective}`
+                                    : `No goal set for this conversation. Up to ${DEFAULT_MAX_GOAL_ROUNDS} automatic turns when started.`,
+                                values: commands,
+                                options: commands.map((command) => ({
+                                    label: `/${command.name}`,
+                                    description: command.description,
+                                })),
+                                windowSize: 7,
+                            });
+                        }
+                        catch (error) {
+                            if (!appLifetime.signal.aborted &&
+                                conversationGenRef.current === generation &&
+                                choicePickerRef.current?.request === request) {
+                                setChoicePicker(null);
+                                pushMessage('system', `Could not load goal: ${error instanceof Error ? error.message : String(error)}`);
+                            }
+                        }
+                        finally {
+                            wakeGoalDriver();
+                        }
+                    })();
+                    return;
+                }
                 case 'clear-screen':
                     setMessages([]);
                     resetTranscript();
@@ -3419,7 +3883,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     setKeyEntryFor(null);
                     setPickerDetected(null);
                     setPickerSelectionKind('provider-and-model');
-                    setPickerInitialView('providers');
+                    setPickerInitialView('models');
                     setPhase('picker');
                     return;
                 case 'permission-mode': {
@@ -3428,7 +3892,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' ||
@@ -3438,22 +3902,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': {
@@ -3486,6 +3942,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                             label: effort ?? 'default',
                             description: reasoningEffortDescription(effort),
                             current: effort === current,
+                            default: effort === undefined,
                         })),
                     });
                     return;
@@ -3527,16 +3984,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 case 'remember':
                     try {
-                        appendMemory(slash.text);
-                        pushMessage('system', `Remembered: ${slash.text}`);
+                        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}`);
                     }
                     catch (err) {
                         pushMessage('system', `Could not save memory: ${err instanceof Error ? err.message : String(err)}`);
                     }
                     return;
                 case 'show-memory': {
-                    const mem = composeMemoryPrompt(readMemory());
-                    pushMessage('system', mem ?? 'Nothing remembered yet. Use /remember <text>, or edit ~/.namzu/MEMORY.md.');
+                    pushMessage('system', renderMemoryReport(readMemory(undefined, ctx.cwd), { cwd: ctx.cwd }));
                     return;
                 }
                 case 'list-skills': {
@@ -3595,79 +4051,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 case 'fork':
                     void doFork();
                     return;
-                case 'expand': {
-                    // Resolved INSIDE the updater, against `prev`.
-                    //
-                    // Not against the `messages` this callback captured: rows arrive
-                    // from `applyEvent` while a turn runs, which is exactly when
-                    // someone types `/expand`, and a captured array can be a render
-                    // behind — so "the most recent one" would sometimes mean the one
-                    // before it, and the command would quietly show the wrong output.
-                    // `prev` is by definition the latest.
-                    //
-                    // And against the ROWS, not a parallel index of them. An earlier
-                    // draft kept a ref mirroring `{ref, label, lines}` alongside the
-                    // rows that already hold all three. That is one concept in two
-                    // shapes with a hand-written copy between them — the geometry
-                    // `docs/conventions/one-site-is-not-every-site.md` names as the
-                    // hardest kind to spot, adopted here to solve a staleness problem
-                    // the updater solves without it.
-                    //
-                    // The id is taken outside so both branches use the same one.
-                    const id = nextId();
-                    setMessages((prev) => {
-                        const blocks = prev.filter((m) => m.detailRef !== undefined);
-                        const say = (content) => ({
-                            id,
-                            role: 'system',
-                            content,
-                        });
-                        if (blocks.length === 0) {
-                            return [
-                                ...prev,
-                                say('Nothing to expand yet. Tool output longer than six lines collapses with a "… +N lines · /expand n" hint, and that number is what this takes.'),
-                            ];
-                        }
-                        const block = slash.which === 'last'
-                            ? blocks[blocks.length - 1]
-                            : blocks.find((m) => m.detailRef === slash.which);
-                        if (!block) {
-                            // Names the range rather than only refusing: the operator's
-                            // next move is to type a different number, and they should
-                            // not have to guess which ones exist.
-                            return [
-                                ...prev,
-                                say(`No collapsed output numbered ${slash.which}. This conversation has ${blocks.length === 1
-                                    ? 'one, numbered 1'
-                                    : `${blocks.length}, numbered 1 to ${blocks.length}`}.`),
-                            ];
-                        }
-                        // A NEW row carrying the same lines, flagged to print them all.
-                        // Not a mutation of the row that collapsed them: that row was
-                        // handed to <Static>, which emits an item once and calls the
-                        // render function only for items it has not emitted yet, so
-                        // nothing decided now can reach it. Appending is the only
-                        // expansion this architecture has.
-                        //
-                        // The lines travel as `detail` rather than flattened into the
-                        // content so the `▏` rule and the +/- diff colouring survive.
-                        // An expansion that showed LESS than the collapsed form would
-                        // be a strange thing to have asked for.
-                        //
-                        // It carries no `detailRef` of its own: it is already in full,
-                        // so there is nothing for a number to offer, and giving it one
-                        // would let `/expand` produce a third copy of the same output.
-                        return [
-                            ...prev,
-                            {
-                                id,
-                                role: 'system',
-                                content: `${block.content} — in full (${block.detail?.length ?? 0} lines)`,
-                                glyph: '⤢',
-                                detail: block.detail,
-                                detailExpanded: true,
-                            },
-                        ];
+                case 'restore':
+                    void doRestore(slash.turn);
+                    return;
+                case 'add-dir': {
+                    const dirs = session?.directories;
+                    if (!dirs) {
+                        pushMessage('system', 'No session yet; /add-dir works once one has started.');
+                        return;
+                    }
+                    void dirs.add(slash.path).then((result) => {
+                        pushMessage('system', result.added
+                            ? `Added ${result.path}. The file tools reach it by absolute path from the next turn; a sandboxed run binds it read-write.`
+                            : `Not added: ${result.path} — ${result.reason ?? 'refused'}`);
                     });
                     return;
                 }
@@ -3702,9 +4098,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 await materializeConversation();
                             const durableSessions = sessionsRef.current;
                             const runScope = scopeRef.current;
+                            const taskStore = slash.name === 'tasks' ? session?.currentTaskStore?.() : undefined;
+                            if (slash.name === 'tasks' && !taskStore) {
+                                pushMessage('system', session?.currentTaskStore
+                                    ? 'No task list is available yet for this conversation.'
+                                    : 'Task listing is unavailable in this session.');
+                                return;
+                            }
                             const registry = new HostCommandRegistry();
                             registry.register(kernelHostCommands({
                                 allowedAgentIds: session?.agentIds ?? [],
+                                ...(taskStore ? { taskStore } : {}),
                                 ...(durableSessions && runScope && conversationMaterializedRef.current
                                     ? {
                                         goal: {
@@ -4004,11 +4408,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         advanceQueueContinuation,
         applyPermissionMode,
         applyReasoningEffort,
+        appLifetime,
         ctx.cwd,
         doResume,
         enqueueQueued,
         exitWithSummary,
         hasUnsettledTurn,
+        goalActivation,
+        goalStatus,
+        hostCommands,
         nextId,
         openAgentCockpit,
         pushMessage,
@@ -4016,6 +4424,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         removeStoredCredential,
         resetTranscript,
         runConversationExport,
+        session,
         setChoicePicker,
         setCopyPicker,
         setReasoningEffort,
@@ -4224,9 +4633,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pushMessage('system', `⬆ Update available:\n${lines.join('\n')}`);
         });
     }, [phase, ctx.version, pushMessage]);
-    const hydrateFromPicker = useCallback(async (prefs, detectedNow, signal, revealAllOnFailure = false) => {
+    const hydrateFromPicker = useCallback(async (prefs, detectedNow, signal, options = {}) => {
         try {
-            await hydrateSession(prefs, detectedNow, signal);
+            await hydrateSession(prefs, detectedNow, signal, options.persistSelection);
         }
         catch (err) {
             // A superseded choice no longer owns even its failure message. Its
@@ -4234,7 +4643,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // choice stays on the picker with the actionable construction error.
             if (signal.aborted)
                 return;
-            if (revealAllOnFailure) {
+            if (options.revealAllOnFailure) {
                 setPickerDetected(null);
                 setPickerSelectionKind('provider-and-model');
                 setPickerInitialView('providers');
@@ -4259,48 +4668,29 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setPickerNotice(null);
         // The disposition, not the key. `credential` never reaches a message.
         pushMessage('system', disposition);
-        // The SAVED chain when the credential is for the provider that was
-        // already chosen, and a fresh one-member chain otherwise. Rebuilding
-        // from the id alone would have been a quiet demotion in the one case
-        // this routing creates: an operator whose file pins a model, and whose
-        // only problem was a missing secret, would have been moved onto the
-        // registry default for supplying it.
+        // Supplying a credential changes the primary's access, not unrelated
+        // fallbacks, model pins, delegation or capability preferences.
         const saved = savedPrefsRef.current;
         const prefs = saved && primaryProvider(saved).id === credential.entry.id
             ? saved
-            : {
-                version: 3,
-                providers: [{ id: credential.entry.id }],
-                subagents: { active: [] },
-            };
+            : selectPrimaryProvider(saved, { id: credential.entry.id });
         void hydrateFromPicker(prefs, next, signal);
     }, [detected, hydrateFromPicker, pushMessage]);
     const handlePickerSubmit = useCallback((selection, signal) => {
-        // One member for now. The picker builds a longer chain in a later
-        // change; the shape it writes into is already the chain.
-        const prefs = {
-            version: 3,
-            providers: [
-                {
-                    id: selection.provider,
-                    ...(selection.model !== undefined ? { model: selection.model } : {}),
-                },
-            ],
-            subagents: { active: [] },
-        };
+        const prefs = selectPrimaryProvider(savedPrefsRef.current, {
+            id: selection.provider,
+            ...(selection.model !== undefined ? { model: selection.model } : {}),
+        });
         setKeyEntryFor(null);
         setPickerNotice(null);
-        try {
-            writePreferences(prefs);
-        }
-        catch (err) {
-            pushMessage('system', `Could not save preferences: ${err instanceof Error ? err.message : String(err)}`);
-            return;
-        }
         // Keep a narrowed signed-in roster stable while construction is pending.
         // Only a real refusal broadens back to the general, sign-in-capable picker.
-        void hydrateFromPicker(prefs, detected, signal, true);
-    }, [detected, hydrateFromPicker, pushMessage]);
+        void hydrateFromPicker(prefs, detected, signal, {
+            revealAllOnFailure: true,
+            persistSelection: detected.find((provider) => provider.entry.id === selection.provider)?.source.kind !==
+                'session',
+        });
+    }, [detected, hydrateFromPicker]);
     /**
      * Leaving the picker returns to whatever was on screen before it.
      *
@@ -4330,6 +4720,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         exitWithSummary();
     }, [session, exitWithSummary]);
     useInput((input, key) => {
+        // 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') {
+            if (key.escape || (key.ctrl && input === 'c'))
+                exitWithSummary();
+            return;
+        }
         // The provider picker owns its own keyboard — arrows, digits, enter,
         // esc and the typed-key screen are all its business. Ctrl+C is not: it
         // is the one key that must work on every screen, and this handler used
@@ -4347,12 +4744,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 exitWithSummary();
             return;
         }
-        // Previous-prompt picker owns the keyboard. Esc keeps stepping toward
-        // older prompts, matching the second Esc that opened it; q is the cancel.
+        // Previous-prompt picker uses the same cancel key as other selectors.
         if (phase === 'edit') {
             if (editCommittedRef.current)
                 return;
-            if ((key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
+            if (key.escape || (key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
                 setEditList([]);
                 setPhase('ready');
                 return;
@@ -4361,7 +4757,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 setSelectedEdit((index) => moveSelection(index, editList.length, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page'));
                 return;
             }
-            if (key.escape || key.leftArrow || key.upArrow) {
+            if (key.leftArrow || key.upArrow) {
                 setSelectedEdit((index) => moveSelection(index, editList.length, 'previous'));
                 return;
             }
@@ -4435,25 +4831,27 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 setPermissionDetailsOpen(!permissionDetailsOpenRef.current);
                 return;
             }
-            if (permission &&
-                (key.upArrow || key.downArrow || key.pageUp || key.pageDown || key.home || key.end)) {
+            if (permission && (key.upArrow || key.downArrow)) {
+                const current = permissionChoiceRef.current;
+                const next = key.upArrow ? Math.max(0, current - 1) : Math.min(2, current + 1);
+                setPermissionChoice(next);
+                return;
+            }
+            if (permission && (key.pageUp || key.pageDown || key.home || key.end)) {
                 const source = permissionDetailsOpenRef.current
                     ? permission.review
                     : permission.summary.text;
                 const count = permissionReviewRows(source, terminal.columns).length;
-                const maxOffset = Math.max(0, count - PERMISSION_REVIEW_PAGE_ROWS);
+                const pageRows = permissionReviewPageRows(terminal.rows);
+                const maxOffset = Math.max(0, count - pageRows);
                 const current = Math.min(permissionReviewOffsetRef.current, maxOffset);
                 const next = key.home
                     ? 0
                     : key.end
                         ? maxOffset
                         : key.pageUp
-                            ? Math.max(0, current - PERMISSION_REVIEW_PAGE_ROWS)
-                            : key.pageDown
-                                ? Math.min(maxOffset, current + PERMISSION_REVIEW_PAGE_ROWS)
-                                : key.upArrow
-                                    ? Math.max(0, current - 1)
-                                    : Math.min(maxOffset, current + 1);
+                            ? Math.max(0, current - pageRows)
+                            : Math.min(maxOffset, current + pageRows);
                 setPermissionReviewOffset(next);
                 return;
             }
@@ -4468,18 +4866,21 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 resolvePermission({ kind: 'reject' });
                 return;
             }
-            // Enter is deliberately NOT an approval. It is the key people press
-            // to dismiss a thing that appeared, it is the key already in flight
-            // when a turn's follow-up was being typed, and it is named nowhere
-            // on this prompt — so reading it as consent approves a tool call the
-            // operator never looked at. `y` and `a` are the only approvals, and
-            // they must arrive after the prompt has been up long enough to read.
+            // Every approval waits out the settle window: `y`, `a`, a digit and
+            // Enter alike. Enter confirms the answer the cursor is on, which
+            // opens on "Yes" — the prompt an operator knows from elsewhere — so
+            // the window is what stands between an in-flight Enter and a call
+            // the operator never looked at. Refusals above never wait.
             if (!approvalIsDeliberate(permissionOpenedAtRef.current, Date.now()))
                 return;
-            if (ch === 'y')
+            const numbered = ch === '1' ? 0 : ch === '2' ? 1 : ch === '3' ? 2 : null;
+            const chosen = key.return ? permissionChoiceRef.current : numbered;
+            if (ch === 'y' || chosen === 0)
                 resolvePermission({ kind: 'approve' });
-            else if (ch === 'a')
+            else if (ch === 'a' || chosen === 1)
                 resolvePermission({ kind: 'approve-all' });
+            else if (chosen === 2)
+                resolvePermission({ kind: 'reject' });
             return;
         }
         // The active child count already advertises this key beside Working.
@@ -4502,7 +4903,7 @@ 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 phaseIndex = Math.max(0, phases.findIndex((phase) => phase.id === agentView.selectedPhaseId));
@@ -4629,10 +5030,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // menu. Only the exact object React committed may consume a choice.
             if (choicePickerCommittedRef.current !== picker)
                 return;
-            const options = picker.options;
+            const searchable = choicePickerSearchable(picker);
+            const options = filterChoiceOptions(picker.options, choiceQueryRef.current);
+            const applyVisibleChoice = (index) => {
+                const option = options[index];
+                if (option)
+                    applyChoiceSelection(picker.options.indexOf(option));
+            };
             if (key.escape || (key.ctrl && input === 'c')) {
                 reviewChoiceInFlightRef.current = null;
-                setChoicePicker(null);
+                setSelectedChoice(0);
+                setChoicePicker(key.escape ? (picker.back ?? null) : null);
                 // Esc leaves the question unanswered and the turn running; the
                 // tool tells the model so. Ctrl+C is the operator saying stop.
                 if (picker.kind === 'user-question') {
@@ -4641,26 +5049,42 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             }
             if (key.home || key.end || key.pageUp || key.pageDown) {
-                const pageSize = picker.kind === 'command' ? picker.windowSize : undefined;
-                setSelectedChoice((index) => moveSelection(index, options.length, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page', pageSize));
+                const pageSize = choicePickerWindowSize({
+                    rows: terminal.rows,
+                    columns: Math.max(1, (terminal.columns ?? 80) - 2),
+                    searchable,
+                    notice: Boolean(picker.notice),
+                    selectedDescription: options.some((option) => Boolean(option.selectedDescription || option.disabledReason)),
+                    windowSize: picker.kind === 'command' ? picker.windowSize : undefined,
+                });
+                setSelectedChoice((index) => moveChoiceSelection(options, index, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page', pageSize));
                 return;
             }
             if (key.upArrow) {
-                setSelectedChoice((index) => moveSelection(index, options.length, 'previous'));
+                setSelectedChoice((index) => moveChoiceSelection(options, index, 'previous'));
                 return;
             }
             if (key.downArrow) {
-                setSelectedChoice((index) => moveSelection(index, options.length, 'next'));
+                setSelectedChoice((index) => moveChoiceSelection(options, index, 'next'));
                 return;
             }
             if (key.return) {
-                applyChoiceSelection(selectedChoiceRef.current);
+                applyVisibleChoice(selectedChoiceRef.current);
+                return;
+            }
+            if (searchable && !key.ctrl && !key.meta && (key.backspace || key.delete || input)) {
+                const next = key.backspace || key.delete
+                    ? eraseLastChoiceGrapheme(choiceQueryRef.current)
+                    : choiceQueryRef.current + input.replace(/\p{Cc}/gu, '');
+                choiceQueryRef.current = next;
+                setChoiceQuery(next);
+                setSelectedChoice(moveChoiceSelection(filterChoiceOptions(picker.options, next), 0, 'first'));
                 return;
             }
             if (/^[1-9]$/.test(input)) {
                 const index = Number(input) - 1;
                 if (options[index])
-                    applyChoiceSelection(index);
+                    applyVisibleChoice(index);
             }
             return;
         }
@@ -4739,19 +5163,36 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // in place and sometimes prints a second copy further down would be two
         // commands wearing one name.
         if (key.ctrl && input === 'o') {
-            // Taken outside the updater so both branches use the same one, as
-            // `/expand` does.
+            // 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: 'Nothing on screen can be expanded in place. Only the last few rows stay redrawable; anything older has been printed to the terminal’s own scrollback, which cannot be rewritten. Use /expand <n> for those — the number is in the hint under each collapsed body, and /expand on its own takes the most recent.',
+                            content: `${block.content} — in full (${block.detail?.length ?? 0} lines)`,
+                            glyph: '⤢',
+                            detail: block.detail,
+                            detailExpanded: true,
                         },
                     ];
                 }
@@ -4803,7 +5244,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' ||
@@ -4840,21 +5281,30 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 : agentSurface?.kind === 'transcript'
                                     ? 'observing agent — esc agents · q parent'
                                     : textPrompt
-                                        ? 'name editor open — enter save · esc cancel'
+                                        ? 'editor open · enter apply · esc cancel'
                                         : choicePicker
-                                            ? 'choice open — ↑↓ / 1–9 select · enter apply · esc cancel'
+                                            ? choicePickerSearchable(choicePicker)
+                                                ? 'type to filter · ↑↓ select · enter apply · esc back'
+                                                : '↑↓ / 1–9 select · enter apply · esc back'
                                             : copyPicker
                                                 ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
                                                 : 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: [transcriptOwned || !lifecycleOwnsViewport ? (_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: renderedSettled, resetKey: resetKey, raw: rawOutput, hyperlinks: hyperlinks, showLive: !lifecycleOwnsViewport, header: transcriptOwned ? (_jsx(Banner, { version: ctx.version, session: session, permissionMode: permissionMode, cwd: ctx.cwd })) : undefined }) })) : null, phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'resume' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume })) : phase === 'edit' ? (_jsx(EditPromptPicker, { prompts: editList, selected: selectedEdit })) : phase === 'picker' ? (_jsx(Picker, { detected: pickerDetected ?? detected, currentProvider: currentProvider, selectionKind: pickerSelectionKind, currentModel: session?.modelSummary ?? null, initialView: pickerInitialView, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [agentSurface === null ? (_jsx(LiveActivity, { activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true })) : null, agentSurface === null && permission === null ? _jsx(TaskList, { tasks: tasks }) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, columns: terminal.columns })) : 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, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && agentSurface === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
-                                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, 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' &&
+                                state !== 'awaiting-permission' &&
+                                !compacting &&
+                                externalEditorRequest === null &&
                                 conversationMutation === null &&
                                 textPrompt === null &&
                                 choicePicker === null &&
                                 copyPicker === null &&
-                                agentSurface === null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, children: [pendingSteers.length > 0 &&
+                                agentSurface === null, hidden: permission !== null ||
+                                textPrompt !== null ||
+                                choicePicker !== null ||
+                                copyPicker !== null ||
+                                agentSurface?.kind === 'transcript', children: [pendingSteers.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
@@ -4868,7 +5318,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, { permissionMode: displayedPermissionMode, onCycleMode: cyclePermissionMode, disabled: phase !== 'ready' ||
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
@@ -4876,29 +5326,26 @@ 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, 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 }) })] }) }));
+                                    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) => ({
+                                        ...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 }) })] }) }));
 }
-function Banner({ version, session, permissionMode, cwd, }) {
-    const { columns } = useWindowSize();
-    const wide = columns >= NAMZU_WORDMARK_MIN_WIDTH;
-    const provider = session?.providerSummary;
-    const model = session?.modelSummary;
-    const home = process.env.HOME;
-    const prettyCwd = home && cwd.startsWith(home) ? `~${cwd.slice(home.length)}` : cwd;
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingTop: 1, paddingBottom: 1, children: [_jsxs(Box, { flexDirection: "row", children: [wide ? (_jsx(Box, { flexDirection: "column", marginRight: 2, children: NAMZU_WORDMARK.map((line, i) => (_jsx(Text, { color: NAMZU_WORDMARK_GRADIENT[i], bold: true, children: line }, `wm-${i}`))) })) : (_jsxs(Text, { color: NAMZU_MARK_COLOR, children: [NAMZU_MARK, " "] })), _jsxs(Box, { flexDirection: "column", marginTop: wide ? 1 : 0, children: [_jsxs(Text, { children: [_jsx(Text, { color: theme.text.secondary, children: "Cogitave" }), wide ? null : (_jsxs(Text, { color: NAMZU_MARK_COLOR, bold: true, children: [' ', "Namzu"] })), _jsxs(Text, { color: theme.text.muted, children: [" v", version] })] }), _jsx(Text, { color: theme.text.secondary, children: provider ? `${provider}${model ? ` · ${model}` : ''}` : 'the agent in your terminal' }), _jsx(Text, { color: theme.text.muted, children: prettyCwd })] })] }), permissionMode === 'auto' ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.status.error, bold: true, children: "\u26A0 launched in auto permission mode \u2014 undecided tools run without asking until /permissions changes it" }) })) : null] }));
+/** One line for a background job that ended, for the transcript and the next turn. */
+function describeJobExit(job) {
+    const outcome = job.status === 'killed'
+        ? 'was stopped'
+        : `exited ${job.exitCode ?? '?'}${job.signal ? ` (${job.signal})` : ''}`;
+    return `background job ${job.jobId} (${job.command}) ${outcome}`;
 }
 function TranscriptFrame({ children }) {
     // Borderless, edge-to-edge — the message glyph gutter provides structure.
     return _jsx(Box, { flexDirection: "column", children: children });
 }
-function ComposerFrame({ focus, hidden = false, children, }) {
-    // Input-field look: a rounded rule above and below the composer, no side
-    // borders, so the input reads as a field rather than a heavy box.
-    return (_jsx(Box, { flexDirection: "column", ...(hidden ? {} : { borderStyle: 'round' }), borderTop: true, borderBottom: true, borderLeft: false, borderRight: false, borderColor: focus ? theme.border.focus : theme.border.default, marginTop: hidden ? 0 : 1, children: children }));
-}
 // Tool call label: the tool name title-cased, then its most identifying
 // argument — `Bash(ls -la)`, `Read(file.ts)`. A bare tool name in a transcript
 // of forty calls says nothing about which one this was.
@@ -4921,7 +5368,7 @@ hasDraft = false) {
     if (phase === 'resume')
         return '↑↓ navigate · enter resume · esc cancel';
     if (phase === 'edit')
-        return 'Esc / ← older · → newer · enter fork and edit · q cancel';
+        return '← older · → newer · enter fork and edit · esc cancel';
     if (phase === 'probing')
         return 'discovering providers…';
     // Esc does two different things here depending on how the picker was reached,
@@ -4933,11 +5380,11 @@ hasDraft = false) {
             : '↑↓ navigate · enter accept · esc or Ctrl+C exit';
     }
     if (phase === 'unhealthy')
-        return 'Ctrl+C ×2 to exit';
+        return 'esc or Ctrl+C exit';
     // Enter is absent because Enter decides nothing here, deliberately — see the
     // permission gate in the key handler above.
     if (state === 'awaiting-permission')
-        return 'y approve · n / esc reject · a approve all';
+        return '↑↓ select · enter confirm · esc decline';
     if (state !== 'idle')
         return hasDraft ? 'enter steer · tab queue · esc interrupt' : '';
     // The composer already points to /help. Keeping the complete key legend in
@@ -4963,29 +5410,38 @@ function goalStatusLabel(goal) {
 function labelOfOption(question, optionId) {
     return question.options.find((option) => option.id === optionId)?.label ?? optionId;
 }
-function permissionModeDescription(mode) {
-    switch (mode) {
-        case 'prompt':
-            return 'Ask before an undecided tool call runs';
-        case 'accept-edits':
-            return 'Approve file edits and writes without asking; shell and everything else still ask';
-        case 'plan':
-            return 'Read-only: the agent explores and presents a plan; leave plan mode to carry it out';
-        case 'auto':
-            return 'Approve undecided calls unless a rule or safety gate refuses';
-        case 'strict':
-            return 'Refuse undecided calls; explicit allow rules still work';
-    }
+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 reasoningEffortDescription(effort) {
     switch (effort) {