@bubblebrain-ai/bubble 0.0.17 → 0.0.19

package/dist/tui/paste-placeholder.d.ts

@@ -0,0 +1,10 @@
+export declare const LONG_PASTE_CHAR_THRESHOLD = 1000;
+export declare const LONG_PASTE_LINE_THRESHOLD = 20;
+export interface PastedContentReference {
+    marker: string;
+    content: string;
+}
+export declare function countTextLines(text: string): number;
+export declare function shouldCollapsePastedContent(text: string): boolean;
+export declare function createPastedContentMarker(content: string, index?: number): string;
+export declare function expandPastedContentMarkers(displayText: string, references: PastedContentReference[]): string;

package/dist/tui/paste-placeholder.js

@@ -0,0 +1,45 @@
+export const LONG_PASTE_CHAR_THRESHOLD = 1000;
+export const LONG_PASTE_LINE_THRESHOLD = 20;
+export function countTextLines(text) {
+    return text.length === 0 ? 0 : text.split(/\r?\n/).length;
+}
+export function shouldCollapsePastedContent(text) {
+    if (text.length >= LONG_PASTE_CHAR_THRESHOLD)
+        return true;
+    return countTextLines(text) >= LONG_PASTE_LINE_THRESHOLD;
+}
+export function createPastedContentMarker(content, index = 1) {
+    const safeIndex = Math.max(1, Math.floor(index));
+    const lineCount = countTextLines(content);
+    const size = lineCount > 1
+        ? `${lineCount} ${lineCount === 1 ? "line" : "lines"}`
+        : `${content.length} ${content.length === 1 ? "char" : "chars"}`;
+    return `[Pasted text #${safeIndex} +${size}]`;
+}
+export function expandPastedContentMarkers(displayText, references) {
+    if (references.length === 0 || displayText.length === 0)
+        return displayText;
+    let expanded = "";
+    let index = 0;
+    const used = new Set();
+    while (index < displayText.length) {
+        let matched = -1;
+        for (let i = 0; i < references.length; i++) {
+            const ref = references[i];
+            if (!used.has(i) && displayText.startsWith(ref.marker, index)) {
+                matched = i;
+                break;
+            }
+        }
+        if (matched >= 0) {
+            const ref = references[matched];
+            expanded += ref.content;
+            index += ref.marker.length;
+            used.add(matched);
+            continue;
+        }
+        expanded += displayText[index];
+        index += 1;
+    }
+    return expanded;
+}

package/dist/tui/run.js

@@ -480,6 +480,7 @@ function OpenTuiApp(props) {
         completionTokens: 0,
         promptCacheHitTokens: 0,
         promptCacheMissTokens: 0,
+        cacheCreationTokens: 0,
         reasoningTokens: 0,
         turns: 0,
     });
@@ -602,6 +603,7 @@ function OpenTuiApp(props) {
     let sidebarGaugeText;
     let sidebarGaugeLabelText;
     let sidebarUsageText;
+    let sidebarCacheText;
     let sidebarReasoningText;
     let sidebarCostText;
     let sidebarLspSummaryText;
@@ -956,6 +958,7 @@ function OpenTuiApp(props) {
         setSidebarText(sidebarUsageText, context.turns > 0
             ? `${formatCompactNumber(context.promptTokens)} in · ${formatCompactNumber(context.completionTokens)} out`
             : "usage pending");
+        setSidebarText(sidebarCacheText, context.cacheText);
         setSidebarText(sidebarReasoningText, context.reasoningTokens > 0
             ? `${formatCompactNumber(context.reasoningTokens)} reasoning`
             : "");
@@ -5341,6 +5344,7 @@ function OpenTuiApp(props) {
                             promptCacheHitTokens: current.promptCacheHitTokens + (event.usage.promptCacheHitTokens ?? 0),
                             promptCacheMissTokens: current.promptCacheMissTokens + (event.usage.promptCacheMissTokens
                                 ?? (event.usage.promptCacheHitTokens === undefined ? event.usage.promptTokens : 0)),
+                            cacheCreationTokens: current.cacheCreationTokens + (event.usage.cacheCreationTokens ?? 0),
                             reasoningTokens: current.reasoningTokens + (event.usage.reasoningTokens ?? 0),
                             turns: current.turns + 1,
                         }));
