pi-cc-extensions 0.9.4 → 0.9.5

package/README.en.md

@@ -50,7 +50,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 
   // features
   "enableSessionReference": true,          // @ session references
-  "enableSubagentAutocomplete": true,      // @ subagent completion and delegation hints
+  "enableSubagentAutocomplete": true,      // @subagent:[name] completion and delegation hints
   "enableContextCommand": true,            // /context usage check
   "enableAgentSummary": true,              // per-turn tool summary
   "enableWorkingMessage": true,            // Working... bottom token/elapsed
@@ -59,7 +59,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   // ui
   "expandedInputMaxLines": 5,              // expanded tool Input lines; overflow shows a footer hint
   "expandedOutputMaxLines": 10,            // expanded tool Output lines; overflow shows a footer hint
-  "expandedPreviewMaxLines": 40,           // max lines for expanded diff/TaskList bodies
+  "expandedPreviewMaxLines": 40,           // max lines for expanded TaskList bodies (expanded diffs always show all)
   "inputClip": 100,                        // tool summary path/command clip length
   "showStartupHeader": true,               // startup header (logo + tips) toggle
   "scrollStepLines": 3,                    // fullscreen wheel scroll step
@@ -89,7 +89,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```
 
 > [!TIP]
-> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. When expanded Input/Output exceeds the line cap, the footer `… +N more lines • click to show more` opens a full preview. Double-click an expanded panel to collapse it.
+> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines • click to show more` opens a full preview. Double-click an expanded panel to collapse it.
 
 > [!NOTE]
 > **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.

package/README.md

@@ -50,7 +50,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // features
   "enableSessionReference": true,          // @ session 引用
-  "enableSubagentAutocomplete": true,      // @ subagent 补全与委派提示
+  "enableSubagentAutocomplete": true,      // @subagent:[name] 补全与委派提示
   "enableContextCommand": true,            // /context 上下文检查
   "enableAgentSummary": true,              // 每回合工具摘要
   "enableWorkingMessage": true,            // Working... 底部 token/耗时
@@ -59,7 +59,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   // ui
   "expandedInputMaxLines": 5,              // 展开工具卡 Input 可见行数，超出在末行显示展开提示
   "expandedOutputMaxLines": 10,            // 展开工具卡 Output 可见行数，超出在末行显示展开提示
-  "expandedPreviewMaxLines": 40,           // 展开 diff/TaskList 正文最大行数
+  "expandedPreviewMaxLines": 40,           // 展开 TaskList 正文最大行数（展开 diff 始终全量）
   "inputClip": 100,                        // 工具摘要 path/command 折叠字符数
   "showStartupHeader": true,               // 启动头（logo + tips）开关
   "scrollStepLines": 3,                    // fullscreen 滚轮步进
