pi-cc-extensions 0.9.4 → 0.9.6

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 { isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
+import { mcpToolTitle } from "./mcp-title.ts";
+import { collapseHintText, 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")
@@ -357,7 +372,8 @@ export class ToolGroupComponent extends Container {
 		const overallColor = overall === "pending" ? "accent" : overall;
 		const nameList = names.size > 1 ? ` ${fg("dim", `• ${toolNameList(this.children)}`)}` : "";
 		// 圆点保持 dim；hover 只高亮可点击文字。
-		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", showMoreHintText())}`;
+		const hintText = this._expanded ? collapseHintText() : showMoreHintText();
+		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
 		const lines = [
 			"",
 			truncateToWidth(
@@ -398,7 +414,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/extensions/renderer/tool/show-more-hint.ts

@@ -36,3 +36,13 @@ export function expandShortcutText(): string {
 export function showMoreHintText(): string {
 	return isToolTuiFullscreen() ? "click to show more" : `${expandShortcutText()} to show more`;
 }
+
+/** 展开卡的收起提示，与折叠态 showMoreHintText 同一位置对称。 */
+export function collapseHintText(): string {
+	return isToolTuiFullscreen() ? "↑ Collapse" : `${expandShortcutText()} to collapse`;
+}
+
+/** 该行是否带展开态收起提示（用于展开卡的 hint hover 命中）。 */
+export function isCollapseHintLine(plainLine: string): boolean {
+	return plainLine.includes(collapseHintText());
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.9.4",
+	"version": "0.9.6",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",
@@ -38,6 +38,7 @@
 	},
 	"scripts": {
 		"test": "node --test tests/**/*.test.ts",
+		"coverage": "node --test --experimental-test-coverage --test-coverage-include=extensions/**/*.ts tests/**/*.test.ts",
 		"typecheck": "tsc --noEmit",
 		"format": "biome format --write .",
 		"format:check": "biome format .",