@namzu/cli 15.1.2 → 16.1.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 { DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, RunCancelled, SessionGoalActivation, StaleGoalError, asSessionId, createAssistantMessage, createUserMessage, generateRunId, isCompactionMessage, kernelHostCommands, } from '@namzu/sdk';
+import { 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';
@@ -28,19 +28,18 @@ import { checkUpdates } from '../integrations/updates.js';
 import { appendMemory, composeMemoryPrompt, readMemory } from '../memory/store.js';
 import { composeSkillsPrompt, discoverSkills, loadSkillBody } from '../skills/store.js';
 import { discoverUserCommands } from '../user-commands/store.js';
+import { AgentCockpit, AgentTranscript, agentCockpitIsWide, agentPickerPageSize, agentPhasePageSize, agentPhases, agentTranscriptPageSize, maxAgentTranscriptTailOffset, } from './AgentExplorer.js';
 import { ChoicePicker } from './ChoicePicker.js';
 import { Composer, suggestionWindowSize, } from './Composer.js';
 import { CopyPicker } from './CopyPicker.js';
 import { EditPromptPicker } from './EditPromptPicker.js';
 import { LiveActivity, formatElapsed } from './LiveActivity.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
-import { PERMISSION_REVIEW_PAGE_ROWS, buildPermissionReview, permissionReviewRefusal, permissionReviewRows, } from './permission-review.js';
 import { Picker } from './Picker.js';
 import { ResumePicker } from './ResumePicker.js';
 import { StatusBar } from './StatusBar.js';
 import { TextPrompt } from './TextPrompt.js';
 import { Transcript, willCollapse } from './Transcript.js';
-import { terminalSupportsHyperlinks } from './terminal-hyperlinks.js';
 import { TrustPrompt } from './TrustPrompt.js';
 import { createAgentSession, probeAgentSession, } from './agent.js';
 import { keepRecentRows } from './compact-transcript.js';
@@ -48,18 +47,20 @@ import { approvalIsDeliberate } from './consent-timing.js';
 import { planTurnPublication } from './conversation-history.js';
 import { copyTargetsForResponse } from './copy-targets.js';
 import { editablePrompts } from './edit-prompts.js';
+import { editDraftInExternalEditor } from './external-editor.js';
 import { liveWindow } from './live-window.js';
-import { describeRunInterruption } from './run-interruption.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 { 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 { describeRunInterruption } from './run-interruption.js';
+import { moveSelection } from './selection-window.js';
 import { baseBranchReviewPrompt, commitReviewPrompt, hostCommandNames, kernelCommandDescriptors, mergeHostCommands, renderOutcome, reviewPrompt, runSlash, } from './slashCommands.js';
 import { splitCompleteBlocks } from './stream-blocks.js';
-import { moveSelection } from './selection-window.js';
+import { terminalSupportsHyperlinks } from './terminal-hyperlinks.js';
 import { theme } from './theme.js';
 import { useSelectionIndex } from './use-selection-index.js';
-import { editDraftInExternalEditor } from './external-editor.js';
 import { renderWorkspaceDiff, workspaceDiff } from './workspace-diff.js';
 import { listReviewBranches, listReviewCommits, reviewMergeBase, } from './workspace-review.js';
 /** Last non-empty assistant text in a durable conversation, newest first. */
@@ -293,6 +294,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const [permission, setPermission] = useState(null);
     const [permissionReviewOffset, setPermissionReviewOffsetState] = useState(0);
     const permissionReviewOffsetRef = useRef(0);
+    const [permissionDetailsOpen, setPermissionDetailsOpenState] = useState(false);
+    const permissionDetailsOpenRef = useRef(false);
+    const setPermissionDetailsOpen = useCallback((next) => {
+        permissionDetailsOpenRef.current = next;
+        setPermissionDetailsOpenState(next);
+    }, []);
     const setPermissionReviewOffset = useCallback((next) => {
         permissionReviewOffsetRef.current = next;
         setPermissionReviewOffsetState(next);
@@ -319,10 +326,6 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const [mentionCandidates, setMentionCandidates] = useState([]);
     const mentionLoadOwnerRef = useRef(null);
     const [usage, setUsage] = useState(null);
-    // Context fill, straight from the kernel and held apart from `usage` —
-    // they are different quantities and conflating them is what made the
-    // gauge climb with turn count instead of with context.
-    const [context, setContext] = useState(null);
     // Tools currently executing — rendered live (spinner + elapsed) below the
     // transcript, then committed as static lines on completion.
     const [activeTools, setActiveTools] = useState([]);
@@ -392,11 +395,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     /** `/copy` owns this exact response snapshot until selection or cancellation. */
     const [copyPicker, setCopyPickerState] = useState(null);
     const copyPickerRef = useRef(null);
+    const copyPickerCommittedRef = useRef(null);
     const { selection: selectedCopy, selectionRef: selectedCopyRef, setSelection: setSelectedCopy, } = useSelectionIndex(0);
     const setCopyPicker = useCallback((next) => {
         copyPickerRef.current = next;
+        if (next === null)
+            copyPickerCommittedRef.current = null;
         setCopyPickerState(next);
     }, []);
+    useEffect(() => {
+        copyPickerCommittedRef.current = copyPicker;
+    }, [copyPicker]);
     /** Finite slash-command choice owned synchronously until apply or cancel. */
     const [choicePicker, setChoicePickerState] = useState(null);
     const choicePickerRef = useRef(null);
@@ -426,7 +435,49 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setTextPromptState(next);
     }, []);
     const [composerDraft, setComposerDraft] = useState(null);
+    const [composerHasDraft, setComposerHasDraft] = useState(false);
     const composerDraftTokenRef = useRef(0);
+    /** Bounded child-run projection published by the current AgentSession. */
+    const [subagents, setSubagentsState] = useState([]);
+    const subagentsRef = useRef([]);
+    const [agentSurface, setAgentSurfaceState] = useState(null);
+    const agentSurfaceRef = useRef(null);
+    const agentSurfaceCommittedRef = useRef(null);
+    const setAgentSurface = useCallback((next) => {
+        const wasVisible = agentSurfaceCommittedRef.current !== null;
+        agentSurfaceRef.current = next;
+        if (next === null)
+            agentSurfaceCommittedRef.current = null;
+        // Only opening the surface needs a paint fence. Once the operator has
+        // seen it, navigation may update the state object several times in one
+        // terminal input burst; those updates remain actionable immediately.
+        else if (wasVisible)
+            agentSurfaceCommittedRef.current = next;
+        setAgentSurfaceState(next);
+    }, []);
+    useEffect(() => {
+        agentSurfaceCommittedRef.current = agentSurface;
+    }, [agentSurface]);
+    const replaceSubagents = useCallback((next) => {
+        subagentsRef.current = next;
+        setSubagentsState(next);
+        const surface = agentSurfaceRef.current;
+        if (!surface || next.some((agent) => agent.viewId === surface.selectedId))
+            return;
+        const phases = agentPhases(next);
+        const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? phases[0];
+        const fallbackAgent = fallbackPhase?.agents[0];
+        if (!fallbackPhase || !fallbackAgent) {
+            setAgentSurface(null);
+            return;
+        }
+        setAgentSurface({
+            kind: 'cockpit',
+            selectedPhaseId: fallbackPhase.id,
+            selectedId: fallbackAgent.viewId,
+            focus: surface.kind === 'cockpit' ? surface.focus : surface.returnFocus,
+        });
+    }, [setAgentSurface]);
     /** One git-backed review choice may be resolving while its visible picker remains authoritative. */
     const reviewChoiceInFlightRef = useRef(null);
     const exitArmedRef = useRef(false);
@@ -466,6 +517,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * server's child process outlives the object that opened it.
      */
     const previousSessionRef = useRef(null);
+    useEffect(() => {
+        const source = session?.subagents;
+        setAgentSurface(null);
+        if (!source) {
+            replaceSubagents([]);
+            return;
+        }
+        const refresh = () => replaceSubagents(source.getSnapshot());
+        refresh();
+        return source.subscribe(refresh);
+    }, [replaceSubagents, session, setAgentSurface]);
+    const resetSubagentActivity = useCallback(() => {
+        session?.subagents?.reset();
+        setAgentSurface(null);
+        replaceSubagents([]);
+    }, [replaceSubagents, session, setAgentSurface]);
     // Source of truth for in-flight tools (the event loop runs across renders, so
     // a ref avoids stale state); `activeTools` mirrors it for rendering.
     const activeToolsRef = useRef([]);
@@ -496,9 +563,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // turns attribute to the resumed conversation.
     const sessionsRef = useRef(null);
     const scopeRef = useRef(null);
+    /**
+     * A provider session can be ready before a person has started a conversation.
+     * The scope still needs a mutable session cursor, but its generated id is
+     * provisional until the first admitted prompt or an explicit conversation
+     * operation publishes the durable Session.
+     */
+    const conversationMaterializedRef = useRef(false);
+    const materializationRef = useRef(null);
     const exitWithSummary = useCallback(() => {
         onExitSummary?.({
-            ...(scopeRef.current?.sessionId ? { conversationId: scopeRef.current.sessionId } : {}),
+            ...(conversationMaterializedRef.current && scopeRef.current?.sessionId
+                ? { conversationId: scopeRef.current.sessionId }
+                : {}),
         });
         exit();
     }, [exit, onExitSummary]);
@@ -775,12 +852,21 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         applyReasoningEffort(next);
     }, [applyReasoningEffort, pushMessage, session]);
