pi-cc-extensions 0.9.4 → 0.9.6

package/extensions/renderer/compact-mode.ts

@@ -1,8 +1,9 @@
 /**
  * Compact mode：每条含 toolCall 的 assistant message 折叠为一条逐步累加的摘要行
  * （`Ran for 8s, bash×2, read×2`），edit/write 独立标题行（`✓ write <path> (+25 -0)`），
- * 普通工具折叠时不显示独立行；展开（Ctrl+O / fullscreen 点击）在单个工具卡中恢复
- * compact-thinking/Pi 原生或专用 renderer。edit/write 复用 mode=on 的 rich diff
+ * 普通工具折叠时不显示独立行；展开（Ctrl+O / fullscreen 点击）时助手文本按原生渲染，
+ * thinking 与工具卡装进 userMessageBg 面板（卡内恢复 compact-thinking/Pi 原生或专用
+ * renderer）。edit/write 复用 mode=on 的 rich diff
  * 与 `editDiffCollapsedLines` / `writeDiffCollapsedLines` / `expandedPreviewMaxLines`。
  * Agent/Task 族：调用只进摘要计数，tool 卡始终折叠（避免 pending→完成高度闪动）。
  * 底部 Agents/Tasks 面板由 pi-subagents/pi-tasks 独立 widget 负责，不经 tool 卡外置。
@@ -35,6 +36,7 @@ import {
 import { renderRichToolResult } from "./tool/diff/index.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
+import { getToolMouseTui } from "./mouse/scroll.ts";
 import { insetComponent, renderExpandedToolResult, scheduleAnimation } from "./tool/result.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
 import { formatDisplayPath } from "./tool/names.ts";
@@ -50,6 +52,11 @@ import {
 	PROTOTYPE_ORIGINAL_KEY,
 } from "../utils/patch-keys.ts";
 
+/** Pi 的 native 组件与扩展可能各持一份 pi-tui，Spacer 不能只靠 instanceof 判。 */
+function isSpacerComponent(value: any): boolean {
+	return value instanceof Spacer || value?.constructor?.name === "Spacer";
+}
+
 /** compact 渲染层对 compact-thinking 的只读查询面（不建第二套计时器）。 */
 export type CompactThinkingQuery = {
 	getMessageThinkingDurationMs(messageTimestamp: number): number | undefined;
@@ -320,14 +327,18 @@ function editWriteExpandedCard(theme: any): any {
 	);
 }
 