@@ -6368,6 +6372,13 @@ function OpenTuiApp(props) {
                             : "usage pending";
                     },
                 }),
+                h("text", {
+                    fg: theme.textMuted,
+                    ref: (ref) => {
+                        sidebarCacheText = ref;
+                        ref.content = context.cacheText;
+                    },
+                }),
                 h("text", {
                     fg: theme.textMuted,
                     ref: (ref) => {
@@ -6573,16 +6584,28 @@ function OpenTuiApp(props) {
             completionTokens: usage.completionTokens,
             promptCacheHitTokens: usage.promptCacheHitTokens,
             promptCacheMissTokens: usage.promptCacheMissTokens,
+            cacheCreationTokens: usage.cacheCreationTokens,
             reasoningTokens: usage.reasoningTokens,
             totalTokens: usage.promptTokens + usage.completionTokens,
         };
         const cost = providerId && modelId ? calculateUsageCost(providerId, modelId, tokenUsage) : undefined;
+        const cacheReadTokens = usage.promptCacheHitTokens;
+        const cacheCreateTokens = usage.cacheCreationTokens;
+        const cacheMissTokens = Math.max(0, usage.promptCacheMissTokens - cacheCreateTokens);
+        const cacheObservedTokens = cacheReadTokens + cacheCreateTokens + cacheMissTokens;
+        const cacheHitRate = cacheObservedTokens > 0
+            ? Math.round((cacheReadTokens / cacheObservedTokens) * 100)
+            : 0;
+        const cacheText = cacheObservedTokens > 0
+            ? `cache ${formatCompactNumber(cacheReadTokens)} read · ${formatCompactNumber(cacheCreateTokens)} create · ${formatCompactNumber(cacheMissTokens)} miss · ${cacheHitRate}% hit`
+            : "";
         return {
             tokens: contextTokens,
             percent: contextPercent,
             remainingTokens,
             promptTokens: usage.promptTokens,
             completionTokens: usage.completionTokens,
+            cacheText,
             reasoningTokens: usage.reasoningTokens,
             turns: usage.turns,
             costText: cost ? `${formatCurrency(cost.cost, cost.currency)} spent${cost.estimated ? " est." : ""}` : "cost unavailable",

package/dist/tui-ink/app.js

@@ -501,6 +501,7 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
             thinkingLevel: overrides?.thinkingLevel ?? agent.thinking,
             mode: overrides?.mode ?? agent.mode,
             workingDir: args.cwd,
+            ...agent.getSystemPromptToolOptions(),
         }));
     }, [agent, args.cwd, safeRegistry, safeSkillRegistry]);
     useInput((input, key) => {
@@ -614,6 +615,7 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
                 configuredModelId: model,
                 thinkingLevel: agent.thinking,
                 workingDir: args.cwd,
+                ...agent.getSystemPromptToolOptions(),
             }));
             userConfig.pushRecentModel(model);
             setThinkingLevel(agent.thinking);

package/dist/tui-ink/input-box.d.ts

@@ -1,5 +1,6 @@
 import type { SkillRegistry } from "../skills/registry.js";
 import { type ImageAttachment } from "./image-paste.js";
