@bubblebrain-ai/bubble 0.0.14 → 0.0.16

package/dist/session-log.js

@@ -1,3 +1,4 @@
+import { sanitizeInternalReminderBlocks } from "./agent/internal-reminder-sanitizer.js";
 export class SessionLog {
     entries = [];
     load(lines) {
@@ -190,7 +191,9 @@ function normalizeMessageToEntries(message, id, timestamp) {
                 message: {
                     role: "assistant",
                     content: message.content,
-                    reasoning: message.reasoning,
+                    reasoning: message.reasoning !== undefined
+                        ? sanitizeInternalReminderBlocks(message.reasoning)
+                        : undefined,
                     model: message.model,
                     providerId: message.providerId,
                     modelId: message.modelId,

package/dist/stats/usage.d.ts

@@ -1,3 +1,4 @@
+import type { PricingCurrency } from "../model-pricing.js";
 export type StatsRange = "7d" | "30d";
 export interface DailyUsage {
     date: string;
@@ -22,6 +23,7 @@ export interface ModelUsageStats {
     reasoningTokens: number;
     totalTokens: number;
     cost?: number;
+    costCurrency?: PricingCurrency;
 }
 export interface UsageStats {
     range: StatsRange;
@@ -32,7 +34,9 @@ export interface UsageStats {
     heatmap: HeatmapColumn[];
     models: ModelUsageStats[];
     totalTokens: number;
+    trackedCosts?: Partial<Record<PricingCurrency, number>>;
     trackedCost?: number;
+    trackedCostCurrency?: PricingCurrency;
     activeDays: number;
     sessionsScanned: number;
     sessionsWithoutTokenData: number;

package/dist/stats/usage.js

@@ -61,11 +61,15 @@ export function formatCompactNumber(value) {
     return String(Math.round(value));
 }
 export function formatCurrency(value) {
-    if (value >= 1)
-        return `$${value.toFixed(2)}`;
-    if (value >= 0.01)
-        return `$${value.toFixed(3)}`;
-    return `$${value.toFixed(4)}`;
+    return formatCurrencyFor(value, "USD");
+}
+function formatCurrencyFor(value, currency) {
+    const amount = value >= 1
+        ? value.toFixed(2)
+        : value >= 0.01
+            ? value.toFixed(3)
+            : value.toFixed(4);
+    return currency === "USD" ? `$${amount}` : `CNY ${amount}`;
 }
 function createAccumulator(range, days, now) {
     const end = startOfLocalDay(now);
@@ -146,7 +150,11 @@ function finalizeAccumulator(accumulator) {
         .filter((model) => model.totalTokens > 0)
         .sort((a, b) => b.totalTokens - a.totalTokens);
     const totalTokens = models.reduce((sum, model) => sum + model.totalTokens, 0);
-    const trackedCost = models.reduce((sum, model) => sum + (model.cost ?? 0), 0);
+    const trackedCosts = aggregateCosts(models);
+    const trackedCostEntries = trackedCosts
+        ? Object.entries(trackedCosts)
+        : [];
+    const trackedCostEntry = trackedCostEntries.length === 1 ? trackedCostEntries[0] : undefined;
     return {
         range: accumulator.range,
         days: accumulator.days,
@@ -156,7 +164,9 @@ function finalizeAccumulator(accumulator) {
         heatmap: buildHeatmap(daily),
         models,
         totalTokens,
-        trackedCost: trackedCost > 0 ? trackedCost : undefined,
+        trackedCosts,
+        trackedCost: trackedCostEntry ? trackedCostEntry[1] : undefined,
+        trackedCostCurrency: trackedCostEntry ? trackedCostEntry[0] : undefined,
         activeDays: daily.filter((day) => day.active).length,
         sessionsScanned: accumulator.sessionsScanned,
         sessionsWithoutTokenData: accumulator.sessionsWithoutTokenData,
@@ -189,8 +199,10 @@ function addModelUsage(accumulator, model, message, usage) {
     existing.totalTokens += tokenTotal(usage);
     if (providerId && modelId) {
         const cost = calculateUsageCost(providerId, modelId, usage);
-        if (cost)
+        if (cost) {
             existing.cost = (existing.cost ?? 0) + cost.cost;
+            existing.costCurrency = cost.currency;
+        }
     }
     accumulator.modelUsage.set(key, existing);
 }
@@ -254,7 +266,9 @@ function formatModelUsageLines(stats, width) {
         const percentText = `${Math.round(percent * 100)}%`.padStart(4, " ");
         const tokenText = formatCompactNumber(model.totalTokens).padStart(6, " ");
         const turnsText = `${model.turns}t`.padStart(4, " ");
-        const costText = showCost ? ` ${(model.cost !== undefined ? formatCurrency(model.cost) : "").padStart(7, " ")}` : "";
+        const costText = showCost
+            ? ` ${(model.cost !== undefined ? formatCurrencyFor(model.cost, model.costCurrency ?? "USD") : "").padStart(7, " ")}`
+            : "";
         return `  ${truncate(model.displayName, labelWidth).padEnd(labelWidth, " ")} ${bar} ${percentText} ${tokenText} ${turnsText}${costText}`.trimEnd();
     });
     if (stats.models.length > MAX_MODEL_ROWS) {
@@ -270,14 +284,37 @@ function formatSummaryLines(stats, width) {
     if (favorite) {
         lines.push(`  Favorite model ${truncate(favorite, Math.max(12, width - 17))}`);
     }
-    if (stats.trackedCost !== undefined)
-        lines.push(`  Tracked cost ${formatCurrency(stats.trackedCost)}`);
+    const trackedCostText = formatTrackedCosts(stats);
+    if (trackedCostText)
+        lines.push(`  Tracked cost ${trackedCostText}`);
     lines.push(`  Sessions scanned ${stats.sessionsScanned}`);
     if (stats.sessionsWithoutTokenData > 0) {
         lines.push(`  Sessions without token data ${stats.sessionsWithoutTokenData}`);
     }
     return lines;
 }
+function aggregateCosts(models) {
+    const totals = {};
+    for (const model of models) {
+        if (model.cost === undefined)
+            continue;
+        const currency = model.costCurrency ?? "USD";
+        totals[currency] = (totals[currency] ?? 0) + model.cost;
+    }
+    return Object.keys(totals).length > 0 ? totals : undefined;
+}
+function formatTrackedCosts(stats) {
+    if (stats.trackedCosts) {
+        const parts = Object.entries(stats.trackedCosts)
+            .filter(([, value]) => value > 0)
+            .map(([currency, value]) => formatCurrencyFor(value, currency));
+        return parts.length > 0 ? parts.join(" + ") : undefined;
+    }
+    if (stats.trackedCost !== undefined) {
+        return formatCurrencyFor(stats.trackedCost, stats.trackedCostCurrency ?? "USD");
+    }
+    return undefined;
+}
 function heatmapCell(day, maxTokens) {
     if (!day)
         return " ";

package/dist/tools/glob.js

@@ -65,6 +65,7 @@ export function createGlobTool(cwd) {
             }
             files.sort((a, b) => b.mtimeMs - a.mtimeMs || a.path.localeCompare(b.path));
             const matches = files.slice(0, MAX_RESULTS).map((item) => item.path);
+            const absoluteMatches = matches.map((item) => resolve(root, item));
             const wasTruncated = truncated.value || files.length > MAX_RESULTS;
             if (matches.length === 0) {
                 return {
@@ -78,6 +79,7 @@ export function createGlobTool(cwd) {
                         truncated: false,
                         searchSignature: `glob:${root}:${pattern}`,
                         searchFamily: `glob:${pattern}`,
+                        paths: [],
                     },
                 };
             }
@@ -92,6 +94,7 @@ export function createGlobTool(cwd) {
                     truncated: wasTruncated,
                     searchSignature: `glob:${root}:${pattern}`,
                     searchFamily: `glob:${pattern}`,
+                    paths: absoluteMatches,
                 },
             };
         },

package/dist/tools/grep.js

@@ -2,6 +2,7 @@
  * Grep tool - search file contents using ripgrep.
  */
 import { execFile } from "node:child_process";
+import { resolve as resolvePath } from "node:path";
 import { isSensitivePath } from "./sensitive-paths.js";
 import { analyzeToolIntent } from "../agent/tool-intent.js";
 import { resolveToolPath } from "./path-utils.js";
@@ -57,6 +58,7 @@ export function createGrepTool(cwd) {
                     // rg returns exit code 1 when no matches found, which is not an error for us
                     const lines = stdout.split("\n").filter((l) => l.trim() !== "");
                     const matches = [];
+                    const matchedPaths = new Set();
                     for (const line of lines) {
                         try {
                             const obj = JSON.parse(line);
@@ -64,6 +66,9 @@ export function createGrepTool(cwd) {
                                 const path = obj.data.path.text;
                                 const lineNum = obj.data.line_number;
                                 const text = obj.data.lines.text?.trim() ?? "";
+                                if (typeof path === "string" && path.trim()) {
+                                    matchedPaths.add(resolvePath(cwd, path));
+                                }
                                 matches.push(`${path}:${lineNum}: ${text}`);
                             }
                         }
@@ -83,6 +88,7 @@ export function createGrepTool(cwd) {
                                 truncated: false,
                                 searchSignature: intent.search?.signature,
                                 searchFamily: intent.search?.familyKey,
+                                paths: [],
                             },
                         });
                         return;
@@ -103,6 +109,7 @@ export function createGrepTool(cwd) {
                             truncated,
                             searchSignature: intent.search?.signature,
                             searchFamily: intent.search?.familyKey,
+                            paths: [...matchedPaths],
                         },
                     });
                 });

package/dist/tui/run.d.ts

@@ -41,5 +41,7 @@ export interface RunTuiOptions {
     runMemoryCompaction?: () => Promise<string>;
     runMemorySummary?: (scope?: MemoryScope) => Promise<string>;
     runMemoryRefresh?: (scope?: MemoryScope) => Promise<string>;
+    /** One-line "update available" notice shown on the home screen, if any. */
+    updateNotice?: string;
 }
 export declare function runTui(agent: Agent, args: CliArgs, options?: RunTuiOptions): Promise<void>;

package/dist/tui/run.js

@@ -9,10 +9,13 @@ import { homedir } from "node:os";
 import { AgentAbortError } from "../agent.js";
 import { AgentRunInputQueue } from "../agent/input-controller.js";
 import { debugReasoningStream, summarizeDebugText } from "../reasoning-debug.js";
+import { isHiddenToolMetadata } from "../agent/discovery-barrier.js";
+import { sanitizeInternalReminderBlocks } from "../agent/internal-reminder-sanitizer.js";
 import { summarizeAgentEventForTrace, summarizeTraceError, summarizeTraceValue, traceEvent, } from "../debug-trace.js";
 import { BUILTIN_PROVIDERS, decodeModel, displayModel, isUserVisibleProvider } from "../provider-registry.js";
 import { calculateUsageCost } from "../model-pricing.js";
 import { getAvailableThinkingLevels } from "../provider-transform.js";
+import { getCurrentVersion } from "../update/index.js";
 import { collectUsageStatsBundle, formatStatsPanelBody } from "../stats/usage.js";
 import { parseSkillInvocation } from "../skills/invocation.js";
 import { registry as slashRegistry } from "../slash-commands/index.js";
@@ -59,6 +62,7 @@ const PROVIDER_PRIORITY = new Map([
     ["zai", 5],
     ["zai-coding-plan", 6],
     ["kimi-for-coding", 7],
+    ["stepfun", 8],
 ]);
 const DEFAULT_THEME = {
     primary: "#fab283",
@@ -181,7 +185,7 @@ const PROMPT_SCANNER_IDLE_FRAMES = ["        "];
 const PROMPT_SCANNER_INTERVAL_MS = 80;
 const SESSION_SIDEBAR_WIDTH = 42;
 const SESSION_SIDEBAR_AUTO_WIDTH = 120;
-const PROVIDER_DIALOG_ROWS = 11;
+const PROVIDER_DIALOG_ROWS = 13;
 const QUESTION_MAX_TABS = 4;
 const QUESTION_MAX_OPTIONS = 10;
 const QUESTION_MAX_CONFIRM_ROWS = 3;
@@ -1104,7 +1108,7 @@ function OpenTuiApp(props) {
         if (!safeSetText(ref, promptModeBadge()))
             promptModeLabels.delete(ref);
     };
-    const promptModelTitle = () => displayModel(props.agent.model) || "no model";
+    const promptModelTitle = () => displayModelWithThinking(props.agent.model, props.agent.thinking) || "no model";
     const syncModelChrome = () => {
         if (uiDisposed)
             return;
@@ -3046,6 +3050,31 @@ function OpenTuiApp(props) {
             // Keep the already-rendered local catalog when remote model discovery fails.
         }
     }
+    function providerDialogMatchScore(item, query) {
+        const label = (item.label || "").toLowerCase();
+        const value = (item.value || "").toLowerCase();
+        const haystack = [
+            item.label,
+            item.detail,
+            item.value,
+            item.category,
+            item.footer,
+        ].filter(Boolean).join(" ").toLowerCase();
+        if (label.startsWith(query))
+            return 100;
+        if (label.includes(query))
+            return 80;
+        if (value.includes(query))
+            return 60;
+        if (haystack.includes(query))
+            return 40;
+        // Fuzzy (subsequence) match is a last resort, and only against label+value
+        // so long provider descriptions (e.g. "platform.moonshot.cn") don't produce
+        // spurious hits like "gpt" matching "kimi-k2-thinking".
+        if (fuzzyMatch(`${label} ${value}`, query))
+            return 20;
+        return 0;
+    }
     function providerDialogFilteredItems(state = providerDialog) {
         if (!state || state.step === "key")
             return [];
@@ -3053,16 +3082,12 @@ function OpenTuiApp(props) {
         const query = state.query.trim().toLowerCase();
         if (!query)
             return items;
-        return items.filter((item) => {
-            const haystack = [
-                item.label,
-                item.detail,
-                item.value,
-                item.category,
-                item.footer,
-            ].filter(Boolean).join(" ").toLowerCase();
-            return haystack.includes(query) || fuzzyMatch(haystack, query);
-        });
+        const scored = items
+            .map((item, order) => ({ item, order, score: providerDialogMatchScore(item, query) }))
+            .filter((entry) => entry.score > 0);
+        // Stable sort by score desc, preserving original catalog order within a tier.
+        scored.sort((a, b) => b.score - a.score || a.order - b.order);
+        return scored.map((entry) => entry.item);
     }
     function providerDialogVisibleRows(state = providerDialog) {
         if (!state)
@@ -3103,7 +3128,7 @@ function OpenTuiApp(props) {
             providerDialogRoot.requestRender();
             return;
         }
-        const width = Math.max(48, Math.min(60, dimensions().width - 2));
+        const width = Math.max(56, Math.min(76, dimensions().width - 4));
         const height = PROVIDER_DIALOG_ROWS + 7;
         providerDialogRoot.visible = true;
         providerDialogRoot.width = dimensions().width;
@@ -5053,6 +5078,7 @@ function OpenTuiApp(props) {
             "zhipuai-coding-plan": "Coding Plan",
             "zai-coding-plan": "Coding Plan",
             "kimi-for-coding": "Coding Plan",
+            stepfun: "Step Plan API key",
             local: "OpenAI-compatible local endpoint",
         };
         return descriptions[providerId] ?? "API key";
@@ -5494,6 +5520,10 @@ function OpenTuiApp(props) {
             paddingRight: 2,
         }, [
             h("box", { flexShrink: 0, flexDirection: "column", alignItems: "center" }, ...logoLines.map((line) => renderHomeLogoLine(line))),
+            h("box", { flexShrink: 0, flexDirection: "column", alignItems: "center", paddingTop: 1 }, h("text", { fg: theme.textMuted, content: `v${getCurrentVersion()}` })),
+            ...(props.options.updateNotice
+                ? [h("box", { flexShrink: 0, flexDirection: "column", alignItems: "center" }, h("text", { fg: theme.accent, content: props.options.updateNotice }))]
+                : []),
             h("box", { height: 1, minHeight: 0, flexShrink: 1 }),
             h("box", {
                 ref: (ref) => {
@@ -5996,7 +6026,8 @@ function OpenTuiApp(props) {
                 width: "100%",
                 value: "",
                 placeholder: "",
-                fg: theme.text,
+                textColor: theme.text,
+                focusedTextColor: theme.text,
                 backgroundColor: theme.backgroundElement,
                 focusedBackgroundColor: theme.backgroundElement,
                 cursorColor: theme.primary,
@@ -6141,7 +6172,7 @@ function OpenTuiApp(props) {
             },
             visible: false,
             position: "absolute",
-            width: 60,
+            width: 76,
             height: PROVIDER_DIALOG_ROWS + 7,
             backgroundColor: theme.backgroundPanel,
             flexDirection: "column",
@@ -6178,7 +6209,8 @@ function OpenTuiApp(props) {
                 width: "100%",
                 value: "",
                 placeholder: "Search",
-                fg: theme.textMuted,
+                textColor: theme.text,
+                focusedTextColor: theme.text,
                 backgroundColor: theme.backgroundPanel,
                 focusedBackgroundColor: theme.backgroundPanel,
                 cursorColor: theme.primary,
@@ -6191,15 +6223,11 @@ function OpenTuiApp(props) {
                         providerDialog = { ...state, apiKey: value, error: undefined };
                     }
                     else {
+                        const query = value.trim().toLowerCase();
                         const items = providerDialogItemsFor(state.step, state.providerId).filter((item) => {
-                            const query = value.trim().toLowerCase();
                             if (!query)
                                 return true;
-                            const haystack = [item.label, item.detail, item.value, item.category, item.footer]
-                                .filter(Boolean)
-                                .join(" ")
-                                .toLowerCase();
-                            return haystack.includes(query) || fuzzyMatch(haystack, query);
+                            return providerDialogMatchScore(item, query) > 0;
                         });
                         providerDialog = {
                             ...state,
@@ -6557,7 +6585,7 @@ function OpenTuiApp(props) {
             completionTokens: usage.completionTokens,
             reasoningTokens: usage.reasoningTokens,
             turns: usage.turns,
-            costText: cost ? `${formatCurrency(cost.cost)} spent${cost.estimated ? " est." : ""}` : "cost unavailable",
+            costText: cost ? `${formatCurrency(cost.cost, cost.currency)} spent${cost.estimated ? " est." : ""}` : "cost unavailable",
         };
     }
     function sidebarMcpStates() {
@@ -6926,12 +6954,14 @@ function renderUserMessage(message, index) {
     }, h("box", { paddingTop: 1, paddingBottom: 1, paddingLeft: 2, backgroundColor: theme.backgroundPanel, flexShrink: 0, flexDirection: "column" }, ...userChildren));
 }
 function renderAssistantMessage(message, syntaxStyle, subtleSyntaxStyle, showThinking = true, verboseTrace = false, width = 80) {
+    const visibleReasoning = showThinking
+        ? sanitizeInternalReminderBlocks(message.reasoning ?? "").trim()
+        : "";
     const modelSwitch = parseModelSwitchMessage(message.content);
-    if (modelSwitch && !message.reasoning?.trim() && !(message.toolCalls?.length)) {
+    if (modelSwitch && !visibleReasoning && !(message.toolCalls?.length)) {
         return renderModelSwitchMessage(modelSwitch);
     }
     const children = [];
-    const visibleReasoning = showThinking ? message.reasoning?.trim() : "";
     const parts = message.parts ?? [];
     const hasParts = parts.length > 0;
     if (message.status && !visibleReasoning && !message.content.trim() && !(message.toolCalls?.length) && !hasParts) {
@@ -7054,7 +7084,7 @@ function renderMarkdownContent(content, syntaxStyle, options) {
         bg: theme.background,
         width: "100%",
         tableOptions: {
-            widthMode: "full",
+            widthMode: "content",
             columnFitter: "balanced",
             wrapMode: "word",
             cellPadding: 1,
@@ -7274,7 +7304,13 @@ function syncMarkdownRenderable(markdown, content, streaming) {
         return;
     markdown.content = content;
     markdown.streaming = streaming;
-    markdown.clearCache();
+    // While streaming, let OpenTUI's incremental markdown/code-block rendering do
+    // its job — clearing the parse cache every delta forces the (syntax-
+    // highlighted) code blocks to be rebuilt and re-highlighted on every token,
+    // which is the source of the visible flicker on streamed code blocks. Clear
+    // the cache only once streaming ends, to fully reparse the finalized content.
+    if (!streaming)
+        markdown.clearCache();
 }
 function updateAssistantPartEntries(entry, parts, options, streaming) {
     const partsBox = entry.refs.partsBox;
@@ -7613,7 +7649,7 @@ function createMarkdown(ctx, content, syntaxStyle, options) {
         width: "100%",
         flexShrink: 0,
         tableOptions: {
-            widthMode: "full",
+            widthMode: "content",
             columnFitter: "balanced",
             wrapMode: "word",
             cellPadding: 1,
@@ -8293,7 +8329,7 @@ function renderTool(tool, syntaxStyle, width = 80) {
     const color = toolColor(tool);
     const diff = extractToolDiff(tool);
     if (diff && !tool.resultCollapsed && !tool.isError && (tool.name === "edit" || tool.name === "apply_patch")) {
-        return h("box", { paddingLeft: 3, marginTop: 1, flexDirection: "column", flexShrink: 0 }, h("text", { fg: color }, `${icon} ${displayToolName(tool.name)}${toolHeader(tool) ? ` ${toolHeader(tool)}` : ""}`), h("box", { paddingLeft: 1, marginTop: 1, border: ["left"], borderColor: theme.borderSubtle, flexDirection: "column", flexShrink: 0 }, renderDiffContent(diff, toolPath(tool), syntaxStyle, width)));
+        return h("box", { paddingLeft: 3, marginTop: 1, flexDirection: "column", flexShrink: 0 }, h("text", { fg: color }, `${icon} ${displayToolName(tool.name)}${toolHeader(tool) ? ` ${toolHeader(tool)}` : ""}`), h("box", { paddingLeft: 1, marginTop: 1, border: ["left"], borderColor: theme.borderSubtle, flexDirection: "column", flexShrink: 0, backgroundColor: theme.diffContextBg }, renderDiffContent(diff, toolPath(tool), syntaxStyle, width)));
     }
     if (!tool.resultCollapsed && isWritePreviewTool(tool)) {
         const hasContent = typeof tool.args.content === "string";
@@ -8401,10 +8437,20 @@ function pickerTitle(kind, providerId) {
     }
 }
 function getModelPickerReasoningLevels(providerId, modelId) {
-    if (providerId !== "deepseek" || (modelId !== "deepseek-v4-flash" && modelId !== "deepseek-v4-pro")) {
+    // Only expand into one picker row per effort for models that genuinely have a
+    // reasoning-effort spectrum: OpenAI's reasoning models (codex gpt-5.x:
+    // off/minimal/low/medium/high/xhigh), DeepSeek's v4 models, and StepFun
+    // Step Plan models. Other providers
+    // (e.g. GLM, Moonshot/Kimi) only have a thinking on/off toggle, not an effort
+    // control, so they stay as a single row.
+    const isOpenAIReasoning = providerId === "openai" || providerId === "openai-codex";
+    const isDeepseekReasoning = providerId === "deepseek" && (modelId === "deepseek-v4-flash" || modelId === "deepseek-v4-pro");
+    const isStepFunReasoning = providerId === "stepfun";
+    if (!isOpenAIReasoning && !isDeepseekReasoning && !isStepFunReasoning)
         return [];
-    }
-    return getAvailableThinkingLevels(providerId, modelId);
+    const levels = getAvailableThinkingLevels(providerId, modelId);
+    // gpt-4o and friends report only ["off"] — keep those as a single row too.
+    return levels.length > 1 ? levels : [];
 }
 function displayModelWithThinking(model, thinkingLevel) {
     if (!model)
@@ -8412,7 +8458,11 @@ function displayModelWithThinking(model, thinkingLevel) {
     const { providerId, modelId } = decodeModel(model);
     if (!providerId)
         return displayModel(model);
-    const levels = getAvailableThinkingLevels(providerId, modelId);
+    // Use the same scoping as the picker: only models with a real reasoning-effort
+    // spectrum (OpenAI codex gpt-5.x, deepseek v4, StepFun Step Plan) get the
+    // "(level)" suffix. The on/off thinking toggle on GLM / Moonshot(Kimi) is
+    // not an effort control.
+    const levels = getModelPickerReasoningLevels(providerId, modelId);
     if (levels.length > 1 && thinkingLevel !== "off") {
         return `${displayModel(model)} (${thinkingLevel})`;
     }
@@ -8608,6 +8658,8 @@ function reconstructDisplayMessages(agentMessages) {
             }
             catch { }
             const toolResult = agentMessages.find((candidate) => candidate.role === "tool" && candidate.toolCallId === tc.id);
+            if (isHiddenToolMetadata(toolResult ? toolResult.metadata : undefined))
+                continue;
             toolCalls.push({
                 id: tc.id,
                 name: tc.name,
@@ -9066,11 +9118,18 @@ function toolPath(tool) {
         ?? (Array.isArray(tool.metadata?.paths) ? tool.metadata.paths[0] : undefined);
     return typeof value === "string" ? value : undefined;
 }
+// Strip only leading/trailing newlines — NOT a full .trim(). A blank context
+// line in a unified diff is a single space (" "); plain .trim() would delete a
+// trailing blank context line, leaving the hunk body shorter than its @@ header
+// count and breaking the diff parser ("Added line count did not match").
+function stripDiffEdgeNewlines(diff) {
+    return diff.replace(/^\n+/, "").replace(/\n+$/, "");
+}
 function extractToolDiff(tool) {
     if (tool.resultCollapsed)
         return undefined;
     if (typeof tool.metadata?.diff === "string" && tool.metadata.diff.trim().length > 0) {
-        return tool.metadata.diff.trim();
+        return stripDiffEdgeNewlines(tool.metadata.diff);
     }
     if (!tool.result)
         return undefined;
@@ -9086,10 +9145,14 @@ function extractToolDiff(tool) {
     const rawDiff = tool.result.slice(index + marker.length);
     const diagnosticsIndex = rawDiff.search(/\n\nLSP diagnostics in /);
     const diff = diagnosticsIndex === -1 ? rawDiff : rawDiff.slice(0, diagnosticsIndex);
-    return diff.trim().length > 0 ? diff : undefined;
+    return diff.trim().length > 0 ? stripDiffEdgeNewlines(diff) : undefined;
 }
-function diffViewMode(width = 80) {
-    return width > 120 ? "split" : "unified";
+function diffViewMode(_width = 80) {
+    // Always unified: split view pads the shorter side with empty filler rows that
+    // OpenTUI's DiffRenderable leaves uncolored, which shows up as bright white
+    // blocks in light mode. Unified view has no filler rows — every line is
+    // add/remove/context and gets a background — so the edit area stays uniform.
+    return "unified";
 }
 function filetype(filePath) {
     if (!filePath)
@@ -9337,12 +9400,11 @@ function formatCompactNumber(value) {
         return `${(value / 1_000).toFixed(1)}K`;
     return String(value);
 }
-function formatCurrency(value) {
+function formatCurrency(value, currency = "USD") {
     if (value < 0.0001)
-        return "$0.0000";
-    if (value < 1)
-        return `$${value.toFixed(4)}`;
-    return `$${value.toFixed(2)}`;
+        return currency === "USD" ? "$0.0000" : "CNY 0.0000";
+    const amount = value < 1 ? value.toFixed(4) : value.toFixed(2);
+    return currency === "USD" ? `$${amount}` : `CNY ${amount}`;
 }
 function sidebarStatusColor(kind) {
     if (kind === "connected")

package/dist/tui-ink/app.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useApp, useInput } from "ink";
 import { AgentAbortError } from "../agent.js";
+import { isHiddenToolMetadata } from "../agent/discovery-barrier.js";
 import { registry as slashRegistry } from "../slash-commands/index.js";
 import { UserConfig, maskKey } from "../config.js";
 import { createPastedContentMarker, InputBox, isCtrlCInput, shouldCollapsePastedContent, } from "./input-box.js";
@@ -82,6 +83,8 @@ function reconstructDisplayMessages(agentMessages) {
                         args = {};
                     }
                     const toolResult = agentMessages.find((tm) => tm.role === "tool" && tm.toolCallId === tc.id);
+                    if (isHiddenToolMetadata(toolResult ? toolResult.metadata : undefined))
+                        continue;
                     toolCalls.push({
                         id: tc.id,
                         name: tc.name,

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

@@ -7,6 +7,7 @@ import { MarkdownContent, StreamingMarkdown } from "./markdown.js";
 import { buildTraceGroups, formatTracePath, traceGroupLabel } from "./trace-groups.js";
 import { EDIT_COLLAPSED_DIFF_LINES, formatEditSuccessSummary, getEditDiffDetails } from "./edit-diff.js";
 import { formatSubagentRoute } from "../agent/subagent-route-format.js";
+import { sanitizeInternalReminderBlocks } from "../agent/internal-reminder-sanitizer.js";
 export function MessageList({ messages, streamingContent, streamingReasoning, streamingTools, streamingParts, terminalColumns, verboseTrace, pendingApproval, nowTick, welcomeBanner, }) {
     const hasStreaming = !!(streamingContent ||
         streamingReasoning ||
@@ -44,22 +45,24 @@ function MessageItem({ message, terminalColumns, verboseTrace, showExpandHint, n
     if (message.syntheticKind === "ui_compact_summary") {
         return _jsx(CompactionSummaryBlock, { message: message });
     }
+    const visibleReasoning = sanitizeInternalReminderBlocks(message.reasoning ?? "").trim();
     const hasVisibleAssistantContent = !!message.content ||
         (message.toolCalls?.length ?? 0) > 0 ||
         (message.parts?.length ?? 0) > 0 ||
-        (!!message.reasoning && verboseTrace);
+        (!!visibleReasoning && verboseTrace);
     if (!hasVisibleAssistantContent)
         return null;
-    return (_jsxs(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: [message.reasoning && verboseTrace && _jsx(ReasoningTraceBlock, { reasoning: message.reasoning }), 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 })), message.content && _jsx(MarkdownContent, { content: message.content })] })), 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 && 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 })), message.content && _jsx(MarkdownContent, { content: message.content })] })), 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, verboseTrace, pendingApproval, nowTick, }) {
     const deferredContent = React.useDeferredValue(content);
     const deferredReasoning = React.useDeferredValue(reasoning);
     const deferredParts = React.useDeferredValue(parts);
+    const visibleReasoning = sanitizeInternalReminderBlocks(deferredReasoning).trim();
     const visibleParts = deferredParts.length > 0
         ? deferredParts
         : fallbackStreamingParts(deferredContent, tools);
-    return (_jsxs(Box, { flexDirection: "column", children: [deferredReasoning && verboseTrace && (_jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(ReasoningTraceBlock, { reasoning: deferredReasoning }) })), visibleParts.length > 0 && (
+    return (_jsxs(Box, { flexDirection: "column", children: [visibleReasoning && verboseTrace && (_jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(ReasoningTraceBlock, { reasoning: visibleReasoning }) })), visibleParts.length > 0 && (
             // marginTop intentionally 0: this Box only mounts on the first non-empty
             // streaming frame, so a marginTop=1 here would visibly insert a blank
             // line under the user message right at that moment (the "spinner sits

package/dist/tui-opentui/app.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/reac
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useKeyboard, useRenderer } from "@opentui/react";
 import { AgentAbortError } from "../agent.js";
+import { isHiddenToolMetadata } from "../agent/discovery-barrier.js";
 import { registry as slashRegistry } from "../slash-commands/index.js";
 import { UserConfig, maskKey } from "../config.js";
 import { createPastedContentMarker, InputBox, shouldCollapsePastedContent, } from "./input-box.js";
@@ -96,6 +97,8 @@ function reconstructDisplayMessages(agentMessages) {
                         args = {};
                     }
                     const toolResult = agentMessages.find((tm) => tm.role === "tool" && tm.toolCallId === tc.id);
+                    if (isHiddenToolMetadata(toolResult ? toolResult.metadata : undefined))
+                        continue;
                     toolCalls.push({
                         id: tc.id,
                         name: tc.name,