pi-cc-extensions 0.9.10 → 0.9.12

package/extensions/feature/compact-thinking.ts

@@ -324,7 +324,7 @@ function hiddenPreviewHint(
 	return undefined;
 }
 
-const expandedThinking = new Set<number>();
+const expandedThinking = new Set<string>();
 
 /** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、展开卡单击整块收起（拖动选择文本时不收起）。 */
 export class ThinkingPreviewBlock implements Component {
@@ -335,7 +335,6 @@ export class ThinkingPreviewBlock implements Component {
 	readonly runStartIndex: number;
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
-	private _expanded: boolean;
 	private hintHovered = false;
 	private collapsedMemo:
 		| {
@@ -363,7 +362,6 @@ export class ThinkingPreviewBlock implements Component {
 		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
-		this._expanded = expandedThinking.has(messageTimestamp);
 	}
 
 	private paint(color: string, text: string): string {
@@ -372,18 +370,20 @@ export class ThinkingPreviewBlock implements Component {
 			: text;
 	}
 
+	/** 展开态按消息时间戳 + run 序号共享：面板重排/内容重建换掉实例后，
+	 *  布局里的旧实例与 render 的新实例同键，点谁都能展开。 */
 	get expanded(): boolean {
-		return this._expanded;
+		return expandedThinking.has(`${this.messageTimestamp}:${this.runStartIndex}`);
 	}
 
 	setExpanded(expanded: boolean): void {
-		if (this._expanded !== expanded) this.collapsedMemo = undefined;
-		this._expanded = expanded;
-		if (expanded) expandedThinking.add(this.messageTimestamp);
+		const key = `${this.messageTimestamp}:${this.runStartIndex}`;
+		if (expanded) expandedThinking.add(key);
 		else {
-			expandedThinking.delete(this.messageTimestamp);
+			expandedThinking.delete(key);
 			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
+		this.collapsedMemo = undefined;
 	}
 
 	setHintHovered(hovered: boolean): void {
@@ -392,7 +392,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private headingLines(width: number, hiddenLines: number, padding: number): string[] {
-		const hint = this._expanded
+		const hint = this.expanded
 			? undefined
 			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && config.previewLines <= 0);
 		if (!hint) return new Text(this.heading, padding, 0).render(width);
@@ -412,10 +412,10 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private bodyLines(width: number, padding: number): { lines: string[]; hiddenLines: number } {
-		if (!this.text || (config.previewLines <= 0 && !this._expanded)) {
+		if (!this.text || (config.previewLines <= 0 && !this.expanded)) {
 			return { lines: [], hiddenLines: 0 };
 		}
-		if (this._expanded) {
+		if (this.expanded) {
 			return {
 				lines: wrapExpandedThinking(this.messageTimestamp, this.runStartIndex, this.text, width),
 				hiddenLines: 0,
@@ -426,7 +426,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	render(width: number) {
-		if (this._expanded) {
+		if (this.expanded) {
 			const innerWidth = Math.max(1, width - 2);
 			const body = this.bodyLines(innerWidth, 0);
 			const heading = this.headingLines(innerWidth, 0, 0);

package/extensions/feature/shell/footer-currency.ts

@@ -0,0 +1,29 @@
+const KNOWN_CURRENCIES = new Set(Intl.supportedValuesOf("currency"));
+
+/** 1 美元费用对应的显示币种数量。面板切换币种时写入。 */
+export const FOOTER_CURRENCY_RATES = {
+	CNY: 7.12,
+	EUR: 0.92,
+	JPY: 150,
+	GBP: 0.76,
+	INR: 96.25,
+	HKD: 7.78,
+} as const;
+
+export const FOOTER_CURRENCY_PRESETS = ["USD", ...Object.keys(FOOTER_CURRENCY_RATES)] as const;
+
+/** 不在表里的币种，包括 USD，返回 null。 */
+export function presetFooterCurrencyRate(currency: string): number | null {
+	const code = currency.trim().toUpperCase();
+	return FOOTER_CURRENCY_RATES[code as keyof typeof FOOTER_CURRENCY_RATES] ?? null;
+}
+
+/** 底栏费用文本。USD 或不支持的币种保持美元写法。没有倍率时只换符号。 */
+export function formatFooterCost(cost: number, currency: string, rate: number | null): string {
+	const usd = `$${cost.toFixed(2)}`;
+	if (currency === "USD" || !KNOWN_CURRENCIES.has(currency)) return usd;
+	const formatted = new Intl.NumberFormat("en", { style: "currency", currency }).format(
+		rate === null ? cost : cost * rate,
+	);
+	return rate === null ? formatted : `≈${formatted}`;
+}

package/extensions/feature/shell/footer.ts

@@ -14,13 +14,13 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { execFile } from "node:child_process";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { config } from "../../config/config.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
+import { formatFooterCost } from "./footer-currency.ts";
 import {
 	PI_USAGE_KEY,
 	isSkippedFooterStatusKey,
@@ -28,8 +28,11 @@ import {
 	visibleFooterPluginTexts,
 	type FooterChipLayout,
 } from "./footer-layout.ts";
+import { createGitStatsRefresher, readGitStats, type GitStats } from "./git-stats.ts";
 import { MCP_STATUS_KEY, buildMcpChip } from "./mcp-chip.ts";
 
+export { parseGitStats } from "./git-stats.ts";
+
 const GIT_REFRESH_INTERVAL_MS = 10_000;
 const USAGE_REFRESH_INTERVAL_MS = 5 * 60 * 1000;
 // 后台连接 MCP 服务器不会触发 footer 重绘，靠这个兜底轮询把芯片刷出来
@@ -48,8 +51,6 @@ export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string;
 		: { git: "", cache: "", mcp: "" };
 }
 
-type GitStats = { add: number; del: number };
-
 type XaiFooterReport = {
 	buckets?: Array<{
 		id?: string;
@@ -61,19 +62,6 @@ type XaiFooterReport = {
 	metrics?: Array<{ id?: string; value?: unknown }>;
 };
 
-export function parseGitStats(stdout: string): GitStats {
-	let add = 0;
-	let del = 0;
-	for (const line of stdout.split("\n")) {
-		const match = line.match(/^(\d+)\s+(\d+)/);
-		if (match) {
-			add += Number(match[1]);
-			del += Number(match[2]);
-		}
-	}
-	return { add, del };
-}
-
 export function formatXaiFooterChip(report: XaiFooterReport): string | undefined {
 	const included = report.buckets?.find((b) => b.id === "included-allowance");
 	if (included?.unit === "percent" && typeof included.used === "number") {
@@ -180,7 +168,12 @@ function colorUsageChip(theme: any, text: string): string {
 }
 
 let currentTui: any = undefined;
-let refreshCurrentGitStats: (() => void) | undefined;
+let refreshCurrentGitStats: ((reset?: boolean) => void) | undefined;
+
+/** Apply a /ccstyle Git mode change immediately, without recreating the footer. */
+export function refreshFooterGitStats(): void {
+	refreshCurrentGitStats?.(true);
+}
 let refreshCurrentUsage: (() => void) | undefined;
 let refreshCurrentMcpChip: (() => void) | undefined;
 /** 工具/命令列表在 pi API 上，而 footer 工厂只拿得到 ctx，加载时记下来。 */
@@ -192,33 +185,23 @@ const createCustomFooterFactory =
 		const sep = theme.fg("muted", " · ");
 		const joinChips = (parts: string[]) => parts.filter(Boolean).join(sep);
 		let gitStats: GitStats | undefined;
-		let gitRefreshRunning = false;
 		let localUsageChip = "";
 		let usageGeneration = 0;
 		let usageAbort: AbortController | undefined;
 		let disposed = false;
 
-		// 查询在 render 外执行，保留旧值；仅统计结果真正变化时重绘，避免周期性清零抖动。
-		const refreshGitStats = () => {
-			if (gitRefreshRunning || disposed) return;
-			gitRefreshRunning = true;
-			execFile(
-				"git",
-				["diff", "--numstat", "HEAD"],
-				{ cwd: ctx.cwd, timeout: 2000 },
-				(err, stdout) => {
-					gitRefreshRunning = false;
-					if (err || disposed) return;
-					const next = parseGitStats(stdout);
-					if (gitStats?.add === next.add && gitStats.del === next.del) return;
-					gitStats = next;
-					tui.requestRender();
-				},
-			);
-		};
-		refreshCurrentGitStats = refreshGitStats;
-		refreshGitStats();
-		const gitRefreshTimer = setInterval(refreshGitStats, GIT_REFRESH_INTERVAL_MS);
+		// 查询在 render 外执行；模式/分支变化清旧值，普通轮询只在统计变化时重绘。
+		const gitRefresher = createGitStatsRefresher({
+			getMode: () => config.footerGitStatsMode,
+			query: (mode, signal) => readGitStats(ctx.cwd, mode, signal),
+			onChange: (next) => {
+				gitStats = next;
+				tui.requestRender();
+			},
+		});
+		refreshCurrentGitStats = gitRefresher.refresh;
+		gitRefresher.refresh();
+		const gitRefreshTimer = setInterval(() => gitRefresher.refresh(), GIT_REFRESH_INTERVAL_MS);
 		gitRefreshTimer.unref?.();
 
 		const refreshUsage = () => {
@@ -314,9 +297,9 @@ const createCustomFooterFactory =
 		const mcpRefreshTimer = setInterval(refreshMcp, MCP_REFRESH_INTERVAL_MS);
 		mcpRefreshTimer.unref?.();
 
-		// 分支变化时同步更新分支名和相对 HEAD 的统计。
+		// 分支变化时重新选择基准，并拒绝旧分支的异步查询结果。
 		const unsubBranch = footerData.onBranchChange(() => {
-			refreshGitStats();
+			gitRefresher.refresh(true);
 			tui.requestRender();
 		});
 
@@ -419,8 +402,10 @@ const createCustomFooterFactory =
 				cachePct > 0 ? `${glyphs.cache ? `${glyphs.cache} ` : ""}${Math.floor(cachePct)}%` : "";
 			const costChip =
 				cost || usingSubscription
-					? theme.fg("dim", `$${cost.toFixed(2)}`) +
-						(usingSubscription ? theme.fg("warning", " sub") : "")
+					? theme.fg(
+							"dim",
+							formatFooterCost(cost, config.footerCurrency, config.footerCurrencyRate),
+						) + (usingSubscription ? theme.fg("warning", " sub") : "")
 					: "";
 			const line1 = joinChips([
 				theme.fg("accent", modelLabel),
@@ -439,14 +424,17 @@ const createCustomFooterFactory =
 			}
 			const branch = footerData.getGitBranch();
 			if (branch) {
-				const stats =
-					gitStats && (gitStats.add || gitStats.del)
-						? theme.fg("dim", " (") +
-							theme.fg("success", `+${gitStats.add}`) +
-							" " +
-							theme.fg("error", `−${gitStats.del}`) +
-							theme.fg("dim", ")")
-						: "";
+				const s = gitStats;
+				let stats = "";
+				if (s && s.status)
+					stats = theme.fg("dim", " [") + gitColor(s.status) + theme.fg("dim", "]");
+				if (s && (s.add || s.del))
+					stats +=
+						theme.fg("dim", "(") +
+						theme.fg("success", `+${s.add}`) +
+						" " +
+						theme.fg("error", `−${s.del}`) +
+						theme.fg("dim", ")");
 				const gitLabel = glyphs.git ? `${glyphs.git} ${branch}` : branch;
 				place += theme.fg("muted", " on ") + gitColor(gitLabel) + stats;
 			}
@@ -467,6 +455,7 @@ const createCustomFooterFactory =
 			},
 			dispose(): void {
 				disposed = true;
+				gitRefresher.dispose();
 				usageAbort?.abort();
 				usageAbort = undefined;
 				clearInterval(gitRefreshTimer);

package/extensions/feature/shell/git-stats.ts

@@ -0,0 +1,162 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import type { FooterGitStatsMode } from "../../config/config.ts";
+
+export type GitStats = { add: number; del: number; status?: string };
+
+const execFileAsync = promisify(execFile);
+const BRANCH_BASE_REFS = ["refs/remotes/origin/HEAD", "refs/heads/main", "refs/heads/master"];
+
+export function parseGitStats(stdout: string): GitStats {
+	let add = 0;
+	let del = 0;
+	for (const line of stdout.split("\n")) {
+		const match = line.match(/^(\d+)\s+(\d+)/);
+		if (match) {
+			add += Number(match[1]);
+			del += Number(match[2]);
+		}
+	}
+	return { add, del };
+}
+
+const CONFLICT_CODES = new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
+
+/**
+ * git status --porcelain --branch 的第一行带分支头（## branch...origin/branch [ahead N, behind M]），
+ * 其余行是 XY 文件状态。返回 Starship 风格的状态符号串（= ! ? ⇡⇣），无变化时 undefined。
+ */
+export function parseGitStatus(stdout: string): string | undefined {
+	let conflicted = false;
+	let modified = false;
+	let untracked = false;
+	let ahead: number | undefined;
+	let behind: number | undefined;
+	for (const line of stdout.split("\n")) {
+		if (line.startsWith("## ")) {
+			ahead = Number(line.match(/ahead (\d+)/)?.[1]) || undefined;
+			behind = Number(line.match(/behind (\d+)/)?.[1]) || undefined;
+			continue;
+		}
+		const code = line.slice(0, 2);
+		if (code === "??") untracked = true;
+		else if (CONFLICT_CODES.has(code)) {
+			// 冲突文件必然也有未提交内容，! 与 = 同时出现
+			conflicted = true;
+			modified = true;
+		} else if (line.trim()) modified = true;
+	}
+	let status = "";
+	if (conflicted) status += "=";
+	if (modified) status += "!";
+	if (untracked) status += "?";
+	if (ahead) status += `⇡${ahead}`;
+	if (behind) status += `⇣${behind}`;
+	return status || undefined;
+}
+
+/** Read only local refs and tracked files; never fetch or change the index. */
+export async function readGitStats(
+	cwd: string,
+	mode: FooterGitStatsMode,
+	signal?: AbortSignal,
+): Promise<GitStats | undefined> {
+	const git = async (args: string[]) => {
+		const { stdout } = await execFileAsync("git", args, {
+			cwd,
+			timeout: 2000,
+			maxBuffer: 16 * 1024 * 1024,
+			signal,
+		});
+		return stdout.trim();
+	};
+	try {
+		let base = "HEAD";
+		if (mode === "branch") {
+			let baseCommit: string | undefined;
+			for (const ref of BRANCH_BASE_REFS) {
+				try {
+					baseCommit = await git(["rev-parse", "--verify", `${ref}^{commit}`]);
+					break;
+				} catch {
+					if (signal?.aborted) return undefined;
+					// Missing/dangling remote HEAD: try the local default branches.
+				}
+			}
+			if (!baseCommit) return undefined;
+			base = await git(["merge-base", "HEAD", baseCommit]);
+		}
+		// One comparison includes committed + staged + unstaged net changes,
+		// without double-counting edits that are later reverted. Untracked files are excluded.
+		const [numstat, statusOut] = await Promise.all([
+			git(["diff", "--numstat", base, "--"]),
+			git(["status", "--porcelain", "--branch"]).catch(() => ""),
+		]);
+		if (signal?.aborted) return undefined;
+		const stats = parseGitStats(numstat);
+		const status = parseGitStatus(statusOut);
+		return status ? { ...stats, status } : stats;
+	} catch {
+		// Non-repository, unborn HEAD, unrelated histories, timeout, etc.
+		return undefined;
+	}
+}
+
+/** Coalesce overlapping refreshes and reject stale results after a mode/branch change. */
+export function createGitStatsRefresher(options: {
+	getMode: () => FooterGitStatsMode;
+	query: (mode: FooterGitStatsMode, signal: AbortSignal) => Promise<GitStats | undefined>;
+	onChange: (stats: GitStats | undefined) => void;
+}): { refresh: (reset?: boolean) => void; dispose: () => void } {
+	let stats: GitStats | undefined;
+	let mode = options.getMode();
+	let generation = 0;
+	let running = false;
+	let pending = false;
+	let disposed = false;
+	let controller: AbortController | undefined;
+	const publish = (next: GitStats | undefined) => {
+		if (stats?.add === next?.add && stats?.del === next?.del && stats?.status === next?.status)
+			return;
+		stats = next;
+		options.onChange(next);
+	};
+	const refresh = (reset = false) => {
+		if (disposed) return;
+		const nextMode = options.getMode();
+		if (reset || mode !== nextMode) publish(undefined);
+		mode = nextMode;
+		const request = ++generation;
+		if (running) {
+			pending = true;
+			return;
+		}
+		running = true;
+		const queryController = new AbortController();
+		controller = queryController;
+		void (async () => {
+			let next: GitStats | undefined;
+			try {
+				next = await options.query(nextMode, queryController.signal);
+			} catch {
+				// Failed queries clear the old numbers rather than leaving a stale chip.
+			} finally {
+				if (!disposed && request === generation && nextMode === options.getMode()) publish(next);
+				running = false;
+				controller = undefined;
+				if (pending && !disposed) {
+					pending = false;
+					refresh();
+				}
+			}
+		})();
+	};
+	return {
+		refresh,
+		dispose: () => {
+			disposed = true;
+			generation++;
+			controller?.abort();
+		},
+	};
+}

package/extensions/renderer/compact-mode.ts

@@ -42,6 +42,7 @@ import {
 	isRichDiffComponent,
 } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult } from "./tool/diff/index.ts";
+import { displayConfigCacheKey } from "./tool/diff/diff-component.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
@@ -535,6 +536,12 @@ function isToolComponent(value: any): boolean {
 	return value instanceof ToolExecutionComponent;
 }
 
+/** 成员离开回合后不再算外层面板，避免点别的卡时被跳过收起。 */
+function clearRoundAnchor(component: any): void {
+	if (!component || Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) return;
+	delete component.roundAnchor;
+}
+
 function detachAssistantExpansion(component: any): void {
 	if (
 		typeof component?.[ASSISTANT_SET_EXPANDED_KEY] !== "function" ||
@@ -546,6 +553,7 @@ function detachAssistantExpansion(component: any): void {
 	delete component[ASSISTANT_SET_EXPANDED_KEY];
 	delete component[ASSISTANT_TOGGLE_ROUND_KEY];
 	delete component[ASSISTANT_REENTRY_KEY];
+	clearRoundAnchor(component);
 }
 
 /** 供 mouse-interaction 识别可点击的 compact assistant 行（仅 compact 模式下生效）。 */
@@ -703,8 +711,9 @@ function compactEditWriteLine(
 	// 展开卡 Box(1,1) 已 pad；折叠行自己留 1 格前导空格
 	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
-	const hintText =
-		options.hint !== false && component.expanded !== true ? ` · ${showMoreHintText()}` : "";
+	const clickable = options.hint !== false && component.expanded !== true;
+	const clickText = clickable ? showMoreHintText() : "";
+	const hintText = clickable ? ` · ${clickText}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -713,7 +722,11 @@ function compactEditWriteLine(
 	const pathWidth = Math.max(0, width - fixedWidth - (path ? 1 : 0));
 	const pathPart =
 		pathWidth > 0 && path ? ` ${formatDisplayPath(path, component.cwd, pathWidth)}` : "";
-	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintText ? theme.fg("dim", hintText) : ""}`;
+	// 圆点保持 dim；hover 只高亮可点击文字，与 compact 摘要行一致
+	const hintPart = clickable
+		? `${theme.fg("dim", " · ")}${theme.fg(isToolCallHovered(component.toolCallId) ? "text" : "dim", clickText)}`
+		: "";
+	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintPart}`;
 	return ["", truncateToWidth(line, width, "")];
 }
 
@@ -728,6 +741,7 @@ type CompactEditPaintHit = {
 	theme: unknown;
 	/** 展开卡的背景槽位同样参与命中判断。 */
 	bgSlot: string;
+	diffConfigKey: string;
 	expanded: boolean;
 	result: unknown;
 	isPartial: boolean;
@@ -759,6 +773,7 @@ function compactEditWriteLines(
 	const hover = isToolCallHovered(component.toolCallId);
 	const ioHover = compactEditIoHover(component);
 	const theme = themeOf();
+	const diffConfigKey = displayConfigCacheKey(getToolDisplayConfig());
 	if (!pending) {
 		const hit = compactEditPaintCache.get(component);
 		if (
@@ -766,6 +781,7 @@ function compactEditWriteLines(
 			hit.width === width &&
 			hit.theme === theme &&
 			hit.bgSlot === config.expandedCardBackground &&
+			hit.diffConfigKey === diffConfigKey &&
 			hit.expanded === expanded &&
 			hit.result === component.result &&
 			hit.isPartial === isPartial &&
@@ -782,6 +798,7 @@ function compactEditWriteLines(
 			width,
 			theme,
 			bgSlot: config.expandedCardBackground,
+			diffConfigKey,
 			expanded,
 			result: component.result,
 			isPartial,
@@ -949,8 +966,11 @@ function compactAssistantLineComponent(
 					text = `${styleCompactThinkingText(heading, theme)}${plain(tools)}`;
 				}
 			}
-			const hintColor = hover ? "text" : "dim";
-			const line = `${text}${hintText ? theme.fg(hintColor, hintText) : ""}`;
+			// 圆点保持 dim；hover 只高亮可点击文字。
+			const hintPart = hint
+				? `${theme.fg("dim", " · ")}${theme.fg(hover ? "text" : "dim", showMoreHintText())}`
+				: "";
+			const line = `${text}${hintPart}`;
 			const rendered = `${" ".repeat(pad)}${truncateToWidth(line, available, "")}`;
 			const lines = leadingBlank ? ["", rendered] : [rendered];
 			paint = {
@@ -1695,6 +1715,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		for (const [component, message] of round.messages) {
 			component.lastMessage = message;
 			ensureAssistantSetExpanded(component);
+			// 尾行用 getter 指向 anchor；成员用同名属性，点内部工具时能认出同一回合。
+			if (!Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) {
+				component.roundAnchor = round.anchor;
+			}
 			component[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) => {
 				const wasExpanded = round.anchor.expanded === true;
 				if (expanded && !wasExpanded) capturePanelViewport(round.anchor);
@@ -1946,7 +1970,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (hasToolCalls) {
 			let round = roundByComponent.get(this);
 			if (hasText && (!round || round.anchor !== this)) {
-				if (round) round.messages.delete(this);
+				if (round) {
+					round.messages.delete(this);
+					clearRoundAnchor(this);
+				}
 				if (activeRound) finishRound(activeRound);
 				round = createRound(this, message);
 				roundByComponent.set(this, round);
@@ -1966,6 +1993,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 最终回答开始后，当前组件恢复原生文本；它已完成的 thinking
 				// 留在上一轮摘要中，避免再次生成独立 Thought 行。
 				round.messages.delete(this);
+				clearRoundAnchor(this);
 				round.detachedMessages.push(previousMessage);
 				roundByComponent.delete(this);
 				finishRound(round);
@@ -1975,6 +2003,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 围观态下 anchor 还挂着槽位卡，必须重绘才能收回。
 				endRound(round, true);
 				roundByComponent.delete(this);
+				clearRoundAnchor(this);
 				return passThroughAssistant(this, message);
 			}
 			if (activeRound) finishRound(activeRound);

package/extensions/renderer/default-mode.ts

@@ -85,8 +85,8 @@ type GlobalToolRenderPatch = {
 	prototype: any;
 	active: boolean;
 	mode: () => CompactStyleMode;
-	wrap: (tool: any) => any;
-	byDefinition: WeakMap<object, any>;
+	wrap: (tool: any, toolName: string) => any;
+	byDefinition: WeakMap<object, Map<string, any>>;
 	byName: Map<string, any>;
 	downstream: ToolRenderMethods;
 	installed: ToolRenderMethods;
@@ -217,8 +217,8 @@ function renderExpandedTaskResult(
 function createCcstyleTool(
 	originalTool: any,
 	writeExecutionMetadata: WriteExecutionMetadataStore,
+	toolName: string,
 ): any {
-	const toolName = originalTool.name;
 	const label = originalTool.label || toolName;
 	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
 	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
@@ -459,19 +459,24 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 
 function getGloballyStyledTool(component: any, patch: GlobalToolRenderPatch): any {
 	const definition = component.toolDefinition ?? component.builtInToolDefinition;
+	const name = String(component.toolName || definition?.name || "tool");
 	if (definition && typeof definition === "object") {
-		let wrapped = patch.byDefinition.get(definition);
+		let byName = patch.byDefinition.get(definition);
+		if (!byName) {
+			byName = new Map();
+			patch.byDefinition.set(definition, byName);
+		}
+		let wrapped = byName.get(name);
 		if (!wrapped) {
-			wrapped = patch.wrap(definition);
-			patch.byDefinition.set(definition, wrapped);
+			wrapped = patch.wrap(definition, name);
+			byName.set(name, wrapped);
 		}
 		return wrapped;
 	}
 
-	const name = String(component.toolName || "tool");
 	let wrapped = patch.byName.get(name);
 	if (!wrapped) {
-		wrapped = patch.wrap({ name, label: name });
+		wrapped = patch.wrap({ name, label: name }, name);
 		patch.byName.set(name, wrapped);
 	}
 	return wrapped;
@@ -568,7 +573,8 @@ function installGlobalToolRendering(
 		prototype,
 		active: true,
 		mode: () => config.mode,
-		wrap: (tool: any) => createCcstyleTool(tool, writeExecutionMetadata),
+		wrap: (tool: any, toolName: string) =>
+			createCcstyleTool(tool, writeExecutionMetadata, toolName),
 		byDefinition: new WeakMap(),
 		byName: new Map(),
 		downstream,