@bubblebrain-ai/bubble 0.0.28 → 0.0.30

package/dist/tui-ink/app.js

@@ -6,8 +6,9 @@ import { isHiddenToolMetadata } from "../agent/discovery-barrier.js";
 import { SessionManager } from "../session.js";
 import { registry as slashRegistry } from "../slash-commands/index.js";
 import { UserConfig, maskKey } from "../config.js";
-import { InputBox, isCtrlCInput, } from "./input-box.js";
+import { InputBox, isCtrlCInput, isCtrlLetterInput, } from "./input-box.js";
 import { MessageList } from "./message-list.js";
+import { isMultiplexedTerminal } from "./terminal-env.js";
 import { appendTextPart, appendToolPart, compactDisplayMessages, contentFromParts, latestCompactionSummary, moveStatusMessageToEnd, nextDisplayMessageKey, setUserInputStatus, snapshotDisplayParts, stripInterruptedAssistantMarker, toolCallsFromParts, } from "./display-history.js";
 import { AgentRunInputQueue } from "../agent/input-controller.js";
 import { paletteFor, ThemeProvider, useTheme } from "./theme.js";
@@ -23,6 +24,7 @@ import { useTerminalSize } from "./use-terminal-size.js";
 import { WelcomeBanner, shouldShowWelcomeBanner } from "./welcome.js";
 import { expandAtMentions } from "./file-mentions.js";
 import { TodosPanel } from "./todos.js";
+import { CompactionProgressCard } from "./compaction-progress.js";
 import { PlanConfirm } from "./plan-confirm.js";
 import { ApprovalDialog } from "./approval/approval-dialog.js";
 import { getNextPermissionMode } from "../permission/mode.js";
@@ -35,6 +37,8 @@ import { formatImageUserDisplayText, nextImageDisplayLabelStart } from "../tui/i
 import { decideStartingSubmitFingerprint, submitPayloadFingerprint } from "./submit-dedupe.js";
 import { isQueuedInputForCurrentSession, queuedAndPendingDisplayKeys, } from "./input-queue.js";
 import { SessionPicker } from "./session-picker.js";
+import { SubagentInspector } from "./subagent-inspector.js";
+import { collectSubagentGroups, subagentSummary } from "./subagent-view.js";
 import { sessionDisplayName } from "../tui/session-display.js";
 import { parseGoalCommand } from "../goal/command.js";
 import { continuationPrompt, initialPrompt } from "../goal/prompts.js";