+export { createPastedContentMarker, expandPastedContentMarkers, shouldCollapsePastedContent, type PastedContentReference, } from "../tui/paste-placeholder.js";
 export interface SubmitPayload {
     /** Fully-expanded text sent to the agent. */
     text: string;
@@ -19,10 +20,6 @@ interface InputBoxProps {
     terminalColumns: number;
     cwd: string;
 }
-export interface PastedContentReference {
-    marker: string;
-    content: string;
-}
 export declare function needsCursorRowCompensation(nextOutputHeight: number, viewportRows: number, previousOutputHeight: number | null): boolean;
 export declare function resolveCursorRowCompensation(input: {
     sameRenderedFrame: boolean;
@@ -58,8 +55,4 @@ export declare function insertNewlineAtCursor(text: string, cursor: number): {
     text: string;
     cursor: number;
 };
-export declare function shouldCollapsePastedContent(text: string): boolean;
-export declare function createPastedContentMarker(content: string): string;
-export declare function expandPastedContentMarkers(displayText: string, references: PastedContentReference[]): string;
 export declare function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch, draftText, draftEpoch, onDraftApplied, skillRegistry, terminalColumns, cwd, }: InputBoxProps): import("react/jsx-runtime").JSX.Element;
-export {};

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

@@ -9,13 +9,13 @@ import { filterFileSuggestions, findAtContext, listProjectFiles } from "./file-m
 import { ingestClipboardImage, ingestImagePath, isImageFilePath, isScreenshotTempPath, splitPastedPaths, } from "./image-paste.js";
 import { appendHistoryEntry, loadHistorySync, pushHistoryEntry, stepHistory, } from "./input-history.js";
 import { stripTerminalMouseSequences } from "./terminal-mouse.js";
+export { createPastedContentMarker, expandPastedContentMarkers, shouldCollapsePastedContent, } from "../tui/paste-placeholder.js";
+import { createPastedContentMarker, expandPastedContentMarkers, shouldCollapsePastedContent, } from "../tui/paste-placeholder.js";
 const MIN_VISIBLE_LINES = 3;
 const MAX_VISIBLE_LINES = 6;
 const PADDING_X = 1;
 const PROMPT = " > ";
 const MAX_VISIBLE_SUGGESTIONS = 8;
-const LONG_PASTE_CHAR_THRESHOLD = 1000;
-const LONG_PASTE_LINE_THRESHOLD = 20;
 export function needsCursorRowCompensation(nextOutputHeight, viewportRows, previousOutputHeight) {
     const hadPreviousFrame = previousOutputHeight !== null && previousOutputHeight > 0;
     const isFullscreen = nextOutputHeight >= viewportRows;
@@ -148,41 +148,6 @@ export function insertNewlineAtCursor(text, cursor) {
         cursor: clampedCursor + 1,
     };
 }
-export function shouldCollapsePastedContent(text) {
-    if (text.length >= LONG_PASTE_CHAR_THRESHOLD)
-        return true;
-    return text.split("\n").length >= LONG_PASTE_LINE_THRESHOLD;
-}
-export function createPastedContentMarker(content) {
-    return `[Pasted Content ${content.length} chars]`;
-}
-export function expandPastedContentMarkers(displayText, references) {
-    if (references.length === 0 || displayText.length === 0)
-        return displayText;
-    let expanded = "";
-    let index = 0;
-    const used = new Set();
-    while (index < displayText.length) {
-        let matched = -1;
-        for (let i = 0; i < references.length; i++) {
-            const ref = references[i];
-            if (!used.has(i) && displayText.startsWith(ref.marker, index)) {
-                matched = i;
-                break;
-            }
-        }
-        if (matched >= 0) {
-            const ref = references[matched];
-            expanded += ref.content;
-            index += ref.marker.length;
-            used.add(matched);
-            continue;
-        }
-        expanded += displayText[index];
-        index += 1;
-    }
-    return expanded;
-}
 export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch = 0, draftText, draftEpoch = 0, onDraftApplied, skillRegistry, terminalColumns, cwd, }) {
     const theme = useTheme();
     const width = terminalColumns;
@@ -196,6 +161,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
     const [historyIndex, setHistoryIndex] = useState(null);
     const historyDraftRef = useRef("");
     const loadingFilesRef = useRef(false);
+    const nextPastedContentIndexRef = useRef(1);
     // Paste and the keystrokes that follow can arrive inside the same stdin chunk
     // and dispatch within one discreteUpdates batch. If the Enter that a user
     // typed after a paste fires before React commits the paste-driven setState,
@@ -327,7 +293,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
         if (imageTokens.length === 0) {
             // Plain text paste — insert into the input at the cursor.
             if (shouldCollapsePastedContent(clean)) {
-                const marker = createPastedContentMarker(clean);
+                const marker = createPastedContentMarker(clean, nextPastedContentIndexRef.current++);
                 setPastedContentRefs((prev) => [...prev, { marker, content: clean }]);
                 insertTextAtCursor(marker);
             }
@@ -409,6 +375,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
         setSelectedIndex(0);
         setAttachments([]);
         setPastedContentRefs([]);
+        nextPastedContentIndexRef.current = 1;
         setHistoryIndex(null);
         historyDraftRef.current = "";
     };
@@ -560,6 +527,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
                 historyDraftRef.current = result.draft;
                 setSelectedIndex(0);
                 setPastedContentRefs([]);
+                nextPastedContentIndexRef.current = 1;
             }
             return;
         }