@@ -89,7 +89,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 ```
 
 > [!TIP]
-> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；展开后 Input/Output 超行时，末行 `… +N more lines • click to show more` 打开全量预览，双击展开面板收起。
+> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines • click to show more` 打开全量预览，双击展开面板收起。
 
 > [!NOTE]
 > **Mermaid 渲染**：建议把 `markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。

package/extensions/config/config.ts

@@ -37,9 +37,8 @@ export const DEFAULT_TOOL_DISPLAY_CONFIG: ToolDisplayConfig = {
 	writeDiffCollapsedLines: 0,
 	diffWordWrap: true,
 	/**
-	 * Expanded tool/diff body cap. 40 ≈ one screen of content after title,
-	 * Input section, editor, and status — keeps the TUI compact.
-	 * Raise via /ccstyle → Diff → Expanded max lines when reviewing large dumps.
+	 * Expanded TaskList body cap. Tool Input/Output and diffs use their own settings;
+	 * an expanded diff always renders every line.
 	 */
 	expandedPreviewMaxLines: 40,
 };

package/extensions/config/panel.ts

@@ -485,8 +485,7 @@ export async function showCcstylePanel(
 		const expandedMaxSetting = {
 			id: "expandedPreviewMaxLines",
 			label: "Expanded max lines",
-			description:
-				"Max diff/TaskList body lines when expanded. Tool Input/Output use the two settings above.",
+			description: "Max TaskList body lines when expanded. Expanded diffs show every line.",
 			currentValue: String(config.expandedPreviewMaxLines),
 			values: [...EXPANDED_PREVIEW_MAX_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
@@ -556,7 +555,7 @@ export async function showCcstylePanel(
 		const subagentAutocompleteToggle = featureToggleSetting(
 			"enableSubagentAutocomplete",
 			"Subagent autocomplete",
-			"@ subagent mentions suggest agents and inject delegation instructions. Next restart applies.",
+			"@subagent:[name] mentions suggest agents and inject delegation instructions. Next restart applies.",
 			"Subagent autocomplete disabled.",
 			config.enableSubagentAutocomplete,
 		);

package/extensions/feature/reference/index.ts

@@ -14,6 +14,7 @@ import {
 import {
 	SESSION_REFERENCE_CUSTOM_TYPE,
 	SESSION_REFERENCE_PREFIX,
+	assignReferenceTokens,
 	buildReferenceContentFromSections,
 	extractSessionReferenceIds,
 	formatReferenceSession,
@@ -123,7 +124,7 @@ function formatDate(date: Date): string {
 const sessionSearchTextCache = new WeakMap<SessionReference, string>();
 const sessionItemCache = new WeakMap<
 	SessionReference,
-	{ cwd: string; named?: AutocompleteItem; stable?: AutocompleteItem }
+	{ cwd: string; token: string; item: AutocompleteItem }
 >();
 
 function sessionSearchText(reference: SessionReference): string {
@@ -138,30 +139,24 @@ function sessionSearchText(reference: SessionReference): string {
 function sessionItem(
 	reference: SessionReference,
 	currentCwd: string,
-	useStableId: boolean,
+	token: string,
 ): AutocompleteItem {
-	let cached = sessionItemCache.get(reference);
-	const variant = useStableId ? "stable" : "named";
-	if (cached?.cwd === currentCwd && cached[variant]) return cached[variant];
+	const cached = sessionItemCache.get(reference);
+	if (cached?.cwd === currentCwd && cached.token === token) return cached.item;
 
 	const session = reference.info;
 	const workspace = samePath(session.cwd, currentCwd)
 		? "current workspace"
 		: session.cwd || "unknown workspace";
-	const label = reference.kind === "subagent" ? "[SubAgent]" : "[Session]";
-	// 唯一名称保持短格式；同名或无名称时使用稳定 ID，避免引用歧义。
-	const sessionName = session.name?.trim();
-	const referenceId = useStableId
-		? reference.referenceIds[0]
-		: (sessionName ?? reference.referenceIds[0]);
+	const kindLabel = reference.kind === "subagent" ? "[SubAgent]" : "[Session]";
+	// 消歧后的 token 会带上日期；回落到 ID 时下拉仍显示可读标题。
+	const title = token === (reference.referenceIds[0] ?? session.id) ? sessionTitle(session) : token;
 	const item: AutocompleteItem = {
-		value: `${SESSION_REFERENCE_PREFIX}[${referenceId}]`,
-		label: `${label} ${sessionTitle(session)}`,
+		value: `${SESSION_REFERENCE_PREFIX}[${token}]`,
+		label: `${kindLabel} ${title}`,
 		description: `${workspace} · ${session.messageCount} messages · ${formatDate(session.modified)}`,
 	};
-	if (cached?.cwd !== currentCwd) cached = { cwd: currentCwd };
-	cached[variant] = item;
-	sessionItemCache.set(reference, cached);
+	sessionItemCache.set(reference, { cwd: currentCwd, token, item });
 	return item;
 }
 
@@ -197,11 +192,7 @@ function filterSessions(
 	if (query.startsWith("session:")) return [];
 
 	const ordered = orderSessionReferences(references, currentCwd);
-	const nameCounts = new Map<string, number>();
-	for (const reference of ordered) {
-		const name = reference.info.name?.trim();
-		if (name) nameCounts.set(name, (nameCounts.get(name) ?? 0) + 1);
-	}
+	const tokens = assignReferenceTokens(ordered);
 	const trimmed = query.trim();
 	// 模糊匹配只接受有 session name 的会话；subagent 按 agent name 匹配。
 	const searchable = ordered.filter(
@@ -211,10 +202,11 @@ function filterSessions(
 	const matches = trimmed
 		? fuzzyFilter(searchable, trimmed, sessionSearchText)
 		: ordered.slice(0, MAX_SESSION_SUGGESTIONS);
-	return matches.slice(0, MAX_SESSION_SUGGESTIONS).map((reference) => {
-		const name = reference.info.name?.trim();
-		return sessionItem(reference, currentCwd, Boolean(name && (nameCounts.get(name) ?? 0) > 1));
-	});
+	return matches
+		.slice(0, MAX_SESSION_SUGGESTIONS)
+		.map((reference) =>
+			sessionItem(reference, currentCwd, tokens.get(reference) ?? reference.info.id),
+		);
 }
 
 function isPathLikeQuery(query: string): boolean {
@@ -452,22 +444,17 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 				),
 			));
 		const referencesById = new Map<string, SessionReference>();
-		const referencesByName = new Map<string, SessionReference>();
-		const ambiguousNames = new Set<string>();
+		const referencesByToken = new Map<string, SessionReference>();
 		for (const reference of references) {
 			for (const id of reference.referenceIds) referencesById.set(id, reference);
-			const name = reference.info.name?.trim();
-			if (!name || ambiguousNames.has(name)) continue;
-			if (referencesByName.has(name)) {
-				referencesByName.delete(name);
-				ambiguousNames.add(name);
-			} else {
-				referencesByName.set(name, reference);
-			}
+		}
+		// 同位重名的会话用带日期的 token 区分，解析端与补全端用同一套分配。
+		for (const [reference, token] of assignReferenceTokens(references)) {
+			referencesByToken.set(token, reference);
 		}
 		const seenReferences = new Set<SessionReference>();
 		const matchingReferences = referenceIds
-			.map((id) => referencesById.get(id) ?? referencesByName.get(id))
+			.map((id) => referencesById.get(id) ?? referencesByToken.get(id))
 			.filter((reference): reference is SessionReference => {
 				if (!reference || reference.info.id === currentSessionId || seenReferences.has(reference))
 					return false;

package/extensions/feature/reference/session.ts

@@ -1,3 +1,6 @@
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import { stripTerminalSequences } from "../../utils/ansi-text.ts";
+
 export const SESSION_REFERENCE_CUSTOM_TYPE = "session-reference";
 export const SESSION_REFERENCE_PREFIX = "@session:";
 
@@ -45,13 +48,104 @@ export function extractSessionReferenceIds(text: string): string[] {
 	return ids;
 }
 
+const EMPTY_SESSION_TITLE = "(no messages)";
+
 export function sessionTitle(info: ReferenceSessionInfo, maxLength = 80): string {
-	const source = info.name?.trim() || info.firstMessage || "(no messages)";
+	const source = info.name?.trim() || info.firstMessage || EMPTY_SESSION_TITLE;
 	const normalized = source.replace(CONTROL_CHARACTERS, " ").replace(/\s+/g, " ").trim();
 	if (normalized.length <= maxLength) return normalized;
 	return `${normalized.slice(0, Math.max(1, maxLength - 1)).trimEnd()}…`;
 }
 
+/**
+ * 编辑器里的 `@session:[…]` 是行内文本，token 按显示宽度收口，
+ * 不让首条消息整段挤进输入行。同名会话靠后缀消歧，不受它影响。
+ */
+export const REFERENCE_TOKEN_MAX_WIDTH = 32;
+
+/** Editor `@session:[…]` text: the readable title, never a placeholder or brackets. */
+export function sessionReferenceLabel(
+	info: ReferenceSessionInfo,
+	maxWidth = REFERENCE_TOKEN_MAX_WIDTH,
+): string {
+	const title = sessionTitle(info).replace(/[[\]]/g, "").trim();
+	if (!title || title === EMPTY_SESSION_TITLE) return "";
+	// truncateToWidth 会在省略号前后补 ANSI reset，token 是明文，去掉。
+	return stripTerminalSequences(truncateToWidth(title, maxWidth, "…")).trim();
+}
+
+export interface ReferenceTokenSource {
+	referenceIds: string[];
+	info: ReferenceSessionInfo;
+}
+
+/** UTC keeps the disambiguator identical across timezones (same-day drift is harmless). */
+function referenceTokenDate(date: Date): string {
+	const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+	const day = String(date.getUTCDate()).padStart(2, "0");
+	return `${month}-${day}`;
+}
+
+function referenceTokenTime(date: Date): string {
+	const hours = String(date.getUTCHours()).padStart(2, "0");
+	const minutes = String(date.getUTCMinutes()).padStart(2, "0");
+	return `${hours}:${minutes}`;
+}
+
+/** Title first; date then time widen the disambiguation before the ID fallback. */
+function referenceTokenCandidates(reference: ReferenceTokenSource): string[] {
+	const title = sessionReferenceLabel(reference.info);
+	const stableId = reference.referenceIds[0] ?? reference.info.id;
+	if (!title) return [stableId];
+	const date = referenceTokenDate(reference.info.modified);
+	return [
+		title,
+		`${title} ${date}`,
+		`${title} ${date} ${referenceTokenTime(reference.info.modified)}`,
+		stableId,
+	];
+}
+
+/**
+ * Assign each reference a unique editor token. Same-named sessions keep a readable
+ * title plus a date/time suffix; the stable ID is only the last resort.
+ */
+export function assignReferenceTokens<T extends ReferenceTokenSource>(
+	references: T[],
+): Map<T, string> {
+	const candidates = new Map<T, string[]>();
+	let levels = 0;
+	for (const reference of references) {
+		const options = referenceTokenCandidates(reference);
+		levels = Math.max(levels, options.length);
+		candidates.set(reference, options);
+	}
+
+	const tokens = new Map<T, string>();
+	const taken = new Set<string>();
+	for (let level = 0; level < levels && tokens.size < references.length; level++) {
+		const counts = new Map<string, number>();
+		for (const [reference, options] of candidates) {
+			const candidate = tokens.has(reference) ? undefined : options[level];
+			if (candidate) counts.set(candidate, (counts.get(candidate) ?? 0) + 1);
+		}
+		for (const [reference, options] of candidates) {
+			if (tokens.has(reference)) continue;
+			const candidate = options[level];
+			if (candidate && counts.get(candidate) === 1 && !taken.has(candidate)) {
+				tokens.set(reference, candidate);
+				taken.add(candidate);
+			}
+		}
+	}
+	for (const reference of references) {
+		if (!tokens.has(reference)) {
+			tokens.set(reference, reference.referenceIds[0] ?? reference.info.id);
+		}
+	}
+	return tokens;
+}
+
 function byteLength(text: string): number {
 	return Buffer.byteLength(text, "utf8");
 }

package/extensions/feature/reference/subagent.ts

@@ -18,9 +18,12 @@ type AgentInfo = {
 	filePath: string;
 };
 
+export const SUBAGENT_DELEGATION_CUSTOM_TYPE = "subagent-delegation";
+export const SUBAGENT_REFERENCE_PREFIX = "@subagent:";
+
 const MAX_SUGGESTIONS = 2;
-// Match `@name` but NOT `@session:` (reserved by session-reference extension).
-const AGENT_NAME_PATTERN = /(?:^|[\t ])@((?:[^\s:@][^\s:]*)?)$/;
+const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
+const SUBAGENT_REFERENCE_PATTERN = /(?:^|\s)@subagent:\[([^\]]+)](?![\w-])/g;
 
 function getAgentDir(): string {
 	const override = process.env.PI_CODING_AGENT_DIR;
@@ -60,6 +63,36 @@ function loadAgents(): AgentInfo[] {
 		});
 }
 
+function extractMentionQuery(textBeforeCursor: string): string | undefined {
+	return textBeforeCursor.match(MENTION_PATTERN)?.[1];
+}
+
+/** Filter text for agent names, or null when this provider should not claim the @ query. */
+function agentSearchQuery(raw: string): string | null {
+	if (raw.startsWith("session:")) return null;
+	if (raw === "subagent") return "";
+	const prefixed = raw.match(/^subagent:\[?([^\]]*)$/);
+	if (prefixed) return prefixed[1] ?? "";
+	return raw;
+}
+
+export function extractSubagentReferenceNames(text: string): string[] {
+	const names: string[] = [];
+	const seen = new Set<string>();
+	for (const match of text.matchAll(SUBAGENT_REFERENCE_PATTERN)) {
+		const name = match[1]?.trim();
+		if (name && !seen.has(name)) {
+			seen.add(name);
+			names.push(name);
+		}
+	}
+	return names;
+}
+
+export function subagentReferenceValue(name: string): string {
+	return `${SUBAGENT_REFERENCE_PREFIX}[${name}]`;
+}
+
 export function createAgentAutocompleteProvider(
 	current: AutocompleteProvider,
 	getAgents: () => AgentInfo[],
@@ -74,13 +107,16 @@ export function createAgentAutocompleteProvider(
 		): Promise<AutocompleteSuggestions | null> {
 			const currentLine = lines[cursorLine] ?? "";
 			const textBeforeCursor = currentLine.slice(0, cursorCol);
-			const match = textBeforeCursor.match(AGENT_NAME_PATTERN);
+			const rawQuery = extractMentionQuery(textBeforeCursor);
+			if (rawQuery === undefined) {
+				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+			}
 
-			if (!match) {
+			const search = agentSearchQuery(rawQuery);
+			if (search === null) {
 				return current.getSuggestions(lines, cursorLine, cursorCol, options);
 			}
 
-			const query = match[1]!;
 			const agents = getAgents();
 
 			if (options.signal.aborted || agents.length === 0) {
@@ -89,17 +125,20 @@ export function createAgentAutocompleteProvider(
 
 			const [baseSuggestions, matches] = await Promise.all([
 				current.getSuggestions(lines, cursorLine, cursorCol, options),
-				Promise.resolve(query.trim() ? fuzzyFilter(agents, query, (a) => a.name) : agents),
+				Promise.resolve(search.trim() ? fuzzyFilter(agents, search, (a) => a.name) : agents),
 			]);
 			if (options.signal.aborted) return null;
 
 			const agentItems: AutocompleteItem[] = matches.slice(0, MAX_SUGGESTIONS).map((agent) => ({
-				value: `@${agent.name}`,
+				value: subagentReferenceValue(agent.name),
 				label: `[SubAgent] ${agent.displayName}`,
 				description: `${agent.model ?? "?"} · ${agent.thinking ?? "?"}`,
 			}));
-			const hasCompatibleBaseSuggestions = baseSuggestions?.prefix === `@${query}`;
-			const agentValues = new Set(agents.map((agent) => `@${agent.name}`));
+			const prefix = `@${rawQuery}`;
+			const hasCompatibleBaseSuggestions = baseSuggestions?.prefix === prefix;
+			const agentValues = new Set(
+				agents.flatMap((agent) => [`@${agent.name}`, subagentReferenceValue(agent.name)]),
+			);
 			const baseItems = hasCompatibleBaseSuggestions
 				? baseSuggestions.items.filter((item) => !agentValues.has(item.value))
 				: [];
@@ -112,7 +151,7 @@ export function createAgentAutocompleteProvider(
 			});
 
 			if (items.length === 0 && !hasCompatibleBaseSuggestions) return baseSuggestions;
-			return { items, prefix: `@${query}` };
+			return { items, prefix };
 		},
 
 		applyCompletion(
@@ -166,16 +205,13 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 		sessionGeneration++;
 	});
 
-	// Inject instruction when user types @agent-name (not @session:) in prompt.
-	// Supports multiple different subagents in a single prompt.
-	const AGENT_PROMPT_PATTERN = /(?:^|[\s])@([^\s:@][^\s:]*)/g;
+	// Inject as a request message, not systemPrompt, so the cached prefix stays stable.
 	pi.on("before_agent_start", async (event, _ctx) => {
 		const agents = getAgents();
 		if (agents.length === 0) return;
 
 		const mentions: string[] = [];
-		for (const m of event.prompt.matchAll(AGENT_PROMPT_PATTERN)) {
-			const name = m[1]!;
+		for (const name of extractSubagentReferenceNames(event.prompt)) {
 			if (agents.some((a) => a.name === name) && !mentions.includes(name)) {
 				mentions.push(name);
 			}
@@ -186,12 +222,15 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 		const agentList = mentions.map((n) => `"${n}" (${agentMap.get(n)!.displayName})`).join(", ");
 
 		return {
-			systemPrompt:
-				event.systemPrompt +
-				`\n\nThe user's prompt references these subagent types: ${agentList}. ` +
-				`You MUST use the Agent tool for EACH mentioned subagent to delegate the relevant parts of the request. ` +
-				`Handle different subagents separately — do NOT merge their tasks into a single Agent call. ` +
-				`For example, if the user mentions @coder and @explore, make two separate Agent tool calls, one with subagent_type="coder" and another with subagent_type="explore".`,
+			message: {
+				customType: SUBAGENT_DELEGATION_CUSTOM_TYPE,
+				content:
+					`The user's prompt references these subagent types: ${agentList}. ` +
+					`You MUST use the Agent tool for EACH mentioned subagent to delegate the relevant parts of the request. ` +
+					`Handle different subagents separately — do NOT merge their tasks into a single Agent call. ` +
+					`For example, if the user mentions @subagent:[coder] and @subagent:[explore], make two separate Agent tool calls, one with subagent_type="coder" and another with subagent_type="explore".`,
+				display: false,
+			},
 		};
 	});
 }

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,9 +212,10 @@ 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,
@@ -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() {

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,

package/extensions/renderer/mouse/interaction.ts

@@ -1,3 +1,4 @@
+import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
 import { hasActiveTextPreview, showTextPreview } from "../../feature/context.ts";
 import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { patchRegistry, TOOL_MOUSE_OWNER_KEY } from "../../utils/patch-keys.ts";
@@ -311,6 +312,31 @@ 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 行：声明存在时只有那一行是展开入口（正文里的同名字样不算）；
+ * 未声明的组件继续用文本规则。
+ */
+function isCollapsedHintRow(component: any, finalLine: string): boolean {
+	const result = component?.resultRendererComponent;
+	return typeof result?.isCollapsedHintLine === "function"
+		? result.isCollapsedHintLine(finalLine)
+		: true;
+}
+
+/**
+ * pi 0.87 给工具结果区套了 MouseRegion：整卡左键 click 都会 setExpanded。
+ * 命中该区域时官方会跳过文本选区，所以可以安全吞掉；单行摘要卡没有声明
+ * remainder 行，继续走官方整行行为。
+ */
+function blocksOfficialCardToggle(component: any, event: any): boolean {
+	if (event?.type !== "click" || event.button !== "left" || component?.expanded) return false;
+	const result = component?.resultRendererComponent;
+	if (typeof result?.isCollapsedHintLine !== "function") return false;
+	const lines = component.render?.(Math.max(1, Math.floor(Number(event.width) || 0)));
+	const line = Array.isArray(lines) ? lines[event.y] : undefined;
+	return typeof line === "string" && !result.isCollapsedHintLine(line);
+}
+
 /**
  * 官方 fullscreen 工具卡点击：collapsed hint 单击展开
  * （有且仅保持一个展开：展开前收起其他工具卡），expanded 整卡双击收起，
@@ -352,6 +378,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
 		const hint = collapsedHintHitbox(line);
 		if (!hint || packet.col < hint.startCol || packet.col > hint.endCol) return false;
+		if (!isCollapsedHintRow(component, line)) return false;
 		// single-expand：展开前收起其他已展开工具卡/group。
 		const others: any[] = [];
 		collectFullscreenToolCards(hit.box.component, others);
@@ -574,7 +601,11 @@ function buildInteractionFrame(
 			const line = placement.finalLine;
 			if (!component.expanded) {
 				const box = collapsedHintHitbox(line);
-				if (box && COLLAPSED_TOOL_SUMMARY.test(stripTerminalSequences(line))) {
+				if (
+					box &&
+					COLLAPSED_TOOL_SUMMARY.test(stripTerminalSequences(line)) &&
+					isCollapsedHintRow(component, line)
+				) {
 					regions.push({ kind: "collapsed-hint", row: finalRow, ...box, component });
 				}
 				continue;
@@ -867,6 +898,7 @@ export function teardownToolMouseInteraction(
 	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
+	releaseToolCardMouseGuard();
 	clearExpandPanelDoubleClick();
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
@@ -901,6 +933,43 @@ export function resetToolHoverState(): void {
 	releaseFullscreenToolMouseMotion(getToolMouseTui());
 }
 
+/**
+ * pi 0.87 起工具卡结果区自带 MouseRegion，整卡左键 click 都会 setExpanded。
+ * ccstyle 的多行折叠卡（rich diff）只允许声明的 remainder 行展开，
+ * 其余位置直接吞掉 click，避免官方把 diff 正文当展开入口。
+ * 0.84 及更早没有 handleMouse，安装时跳过。
+ */
+const TOOL_CARD_MOUSE_GUARD_KEY = Symbol.for("pi.ccstyle.tool-card-mouse-guard");
+
+type ToolCardMouseGuard = {
+	prototype: any;
+	original: (event: any) => any;
+	wrapper: (event: any) => any;
+};
+
+function installToolCardMouseGuard(): void {
+	const prototype = (ToolExecutionComponent as any)?.prototype;
+	if (typeof prototype?.handleMouse !== "function") return;
+	const previous = (globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] as ToolCardMouseGuard | undefined;
+	if (previous && previous.prototype === prototype && prototype.handleMouse === previous.wrapper)
+		return;
+	// 每次取当前值作为下游，可能是别的扩展的包装。
+	const original = prototype.handleMouse;
+	const wrapper = function (this: any, event: any) {
+		if (blocksOfficialCardToggle(this, event)) return { handled: true };
+		return original.call(this, event);
+	};
+	prototype.handleMouse = wrapper;
+	(globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] = { prototype, original, wrapper };
+}
+
+function releaseToolCardMouseGuard(): void {
+	const guard = (globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] as ToolCardMouseGuard | undefined;
+	if (!guard) return;
+	if (guard.prototype?.handleMouse === guard.wrapper) guard.prototype.handleMouse = guard.original;
+	(globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] = undefined;
+}
+
 export function installToolMouseInteraction(
 	ctx: any,
 	owner: object = DEFAULT_TOOL_MOUSE_OWNER,
@@ -912,6 +981,7 @@ export function installToolMouseInteraction(
 
 	toolMouseInstallationOwner = owner;
 	patchRegistry.install(TOOL_MOUSE_OWNER_KEY, owner);
+	installToolCardMouseGuard();
 	setHoveredToolCallId(null);
 	toolMouseUi = ctx.ui;
 	// 0.84+ 的 tui 是惰性 Proxy：regular 保留原生 scrollback；fullscreen

package/extensions/renderer/tool/diff/diff-component.ts

@@ -3,8 +3,9 @@ import {
 	type DiffIndicatorMode,
 	type ToolDisplayConfig,
 } from "../../../config/config.ts";
-import type { DiffPresentationMode } from "./diff-presentation.ts";
+import { stripTerminalSequencesPreservingLayout } from "../../../utils/ansi-text.ts";
 import { RICH_DIFF_COMPONENT } from "../../../utils/patch-keys.ts";
+import type { DiffPresentationMode } from "./diff-presentation.ts";
 export { RICH_DIFF_COMPONENT };
 
 /** Snapshot or live getter — panel changes must apply on the next paint. */
@@ -33,6 +34,15 @@ export function resolveLiveDisplayConfig(input: DisplayConfigInput): ToolDisplay
 	return typeof input === "function" ? input() : input;
 }
 
+/**
+ * 比对用归一化：ANSI、缩进前缀和右侧填充不影响判断。
+ * 折叠态 remainder 行里有任意正文，入口必须先由组件声明再比对文本。
+ */
+export function normalizeCollapsedHintLine(line: string | undefined): string | undefined {
+	if (line === undefined) return undefined;
+	return stripTerminalSequencesPreservingLayout(line).replace(/\s+/g, " ").trim();
+}
+
 /** Cache key fragment so indicator/wrap/limits invalidate without host recreate. */
 export function displayConfigCacheKey(config: ToolDisplayConfig): string {
 	return [
@@ -42,7 +52,6 @@ export function displayConfigCacheKey(config: ToolDisplayConfig): string {
 		String(config.editDiffCollapsedLines),
 		String(config.writeDiffCollapsedLines),
 		config.diffWordWrap ? "1" : "0",
-		String(config.expandedPreviewMaxLines),
 	].join(":");
 }
 
@@ -59,6 +68,8 @@ export function createDiffRenderCache() {
 	let cachedConfigKey: string | undefined;
 	let cachedHovered: boolean | undefined;
 	let cachedLines: string[] | undefined;
+	/** 与 cachedLines 同一次渲染的折叠态 remainder 行文本。 */
+	let cachedHintLine: string | undefined;
 
 	return {
 		get(
@@ -80,6 +91,9 @@ export function createDiffRenderCache() {
 			}
 			return undefined;
 		},
+		getHintLine(): string | undefined {
+			return cachedHintLine;
+		},
 		set(
 			width: number,
 			expanded: boolean,
@@ -87,6 +101,7 @@ export function createDiffRenderCache() {
 			configKey: string,
 			hovered: boolean,
 			lines: string[],
+			hintLine?: string,
 		): string[] {
 			cachedWidth = width;
 			cachedExpanded = expanded;
@@ -94,6 +109,7 @@ export function createDiffRenderCache() {
 			cachedConfigKey = configKey;
 			cachedHovered = hovered;
 			cachedLines = lines;
+			cachedHintLine = hintLine;
 			return lines;
 		},
 		invalidate(): void {
@@ -103,6 +119,7 @@ export function createDiffRenderCache() {
 			cachedConfigKey = undefined;
 			cachedHovered = undefined;
 			cachedLines = undefined;
+			cachedHintLine = undefined;
 		},
 	};
 }

package/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -32,6 +32,7 @@ import {
 	displayConfigCacheKey,
 	resolveDiffIndicatorMode,
 	resolveLiveDisplayConfig,
+	normalizeCollapsedHintLine,
 	type DiffRenderOptions,
 	type DisplayConfigInput,
 } from "./diff-component.ts";
@@ -127,6 +128,11 @@ export function renderEditDiffResult(
 
 	return {
 		[RICH_DIFF_COMPONENT]: true,
+		/** 鼠标层只在真正的 remainder 行上提供展开入口。 */
+		isCollapsedHintLine(plainLine: string): boolean {
+			const hint = cache.getHintLine();
+			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
+		},
 		render(width: number): string[] {
 			// Live config: panel can change indicator/wrap/limits after this component is created.
 			const live = resolveLiveDisplayConfig(config);
@@ -161,11 +167,7 @@ export function renderEditDiffResult(
 			}
 
 			const headerRows = renderHeaderRows(parsed.stats, mode, safeWidth, theme);
-			const displayLimit = resolveDiffDisplayLimit(
-				options.expanded,
-				live.editDiffCollapsedLines,
-				live.expandedPreviewMaxLines,
-			);
+			const displayLimit = resolveDiffDisplayLimit(options.expanded, live.editDiffCollapsedLines);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
 			// Only highlight/render a prefix that can fill the display limit; full-diff
 			// LCS + syntax highlight on thousands of hidden lines is pure waste when collapsed.
@@ -198,7 +200,6 @@ export function renderEditDiffResult(
 				safeWidth,
 				options.expanded,
 				live.editDiffCollapsedLines,
-				live.expandedPreviewMaxLines,
 				parsed.stats.hunks,
 				theme,
 				unprocessedLogicalRows,
@@ -207,11 +208,19 @@ export function renderEditDiffResult(
 			const frame = renderDiffFrameLine(safeWidth, theme);
 			const renderedLines =
 				mode === "unified"
-					? [...headerRows.map((row) => row.text), frame, ...bodyWithLimit, frame]
-					: [...headerRows.map((row) => row.text), ...bodyWithLimit];
+					? [...headerRows.map((row) => row.text), frame, ...bodyWithLimit.lines, frame]
+					: [...headerRows.map((row) => row.text), ...bodyWithLimit.lines];
 
 			const clampedLines = clampDiffLinesToWidth(renderedLines, safeWidth);
-			return cache.set(safeWidth, options.expanded, mode, configKey, hovered, clampedLines);
+			return cache.set(
+				safeWidth,
+				options.expanded,
+				mode,
+				configKey,
+				hovered,
+				clampedLines,
+				normalizeCollapsedHintLine(bodyWithLimit.hintLine),
+			);
 		},
 		invalidate: cache.invalidate,
 	} as Component;

package/extensions/renderer/tool/diff/diff-limits.ts

@@ -31,18 +31,16 @@ function renderDiffSpacerLine(width: number): string {
 	return safeWidth > 0 ? " ".repeat(safeWidth) : "";
 }
 
-export function resolveDiffDisplayLimit(
-	expanded: boolean,
-	maxCollapsedLines: number,
-	maxExpandedLines: number,
-): number {
-	const expandedLimit = Number.isFinite(maxExpandedLines)
-		? maxExpandedLines
-		: DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines;
+/**
+ * Body lines to render before the remainder hint. Expanded diffs are never capped:
+ * clicking `click to show more` expands the card to the whole diff.
+ */
+export function resolveDiffDisplayLimit(expanded: boolean, maxCollapsedLines: number): number {
+	if (expanded) return Number.POSITIVE_INFINITY;
 	const collapsedLimit = Number.isFinite(maxCollapsedLines)
 		? maxCollapsedLines
 		: DEFAULT_TOOL_DISPLAY_CONFIG.editDiffCollapsedLines;
-	return expanded ? Math.max(0, expandedLimit) : Math.max(1, collapsedLimit);
+	return Math.max(1, collapsedLimit);
 }
 
 export function resolveWriteCollapsedLimit(
@@ -99,7 +97,6 @@ export function applyLineLimit(
 	width: number,
 	expanded: boolean,
 	maxCollapsedLines: number,
-	maxExpandedLines: number,
 	totalHunks: number,
 	theme: DiffTheme,
 	/**
@@ -108,17 +105,17 @@ export function applyLineLimit(
 	 */
 	unprocessedLogicalRows = 0,
 	hovered = false,
-): string[] {
-	const limit = resolveDiffDisplayLimit(expanded, maxCollapsedLines, maxExpandedLines);
+): { lines: string[]; hintLine?: string } {
+	const limit = resolveDiffDisplayLimit(expanded, maxCollapsedLines);
 	const safeUnprocessed = Math.max(0, unprocessedLogicalRows);
 	if (limit === 0 || (rows.length <= limit && safeUnprocessed === 0)) {
-		return rows.map((row) => clampDiffLineToWidth(row.text, width));
+		return { lines: rows.map((row) => clampDiffLineToWidth(row.text, width)) };
 	}
 
 	const shown = rows.length <= limit ? rows : rows.slice(0, limit);
 	const remaining = Math.max(0, rows.length - shown.length) + safeUnprocessed;
 	if (remaining === 0) {
-		return shown.map((row) => clampDiffLineToWidth(row.text, width));
+		return { lines: shown.map((row) => clampDiffLineToWidth(row.text, width)) };
 	}
 	const visibleHunks = new Set(
 		shown
@@ -137,15 +134,19 @@ export function applyLineLimit(
 
 	const clickLabel = showMoreHintText();
 	const clickIndex = hintText.lastIndexOf(clickLabel);
+	// 展开态不会再截断，剩下的分支必是折叠态提示。
 	const styledHint =
-		hovered && !expanded && clickIndex >= 0
+		hovered && clickIndex >= 0
 			? theme.fg("muted", hintText.slice(0, clickIndex)) +
 				theme.fg("text", clickLabel) +
 				theme.fg("muted", hintText.slice(clickIndex + clickLabel.length))
-			: theme.fg(expanded ? "warning" : "muted", hintText);
-	return [
-		...shown.map((row) => clampDiffLineToWidth(row.text, width)),
-		renderDiffSpacerLine(width),
-		clampDiffLineToWidth(styledHint, width),
-	];
+			: theme.fg("muted", hintText);
+	return {
+		lines: [
+			...shown.map((row) => clampDiffLineToWidth(row.text, width)),
+			renderDiffSpacerLine(width),
+			clampDiffLineToWidth(styledHint, width),
+		],
+		hintLine: hintText,
+	};
 }

package/extensions/renderer/tool/diff/diff-write-render.ts

@@ -46,6 +46,7 @@ import {
 	displayConfigCacheKey,
 	resolveDiffIndicatorMode,
 	resolveLiveDisplayConfig,
+	normalizeCollapsedHintLine,
 	type DiffRenderOptions,
 	type DisplayConfigInput,
 } from "./diff-component.ts";
@@ -407,6 +408,11 @@ export function renderWriteDiffResult(
 
 	return {
 		[RICH_DIFF_COMPONENT]: true,
+		/** 鼠标层只在真正的 remainder 行上提供展开入口。 */
+		isCollapsedHintLine(plainLine: string): boolean {
+			const hint = cache.getHintLine();
+			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
+		},
 		render(width: number): string[] {
 			// Live config: panel can change indicator/wrap/limits after this component is created.
 			const live = resolveLiveDisplayConfig(config);
@@ -433,22 +439,21 @@ export function renderWriteDiffResult(
 			const writeCollapsedLimit = resolveWriteCollapsedLimit(live);
 			const statsOnlyCollapsed = !options.expanded && writeCollapsedLimit === 0;
 			if (statsOnlyCollapsed) {
+				const hintLines = renderWriteCollapsedHintLine(
+					options.fileExistedBeforeWrite === true,
+					safeWidth,
+					theme,
+					hovered,
+					options.headerLabel,
+				);
 				return cache.set(
 					safeWidth,
 					options.expanded,
 					mode,
 					configKey,
 					hovered,
-					clampDiffLinesToWidth(
-						renderWriteCollapsedHintLine(
-							options.fileExistedBeforeWrite === true,
-							safeWidth,
-							theme,
-							hovered,
-							options.headerLabel,
-						),
-						safeWidth,
-					),
+					clampDiffLinesToWidth(hintLines, safeWidth),
+					normalizeCollapsedHintLine(hintLines[0]),
 				);
 			}
 
@@ -500,11 +505,7 @@ export function renderWriteDiffResult(
 			}
 
 			const data = getDetailedData();
-			const displayLimit = resolveDiffDisplayLimit(
-				options.expanded,
-				writeCollapsedLimit,
-				live.expandedPreviewMaxLines,
-			);
+			const displayLimit = resolveDiffDisplayLimit(options.expanded, writeCollapsedLimit);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
 			const entryBudget = takeEntriesForLineBudget(data.entries, processBudget);
 			const splitBudget = takeSplitRowsForBudget(data.splitRows, processBudget);
@@ -541,7 +542,6 @@ export function renderWriteDiffResult(
 				safeWidth,
 				options.expanded,
 				writeCollapsedLimit,
-				live.expandedPreviewMaxLines,
 				data.hunkCount,
 				theme,
 				unprocessedLogicalRows,
@@ -549,9 +549,19 @@ export function renderWriteDiffResult(
 			);
 			const frame = renderDiffFrameLine(safeWidth, theme);
 			const renderedLines =
-				mode === "unified" ? [header, frame, ...bodyWithLimit, frame] : [header, ...bodyWithLimit];
+				mode === "unified"
+					? [header, frame, ...bodyWithLimit.lines, frame]
+					: [header, ...bodyWithLimit.lines];
 			const finalLines = clampDiffLinesToWidth(renderedLines, safeWidth);
-			return cache.set(safeWidth, options.expanded, mode, configKey, hovered, finalLines);
+			return cache.set(
+				safeWidth,
+				options.expanded,
+				mode,
+				configKey,
+				hovered,
+				finalLines,
+				normalizeCollapsedHintLine(bodyWithLimit.hintLine),
+			);
 		},
 		invalidate: cache.invalidate,
 	} as Component;

package/extensions/renderer/tool/grouping.ts

@@ -8,12 +8,14 @@ import {
 } from "@earendil-works/pi-tui";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { getToolMouseTui } from "../mouse/scroll.ts";
+import { mcpToolTitle } from "./mcp-title.ts";
 import { isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
 import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 import {
 	fitToolCallSummary,
 	humanizeToolLabel,
+	renderToolSummary,
 	toolCallSummary,
 	type ToolCallSummary,
 } from "./names.ts";
@@ -44,6 +46,19 @@ function toolName(tool: any): string {
 	return String(tool?.toolName ?? tool?.toolDefinition?.name ?? "tool");
 }
 
+/**
+ * 标题：MCP 工具用 adapter 暴露的真实工具名，其余回退工具名人性化。
+ */
+function toolTitle(tool: any): string {
+	const name = toolName(tool);
+	return (
+		mcpToolTitle({
+			toolName: name,
+			definition: tool?.toolDefinition ?? tool?.builtInToolDefinition,
+		}) ?? humanizeToolLabel(name)
+	);
+}
+
 function isGroupable(value: unknown): boolean {
 	return value instanceof ToolExecutionComponent && !NON_GROUPABLE.has(toolName(value));
 }
@@ -170,6 +185,7 @@ export function paddedBackgroundRow(
 
 function toolSummary(tool: any): ToolCallSummary {
 	return toolCallSummary(toolName(tool), tool?.args ?? {}, {
+		title: toolTitle(tool),
 		variant: "grouping",
 		cwd: tool?.cwd,
 	});
@@ -347,8 +363,7 @@ export class ToolGroupComponent extends Container {
 			})
 			.join(` ${fg("dim", "•")} `);
 		const names = new Set(this.children.map(toolName));
-		const label =
-			names.size === 1 ? humanizeToolLabel(toolName(this.children[0])) : "Multiple Tools";
+		const label = names.size === 1 ? toolTitle(this.children[0]) : "Multiple Tools";
 		const overall: ToolStatus = counts.error ? "error" : counts.pending ? "pending" : "success";
 		if (
 			(this.children as any[]).some((tool) => tool?.executionStarted && status(tool) === "pending")
@@ -398,7 +413,7 @@ export class ToolGroupComponent extends Container {
 				const mainWidth = Math.max(0, width - visibleWidth(prefix) - visibleWidth(detail));
 				lines.push(
 					truncateToWidth(
-						`${prefix}${fg("toolTitle", fitToolCallSummary(summary, mainWidth))}${detail}`,
+						`${prefix}${renderToolSummary(summary, mainWidth, fg)}${detail}`,
 						width,
 						"",
 					),

package/extensions/renderer/tool/mcp-title.ts

@@ -0,0 +1,39 @@
+import { humanizeToolLabel } from "./names.ts";
+
+/**
+ * MCP 工具的识别与标题，单卡（default-mode）与分组行/分组头（grouping）共用。
+ *
+ * - 判定：工具名带 mcp 片段（`mcp` 网关、`mcpScript`、`mcp__<server>`），或 adapter 注册时
+ *   给的 label 以 `MCP:` 开头。默认/none/short 前缀模式下直连工具的名字里没有 mcp 片段
+ *   （`github_search_code`、`search_code`），只能靠 label 判定。
+ * - 标题：具体工具用 adapter 暴露的真实工具名，不做二次格式化；只有 `mcp` / `mcpScript`
+ *   这两个入口没有具体工具名，跟普通工具一样人性化（MCP / MCP Script）。
+ * - 参数摘要与其它工具共用 toolCallSummary 的字段链，网关额外把 `args.tool` 提到标题后。
+ */
+
+/** 单次 MCP 调用的识别信息。 */
+export type McpToolCall = {
+	toolName: string;
+	/** 工具定义；默认/none/short 前缀模式要靠 label 判定，会话重放时可能缺失。 */
+	definition?: any;
+};
+
+const GATEWAY_TOOL_NAME = "mcp";
+const SCRIPT_TOOL_NAME = "mcpScript";
+
+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 === GATEWAY_TOOL_NAME || toolName === SCRIPT_TOOL_NAME) return true;
+	return /^mcp[_:-]|[_:-]mcp[_:-]/i.test(toolName);
+}
+
+/** 标题：MCP 工具返回标题（入口走人性化，其余用真实工具名）；非 MCP 返回 undefined。 */
+export function mcpToolTitle(call: McpToolCall): string | undefined {
+	const { toolName } = call;
+	if (!isMcpToolDefinition(call.definition, toolName)) return undefined;
+	if (toolName === GATEWAY_TOOL_NAME || toolName === SCRIPT_TOOL_NAME) {
+		return humanizeToolLabel(toolName);
+	}
+	return toolName;
+}

package/extensions/renderer/tool/names.ts

@@ -1,15 +1,23 @@
 import { posix, win32 } from "node:path";
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 import { visibleWidth } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
 import { oneLine } from "../../utils/format.ts";
+import { headTruncateToWidth } from "./result.ts";
 
 function clip(value: unknown): string {
 	return oneLine(value, config.inputClip);
 }
 
+/** 载荷（入参 JSON / 脚本代码）至少留出这么多宽度才显示，否则整段省略（避免只剩一个孤零零的 " {…"）。 */
+const MIN_PAYLOAD_WIDTH = 10;
+
 /** 品牌大小写固定写法；humanize 推导不出来的工具名写在这里。 */
 const TOOL_LABEL_OVERRIDES: Readonly<Record<string, string>> = {
 	powershell: "PowerShell",
+	// MCP 入口两个没有具体工具名，跟普通工具一样人性化；缩写固定大写
+	mcp: "MCP",
+	mcpscript: "MCP Script",
 };
 
 /**
@@ -49,6 +57,8 @@ export type ToolCallSummary = {
 	detail: string;
 	/** 路径摘要保留结构，供最终渲染按实际宽度优先保留文件名。 */
 	path?: { prefix: string; value: string };
+	/** 标题之外的原始载荷（完整入参 JSON、脚本代码…），已压成单行，渲染时用 dim 接在标题后。 */
+	payload?: string;
 };
 
 function pathApi(value: string) {
@@ -229,6 +239,18 @@ export function toolCallSummary(
 	const variant = opts.variant ?? "default";
 	if (!args || typeof args !== "object") return { main: title, detail: "" };
 	const name = toolName.toLowerCase();
+
+	// MCP 入口沿用 mcp-adapter 自己的标题风格（adapter 的 formatMcpProxyToolCallLines）：
+	// `MCP <动作> <目标>` / `MCP Script <代码>`，比把整包参数摊成 JSON 好读
+	if (name === "mcp") {
+		const gateway = mcpGatewaySummary(title, args);
+		if (gateway) return gateway;
+	}
+	if (name === "mcpscript") {
+		const code = typeof args.code === "string" && args.code ? clip(args.code) : "";
+		return code ? { main: title, detail: "", payload: code } : { main: title, detail: "" };
+	}
+
 	const value = (fallback: string, ...keys: string[]) => {
 		const found = keys.map((key) => args[key]).find((item) => typeof item === "string" && item);
 		return `${title} ${clip(found || fallback)}`;
@@ -315,5 +337,85 @@ export function toolCallSummary(
 	if (typeof preferredPath === "string" && preferredPath) {
 		return pathSummary(title, preferredPath, opts.cwd);
 	}
-	return { main: title, detail: "" };
+
+	// 字段链认不出的参数（命名空间代理的 tool+args、第三方工具的自定义键…）展开完整入参 JSON，
+	// 而不是只剩一个标题；网关与脚本的专属形状在上面处理
+	const payload = jsonArgs(args);
+	return payload ? { main: title, detail: "", payload } : { main: title, detail: "" };
+}
+
+/**
+ * MCP 网关注解 `mcp <动作> <目标>`：动作与目标照搬 mcp-adapter 的 formatMcpProxyToolCallLines，
+ * 人眼读起来比参数 JSON 快；`instructions` 是 adapter 自己漏掉的一档（它那里会落到 mcp status）。
+ * 认不出的入参返回 undefined，交给通用 JSON 回退，不猜成 status。
+ */
+function mcpGatewaySummary(title: string, args: any): ToolCallSummary | undefined {
+	const text = (value: unknown) => (typeof value === "string" && value ? value : "");
+	const tool = text(args.tool);
+	const connect = text(args.connect);
+	const describe = text(args.describe);
+	const instructions = text(args.instructions);
+	const search = text(args.search);
+	const server = text(args.server);
+	const action = text(args.action);
+	const scoped = (target: string) => (server ? `${target} @ ${server}` : target);
+
+	if (action === "ui-messages") return { main: `${title} ${action}`, detail: "" };
+	if (tool) {
+		const main = `${title} call ${scoped(tool)}`;
+		const payload = innerArgsPayload(args.args);
+		return payload ? { main, detail: "", payload } : { main, detail: "" };
+	}
+	if (connect) return { main: `${title} connect ${connect}`, detail: "" };
+	if (describe) return { main: `${title} describe ${scoped(describe)}`, detail: "" };
+	if (instructions) return { main: `${title} instructions ${instructions}`, detail: "" };
+	if (search) {
+		const flags = [
+			args.regex === true ? "regex" : "",
+			args.includeSchemas === false ? "schemas hidden" : "",
+		].filter(Boolean);
+		return {
+			main: `${title} search ${scoped(search)}`,
+			detail: flags.length ? ` (${flags.join(", ")})` : "",
+		};
+	}
+	if (server) return { main: `${title} list ${server}`, detail: "" };
+	if (action) return { main: `${title} ${action}`, detail: "" };
+	if (Object.keys(args).length === 0) return { main: `${title} status`, detail: "" };
+	return undefined;
+}
+
+/** 网关 call 的内层工具入参：对象转单行 JSON；网关允许传 JSON 字符串，就原样取用不再转义。 */
+function innerArgsPayload(value: unknown): string {
+	if (typeof value === "string") return value ? clip(value) : "";
+	if (!value || typeof value !== "object") return "";
+	return jsonArgs(value);
+}
+
+/** 入参序列化成单行 JSON；空对象或不可序列化时返回 ""。 */
+function jsonArgs(args: any): string {
+	try {
+		const json = JSON.stringify(args);
+		return json && json !== "{}" ? clip(json) : "";
+	} catch {
+		return "";
+	}
+}
+
+/**
+ * 标题行内容：标题用调用方的 toolTitle 色，原始载荷（入参 JSON / 脚本代码）单独用 dim。
+ * 标题优先占宽（它是身份），剩下的宽度给载荷；载荷超宽时尾部省略，连
+ * MIN_PAYLOAD_WIDTH 都放不下时整段省略。
+ */
+export function renderToolSummary(
+	summary: ToolCallSummary,
+	width: number,
+	fg: (color: ThemeColor, text: string) => string,
+): string {
+	const title = fitToolCallSummary(summary, width);
+	if (!summary.payload) return fg("toolTitle", title);
+	const room = width - visibleWidth(title);
+	return room >= MIN_PAYLOAD_WIDTH
+		? `${fg("toolTitle", title)}${fg("dim", headTruncateToWidth(` ${summary.payload}`, room))}`
+		: fg("toolTitle", title);
 }

package/extensions/renderer/tool/result.ts

@@ -14,7 +14,7 @@ export function toolViewportWidth(width: number): number {
 
 /** 与默认工具结果相同的一级缩进包装。子组件只扣始终加上的 1 列；↳ 行多出的 2 列由 truncateToWidth 吃掉。 */
 export function insetComponent(component: any): any {
-	return {
+	const wrapped: Record<string, unknown> = {
 		render: (width: number) =>
 			component.render(Math.max(1, width - 1)).map((line: string) => {
 				const nestedMarker = line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳");
@@ -22,6 +22,11 @@ export function insetComponent(component: any): any {
 			}),
 		invalidate: () => component.invalidate?.(),
 	};
+	// 内层 diff 声明的 remainder 行：鼠标层只能看到这个包装组件。
+	if (typeof component.isCollapsedHintLine === "function") {
+		wrapped.isCollapsedHintLine = (line: string) => component.isCollapsedHintLine(line);
+	}
+	return wrapped;
 }
 
 function rawTextFromResult(result: any): string {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.9.4",
+	"version": "0.9.5",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",