@bubblebrain-ai/bubble 0.0.13 → 0.0.14

package/dist/tui/tool-renderers/fallback.js

@@ -10,7 +10,7 @@ function renderFallbackTool({ ctx, tool, syntaxStyle, width, helpers }) {
     const header = helpers.toolHeader(tool);
     const diff = helpers.extractToolDiff(tool);
     const isError = tool.isError === true || tool.status === "error";
-    if (diff && !isError && tool.name === "edit") {
+    if (diff && !isError && (tool.name === "edit" || tool.name === "apply_patch")) {
         return helpers.createBox(ctx, {
             paddingLeft: 3,
             marginTop: 1,

package/dist/tui/tool-renderers/write-preview.js

@@ -1,6 +1,8 @@
 const WRITE_PREVIEW_LINE_LIMIT = 10;
 export const WRITE_PREVIEW_CHAR_LIMIT = 5000;
 export function isWritePreviewTool(tool) {
+    if (tool.resultCollapsed)
+        return false;
     if (tool.isError)
         return false;
     if (tool.name !== "write")

package/dist/tui/trace-groups.js

@@ -226,8 +226,8 @@ function buildExecuteGroup(classifier, tool, options, pending, startedAt, hasErr
 function buildMutationGroup(classifier, raw, options, pending, startedAt, hasError, errorCount) {
     const items = raw
         .map((tool) => {
-        const path = formatTracePath(tool.args.path ?? "", options.homeDir);
-        const details = tool.name === "edit" ? getEditDiffDetails(tool) : null;
+        const path = formatTracePath(tool.args.path ?? firstMetadataPath(tool) ?? "", options.homeDir);
+        const details = tool.name === "edit" || tool.name === "apply_patch" ? getEditDiffDetails(tool) : null;
         const suffix = details ? ` ${formatCompactEditStats(details.added, details.removed)}` : "";
         return path ? `${path}${suffix}` : "";
     })
@@ -323,7 +323,7 @@ function isFailedSubagent(subagent) {
     return subagent.status === "failed" || subagent.status === "blocked" || subagent.status === "cancelled";
 }
 function isToolPending(tool) {
-    return tool.result === undefined;
+    return tool.result === undefined && tool.resultCollapsed !== true;
 }
 function isDirectoryLikeGlob(pattern) {
     const normalized = pattern.trim();
@@ -400,8 +400,15 @@ function toolHeader(tool, homeDir) {
             return formatTracePath(value, homeDir);
         }
     }
+    const path = firstMetadataPath(tool);
+    if (path)
+        return formatTracePath(path, homeDir);
     return undefined;
 }
+function firstMetadataPath(tool) {
+    const paths = tool.metadata?.paths;
+    return Array.isArray(paths) && typeof paths[0] === "string" ? paths[0] : undefined;
+}
 function formatCompactEditStats(added, removed) {
     const parts = [];
     if (added > 0)

package/dist/tui-ink/app.js

@@ -996,10 +996,7 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
             catch (err) {
                 commitAssistantMessage();
                 if (err instanceof AgentAbortError || err?.name === "AbortError") {
-                    updateDisplayMessages((prev) => [
-                        ...prev,
-                        withMessageKey({ role: "assistant", content: "Cancelled." }),
-                    ]);
+                    updateDisplayMessages(() => reconstructDisplayMessages(agent.messages));
                 }
                 else {
                     updateDisplayMessages((prev) => [

package/dist/tui-ink/approval/approval-dialog.js

@@ -53,7 +53,7 @@ function buildOptions(request) {
             },
         ];
     }
-    // edit / write
+    // edit / write / patch
     return [
         { id: "yes", label: "Yes", allowAmend: true, amendPlaceholder: "and tell Claude what to do next" },
         {
@@ -69,6 +69,8 @@ function dialogTitle(req) {
     switch (req.type) {
         case "edit":
             return "Edit file";
+        case "patch":
+            return "Apply patch";
         case "write":
             return req.fileExists ? "Overwrite file" : "Create file";
         case "bash":
@@ -81,6 +83,8 @@ function dialogQuestion(req) {
     switch (req.type) {
         case "edit":
             return `Do you want to make this edit to ${basename(req.path)}?`;
+        case "patch":
+            return `Do you want to apply this patch to ${req.paths.length} file${req.paths.length === 1 ? "" : "s"}?`;
         case "write":
             return `Do you want to ${req.fileExists ? "overwrite" : "create"} ${basename(req.path)}?`;
         case "bash":
@@ -99,6 +103,8 @@ function RequestPreview({ request }) {
             return _jsx(BashPreview, { command: request.command, cwd: request.cwd });
         case "edit":
             return _jsx(DiffView, { diff: request.diff });
+        case "patch":
+            return _jsx(DiffView, { diff: request.diff });
         case "write":
             return _jsx(WritePreview, { path: request.path, content: request.content });
     }

package/dist/tui-ink/display-history.d.ts

@@ -33,6 +33,7 @@ export interface DisplayToolCall {
      */
     rawArguments?: string;
     result?: string;
+    resultCollapsed?: boolean;
     isError?: boolean;
     metadata?: ToolResultMetadata;
     /** Set when the tool_start event was received. Used to render elapsed time. */

package/dist/tui-ink/display-history.js

@@ -46,7 +46,6 @@ export function toolCallsFromParts(parts) {
 const FULL_DETAIL_WINDOW = 24;
 const MAX_OLD_CONTENT_CHARS = 1200;
 const MAX_OLD_REASONING_CHARS = 600;
-const MAX_OLD_TOOL_RESULT_CHARS = 800;
 export function compactDisplayMessages(messages) {
     if (messages.length === 0) {
         return messages;
@@ -97,11 +96,13 @@ function compactDisplayPart(part) {
     };
 }
 function compactToolCall(toolCall) {
+    if (toolCall.result === undefined) {
+        return toolCall;
+    }
     return {
         ...toolCall,
-        result: toolCall.result
-            ? truncateText(toolCall.result, MAX_OLD_TOOL_RESULT_CHARS)
-            : toolCall.result,
+        result: undefined,
+        resultCollapsed: true,
     };
 }
 const PREVIOUS_SUMMARY_PREFIX = /^Previous conversation summary:\s*\n?([\s\S]*)$/;

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

@@ -105,8 +105,8 @@ function ToolsPart({ toolCalls, terminalColumns, verboseTrace, pendingApproval,
     }
     const lastIdx = toolCalls.length - 1;
     return (_jsx(Box, { flexDirection: "column", children: toolCalls.map((tc, idx) => {
-            const isWaitingApproval = tc.result === undefined && !!pendingApproval && approvalMatchesTool(pendingApproval, tc);
-            return (_jsx(ToolCallDisplay, { toolCall: tc, isStreaming: tc.result === undefined, verbose: verboseTrace, terminalColumns: terminalColumns, showExpandHint: showExpandHint && idx === lastIdx, waitingApproval: isWaitingApproval, compactTop: idx === 0 && compactTop, nowTick: nowTick }, tc.id));
+            const isWaitingApproval = isToolPending(tc) && !!pendingApproval && approvalMatchesTool(pendingApproval, tc);
+            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) {
@@ -192,7 +192,7 @@ function findActiveTraceGroup(groups, pendingApproval) {
     return undefined;
 }
 function isTraceGroupWaitingForApproval(group, pendingApproval) {
-    return !!pendingApproval && group.raw.some((tool) => tool.result === undefined && approvalMatchesTool(pendingApproval, tool));
+    return !!pendingApproval && group.raw.some((tool) => isToolPending(tool) && approvalMatchesTool(pendingApproval, tool));
 }
 function approvalMatchesTool(hint, tc) {
     if (hint.toolName !== tc.name)
@@ -202,6 +202,9 @@ function approvalMatchesTool(hint, tc) {
     }
     return !hint.path || hint.path === tc.args.path;
 }
+function isToolPending(tool) {
+    return tool.result === undefined && tool.resultCollapsed !== true;
+}
 function ReasoningTraceBlock({ reasoning }) {
     const theme = useTheme();
     const lines = React.useMemo(() => reasoning.split("\n").filter((l) => l.trim() !== ""), [reasoning]);
@@ -280,6 +283,8 @@ function getToolHeader(toolCall) {
     }
 }
 function summarizeToolResult(tc) {
+    if (tc.resultCollapsed)
+        return tc.isError ? "error output collapsed" : "result collapsed";
     if (tc.result === undefined)
         return "pending";
     const raw = tc.result.replace(/\r\n/g, "\n");
@@ -441,7 +446,7 @@ function ToolCallDisplay({ toolCall, isStreaming, verbose, terminalColumns, show
         summary = "⏸ waiting for approval";
         summaryColor = theme.warning;
     }
-    else if (toolCall.result === undefined && toolCall.startedAt) {
+    else if (isToolPending(toolCall) && toolCall.startedAt) {
         void nowTick;
         summary = "running";
         summaryColor = theme.toolPending;
@@ -454,18 +459,19 @@ function ToolCallDisplay({ toolCall, isStreaming, verbose, terminalColumns, show
             summaryColor = theme.success;
     }
     const editDetails = getEditDiffDetails(toolCall);
-    const isEditDiff = editDetails !== null && toolCall.result !== undefined;
+    const isEditDiff = editDetails !== null && toolCall.result !== undefined && !toolCall.resultCollapsed;
+    const showSummary = !toolCall.resultCollapsed || waitingApproval;
     // Only show the file preview once the tool actually executed. During the
     // streaming-args phase, args.content is incomplete and re-rendering the
     // entire body per delta both looks chaotic and breaks on partial escapes.
-    const isWritePreview = toolCall.name === "write" && !toolCall.isError && toolCall.result !== undefined;
-    return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: compactTop ? 0 : 1, children: [_jsxs(Box, { children: [_jsxs(Text, { color: bulletColor, children: [glyph, " "] }), _jsx(Text, { bold: true, color: theme.toolName, children: name }), header && _jsxs(Text, { color: theme.muted, children: ["(", header, ")"] })] }), _jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: summaryColor, children: ["\u23BF  ", summary] }) }), toolCall.isError && toolCall.result && (_jsx(Box, { marginLeft: 4, flexDirection: "column", children: toolCall.result.replace(/\r\n/g, "\n").split("\n").slice(0, 6).map((line, i) => (_jsx(Text, { color: theme.error, children: line }, i))) })), isEditDiff && (_jsx(DiffBlock, { diff: editDetails.diff, terminalColumns: terminalColumns, maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint })), isWritePreview && (_jsx(WritePreview, { content: String(toolCall.args.content || ""), maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint })), !toolCall.isError && !isEditDiff && !isWritePreview && highlighted && (_jsx(OutputPreview, { text: highlighted, maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint }))] }));
+    const isWritePreview = toolCall.name === "write" && !toolCall.isError && toolCall.result !== undefined && !toolCall.resultCollapsed;
+    return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: compactTop ? 0 : 1, children: [_jsxs(Box, { children: [_jsxs(Text, { color: bulletColor, children: [glyph, " "] }), _jsx(Text, { bold: true, color: theme.toolName, children: name }), header && _jsxs(Text, { color: theme.muted, children: ["(", header, ")"] })] }), showSummary && (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: summaryColor, children: ["\u23BF  ", summary] }) })), toolCall.isError && toolCall.result && (_jsx(Box, { marginLeft: 4, flexDirection: "column", children: toolCall.result.replace(/\r\n/g, "\n").split("\n").slice(0, 6).map((line, i) => (_jsx(Text, { color: theme.error, children: line }, i))) })), isEditDiff && (_jsx(DiffBlock, { diff: editDetails.diff, terminalColumns: terminalColumns, maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint })), isWritePreview && (_jsx(WritePreview, { content: String(toolCall.args.content || ""), maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint })), !toolCall.isError && !isEditDiff && !isWritePreview && highlighted && (_jsx(OutputPreview, { text: highlighted, maxLines: maxLines, verbose: verbose, showExpandHint: showExpandHint }))] }));
 }
 function SubagentToolDisplay({ toolCall, verbose, terminalColumns, compactTop, }) {
     const theme = useTheme();
     const subagents = subagentsFrom(toolCall);
     const hasError = toolCall.isError || subagents.some((subagent) => (subagent.status === "failed" || subagent.status === "blocked" || subagent.status === "cancelled"));
-    const bulletColor = hasError ? theme.error : toolCall.result === undefined ? theme.toolPending : theme.user;
+    const bulletColor = hasError ? theme.error : isToolPending(toolCall) ? theme.toolPending : theme.user;
     const detailWidth = Math.max(24, terminalColumns - 10);
     const rows = verbose ? sortSubagents(subagents) : sortSubagents(subagents).slice(0, 4);
     const omitted = Math.max(0, subagents.length - rows.length);

package/dist/tui-ink/trace-groups.js

@@ -323,7 +323,7 @@ function isFailedSubagent(subagent) {
     return subagent.status === "failed" || subagent.status === "blocked" || subagent.status === "cancelled";
 }
 function isToolPending(tool) {
-    return tool.result === undefined;
+    return tool.result === undefined && tool.resultCollapsed !== true;
 }
 function isDirectoryLikeGlob(pattern) {
     const normalized = pattern.trim();

package/dist/tui-opentui/app.js

@@ -1147,6 +1147,8 @@ export function App({ agent, args, sessionManager, createProvider, registry, ski
                 return { toolName: "bash", command: r.command };
             if (r.type === "edit")
                 return { toolName: "edit", path: r.path };
+            if (r.type === "patch")
+                return { toolName: "edit", path: r.paths[0] ?? r.path };
             if (r.type === "write")
                 return { toolName: "write", path: r.path };
             return null;

package/dist/tui-opentui/approval/approval-dialog.js

@@ -60,7 +60,7 @@ function buildOptions(request) {
             },
         ];
     }
-    // edit / write
+    // edit / write / patch
     return [
         { id: "yes", label: "Yes", allowAmend: true, amendPlaceholder: "and tell Claude what to do next" },
         {
@@ -76,6 +76,8 @@ function dialogTitle(req) {
     switch (req.type) {
         case "edit":
             return "Edit file";
+        case "patch":
+            return "Apply patch";
         case "write":
             return req.fileExists ? "Overwrite file" : "Create file";
         case "bash":
@@ -88,6 +90,8 @@ function dialogQuestion(req) {
     switch (req.type) {
         case "edit":
             return `Do you want to make this edit to ${basename(req.path)}?`;
+        case "patch":
+            return `Do you want to apply this patch to ${req.paths.length} file${req.paths.length === 1 ? "" : "s"}?`;
         case "write":
             return `Do you want to ${req.fileExists ? "overwrite" : "create"} ${basename(req.path)}?`;
         case "bash":
@@ -106,6 +110,8 @@ function RequestPreview({ request }) {
             return _jsx(BashPreview, { command: request.command, cwd: request.cwd });
         case "edit":
             return _jsx(DiffView, { diff: request.diff });
+        case "patch":
+            return _jsx(DiffView, { diff: request.diff });
         case "write":
             return _jsx(WritePreview, { path: request.path, content: request.content });
     }

package/dist/tui-opentui/display-history.d.ts

@@ -33,6 +33,7 @@ export interface DisplayToolCall {
      */
     rawArguments?: string;
     result?: string;
+    resultCollapsed?: boolean;
     isError?: boolean;
     metadata?: ToolResultMetadata;
     /** Set when the tool_start event was received. Used to render elapsed time. */

package/dist/tui-opentui/display-history.js

@@ -46,7 +46,6 @@ export function toolCallsFromParts(parts) {
 const FULL_DETAIL_WINDOW = 24;
 const MAX_OLD_CONTENT_CHARS = 1200;
 const MAX_OLD_REASONING_CHARS = 600;
-const MAX_OLD_TOOL_RESULT_CHARS = 800;
 export function compactDisplayMessages(messages) {
     if (messages.length === 0) {
         return messages;
@@ -97,11 +96,13 @@ function compactDisplayPart(part) {
     };
 }
 function compactToolCall(toolCall) {
+    if (toolCall.result === undefined) {
+        return toolCall;
+    }
     return {
         ...toolCall,
-        result: toolCall.result
-            ? truncateText(toolCall.result, MAX_OLD_TOOL_RESULT_CHARS)
-            : toolCall.result,
+        result: undefined,
+        resultCollapsed: true,
     };
 }
 const PREVIOUS_SUMMARY_PREFIX = /^Previous conversation summary:\s*\n?([\s\S]*)$/;

package/dist/tui-opentui/edit-diff.js

@@ -1,7 +1,7 @@
 import { countUnifiedDiffChanges } from "../diff-stats.js";
 export const EDIT_COLLAPSED_DIFF_LINES = 20;
 export function getEditDiffDetails(tool) {
-    if (tool.name !== "edit" || tool.isError)
+    if ((tool.name !== "edit" && tool.name !== "apply_patch") || tool.isError)
         return null;
     const metadata = tool.metadata;
     const metadataDiff = readMetadataString(metadata, "diff");
@@ -12,9 +12,14 @@ export function getEditDiffDetails(tool) {
     const added = readMetadataNumber(metadata, "addedLines") ?? counted.added;
     const removed = readMetadataNumber(metadata, "removedLines") ?? counted.removed;
     const path = readMetadataString(metadata, "path")
+        ?? readFirstMetadataPath(metadata)
         ?? (typeof tool.args.path === "string" ? tool.args.path : undefined);
     return { diff, added, removed, path };
 }
+function readFirstMetadataPath(metadata) {
+    const value = metadata?.paths;
+    return Array.isArray(value) && typeof value[0] === "string" ? value[0] : undefined;
+}
 export function formatEditSuccessSummary(details) {
     const stats = details ? formatEditStats(details.added, details.removed) : "";
     return `Succeeded. File edited.${stats ? ` ${stats}` : ""}`;

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

@@ -84,15 +84,18 @@ function ToolsPart({ toolCalls, terminalColumns, verboseTrace, theme, }) {
  * body as content. Matches opencode's `theme.block` pattern.
  */
 function ToolCard({ tool, terminalColumns, verboseTrace, theme, }) {
-    const pending = tool.result === undefined;
+    const pending = isToolPending(tool);
     const error = tool.isError;
     const target = describeToolTarget(tool);
     const headerColor = pending ? theme.toolPending : error ? theme.toolError : theme.textMuted;
     const titleText = target ? `${tool.name}  ${target}` : tool.name;
-    const editDetails = (tool.name === "edit" || tool.name === "multiedit" || tool.name === "write")
+    const editDetails = (tool.name === "edit" || tool.name === "apply_patch" || tool.name === "multiedit" || tool.name === "write")
         ? getEditDiffDetails(tool)
         : null;
-    return (_jsxs("box", { style: { flexDirection: "column", marginBottom: 1 }, children: [_jsx("text", { fg: headerColor, content: titleText }), _jsxs("box", { style: { paddingLeft: 1, flexDirection: "column" }, children: [!pending && tool.result && verboseTrace && (_jsx(ToolResultPreview, { result: tool.result, error: error, terminalColumns: terminalColumns, theme: theme })), editDetails && editDetails.diff && (_jsx(EditDiffPreview, { diff: editDetails.diff, theme: theme }))] })] }));
+    return (_jsxs("box", { style: { flexDirection: "column", marginBottom: 1 }, children: [_jsx("text", { fg: headerColor, content: titleText }), _jsxs("box", { style: { paddingLeft: 1, flexDirection: "column" }, children: [!pending && tool.result && verboseTrace && (_jsx(ToolResultPreview, { result: tool.result, error: error, terminalColumns: terminalColumns, theme: theme })), !tool.resultCollapsed && editDetails && editDetails.diff && (_jsx(EditDiffPreview, { diff: editDetails.diff, theme: theme }))] })] }));
+}
+function isToolPending(tool) {
+    return tool.result === undefined && tool.resultCollapsed !== true;
 }
 function describeToolTarget(tool) {
     const args = tool.args || {};

package/dist/tui-opentui/trace-groups.js

@@ -226,8 +226,8 @@ function buildExecuteGroup(classifier, tool, options, pending, startedAt, hasErr
 function buildMutationGroup(classifier, raw, options, pending, startedAt, hasError, errorCount) {
     const items = raw
         .map((tool) => {
-        const path = formatTracePath(tool.args.path ?? "", options.homeDir);
-        const details = tool.name === "edit" ? getEditDiffDetails(tool) : null;
+        const path = formatTracePath(tool.args.path ?? firstMetadataPath(tool) ?? "", options.homeDir);
+        const details = tool.name === "edit" || tool.name === "apply_patch" ? getEditDiffDetails(tool) : null;
         const suffix = details ? ` ${formatCompactEditStats(details.added, details.removed)}` : "";
         return path ? `${path}${suffix}` : "";
     })
@@ -323,7 +323,7 @@ function isFailedSubagent(subagent) {
     return subagent.status === "failed" || subagent.status === "blocked" || subagent.status === "cancelled";
 }
 function isToolPending(tool) {
-    return tool.result === undefined;
+    return tool.result === undefined && tool.resultCollapsed !== true;
 }
 function isDirectoryLikeGlob(pattern) {
     const normalized = pattern.trim();
@@ -400,8 +400,15 @@ function toolHeader(tool, homeDir) {
             return formatTracePath(value, homeDir);
         }
     }
+    const path = firstMetadataPath(tool);
+    if (path)
+        return formatTracePath(path, homeDir);
     return undefined;
 }
+function firstMetadataPath(tool) {
+    const paths = tool.metadata?.paths;
+    return Array.isArray(paths) && typeof paths[0] === "string" ? paths[0] : undefined;
+}
 function formatCompactEditStats(added, removed) {
     const parts = [];
     if (added > 0)

package/dist/types.d.ts

@@ -23,6 +23,16 @@ export interface AssistantMessage {
     content: string;
     reasoning?: string;
     toolCalls?: ToolCall[];
+    /** Model metadata captured for local usage statistics. */
+    model?: string;
+    providerId?: string;
+    modelId?: string;
+    usage?: TokenUsage;
+    error?: {
+        name: string;
+        message: string;
+        aborted?: boolean;
+    };
 }
 export interface ToolMessage {
     role: "tool";
@@ -90,9 +100,9 @@ export interface ParsedToolCall extends ToolCall {
      */
     argsCorrupt?: boolean;
 }
-export type ToolResultStatus = "success" | "no_match" | "partial" | "timeout" | "blocked" | "command_error";
+export type ToolResultStatus = "success" | "no_match" | "partial" | "timeout" | "blocked" | "cancelled" | "command_error";
 export interface ToolResultMetadata {
-    kind?: "search" | "read" | "write" | "edit" | "shell" | "web" | "security" | "lsp" | "question" | "subagent";
+    kind?: "search" | "read" | "write" | "edit" | "patch" | "shell" | "server" | "web" | "security" | "lsp" | "question" | "subagent";
     path?: string;
     pattern?: string;
     matches?: number;

package/package.json

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