@bubblebrain-ai/bubble 0.0.19 → 0.0.20

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

@@ -9,6 +9,7 @@ import type { McpManager } from "../mcp/manager.js";
 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";
 export interface SidebarCommandState {
     mode: SidebarMode;
@@ -28,6 +29,7 @@ export interface SlashCommandContext {
     skillRegistry: SkillRegistry;
     bashAllowlist?: BashAllowlist;
     settingsManager?: SettingsManager;
+    hookController?: ExternalHookController;
     mcpManager?: McpManager;
     lspService?: LspService;
     flushMemory?: () => Promise<void>;

package/dist/tools/edit-apply.js

@@ -1,3 +1,4 @@
+import { isSensitivePath } from "./sensitive-paths.js";
 export class EditApplyError extends Error {
     status;
     constructor(message, status = "no_match") {
@@ -6,6 +7,9 @@ export class EditApplyError extends Error {
         this.name = "EditApplyError";
     }
 }
+const CANDIDATE_EXCERPT_CONTEXT_LINES = 3;
+const CANDIDATE_EXCERPT_MAX_LINES = 8;
+const CANDIDATE_EXCERPT_MAX_CHARS = 1200;
 function detectLineEnding(content) {
     const crlf = content.indexOf("\r\n");
     const lf = content.indexOf("\n");
@@ -234,19 +238,75 @@ function findBestLineHint(content, oldText) {
         return undefined;
     const contentLines = nonBlankLines(splitLines(content));
     let best;
+    let tieCount = 0;
     for (let i = 0; i < contentLines.length; i++) {
         let score = 0;
         for (let j = 0; j < oldLines.length && i + j < contentLines.length; j++) {
             if (contentLines[i + j].normalized === oldLines[j])
                 score++;
         }
-        if (!best || score > best.score)
+        if (!best || score > best.score) {
             best = { index: i, score };
+            tieCount = 1;
+        }
+        else if (score === best.score) {
+            tieCount++;
+        }
     }
     if (!best || best.score === 0)
         return undefined;
     const startLine = contentLines[best.index].lineIndex + 1;
-    return `Closest line-based candidate starts near line ${startLine} and matched ${best.score}/${oldLines.length} non-blank lines.`;
+    return {
+        startLine,
+        score: best.score,
+        total: oldLines.length,
+        lineIndex: contentLines[best.index].lineIndex,
+        tieCount,
+    };
+}
+function isHighConfidenceLineHint(hint) {
+    return hint.score >= 2 && hint.score / hint.total >= 0.5 && hint.tieCount === 1;
+}
+function formatLineHint(hint) {
+    if (hint.tieCount > 1) {
+        return `Closest ambiguous line-based candidate starts near line ${hint.startLine} and matched ${hint.score}/${hint.total} non-blank lines, but ${hint.tieCount} candidates tied. Current bytes were not included because the candidate may be unrelated.`;
+    }
+    if (!isHighConfidenceLineHint(hint)) {
+        return `Closest low-confidence line-based candidate starts near line ${hint.startLine} and matched ${hint.score}/${hint.total} non-blank lines. Current bytes were not included because the candidate may be unrelated.`;
+    }
+    return `Closest line-based candidate starts near line ${hint.startLine} and matched ${hint.score}/${hint.total} non-blank lines.`;
+}
+function formatFence(content) {
+    let fence = "```";
+    while (content.includes(fence))
+        fence += "`";
+    return `${fence}\n${content}\n${fence}`;
+}
+function truncateExcerpt(excerpt) {
+    if (excerpt.length <= CANDIDATE_EXCERPT_MAX_CHARS)
+        return excerpt;
+    const marker = "\n...[truncated current candidate excerpt]";
+    return excerpt.slice(0, Math.max(0, CANDIDATE_EXCERPT_MAX_CHARS - marker.length)) + marker;
+}
+function formatCandidateExcerpt(content, hint) {
+    const lines = splitLines(content);
+    const startLineIndex = Math.max(0, hint.lineIndex - CANDIDATE_EXCERPT_CONTEXT_LINES);
+    const requestedEnd = Math.min(lines.length, hint.lineIndex + CANDIDATE_EXCERPT_CONTEXT_LINES + 1);
+    const endLineIndex = Math.min(requestedEnd, startLineIndex + CANDIDATE_EXCERPT_MAX_LINES);
+    const excerpt = truncateExcerpt(lines.slice(startLineIndex, endLineIndex).map((line) => line.text).join("\n"));
+    return [
+        `Current candidate excerpt (high confidence, current file lines ${startLineIndex + 1}-${endLineIndex}, not guaranteed target):`,
+        formatFence(excerpt),
+    ].join("\n");
+}
+function formatBestLineHint(content, hint, options) {
+    const lineHint = formatLineHint(hint);
+    if (!isHighConfidenceLineHint(hint))
+        return lineHint;
+    if (options?.path && isSensitivePath(options.path)) {
+        return `${lineHint}\nCurrent bytes were not included because this path is blocked by the sensitive-path read policy.`;
+    }
+    return `${lineHint}\n\n${formatCandidateExcerpt(content, hint)}`;
 }
 function matchEdit(content, edit, index, total, options) {
     if (edit.oldText.length === 0) {
@@ -350,7 +410,7 @@ function matchEdit(content, edit, index, total, options) {
         }
     }
     const hint = findBestLineHint(content, oldText);
-    const hintSuffix = hint ? `\n${hint}` : "";
+    const hintSuffix = hint ? `\n${formatBestLineHint(content, hint, options)}` : "";
     const recovery = [
         "",
         "How to recover:",

package/dist/tools/edit.js

@@ -65,12 +65,12 @@ export function createEditTool(cwd, approval, lsp, fileState) {
         name: "edit",
         effect: "write_direct",
         requiresApproval: true,
-        description: "Edit a single file using targeted text replacements. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.",
+        description: "Edit a single file using targeted text replacements. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes overlap or one replacement is nested inside another, merge them into one edit. Do not include large unchanged regions just to connect distant changes.",
         promptSnippet: "Make precise file edits with exact text replacement, including multiple disjoint edits in one call",
         promptGuidelines: [
-            "Use edit for precise changes; edits[].oldText should be copied from a recent read and must identify a unique target.",
-            "When changing multiple separate locations in one file, use one edit call with multiple entries in edits[] instead of multiple edit calls.",
-            "Each edits[].oldText is matched against the original file, not after earlier edits are applied. Do not emit overlapping or nested edits. Merge nearby changes into one edit.",
+            "Use edit for precise changes; each edits[].oldText must be copied verbatim from a fresh read of the current exact target block and must identify a unique target. Do not reconstruct oldText from memory, stale reads, or similar code elsewhere.",
+            "When changing multiple small, clearly disjoint locations copied from the same fresh read, you may use one edit call with multiple entries in edits[]. Use separate smaller edit calls after re-reading when anchors are uncertain, stale, or likely to drift.",
+            "Each edits[].oldText is matched against the original file, not after earlier edits are applied. Do not emit overlapping or nested edits; merge only truly overlapping targets.",
             "Keep edits[].oldText as small as possible while still being unique in the file. Do not pad with large unchanged regions.",
         ],
         parameters: {

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

@@ -2,7 +2,6 @@ import type { ToolResultMetadata, TokenUsage } from "../types.js";
 export interface CompactionMeta {
     turns: number;
     messages: number;
-    tokensSaved: number;
     summarySections: Array<{
         label: string;
         content: string;
@@ -10,11 +9,12 @@ export interface CompactionMeta {
     contextWindow?: number;
     compactedAt: number;
 }
+export type UserInputStatus = "queued" | "pending_steer";
 export interface DisplayMessage {
     role: "user" | "assistant" | "error";
     content: string;
     clientId?: string;
-    queued?: boolean;
+    inputStatus?: UserInputStatus;
     reasoning?: string;
     toolCalls?: DisplayToolCall[];
     parts?: DisplayMessagePart[];
@@ -53,11 +53,12 @@ export interface DisplayToolCall {
     startedAt?: number;
     completedAt?: number;
 }
+export declare function userInputStatusBadgeLabel(status?: UserInputStatus): string | undefined;
+export declare function setUserInputStatus(message: DisplayMessage, inputStatus?: UserInputStatus): DisplayMessage;
 export declare function appendTextPart(parts: DisplayMessagePart[], content: string): void;
 export declare function appendToolPart(parts: DisplayMessagePart[], toolCall: DisplayToolCall): void;
 export declare function snapshotDisplayParts(parts: DisplayMessagePart[]): DisplayMessagePart[];
 export declare function contentFromParts(parts: DisplayMessagePart[]): string;
 export declare function toolCallsFromParts(parts: DisplayMessagePart[]): DisplayToolCall[];
 export declare function compactDisplayMessages(messages: DisplayMessage[]): DisplayMessage[];
-export declare function truncateText(value: string, maxChars: number): string;
 export declare function formatCompactNumber(n: number): string;

package/dist/tui/display-history.js

@@ -1,3 +1,19 @@
+export function userInputStatusBadgeLabel(status) {
+    switch (status) {
+        case "queued":
+            return "QUEUED";
+        case "pending_steer":
+            return "STEER";
+        default:
+            return undefined;
+    }
+}
+export function setUserInputStatus(message, inputStatus) {
+    if (inputStatus)
+        return { ...message, inputStatus };
+    const { inputStatus: _inputStatus, ...rest } = message;
+    return rest;
+}
 export function appendTextPart(parts, content) {
     if (!content)
         return;
@@ -40,18 +56,21 @@ export function toolCallsFromParts(parts) {
 }
 const MAX_VISIBLE_MESSAGES = 80;
 const FULL_DETAIL_WINDOW = 24;
-const MAX_OLD_CONTENT_CHARS = 1200;
-const MAX_OLD_REASONING_CHARS = 600;
 const COMPACTION_SUMMARY_ITEMS = 6;
 const COMPACTION_FILE_LIMIT = 8;
 const TOOL_PATH_KEYS = ["file", "path", "paths", "filePath"];
+// Display-history folding policy: message text is NEVER rewritten or truncated.
+// Visible messages keep their content verbatim (older ones only collapse bulky
+// tool-result bodies, which the UI can re-expand). When history exceeds
+// MAX_VISIBLE_MESSAGES, the entire older span is folded behind a single summary
+// card — mirroring how mainstream coding agents present compacted history —
+// instead of clipping individual messages mid-sentence.
 export function compactDisplayMessages(messages) {
     if (messages.length === 0) {
         return messages;
     }
     let hiddenCount = 0;
     let accumulatedTurns = 0;
-    let accumulatedTokens = 0;
     const summarySections = [];
     const withoutSynthetic = messages.filter((message) => {
         if (message.syntheticKind !== "ui_compact_card") {
@@ -60,7 +79,6 @@ export function compactDisplayMessages(messages) {
         hiddenCount += message.hiddenCount ?? 0;
         if (message.compactionMeta) {
             accumulatedTurns += message.compactionMeta.turns;
-            accumulatedTokens += message.compactionMeta.tokensSaved;
             for (const section of message.compactionMeta.summarySections) {
                 summarySections.push(section);
             }
@@ -69,36 +87,31 @@ export function compactDisplayMessages(messages) {
     });
     const overflow = Math.max(0, withoutSynthetic.length - MAX_VISIBLE_MESSAGES);
     hiddenCount += overflow;
+    const hiddenMessages = overflow > 0 ? withoutSynthetic.slice(0, overflow) : [];
     const visible = overflow > 0 ? withoutSynthetic.slice(overflow) : withoutSynthetic;
     const detailStart = Math.max(0, visible.length - FULL_DETAIL_WINDOW);
     const compacted = visible.map((message, index) => {
         if (message.syntheticKind === "ui_compact_card") {
             return message;
         }
-        return index < detailStart ? compactDisplayMessage(message) : message;
+        return index < detailStart ? collapseToolResults(message) : message;
     });
     if (hiddenCount === 0) {
         return compacted;
     }
-    const truncatedMessages = visible.slice(0, Math.max(1, detailStart));
-    const extractedMeta = extractCompactionMeta(truncatedMessages, hiddenCount, accumulatedTurns, accumulatedTokens, summarySections);
+    const extractedMeta = extractCompactionMeta(hiddenMessages, hiddenCount, accumulatedTurns, summarySections);
     return [buildCompactCard(extractedMeta), ...compacted];
 }
-function extractCompactionMeta(truncatedMessages, hiddenCount, previousTurns, previousTokens, previousSections) {
-    const turnsInBatch = countUserTurns(truncatedMessages);
+function extractCompactionMeta(hiddenMessages, hiddenCount, previousTurns, previousSections) {
+    const turnsInBatch = countUserTurns(hiddenMessages);
     const totalTurns = previousTurns + turnsInBatch;
-    const messagesInBatch = truncatedMessages.length;
-    const totalMessages = hiddenCount;
-    const estimatedTokens = estimateTokenSavings(truncatedMessages);
-    const totalTokens = previousTokens + estimatedTokens;
     const sections = [
         ...previousSections,
-        ...extractSummarySections(truncatedMessages),
+        ...extractSummarySections(hiddenMessages),
     ];
     return {
         turns: totalTurns,
-        messages: totalMessages,
-        tokensSaved: totalTokens > 0 ? totalTokens : estimatedTokens,
+        messages: hiddenCount,
         summarySections: mergeSummarySections(sections, COMPACTION_SUMMARY_ITEMS),
         compactedAt: Date.now(),
     };
@@ -106,18 +119,6 @@ function extractCompactionMeta(truncatedMessages, hiddenCount, previousTurns, pr
 function countUserTurns(messages) {
     return messages.filter((message) => message.role === "user").length;
 }
-function estimateTokenSavings(messages) {
-    let chars = 0;
-    for (const message of messages) {
-        chars += message.content.length;
-        chars += (message.reasoning?.length ?? 0);
-        for (const tool of message.toolCalls ?? []) {
-            chars += (tool.result?.length ?? 0);
-            chars += JSON.stringify(tool.args).length;
-        }
-    }
-    return Math.ceil(chars / 4);
-}
 function extractSummarySections(messages) {
     const sections = [];
     const userMessages = messages
@@ -206,13 +207,6 @@ function mergeSummarySections(sections, maxItems) {
         .slice(0, maxItems);
 }
 function buildCompactCard(meta) {
-    const formatNum = (n) => {
-        if (n >= 1_000_000)
-            return `${(n / 1_000_000).toFixed(1)}M`;
-        if (n >= 1_000)
-            return `${(n / 1_000).toFixed(1)}K`;
-        return String(n);
-    };
     const parts = [];
     if (meta.turns > 0) {
         parts.push(`${meta.turns} turn${meta.turns === 1 ? "" : "s"}`);
@@ -220,9 +214,6 @@ function buildCompactCard(meta) {
     if (meta.messages > 0) {
         parts.push(`${meta.messages} message${meta.messages === 1 ? "" : "s"}`);
     }
-    if (meta.tokensSaved > 0) {
-        parts.push(`~${formatNum(meta.tokensSaved)} tokens`);
-    }
     const statsLine = parts.length > 0 ? `┃ ${parts.join(" · ")}` : "";
     const sectionLines = [];
     for (const section of meta.summarySections) {
@@ -238,16 +229,15 @@ function buildCompactCard(meta) {
         status: "responding",
     };
 }
-function compactDisplayMessage(message) {
+// Collapses bulky tool-result bodies on older messages while leaving the
+// message text (content, reasoning) verbatim — never truncate what the user
+// or the assistant actually said.
+function collapseToolResults(message) {
     if (message.syntheticKind === "ui_compact_card") {
         return message;
     }
     return {
         ...message,
-        content: truncateText(message.content, MAX_OLD_CONTENT_CHARS),
-        reasoning: message.reasoning
-            ? truncateText(message.reasoning, MAX_OLD_REASONING_CHARS)
-            : message.reasoning,
         toolCalls: message.toolCalls?.map(compactToolCall),
         parts: message.parts?.map(compactDisplayPart),
     };
@@ -260,10 +250,7 @@ function cloneToolCall(toolCall) {
 }
 function compactDisplayPart(part) {
     if (part.type === "text") {
-        return {
-            ...part,
-            content: truncateText(part.content, MAX_OLD_CONTENT_CHARS),
-        };
+        return part;
     }
     return {
         type: "tools",
@@ -280,16 +267,6 @@ function compactToolCall(toolCall) {
         resultCollapsed: true,
     };
 }
-export function truncateText(value, maxChars) {
-    if (value.length <= maxChars) {
-        return value;
-    }
-    const head = Math.max(1, Math.floor(maxChars * 0.7));
-    const tail = Math.max(1, maxChars - head - 32);
-    const omitted = value.length - head - tail;
-    const separator = "─".repeat(12);
-    return `${value.slice(0, head)}\n${separator} ✂ ${omitted} chars truncated ${separator}\n${value.slice(-tail)}`;
-}
 function shorten(text, maxChars) {
     const normalized = text.replace(/\s+/g, " ").trim();
     if (normalized.length <= maxChars) {

package/dist/tui/display-sanitizer.d.ts

@@ -0,0 +1,3 @@
+import type { DisplayMessage } from "./display-history.js";
+export declare function sanitizeDisplayMessages(messages: DisplayMessage[]): DisplayMessage[];
+export declare function sanitizeDisplayMessage(message: DisplayMessage): DisplayMessage;

package/dist/tui/display-sanitizer.js

@@ -0,0 +1,38 @@
+import { sanitizeInternalReasoningText, sanitizeInternalReminderBlocks, } from "../agent/internal-reminder-sanitizer.js";
+export function sanitizeDisplayMessages(messages) {
+    return messages.map(sanitizeDisplayMessage);
+}
+export function sanitizeDisplayMessage(message) {
+    if (message.role !== "assistant")
+        return message;
+    const content = sanitizeInternalReminderBlocks(message.content);
+    const reasoning = message.reasoning !== undefined
+        ? sanitizeInternalReasoningText(message.reasoning)
+        : undefined;
+    const sanitizedParts = message.parts
+        ?.map(sanitizeDisplayPart)
+        .filter(isRenderableDisplayPart);
+    const parts = sanitizedParts && sanitizedParts.length > 0 ? sanitizedParts : undefined;
+    if (content === message.content
+        && reasoning === message.reasoning
+        && parts === message.parts) {
+        return message;
+    }
+    return {
+        ...message,
+        content,
+        reasoning,
+        parts,
+    };
+}
+function sanitizeDisplayPart(part) {
+    if (part.type !== "text")
+        return part;
+    const content = sanitizeInternalReminderBlocks(part.content);
+    return content === part.content ? part : { ...part, content };
+}
+function isRenderableDisplayPart(part) {
+    if (part.type === "text")
+        return !!part.content.trim();
+    return part.toolCalls.length > 0;
+}

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

@@ -7,4 +7,5 @@ export interface PastedContentReference {
 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 decodePastedBytes(bytes: unknown): string;
 export declare function expandPastedContentMarkers(displayText: string, references: PastedContentReference[]): string;

package/dist/tui/paste-placeholder.js

@@ -16,6 +16,13 @@ export function createPastedContentMarker(content, index = 1) {
         : `${content.length} ${content.length === 1 ? "char" : "chars"}`;
     return `[Pasted text #${safeIndex} +${size}]`;
 }
+export function decodePastedBytes(bytes) {
+    if (typeof bytes === "string")
+        return bytes;
+    if (bytes instanceof Uint8Array)
+        return new TextDecoder().decode(bytes);
+    return "";
+}
 export function expandPastedContentMarkers(displayText, references) {
     if (references.length === 0 || displayText.length === 0)
         return displayText;

package/dist/tui/run.d.ts

@@ -1,6 +1,7 @@
 import { type Agent } from "../agent.js";
 import type { CliArgs } from "../cli.js";
 import type { ThemeMode } from "../config.js";
+import type { ExternalHookController } from "../hooks/controller.js";
 import type { SessionManager } from "../session.js";
 import type { PlanDecision, Provider } from "../types.js";
 import type { ProviderRegistry } from "../provider-registry.js";
@@ -29,6 +30,7 @@ export interface RunTuiOptions {
     questionController?: QuestionController;
     bashAllowlist?: BashAllowlist;
     settingsManager?: SettingsManager;
+    hookController?: ExternalHookController;
     lspService?: LspService;
     mcpManager?: McpManager;
     themeMode?: ThemeMode;