@@ -223,34 +227,10 @@ function withMessageKey(message) {
 // 40ms keeps perceived latency invisible while capping layout work at 25fps.
 const STREAMING_FLUSH_INTERVAL_MS = 40;
 export const INK_LOCAL_SLASH_COMMANDS = [
-    {
-        name: "thinking",
-        description: "Toggle thinking block visibility",
-    },
-    {
-        name: "toggle-thinking",
-        description: "Toggle thinking block visibility",
-    },
     {
         name: "goal",
         description: "Set/manage an autonomous goal (/goal <objective>|clear|pause|resume|edit)",
     },
-    {
-        name: "trace",
-        description: "Toggle verbose trace output",
-    },
-    {
-        name: "verbose",
-        description: "Toggle verbose trace output",
-    },
-    {
-        name: "debug",
-        description: "Toggle verbose trace output",
-    },
-    {
-        name: "write-previews",
-        description: "Toggle write preview expansion",
-    },
 ];
 export function App({ agent, args, sessionManager: initialSessionManager, switchSession, createProvider, registry, skillRegistry, planHandlerRef, approvalHandlerRef, questionController, bashAllowlist, settingsManager, lspService, mcpManager, themeMode: initialThemeMode, themeOverrides, detectedTheme, onThemeModeChange, flushMemory, runMemoryCompaction, runMemorySummary, runMemoryRefresh, goalStore, bypassEnabled, updateNotice, updateNoticeRefresh, hookController, onExit }) {
     const [sessionManager, setSessionManager] = useState(initialSessionManager);
@@ -277,7 +257,31 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     const [streamingReasoning, setStreamingReasoning] = useState("");
     const [streamingTools, setStreamingTools] = useState([]);
     const [streamingParts, setStreamingParts] = useState([]);
-    const [thinkingLevel, setThinkingLevel] = useState(agent.thinking);
+    // Live subagent groups for the inspector opened from the subagent entry line;
+    // recomputed each render so it reflects members as their events stream into the transcript.
+    const subagentGroups = useMemo(() => collectSubagentGroups(messages, streamingTools), [messages, streamingTools]);
+    const subagentMembers = useMemo(() => subagentGroups.flatMap((g) => g.members), [subagentGroups]);
+    // Down-arrow from the composer focuses the subagent entry line; Enter then
+    // opens the inspector, Esc/Up returns to the composer (Claude Code parity).
+    const [subagentEntryFocused, setSubagentEntryFocused] = useState(false);
+    useEffect(() => {
+        if (subagentMembers.length === 0 && subagentEntryFocused)
+            setSubagentEntryFocused(false);
+    }, [subagentMembers.length, subagentEntryFocused]);
+    // Live progress for a manual `/compact` run (null when not compacting).
+    const [compaction, setCompaction] = useState(null);
+    // Normalize agent.thinking against the current model's supported levels so the
+    // banner displays the *effective* level, not a stale user-config value like
+    // "xhigh" when switching to a model that only supports ["high","max","off"].
+    const [thinkingLevel, setThinkingLevel] = useState(() => {
+        const modelParts = agent.model.includes(":")
+            ? agent.model.split(":")
+            : [agent.providerId || safeRegistry.getDefault()?.id || "openai", agent.model];
+        const providerId = modelParts[0];
+        const modelId = modelParts.slice(1).join(":");
+        const availableLevels = getAvailableThinkingLevels(providerId, modelId);
+        return normalizeThinkingLevel(agent.thinking, availableLevels);
+    });
     const [permissionMode, setPermissionMode] = useState(agent.mode);
     const [todos, setTodos] = useState(() => agent.getTodos());
     const [goalLine, setGoalLine] = useState("");
@@ -292,9 +296,7 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     const [composerDraft, setComposerDraft] = useState(null);
     const [keyProviderId, setKeyProviderId] = useState(null);
     const [showThinking, setShowThinking] = useState(false);
-    const [expandedToolOutput, setExpandedToolOutput] = useState(false);
     const [verboseTrace, setVerboseTrace] = useState(false);
-    const [sidebarMode, setSidebarMode] = useState("collapsed");
     const startedWithVisibleHistoryRef = useRef(messages.some((message) => message.syntheticKind !== "ui_summary"));
     const { columns: terminalColumns, rows: terminalRows } = useTerminalSize();
     const showWelcome = shouldShowWelcomeBanner({
@@ -310,6 +312,12 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     // MessageList so Ink discards its already-printed rows and re-prints the
     // rebuilt list onto a freshly-cleared screen instead of appending duplicates.
     const [staticGeneration, setStaticGeneration] = useState(0);
+    const reprintTranscript = useCallback(() => {
+        if (process.stdout.isTTY) {
+            process.stdout.write("\x1b[2J\x1b[3J\x1b[H");
+        }
+        setStaticGeneration((generation) => generation + 1);
+    }, []);
     // Steer/queue while the agent runs:
     // Enter steers the current run via the agent's input controller; Tab (or an
     // ineligible input) queues for the next turn. Both render placeholder user
@@ -521,7 +529,25 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
         // also frees the arrow keys entirely for composer history.
         if (pendingPlan || pendingApproval || pendingQuestion || pendingFeedback || statsPanel)
             return;
-        if (key.ctrl && input.toLowerCase() === "p" && !pickerMode && !activeAbortRef.current) {
+        // Subagent entry is focused (the composer is disabled): Enter opens the
+        // inspector, Up/Esc returns to the composer. Other keys just return focus.
+        if (subagentEntryFocused && !pickerMode) {
+            if (key.return) {
+                setSubagentEntryFocused(false);
+                setStatsPanel(null);
+                setPickerMode("agents");
+                return;
+            }
+            if (key.escape || key.upArrow) {
+                setSubagentEntryFocused(false);
+                return;
+            }
+            if (key.downArrow)
+                return; // stay focused
+            setSubagentEntryFocused(false);
+            return;
+        }
+        if (isCtrlLetterInput(input, key, "p") && !pickerMode && !activeAbortRef.current) {
             setStatsPanel(null);
             setPickerMode("slash");
             return;
@@ -536,7 +562,7 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
             }
             return;
         }
-        if (key.ctrl && input.toLowerCase() === "t" && !pickerMode) {
+        if (isCtrlLetterInput(input, key, "t") && !pickerMode) {
             setShowThinking((current) => {
                 const next = !current;
                 addMessage("assistant", next ? "Thinking blocks visible" : "Thinking blocks hidden");
@@ -544,12 +570,13 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
             });
             return;
         }
-        if (key.ctrl && input === "o" && !pickerMode) {
+        if (isCtrlLetterInput(input, key, "o") && !pickerMode) {
             setVerboseTrace((v) => !v);
+            reprintTranscript();
             return;
         }
         // Ctrl+R: cycle thinking level (formerly Shift+Tab)
-        if (key.ctrl && input === "r" && !pickerMode) {
+        if (isCtrlLetterInput(input, key, "r") && !pickerMode) {
             const modelParts = agent.model.includes(":")
                 ? agent.model.split(":")
                 : [agent.providerId || safeRegistry.getDefault()?.id || "openai", agent.model];
@@ -593,12 +620,9 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     // un-printed, so we wipe the screen + scrollback and bump the Static key:
     // Ink then re-prints the rebuilt list fresh instead of appending duplicates.
     const resetTranscript = useCallback((updater) => {
-        if (process.stdout.isTTY) {
-            process.stdout.write("\x1b[2J\x1b[3J\x1b[H");
-        }
-        setStaticGeneration((generation) => generation + 1);
+        reprintTranscript();
         updateDisplayMessages(updater);
-    }, [updateDisplayMessages]);
+    }, [reprintTranscript, updateDisplayMessages]);
     const addMessage = useCallback((role, content) => {
         updateDisplayMessages((prev) => [...prev, withMessageKey({ role, content })]);
     }, [updateDisplayMessages]);
@@ -642,7 +666,11 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
         // <Static>), so clearing React state is not enough — resetTranscript wipes
         // the screen + scrollback and re-prints the (now empty) transcript.
         resetTranscript(() => []);
-    }, [resetTranscript]);
+        // The todos panel renders off React state, not the transcript, so wiping
+        // messages alone leaves a stale To-Do list on screen. /clear already reset
+        // the agent's todos; mirror that into the UI (same as session switch).
+        setTodos(agent.getTodos());
+    }, [resetTranscript, agent]);
     // Render a placeholder user row for input waiting to enter the run.
     const addStatusUserMessage = useCallback((content, status) => {
         const key = nextDisplayMessageKey("user");
@@ -709,21 +737,6 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
         const { description: _drop, ...rest } = base;
         setPendingFeedback({ base: rest, initialDescription });
     }, [agent]);
-    const sidebarFits = terminalColumns > 120;
-    const sidebarVisible = sidebarMode === "expanded" ? sidebarFits : sidebarMode === "auto" && sidebarFits;
-    const currentSidebarCommandState = useCallback((mode = sidebarMode) => {
-        const visible = mode === "expanded" ? sidebarFits : mode === "auto" && sidebarFits;
-        return { mode, visible, active: visible };
-    }, [sidebarFits, sidebarMode]);
-    const toggleSidebar = useCallback(() => {
-        const next = sidebarVisible ? "collapsed" : "expanded";
-        setSidebarMode(next);
-        return currentSidebarCommandState(next);
-    }, [currentSidebarCommandState, sidebarVisible]);
-    const applySidebarMode = useCallback((mode) => {
-        setSidebarMode(mode);
-        return currentSidebarCommandState(mode);
-    }, [currentSidebarCommandState]);
     const openSessionPicker = useCallback(() => {
         if (activeAbortRef.current) {
             addMessage("error", "Stop the current run before switching sessions.");
@@ -1238,7 +1251,14 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                                 if (steer) {
                                     pendingSteersRef.current.delete(event.id);
                                     setPendingSteerCount(pendingSteersRef.current.size);
-                                    resetTranscript((prev) => moveStatusMessageToEnd(prev, steer.displayKey));
+                                    // Moving the steer placeholder out of the live region into
+                                    // <Static> is a pure append (it was never in the settled list,
+                                    // only the dynamic block). Off a multiplexer Ink erases the
+                                    // vacated live rows in place, so a plain append avoids the
+                                    // full-screen reprint flash. Under tmux/screen the in-place
+                                    // erase can't reach scrolled rows, so keep the clean reprint.
+                                    const commit = isMultiplexedTerminal() ? resetTranscript : updateDisplayMessages;
+                                    commit((prev) => moveStatusMessageToEnd(prev, steer.displayKey));
                                 }
                                 break;
                             }
@@ -1287,7 +1307,24 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                     commitAssistantMessage();
                     if (err instanceof AgentAbortError || err?.name === "AbortError") {
                         runCancelled = true;
-                        resetTranscript(() => reconstructDisplayMessages(agent.messages));
+                        // commitAssistantMessage already appended the partial answer; the
+                        // interrupt is otherwise a pure append (the partial + a "Interrupted"
+                        // row). Off a multiplexer, append just the interrupt row so settled
+                        // history is never reprinted — no flash. Under tmux/screen, fall back
+                        // to the full reprint that rebuilds from the canonical agent.messages.
+                        if (isMultiplexedTerminal()) {
+                            resetTranscript(() => reconstructDisplayMessages(agent.messages));
+                        }
+                        else {
+                            updateDisplayMessages((prev) => [
+                                ...prev,
+                                withMessageKey({
+                                    role: "assistant",
+                                    content: "Interrupted by user",
+                                    syntheticKind: "ui_interrupt",
+                                }),
+                            ]);
+                        }
                     }
                     else {
                         runErrored = true;
@@ -1479,30 +1516,6 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                     requestExit();
                     return;
                 }
-                if (/^\/(?:thinking|toggle-thinking)(?:\s|$)/.test(input.trim())) {
-                    setShowThinking((current) => {
-                        const next = !current;
-                        addMessage("assistant", next ? "Thinking blocks visible" : "Thinking blocks hidden");
-                        return next;
-                    });
-                    return;
-                }
-                if (/^\/(?:trace|verbose|debug)(?:\s|$)/.test(input.trim())) {
-                    setVerboseTrace((current) => {
-                        const next = !current;
-                        addMessage("assistant", next ? "Verbose trace visible" : "Compact trace visible");
-                        return next;
-                    });
-                    return;
-                }
-                if (/^\/write-previews(?:\s|$)/.test(input.trim())) {
-                    setExpandedToolOutput((current) => {
-                        const next = !current;
-                        addMessage("assistant", next ? "Write previews expanded" : "Write previews collapsed");
-                        return next;
-                    });
-                    return;
-                }
                 if (/^\/goal(?:\s|$)/.test(input.trim())) {
                     await handleGoalCommand(input);
                     return;
@@ -1541,9 +1554,8 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                     getThemeMode: () => themeMode,
                     getResolvedTheme: () => themeResolved,
                     setThemeMode: applyThemeMode,
-                    toggleSidebar,
-                    setSidebarMode: applySidebarMode,
                     openStats: openStatsPanel,
+                    compactionProgress: setCompaction,
                 });
                 if (handled) {
                     if (agent.mode !== permissionMode) {
@@ -1607,7 +1619,7 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                 setStartingSubmit(null);
             }
         }
-    }, [addMessage, agent, args.cwd, openPicker, openSessionPicker, openRewindPicker, openStatsPanel, createProvider, currentSessionFile, fillComposer, prepareSubmitDisplay, safeRegistry, safeSkillRegistry, updateDisplayMessages, queueInput, submitSteer, requestExit, toggleSidebar, applySidebarMode, setStartingSubmit]);
+    }, [addMessage, agent, args.cwd, openPicker, openSessionPicker, openRewindPicker, openStatsPanel, createProvider, currentSessionFile, fillComposer, prepareSubmitDisplay, safeRegistry, safeSkillRegistry, updateDisplayMessages, queueInput, submitSteer, requestExit, setStartingSubmit]);
     // Drain the queue once the run ends and no modal needs the user first.
     // The placeholder row is removed right before resubmitting — handleSubmit
     // renders the message again as a regular user row.
