@namzu/cli 16.0.0 → 17.0.0

package/dist/tui/App.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *      automatic reuse is not mistaken for a durable operator preference.
  */
 import { join, relative } from 'node:path';
-import { 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,7 +28,7 @@ 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 { 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';
@@ -462,9 +462,21 @@ 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 || 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);
@@ -551,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]);
@@ -830,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;
@@ -857,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) {
@@ -904,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' ||
@@ -956,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 ||
@@ -1204,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') {
@@ -1303,45 +1338,81 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         setMessages((prev) => prev.map((m) => m.id === id ? { ...m, content: finalContent ?? m.content, pending: false } : m));
     }, []);
     // Open the SDK session store and select the durable conversation once.
-    // Ordinary startup remains best-effort; an explicit `namzu resume <id>` is
-    // exact and therefore refuses instead of silently widening to a fresh chat.
+    // This is an admission gate for every startup, not optional persistence: a
+    // corrupt or split estate must not silently widen into cwd-local state and
+    // let the model run against a different history than the operator selected.
     const ensureSessions = useCallback(async () => {
         if (scopeRef.current)
             return scopeRef.current;
         const requestedConversationId = initialConversationIdRef.current;
-        try {
-            const sessions = await openSessions(ctxRef.current.cwd);
-            let sessionId;
-            if (requestedConversationId) {
-                const restored = await loadResumableConversation(sessions, requestedConversationId);
-                sessionId = asSessionId(requestedConversationId);
-                modelHistoryRef.current = restored;
-                setMessages(projectConversation(restored, nextId));
-                setHistory(promptHistoryFromConversation(restored));
-                const persistedOutput = latestAssistantOutput(restored);
-                lastCompletedOutputRef.current = persistedOutput
-                    ? { text: persistedOutput, provenance: 'persisted' }
-                    : null;
-                initialConversationIdRef.current = undefined;
+        const sessions = await openSessions(ctxRef.current.cwd);
+        let sessionId;
+        if (requestedConversationId) {
+            const restored = await loadResumableConversation(sessions, requestedConversationId);
+            sessionId = asSessionId(requestedConversationId);
+            modelHistoryRef.current = restored;
+            setMessages(projectConversation(restored, nextId));
+            setHistory(promptHistoryFromConversation(restored));
+            const persistedOutput = latestAssistantOutput(restored);
+            lastCompletedOutputRef.current = persistedOutput
+                ? { text: persistedOutput, provenance: 'persisted' }
+                : null;
+            initialConversationIdRef.current = undefined;
+            conversationMaterializedRef.current = true;
+        }
+        else {
+            // 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 = {
+            sessionId,
+            topicId: sessions.topicId,
+            projectId: sessions.projectId,
+            tenantId: sessions.tenantId,
+        };
+        return scopeRef.current;
+    }, [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;
             }
-            else {
-                sessionId = await startConversation(sessions);
+            finally {
+                if (conversationMutationRef.current === 'materialize') {
+                    conversationMutationRef.current = null;
+                }
             }
-            sessionsRef.current = sessions;
-            scopeRef.current = {
-                sessionId,
-                topicId: sessions.topicId,
-                projectId: sessions.projectId,
-                tenantId: sessions.tenantId,
-            };
-            return scopeRef.current;
+        })();
+        materializationRef.current = pending;
+        try {
+            return await pending;
         }
-        catch (error) {
-            if (requestedConversationId)
-                throw error;
-            return undefined;
+        finally {
+            if (materializationRef.current === pending)
+                materializationRef.current = null;
         }
-    }, [nextId]);
+    }, [ensureSessions]);
     const hydrateSession = useCallback(async (prefs, detectedNow, signal) => {
         if (signal?.aborted)
             return;
@@ -1352,6 +1423,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         const s = await createAgentSession(prefs, detectedNow, {
             scope,
             cwd: activeCtx.cwd,
+            ...(sessionsRef.current?.backend === 'central'
+                ? { stateRoot: sessionsRef.current.root }
+                : {}),
             enableComputerUse: true,
             rules: activeCtx.rules,
             ...(sessionsRef.current ? { sessionGoals: sessionsRef.current.goals } : {}),
@@ -1985,11 +2059,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         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.`);
@@ -2053,8 +2132,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             modelHistoryRef.current = [];
             lastAssistantMessage.current = null;
             lastCompletedOutputRef.current = null;
-            if (sourceScope && targetSessionId)
+            if (sourceScope && targetSessionId) {
                 sourceScope.sessionId = targetSessionId;
+                conversationMaterializedRef.current = true;
+            }
             if (clearScreen) {
                 setMessages([]);
                 resetTranscript();
@@ -2098,8 +2179,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;
@@ -2127,7 +2208,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)
@@ -2195,8 +2276,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;
@@ -2223,9 +2304,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             setConversationMutation(null);
         }
     }, [
-        ensureSessions,
         goalActivation,
         hasUnsettledTurn,
+        materializeConversation,
         pushMessage,
         resetSubagentActivity,
         wakeGoalDriver,
@@ -2374,10 +2455,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;
@@ -2441,7 +2523,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     activeToolsRef.current = [...running.slice(0, i), ...running.slice(i + 1)];
                     setActiveTools(activeToolsRef.current);
                 }
-                pushMessage('tool', done?.label ?? formatToolCall(event.toolName, event.summary), false, event.isError ? '✗' : '✓', done?.detail, event.isError ? theme.status.error : theme.status.ok, done ? formatElapsed(Date.now() - done.startedAt) : undefined);
+                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
+                        ? formatElapsed(Date.now() - done.startedAt)
+                        : undefined);
                 if (event.isError ||
                     (!event.hidden && (event.summary.length > 0 || (event.detail?.length ?? 0) > 0))) {
                     pushMessage('tool', event.isError ? `failed: ${event.summary}` : event.summary, false, '⎿', event.detail);
@@ -2533,13 +2619,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 {
@@ -2591,6 +2686,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             pending: '',
             completed: false,
             outcome: null,
+            sessionId: destination,
             notification: null,
         };
         const ac = new AbortController();
@@ -2917,6 +3013,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         finalizeMessage,
         flushStream,
         goalActivation,
+        materializeConversation,
         onPermission,
         pushMessage,
         replaceQueued,
@@ -2941,7 +3038,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;
         }
@@ -2978,15 +3077,21 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     });
                     return;
                 }
-                case 'agent-picker': {
+                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: 'picker',
-                        selectedId: agents[0]?.viewId ?? '',
+                        kind: 'cockpit',
+                        selectedPhaseId: firstPhase.id,
+                        selectedId: firstAgent.viewId,
+                        focus: 'agents',
                     });
                     return;
                 }
@@ -3324,29 +3429,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)
@@ -3361,10 +3483,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;
@@ -3382,6 +3501,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: [
                             {
@@ -3399,7 +3519,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': {
@@ -4115,21 +4235,42 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             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 (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;
@@ -4146,19 +4287,43 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                     : 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 });
+                    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: 'picker', selectedId: selected.viewId });
+                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) {
@@ -4383,8 +4548,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                         ? 'compacting conversation — input is paused'
                         : permission
                             ? hintForPhase(phase, state, session?.hasProvider === true)
-                            : agentSurface?.kind === 'picker'
-                                ? 'agent list — enter inspect · esc return'
+                            : 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
@@ -4396,7 +4563,7 @@ 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 === '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' &&
+    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 &&