@bubblebrain-ai/bubble 0.0.7 → 0.0.9

package/dist/tui/run.js

@@ -2,6 +2,7 @@ import { BoxRenderable, CodeRenderable, createCliRenderer, DiffRenderable, getTr
 import { createComponent, createElement, insert, render, spread, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions, } from "@opentui/solid";
 import { createEffect, createSignal, onCleanup, onMount } from "solid-js";
 import { AgentAbortError } from "../agent.js";
+import { debugReasoningStream, summarizeDebugText } from "../reasoning-debug.js";
 import { BUILTIN_PROVIDERS, decodeModel, displayModel, isUserVisibleProvider } from "../provider-registry.js";
 import { listBuiltinModels } from "../model-catalog.js";
 import { calculateUsageCost } from "../model-pricing.js";
@@ -29,8 +30,10 @@ import { readGitSidebarState } from "./sidebar-state.js";
 import { buildImageContentPartsFromLabels, imageAttachmentLabelPattern, resolveComposerImagePaths, resolveImageInput, } from "./image-paste.js";
 import { isModeCycleKeyEvent, isModeCycleSequence, isModifiedEnterSequence, PROMPT_TEXTAREA_KEYBINDINGS, } from "./prompt-keybindings.js";
 import { keyNameFromEvent, keyNameFromSequence } from "./global-key-router.js";
+import { EscapeConfirmationGate } from "./escape-confirmation.js";
 const treeSitterClient = getTreeSitterClient();
 const PROMPT_HISTORY_LIMIT = 100;
+const ESC_CANCEL_CONFIRM_WINDOW_MS = 1800;
 const PROVIDER_PRIORITY = new Map([
     ["openai", 0],
     ["deepseek", 1],
@@ -301,6 +304,9 @@ function OpenTuiApp(props) {
     const [isRunning, setIsRunning] = createSignal(false);
     let activeRun;
     let nextRunId = 0;
+    const runningCancelGate = new EscapeConfirmationGate(ESC_CANCEL_CONFIRM_WINDOW_MS);
+    const [runningCancelHint, setRunningCancelHint] = createSignal("");
+    let runningCancelHintTimer;
     const [showThinking, setShowThinking] = createSignal(true);
     let streamingDisplay;
     let sidebarLspSyncTimer;
@@ -345,6 +351,7 @@ function OpenTuiApp(props) {
     let transcriptScrollInitialized = false;
     let rootBox;
     let sidebarShell;
+    let homeSurfaceShell;
     let transcriptHost;
     const transcriptState = {
         entries: [],
@@ -538,6 +545,8 @@ function OpenTuiApp(props) {
         uiDisposed = true;
         if (copyToastClearTimer)
             clearTimeout(copyToastClearTimer);
+        if (runningCancelHintTimer)
+            clearTimeout(runningCancelHintTimer);
         promptModeLabels.clear();
         promptModelLabels.clear();
         footerModeBadge = undefined;
@@ -1599,6 +1608,8 @@ function OpenTuiApp(props) {
         const homeActive = isHomeSurfaceActive(streamingDisplay);
         setSessionActive(!homeActive);
         const questionActive = !!pendingQuestion();
+        if (homeSurfaceShell)
+            homeSurfaceShell.visible = homeActive;
         if (homeComposerShell)
             homeComposerShell.visible = homeActive && !questionActive;
         if (sessionComposerShell)
@@ -1635,6 +1646,7 @@ function OpenTuiApp(props) {
         }
     }
     function beginAgentRun() {
+        clearRunningCancelHint();
         const run = { id: ++nextRunId, abortController: new AbortController() };
         activeRun = run;
         setRunningState(true);
@@ -1643,11 +1655,54 @@ function OpenTuiApp(props) {
     function finishAgentRun(run) {
         if (activeRun?.id === run.id)
             activeRun = undefined;
+        clearRunningCancelHint();
         setRunningState(false);
     }
+    function requestComposerRender() {
+        try {
+            activeComposerShell()?.requestRender();
+            rootBox?.requestRender();
+        }
+        catch {
+            // Render hints are best-effort and must not interfere with cancellation.
+        }
+    }
+    function clearRunningCancelHint() {
+        runningCancelGate.clear();
+        if (runningCancelHintTimer) {
+            clearTimeout(runningCancelHintTimer);
+            runningCancelHintTimer = undefined;
+        }
+        if (runningCancelHint()) {
+            setRunningCancelHint("");
+            requestComposerRender();
+        }
+    }
+    function armRunningCancelHint(run) {
+        const decision = runningCancelGate.press(run.id);
+        if (decision.action === "confirm")
+            return true;
+        setRunningCancelHint("Press Esc again to stop");
+        if (runningCancelHintTimer)
+            clearTimeout(runningCancelHintTimer);
+        runningCancelHintTimer = setTimeout(() => {
+            if (!runningCancelGate.isArmed(run.id)) {
+                if (runningCancelHint()) {
+                    setRunningCancelHint("");
+                    requestComposerRender();
+                }
+                runningCancelHintTimer = undefined;
+                return;
+            }
+            clearRunningCancelHint();
+        }, Math.max(0, decision.expiresAt - Date.now()));
+        requestComposerRender();
+        return false;
+    }
     function cancelActiveAgentRun() {
         if (!activeRun || activeRun.abortController.signal.aborted)
             return false;
+        clearRunningCancelHint();
         activeRun.abortController.abort(new AgentAbortError("Agent run cancelled by user."));
         setNotice("Agent run cancelled");
         redrawDock();
@@ -1660,6 +1715,14 @@ function OpenTuiApp(props) {
     function routeRunningCancel(name, event) {
         if (name !== "escape")
             return false;
+        if (!activeRun || activeRun.abortController.signal.aborted)
+            return false;
+        const shouldCancel = armRunningCancelHint(activeRun);
+        if (!shouldCancel) {
+            if (event)
+                preventGlobalKey(event);
+            return true;
+        }
         if (!cancelActiveAgentRun())
             return false;
         if (event)
@@ -1668,10 +1731,10 @@ function OpenTuiApp(props) {
     }
     function routeGlobalRawSequence(sequence) {
         const name = keyNameFromSequence(sequence);
-        if (routeRunningCancel(name))
-            return true;
         if (routeModalRawSequence(sequence))
             return true;
+        if (routeRunningCancel(name))
+            return true;
         if (cycleModeFromRawSequence(sequence))
             return true;
         return false;
@@ -1682,6 +1745,8 @@ function OpenTuiApp(props) {
             void requestExit();
             return true;
         }
+        if (routeModalKey(event))
+            return true;
         if (routeRunningCancel(name, event))
             return true;
         // Ctrl+Shift+M opens the MCP reconnect picker. Shift is required because
@@ -1701,8 +1766,6 @@ function OpenTuiApp(props) {
             event.preventDefault?.();
             return true;
         }
-        if (routeModalKey(event))
-            return true;
         if (cycleModeFromKey(event))
             return true;
         if (event.ctrl && name === "p" && !picker && !isRunning()) {
@@ -1717,7 +1780,6 @@ function OpenTuiApp(props) {
             cwd: props.args.cwd,
             width: contentWidth(),
             tip: homeTip,
-            renderHome: renderHomeSurface,
             plan: pendingPlan()?.plan,
             selectedOption: approvalOptionIdx(),
             showThinking: showThinking(),
@@ -2700,7 +2762,11 @@ function OpenTuiApp(props) {
         streamingDisplay = undefined;
         promptHistory = [];
         resetPromptHistoryBrowse();
+        transcriptState.expandedCompactions.clear();
+        transcriptState.expandedWrites.clear();
+        transcriptState.defaultWritesExpanded = false;
         redrawTranscript(undefined, []);
+        syncPromptSurfaces(true);
     };
     async function submitPrompt() {
         if (providerDialog) {
@@ -3613,6 +3679,14 @@ function OpenTuiApp(props) {
                     assistantContent += event.content;
                 }
                 else if (event.type === "reasoning_delta") {
+                    debugReasoningStream({
+                        stage: "ui_append",
+                        providerId: props.agent.providerId,
+                        modelId: props.agent.apiModel,
+                        beforeLength: assistantReasoning.length,
+                        delta: summarizeDebugText(event.content),
+                        afterLength: assistantReasoning.length + event.content.length,
+                    });
                     assistantReasoning += event.content;
                     scheduleStreamingRedraw();
                 }
@@ -3820,8 +3894,6 @@ function OpenTuiApp(props) {
         }
     }
     function promptUiKeyDown(event) {
-        if (routeRunningCancel(keyNameFromEvent(event), event))
-            return true;
         const modalOwner = activeModalKeyOwner();
         if (modalOwner) {
             if (routeModalKey(event) || shouldModalSwallowUnhandledKey(modalOwner)) {
@@ -3830,6 +3902,8 @@ function OpenTuiApp(props) {
                 return true;
             }
         }
+        if (routeRunningCancel(keyNameFromEvent(event), event))
+            return true;
         if (cycleModeFromKey(event))
             return true;
         if (handlePromptHistoryKey(event))
@@ -3862,6 +3936,7 @@ function OpenTuiApp(props) {
             registerModeLabel: registerPromptModeLabel,
             registerModelLabel: registerPromptModelLabel,
             model: promptModelTitle,
+            interruptHint: runningCancelHint,
             placeholder: () => {
                 const approvalState = pendingApproval();
                 if (approvalState)
@@ -3878,6 +3953,11 @@ function OpenTuiApp(props) {
     function renderHomeSurface() {
         const homeHeight = Math.max(16, dimensions().height - 4);
         return h("box", {
+            ref: (ref) => {
+                homeSurfaceShell = ref;
+                ref.visible = isHomeSurfaceActive(streamingDisplay);
+            },
+            visible: isHomeSurfaceActive(streamingDisplay),
             height: homeHeight,
             flexDirection: "column",
             alignItems: "center",
@@ -3917,6 +3997,7 @@ function OpenTuiApp(props) {
                 registerModeLabel: registerPromptModeLabel,
                 registerModelLabel: registerPromptModelLabel,
                 model: promptModelTitle,
+                interruptHint: runningCancelHint,
                 placeholder: () => {
                     const approvalState = pendingApproval();
                     if (approvalState)
@@ -4623,7 +4704,7 @@ function OpenTuiApp(props) {
                 onMouseScroll: handleTranscriptMouseScroll,
                 flexGrow: 1,
                 minHeight: 0,
-            }, h("box", { height: 1 }), h("box", {
+            }, h("box", { height: 1 }), renderHomeSurface(), h("box", {
                 ref: (ref) => {
                     const isNewHost = transcriptHost !== ref;
                     transcriptHost = ref;
@@ -4860,7 +4941,9 @@ function renderPrompt(input) {
     }, promptModeBadgeContent(input.mode())), h("text", { fg: theme.textMuted }, "·"), h("text", {
         fg: theme.text,
         ref: input.registerModelLabel,
-    }, input.model()))))), h("box", { width: "100%", flexDirection: "row", justifyContent: "space-between" }, () => input.disabled() ? h("text", { fg: theme.textMuted }, "esc interrupt") : h("text", { fg: theme.textMuted }, ""), h("box", { flexDirection: "row", gap: 2 }, h("text", { fg: theme.text }, "tab ", h("span", { fg: theme.textMuted }, "mode")), h("text", { fg: theme.text }, "ctrl+p ", h("span", { fg: theme.textMuted }, "commands")))));
+    }, input.model()))))), h("box", { width: "100%", flexDirection: "row", justifyContent: "space-between" }, () => input.disabled() && input.interruptHint()
+        ? h("text", { fg: theme.warning }, input.interruptHint())
+        : h("text", { fg: theme.textMuted }, ""), h("box", { flexDirection: "row", gap: 2 }, h("text", { fg: theme.text }, "tab ", h("span", { fg: theme.textMuted }, "mode")), h("text", { fg: theme.text }, "ctrl+p ", h("span", { fg: theme.textMuted }, "commands")))));
 }
 function PromptScanner(input) {
     let scannerRef;
@@ -5052,20 +5135,7 @@ function updateTranscriptHost(host, state, messages, options, syntaxStyle, subtl
     const ctx = host.ctx;
     const nextEntries = [];
     if (!visibleMessages.length && !options?.plan) {
-        const key = `home:${options?.cwd ?? ""}:${options?.tip ?? ""}:${options?.renderHome ? "prompt" : "static"}`;
-        const previous = state.entries[0];
-        if (previous?.key !== key) {
-            clearTranscriptEntries(host, state);
-            const node = (options?.renderHome
-                ? options.renderHome()
-                : renderHomeState({
-                    width: options?.width ?? 80,
-                    cwd: options?.cwd ?? "",
-                    tip: options?.tip ?? "",
-                }));
-            host.add(node);
-            state.entries = [{ key, signature: key, node, refs: {} }];
-        }
+        clearTranscriptEntries(host, state);
         host.requestRender();
         return;
     }

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

@@ -0,0 +1,52 @@
+import { type Agent } from "../agent.js";
+import type { CliArgs } from "../cli.js";
+import type { SessionManager } from "../session.js";
+import type { PlanDecision, Provider } from "../types.js";
+import { type ResolvedTheme, type ThemeMode } from "./theme.js";
+import { ProviderRegistry } from "../provider-registry.js";
+import { SkillRegistry } from "../skills/registry.js";
+import type { ApprovalDecision, ApprovalRequest } from "../approval/types.js";
+import type { BashAllowlist } from "../approval/session-cache.js";
+import type { SettingsManager } from "../permissions/settings.js";
+import type { McpManager } from "../mcp/manager.js";
+import type { LspService } from "../lsp/index.js";
+import type { QuestionController } from "../question/index.js";
+import type { MemoryScope } from "../memory/index.js";
+export interface PlanHandlerRef {
+    current?: (plan: string) => Promise<PlanDecision>;
+}
+export interface ApprovalHandlerRef {
+    current?: (req: ApprovalRequest) => Promise<ApprovalDecision>;
+}
+interface AppProps {
+    agent: Agent;
+    args: CliArgs;
+    sessionManager?: SessionManager;
+    createProvider?: (providerId: string, apiKey: string, baseURL: string) => Provider;
+    registry?: ProviderRegistry;
+    skillRegistry?: SkillRegistry;
+    planHandlerRef?: PlanHandlerRef;
+    approvalHandlerRef?: ApprovalHandlerRef;
+    questionController?: QuestionController;
+    bashAllowlist?: BashAllowlist;
+    settingsManager?: SettingsManager;
+    lspService?: LspService;
+    mcpManager?: McpManager;
+    themeMode?: ThemeMode;
+    themeOverrides?: Record<string, string>;
+    detectedTheme?: ResolvedTheme;
+    onThemeModeChange?: (mode: ThemeMode) => void;
+    flushMemory?: () => Promise<void>;
+    runMemoryCompaction?: () => Promise<string>;
+    runMemorySummary?: (scope?: MemoryScope) => Promise<string>;
+    runMemoryRefresh?: (scope?: MemoryScope) => Promise<string>;
+    /** Whether the bypassPermissions mode is reachable via Shift+Tab cycling. */
+    bypassEnabled?: boolean;
+    onExit?: (summary: ExitSummary) => void;
+}
+export interface ExitSummary {
+    /** Wall-clock duration of the session, in milliseconds. */
+    wallMs: number;
+}
+export declare function App({ agent, args, sessionManager, createProvider, registry, skillRegistry, planHandlerRef, approvalHandlerRef, questionController, bashAllowlist, settingsManager, lspService, mcpManager, themeMode: initialThemeMode, themeOverrides, detectedTheme, onThemeModeChange, flushMemory, runMemoryCompaction, runMemorySummary, runMemoryRefresh, bypassEnabled, onExit }: AppProps): import("react/jsx-runtime").JSX.Element;
+export {};