@@ -1672,78 +1684,80 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     // tail, pickers, composer, footer) occupies the live region. Letting it size
     // to its content keeps the composer pinned just below the latest output the
     // way ordinary shell programs do.
-    const sidebarWidth = sidebarVisible ? Math.min(42, Math.max(28, Math.floor(terminalColumns * 0.34))) : 0;
-    const mainWidth = Math.max(40, terminalColumns - sidebarWidth);
-    return (_jsx(ThemeProvider, { value: palette, children: _jsxs(Box, { flexDirection: "row", width: terminalColumns, backgroundColor: palette.background, children: [_jsxs(Box, { flexDirection: "column", width: mainWidth, backgroundColor: palette.background, children: [_jsx(MessageList, { messages: messages, streamingContent: streamingContent, streamingReasoning: streamingReasoning, streamingTools: streamingTools, streamingParts: streamingParts, terminalColumns: mainWidth, showThinking: showThinking, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: approvalHint, nowTick: nowTick, welcomeBanner: welcomeBannerNode, staticGeneration: staticGeneration, paddingX: 1, maxStreamRows: Math.max(6, terminalRows - 10) }), pickerMode === "model" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ModelPicker, { registry: safeRegistry, current: agent.model, currentThinkingLevel: thinkingLevel, recent: userConfig.getRecentModels(), onSelect: handleModelSelect, onCancel: closePicker }) })), pickerMode === "provider" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
-                                    .filter((p) => isUserVisibleProvider(p.id))
-                                    .map((p) => {
-                                    const configured = safeRegistry.getConfigured().find((item) => item.id === p.id);
-                                    const configuredLabel = configured?.apiKey ? "configured" : "needs key";
-                                    return {
-                                        id: p.id,
-                                        name: `${p.name} [${configuredLabel}]`,
-                                        enabled: true,
-                                    };
-                                }), current: currentProviderId, onSelect: handleProviderSelect, onCancel: closePicker }) })), pickerMode === "provider-add" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
-                                    .filter((p) => isUserVisibleProvider(p.id))
-                                    .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleProviderAddSelect, onCancel: closePicker, title: "Add Provider" }) })), pickerMode === "login" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
-                                    .filter((p) => isUserVisibleProvider(p.id) && safeRegistry.supportsOAuth(p.id))
-                                    .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleLoginProviderSelect, onCancel: closePicker, title: "Select Login Provider" }) })), pickerMode === "logout" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: safeRegistry.getConfigured()
-                                    .filter((p) => safeRegistry.getAuthStorage().has(p.id))
-                                    .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleLogoutProviderSelect, onCancel: closePicker, title: "Select Logout Provider" }) })), pickerMode === "key" && keyTarget && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(KeyPicker, { providerName: keyTarget.name, onSubmit: handleKeySubmit, onCancel: () => {
-                                    closePicker();
-                                    setKeyProviderId(null);
-                                } }) })), pickerMode === "skill" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SkillPicker, { skills: safeSkillRegistry.summaries(), onSelect: (name) => {
-                                    fillComposer(`/${name} `);
-                                    closePicker();
-                                }, onCancel: closePicker }) })), pickerMode === "slash" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(CommandPalette, { items: commandPaletteItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
-                                    closePicker();
-                                    if (item.action === "insert-skill") {
-                                        fillComposer(`/${item.value} `);
-                                    }
-                                    else {
-                                        void handleSubmit(item.command);
-                                    }
-                                }, onCancel: closePicker }) })), pickerMode === "mcp-reconnect" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(McpReconnectPicker, { items: mcpReconnectItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
-                                    closePicker();
-                                    void handleSubmit(item.command);
-                                }, onCancel: closePicker }) })), pickerMode === "session" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SessionPicker, { currentCwd: args.cwd, currentSessions: SessionManager.summarizeSessionsForCwd(args.cwd), allSessions: SessionManager.listAllSessions(), onSelect: handleSessionSelect, onCancel: closePicker }) })), pickerMode === "rewind" && sessionManager && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(RewindPicker, { sessionManager: sessionManager, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (command) => {
-                                    closePicker();
-                                    void handleSubmit(command);
-                                }, onCancel: closePicker }) })), pickerMode === "feishu-setup" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(FeishuSetupPicker, { onComplete: (summary) => {
-                                    closePicker();
-                                    addMessage("assistant", summary);
-                                }, onCancel: () => {
-                                    closePicker();
-                                    addMessage("assistant", "已取消 Feishu setup。");
-                                } }) })), statsPanel && !pickerMode && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(StatsPanel, { panel: statsPanel, terminalColumns: mainWidth, terminalRows: terminalRows, onRangeChange: (range) => setStatsPanel((current) => current ? { ...current, range } : current), onCancel: closeStatsPanel }) })), todos.length > 0 && !pickerMode && !statsPanel && !pendingPlan && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(TodosPanel, { todos: todos, terminalColumns: terminalColumns }) })), pendingPlan && !pickerMode && !statsPanel && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(PlanConfirm, { initialPlan: pendingPlan.plan, onApprove: (finalPlan) => {
-                                    const resolve = pendingPlan.resolve;
-                                    setPendingPlan(null);
-                                    resolve({ action: "approve", plan: finalPlan });
-                                }, onReject: (reason) => {
-                                    const resolve = pendingPlan.resolve;
-                                    setPendingPlan(null);
-                                    resolve({ action: "reject", reason });
-                                } }) })), pendingApproval && !pickerMode && !statsPanel && !pendingPlan && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ApprovalDialog, { request: pendingApproval.request, onDecision: (decision) => {
-                                    const resolve = pendingApproval.resolve;
-                                    setPendingApproval(null);
-                                    resolve(decision);
-                                }, onAllowBashPrefix: (prefix) => {
-                                    bashAllowlist?.add(prefix);
-                                } }) })), pendingQuestion && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingFeedback && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(QuestionDialog, { request: pendingQuestion, onSubmit: (answers) => {
-                                    questionController?.reply(pendingQuestion.id, answers);
-                                    setPendingQuestion(null);
-                                }, onCancel: () => {
-                                    questionController?.reject(pendingQuestion.id);
-                                    setPendingQuestion(null);
-                                } }) })), pendingFeedback && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(FeedbackDialog, { base: pendingFeedback.base, initialDescription: pendingFeedback.initialDescription, onDismiss: () => setPendingFeedback(null), onResult: (result) => {
-                                    if (result.kind === "success") {
-                                        addMessage("assistant", `Feedback submitted: ${result.url}`);
-                                    }
-                                    else if (result.kind === "error") {
-                                        addMessage("error", `Feedback failed: ${result.message}`);
-                                    }
-                                } }) })), !isExiting && isRunning && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingQuestion && !pendingFeedback && (_jsx(Box, { paddingX: 1, paddingBottom: 1, flexShrink: 0, backgroundColor: palette.background, children: _jsx(WaitingIndicator, { tools: streamingTools, hasStreamingText: streamingContent.length > 0, hasStreamingReasoning: streamingReasoning.length > 0, streamedChars: streamingContent.length + streamingReasoning.length, nowTick: nowTick, pendingSteerCount: pendingSteerCount, queuedCount: queuedCount }) })), !isExiting && !pickerMode && !statsPanel && (_jsx(Box, { paddingBottom: 1, flexShrink: 0, backgroundColor: palette.background, children: _jsx(InputBox, { onSubmit: handleSubmit, onQueue: isRunning ? queueInput : undefined, disabled: !!pendingPlan || !!pendingApproval || !!pendingQuestion || !!pendingFeedback || !!statsPanel, cursorResetEpoch: cursorResetEpoch, draftText: composerDraft?.text, draftEpoch: composerDraft?.epoch, onDraftApplied: clearComposerDraft, skillRegistry: safeSkillRegistry, localSlashCommands: [...INK_LOCAL_SLASH_COMMANDS], terminalColumns: mainWidth, cwd: args.cwd, sessionFile: currentSessionFile(), nextImageLabelStart: nextImageDisplayLabelStartRef.current }) })), !isExiting && (_jsx(Box, { flexShrink: 0, children: _jsx(FooterBar, { data: buildFooterData({ mode: permissionMode, goalLine }) }) }))] }), sidebarVisible && (_jsx(InkSidebar, { width: sidebarWidth, agent: agent, sessionManager: sessionManager, cwd: args.cwd, mode: permissionMode, goalLine: goalLine, todos: todos, mcpManager: mcpManager, lspService: lspService }))] }) }));
+    const mainWidth = Math.max(40, terminalColumns);
+    return (_jsx(ThemeProvider, { value: palette, children: _jsxs(Box, { flexDirection: "column", width: mainWidth, backgroundColor: palette.background, children: [_jsx(MessageList, { messages: messages, streamingContent: streamingContent, streamingReasoning: streamingReasoning, streamingTools: streamingTools, streamingParts: streamingParts, terminalColumns: mainWidth, showThinking: showThinking, verboseTrace: verboseTrace, pendingApproval: approvalHint, nowTick: nowTick, welcomeBanner: welcomeBannerNode, staticGeneration: staticGeneration, paddingX: 1, maxStreamRows: Math.max(6, terminalRows - 10) }), pickerMode === "model" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ModelPicker, { registry: safeRegistry, current: agent.model, currentThinkingLevel: thinkingLevel, recent: userConfig.getRecentModels(), onSelect: handleModelSelect, onCancel: closePicker }) })), pickerMode === "provider" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
+                            .filter((p) => isUserVisibleProvider(p.id))
+                            .map((p) => {
+                            const configured = safeRegistry.getConfigured().find((item) => item.id === p.id);
+                            const configuredLabel = configured?.apiKey ? "configured" : "needs key";
+                            return {
+                                id: p.id,
+                                name: `${p.name} [${configuredLabel}]`,
+                                enabled: true,
+                            };
+                        }), current: currentProviderId, onSelect: handleProviderSelect, onCancel: closePicker }) })), pickerMode === "provider-add" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
+                            .filter((p) => isUserVisibleProvider(p.id))
+                            .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleProviderAddSelect, onCancel: closePicker, title: "Add Provider" }) })), pickerMode === "login" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: BUILTIN_PROVIDERS
+                            .filter((p) => isUserVisibleProvider(p.id) && safeRegistry.supportsOAuth(p.id))
+                            .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleLoginProviderSelect, onCancel: closePicker, title: "Select Login Provider" }) })), pickerMode === "logout" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { providers: safeRegistry.getConfigured()
+                            .filter((p) => safeRegistry.getAuthStorage().has(p.id))
+                            .map((p) => ({ id: p.id, name: p.name, enabled: true })), current: currentProviderId, onSelect: handleLogoutProviderSelect, onCancel: closePicker, title: "Select Logout Provider" }) })), pickerMode === "key" && keyTarget && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(KeyPicker, { providerName: keyTarget.name, onSubmit: handleKeySubmit, onCancel: () => {
+                            closePicker();
+                            setKeyProviderId(null);
+                        } }) })), pickerMode === "skill" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SkillPicker, { skills: safeSkillRegistry.summaries(), onSelect: (name) => {
+                            fillComposer(`/${name} `);
+                            closePicker();
+                        }, onCancel: closePicker }) })), pickerMode === "slash" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(CommandPalette, { items: commandPaletteItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
+                            closePicker();
+                            if (item.action === "insert-skill") {
+                                fillComposer(`/${item.value} `);
+                            }
+                            else {
+                                void handleSubmit(item.command);
+                            }
+                        }, onCancel: closePicker }) })), pickerMode === "mcp-reconnect" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(McpReconnectPicker, { items: mcpReconnectItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
+                            closePicker();
+                            void handleSubmit(item.command);
+                        }, onCancel: closePicker }) })), pickerMode === "session" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SessionPicker, { currentCwd: args.cwd, currentSessions: SessionManager.summarizeSessionsForCwd(args.cwd), allSessions: SessionManager.listAllSessions(), onSelect: handleSessionSelect, onCancel: closePicker }) })), pickerMode === "agents" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SubagentInspector, { groups: subagentGroups, onCancel: closePicker }) })), pickerMode === "rewind" && sessionManager && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(RewindPicker, { sessionManager: sessionManager, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (command) => {
+                            closePicker();
+                            void handleSubmit(command);
+                        }, onCancel: closePicker }) })), pickerMode === "feishu-setup" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(FeishuSetupPicker, { onComplete: (summary) => {
+                            closePicker();
+                            addMessage("assistant", summary);
+                        }, onCancel: () => {
+                            closePicker();
+                            addMessage("assistant", "已取消 Feishu setup。");
+                        } }) })), statsPanel && !pickerMode && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(StatsPanel, { panel: statsPanel, terminalColumns: mainWidth, terminalRows: terminalRows, onRangeChange: (range) => setStatsPanel((current) => current ? { ...current, range } : current), onCancel: closeStatsPanel }) })), todos.length > 0 && !pickerMode && !statsPanel && !pendingPlan && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(TodosPanel, { todos: todos, terminalColumns: terminalColumns }) })), pendingPlan && !pickerMode && !statsPanel && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(PlanConfirm, { initialPlan: pendingPlan.plan, onApprove: (finalPlan) => {
+                            const resolve = pendingPlan.resolve;
+                            setPendingPlan(null);
+                            resolve({ action: "approve", plan: finalPlan });
+                        }, onReject: (reason) => {
+                            const resolve = pendingPlan.resolve;
+                            setPendingPlan(null);
+                            resolve({ action: "reject", reason });
+                        } }) })), pendingApproval && !pickerMode && !statsPanel && !pendingPlan && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ApprovalDialog, { request: pendingApproval.request, onDecision: (decision) => {
+                            const resolve = pendingApproval.resolve;
+                            setPendingApproval(null);
+                            resolve(decision);
+                        }, onAllowBashPrefix: (prefix) => {
+                            bashAllowlist?.add(prefix);
+                        } }) })), pendingQuestion && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingFeedback && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(QuestionDialog, { request: pendingQuestion, onSubmit: (answers) => {
+                            questionController?.reply(pendingQuestion.id, answers);
+                            setPendingQuestion(null);
+                        }, onCancel: () => {
+                            questionController?.reject(pendingQuestion.id);
+                            setPendingQuestion(null);
+                        } }) })), pendingFeedback && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingQuestion && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(FeedbackDialog, { base: pendingFeedback.base, initialDescription: pendingFeedback.initialDescription, onDismiss: () => setPendingFeedback(null), onResult: (result) => {
+                            if (result.kind === "success") {
+                                addMessage("assistant", `Feedback submitted: ${result.url}`);
+                            }
+                            else if (result.kind === "error") {
+                                addMessage("error", `Feedback failed: ${result.message}`);
+                            }
+                        } }) })), !isExiting && compaction && (_jsx(Box, { flexShrink: 0, backgroundColor: palette.background, children: _jsx(CompactionProgressCard, { progress: compaction }) })), !isExiting && isRunning && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingQuestion && !pendingFeedback && (_jsx(Box, { paddingX: 1, paddingBottom: 1, flexShrink: 0, backgroundColor: palette.background, children: _jsx(WaitingIndicator, { tools: streamingTools, hasStreamingText: streamingContent.length > 0, hasStreamingReasoning: streamingReasoning.length > 0, streamedChars: streamingContent.length + streamingReasoning.length, nowTick: nowTick, pendingSteerCount: pendingSteerCount, queuedCount: queuedCount }) })), !isExiting && !pickerMode && !statsPanel && (_jsx(Box, { paddingBottom: 1, flexShrink: 0, backgroundColor: palette.background, children: _jsx(InputBox, { onSubmit: handleSubmit, onQueue: isRunning ? queueInput : undefined, onArrowDownAtBottom: () => {
+                            if (subagentMembers.length > 0 && !pickerMode)
+                                setSubagentEntryFocused(true);
+                        }, disabled: !!pendingPlan || !!pendingApproval || !!pendingQuestion || !!pendingFeedback || !!statsPanel || subagentEntryFocused, cursorResetEpoch: cursorResetEpoch, draftText: composerDraft?.text, draftEpoch: composerDraft?.epoch, onDraftApplied: clearComposerDraft, skillRegistry: safeSkillRegistry, localSlashCommands: [...INK_LOCAL_SLASH_COMMANDS], terminalColumns: mainWidth, cwd: args.cwd, sessionFile: currentSessionFile(), nextImageLabelStart: nextImageDisplayLabelStartRef.current }) })), !isExiting && !pickerMode && !statsPanel && !pendingPlan && !pendingApproval && !pendingQuestion && !pendingFeedback && subagentMembers.length > 0 && (_jsxs(Box, { paddingX: 1, flexShrink: 0, backgroundColor: palette.background, children: [_jsx(Text, { bold: subagentEntryFocused, color: subagentEntryFocused ? palette.accent : palette.toolName, children: subagentEntryFocused ? "> ↳ " : "  ↳ " }), _jsxs(Text, { color: subagentEntryFocused ? palette.accent : palette.muted, children: [subagentMembers.length, " subagent", subagentMembers.length === 1 ? "" : "s", " \u00B7 ", subagentSummary(subagentMembers), " \u00B7 "] }), _jsx(Text, { color: palette.accent, children: subagentEntryFocused ? "Enter open · Esc back" : "↓ to inspect traces" })] })), !isExiting && (_jsx(Box, { flexShrink: 0, children: _jsx(FooterBar, { data: buildFooterData({ mode: permissionMode, goalLine }) }) }))] }) }));
 }
 function buildCommandPaletteItems(skillRegistry) {
     const items = new Map();
@@ -2031,82 +2045,6 @@ function StatsPanel({ panel, terminalColumns, terminalRows, onRangeChange, onCan
                     return (_jsx(Text, { color: heading ? theme.accent : undefined, bold: heading, children: line || " " }, key));
                 }) }), maxScroll > 0 && (_jsxs(Text, { color: theme.muted, children: [scroll + 1, "-", Math.min(lines.length, scroll + maxVisible), " of ", lines.length] }))] }));
 }
