@namzu/cli 17.0.1 → 18.0.0

package/dist/tui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/tui/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAON,KAAK,OAAO,EAiBZ,MAAM,YAAY,CAAA;AA+GnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AA2CvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAU/D,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAC1D,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,CAAA;CAC/C;AAOD,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,EAAE;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;CAC5B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAuKrB,6EAA6E;AAC7E,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,MAAM,EAAE,CAM7F;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAClC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,EAAE,MAAM,MAAM,EACpB,iBAAiB,GAAE,SAAS,MAAM,EAAO,GACvC,SAAS,iBAAiB,EAAE,CAuE9B;AA8GD,wBAAgB,GAAG,CAAC,EACnB,GAAG,EAAE,UAAU,EACf,aAAa,EACb,cAAsC,GACtC,EAAE,QAAQ,2CAkoKV"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/tui/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAON,KAAK,OAAO,EAiBZ,MAAM,YAAY,CAAA;AAiHnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AA2CvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAU/D,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAC1D,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,CAAA;CAC/C;AAOD,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,EAAE;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;CAC5B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAuKrB,6EAA6E;AAC7E,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,MAAM,EAAE,CAM7F;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAClC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,EAAE,MAAM,MAAM,EACpB,iBAAiB,GAAE,SAAS,MAAM,EAAO,GACvC,SAAS,iBAAiB,EAAE,CAuE9B;AA+GD,wBAAgB,GAAG,CAAC,EACnB,GAAG,EAAE,UAAU,EACf,aAAa,EACb,cAAsC,GACtC,EAAE,QAAQ,2CAwrKV"}

package/dist/tui/App.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 { 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';
@@ -462,9 +462,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 phases = agentPhases(next);
+        const activeCohorts = activeSubagentCohorts(next);
+        if (activeCohorts.length === 0) {
+            setAgentSurface(null);
+            return;
+        }
+        if (activeCohorts.some((agent) => agent.viewId === surface.selectedId))
+            return;
+        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 +486,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)
@@ -2502,6 +2509,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 +2521,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 +2548,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
@@ -3101,7 +3123,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;
                 }
@@ -4241,8 +4263,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 +4279,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));
@@ -4533,9 +4561,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 +4620,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, 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 &&
@@ -4611,11 +4648,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();