-    const recordFeedback = useCallback((runIdValue, messageIdValue, rating, note) => {
-        // Written under the same `<cwd>/.namzu` root the runs live in, so a
-        // rating and the transcript it judges travel together.
+    const recordFeedback = useCallback((sessionId, runIdValue, messageIdValue, rating, note) => {
+        const sessions = sessionsRef.current;
+        if (!sessions) {
+            pushMessage('system', 'Could not record feedback: conversation persistence is unavailable.');
+            return;
+        }
+        // Run evidence is session-scoped in the canonical store. The old flat
+        // `<cwd>/.namzu/runs` lookup never existed after the hierarchy migration,
+        // so the feedback store correctly refused every TUI rating as unverifiable.
+        // Bind both trees to the exact conversation captured with the streamed
+        // message; `/resume` may change the active scope before a delayed click.
+        const sessionDir = new DefaultPathBuilder(sessions.root).sessionDir(sessions.projectId, sessionId);
         const store = new DiskMessageFeedbackStore({
-            rootDir: join(ctx.cwd, '.namzu', 'feedback'),
-            runsDir: join(ctx.cwd, '.namzu', 'runs'),
+            rootDir: join(sessionDir, 'feedback'),
+            runsDir: join(sessionDir, 'runs'),
         });
         const runId = runIdValue;
         const messageId = messageIdValue;
@@ -802,7 +888,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 pushMessage('system', `Could not record feedback: ${error instanceof Error ? error.message : String(error)}`);
             }
         })();
-    }, [ctx.cwd, pushMessage]);
+    }, [pushMessage]);
     const activateSkill = useCallback((name) => {
         const info = discoverSkills({ cwd: ctx.cwd }).find((skill) => skill.name === name);
         if (!info) {
@@ -849,8 +935,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         const sessions = sessionsRef.current;
         const sessionId = scopeRef.current?.sessionId;
-        if (!sessions || !sessionId) {
-            pushMessage('system', 'Cannot archive this conversation because durable session persistence is unavailable.');
+        if (!sessions || !sessionId || !conversationMaterializedRef.current) {
+            pushMessage('system', !conversationMaterializedRef.current
+                ? 'There is no conversation to archive yet — send a message first.'
+                : 'Cannot archive this conversation because durable session persistence is unavailable.');
             return;
         }
         if (state !== 'idle' ||
@@ -901,8 +989,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const stableExportSource = useCallback(() => {
         const sessions = sessionsRef.current;
         const sessionId = scopeRef.current?.sessionId;
-        if (!sessions || !sessionId) {
-            pushMessage('system', 'Cannot export this conversation because durable session persistence is unavailable.');
+        if (!sessions || !sessionId || !conversationMaterializedRef.current) {
+            pushMessage('system', !conversationMaterializedRef.current
+                ? 'There is no conversation to export yet — send a message first.'
+                : 'Cannot export this conversation because durable session persistence is unavailable.');
             return null;
         }
         if (abortRef.current ||
@@ -1149,7 +1239,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return;
         }
         if (picker.kind === 'feedback-rating') {
-            recordFeedback(picker.runId, picker.messageId, value);
+            recordFeedback(picker.sessionId, picker.runId, picker.messageId, value);
             return;
         }
         if (picker.kind === 'skill') {
@@ -1268,9 +1358,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     ? { text: persistedOutput, provenance: 'persisted' }
                     : null;
                 initialConversationIdRef.current = undefined;
+                conversationMaterializedRef.current = true;
             }
             else {
-                sessionId = await startConversation(sessions);
+                // Provider/tool startup needs stable project/tenant/topic ids, not a
+                // durable conversation. The cursor is replaced on first admitted use.
+                sessionId = generateSessionId();
             }
             sessionsRef.current = sessions;
             scopeRef.current = {
@@ -1287,6 +1380,45 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             return undefined;
         }
     }, [nextId]);
+    /** Publish the provisional conversation exactly once, at first durable use. */
+    const materializeConversation = useCallback(async () => {
+        const existing = await ensureSessions();
+        if (!existing)
+            return undefined;
+        if (conversationMaterializedRef.current)
+            return existing;
+        if (materializationRef.current)
+            return materializationRef.current;
+        const pending = (async () => {
+            const sessions = sessionsRef.current;
+            const scope = scopeRef.current;
+            if (!sessions || !scope)
+                return undefined;
+            conversationMutationRef.current = 'materialize';
+            try {
+                const sessionId = await startConversation(sessions);
+                if (scopeRef.current !== scope || conversationMaterializedRef.current) {
+                    throw new Error('the active conversation changed while its first session was published');
+                }
+                scope.sessionId = sessionId;
+                conversationMaterializedRef.current = true;
+                return scope;
+            }
+            finally {
+                if (conversationMutationRef.current === 'materialize') {
+                    conversationMutationRef.current = null;
+                }
+            }
+        })();
+        materializationRef.current = pending;
+        try {
+            return await pending;
+        }
+        finally {
+            if (materializationRef.current === pending)
+                materializationRef.current = null;
+        }
+    }, [ensureSessions]);
     const hydrateSession = useCallback(async (prefs, detectedNow, signal) => {
         if (signal?.aborted)
             return;
@@ -1341,8 +1473,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const mentionLoadOwner = {};
         mentionLoadOwnerRef.current = mentionLoadOwner;
         void listMentionableFiles(activeCtx.cwd, appLifetime.signal).then((files) => {
-            if (!appLifetime.signal.aborted &&
-                mentionLoadOwnerRef.current === mentionLoadOwner)
+            if (!appLifetime.signal.aborted && mentionLoadOwnerRef.current === mentionLoadOwner)
                 setMentionCandidates(files);
         });
         setCurrentProvider(primaryProvider(prefs).id);
@@ -1715,7 +1846,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         settled: settledRef.current,
         raw: rawOutput,
     });
-    settledRef.current = window.settled;
+    // A child view is a redrawable overlay above the parent's native scrollback.
+    // Freeze the parent's Static floor while it is open; otherwise a parent turn
+    // settling in the background prints through the child screen. Returning
+    // advances the floor once and emits those finalized rows exactly once.
+    if (agentSurface === null)
+        settledRef.current = window.settled;
+    const renderedSettled = agentSurface === null ? window.settled : settledRef.current;
     // One merged vocabulary for the session: this host's own commands plus
     // whatever the kernel's registry reports. Built here so `/help`, the
     // autocomplete and the dispatcher all answer from the same list — three
@@ -1801,10 +1938,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         permissionResolveRef.current = null;
         permissionOpenedAtRef.current = null;
         setPermissionReviewOffset(0);
+        setPermissionDetailsOpen(false);
         setPermission(null);
         if (resolve)
             resolve(decision);
-    }, [setPermissionReviewOffset]);
+    }, [setPermissionDetailsOpen, setPermissionReviewOffset]);
     /**
      * Stop the running turn, and hand the screen back in a usable state.
      *
@@ -1918,16 +2056,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         goalActivation.clear();
         wakeGoalDriver();
         conversationGenRef.current += 1;
+        resetSubagentActivity();
         activeTurnTokenRef.current = null;
         resetTranscript();
         setMessages(restored);
         modelHistoryRef.current = msgs;
         setHistory((previous) => [...previous, ...promptHistoryFromConversation(msgs)]);
+        // Persisted conversation rows do not carry the live run/message identity
+        // required by feedback validation. Do not leave the answer from the
+        // conversation we just exited as a hidden `/feedback` target.
+        lastAssistantMessage.current = null;
         const persistedOutput = latestAssistantOutput(msgs);
         lastCompletedOutputRef.current = persistedOutput
             ? { text: persistedOutput, provenance: 'persisted' }
             : null;
         scope.sessionId = conv.id; // new turns now attribute to the resumed session
+        conversationMaterializedRef.current = true;
         pushMessage('system', `Resumed: ${conv.title}`);
         if (discardedQueued > 0) {
             pushMessage('system', `Discarded ${discardedQueued} queued prompt${discardedQueued === 1 ? '' : 's'} from the conversation you left.`);
@@ -1946,6 +2090,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         interruptTurn,
         nextId,
         pushMessage,
+        resetSubagentActivity,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -1985,13 +2130,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             goalActivation.clear();
             wakeGoalDriver();
             conversationGenRef.current += 1;
+            resetSubagentActivity();
             activeTurnTokenRef.current = null;
             modelHistoryRef.current = [];
             lastAssistantMessage.current = null;
             lastCompletedOutputRef.current = null;
-            setContext(null);
-            if (sourceScope && targetSessionId)
+            if (sourceScope && targetSessionId) {
                 sourceScope.sessionId = targetSessionId;
+                conversationMaterializedRef.current = true;
+            }
             if (clearScreen) {
                 setMessages([]);
                 resetTranscript();
@@ -2017,7 +2164,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             conversationMutationRef.current = null;
             setConversationMutation(null);
         }
-    }, [discardQueued, goalActivation, interruptTurn, pushMessage, resetTranscript, wakeGoalDriver]);
+    }, [
+        discardQueued,
+        goalActivation,
+        interruptTurn,
+        pushMessage,
+        resetSubagentActivity,
+        resetTranscript,
+        wakeGoalDriver,
+    ]);
     /**
      * `/rename` (and the older `/title` alias): edit or set the name this
      * conversation appears under.
@@ -2027,8 +2182,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * history; it is a session-store operation with the session id captured here.
      */
     const doTitle = useCallback(async (title, clear) => {
-        const sessions = sessionsRef.current ?? (await ensureSessions(), sessionsRef.current);
-        const scope = scopeRef.current;
+        const scope = await materializeConversation();
+        const sessions = sessionsRef.current;
         if (!sessions || !scope) {
             pushMessage('system', 'Conversation history is unavailable in this folder.');
             return;
@@ -2056,7 +2211,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         catch (err) {
             pushMessage('system', `Could not save the name: ${err instanceof Error ? err.message : String(err)}`);
         }
-    }, [ensureSessions, pushMessage, setTextPrompt]);
+    }, [materializeConversation, pushMessage, setTextPrompt]);
     const submitTextPrompt = useCallback((value) => {
         const prompt = textPromptRef.current;
         if (!prompt)
@@ -2124,8 +2279,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         conversationMutationRef.current = 'fork';
         setConversationMutation('fork');
         try {
-            const sessions = sessionsRef.current ?? (await ensureSessions(), sessionsRef.current);
-            const scope = scopeRef.current;
+            const scope = await materializeConversation();
+            const sessions = sessionsRef.current;
             if (!sessions || !scope) {
                 pushMessage('system', 'Conversation history is unavailable in this folder.');
                 return;
@@ -2139,6 +2294,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // The transcript on screen is already the fork's history, so nothing
             // is reloaded or reset. Only where the NEXT turn is written changes.
             scope.sessionId = forked.id;
+            resetSubagentActivity();
             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.`);
@@ -2150,7 +2306,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             conversationMutationRef.current = null;
             setConversationMutation(null);
         }
-    }, [ensureSessions, goalActivation, hasUnsettledTurn, pushMessage, wakeGoalDriver]);
+    }, [
+        goalActivation,
+        hasUnsettledTurn,
+        materializeConversation,
+        pushMessage,
+        resetSubagentActivity,
+        wakeGoalDriver,
+    ]);
     /** Open the durable prompt picker after the composer's second empty Esc. */
     const openPromptEditor = useCallback(() => {
         if (conversationMutationRef.current || compactingRef.current)
@@ -2206,6 +2369,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 .slice(0, target.userOrdinal)
                 .map((prompt) => prompt.displayText);
             conversationGenRef.current += 1;
+            resetSubagentActivity();
             activeTurnTokenRef.current = null;
             goalActivation.clear();
             wakeGoalDriver();
@@ -2246,6 +2410,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         hasUnsettledTurn,
         nextId,
         pushMessage,
+        resetSubagentActivity,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -2259,15 +2424,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 feedback: permissionReviewRefusal(review.reason),
             });
         }
+        const summary = buildPermissionSummary(review.text);
         return new Promise((resolve) => {
             permissionResolveRef.current = resolve;
             permissionOpenedAtRef.current = Date.now();
             setPermissionReviewOffset(0);
-            setPermission({ ...req, review: review.text });
+            setPermissionDetailsOpen(!summary.complete);
+            setPermission({ ...req, review: review.text, summary });
             setState('awaiting-permission');
             sendTerminalNotification({ kind: 'approval-required' });
         });
-    }, [sendTerminalNotification, setPermissionReviewOffset]);
+    }, [sendTerminalNotification, setPermissionDetailsOpen, setPermissionReviewOffset]);
     // Render one agent event onto the transcript. Shared by the local turn loop
     // and the daemon-attach poller, so both paths produce identical output.
     // `st` carries the streaming-assistant bubble id + accumulated text across
@@ -2291,10 +2458,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         switch (event.kind) {
             case 'delta': {
                 setState('thinking');
-                if (event.messageId && event.runId) {
+                if (event.messageId && event.runId && st.sessionId) {
                     lastAssistantMessage.current = {
                         runId: event.runId,
                         messageId: event.messageId,
+                        sessionId: st.sessionId,
                     };
                 }
                 st.text += event.text;
@@ -2368,20 +2536,6 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
             case 'usage':
                 setUsage({ totalTokens: event.totalTokens, cost: event.cost });
-                // Mirrored verbatim, absences included. A run that reports no
-                // window clears the gauge rather than leaving the last one up:
-                // a stale bar is read as current, and this bar's whole defect
-                // was being read as something it was not.
-                setContext({
-                    ...(event.contextTokens !== undefined ? { tokens: event.contextTokens } : {}),
-                    ...(event.contextWindowTokens !== undefined
-                        ? { windowTokens: event.contextWindowTokens }
-                        : {}),
-                    ...(event.contextMeasuredBy !== undefined
-                        ? { measuredBy: event.contextMeasuredBy }
-                        : {}),
-                    ...(event.windowSource !== undefined ? { windowSource: event.windowSource } : {}),
-                });
                 break;
             case 'task':
                 pushMessage('tool', event.subject, false, event.status === 'completed' ? '☑' : '☐');
@@ -2464,13 +2618,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // state idle while the admission read was pending let a second submit
         // start beside it and broke the queue's FIFO ownership.
         setState('thinking');
+        let durableScope;
+        try {
+            durableScope = await materializeConversation();
+        }
+        catch (error) {
+            pushMessage('system', `Conversation persistence could not start: ${error instanceof Error ? error.message : String(error)}. This turn will continue in memory and cannot be resumed.`);
+        }
         // A conversation can be closed outside this App after it was opened or
         // resumed. Re-check at the actual turn boundary, before expanding file
         // mentions, recording run evidence, or creating a provider iterator.
         // The persistence helpers repeat the same check at their own boundary;
         // neither read is claimed to serialize a concurrent archive (that needs
         // a store-level lease shared with ProjectManager).
-        const destination = scopeRef.current?.sessionId ?? null;
+        const destination = conversationMaterializedRef.current
+            ? (durableScope?.sessionId ?? scopeRef.current?.sessionId ?? null)
+            : null;
         const turnSessions = sessionsRef.current;
         if (turnSessions && destination) {
             try {
@@ -2522,6 +2685,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pending: '',
             completed: false,
             outcome: null,
+            sessionId: destination,
             notification: null,
         };
         const ac = new AbortController();
@@ -2848,6 +3012,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         finalizeMessage,
         flushStream,
         goalActivation,
+        materializeConversation,
         onPermission,
         pushMessage,
         replaceQueued,
@@ -2872,7 +3037,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     ? 'branched for prompt editing'
                     : conversationMutationRef.current === 'archive'
                         ? 'archived'
-                        : 'moved to a fresh conversation';
+                        : conversationMutationRef.current === 'materialize'
+                            ? 'initialized'
+                            : 'moved to a fresh conversation';
             pushMessage('system', `Conversation history is being ${operation}. Wait for it to finish before sending another command or prompt.`);
             return;
         }
@@ -2909,6 +3076,24 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     });
                     return;
                 }
+                case 'agent-cockpit': {
+                    const agents = subagentsRef.current;
+                    if (agents.length === 0) {
+                        pushMessage('system', 'No delegated agents are available in this conversation yet. When an Agent tool starts one, /agent opens its live activity and retained transcript.');
+                        return;
+                    }
+                    const firstPhase = agentPhases(agents)[0];
+                    const firstAgent = firstPhase?.agents[0];
+                    if (!firstPhase || !firstAgent)
+                        return;
+                    setAgentSurface({
+                        kind: 'cockpit',
+                        selectedPhaseId: firstPhase.id,
+                        selectedId: firstAgent.viewId,
+                        focus: 'agents',
+                    });
+                    return;
+                }
                 case 'clear-screen':
                     setMessages([]);
                     resetTranscript();
@@ -3243,29 +3428,46 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     // THIS session can answer from. The descriptors used for
                     // the merge above carry no store — they are names — so the
                     // registry is rebuilt here with the live one.
-                    const durableSessions = sessionsRef.current;
-                    const runScope = scopeRef.current;
                     const generation = conversationGenRef.current;
                     const goalCommand = slash.name === 'goal';
                     if (goalCommand)
                         goalCommandInFlightRef.current = true;
-                    const registry = new HostCommandRegistry();
-                    registry.register(kernelHostCommands({
-                        allowedAgentIds: session?.agentIds ?? [],
-                        ...(durableSessions && runScope
-                            ? {
-                                goal: {
-                                    store: durableSessions.goals,
-                                    sessionId: runScope.sessionId,
-                                    tenantId: durableSessions.tenantId,
-                                    activation: goalActivation,
-                                },
-                            }
-                            : {}),
-                    }));
                     void (async () => {
+                        let goalCommandReleased = false;
+                        const releaseGoalCommand = () => {
+                            if (!goalCommand || goalCommandReleased)
+                                return;
+                            goalCommandReleased = true;
+                            goalCommandInFlightRef.current = false;
+                            wakeGoalDriver();
+                        };
                         try {
+                            if (goalCommand)
+                                await materializeConversation();
+                            const durableSessions = sessionsRef.current;
+                            const runScope = scopeRef.current;
+                            const registry = new HostCommandRegistry();
+                            registry.register(kernelHostCommands({
+                                allowedAgentIds: session?.agentIds ?? [],
+                                ...(durableSessions && runScope && conversationMaterializedRef.current
+                                    ? {
+                                        goal: {
+                                            store: durableSessions.goals,
+                                            sessionId: runScope.sessionId,
+                                            tenantId: durableSessions.tenantId,
+                                            activation: goalActivation,
+                                        },
+                                    }
+                                    : {}),
+                            }));
                             const outcome = await registry.dispatch(`/${slash.name} ${slash.args.join(' ')}`.trim());
+                            // The dispatch result is the durable boundary. Release the input
+                            // gate before publishing that result: once the operator can see a
+                            // completed `/goal` row, the next goal command must be admissible.
+                            // Keeping the gate until `finally` left one render-sized window in
+                            // which a visible success was followed by "still reaching durable
+                            // state" when the operator immediately typed `/goal resume`.
+                            releaseGoalCommand();
                             // A late readout from the conversation just left must not be
                             // painted as state of the one now on screen.
                             if (conversationGenRef.current !== generation)
@@ -3280,10 +3482,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                             pushMessage('system', `Could not run /${slash.name}: ${error instanceof Error ? error.message : String(error)}`);
                         }
                         finally {
-                            if (goalCommand) {
-                                goalCommandInFlightRef.current = false;
-                                wakeGoalDriver();
-                            }
+                            releaseGoalCommand();
                         }
                     })();
                     return;
@@ -3301,6 +3500,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         title: 'Rate the latest answer',
                         runId: target.runId,
                         messageId: target.messageId,
+                        sessionId: target.sessionId,
                         values,
                         options: [
                             {
@@ -3318,7 +3518,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         pushMessage('system', 'Nothing to rate yet.');
                         return;
                     }
-                    recordFeedback(target.runId, slash.messageId, slash.rating, slash.note);
+                    recordFeedback(target.sessionId, target.runId, slash.messageId, slash.rating, slash.note);
                     return;
                 }
                 case 'review': {
@@ -3417,11 +3617,6 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 await replaceConversation(sessions, destination, result.messages);
                             }
                             modelHistoryRef.current = result.messages;
-                            // The old gauge measured the history that was just replaced.
-                            // Clear it only after the durable projection and live model
-                            // history agree; until then the old measurement is still the
-                            // truthful one. The next run publishes a fresh measurement.
-                            setContext(null);
                             // How many user/assistant turns survived the pass.
                             // `keepRecentRows` explains why the transcript is trimmed
                             // to match rather than rebuilt from `result.messages`.
@@ -3906,13 +4101,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             }
             if (key.home || key.end || key.pageUp || key.pageDown) {
-                setSelectedEdit((index) => moveSelection(index, editList.length, key.home
-                    ? 'first'
-                    : key.end
-                        ? 'last'
-                        : key.pageUp
-                            ? 'previous-page'
-                            : 'next-page'));
+                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) {
@@ -3939,13 +4128,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             if (resumeCommittedRef.current)
                 return;
             if (key.home || key.end || key.pageUp || key.pageDown) {
-                setSelectedResume((index) => moveSelection(index, resumeList.length, key.home
-                    ? 'first'
-                    : key.end
-                        ? 'last'
-                        : key.pageUp
-                            ? 'previous-page'
-                            : 'next-page'));
+                setSelectedResume((index) => moveSelection(index, resumeList.length, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page'));
             }
             else if (key.upArrow)
                 setSelectedResume((index) => moveSelection(index, resumeList.length, 'previous'));
@@ -3989,9 +4172,18 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         // A pending permission prompt owns the keyboard: y/n/a decide it.
         if (permissionResolveRef.current) {
+            const ch = input.toLowerCase();
+            if (permission && ch === 'd') {
+                setPermissionReviewOffset(0);
+                setPermissionDetailsOpen(!permissionDetailsOpenRef.current);
+                return;
+            }
             if (permission &&
                 (key.upArrow || key.downArrow || key.pageUp || key.pageDown || key.home || key.end)) {
-                const count = permissionReviewRows(permission.review, terminal.columns).length;
+                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 current = Math.min(permissionReviewOffsetRef.current, maxOffset);
                 const next = key.home
@@ -4008,7 +4200,6 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 setPermissionReviewOffset(next);
                 return;
             }
-            const ch = input.toLowerCase();
             // Refusing is never deferred or gated — it is the direction a
             // mistake is recoverable in, so it answers on the first press.
             if (key.ctrl && input === 'c') {
@@ -4034,6 +4225,125 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 resolvePermission({ kind: 'approve-all' });
             return;
         }
+        // Child observation owns navigation, but never outranks consent: the
+        // permission branch above preempts it if a child or parent call asks.
+        const agentView = agentSurfaceRef.current;
+        if (agentView) {
+            // The Return that opened `/agent` cannot also drill into the
+            // highlighted child before the list has appeared on screen.
+            if (agentSurfaceCommittedRef.current !== agentView)
+                return;
+            const agents = subagentsRef.current;
+            if (agentView.kind === 'cockpit') {
+                const phases = agentPhases(agents);
+                const phaseIndex = Math.max(0, phases.findIndex((phase) => phase.id === agentView.selectedPhaseId));
+                const phase = phases[phaseIndex];
+                const phaseAgents = phase?.agents ?? [];
+                const agentIndex = Math.max(0, phaseAgents.findIndex((agent) => agent.viewId === agentView.selectedId));
+                const selected = phaseAgents[agentIndex];
+                if (!phase || !selected) {
+                    setAgentSurface(null);
+                    return;
+                }
+                if (key.escape || (key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
+                    setAgentSurface(null);
+                    return;
+                }
+                if (key.leftArrow || key.rightArrow || key.tab) {
+                    const focus = key.leftArrow
+                        ? 'phases'
+                        : key.rightArrow
+                            ? 'agents'
+                            : agentView.focus === 'phases'
+                                ? 'agents'
+                                : 'phases';
+                    setAgentSurface({ ...agentView, focus });
+                    return;
+                }
+                if (key.return) {
+                    if (agentView.focus === 'phases') {
+                        setAgentSurface({ ...agentView, focus: 'agents' });
+                        return;
+                    }
+                    setAgentSurface({
+                        kind: 'transcript',
+                        selectedPhaseId: phase.id,
+                        selectedId: selected.viewId,
+                        returnFocus: agentView.focus,
+                        tailOffset: 0,
+                    });
+                    return;
+                }
+                if (key.home || key.end || key.pageUp || key.pageDown || key.upArrow || key.downArrow) {
+                    const movement = key.home
+                        ? 'first'
+                        : key.end
+                            ? 'last'
+                            : key.pageUp
+                                ? 'previous-page'
+                                : key.pageDown
+                                    ? 'next-page'
+                                    : key.upArrow
+                                        ? 'previous'
+                                        : 'next';
+                    if (agentView.focus === 'phases') {
+                        const next = moveSelection(phaseIndex, phases.length, movement, agentPhasePageSize(terminal.rows, agentCockpitIsWide(terminal.columns)));
+                        const targetPhase = phases[next];
+                        const targetAgent = targetPhase?.agents[0];
+                        if (targetPhase && targetAgent) {
+                            setAgentSurface({
+                                ...agentView,
+                                selectedPhaseId: targetPhase.id,
+                                selectedId: targetAgent.viewId,
+                            });
+                        }
+                    }
+                    else {
+                        const next = moveSelection(agentIndex, phaseAgents.length, movement, agentPickerPageSize(terminal.rows, agentCockpitIsWide(terminal.columns)));
+                        const target = phaseAgents[next];
+                        if (target)
+                            setAgentSurface({ ...agentView, selectedId: target.viewId });
+                    }
+                }
+                return;
+            }
+            const selected = agents.find((agent) => agent.viewId === agentView.selectedId);
+            if (!selected) {
+                setAgentSurface(null);
+                return;
+            }
+            if (input.toLowerCase() === 'q' || (key.ctrl && input === 'c')) {
+                setAgentSurface(null);
+                return;
+            }
+            if (key.escape) {
+                setAgentSurface({
+                    kind: 'cockpit',
+                    selectedPhaseId: agentView.selectedPhaseId,
+                    selectedId: selected.viewId,
+                    focus: agentView.returnFocus,
+                });
+                return;
+            }
+            if (key.home || key.end || key.pageUp || key.pageDown || key.upArrow || key.downArrow) {
+                const page = agentTranscriptPageSize(terminal.rows);
+                const max = maxAgentTranscriptTailOffset(selected, terminal.rows, terminal.columns);
+                const offset = Math.min(agentView.tailOffset, max);
+                const next = key.home
+                    ? max
+                    : key.end
+                        ? 0
+                        : key.pageUp
+                            ? Math.min(max, offset + page)
+                            : key.pageDown
+                                ? Math.max(0, offset - page)
+                                : key.upArrow
+                                    ? Math.min(max, offset + 1)
+                                    : Math.max(0, offset - 1);
+                setAgentSurface({ ...agentView, tailOffset: next });
+            }
+            return;
+        }
         // A host-owned text prompt has its own input hook. This synchronous ref
         // claims the interval before React paints it too, so App cannot read a
         // key repeat as an interrupt, exit ladder, or finite-menu choice.
@@ -4058,13 +4368,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
             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));
+                setSelectedChoice((index) => moveSelection(index, options.length, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page', pageSize));
                 return;
             }
             if (key.upArrow) {
@@ -4090,19 +4394,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // stays above it in this handler so an approval request that arrives
         // while the picker is open cannot have its keys stolen by the chooser.
         if (copyPickerRef.current) {
+            // The Return that submitted `/copy` is an ownership fence, not a
+            // selection made against a picker the operator has not seen yet.
+            if (copyPickerCommittedRef.current !== copyPickerRef.current)
+                return;
             const targets = copyPickerRef.current.targets;
             if (key.escape || (key.ctrl && input === 'c')) {
                 setCopyPicker(null);
                 return;
             }
             if (key.home || key.end || key.pageUp || key.pageDown) {
-                setSelectedCopy((index) => moveSelection(index, targets.length, key.home
-                    ? 'first'
-                    : key.end
-                        ? 'last'
-                        : key.pageUp
-                            ? 'previous-page'
-                            : 'next-page'));
+                setSelectedCopy((index) => moveSelection(index, targets.length, key.home ? 'first' : key.end ? 'last' : key.pageUp ? 'previous-page' : 'next-page'));
                 return;
             }
             if (key.upArrow) {
@@ -4213,21 +4515,73 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // Background is left natural — we inherit the terminal's own background
     // and only theme the foreground. Forcing
     // a filled bg left mismatched patches around bordered areas, so we don't.
-    const lifecycleOwnsViewport = phase === 'trust' || phase === 'resume' || phase === 'edit' || phase === 'picker';
-    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: window.settled, 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: [_jsx(LiveActivity, { activeTools: activeTools, thinking: state === 'thinking' && !messages.some((m) => m.pending) }), permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, reviewOffset: permissionReviewOffset, columns: terminal.columns })) : null, textPrompt ? (_jsx(TextPrompt, { title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null, onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && choicePicker ? (_jsx(ChoicePicker, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
+    const liveSubagentCount = subagents.filter((agent) => agent.status === 'starting' || agent.status === 'working').length;
+    const selectedSubagent = agentSurface
+        ? subagents.find((agent) => agent.viewId === agentSurface.selectedId)
+        : undefined;
+    const lifecycleOwnsViewport = phase === 'trust' ||
+        phase === 'resume' ||
+        phase === 'edit' ||
+        phase === 'picker' ||
+        agentSurface !== null;
+    const statusGoal = phase === 'ready' &&
+        state === 'idle' &&
+        conversationMutation === null &&
+        !compacting &&
+        permission === null &&
+        textPrompt === null &&
+        choicePicker === null &&
+        copyPicker === null &&
+        agentSurface === null
+        ? goalStatusLabel(goalStatus)
+        : null;
+    const statusHint = conversationMutation === 'fork'
+        ? 'forking conversation — input is paused'
+        : conversationMutation === 'edit'
+            ? 'branching before prompt — input is paused'
+            : conversationMutation === 'archive'
+                ? 'archiving conversation — input is paused'
+                : conversationMutation === 'new'
+                    ? 'starting a fresh conversation — input is paused'
+                    : compacting
+                        ? 'compacting conversation — input is paused'
+                        : permission
+                            ? hintForPhase(phase, state, session?.hasProvider === true)
+                            : agentSurface?.kind === 'cockpit'
+                                ? agentSurface.focus === 'phases'
+                                    ? 'agent phases — enter agents · esc return'
+                                    : 'agents — enter inspect · left phases · esc return'
+                                : agentSurface?.kind === 'transcript'
+                                    ? 'observing agent — esc agents · q parent'
+                                    : textPrompt
+                                        ? 'name editor open — enter save · esc cancel'
+                                        : choicePicker
+                                            ? 'choice open — ↑↓ / 1–9 select · enter apply · esc cancel'
+                                            : 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: activeTools, working: state === 'thinking' || state === 'tool', agentCount: liveSubagentCount, interruptible: abortRef.current !== null, animate: stdout.isTTY === true })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, columns: terminal.columns })) : null, 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, 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' &&
                                 conversationMutation === null &&
                                 textPrompt === null &&
                                 choicePicker === null &&
-                                copyPicker === null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, children: [pendingSteers.length > 0 &&
+                                copyPicker === null &&
+                                agentSurface === null, hidden: permission !== null ||
+                                choicePicker !== null ||
+                                copyPicker !== null ||
+                                agentSurface !== null, children: [pendingSteers.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
-                                    copyPicker === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
+                                    copyPicker === null &&
+                                    agentSurface === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
-                                    copyPicker === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
+                                    copyPicker === null &&
+                                    agentSurface === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '⏸' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
                                                 ? 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`
@@ -4235,42 +4589,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
-                                        externalEditorRequest !== null, hidden: permission !== null ||
+                                        externalEditorRequest !== null ||
+                                        agentSurface !== null, hidden: permission !== null ||
                                         textPrompt !== null ||
                                         choicePicker !== null ||
-                                        copyPicker !== null, 
+                                        copyPicker !== null ||
+                                        agentSurface !== null, 
                                     // A turn is running, so Esc is the interrupt and not
                                     // the composer's clear.
-                                    escapeInterrupts: !compacting && (state === 'thinking' || state === 'tool'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), userCommands: userCommands, mentionCandidates: mentionCandidates, history: history })] })] })), _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: phase === 'ready' &&
-                            state === 'idle' &&
-                            conversationMutation === null &&
-                            !compacting &&
-                            permission === null &&
-                            textPrompt === null &&
-                            choicePicker === null &&
-                            copyPicker === null
-                            ? goalStatusLabel(goalStatus)
-                            : null, state: state, hint: conversationMutation === 'fork'
-                            ? 'forking conversation — input is paused'
-                            : conversationMutation === 'edit'
-                                ? 'branching before prompt — input is paused'
-                                : conversationMutation === 'archive'
-                                    ? 'archiving conversation — input is paused'
-                                    : conversationMutation === 'new'
-                                        ? 'starting a fresh conversation — input is paused'
-                                        : compacting
-                                            ? 'compacting conversation — input is paused'
-                                            : permission
-                                                ? hintForPhase(phase, state, session?.hasProvider === true)
-                                                : textPrompt
-                                                    ? 'name editor open — enter save · esc cancel'
-                                                    : choicePicker
-                                                        ? 'choice open — ↑↓ / 1–9 select · enter apply · esc cancel'
-                                                        : copyPicker
-                                                            ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
-                                                            : goalStatus && phase === 'ready' && state === 'idle'
-                                                                ? undefined
-                                                                : hintForPhase(phase, state, session?.hasProvider === true), usage: usage, context: context }) })] }) }));
+                                    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, userCommands: userCommands, mentionCandidates: mentionCandidates, history: history })] })] })), _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();
@@ -4302,7 +4629,9 @@ function formatToolCall(toolName, summary, standalone = false) {
 }
 function hintForPhase(phase, state, 
 /** Whether there is a working session behind the picker to go back to. */
-canReturn = false) {
+canReturn = false, 
+/** Whether the active-turn composer contains text, a paste, or an attachment. */
+hasDraft = false) {
     // Enter is absent because Enter grants nothing here, deliberately — see the
     // trust branch in the key handler above.
     if (phase === 'trust')
@@ -4328,7 +4657,7 @@ canReturn = false) {
     if (state === 'awaiting-permission')
         return 'y approve · n / esc reject · a approve all';
     if (state !== 'idle')
-        return 'enter steer · tab queue · esc interrupt';
+        return hasDraft ? 'enter steer · tab queue · esc interrupt' : '';
     // The composer already points to /help. Keeping the complete key legend in
     // every idle frame made ordinary conversation read like a permanent setup
     // screen; only state-specific actions belong in the footer.