-function summarizeMcpStates(states) {
-    const summary = { connected: 0, starting: 0, failed: 0, disabled: 0, tools: 0 };
-    for (const state of states) {
-        if (state.status.kind === "connected") {
-            summary.connected += 1;
-            summary.tools += state.status.tools.length;
-        }
-        else if (state.status.kind === "failed") {
-            summary.failed += 1;
-        }
-        else {
-            summary.disabled += 1;
-        }
-    }
-    return summary;
-}
-function summarizeLspStatuses(statuses) {
-    const summary = { connected: 0, starting: 0, failed: 0, disabled: 0 };
-    for (const status of statuses) {
-        if (status.status === "connected")
-            summary.connected += 1;
-        else if (status.status === "starting")
-            summary.starting += 1;
-        else
-            summary.failed += 1;
-    }
-    return summary;
-}
-function formatStatusCount(summary) {
-    const parts = [];
-    if (summary.connected > 0)
-        parts.push(`${summary.connected} up`);
-    if (summary.starting > 0)
-        parts.push(`${summary.starting} starting`);
-    if (summary.failed > 0)
-        parts.push(`${summary.failed} failed`);
-    if (summary.disabled > 0)
-        parts.push(`${summary.disabled} disabled`);
-    return parts.join(" · ") || "none";
-}
-function SidebarSection({ title, children }) {
-    const theme = useTheme();
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: theme.accent, bold: true, children: title }), children] }));
-}
-function SidebarRow({ label, value, color, }) {
-    const theme = useTheme();
-    return (_jsxs(Box, { children: [_jsxs(Text, { color: theme.muted, children: [label, ": "] }), _jsx(Text, { color: color ?? theme.userMessageText, children: value })] }));
-}
-function InkSidebar({ width, agent, sessionManager, cwd, mode, goalLine, todos, mcpManager, lspService, }) {
-    const theme = useTheme();
-    const innerWidth = Math.max(12, width - 4);
-    const todoCounts = todos.reduce((acc, todo) => {
-        acc[todo.status] = (acc[todo.status] ?? 0) + 1;
-        return acc;
-    }, {});
-    const todoSummary = todos.length === 0
-        ? "none"
-        : [
-            todoCounts.in_progress ? `${todoCounts.in_progress} active` : "",
-            todoCounts.pending ? `${todoCounts.pending} pending` : "",
-            todoCounts.completed ? `${todoCounts.completed} done` : "",
-        ].filter(Boolean).join(" · ");
-    const mcpStates = mcpManager?.getStates() ?? [];
-    const mcpSummary = summarizeMcpStates(mcpStates);
-    const lspSummary = lspService?.isDisabled()
-        ? { connected: 0, starting: 0, failed: 0, disabled: 1 }
-        : summarizeLspStatuses(lspService?.status() ?? []);
-    const latestMcpFailure = mcpStates.find((state) => state.status.kind === "failed");
-    const latestLspFailure = lspService?.status().find((status) => status.status === "error");
-    const sessionTitle = truncate(sessionDisplayName(sessionManager), innerWidth);
-    const modelLabel = agent.model ? displayModel(agent.model) : "not selected";
-    const route = agent.providerId
-        ? `${agent.providerId}/${modelLabel}`
-        : modelLabel;
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: "100%", borderStyle: "single", borderColor: theme.border, paddingX: 1, paddingY: 1, flexShrink: 0, children: [_jsx(Text, { color: theme.borderActive, bold: true, children: "Session" }), _jsx(Text, { color: theme.userMessageText, children: sessionTitle }), _jsx(Text, { color: theme.muted, children: truncate(friendlyCwd(cwd), innerWidth) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(SidebarSection, { title: "Runtime", children: [_jsx(SidebarRow, { label: "model", value: truncate(route, innerWidth - 7) }), _jsx(SidebarRow, { label: "mode", value: mode, color: mode === "bypassPermissions" ? theme.warning : theme.userMessageText }), _jsx(SidebarRow, { label: "thinking", value: agent.thinking || "off" })] }), goalLine && (_jsx(SidebarSection, { title: "Goal", children: _jsx(Text, { color: theme.userMessageText, children: truncate(goalLine, innerWidth) }) })), _jsx(SidebarSection, { title: "Todos", children: _jsx(Text, { color: todos.length > 0 ? theme.userMessageText : theme.muted, children: truncate(todoSummary, innerWidth) }) }), _jsxs(SidebarSection, { title: "MCP", children: [_jsx(Text, { color: mcpSummary.failed > 0 ? theme.warning : theme.userMessageText, children: truncate(`${formatStatusCount(mcpSummary)}${mcpSummary.tools > 0 ? ` · ${mcpSummary.tools} tools` : ""}`, innerWidth) }), latestMcpFailure?.status.kind === "failed" && (_jsx(Text, { color: theme.muted, children: truncate(latestMcpFailure.status.error, innerWidth) }))] }), _jsxs(SidebarSection, { title: "LSP", children: [_jsx(Text, { color: lspSummary.failed > 0 ? theme.warning : theme.userMessageText, children: truncate(formatStatusCount(lspSummary), innerWidth) }), latestLspFailure?.message && (_jsx(Text, { color: theme.muted, children: truncate(latestLspFailure.message, innerWidth) }))] })] })] }));
-}
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 const GENERIC_PHRASES = [
     "mapping the workspace",

package/dist/tui-ink/compaction-progress.d.ts

@@ -0,0 +1,19 @@
+import type { CompactionProgress } from "../slash-commands/types.js";
+/**
+ * Map a compaction phase + streamed length onto a 0..1 bar fill. There is no
+ * true denominator for a single LLM call, so the curve is honest by design:
+ * it ramps but never reaches 1.0 (or even 0.9) until the work is actually done.
+ */
+export declare function compactionFraction(progress: CompactionProgress): number;
+export declare function renderBar(fraction: number, width?: number): {
+    filled: string;
+    empty: string;
+};
+/**
+ * Bottom-stack progress card for a manual `/compact` run. Mount it only while a
+ * compaction is in flight (i.e. render conditionally on a non-null progress) so
+ * its elapsed-time clock resets per run.
+ */
+export declare function CompactionProgressCard({ progress }: {
+    progress: CompactionProgress | null;
+}): import("react/jsx-runtime").JSX.Element | null;