pi-cc-extensions 0.9.9 → 0.9.11

package/extensions/feature/shell/mcp-chip.ts

@@ -0,0 +1,136 @@
+/**
+ * 内置 MCP 的状态栏芯片。
+ *
+ * pi 的内置 MCP 不写 setStatus：连接状态只在 `/mcp` 菜单里，扩展读不到。这里用公开数据推算
+ * 「已连接/已配置」，并在别的扩展接管 `/mcp` 时让位（pi-mcp-adapter 这类扩展自己会写 "mcp" 状态）。
+ *
+ * - 已连接：`pi.getAllTools()` 里来源是 builtin:mcp、曝光非 hidden 的工具，按 namespace 去重。
+ *   断线后工具仍在、0 个工具的服务器连上也看不见，needs-auth / failed 与 connecting 也分不开，
+ *   所以这只是近似值。
+ * - 已配置：mcp.json 里 enabled !== false 的条目（项目级要已 trust）。
+ */
+
+import { readFileSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+/** 与 pi-mcp-adapter 共用同一个 status key；它写了 key 时本扩展不画。 */
+export const MCP_STATUS_KEY = "mcp";
+/** 内置 MCP 扩展的资源路径。 */
+export const BUILTIN_MCP_SOURCE = "builtin:mcp";
+const MCP_NAMESPACE_PREFIX = "mcp__";
+
+type McpConfigCacheEntry = { mtimeMs: number; names: string[] };
+
+const configCache = new Map<string, McpConfigCacheEntry>();
+
+export function mcpAgentDir(): string {
+	return process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
+}
+
+/** pi 把 `-` 与 `_` 视作同一个服务器名（`mcpNamespace` 只把 `-` 换成 `_`）。 */
+export function normalizeMcpServerName(name: string): string {
+	return name.trim().replace(/-/g, "_");
+}
+
+/** `mcp__<server>` → `<server>`；不是 MCP 命名空间返回 undefined。 */
+export function mcpNamespaceServer(namespace: string): string | undefined {
+	if (!namespace.startsWith(MCP_NAMESPACE_PREFIX)) return undefined;
+	const server = namespace.slice(MCP_NAMESPACE_PREFIX.length);
+	return server || undefined;
+}
+
+/** 已连接的服务器名（按 namespace 去重，返回规范化名字）。 */
+export function connectedMcpServers(tools: readonly any[]): string[] {
+	const fromBuiltin = new Set<string>();
+	const fromNamespace = new Set<string>();
+	for (const tool of tools ?? []) {
+		if (tool?.exposure === "hidden") continue;
+		const server = mcpNamespaceServer(String(tool?.namespace?.name ?? ""));
+		if (!server) continue;
+		const name = normalizeMcpServerName(server);
+		if (tool?.sourceInfo?.path === BUILTIN_MCP_SOURCE) fromBuiltin.add(name);
+		else fromNamespace.add(name);
+	}
+	// 版本漂移兜底：来源路径对不上时按 namespace 认（接管 /mcp 的扩展已在此之前排除）
+	return [...(fromBuiltin.size > 0 ? fromBuiltin : fromNamespace)];
+}
+
+/** `MCP 2/3`：已连接/（已连接 ∪ 已配置）。两边都空时不显示。 */
+export function formatMcpChip(
+	connected: readonly string[],
+	configured: readonly string[],
+): string | undefined {
+	const connectedNames = new Set(connected.map(normalizeMcpServerName).filter(Boolean));
+	const configuredNames = new Set(configured.map(normalizeMcpServerName).filter(Boolean));
+	const total = new Set([...connectedNames, ...configuredNames]).size;
+	if (total === 0) return undefined;
+	return `MCP ${connectedNames.size}/${total}`;
+}
+
+/** 读一个 mcp.json 里启用中的服务器名；文件缺失或损坏返回 undefined。 */
+function readMcpConfigNames(path: string): string[] | undefined {
+	try {
+		const { mtimeMs } = statSync(path);
+		const cached = configCache.get(path);
+		if (cached && cached.mtimeMs === mtimeMs) return cached.names;
+		const parsed = JSON.parse(readFileSync(path, "utf8")) as { mcpServers?: unknown };
+		const servers = parsed?.mcpServers;
+		const names: string[] = [];
+		if (servers && typeof servers === "object" && !Array.isArray(servers)) {
+			for (const [name, entry] of Object.entries(servers as Record<string, unknown>)) {
+				if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+				if ((entry as { enabled?: unknown }).enabled === false) continue;
+				names.push(name);
+			}
+		}
+		configCache.set(path, { mtimeMs, names });
+		return names;
+	} catch {
+		configCache.delete(path);
+		return undefined;
+	}
+}
+
+/** mcp.json 里启用中的服务器名：用户级，加上已信任时的项目级（同名以项目为准，计数时去重）。 */
+export function configuredMcpServers(options: {
+	agentDir: string;
+	cwd: string;
+	projectTrusted: boolean;
+}): string[] {
+	const names = [...(readMcpConfigNames(join(options.agentDir, "mcp.json")) ?? [])];
+	if (options.projectTrusted) {
+		names.push(...(readMcpConfigNames(join(options.cwd, ".pi", "mcp.json")) ?? []));
+	}
+	return names;
+}
+
+/** 注册了 `/mcp` 的都是内置 MCP；别的扩展接管时它自己会写状态芯片。 */
+export function builtinMcpOwnsCommand(commands: readonly any[]): boolean {
+	const mcpCommands = (commands ?? []).filter((command) => command?.name === MCP_STATUS_KEY);
+	return (
+		mcpCommands.length > 0 &&
+		mcpCommands.every((command) => command?.sourceInfo?.path === BUILTIN_MCP_SOURCE)
+	);
+}
+
+/** footer 渲染用：当前芯片文案（不含 nerd 图标），不适用时返回 undefined。 */
+export function buildMcpChip(ctx: any, api: any): string | undefined {
+	try {
+		// 工具与命令列表在 pi API 上，ctx 只提供 cwd / trust
+		if (!builtinMcpOwnsCommand(api?.getCommands?.() ?? [])) return undefined;
+		const tools = api?.getAllTools?.();
+		if (!Array.isArray(tools)) return undefined;
+		return formatMcpChip(
+			connectedMcpServers(tools),
+			configuredMcpServers({
+				agentDir: mcpAgentDir(),
+				cwd: String(ctx?.cwd ?? process.cwd()),
+				projectTrusted: ctx?.isProjectTrusted?.() === true,
+			}),
+		);
+	} catch {
+		// footer 不能因为读配置或读工具列表失败而中断渲染
+		return undefined;
+	}
+}

package/extensions/renderer/compact-mode.ts

@@ -338,16 +338,18 @@ function toolCardBgRow(
 	const inset = (n: number) => (outerBg ? `${outerBg}${" ".repeat(n)}\x1b[49m` : " ".repeat(n));
 	return `${inset(leftInset)}${bgAnsi}${stable}\x1b[49m${inset(rightInset)}`;
 }
-/** edit/write 展开卡：保持原样式（userMessageBg Box），不应用工具卡深色/间距改动。 */
+/** edit/write 展开卡：保持原样式（展开卡背景 Box），不应用工具卡深色/间距改动。 */
 function editWriteExpandedCard(theme: any): any {
 	return new Box(
 		1,
 		1,
-		typeof theme.bg === "function" ? (text: string) => theme.bg("userMessageBg", text) : undefined,
+		typeof theme.bg === "function"
+			? (text: string) => theme.bg(config.expandedCardBackground, text)
+			: undefined,
 	);
 }
 
-/** compact 展开面板：外卡片保持 userMessageBg；展开的 thinking 另包一层更深的
+/** compact 展开面板：外卡片保持展开卡背景；展开的 thinking 另包一层更深的
  *  内卡（自身 Box 背景与外卡同色，不区分会糊在一起），工具卡直接铺在外卡背景上。
  *  每个子卡前面补 1 行分隔（上一条已经是空行时不再补），子卡自带的首尾空行会被裁掉，
  *  避免与外卡/内卡 padding 叠出双空行。
@@ -364,7 +366,7 @@ function layoutExpandedToolCard(
 	toolHits = false,
 	live = false,
 ): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
-	const slot = "userMessageBg";
+	const slot = config.expandedCardBackground;
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
 	/** live 每行前面的标记宽度（首行 `↳ `，其余对齐空格）。 */
 	const markerWidth = live ? 2 : 0;
@@ -471,6 +473,8 @@ function compactRoundCard(
 		| {
 				width: number;
 				theme: unknown;
+				/** 背景槽位也是面板行的输入：改配置后不能复用旧底色的整卡。 */
+				bgSlot: string;
 				paints: unknown[];
 				lines: string[];
 				hits: Array<{ child: any; start: number; end: number }>;
@@ -478,6 +482,7 @@ function compactRoundCard(
 		| undefined;
 	const layout = (width: number) => {
 		const theme = themeOf();
+		const bgSlot = config.expandedCardBackground;
 		const innerWidth = contentWidth(width);
 		const paints = children.map((child) => {
 			const lines = child.render?.(innerWidth);
@@ -487,6 +492,7 @@ function compactRoundCard(
 			paint &&
 			paint.width === width &&
 			paint.theme === theme &&
+			paint.bgSlot === bgSlot &&
 			paint.paints.length === paints.length &&
 			paint.paints.every((item, index) => item === paints[index])
 		) {
@@ -496,6 +502,7 @@ function compactRoundCard(
 		paint = {
 			width,
 			theme,
+			bgSlot,
 			paints,
 			lines: laid.lines,
 			hits: laid.hits,
@@ -528,6 +535,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" ||
@@ -539,6 +552,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 模式下生效）。 */
@@ -697,7 +711,7 @@ function compactEditWriteLine(
 	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
 	const hintText =
-		options.hint !== false && component.expanded !== true ? ` • ${showMoreHintText()}` : "";
+		options.hint !== false && component.expanded !== true ? ` · ${showMoreHintText()}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -719,6 +733,8 @@ const compactRichDiffCache = new WeakMap<
 type CompactEditPaintHit = {
 	width: number;
 	theme: unknown;
+	/** 展开卡的背景槽位同样参与命中判断。 */
+	bgSlot: string;
 	expanded: boolean;
 	result: unknown;
 	isPartial: boolean;
@@ -756,6 +772,7 @@ function compactEditWriteLines(
 			hit &&
 			hit.width === width &&
 			hit.theme === theme &&
+			hit.bgSlot === config.expandedCardBackground &&
 			hit.expanded === expanded &&
 			hit.result === component.result &&
 			hit.isPartial === isPartial &&
@@ -771,6 +788,7 @@ function compactEditWriteLines(
 		compactEditPaintCache.set(component, {
 			width,
 			theme,
+			bgSlot: config.expandedCardBackground,
 			expanded,
 			result: component.result,
 			isPartial,
@@ -901,7 +919,7 @@ function compactAssistantLineComponent(
 			const pad = Math.max(0, options.pad ?? (Number(self.outputPad) || 0));
 			const available = Math.max(0, width - pad);
 			const hint = options.hint !== false;
-			const hintText = hint ? ` • ${showMoreHintText()}` : "";
+			const hintText = hint ? ` · ${showMoreHintText()}` : "";
 			const summaryWidth = Math.max(0, available - visibleWidth(hintText));
 			const resolved = typeof summary === "function" ? summary() : summary;
 			const runningActive = resolved.startsWith("Running...");
@@ -938,8 +956,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 = {
@@ -975,7 +996,7 @@ function compactStopStatusLine(status: string, pad = 0): any {
 
 /**
  * 槽位卡内的展开入口：卡里是只读围观，展开走摘要行自己的 hint，卡内不再重复提示。
- * 提示有两处来源——我们的 showMoreHintText（`… +N more lines • click to show more`）与
+ * 提示有两处来源——我们的 showMoreHintText（`… +N more lines · click to show more`）与
  * pi 原生工具卡（`… (N earlier lines, ctrl+o to expand)`），所以按渲染结果收尾裁剪。
  * 只去掉动作词，`(N more lines)` 这类计数保留。
  */
@@ -987,7 +1008,8 @@ const SLOT_HINT_PATTERNS: RegExp[] = [
 	// 只去掉动作词，收尾括号与计数保留。
 	new RegExp(String.raw`,\s*[^()]*?${EXPAND_ACTION}(?=\))`),
 	// 直接挂在行尾：整段去掉。
-	new RegExp(String.raw`\s*(?:•\s*)?${EXPAND_ACTION}\s*$`),
+	// 尾部分隔点：ccstyle 统一 `·`，同时兼容旧帧与 pi 原生的 `•`
+	new RegExp(String.raw`\s*(?:[•·]\s*)?${EXPAND_ACTION}\s*$`),
 ];
 
 function stripSlotHint(line: string): string {
@@ -1357,7 +1379,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		const tail: MountedRoundTail = { host: undefined, container: undefined, parts: [], round };
 		const host: any = {
 			outputPad: Number(round.anchor?.outputPad) || 0,
+			children: [],
 			render: (width: number) => tail.parts.flatMap((part: any) => part?.render?.(width) ?? []),
+			childAtRow(localRow: number, width: number) {
+				let offset = 0;
+				for (const part of tail.parts) {
+					const lines = part?.render?.(width);
+					const count = Array.isArray(lines) ? lines.length : 0;
+					if (localRow < offset + count) {
+						return part?.childAtRow?.(localRow - offset, width) ?? null;
+					}
+					offset += count;
+				}
+				return null;
+			},
 			invalidate: () => {
 				for (const part of tail.parts) part?.invalidate?.();
 			},
@@ -1373,6 +1408,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		// 点击/悬停归属与 anchor 同一展开入口；toggle 每次 renderRound 重建，按值转发。
 		// 经 tail.round 动态解引用：重建过户时 anchor 可能换成别的组件。
 		ensureAssistantSetExpanded(host);
+		Object.defineProperty(host, "roundAnchor", {
+			configurable: true,
+			get: () => tail.round?.anchor,
+		});
 		host[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) =>
 			tail.round?.anchor?.[ASSISTANT_TOGGLE_ROUND_KEY]?.(expanded);
 		tail.host = host;
@@ -1527,6 +1566,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		const tail = ensureTailHost(round);
 		tail.parts = makeParts(tail.host);
+		tail.host.children = tail.parts;
 		syncTailPosition(round);
 	};
 
@@ -1665,6 +1705,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);
@@ -1679,8 +1723,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 
 		if (round.anchor.expanded === true) {
-			// 展开卡自带全部内容，尾行摘下（收起时在折叠分支重新挂载）。
-			unmountRoundTail(round);
+			// 展开内容留在摘要行那个位置：回合最后一个成员（含 write/edit）之后。
+			// 放进 anchor 内部会跳到回合起点，盖到中间的 write/edit 上面。
+			// anchor 未挂进 transcript 时没有这个位置，退回 anchor 内部。
+			const mounted = Boolean(tailContainerOf(round.anchor));
 			const toolsById = new Map<string, any>();
 			for (const tool of trackedToolComponents) {
 				if (typeof tool?.toolCallId === "string") toolsById.set(tool.toolCallId, tool);
@@ -1790,7 +1836,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					!explicitRoundToolIds.has(String(tool.toolCallId ?? "")),
 			);
 			flushPanel();
-			for (const child of anchorChildren) round.anchor.contentContainer.addChild(child);
+			if (mounted) {
+				// 正文留在各自的 assistant 消息上，面板挂回摘要行原位。
+				const outside: any[] = [];
+				const panel: any[] = [];
+				for (const child of anchorChildren) {
+					(typeof child?.childAtRow === "function" ? panel : outside).push(child);
+				}
+				for (const child of outside) round.anchor.contentContainer.addChild(child);
+				if (panel.length > 0) mountRoundTail(round, () => panel);
+				else unmountRoundTail(round);
+			} else {
+				unmountRoundTail(round);
+				for (const child of anchorChildren) round.anchor.contentContainer.addChild(child);
+			}
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
 			appendStopStatus(round.anchor, stopStatus);
 			return;
@@ -1901,7 +1960,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);
@@ -1921,6 +1983,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 最终回答开始后，当前组件恢复原生文本；它已完成的 thinking
 				// 留在上一轮摘要中，避免再次生成独立 Thought 行。
 				round.messages.delete(this);
+				clearRoundAnchor(this);
 				round.detachedMessages.push(previousMessage);
 				roundByComponent.delete(this);
 				finishRound(round);
@@ -1930,6 +1993,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

@@ -33,6 +33,11 @@ import {
 } from "./tool/result.ts";
 import { oneLine } from "../utils/format.ts";
 import { showMoreHintText } from "./tool/show-more-hint.ts";
+import {
+	CODEMODE_TOOL_NAME,
+	codemodeExpandedBody,
+	createCodemodeResultComponent,
+} from "./tool/codemode.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";
@@ -80,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;
@@ -157,7 +162,7 @@ function taskListSummary(tasks: ParsedTask[]): string {
 		counts.completed ? `${counts.completed} completed` : "",
 	]
 		.filter(Boolean)
-		.join(" • ");
+		.join(" · ");
 }
 
 function renderExpandedTaskResult(
@@ -212,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 暴露的真实工具名，不做人性化
@@ -305,13 +310,38 @@ function createCcstyleTool(
 			}
 
 			const expanded = isToolExpanded(options, context);
+			const isError = Boolean(options?.isError || context?.isError);
+			// codemode：折叠态自己画子调用树，展开态给全部子调用与去掉脚本头的输出
+			if (toolName === CODEMODE_TOOL_NAME) {
+				if (!options?.isPartial) setToolVisualState(context, isError ? "error" : "success");
+				if (expanded) {
+					return renderExpandedToolResult(
+						codemodeExpandedBody(result),
+						theme,
+						isError,
+						context?.lastComponent,
+						context?.args,
+						context,
+						true,
+					);
+				}
+				// 折叠态不再复用展开视图，免得 hover/鼠标命中指向已隐藏的组件
+				if (context?.state) context.state.ccstyleIoView = undefined;
+				const toolCallId = context?.toolCallId;
+				return createCodemodeResultComponent({
+					result,
+					theme,
+					running: Boolean(options?.isPartial),
+					isError,
+					isHovered: () => isToolCallHovered(toolCallId),
+				});
+			}
 			if (options?.isPartial) {
 				// 展开态贴左（Box 提供 1 格 pad）；折叠态保持 3 格对齐标题
 				const pending = expanded ? "↳ Pending…" : "   ↳ Pending…";
 				return new Text(theme.fg("muted", pending), 0, 0);
 			}
 
-			const isError = options?.isError || context?.isError;
 			setToolVisualState(context, isError ? "error" : "success");
 			const toolCallId = context?.toolCallId;
 			if (shouldRenderRichDiff(config.mode, toolName, Boolean(isError))) {
@@ -356,7 +386,7 @@ function createCcstyleTool(
 						: "Done";
 			const expandable = !expanded && (tasks.length > 0 || hasExpandableDetail(text, args));
 			const hintText = showMoreHintText();
-			const hintPrefix = expandable ? theme.fg("dim", " • ") : "";
+			const hintPrefix = expandable ? theme.fg("dim", " · ") : "";
 			const hint = expandable ? hintPrefix + theme.fg("dim", hintText) : "";
 			const hoveredHint = expandable ? hintPrefix + theme.fg("text", hintText) : "";
 			if (expanded) {
@@ -429,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;
@@ -538,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,
@@ -669,7 +705,9 @@ export function installToolExpandedBackground(): () => void {
 			if (box) {
 				box.paddingX = 1;
 				box.paddingY = 1;
-				if (box.setBgFn) box.setBgFn((text: string) => theme.bg("userMessageBg", text));
+				if (box.setBgFn) {
+					box.setBgFn((text: string) => theme.bg(config.expandedCardBackground, text));
+				}
 			}
 		},
 		original,

package/extensions/renderer/mouse/interaction.ts

@@ -13,7 +13,6 @@ import {
 	setHoveredCompactAssistant,
 } from "../compact-mode.ts";
 import { isMessageDisplayComponent } from "../tool/message-display.ts";
-import { config } from "../../config/config.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
 import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/show-more-hint.ts";
 import {
@@ -144,7 +143,10 @@ function tryOpenToolIoShowMore(region: InteractionRegion): boolean {
 	}
 	const title = section === "input" ? "Tool Input" : "Tool Output";
 	const content = section === "input" ? ioView.getInputBody() : ioView.getOutputBody();
-	void showTextPreview({ ui }, title, content || "(empty)");
+	// 整段就是代码时包一层围栏：弹框按 Markdown 渲染，围栏代码块才会着色
+	const fence = section === "input" ? ioView.getInputCodeFence() : undefined;
+	const preview = fence ? `\`\`\`${fence.language}\n${fence.code}\n\`\`\`` : content;
+	void showTextPreview({ ui }, title, preview || "(empty)");
 	return true;
 }
 
@@ -305,10 +307,6 @@ function ensureFullscreenToolMouseMotion(tui: any): void {
 		releaseFullscreenToolMouseMotion(tui);
 		return;
 	}
-	// 面板改 scrollStepLines 后，下一帧渲染即同步（restore 仍按 original 恢复）。
-	if (typeof tui.wheelScrollLines === "number" && tui.wheelScrollLines !== config.scrollStepLines) {
-		tui.wheelScrollLines = config.scrollStepLines;
-	}
 	if (
 		!toolMouseInteractionActive() ||
 		tui.mouseEnabled === false ||
@@ -345,7 +343,6 @@ function releaseFullscreenToolMouseMotion(tui?: any): void {
 }
 
 const FULLSCREEN_VIEWPORT_PATCH = Symbol("ccstyle.fullscreen-viewport-patch");
-const FULLSCREEN_WHEEL_SCROLL_ORIGINAL = Symbol("ccstyle.fullscreen-wheel-scroll-original");
 
 /**
  * diff 结果组件自带 remainder 行：声明存在时只有那一行是展开入口（正文里的同名字样不算）；
@@ -415,11 +412,11 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	if (!isTool && !isGroup && !isAssistant && !isThinking && !isMessage) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
+		// thinking 例外：标题行（标题、隐藏行数与提示同一行）整行都是展开入口。
 		const hint = collapsedHintHitbox(line);
 		const onHint = Boolean(
 			hint &&
-				packet.col >= hint.startCol &&
-				packet.col <= hint.endCol &&
+				(isThinking || (packet.col >= hint.startCol && packet.col <= hint.endCol)) &&
 				isCollapsedHintRow(component, line),
 		);
 		if (!onHint) {
@@ -433,13 +430,17 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 		for (const other of others) {
 			if (other !== component && other.expanded) {
 				// 展开 round 卡内 thinking/工具时，外层 compact 卡是它的容器，不能收起。
-				if ((isThinking || isTool) && isCompactAssistantComponent(other)) continue;
+				// 面板挂在摘要行时，anchor 与摘要行是同一张外层卡，点内部工具不能收起它。
+				// 同一回合的摘要行、anchor 和其他消息都是外层面板，收起任一个都会关掉整块。
+				if ((isThinking || isTool) && isSameExpandedRound(other, target.owner)) continue;
 				other.setExpanded(false);
 				other.invalidate?.();
 			}
 		}
 		// 展开 round 卡内工具时，让 compact 的强制折叠放行它（非 round 内工具为空操作）。
 		if (isTool) markCompactRoundToolExpanded(component);
+		// compact 摘要行自己记展开前的视口（收起时还原跟随），这里不动它。
+		if (!isAssistant) keepViewportOnExpand(tui);
 		component.setExpanded(true);
 		clearPendingCollapsePress();
 	} else {
@@ -480,6 +481,25 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	return true;
 }
 
+/** 点到的组件和外层卡是否属于同一张 compact 回合面板。 */
+function isSameExpandedRound(other: any, owner: any): boolean {
+	if (!owner || !isCompactAssistantComponent(other)) return false;
+	const anchor = owner.roundAnchor ?? owner;
+	return other === owner || other === anchor || other.roundAnchor === anchor;
+}
+
+/**
+ * 原地展开时停在当前滚动位置：transcript 跟随底部时，内容变高会把视口拖到底，
+ * 点击的行和它上方的外层面板被顶出屏幕。展开前关掉跟随，点击行留在原位。
+ */
+function keepViewportOnExpand(tui: any): void {
+	const view = tui.getPrimaryScrollView?.();
+	if (typeof view?.scrollTo !== "function" || typeof view.scrollTop !== "number") return;
+	view.scrollTo(view.scrollTop, { disableFollow: true });
+	// 已脱离底部跟随：亮出回到底部按钮，新输出到来时仍有入口。
+	if (view.isFollowingEnd === false) setScrollButtonVisible(true);
+}
+
 /**
  * fullscreen 鼠标悬停：collapsed 卡 [click to show more] hint、
  * expanded 卡截断头 show-more、回到底部按钮。motion 不 consume，官方链照常。
@@ -519,7 +539,8 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			if (component instanceof ToolGroupComponent) {
 				if (overHint) target = { kind: "group", component };
 			} else if (component instanceof ThinkingPreviewBlock) {
-				if (component.expanded || overHint) target = { kind: "thinking", component };
+				// thinking 折叠标题行整行可点：整块 hover 都高亮动作词，不只高亮按钮文本。
+				if (component.expanded || Boolean(hintBox)) target = { kind: "thinking", component };
 			} else if (isToolExecutionComponent(component)) {
 				let view: ExpandedToolIoView | null = null;
 				let section: ToolIoSection | null = null;
@@ -562,11 +583,6 @@ function patchFullscreenViewportInput(tui: any): void {
 	const proto = Object.getPrototypeOf(tui);
 	const original = proto?.handleViewportInput;
 	if (typeof original !== "function") return;
-	// 官方原生 routeWheel 已完整处理嵌套 ScrollView；只调整默认步进（config.scrollStepLines）。
-	if (typeof tui.wheelScrollLines === "number") {
-		tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL] = tui.wheelScrollLines;
-		tui.wheelScrollLines = config.scrollStepLines;
-	}
 	tui[FULLSCREEN_VIEWPORT_PATCH] = true;
 	tui.handleViewportInput = function (this: any, data: string) {
 		if (toolMouseInteractionActive() && tui.mode === "fullscreen") {
@@ -615,11 +631,6 @@ function restoreFullscreenViewportInput(tui: any): void {
 	if (typeof proto?.handleViewportInput === "function") {
 		tui.handleViewportInput = proto.handleViewportInput;
 	}
-	const originalWheelScrollLines = tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL];
-	if (typeof originalWheelScrollLines === "number") {
-		tui.wheelScrollLines = originalWheelScrollLines;
-		tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL] = undefined;
-	}
 	tui[FULLSCREEN_VIEWPORT_PATCH] = false;
 }