@namzu/cli 15.1.1 → 16.0.0

package/dist/tui/App.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 { AgentPicker, AgentTranscript, agentPickerPageSize, 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,37 @@ 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)) {
+            setAgentSurface(null);
+        }
+    }, [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 +505,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([]);
@@ -1341,8 +1396,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 +1769,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 +1861,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,6 +1979,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         goalActivation.clear();
         wakeGoalDriver();
         conversationGenRef.current += 1;
+        resetSubagentActivity();
         activeTurnTokenRef.current = null;
         resetTranscript();
         setMessages(restored);
@@ -1946,6 +2008,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         interruptTurn,
         nextId,
         pushMessage,
+        resetSubagentActivity,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -1985,11 +2048,11 @@ 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)
                 sourceScope.sessionId = targetSessionId;
             if (clearScreen) {
@@ -2017,7 +2080,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.
@@ -2139,6 +2210,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 +2222,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             conversationMutationRef.current = null;
             setConversationMutation(null);
         }
-    }, [ensureSessions, goalActivation, hasUnsettledTurn, pushMessage, wakeGoalDriver]);
+    }, [
+        ensureSessions,
+        goalActivation,
+        hasUnsettledTurn,
+        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 +2285,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 +2326,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         hasUnsettledTurn,
         nextId,
         pushMessage,
+        resetSubagentActivity,
         resetTranscript,
         wakeGoalDriver,
     ]);
@@ -2259,15 +2340,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
@@ -2368,20 +2451,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' ? '☑' : '☐');
@@ -2909,6 +2978,18 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     });
                     return;
                 }
+                case 'agent-picker': {
+                    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;
+                    }
+                    setAgentSurface({
+                        kind: 'picker',
+                        selectedId: agents[0]?.viewId ?? '',
+                    });
+                    return;
+                }
                 case 'clear-screen':
                     setMessages([]);
                     resetTranscript();
@@ -3417,11 +3498,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 +3982,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 +4009,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 +4053,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 +4081,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 +4106,80 @@ 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;
+            const index = Math.max(0, agents.findIndex((agent) => agent.viewId === agentView.selectedId));
+            const selected = agents[index];
+            if (!selected) {
+                setAgentSurface(null);
+                return;
+            }
+            if (agentView.kind === 'picker') {
+                if (key.escape || (key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
+                    setAgentSurface(null);
+                    return;
+                }
+                if (key.return) {
+                    setAgentSurface({
+                        kind: 'transcript',
+                        selectedId: selected.viewId,
+                        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';
+                    const next = moveSelection(index, agents.length, movement, agentPickerPageSize(terminal.rows));
+                    const target = agents[next];
+                    if (target)
+                        setAgentSurface({ kind: 'picker', selectedId: target.viewId });
+                }
+                return;
+            }
+            if (input.toLowerCase() === 'q' || (key.ctrl && input === 'c')) {
+                setAgentSurface(null);
+                return;
+            }
+            if (key.escape) {
+                setAgentSurface({ kind: 'picker', selectedId: selected.viewId });
+                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 +4204,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 +4230,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 +4351,71 @@ 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 === 'picker'
+                                ? 'agent list — enter inspect · 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 === 'picker' ? (_jsx(AgentPicker, { agents: subagents, selectedId: agentSurface.selectedId, terminalRows: terminal.rows })) : 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 +4423,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 +4463,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 +4491,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.