-/** compact 展开卡：外卡片保持 userMessageBg 原色；内部 tool call card
- *  背景更深一层且只覆盖内容区（左右内缩、上下限首尾文本行），形成嵌套层次。
- *  hits：非工具子卡（thinking）的行区间，供展开后点击 hint。 */
+/** compact 展开面板：外卡片保持 userMessageBg；展开的 thinking 另包一层更深的
+ *  内卡（自身 Box 背景与外卡同色，不区分会糊在一起），工具卡直接铺在外卡背景上。
+ *  每个子卡前面补 1 行分隔（上一条已经是空行时不再补），子卡自带的首尾空行会被裁掉，
+ *  避免与外卡/内卡 padding 叠出双空行。
+ *  hits：子卡的行区间与命中目标（thinking 命中自身，工具命中 tool 组件），
+ *  供展开后点击 hint。未开启 toolHits 时不映射工具，点击仍归外层面板。 */
 function layoutExpandedToolCard(
 	theme: any,
 	children: any[],
 	width: number,
 	paints?: string[][],
+	toolHits = false,
 ): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
 	const slot = "userMessageBg";
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
@@ -335,31 +346,18 @@ function layoutExpandedToolCard(
 	const lines: string[] = [];
 	const hits: Array<{ child: any; start: number; end: number }> = [];
 	const isThinkingPreview = (child: any) => typeof child?.setHintHovered === "function";
-	lines.push(paddedBackgroundRow(theme, slot, "", width));
-	// 展开不再显示摘要行：跳过第一个 child 的首行空白，避免白占一行
-	let skipLeadingBlank = true;
+	let lastBlank = false;
+	const pushBlank = () => {
+		if (lastBlank) return;
+		lines.push(paddedBackgroundRow(theme, slot, "", width));
+		lastBlank = true;
+	};
 	for (let childIndex = 0; childIndex < children.length; childIndex++) {
 		const child = children[childIndex];
 		const painted = paints?.[childIndex];
 		const childLines = Array.isArray(painted) ? painted : child.render(innerWidth);
-		// 展开的 thinking 与 tool 一样走嵌套深色卡，避免贴在外卡同色底上看不见。
-		const nest = child.__ccToolCard || (isThinkingPreview(child) && child.expanded === true);
-		if (!nest) {
-			let start = 0;
-			if (skipLeadingBlank) {
-				while (start < childLines.length && !hasVisibleText(childLines[start])) start++;
-				skipLeadingBlank = false;
-			}
-			const rangeStart = lines.length;
-			for (let i = start; i < childLines.length; i++) {
-				lines.push(paddedBackgroundRow(theme, slot, childLines[i], width));
-			}
-			if (lines.length > rangeStart) hits.push({ child, start: rangeStart, end: lines.length });
-			continue;
-		}
-		// 工具卡：前导 1 空行 + 首尾文本行之间的内容区（深色）；不保留尾随，
-		// 相邻工具卡之间正好 1 空行，底部由卡片 padding 收尾。
-		skipLeadingBlank = false;
+		// 展开的 thinking 带深色内卡（自带上下 padding，不再补外卡分隔行）。
+		const innerCard = isThinkingPreview(child) && child.expanded === true;
 		let first = -1;
 		let last = -1;
 		for (let i = 0; i < childLines.length; i++) {
@@ -371,26 +369,36 @@ function layoutExpandedToolCard(
 		if (first < 0) {
 			for (const line of childLines) {
 				lines.push(paddedBackgroundRow(theme, slot, line, width));
+				lastBlank = !hasVisibleText(line);
 			}
 			continue;
 		}
-		lines.push(paddedBackgroundRow(theme, slot, "", width));
+		if (!innerCard) pushBlank();
 		const rangeStart = lines.length;
-		// 子卡片内部上下各 1 行深色 padding
-		lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
-		for (let i = first; i <= last; i++) {
-			lines.push(toolCardBgRow(theme, slot, toolBgAnsi, childLines[i], width));
-		}
-		lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
+		// 展开的 thinking 走深色内卡（上下各 1 行 padding），工具卡直接铺在外卡上。
+		const paintRow = innerCard
+			? (line: string) => lines.push(toolCardBgRow(theme, slot, toolBgAnsi, line, width))
+			: (line: string) => lines.push(paddedBackgroundRow(theme, slot, line, width));
+		if (innerCard) paintRow("");
+		for (let i = first; i <= last; i++) paintRow(childLines[i]);
+		if (innerCard) paintRow("");
+		// 内卡的下 padding 不能当分隔：后面的子卡要再留 1 行外卡空行。
+		lastBlank = false;
+		// thinking 命中自身；工具在展开卡内需要能二次展开时才映射回 tool 组件。
 		if (isThinkingPreview(child)) hits.push({ child, start: rangeStart, end: lines.length });
+		else if (toolHits && child.__ccTool) {
+			hits.push({ child: child.__ccTool, start: rangeStart, end: lines.length });
+		}
 	}
-	lines.push(paddedBackgroundRow(theme, slot, "", width));
+	pushBlank();
 	return { lines, hits };
 }
 
 function compactRoundCard(
 	cardItems: Array<{ child?: any; tool?: any }>,
 	toolRender: (tool: any, width: number) => string[],
+	/** true 时卡内工具行归 tool 组件，可点击二次展开（整回合展开卡）。 */
+	toolHits = false,
 ): any {
 	const children: any[] = [];
 	for (const item of cardItems) {
@@ -399,6 +407,7 @@ function compactRoundCard(
 			const tool = item.tool;
 			children.push({
 				__ccToolCard: true,
+				__ccTool: tool,
 				render: (innerWidth: number) => toolRender(tool, innerWidth),
 				invalidate: () => tool.invalidate?.(),
 			});
@@ -429,12 +438,12 @@ function compactRoundCard(
 		) {
 			return paint;
 		}
-		const laid = layoutExpandedToolCard(theme, children, width, paints);
+		const laid = layoutExpandedToolCard(theme, children, width, paints, toolHits);
 		paint = {
 			width,
 			theme,
 			paints,
-			lines: ["", ...laid.lines],
+			lines: laid.lines,
 			hits: laid.hits,
 		};
 		return paint;
@@ -445,10 +454,8 @@ function compactRoundCard(
 			return layout(width).lines;
 		},
 		childAtRow(localRow: number, width: number) {
-			if (localRow < 1) return null;
-			const row = localRow - 1;
 			for (const hit of layout(width).hits) {
-				if (row >= hit.start && row < hit.end) return hit.child;
+				if (localRow >= hit.start && localRow < hit.end) return hit.child;
 			}
 			return null;
 		},
@@ -531,6 +538,43 @@ export function setHoveredCompactAssistant(component: any): boolean {
 	return true;
 }
 
+/**
+ * 整回合展开卡内的工具被点击展开时调用：让 compact 的强制折叠放行这一个，
+ * 并把同一回合里其他展开的工具收回去（保持单开）。非 round 内工具是空操作。
+ */
+let roundToolExpansion: { markUserExpanded(tool: any): void } | undefined;
+
+export function markCompactRoundToolExpanded(tool: any): void {
+	roundToolExpansion?.markUserExpanded(tool);
+}
+
+/** 面板展开前的视口位置：收起时还原，避免面板撑高后收起导致视口错位。 */
+const panelViewportBeforeExpand = new WeakMap<
+	object,
+	{ scrollTop: number; followingEnd: boolean }
+>();
+
+function capturePanelViewport(card: any): void {
+	if (!card || panelViewportBeforeExpand.has(card)) return;
+	const view = getToolMouseTui()?.getPrimaryScrollView?.();
+	if (!view || typeof view.scrollTop !== "number" || typeof view.scrollTo !== "function") return;
+	panelViewportBeforeExpand.set(card, {
+		scrollTop: view.scrollTop,
+		followingEnd: view.isFollowingEnd !== false,
+	});
+}
+
+function restorePanelViewport(card: any): void {
+	const snapshot = panelViewportBeforeExpand.get(card);
+	if (!snapshot) return;
+	panelViewportBeforeExpand.delete(card);
+	const view = getToolMouseTui()?.getPrimaryScrollView?.();
+	if (!view) return;
+	// 展开前就在底部：交回官方 follow；否则回到展开前的滚动偏移。
+	if (snapshot.followingEnd && typeof view.scrollToEnd === "function") view.scrollToEnd();
+	else if (typeof view.scrollTo === "function") view.scrollTo(snapshot.scrollTop);
+}
+
 function compactEditWriteLine(
 	component: any,
 	width: number,
@@ -968,6 +1012,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	let activeRound: CompactRound | undefined;
 	let roundByComponent = new WeakMap<object, CompactRound>();
 	const expandedRoundToolIds = new Set<string>();
+	/** 用户显式点开的 round 内工具；强制折叠不压回这些 id。 */
+	const explicitRoundToolIds = new Set<string>();
 	let uiRef: { requestRender?: (force?: boolean) => void } | undefined;
 	let roundTickTimer: ReturnType<typeof setInterval> | undefined;
 
@@ -1037,6 +1083,23 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		return result;
 	};
 
+	const markRoundToolUserExpanded = (tool: any): void => {
+		const id = String(tool?.toolCallId ?? "");
+		if (!id || !expandedRoundToolIds.has(id)) return;
+		for (const other of trackedToolComponents) {
+			const otherId = String(other?.toolCallId ?? "");
+			if (other === tool || !expandedRoundToolIds.has(otherId) || other.expanded !== true) continue;
+			explicitRoundToolIds.delete(otherId);
+			if (typeof other.setExpanded === "function") other.setExpanded(false);
+			else {
+				other.expanded = false;
+				other.updateDisplay?.();
+			}
+		}
+		explicitRoundToolIds.add(id);
+	};
+	roundToolExpansion = { markUserExpanded: markRoundToolUserExpanded };
+
 	const roundMessages = (round: CompactRound): any[] => [
 		...round.messages.values(),
 		...round.detachedMessages,
@@ -1061,17 +1124,24 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		const summary = getSummary();
 		for (const id of round.suppressedToolIds) expandedRoundToolIds.delete(id);
 		round.suppressedToolIds.clear();
+		// 回合收起（或本回合不在展开态）时忘掉用户的单开选择。
+		if (round.anchor.expanded !== true) {
+			for (const id of roundToolCallIds(round)) explicitRoundToolIds.delete(id);
+		}
 
 		for (const [component, message] of round.messages) {
 			component.lastMessage = message;
 			ensureAssistantSetExpanded(component);
 			component[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) => {
+				const wasExpanded = round.anchor.expanded === true;
+				if (expanded && !wasExpanded) capturePanelViewport(round.anchor);
 				for (const member of round.messages.keys()) member.expanded = expanded;
 				if (!expanded) {
 					for (const id of round.suppressedToolIds) expandedRoundToolIds.delete(id);
 					round.suppressedToolIds.clear();
 				}
 				renderRound(round);
+				if (!expanded && wasExpanded) restorePanelViewport(round.anchor);
 			};
 		}
 
@@ -1080,14 +1150,39 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			for (const tool of trackedToolComponents) {
 				if (typeof tool?.toolCallId === "string") toolsById.set(tool.toolCallId, tool);
 			}
-			const cardItems: Array<{ child?: any; tool?: any }> = [];
-			const placedToolIds = new Set<string>();
-			const takeAssistantRun = (kids: any[], cursor: { i: number }) => {
-				while (cursor.i < kids.length && kids[cursor.i] instanceof Spacer) {
-					cardItems.push({ child: kids[cursor.i++] });
+			// 助手文本按原生渲染、不进面板（面板只留 thinking 与工具卡）。
+			// thinking/工具卡按连续段各包一张面板；先出文本再出面板，
+			// 否则消息内容里的 thinking（[thinking, text, toolCall]）会盖到文本上面。
+			const anchorChildren: any[] = [];
+			let cardItems: Array<{ child?: any; tool?: any }> = [];
+			const flushPanel = () => {
+				if (cardItems.length === 0) return;
+				if (cardItems.every((item) => !item.tool && isSpacerComponent(item.child))) {
+					for (const item of cardItems) anchorChildren.push(item.child);
+				} else {
+					// 面板上沿留 1 行卡外空行：面板底色与 userMessage 同色，
+					// 贴在一起会看成一个块；卡内顶部再加 1 行 padding 保持上下对称。
+					anchorChildren.push(new Spacer(1));
+					anchorChildren.push(
+						compactRoundCard(
+							cardItems,
+							(tool, innerWidth) => patch.toolOriginalRender.call(tool, innerWidth),
+							// 整回合展开卡：卡内工具行归 tool 组件，可单击二次展开。
+							true,
+						),
+					);
 				}
-				if (cursor.i < kids.length) cardItems.push({ child: kids[cursor.i++] });
+				cardItems = [];
 			};
+			const takeChild = (child: any, outside: boolean) => {
+				if (!outside) {
+					cardItems.push({ child });
+					return;
+				}
+				flushPanel();
+				anchorChildren.push(child);
+			};
+			const placedToolIds = new Set<string>();
 			const placeTool = (id: string, fallbackName?: string) => {
 				const tool = toolsById.get(id);
 				if (!tool || EDIT_WRITE_TOOLS.has(String(tool.toolName ?? fallbackName ?? ""))) return;
@@ -1095,6 +1190,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				placedToolIds.add(id);
 				cardItems.push({ tool });
 			};
+			type LocalEntry = { outside: boolean; child?: any; toolId?: string; toolName?: string };
 			for (const [component, message] of round.messages) {
 				passThroughAssistant(component, message);
 				const kids = Array.isArray(component.contentContainer?.children)
@@ -1103,25 +1199,39 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				component.contentContainer?.clear?.();
 				const cursor = { i: 0 };
 				let inThinkingRun = false;
+				// 本消息产出先收集再发射：文本（含其前导 Spacer）统一排在面板前面。
+				const local: LocalEntry[] = [];
+				const takeRun = (outside: boolean) => {
+					while (cursor.i < kids.length && isSpacerComponent(kids[cursor.i])) {
+						local.push({ outside, child: kids[cursor.i++] });
+					}
+					if (cursor.i < kids.length) local.push({ outside, child: kids[cursor.i++] });
+				};
 				for (const item of Array.isArray(message?.content) ? message.content : []) {
 					if (item?.type === "thinking") {
 						if (!String(item.thinking ?? "").trim()) continue;
 						if (!inThinkingRun) {
-							takeAssistantRun(kids, cursor);
+							takeRun(false);
 							inThinkingRun = true;
 						}
 						continue;
 					}
 					inThinkingRun = false;
 					if (item?.type === "text" && String(item.text ?? "").trim()) {
-						takeAssistantRun(kids, cursor);
+						takeRun(true);
 						continue;
 					}
 					if (item?.type === "toolCall" && typeof item.id === "string") {
-						placeTool(item.id, item.name);
+						local.push({ outside: false, toolId: item.id, toolName: item.name });
 					}
 				}
-				while (cursor.i < kids.length) cardItems.push({ child: kids[cursor.i++] });
+				while (cursor.i < kids.length) local.push({ outside: false, child: kids[cursor.i++] });
+				for (const entry of local) if (entry.outside) takeChild(entry.child, true);
+				for (const entry of local) {
+					if (entry.outside) continue;
+					if (entry.toolId) placeTool(entry.toolId, entry.toolName);
+					else takeChild(entry.child, false);
+				}
 			}
 			for (const message of round.detachedMessages) {
 				for (const item of Array.isArray(message?.content) ? message.content : []) {
@@ -1136,12 +1246,14 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				expandedRoundToolIds.add(id);
 				if (!placedToolIds.has(id)) placeTool(id);
 			}
-			// Round 展开只打开外层卡片。普通工具保持折叠，避免长输出递归撑满屏幕。
+			// Round 展开只打开外层卡片。普通工具保持折叠，避免长输出递归撑满屏幕；
+			// 用户单独点开的（explicitRoundToolIds）不压回去。
 			for (const tool of trackedToolComponents) {
 				if (
 					!ids.has(tool.toolCallId) ||
 					EDIT_WRITE_TOOLS.has(String(tool.toolName ?? "")) ||
-					tool.expanded !== true
+					tool.expanded !== true ||
+					explicitRoundToolIds.has(String(tool.toolCallId ?? ""))
 				) {
 					continue;
 				}
@@ -1151,11 +1263,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					tool.updateDisplay?.();
 				}
 			}
-			round.anchor.contentContainer.addChild(
-				compactRoundCard(cardItems, (tool, innerWidth) =>
-					patch.toolOriginalRender.call(tool, innerWidth),
-				),
-			);
+			flushPanel();
+			for (const child of anchorChildren) round.anchor.contentContainer.addChild(child);
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
 			appendStopStatus(round.anchor, stopStatus);
 			return;
@@ -1189,6 +1298,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		activeRound = undefined;
 		roundByComponent = new WeakMap();
 		expandedRoundToolIds.clear();
+		explicitRoundToolIds.clear();
 		deps.query?.setCompactSummaryActive?.(false);
 		stopRoundTick();
 	};
@@ -1322,12 +1432,11 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	};
 
 	patch.toolInstalledUpdateDisplay = function (this: any) {
-		if (
-			patch.active &&
-			config.mode === "compact" &&
-			expandedRoundToolIds.has(String(this.toolCallId ?? ""))
-		) {
-			this.expanded = false;
+		const id = String(this.toolCallId ?? "");
+		if (patch.active && config.mode === "compact" && expandedRoundToolIds.has(id)) {
+			// 用户点开的保留展开；其余（含全局展开被收回的）继续强制折叠。
+			if (this.expanded !== true) explicitRoundToolIds.delete(id);
+			else if (!explicitRoundToolIds.has(id)) this.expanded = false;
 		}
 		const result = patch.toolOriginalUpdateDisplay.call(this);
 		if (!patch.active) return result;
@@ -1355,6 +1464,9 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	patch.dispose = () => {
 		if (!patch.active) return;
 		patch.active = false;
+		if (roundToolExpansion?.markUserExpanded === markRoundToolUserExpanded) {
+			roundToolExpansion = undefined;
+		}
 		if (assistantPrototype.updateContent === patch.assistantInstalled) {
 			assistantPrototype.updateContent = patch.assistantOriginal;
 		}

package/extensions/renderer/default-mode.ts

@@ -36,7 +36,13 @@ import { showMoreHintText } from "./tool/show-more-hint.ts";
 import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult, type WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { fitToolCallSummary, humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
+import { mcpToolTitle } from "./tool/mcp-title.ts";
+import {
+	fitToolCallSummary,
+	humanizeToolLabel,
+	renderToolSummary,
+	toolCallSummary,
+} from "./tool/names.ts";
 
 // 成功勾：亮绿 truecolor（与 message-display 一致）
 const BRIGHT_GREEN = "\x1b[38;2;80;220;100m";
@@ -102,25 +108,6 @@ export function shouldRenderRichDiff(
 	return mode === "on" && !isError && (toolName === "edit" || toolName === "write");
 }
 
-export function isMcpToolDefinition(definition: any, toolName: string): boolean {
-	const label = typeof definition?.label === "string" ? definition.label.trim() : "";
-	if (/^MCP(?::|$)/i.test(label)) return true;
-	if (toolName === "mcp" || /^mcp[_:-]|[_:-]mcp[_:-]/i.test(toolName)) return true;
-	if (label) return false;
-	const description = typeof definition?.description === "string" ? definition.description : "";
-	return /\bModel Context Protocol\b/i.test(description);
-}
-
-export function humanizeMcpToolName(toolName: string): string {
-	const words = toolName
-		.replace(/^mcp(?:[_:-]+)+/i, "")
-		.split(/[_:-]+/)
-		.filter(Boolean);
-	return words.length
-		? words.map((word) => word[0]!.toUpperCase() + word.slice(1)).join(" ")
-		: "MCP";
-}
-
 /** 排除名单内且自带 renderer 的工具保留原渲染。 */
 export function preservesOriginalRenderer(
 	extensionDefinition: any,
@@ -225,15 +212,16 @@ function createCcstyleTool(
 	writeExecutionMetadata: WriteExecutionMetadataStore,
 ): any {
 	const toolName = originalTool.name;
-	const label = isMcpToolDefinition(originalTool, toolName)
-		? humanizeMcpToolName(toolName)
-		: originalTool.label || toolName;
+	const label = originalTool.label || toolName;
+	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
+	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
+	const title = mcpToolTitle({ toolName, definition: originalTool }) ?? defaultTitle;
 
 	return {
 		...originalTool,
 		renderShell: "self",
 		renderCall(args: any, theme: any, context: any) {
-			if (config.mode !== "on") {
+			if (config.mode === "off") {
 				return renderDefault(originalTool, "renderCall", [args, theme, context], String(toolName));
 			}
 
@@ -252,7 +240,7 @@ function createCcstyleTool(
 			// 不再每次 tick 走 updateDisplay 把整张卡重建一遍。
 			const pendingIconStyled = () => theme.fg(toolIconColor(context), pendingIcon(toolName));
 			const summary = toolCallSummary(toolName, args, {
-				title: label === toolName ? humanizeToolLabel(label) : label,
+				title,
 				variant: "default",
 				cwd: context?.cwd,
 			});
@@ -295,7 +283,7 @@ function createCcstyleTool(
 					cachedWidth = width;
 					cachedIcon = icon;
 					// 路径按最终可用宽度中间截断，避免整行二次截断隐藏文件名。
-					cachedLine = `${lead}${icon} ${theme.fg("toolTitle", fitToolCallSummary(summary, mainWidth))}${extraStyled}`;
+					cachedLine = `${lead}${icon} ${renderToolSummary(summary, mainWidth, theme.fg.bind(theme))}${extraStyled}`;
 					return [truncateToWidth(cachedLine, viewportWidth, "")];
 				},
 				invalidate() {
@@ -305,7 +293,7 @@ function createCcstyleTool(
 			};
 		},
 		renderResult(result: any, options: any, theme: any, context: any) {
-			if (config.mode !== "on") {
+			if (config.mode === "off") {
 				return renderDefault(
 					originalTool,
 					"renderResult",
@@ -428,8 +416,9 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 	const builtInDefinition = component.builtInToolDefinition;
 	const definition = extensionDefinition ?? builtInDefinition;
 	const toolName = String(component.toolName || definition?.name || "");
+	// compact 也复用同一套 ccstyle call/result，避免折叠态工具卡回落到 Pi 原生样式。
 	const useCcstyle =
-		patch.mode() === "on" &&
+		patch.mode() !== "off" &&
 		!DEDICATED_RENDERER_TOOLS.has(toolName) &&
 		!preservesOriginalRenderer(extensionDefinition, toolName, builtInDefinition);
 	component[COMPONENT_TOOL_RENDER_MODE] = useCcstyle;
@@ -597,19 +586,27 @@ function installGlobalToolRendering(
 			return originalRender.call(this, width);
 		}
 		const cache = patch.paintCache;
-		const hit = cache?.get(this);
+		// A running partial tool owns a time-varying spinner. Light animation ticks
+		// request a repaint without invalidating the component, so settled-content
+		// caching must not intercept those paints.
+		const cacheable = !(this.executionStarted && this.isPartial);
+		const hit = cacheable ? cache?.get(this) : undefined;
 		if (hit && toolPaintMatches(hit, this, width)) return hit.lines;
 		const lines = originalRender.call(this, width);
-		cache?.set(this, {
-			width,
-			expanded: Boolean(this.expanded),
-			isPartial: Boolean(this.isPartial),
-			result: this.result,
-			args: this.args,
-			callHover: isToolCallHovered(this.toolCallId),
-			ioHover: ioHoverOf(this),
-			lines,
-		});
+		if (cacheable) {
+			cache?.set(this, {
+				width,
+				expanded: Boolean(this.expanded),
+				isPartial: Boolean(this.isPartial),
+				result: this.result,
+				args: this.args,
+				callHover: isToolCallHovered(this.toolCallId),
+				ioHover: ioHoverOf(this),
+				lines,
+			});
+		} else {
+			cache?.delete(this);
+		}
 		return lines;
 	};
 	patch.invalidatePaint = function (this: any): void {

package/extensions/renderer/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { ToolExecutionComponent, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
 import { installToolGrouping, type ToolGroupingHooks } from "./tool/grouping.ts";
 import {
@@ -266,11 +266,13 @@ export default function (
 // ---- 对外导出：入口/测试实际消费的符号 ----
 export { getCompactThinkingConfig } from "../config/config.ts";
 export {
-	humanizeMcpToolName,
-	isMcpToolDefinition,
 	preservesOriginalRenderer,
 	shouldRenderRichDiff,
 } from "./default-mode.ts";
+export {
+	isMcpToolDefinition,
+	mcpToolTitle,
+} from "./tool/mcp-title.ts";
 export {
 	ExpandedToolIoView,
 	ExpandedToolResultText,