@@ -576,6 +544,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
                 historyDraftRef.current = result.draft;
                 setSelectedIndex(0);
                 setPastedContentRefs([]);
+                nextPastedContentIndexRef.current = 1;
             }
             return;
         }
@@ -627,6 +596,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch =
         setCursor(draftText.length);
         setSelectedIndex(0);
         setPastedContentRefs([]);
+        nextPastedContentIndexRef.current = 1;
         setHistoryIndex(null);
         historyDraftRef.current = "";
         onDraftApplied?.();

package/dist/tui-opentui/app.js

@@ -523,6 +523,7 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
             thinkingLevel: overrides?.thinkingLevel ?? agent.thinking,
             mode: overrides?.mode ?? agent.mode,
             workingDir: args.cwd,
+            ...agent.getSystemPromptToolOptions(),
         }));
     }, [agent, args.cwd, safeRegistry, safeSkillRegistry]);
     useKeyboard((key) => {
@@ -636,6 +637,7 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
                 configuredModelId: model,
                 thinkingLevel: agent.thinking,
                 workingDir: args.cwd,
+                ...agent.getSystemPromptToolOptions(),
             }));
             userConfig.pushRecentModel(model);
             setThinkingLevel(agent.thinking);

package/dist/tui-opentui/input-box.d.ts

@@ -8,6 +8,7 @@
 import React from "react";
 import type { SkillRegistry } from "../skills/registry.js";
 import { type ImageAttachment } from "./image-paste.js";
