@bubblebrain-ai/bubble 0.0.29 → 0.0.30

package/README.md

@@ -66,7 +66,6 @@ Bubble ships with a catalog of built-in providers. Configure them inside the app
 | --- | --- |
 | `/login` | OAuth sign-in for ChatGPT; unlocks the OpenAI Codex models without an API key. |
 | `/provider` | Open a picker to connect, switch, add, or remove a provider. |
-| `/key <provider> <key>` | Set the API key for a provider. |
 | `/model` | Pick the active model and reasoning effort. |
 
 Built-in providers include OpenAI, Anthropic, Google, DeepSeek, Moonshot (CN and international), Kimi for Coding, Zhipu AI, Z.AI, Alibaba DashScope, Doubao (Volcengine Ark), MiniMax, StepFun, Groq, Together AI, Fireworks, and a `local` profile for any OpenAI-compatible endpoint (Ollama, vLLM, LM Studio, etc.).
@@ -155,7 +154,7 @@ Rules use a simple pattern syntax, for example:
 | --- | --- |
 | `/help` | List available commands. |
 | `/model` | Switch model and reasoning effort. |
-| `/provider`, `/login`, `/logout`, `/key` | Connect and manage providers. |
+| `/provider`, `/login`, `/logout` | Connect and manage providers. |
 | `/session`, `/rewind`, `/clear` | Manage conversation history. |
 | `/skills` | Open the searchable skills picker. |
 | `/mcp` | List or reconnect MCP servers. |
@@ -163,7 +162,7 @@ Rules use a simple pattern syntax, for example:
 | `/permissions` | View or edit allow/deny rules. |
 | `/context`, `/stats`, `/compact` | Inspect context usage, model stats, and compact the session. |
 | `/lsp`, `/hooks` | Manage language servers and lifecycle hooks. |
-| `/theme`, `/sidebar` | Adjust the interface. |
+| `/theme` | Adjust the interface theme. |
 | `/feedback` | Send feedback or report a bug. |
 
 ## Non-interactive mode

package/dist/goal/format.d.ts

@@ -14,5 +14,5 @@ export declare function goalSummaryText(goal: GoalState): string;
  * update_goal tool can't report this — see goal/tools.ts).
  */
 export declare function goalCompleteNotice(goal: GoalState): string;
-/** Compact single-line indicator for the status line / sidebar. */
+/** Compact single-line indicator for status surfaces. */
 export declare function goalIndicatorLine(goal: GoalState, maxObjective?: number): string;

package/dist/goal/format.js

@@ -95,7 +95,7 @@ function completionTokenUsagePhrase(goal) {
         ? `${formatTokensCompact(goal.tokensUsed)}/${formatTokensCompact(goal.tokenBudget)} tok used`
         : `${formatTokensCompact(goal.tokensUsed)} tok used`;
 }
