@namzu/cli 17.0.1 → 18.1.0

package/dist/tui/App.js

@@ -28,12 +28,13 @@ 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 { AgentCockpit, AgentTaskPanel, AgentTranscript, activeSubagentCohorts, agentCockpitIsWide, agentPhasePageSize, agentPhases, 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 { TaskList } from './TaskList.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
 import { Picker } from './Picker.js';
 import { ResumePicker } from './ResumePicker.js';
@@ -57,12 +58,36 @@ import { PERMISSION_REVIEW_PAGE_ROWS, buildPermissionReview, buildPermissionSumm
 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 { splitCompleteBlocks, splitSafeCut } from './stream-blocks.js';
 import { terminalSupportsHyperlinks } from './terminal-hyperlinks.js';
 import { theme } from './theme.js';
 import { useSelectionIndex } from './use-selection-index.js';
 import { renderWorkspaceDiff, workspaceDiff } from './workspace-diff.js';
 import { listReviewBranches, listReviewCommits, reviewMergeBase, } from './workspace-review.js';
+/** The value a question row carries: an option id, or the free-text escape. */
+const FREE_TEXT_ANSWER = '__free_text__';
+/**
+ * The streaming assistant bubble, carried across events within one turn.
+ *
+ * `text` is everything the model has said and is what gets persisted;
+ * `pending` is the part not yet on screen, held until it forms a whole block.
+ * The two are separate because they answer different questions — what was
+ * said, and what has been shown — and conflating them is how a reply gets
+ * saved with a paragraph the operator never saw, or shown twice.
+ */
+/**
+ * How long held reply text may wait before a sentence of it is shown.
+ *
+ * Blocks are released as they complete (`splitCompleteBlocks`), which keeps a
+ * fast reply landing a paragraph at a time. A slow one — a long paragraph
+ * arriving over twenty seconds — completes no block until its last character
+ * and was invisible for its whole length. Past this interval the pending
+ * text is released to its last safe cut instead (`splitSafeCut`): a sentence
+ * or a line, never a half-word, never inside a fence. Long enough that a
+ * fast stream never reaches it; short enough that a slow one reads as
+ * writing rather than as silence.
+ */
+const STREAM_RELEASE_MS = 250;
 /** Last non-empty assistant text in a durable conversation, newest first. */
 function latestAssistantOutput(messages) {
     for (let i = messages.length - 1; i >= 0; i -= 1) {
@@ -292,6 +317,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      */
     const [pickerNotice, setPickerNotice] = useState(null);
     const [permission, setPermission] = useState(null);
+    /**
+     * The question currently on screen and the promise the tool is waiting
+     * on. Resolved exactly once: by a chosen row, by free text, by Esc (skip)
+     * or by Ctrl+C (abort). A second resolution is a no-op, not a second
+     * answer.
+     */
+    const questionRef = useRef(null);
+    const resolveQuestion = useCallback((answer) => {
+        const pending = questionRef.current;
+        if (!pending?.resolve)
+            return;
+        const resolve = pending.resolve;
+        pending.resolve = null;
+        questionRef.current = null;
+        resolve(answer);
+    }, []);
     const [permissionReviewOffset, setPermissionReviewOffsetState] = useState(0);
     const permissionReviewOffsetRef = useRef(0);
     const [permissionDetailsOpen, setPermissionDetailsOpenState] = useState(false);
@@ -329,6 +370,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // Tools currently executing — rendered live (spinner + elapsed) below the
     // transcript, then committed as static lines on completion.
     const [activeTools, setActiveTools] = useState([]);
+    /**
+     * The model's plan for the current request, in creation order, updated in
+     * place on every status change. Cleared when the next request begins —
+     * a plan is scoped to the request it was made for, and one that outlived
+     * it would read as work still pending on a turn that already ended.
+     */
+    const [tasks, setTasks] = useState([]);
+    /** Ids already seen this request, so an opening row is written once. */
+    const knownTaskIdsRef = useRef(new Set());
     // Bumped to reset the <Static> transcript log (on /clear, /clear-screen and /resume).
     const [resetKey, setResetKey] = useState(0);
     /**
@@ -462,9 +512,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         subagentsRef.current = next;
         setSubagentsState(next);
         const surface = agentSurfaceRef.current;
-        if (!surface || next.some((agent) => agent.viewId === surface.selectedId))
+        if (!surface)
+            return;
+        const activeCohorts = activeSubagentCohorts(next);
+        if (activeCohorts.length === 0) {
+            setAgentSurface(null);
+            return;
+        }
+        if (activeCohorts.some((agent) => agent.viewId === surface.selectedId))
             return;
-        const phases = agentPhases(next);
+        const phases = agentPhases(activeCohorts);
         const fallbackPhase = phases.find((phase) => phase.id === surface.selectedPhaseId) ?? phases[0];
         const fallbackAgent = fallbackPhase?.agents[0];
         if (!fallbackPhase || !fallbackAgent) {
@@ -479,7 +536,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         });
     }, [setAgentSurface]);
     const openAgentCockpit = useCallback(() => {
-        const agents = subagentsRef.current;
+        const agents = activeSubagentCohorts(subagentsRef.current);
         const firstPhase = agentPhases(agents)[0];
         const firstAgent = firstPhase?.agents[0];
         if (!firstPhase || !firstAgent)
@@ -1020,6 +1077,20 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
         return { sessions, sessionId };
     }, [hasUnsettledTurn, pushMessage, state]);
+    /**
+     * Shift+Tab: `prompt` → `accept-edits` → `plan` → `prompt`. Three stops
+     * only — `auto` and `strict` are deliberate choices made by name in
+     * `/permissions`, not stops on a key an operator presses on reflex. From
+     * either of those the key returns to `prompt`, which is the direction a
+     * reflex should fall. The change goes through the same gate `/permissions`
+     * uses, so it is refused while a turn is active, and the refusal is
+     * explained on screen.
+     */
+    const cyclePermissionMode = useCallback(() => {
+        const current = permissionModeRef.current;
+        const next = current === 'prompt' ? 'accept-edits' : current === 'accept-edits' ? 'plan' : 'prompt';
+        applyPermissionMode(next);
+    }, [applyPermissionMode]);
     const runConversationExport = useCallback((destination) => {
         const source = stableExportSource();
         if (!source)
@@ -1202,6 +1273,39 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             })();
             return;
         }
+        if (picker.kind === 'user-question') {
+            const pending = questionRef.current;
+            setChoicePicker(null);
+            if (!pending)
+                return;
+            if (value === FREE_TEXT_ANSWER) {
+                // The scope on a text prompt is what its other kinds check
+                // against a conversation switch; a question belongs to the turn
+                // that asked it, and the turn holds the promise.
+                const scope = scopeRef.current;
+                if (!scope) {
+                    resolveQuestion({ kind: 'skip' });
+                    return;
+                }
+                textPromptTokenRef.current += 1;
+                setTextPrompt({
+                    token: textPromptTokenRef.current,
+                    kind: 'user-question',
+                    title: pending.question.question,
+                    placeholder: 'Type your answer and press Enter · Esc skips',
+                    emptyNotice: 'An empty answer is a skip. Press Esc to skip.',
+                    initialValue: '',
+                    sessionId: scope.sessionId,
+                });
+                return;
+            }
+            // The tool's own result row carries the answer the model saw; this
+            // row is the operator's, so a reader of the transcript sees the
+            // question and the choice together where it happened.
+            pushMessage('system', `Answered "${pending.question.question}": ${labelOfOption(pending.question, value)}`, false, '?');
+            resolveQuestion({ kind: 'answer', selectedOptionIds: [value] });
+            return;
+        }
         if (picker.kind === 'review-commit') {
             advanceQueueContinuation();
             enqueueQueued({
@@ -1341,12 +1445,35 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * if every exit releases it; this is the function every exit calls.
      */
     const flushStream = useCallback((st) => {
+        if (st.releaseTimer) {
+            clearTimeout(st.releaseTimer);
+            st.releaseTimer = undefined;
+        }
         if (!st.pending || st.pending.length === 0)
             return;
         const id = st.assistantId ?? pushMessage('assistant', '', true);
         st.assistantId = id;
         appendToMessage(id, st.pending);
         st.pending = '';
+        st.releasedAt = Date.now();
+    }, [appendToMessage, pushMessage]);
+    /**
+     * Release held text to its last safe cut — a sentence or a line — when it
+     * has waited longer than `STREAM_RELEASE_MS`. Called from the delta path
+     * with the clock, and from the timer the delta path arms so a stream that
+     * goes quiet mid-paragraph still shows what it has.
+     */
+    const releaseStalled = useCallback((st) => {
+        if (!st.pending || st.pending.length === 0)
+            return;
+        const { ready, rest } = splitSafeCut(st.pending);
+        if (ready.length === 0)
+            return;
+        const id = st.assistantId ?? pushMessage('assistant', '', true);
+        st.assistantId = id;
+        st.pending = rest;
+        appendToMessage(id, ready);
+        st.releasedAt = Date.now();
     }, [appendToMessage, pushMessage]);
     const finalizeMessage = useCallback((id, finalContent) => {
         setMessages((prev) => prev.map((m) => m.id === id ? { ...m, content: finalContent ?? m.content, pending: false } : m));
@@ -1445,7 +1572,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             ...(sessionsRef.current ? { sessionGoals: sessionsRef.current.goals } : {}),
             ...(activeCtx.mcpServers ? { mcpServers: activeCtx.mcpServers } : {}),
             ...(activeCtx.plugins ? { plugins: activeCtx.plugins } : {}),
+            ...(activeCtx.web ? { web: activeCtx.web } : {}),
             ...(activeCtx.sandbox ? { sandbox: activeCtx.sandbox } : {}),
+            // Somebody is at this terminal, so the model may ask them one
+            // question when a decision is genuinely theirs.
+            askUser: true,
         });
         if (signal?.aborted) {
             void s.close();
@@ -2236,6 +2367,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         if (!prompt)
             return;
         setTextPrompt(null);
+        if (prompt.kind === 'user-question') {
+            const text = value.trim();
+            const pending = questionRef.current;
+            if (text.length === 0) {
+                resolveQuestion({ kind: 'skip' });
+                return;
+            }
+            if (pending) {
+                pushMessage('system', `Answered "${pending.question.question}": ${text}`, false, '?');
+            }
+            resolveQuestion({ kind: 'answer', selectedOptionIds: [], freeText: text });
+            return;
+        }
         const scope = scopeRef.current;
         if (!scope || scope.sessionId !== prompt.sessionId) {
             pushMessage('system', prompt.kind === 'conversation-title'
@@ -2268,8 +2412,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         queueMicrotask(() => {
             if (textPromptRef.current === prompt)
                 setTextPrompt(null);
+            // A cancelled free-text answer is a skipped question, not a hung tool.
+            if (prompt?.kind === 'user-question')
+                resolveQuestion({ kind: 'skip' });
         });
-    }, [setTextPrompt]);
+    }, [resolveQuestion, setTextPrompt]);
     /**
      * `/fork`: continue in a copy, leaving this conversation where it is.
      *
@@ -2454,6 +2601,39 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             sendTerminalNotification({ kind: 'approval-required' });
         });
     }, [sendTerminalNotification, setPermissionDetailsOpen, setPermissionReviewOffset]);
+    /**
+     * `ask_user_question`, on screen. The question becomes a finite chooser —
+     * the model's options, then "Something else…" when it allowed free text —
+     * and the tool's promise waits on the row the operator picks. One question
+     * at a time: the tool is not concurrency-safe, so a second cannot arrive
+     * while the first is up.
+     */
+    const askQuestion = useCallback((question) => new Promise((resolve) => {
+        questionRef.current = { question, resolve };
+        const values = [
+            ...question.options.map((option) => option.id),
+            ...(question.allowFreeText ? [FREE_TEXT_ANSWER] : []),
+        ];
+        setSelectedChoice(0);
+        setChoicePicker({
+            kind: 'user-question',
+            title: question.question,
+            notice: question.header
+                ? `${question.header} · Enter answers · Esc skips`
+                : 'Enter answers · Esc skips',
+            values,
+            options: [
+                ...question.options.map((option) => ({
+                    label: option.label,
+                    description: option.description ?? '',
+                })),
+                ...(question.allowFreeText
+                    ? [{ label: 'Something else…', description: 'Answer in your own words' }]
+                    : []),
+            ],
+        });
+        sendTerminalNotification({ kind: 'approval-required' });
+    }), [sendTerminalNotification, setChoicePicker, setSelectedChoice]);
     // 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
@@ -2484,6 +2664,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         sessionId: st.sessionId,
                     };
                 }
+                // The release clock starts with the first character, not with the
+                // turn: the wait before the first token is the model's, and
+                // counting it would release the opening sentence on arrival.
+                st.releasedAt ??= Date.now();
                 st.text += event.text;
                 // Held, not appended. Appending each delta is what produced text
                 // that types itself out — nothing animates it, but a few
@@ -2494,7 +2678,21 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 if (ready.length > 0) {
                     st.pending = rest;
                     appendToMessage(ensureAssistant(), ready);
+                    st.releasedAt = Date.now();
+                }
+                // A block is the preferred unit; a sentence is the fallback for
+                // a paragraph that is taking longer than an operator will wait
+                // for it. The timer covers the stream going quiet between two
+                // deltas, which the clock check alone cannot see.
+                if (st.releaseTimer)
+                    clearTimeout(st.releaseTimer);
+                if (Date.now() - (st.releasedAt ?? 0) >= STREAM_RELEASE_MS) {
+                    releaseStalled(st);
                 }
+                st.releaseTimer = setTimeout(() => {
+                    st.releaseTimer = undefined;
+                    releaseStalled(st);
+                }, STREAM_RELEASE_MS);
                 break;
             }
             case 'tool-start': {
@@ -2502,6 +2700,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 setState('tool');
                 const tool = {
                     id: event.toolUseId,
+                    ...(event.runId ? { runId: event.runId } : {}),
                     toolName: event.toolName,
                     label: formatToolCall(event.toolName, event.summary, event.standalone),
                     startedAt: Date.now(),
@@ -2513,7 +2712,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
             case 'tool-progress': {
                 const running = activeToolsRef.current;
-                const index = running.findIndex((tool) => tool.id === event.toolUseId);
+                const index = running.findIndex((tool) => tool.id === event.toolUseId &&
+                    (event.runId === undefined || tool.runId === event.runId));
                 // A terminal event may already have removed this call. Never recreate
                 // a live row from late diagnostic state.
                 if (index < 0)
@@ -2539,12 +2739,25 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 // active tool" — under parallel calls that mis-attributes a
                 // result to the wrong call. If no id matches, render the
                 // completion on its own (label from the end event itself).
-                const i = running.findIndex((t) => t.id === event.toolUseId);
+                const i = running.findIndex((tool) => tool.id === event.toolUseId &&
+                    (event.runId === undefined || tool.runId === event.runId));
                 const done = i >= 0 ? running[i] : undefined;
                 if (i >= 0) {
                     activeToolsRef.current = [...running.slice(0, i), ...running.slice(i + 1)];
                     setActiveTools(activeToolsRef.current);
                 }
+                const representedSuccessfulAgent = !event.isError &&
+                    event.toolName.toLowerCase() === 'agent' &&
+                    subagentsRef.current.some((agent) => agent.toolUseId === event.toolUseId &&
+                        (event.runId === undefined || agent.workflowId === event.runId));
+                if (representedSuccessfulAgent) {
+                    // The automatic panel already owned this successful child from
+                    // start through settlement. Re-emitting its internal Agent call as
+                    // a transcript tool row after the panel closes is duplicate protocol,
+                    // not useful history. Failures remain durable transcript rows.
+                    setState(activeToolsRef.current.length > 0 ? 'tool' : 'thinking');
+                    break;
+                }
                 pushMessage('tool', done?.label ?? formatToolCall(event.toolName, event.summary), false, event.isError ? '✗' : '✓', done?.detail, event.isError ? theme.status.error : theme.status.ok, event.durationMs !== undefined
                     ? formatElapsed(event.durationMs)
                     : done
@@ -2560,9 +2773,34 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             case 'usage':
                 setUsage({ totalTokens: event.totalTokens, cost: event.cost });
                 break;
-            case 'task':
-                pushMessage('tool', event.subject, false, event.status === 'completed' ? '☑' : '☐');
+            case 'task': {
+                // The live list gets every change; the transcript records the
+                // opening and the close, as it did before the list existed.
+                // Decided from a ref, not inside the state updater: React runs
+                // updaters lazily, so a flag set there is still unset when the
+                // transcript row below is chosen.
+                const isNew = !knownTaskIdsRef.current.has(event.taskId);
+                knownTaskIdsRef.current.add(event.taskId);
+                const item = {
+                    id: event.taskId,
+                    subject: event.subject,
+                    status: event.status,
+                };
+                setTasks((prev) => {
+                    const index = prev.findIndex((task) => task.id === item.id);
+                    return index < 0 ? [...prev, item] : prev.map((task, i) => (i === index ? item : task));
+                });
+                if (event.status === 'completed') {
+                    pushMessage('tool', event.subject, false, '☑');
+                }
+                else if (event.status === 'failed') {
+                    pushMessage('tool', event.subject, false, '☒');
+                }
+                else if (isNew) {
+                    pushMessage('tool', event.subject, false, '☐');
+                }
                 break;
+            }
             case 'context':
                 // Into the TRANSCRIPT, not a status line. A status indicator is
                 // present while nothing is happening and gone afterwards, so
@@ -2699,6 +2937,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         else {
             pushMessage('user', text, false, undefined, undefined, undefined, humanPromptMeta(attached.length, attachments));
         }
+        // A plan is scoped to the request it was made for. Cleared here, at
+        // the start of the next one, rather than when the previous turn
+        // ended: a finished list stays on screen until the operator moves on,
+        // which is the moment it has told them everything it can.
+        setTasks([]);
+        knownTaskIdsRef.current = new Set();
         // The model interleaves text → tool → text across iterations; `applyEvent`
         // renders each one in order.
         const st = {
@@ -2848,6 +3092,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     ...(goalRound ? { goalRound } : {}),
                     // The mode above decides whether this callback is consulted.
                     onPermission: askPermission,
+                    onQuestion: askQuestion,
                     inboundMessages: () => inbox.drain(),
                     extraSystem: composeSkillsPrompt(activeSkills) ?? undefined,
                     onConversationMessages: (messages) => {
@@ -3101,7 +3346,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 }
                 case 'agent-cockpit': {
                     if (!openAgentCockpit()) {
-                        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.');
+                        pushMessage('system', 'No delegated agents are active. When an Agent tool starts one, its live activity appears below the composer and this view can inspect it.');
                     }
                     return;
                 }
@@ -3196,7 +3441,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         pushMessage('system', 'Permission choices are unavailable until the active turn, prompt, compaction, queued work, or embedded-session approval latch can be safely settled.');
                         return;
                     }
-                    const values = ['prompt', 'auto', 'strict'];
+                    const values = ['prompt', 'accept-edits', 'auto', 'strict', 'plan'];
                     setSelectedChoice(Math.max(0, values.indexOf(permissionModeRef.current)));
                     setChoicePicker({
                         kind: 'permission-mode',
@@ -4241,8 +4486,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         // Open the same retained cockpit as `/agent`; Enter then drills into a
         // child's transcript. Keep the shortcut below consent so it can never
         // hide an approval that owns the keyboard.
-        if (key.ctrl && input === 't' && openAgentCockpit())
-            return;
+        if (key.ctrl && input === 't') {
+            if (agentSurfaceRef.current) {
+                setAgentSurface(null);
+                return;
+            }
+            if (openAgentCockpit())
+                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;
@@ -4251,7 +4502,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // highlighted child before the list has appeared on screen.
             if (agentSurfaceCommittedRef.current !== agentView)
                 return;
-            const agents = subagentsRef.current;
+            const agents = activeSubagentCohorts(subagentsRef.current);
             if (agentView.kind === 'cockpit') {
                 const phases = agentPhases(agents);
                 const phaseIndex = Math.max(0, phases.findIndex((phase) => phase.id === agentView.selectedPhaseId));
@@ -4382,6 +4633,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             if (key.escape || (key.ctrl && input === 'c')) {
                 reviewChoiceInFlightRef.current = null;
                 setChoicePicker(null);
+                // Esc leaves the question unanswered and the turn running; the
+                // tool tells the model so. Ctrl+C is the operator saying stop.
+                if (picker.kind === 'user-question') {
+                    resolveQuestion({ kind: key.escape ? 'skip' : 'abort' });
+                }
                 return;
             }
             if (key.home || key.end || key.pageUp || key.pageDown) {
@@ -4533,9 +4789,21 @@ 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 liveSubagentCount = subagents.filter((agent) => agent.status === 'starting' || agent.status === 'working').length;
+    const liveSubagents = activeSubagentCohorts(subagents);
+    const representedSubagentTools = new Set(subagents
+        .filter((agent) => agent.toolUseId !== undefined)
+        .map((agent) => JSON.stringify([agent.workflowId, agent.toolUseId])));
+    const representedUnscopedSubagentToolUseIds = new Set(subagents.map((agent) => agent.toolUseId).filter((id) => id !== undefined));
+    // Keep the exact parent Agent row suppressed through the child-settled →
+    // tool-end hand-off. The monitor publishes terminal state synchronously,
+    // while the provider event that removes the generic tool row arrives on the
+    // next tick; filtering only live children made that raw row flash back.
+    const visibleActiveTools = activeTools.filter((tool) => tool.toolName.toLowerCase() !== 'agent' ||
+        !(tool.runId
+            ? representedSubagentTools.has(JSON.stringify([tool.runId, tool.id]))
+            : representedUnscopedSubagentToolUseIds.has(tool.id)));
     const selectedSubagent = agentSurface
-        ? subagents.find((agent) => agent.viewId === agentSurface.selectedId)
+        ? liveSubagents.find((agent) => agent.viewId === agentSurface.selectedId)
         : undefined;
     const lifecycleOwnsViewport = phase === 'trust' ||
         phase === 'resume' ||
@@ -4580,16 +4848,13 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 : goalStatus && phase === 'ready' && state === 'idle'
                                                     ? undefined
                                                     : hintForPhase(phase, state, session?.hasProvider === true, composerHasDraft);
-    return (_jsx(Box, { flexDirection: "column", display: externalEditorRequest ? 'none' : 'flex', children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [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' &&
+    return (_jsx(Box, { flexDirection: "column", display: externalEditorRequest ? 'none' : 'flex', children: _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [transcriptOwned || !lifecycleOwnsViewport ? (_jsx(TranscriptFrame, { children: _jsx(Transcript, { messages: finalized, pending: messages.find((m) => m.pending) ?? null, state: state, settled: renderedSettled, resetKey: resetKey, raw: rawOutput, hyperlinks: hyperlinks, showLive: !lifecycleOwnsViewport, header: transcriptOwned ? (_jsx(Banner, { version: ctx.version, session: session, permissionMode: permissionMode, cwd: ctx.cwd })) : undefined }) })) : null, phase === 'trust' ? (_jsx(TrustPrompt, { cwd: ctx.cwd })) : phase === 'resume' ? (_jsx(ResumePicker, { conversations: resumeList, selected: selectedResume })) : phase === 'edit' ? (_jsx(EditPromptPicker, { prompts: editList, selected: selectedEdit })) : phase === 'picker' ? (_jsx(Picker, { detected: pickerDetected ?? detected, currentProvider: currentProvider, selectionKind: pickerSelectionKind, currentModel: session?.modelSummary ?? null, initialView: pickerInitialView, onSubmit: handlePickerSubmit, onCancel: handlePickerCancel, onCredential: handleTypedCredential, onLogin: startLoginFromPicker, onLoginComplete: finishLoginFromPicker, keyEntryFor: keyEntryFor, notice: pickerNotice })) : (_jsxs(_Fragment, { children: [agentSurface === null ? (_jsx(LiveActivity, { activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true })) : null, agentSurface === null && permission === null ? _jsx(TaskList, { tasks: tasks }) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, columns: terminal.columns })) : null, textPrompt ? (_jsx(TextPrompt, { title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || agentSurface !== null, onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && agentSurface === null && choicePicker ? (_jsx(ChoicePicker, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && agentSurface === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { focus: state === 'idle' &&
                                 phase === 'ready' &&
                                 conversationMutation === null &&
                                 textPrompt === null &&
                                 choicePicker === null &&
                                 copyPicker === null &&
-                                agentSurface === null, hidden: permission !== null ||
-                                choicePicker !== null ||
-                                copyPicker !== null ||
-                                agentSurface !== null, children: [pendingSteers.length > 0 &&
+                                agentSurface === null, hidden: permission !== null || choicePicker !== null || copyPicker !== null, children: [pendingSteers.length > 0 &&
                                     permission === null &&
                                     textPrompt === null &&
                                     choicePicker === null &&
@@ -4603,7 +4868,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 ? queuePause.outcome === 'paused'
                                                     ? 'held after a resumable run paused; wait for recovery, change model, or send a message to release it'
                                                     : `paused after a ${queuePause.outcome} turn; send a message or change model to continue`
-                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { disabled: phase !== 'ready' ||
+                                                : 'sending when ready'] }) })) : null, _jsx(Composer, { permissionMode: permissionMode, onCycleMode: cyclePermissionMode, disabled: phase !== 'ready' ||
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
@@ -4611,11 +4876,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                         agentSurface !== null, hidden: permission !== null ||
                                         textPrompt !== null ||
                                         choicePicker !== null ||
-                                        copyPicker !== null ||
-                                        agentSurface !== null, 
+                                        copyPicker !== null, 
                                     // A turn is running, so Esc is the interrupt and not
                                     // the composer's clear.
-                                    escapeInterrupts: !compacting && (state === 'thinking' || state === 'tool'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), onDraftPresenceChange: setComposerHasDraft, 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 }) })] }) }));
+                                    escapeInterrupts: !compacting && (state === 'thinking' || state === 'tool'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), onDraftPresenceChange: setComposerHasDraft, onOpenAgentPanel: openAgentCockpit, userCommands: userCommands, mentionCandidates: mentionCandidates, history: history })] }), permission === null && agentSurface === null && liveSubagents.length > 0 ? (_jsx(AgentTaskPanel, { agents: liveSubagents, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'cockpit' ? (_jsx(AgentCockpit, { agents: liveSubagents, selectedPhaseId: agentSurface.selectedPhaseId, selectedId: agentSurface.selectedId, focus: agentSurface.focus, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : permission === null && agentSurface?.kind === 'transcript' && selectedSubagent ? (_jsx(AgentTranscript, { agent: selectedSubagent, tailOffset: agentSurface.tailOffset, terminalRows: terminal.rows, terminalColumns: terminal.columns })) : null] })), _jsx(Box, { paddingTop: 1, children: _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort ?? 'default', goal: statusGoal, state: state, hint: statusHint }) })] }) }));
 }
 function Banner({ version, session, permissionMode, cwd, }) {
     const { columns } = useWindowSize();
@@ -4695,10 +4959,18 @@ function goalStatusLabel(goal) {
             return 'Goal achieved';
     }
 }
+/** The label the operator saw for the option id they chose. */
+function labelOfOption(question, optionId) {
+    return question.options.find((option) => option.id === optionId)?.label ?? optionId;
+}
 function permissionModeDescription(mode) {
     switch (mode) {
         case 'prompt':
             return 'Ask before an undecided tool call runs';
+        case 'accept-edits':
+            return 'Approve file edits and writes without asking; shell and everything else still ask';
+        case 'plan':
+            return 'Read-only: the agent explores and presents a plan; leave plan mode to carry it out';
         case 'auto':
             return 'Approve undecided calls unless a rule or safety gate refuses';
         case 'strict':