+export { createPastedContentMarker, shouldCollapsePastedContent, } from "../tui/paste-placeholder.js";
 export interface SubmitPayload {
     text: string;
     displayText?: string;
@@ -25,10 +26,7 @@ interface InputBoxProps {
     terminalColumns: number;
     cwd: string;
 }
-export declare function shouldCollapsePastedContent(text: string): boolean;
-export declare function createPastedContentMarker(content: string): string;
 export declare function isCtrlCInput(input: string, key: {
     ctrl?: boolean;
 }): boolean;
 export declare function InputBox({ onSubmit, onPasteNotice, disabled, cursorResetEpoch, draftText, draftEpoch, onDraftApplied, skillRegistry, terminalColumns, cwd, }: InputBoxProps): React.ReactNode;
-export {};

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

@@ -14,21 +14,10 @@ import { useTheme } from "./theme.js";
 import { filterFileSuggestions, findAtContext, listProjectFiles } from "./file-mentions.js";
 import { ingestImagePath, isImageFilePath, isScreenshotTempPath, splitPastedPaths, } from "./image-paste.js";
 import { appendHistoryEntry, loadHistorySync, stepHistory, } from "./input-history.js";
+export { createPastedContentMarker, shouldCollapsePastedContent, } from "../tui/paste-placeholder.js";
+import { createPastedContentMarker, expandPastedContentMarkers, shouldCollapsePastedContent, } from "../tui/paste-placeholder.js";
 const PROMPT = " > ";
-const LONG_PASTE_CHAR_THRESHOLD = 1000;
-const LONG_PASTE_LINE_THRESHOLD = 20;
 const MAX_VISIBLE_SUGGESTIONS = 8;
-export function shouldCollapsePastedContent(text) {
-    if (text.length >= LONG_PASTE_CHAR_THRESHOLD)
-        return true;
-    const lines = text.split("\n").length;
-    return lines >= LONG_PASTE_LINE_THRESHOLD;
-}
-export function createPastedContentMarker(content) {
-    const lineCount = content.split("\n").length;
-    const wordCount = content.trim().split(/\s+/).length;
-    return `[Pasted ${lineCount} lines · ${wordCount} words]`;
-}
 export function isCtrlCInput(input, key) {
     return input === "\x03" || (key.ctrl === true && input.toLowerCase() === "c");
 }
@@ -37,7 +26,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
     const [buffer, setBuffer] = useState("");
     const [cursor, setCursor] = useState(0);
     const [images, setImages] = useState([]);
-    const [pastedRefs, setPastedRefs] = useState(new Map());
+    const [pastedRefs, setPastedRefs] = useState([]);
     const [history] = useState(() => loadHistorySync());
     const [historyIndex, setHistoryIndex] = useState(null);
     const [suggestions, setSuggestions] = useState([]);
@@ -55,6 +44,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
     const suggestionIndexRef = useRef(suggestionIndex);
     const suggestionKindRef = useRef(suggestionKind);
     const historyIndexRef = useRef(historyIndex);
+    const nextPastedContentIndexRef = useRef(1);
     bufferRef.current = buffer;
     cursorRef.current = cursor;
     imagesRef.current = images;
@@ -70,7 +60,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
         setBuffer("");
         setCursor(0);
         setImages([]);
-        setPastedRefs(new Map());
+        setPastedRefs([]);
+        nextPastedContentIndexRef.current = 1;
         setSuggestions([]);
         setSuggestionKind(null);
         setHistoryIndex(null);
@@ -81,6 +72,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
             return;
         setBuffer(draftText);
         setCursor(draftText.length);
+        setPastedRefs([]);
+        nextPastedContentIndexRef.current = 1;
         onDraftApplied?.();
     }, [draftText, draftEpoch, onDraftApplied]);
     const updateSuggestions = useCallback(async (text, cursorPos) => {
@@ -168,10 +161,7 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
         const refs = pastedRefsRef.current;
         if (!b.trim() && imgs.length === 0)
             return;
-        let expanded = b;
-        for (const [marker, content] of refs) {
-            expanded = expanded.split(marker).join(content);
-        }
+        const expanded = expandPastedContentMarkers(b, refs);
         const payload = {
             text: expanded,
             displayText: expanded !== b ? b : undefined,
@@ -183,7 +173,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
         setBuffer("");
         setCursor(0);
         setImages([]);
-        setPastedRefs(new Map());
+        setPastedRefs([]);
+        nextPastedContentIndexRef.current = 1;
         setSuggestions([]);
         setSuggestionKind(null);
         setHistoryIndex(null);
@@ -211,12 +202,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
         }
         // Plain text: collapse if long, otherwise insert at cursor.
         if (shouldCollapsePastedContent(text)) {
-            const marker = createPastedContentMarker(text);
-            setPastedRefs((prev) => {
-                const next = new Map(prev);
-                next.set(marker, text);
-                return next;
-            });
+            const marker = createPastedContentMarker(text, nextPastedContentIndexRef.current++);
+            setPastedRefs((prev) => [...prev, { marker, content: text }]);
             insertAtCursor(marker);
         }
         else {
@@ -306,6 +293,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
                     setBuffer(next.text);
                     setCursor(next.text.length);
                     setHistoryIndex(next.index);
+                    setPastedRefs([]);
+                    nextPastedContentIndexRef.current = 1;
                 }
                 return;
             }
@@ -324,6 +313,8 @@ export function InputBox({ onSubmit, onPasteNotice, disabled = false, cursorRese
                 setBuffer(next.text);
                 setCursor(next.text.length);
                 setHistoryIndex(next.index);
+                setPastedRefs([]);
+                nextPastedContentIndexRef.current = 1;
                 return;
             }
             const lineEnd = b.indexOf("\n", c);

package/dist/types.d.ts

@@ -87,6 +87,7 @@ export interface ToolDefinition {
     description: string;
     parameters: ToolSchema;
 }
+export type ToolChoiceMode = "auto" | "none";
 export interface ToolCall {
     id: string;
     name: string;
@@ -203,6 +204,12 @@ export interface ToolContext {
 }
 export interface ToolRegistryEntry extends ToolDefinition {
     execute: ToolExecutor;
+    /** Optional one-line summary for the Available tools section. */
+    promptSnippet?: string;
+    /** Optional tool-specific rules appended to the system prompt when this tool is active. */
+    promptGuidelines?: string[];
+    /** Optional compatibility shim for provider-specific argument shapes. */
+    prepareArguments?: (args: Record<string, any>) => Record<string, any>;
     /** Whether this tool is allowed in plan mode. Defaults to false (treated as write-capable). */
     readOnly?: boolean;
     /** Capability classification used by subagent profiles. Defaults to "unknown". */
@@ -272,6 +279,7 @@ export interface TokenUsage {
     completionTokens: number;
     promptCacheHitTokens?: number;
     promptCacheMissTokens?: number;
+    cacheCreationTokens?: number;
     reasoningTokens?: number;
     totalTokens?: number;
 }
@@ -279,6 +287,7 @@ export interface Provider {
     streamChat(messages: ProviderMessage[], options: {
         model: string;
         tools?: ToolDefinition[];
+        toolChoice?: ToolChoiceMode;
         temperature?: number;
         thinkingLevel?: ThinkingLevel;
         abortSignal?: AbortSignal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bubblebrain-ai/bubble",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "A terminal coding agent",
   "type": "module",
   "engines": {
@@ -33,7 +33,7 @@
     "@vue/language-server": "^3.2.7",
     "better-sqlite3": "^12.9.0",
     "chalk": "^5.3.0",
-    "diff": "^7.0.0",
+    "diff": "^9.0.0",
     "ink": "^7.0.3",
     "js-tiktoken": "^1.0.21",
     "openai": "^4.77.0",
@@ -49,12 +49,16 @@
     "vscode-langservers-extracted": "^4.10.0"
   },
   "devDependencies": {
-    "@types/diff": "^7.0.0",
     "@types/node": "^22.0.0",
     "@types/picomatch": "^4.0.3",
     "@types/qrcode-terminal": "^0.12.2",
     "@vitest/coverage-v8": "^4.1.4",
     "typescript": "^5.7.0",
     "vitest": "^4.1.4"
+  },
+  "overrides": {
+    "axios": "^1.17.0",
+    "postcss": "^8.5.15",
+    "ws": "^8.21.0"
   }
 }

package/dist/tools/apply-patch.d.ts

@@ -1,9 +0,0 @@
-import type { ApprovalController } from "../approval/types.js";
-import { type LspService } from "../lsp/index.js";
-import type { ToolRegistryEntry } from "../types.js";
-import { type FileStateTracker } from "./file-state.js";
-export interface ApplyPatchArgs {
-    patch?: string;
-    patchText?: string;
-}
-export declare function createApplyPatchTool(cwd: string, approval?: ApprovalController, lsp?: LspService, fileState?: FileStateTracker): ToolRegistryEntry;