-/** Compact single-line indicator for the status line / sidebar. */
+/** Compact single-line indicator for status surfaces. */
 export function goalIndicatorLine(goal, maxObjective = 48) {
     const segments = [`goal: ${goalStatusLabel(goal.status)}`, `${goal.turnsSpent} turns`];
     const tokens = tokensPart(goal);

package/dist/slash-commands/commands.js

@@ -1,4 +1,4 @@
-import { UserConfig, maskKey } from "../config.js";
+import { UserConfig } from "../config.js";
 import { formatContextUsage } from "../context/usage.js";
 import { formatDiagnostics } from "../lsp/index.js";
 import { normalizeNameForMCP } from "../mcp/name.js";
@@ -8,7 +8,6 @@ import { getAvailableThinkingLevels, getDefaultThinkingLevel, normalizeThinkingL
 import { SessionManager } from "../session.js";
 import { buildSystemPrompt } from "../system-prompt.js";
 import { normalizeSingleLine } from "../text-display.js";
-import { copyToClipboard } from "../clipboard.js";
 import { formatRelativeTime } from "../tui/recent-activity.js";
 import { HOOK_EVENT_NAMES, isHookEventName } from "../hooks/index.js";
 import { isThinkingLevel } from "../variant/thinking-level.js";
@@ -287,17 +286,6 @@ async function handleMemoryCommand(args, ctx) {
     }
     return "Usage: /memory [status|search|compact|summarize|refresh|reset]";
 }
-function parseKeyArgs(args, ctx) {
-    const trimmed = args.trim();
-    const [first, ...rest] = trimmed.split(/\s+/);
-    const explicitProvider = first
-        ? ctx.registry.getConfigured().find((provider) => provider.id === first)
-        : undefined;
-    if (explicitProvider) {
-        return { provider: explicitProvider, apiKey: rest.join(" ") };
-    }
-    return { provider: ctx.registry.getDefault(), apiKey: trimmed };
-}
 const builtinSlashCommandEntries = [
     {
         name: "skills",
@@ -306,13 +294,6 @@ const builtinSlashCommandEntries = [
             ctx.openPicker("skill");
         },
     },
-    {
-        name: "agents",
-        description: "Inspect spawned subagents and their working traces (also Ctrl+G)",
-        async handler(_args, ctx) {
-            ctx.openPicker("agents");
-        },
-    },
     {
         name: "help",
         description: "Show available slash commands",
@@ -370,33 +351,6 @@ const builtinSlashCommandEntries = [
             return `Theme set to ${arg}${arg === "auto" ? ` (resolved to ${resolved})` : ""}.`;
         },
     },
-    {
-        name: "sidebar",
-        description: "Toggle the right sidebar. Usage: /sidebar [open|close|auto]",
-        async handler(args, ctx) {
-            if (!ctx.toggleSidebar || !ctx.setSidebarMode) {
-                return "Sidebar control is only available inside the TUI.";
-            }
-            const arg = args.trim().toLowerCase();
-            if (!arg) {
-                ctx.toggleSidebar();
-                return;
-            }
-            if (["open", "show", "expand", "expanded", "on"].includes(arg)) {
-                ctx.setSidebarMode("expanded");
-                return;
-            }
-            if (["close", "hide", "collapse", "collapsed", "off"].includes(arg)) {
-                ctx.setSidebarMode("collapsed");
-                return;
-            }
-            if (arg === "auto") {
-                ctx.setSidebarMode("auto");
-                return;
-            }
-            return "Usage: /sidebar [open|close|auto]";
-        },
-    },
     {
         name: "clear",
         description: "Clear the current conversation history",
@@ -410,27 +364,6 @@ const builtinSlashCommandEntries = [
             ctx.clearMessages();
         },
     },
-    {
-        name: "copy",
-        description: "Copy the last assistant message to the system clipboard",
-        async handler(args, ctx) {
-            const lastAssistant = [...ctx.agent.messages]
-                .reverse()
-                .find((m) => m.role === "assistant" && typeof m.content === "string" && m.content.trim().length > 0);
-            if (!lastAssistant || typeof lastAssistant.content !== "string") {
-                return "No assistant message to copy yet.";
-            }
-            const text = lastAssistant.content;
-            try {
-                await copyToClipboard(text);
-            }
-            catch (err) {
-                return `Failed to copy to clipboard: ${err?.message || String(err)}`;
-            }
-            const chars = text.length;
-            return `Copied last assistant message to clipboard (${chars} character${chars === 1 ? "" : "s"}).`;
-        },
-    },
     {
         name: "rewind",
         description: "Rewind conversation and/or file edits to before an earlier message. Usage: /rewind [n] [--code|--chat]",
@@ -674,31 +607,6 @@ const builtinSlashCommandEntries = [
             return `Model switched to ${displaySelectedModel(next, ctx.agent.thinking)}.`;
         },
     },
-    {
-        name: "key",
-        description: "Set API key for the current or a specific provider. Usage: /key [provider-id] <key>",
-        async handler(args, ctx) {
-            if (!args) {
-                ctx.openPicker("key");
-                return;
-            }
-            const { provider, apiKey } = parseKeyArgs(args, ctx);
-            if (!provider) {
-                return "No provider configured. Use /provider --add <id> first.";
-            }
-            if (!apiKey) {
-                return `Usage: /key ${provider.id} <key>`;
-            }
-            if (ctx.registry.getModelConfig().hasProvider(provider.id)) {
-                return `API key for ${provider.name} is managed in ~/.bubble/models.json. Please edit that file directly.`;
-            }
-            ctx.registry.updateProviderKey(provider.id, apiKey);
-            ctx.registry.setDefault(provider.id);
-            ctx.agent.setProvider(ctx.createProvider(provider.id, apiKey, provider.baseURL));
-            ctx.agent.providerId = provider.id;
-            return `API key updated for ${provider.name} to ${maskKey(apiKey)}.`;
-        },
-    },
     {
         name: "logout",
         description: "Remove OAuth credentials for a provider. Usage: /logout [openai]",
@@ -739,32 +647,6 @@ const builtinSlashCommandEntries = [
                 : "Exited plan mode.";
         },
     },
-    {
-        name: "todos",
-        description: "Show the current todo list. Use /todos clear to reset it.",
-        async handler(args, ctx) {
-            const sub = args.trim();
-            if (sub === "clear") {
-                const previous = ctx.agent.getTodos().length;
-                if (previous === 0) {
-                    return "Todo list is already empty.";
-                }
-                ctx.agent.setTodos([]);
-                return `Cleared ${previous} todo item${previous === 1 ? "" : "s"}.`;
-            }
-            const todos = ctx.agent.getTodos();
-            if (todos.length === 0) {
-                return "No todos yet. The assistant will create some when working on multi-step tasks.";
-            }
-            const glyph = (status) => status === "completed" ? "✔" : status === "in_progress" ? "▶" : "○";
-            const lines = ["Todos:"];
-            for (const todo of todos) {
-                const label = todo.status === "in_progress" ? (todo.activeForm || todo.content) : todo.content;
-                lines.push(`  ${glyph(todo.status)} ${label}`);
-            }
-            return lines.join("\n");
-        },
-    },
     {
         name: "permissions",
         description: "Inspect or edit allow/deny rules. Subcommands: add <scope> <list> <rule>, remove <scope> <list> <rule>, clear (session allowlist), reload.",

package/dist/slash-commands/types.d.ts

@@ -10,7 +10,6 @@ import type { LspService } from "../lsp/index.js";
 import type { MemoryScope } from "../memory/index.js";
 import type { ThemeMode } from "../config.js";
 import type { ExternalHookController } from "../hooks/controller.js";
-export type SidebarMode = "auto" | "expanded" | "collapsed";
 /**
  * Live progress for a manual `/compact` run, pushed to the TUI so it can render
  * a progress bar. `phase` advances collecting → summarizing → applying;
@@ -21,11 +20,6 @@ export interface CompactionProgress {
     phase: "collecting" | "summarizing" | "applying";
     streamedChars: number;
 }
-export interface SidebarCommandState {
-    mode: SidebarMode;
-    visible: boolean;
-    active: boolean;
-}
 export interface SlashCommandContext {
     agent: Agent;
     addMessage: (role: "user" | "assistant" | "error", content: string) => void;
@@ -34,7 +28,7 @@ export interface SlashCommandContext {
     exit: () => void;
     sessionManager?: SessionManager;
     createProvider: (providerId: string, apiKey: string, baseURL: string) => Provider;
-    openPicker: (mode: "model" | "key" | "provider" | "provider-add" | "login" | "logout" | "skill" | "feishu-setup" | "agents", providerId?: string) => void;
+    openPicker: (mode: "model" | "key" | "provider" | "provider-add" | "login" | "logout" | "skill" | "feishu-setup", providerId?: string) => void;
     registry: ProviderRegistry;
     skillRegistry: SkillRegistry;
     bashAllowlist?: BashAllowlist;
@@ -52,10 +46,6 @@ export interface SlashCommandContext {
     getResolvedTheme?: () => "light" | "dark";
     /** Persist a new theme mode AND apply it to the running TUI. */
     setThemeMode?: (mode: ThemeMode) => void;
-    /** Toggle the right session sidebar in the running TUI. */
-    toggleSidebar?: () => SidebarCommandState;
-    /** Set the right session sidebar mode in the running TUI. */
-    setSidebarMode?: (mode: SidebarMode) => SidebarCommandState;
     /** Open the feedback dialog. `initialDescription` prefills the description field. */
     openFeedback?: (initialDescription: string) => void;
     /** Open the interactive rewind picker. When absent, /rewind falls back to a text listing. */

package/dist/tui-ink/app.d.ts

@@ -60,26 +60,8 @@ export interface ExitSummary {
     wallMs: number;
 }
 export declare const INK_LOCAL_SLASH_COMMANDS: readonly [{
-    readonly name: "thinking";
-    readonly description: "Toggle thinking block visibility";
-}, {
-    readonly name: "toggle-thinking";
-    readonly description: "Toggle thinking block visibility";
-}, {
     readonly name: "goal";
     readonly description: "Set/manage an autonomous goal (/goal <objective>|clear|pause|resume|edit)";
-}, {
-    readonly name: "trace";
-    readonly description: "Toggle verbose trace output";
-}, {
-    readonly name: "verbose";
-    readonly description: "Toggle verbose trace output";
-}, {
-    readonly name: "debug";
-    readonly description: "Toggle verbose trace output";
-}, {
-    readonly name: "write-previews";
-    readonly description: "Toggle write preview expansion";
 }];
 export declare 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 }: AppProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/tui-ink/app.js

@@ -6,7 +6,7 @@ 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";
@@ -227,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);
@@ -281,8 +257,8 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     const [streamingReasoning, setStreamingReasoning] = useState("");
     const [streamingTools, setStreamingTools] = useState([]);
     const [streamingParts, setStreamingParts] = useState([]);
-    // Live subagent groups for the Ctrl+G inspector; recomputed each render so it
-    // reflects members as their events stream into the transcript.
+    // 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
@@ -320,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({
@@ -338,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
@@ -567,7 +547,7 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
             setSubagentEntryFocused(false);
             return;
         }
-        if (key.ctrl && input.toLowerCase() === "p" && !pickerMode && !activeAbortRef.current) {
+        if (isCtrlLetterInput(input, key, "p") && !pickerMode && !activeAbortRef.current) {
             setStatsPanel(null);
             setPickerMode("slash");
             return;
@@ -582,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");
@@ -590,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];
@@ -639,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]);
@@ -759,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.");
@@ -1553,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;
@@ -1615,8 +1554,6 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                     getThemeMode: () => themeMode,
                     getResolvedTheme: () => themeResolved,
                     setThemeMode: applyThemeMode,
-                    toggleSidebar,
-                    setSidebarMode: applySidebarMode,
                     openStats: openStatsPanel,
                     compactionProgress: setCompaction,
                 });
@@ -1682,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.
@@ -1747,81 +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 === "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 }) }) }))] }), 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();
@@ -2109,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/input-box.d.ts

@@ -47,6 +47,9 @@ export declare function resolveCursorRowCompensation(input: {
     viewportRows: number;
     previousOutputHeight: number | null;
 }): number;
+export declare function isCtrlLetterInput(input: string, key: {
+    ctrl?: boolean;
+}, letter: string): boolean;
 export declare function isCtrlCInput(input: string, key: {
     ctrl?: boolean;
 }): boolean;

package/dist/tui-ink/input-box.js

@@ -37,8 +37,15 @@ export function resolveCursorRowCompensation(input) {
         return input.previousRowCompensation;
     return needsCursorRowCompensation(input.nextOutputHeight, input.viewportRows, input.previousOutputHeight) ? 1 : 0;
 }
+export function isCtrlLetterInput(input, key, letter) {
+    const normalized = letter.toLowerCase();
+    if (!/^[a-z]$/.test(normalized))
+        return false;
+    const rawControlInput = String.fromCharCode(normalized.charCodeAt(0) - 96);
+    return input === rawControlInput || (key.ctrl === true && input.toLowerCase() === normalized);
+}
 export function isCtrlCInput(input, key) {
-    return input === "\x03" || (key.ctrl === true && input.toLowerCase() === "c");
+    return isCtrlLetterInput(input, key, "c");
 }
 export function shouldUseLineComposerFrame(_background) {
     return true;

package/dist/tui-ink/message-list.d.ts

@@ -18,7 +18,6 @@ interface MessageListProps {
     streamingParts: DisplayMessagePart[];
     terminalColumns: number;
     showThinking?: boolean;
-    expandedToolOutput?: boolean;
     verboseTrace: boolean;
     pendingApproval?: PendingApprovalHint | null;
     /** Animation tick used to refresh in-progress elapsed counters. */
@@ -42,5 +41,5 @@ interface MessageListProps {
      */
     maxStreamRows?: number;
 }
-export declare function MessageList({ messages, streamingContent, streamingReasoning, streamingTools, streamingParts, terminalColumns, showThinking, expandedToolOutput, verboseTrace, pendingApproval, nowTick, welcomeBanner, staticGeneration, paddingX, maxStreamRows, }: MessageListProps): import("react/jsx-runtime").JSX.Element;
+export declare function MessageList({ messages, streamingContent, streamingReasoning, streamingTools, streamingParts, terminalColumns, showThinking, verboseTrace, pendingApproval, nowTick, welcomeBanner, staticGeneration, paddingX, maxStreamRows, }: MessageListProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/tui-ink/message-list.js

@@ -12,7 +12,7 @@ import { latestSubagentNote, sortSubagents, subagentDescriptor, subagentLabel, s
 import { sanitizeInternalReminderBlocks } from "../agent/internal-reminder-sanitizer.js";
 import { splitImageDisplayContent } from "../tui/image-display.js";
 const EXECUTE_COMMAND_BLOCK_MAX_LINES = 4;
-export function MessageList({ messages, streamingContent, streamingReasoning, streamingTools, streamingParts, terminalColumns, showThinking = false, expandedToolOutput = false, verboseTrace, pendingApproval, nowTick, welcomeBanner, staticGeneration = 0, paddingX = 1, maxStreamRows, }) {
+export function MessageList({ messages, streamingContent, streamingReasoning, streamingTools, streamingParts, terminalColumns, showThinking = false, verboseTrace, pendingApproval, nowTick, welcomeBanner, staticGeneration = 0, paddingX = 1, maxStreamRows, }) {
     const theme = useTheme();
     const hasStreaming = !!(streamingContent ||
         streamingReasoning ||
@@ -47,8 +47,8 @@ export function MessageList({ messages, streamingContent, streamingReasoning, st
                     if (item.kind === "welcome") {
                         return (_jsx(Box, { flexDirection: "column", paddingX: paddingX, children: welcomeBanner }, item.key));
                     }
-                    return (_jsx(Box, { flexDirection: "column", paddingX: paddingX, children: _jsx(MessageItem, { message: item.message, terminalColumns: terminalColumns, showThinking: showThinking, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, showExpandHint: item.showExpandHint, separateFromPrevious: item.separateFromPrevious }) }, item.key));
-                } }, `transcript-${staticGeneration}`), hasDynamic && (_jsxs(DynamicClamp, { maxRows: clampDynamic ? maxStreamRows : undefined, paddingX: paddingX, children: [hasStreaming && (_jsx(StreamingMessage, { content: streamingContent, reasoning: streamingReasoning, tools: streamingTools, parts: streamingParts, terminalColumns: terminalColumns, showThinking: showThinking, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: pendingApproval, nowTick: nowTick })), pendingSteerMessages.length > 0 && (_jsx(PendingInputMessagesBlock, { messages: pendingSteerMessages, terminalColumns: terminalColumns, title: "Messages to steer at next model call", hint: "applies before the next provider request", bulletColor: theme.warning })), queuedInputMessages.length > 0 && (_jsx(PendingInputMessagesBlock, { messages: queuedInputMessages, terminalColumns: terminalColumns, title: "Messages queued for next turn", hint: "runs after the current answer", bulletColor: theme.muted }))] }))] }));
+                    return (_jsx(Box, { flexDirection: "column", paddingX: paddingX, children: _jsx(MessageItem, { message: item.message, terminalColumns: terminalColumns, showThinking: showThinking, verboseTrace: verboseTrace, showExpandHint: item.showExpandHint, separateFromPrevious: item.separateFromPrevious }) }, item.key));
+                } }, `transcript-${staticGeneration}`), hasDynamic && (_jsxs(DynamicClamp, { maxRows: clampDynamic ? maxStreamRows : undefined, paddingX: paddingX, children: [hasStreaming && (_jsx(StreamingMessage, { content: streamingContent, reasoning: streamingReasoning, tools: streamingTools, parts: streamingParts, terminalColumns: terminalColumns, showThinking: showThinking, verboseTrace: verboseTrace, pendingApproval: pendingApproval, nowTick: nowTick })), pendingSteerMessages.length > 0 && (_jsx(PendingInputMessagesBlock, { messages: pendingSteerMessages, terminalColumns: terminalColumns, title: "Messages to steer at next model call", hint: "applies before the next provider request", bulletColor: theme.warning })), queuedInputMessages.length > 0 && (_jsx(PendingInputMessagesBlock, { messages: queuedInputMessages, terminalColumns: terminalColumns, title: "Messages queued for next turn", hint: "runs after the current answer", bulletColor: theme.muted }))] }))] }));
 }
 /**
  * Bounds the live (in-progress turn) region to at most `maxRows` rows, pinned
@@ -99,7 +99,7 @@ function DynamicClamp({ maxRows, paddingX, children, }) {
 // append-only (compaction reuses already-compacted instances), keys are
 // stable, and nowTick is only threaded to the last row, so memo hits for all
 // settled history rows.
-const MessageItem = React.memo(function MessageItem({ message, terminalColumns, showThinking, expandedToolOutput, verboseTrace, showExpandHint, separateFromPrevious, nowTick, }) {
+const MessageItem = React.memo(function MessageItem({ message, terminalColumns, showThinking, verboseTrace, showExpandHint, separateFromPrevious, nowTick, }) {
     const theme = useTheme();
     if (message.role === "user") {
         return (_jsx(UserMessageBlock, { content: message.content, terminalColumns: terminalColumns, inputStatus: message.inputStatus, separateFromPrevious: separateFromPrevious }));
@@ -139,9 +139,9 @@ const MessageItem = React.memo(function MessageItem({ message, terminalColumns,
         message.taskElapsedMs !== undefined;
     if (!hasVisibleAssistantContent)
         return null;
-    return (_jsxs(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: [visibleReasoning && (showThinking || verboseTrace) && _jsx(ReasoningTraceBlock, { reasoning: visibleReasoning }), message.parts && message.parts.length > 0 ? (_jsx(MessageParts, { parts: message.parts, terminalColumns: terminalColumns, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: undefined, showExpandHint: showExpandHint, nowTick: nowTick })) : (_jsxs(_Fragment, { children: [message.toolCalls && (_jsx(ToolsPart, { toolCalls: message.toolCalls, terminalColumns: terminalColumns, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: undefined, showExpandHint: showExpandHint, nowTick: nowTick })), visibleContent.trim() && _jsx(MarkdownContent, { content: visibleContent })] })), verboseTrace && message.toolCalls && message.toolCalls.length > 0 && (_jsx(TurnDigest, { toolCalls: message.toolCalls })), message.taskElapsedMs !== undefined && (_jsx(TaskDurationLine, { elapsedMs: message.taskElapsedMs }))] }));
+    return (_jsxs(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: [visibleReasoning && (showThinking || verboseTrace) && _jsx(ReasoningTraceBlock, { reasoning: visibleReasoning }), message.parts && message.parts.length > 0 ? (_jsx(MessageParts, { parts: message.parts, terminalColumns: terminalColumns, verboseTrace: verboseTrace, pendingApproval: undefined, showExpandHint: showExpandHint, nowTick: nowTick })) : (_jsxs(_Fragment, { children: [message.toolCalls && (_jsx(ToolsPart, { toolCalls: message.toolCalls, terminalColumns: terminalColumns, verboseTrace: verboseTrace, pendingApproval: undefined, showExpandHint: showExpandHint, nowTick: nowTick })), visibleContent.trim() && _jsx(MarkdownContent, { content: visibleContent })] })), verboseTrace && message.toolCalls && message.toolCalls.length > 0 && (_jsx(TurnDigest, { toolCalls: message.toolCalls })), message.taskElapsedMs !== undefined && (_jsx(TaskDurationLine, { elapsedMs: message.taskElapsedMs }))] }));
 });
-function StreamingMessage({ content, reasoning, tools, parts, terminalColumns, showThinking, expandedToolOutput, verboseTrace, pendingApproval, nowTick, }) {
+function StreamingMessage({ content, reasoning, tools, parts, terminalColumns, showThinking, verboseTrace, pendingApproval, nowTick, }) {
     const deferredContent = React.useDeferredValue(content);
     const deferredReasoning = React.useDeferredValue(reasoning);
     const deferredParts = React.useDeferredValue(parts);
@@ -155,16 +155,16 @@ function StreamingMessage({ content, reasoning, tools, parts, terminalColumns, s
             // turn commits — no spacing jump at finalize time. (The old marginTop=0
             // was a flicker mitigation for the main-screen <Static> renderer; the
             // alt-screen viewport repaints frames atomically, so it's obsolete.)
-            _jsx(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: _jsx(MessageParts, { parts: visibleParts, terminalColumns: terminalColumns, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: pendingApproval, showExpandHint: true, nowTick: nowTick, showActivity: true, streaming: true }) }))] }));
+            _jsx(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: _jsx(MessageParts, { parts: visibleParts, terminalColumns: terminalColumns, verboseTrace: verboseTrace, pendingApproval: pendingApproval, showExpandHint: true, nowTick: nowTick, showActivity: true, streaming: true }) }))] }));
 }
-function MessageParts({ parts, terminalColumns, expandedToolOutput, verboseTrace, pendingApproval, showExpandHint, nowTick, showActivity = false, streaming = false, }) {
+function MessageParts({ parts, terminalColumns, verboseTrace, pendingApproval, showExpandHint, nowTick, showActivity = false, streaming = false, }) {
     const lastToolsPartIndex = findLastToolsPartIndex(parts);
     const lastTextPartIndex = findLastTextPartIndex(parts);
     return (_jsx(Box, { flexDirection: "column", children: parts.map((part, idx) => {
             if (part.type === "text") {
                 return (_jsx(TimelineText, { content: part.content, compactTop: idx === 0, terminalColumns: terminalColumns, streaming: streaming && idx === lastTextPartIndex }, `text-${idx}`));
             }
-            return (_jsx(ToolsPart, { toolCalls: part.toolCalls, terminalColumns: terminalColumns, expandedToolOutput: expandedToolOutput, verboseTrace: verboseTrace, pendingApproval: pendingApproval, showExpandHint: showExpandHint && idx === lastToolsPartIndex, compactTop: idx === 0, nowTick: nowTick, showActivity: showActivity && idx === lastToolsPartIndex }, `tools-${idx}`));
+            return (_jsx(ToolsPart, { toolCalls: part.toolCalls, terminalColumns: terminalColumns, verboseTrace: verboseTrace, pendingApproval: pendingApproval, showExpandHint: showExpandHint && idx === lastToolsPartIndex, compactTop: idx === 0, nowTick: nowTick, showActivity: showActivity && idx === lastToolsPartIndex }, `tools-${idx}`));
         }) }));
 }
 function findLastTextPartIndex(parts) {
@@ -195,17 +195,16 @@ function TimelineText({ content, compactTop, terminalColumns, streaming = false,
     const trimmed = visible.trim();
     return (_jsxs(Box, { marginLeft: 2, marginTop: compactTop ? 0 : 1, children: [_jsx(Text, { color: theme.agent, children: "\u25CF  " }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: streaming ? (_jsx(StreamingMarkdown, { content: trimmed, maxWidth: available })) : (_jsx(MarkdownContent, { content: trimmed, maxWidth: available })) })] }));
 }
-function ToolsPart({ toolCalls, terminalColumns, expandedToolOutput, verboseTrace, pendingApproval, showExpandHint, compactTop = false, nowTick, showActivity = false, }) {
+function ToolsPart({ toolCalls, terminalColumns, verboseTrace, pendingApproval, showExpandHint, compactTop = false, nowTick, showActivity = false, }) {
     if (toolCalls.length === 0)
         return null;
-    const expandTools = verboseTrace || expandedToolOutput;
-    if (!expandTools) {
+    if (!verboseTrace) {
         return (_jsx(TraceGroupList, { toolCalls: toolCalls, terminalColumns: terminalColumns, pendingApproval: pendingApproval, nowTick: nowTick, compactTop: compactTop, showActivity: showActivity }));
     }
     const lastIdx = toolCalls.length - 1;
     return (_jsx(Box, { flexDirection: "column", children: toolCalls.map((tc, idx) => {
             const isWaitingApproval = isToolPending(tc) && !!pendingApproval && approvalMatchesTool(pendingApproval, tc);
-            return (_jsx(ToolCallDisplay, { toolCall: tc, isStreaming: isToolPending(tc), verbose: expandTools, terminalColumns: terminalColumns, showExpandHint: showExpandHint && idx === lastIdx, waitingApproval: isWaitingApproval, compactTop: idx === 0 && compactTop, nowTick: nowTick }, tc.id));
+            return (_jsx(ToolCallDisplay, { toolCall: tc, isStreaming: isToolPending(tc), verbose: verboseTrace, terminalColumns: terminalColumns, showExpandHint: showExpandHint && idx === lastIdx, waitingApproval: isWaitingApproval, compactTop: idx === 0 && compactTop, nowTick: nowTick }, tc.id));
         }) }));
 }
 function fallbackStreamingParts(content, tools) {
@@ -553,7 +552,7 @@ function SubagentToolDisplay({ toolCall, verbose, terminalColumns, compactTop, }
                         const descriptor = padVisual(truncateVisual(subagentDescriptor(subagent), descriptorWidth), descriptorWidth);
                         const note = truncateVisual(latestSubagentNote(subagent), Math.max(12, detailWidth - 16 - descriptorWidth - 10));
                         return (_jsxs(Box, { children: [_jsx(Text, { color: subagentStatusColor(status, theme), children: label }), _jsxs(Text, { color: theme.traceAction, children: [" ", descriptor] }), _jsxs(Text, { color: subagentStatusColor(status, theme), children: [" ", padVisual(status, 9)] }), note && _jsxs(Text, { color: subagent.error ? theme.error : theme.traceDetail, children: [" ", note] })] }, subagent.subAgentId ?? `${subagentLabel(subagent)}-${index}`));
-                    }), omitted > 0 && (_jsxs(Text, { color: theme.muted, children: ["... ", omitted, " more \u00B7 Ctrl+O to expand \u00B7 Ctrl+G to inspect traces"] }))] })), subagents.length === 0 && toolCall.result && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: hasError ? theme.error : theme.muted, children: summarizeToolResult(toolCall) }) }))] }));
+                    }), omitted > 0 && (_jsxs(Text, { color: theme.muted, children: ["... ", omitted, " more \u00B7 Ctrl+O to expand \u00B7 \u2193 then Enter to inspect traces"] }))] })), subagents.length === 0 && toolCall.result && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: hasError ? theme.error : theme.muted, children: summarizeToolResult(toolCall) }) }))] }));
 }
 function TruncationHint({ remaining, verbose, showExpandHint, }) {
     const theme = useTheme();

package/dist/tui-ink/subagent-inspector.d.ts

@@ -1,5 +1,5 @@
 /**
- * Full-screen subagent inspector (Ctrl+G / /agents).
+ * Full-screen subagent inspector opened from the subagent entry line.
  *
  * Two-level drill-in modeled on Claude Code's workflow view: a grouped list of
  * subagents (each spawn_agent is one member; each agent_team/agent_batch is a

package/dist/tui-ink/subagent-inspector.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
- * Full-screen subagent inspector (Ctrl+G / /agents).
+ * Full-screen subagent inspector opened from the subagent entry line.
  *
  * Two-level drill-in modeled on Claude Code's workflow view: a grouped list of
  * subagents (each spawn_agent is one member; each agent_team/agent_batch is a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bubblebrain-ai/bubble",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "A terminal coding agent",
   "type": "module",
   "engines": {