@herbertgao/pi-extensions 2026.10.4 → 2026.10.6

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/ccstyle-tool.ts

@@ -0,0 +1,467 @@
+/**
+ * ccstyle 工具卡本体：call/result 渲染，不碰原型补丁。
+ * default 用它接管 ToolExecutionComponent；compact 展开面板复用同一份 render。
+ */
+import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { config, getToolDisplayConfig, type CompactStyleMode } from "../../config/config.ts";
+import { isToolCallHovered } from "../mouse/hover.ts";
+import {
+	ASK_USER_QUESTION_TOOL_NAME,
+	askUserExpandedBody,
+	askUserQuestionCount,
+	createAskUserResultComponent,
+} from "./ask-user-question.ts";
+import {
+	CODEMODE_TOOL_NAME,
+	codemodeExpandedBody,
+	createCodemodeResultComponent,
+} from "./codemode.ts";
+import { countWriteDiffStats, writeStatsInCollapsedBody } from "./diff/diff-renderer.ts";
+import { renderRichToolResult, type WriteExecutionMetadataStore } from "./diff/index.ts";
+import { mcpToolTitle } from "./mcp-title.ts";
+import {
+	humanizeToolLabel,
+	renderToolSummary,
+	SHELL_TOOL_NAMES,
+	toolCallSummary,
+} from "./names.ts";
+import {
+	collapsedResultSummary,
+	formatToolDuration,
+	insetComponent,
+	renderCollapsedToolResultToWidth,
+	textFromResult,
+	toolViewportWidth,
+} from "./result.ts";
+import { hasExpandableDetail, isExpandedToolIoView, renderExpandedToolResult } from "./tool-io.ts";
+import {
+	isLiveToolCall,
+	isToolExpanded,
+	pendingIcon,
+	resolveToolVisualState,
+	scheduleAnimation,
+	settledIcon,
+	setToolVisualState,
+	toolIconColor,
+} from "./tool-state.ts";
+import { showMoreHintText } from "./names.ts";
+
+/** 成功勾：亮绿 truecolor（与 message-display 一致）。 */
+const BRIGHT_GREEN = "";
+const ANSI_FG_RESET = "";
+
+/** `(+A -D)`：plain 用于占宽，styled 用于上屏。default 写标题与 compact edit/write 标题共用。 */
+export function styleChangeCounts(
+	fg: (color: string, text: string) => string,
+	added: number,
+	removed: number,
+): { text: string; styled: string } {
+	return {
+		text: ` (+${added} -${removed})`,
+		styled: ` ${fg("dim", "(")}${fg("success", `+${added}`)} ${fg("error", `-${removed}`)}${fg("dim", ")")}`,
+	};
+}
+
+/** rich diff 的两个入口（本处与 compact 的 paintCompactEditWrite）都靠 renderRichToolResult
+ * 返回 undefined 让位，这里只判断模式与工具名，避免多一个可能与让位不一致的 gate。 */
+export function shouldRenderRichDiff(
+	mode: CompactStyleMode,
+	toolName: string,
+	isError: boolean,
+): boolean {
+	return mode === "on" && !isError && (toolName === "edit" || toolName === "write");
+}
+
+function renderDefault(tool: any, slot: "renderCall" | "renderResult", args: any[], fallback = "") {
+	try {
+		if (typeof tool?.[slot] === "function") return tool[slot](...args);
+	} catch {
+		// Fall through to raw fallback.
+	}
+	return new Text(fallback, 0, 0);
+}
+
+type ParsedTask = { id: string; status: string; subject: string };
+
+function parseTaskList(text: string): ParsedTask[] {
+	return text
+		.split("\n")
+		.map((line) => line.match(/^#(\d+) \[([^\]]+)] (.+)$/))
+		.filter((match): match is RegExpMatchArray => Boolean(match))
+		.map((match) => ({ id: match[1]!, status: match[2]!, subject: match[3]! }));
+}
+
+function taskListSummary(tasks: ParsedTask[]): string {
+	const counts = { pending: 0, in_progress: 0, completed: 0 };
+	for (const task of tasks) {
+		if (task.status in counts) counts[task.status as keyof typeof counts]++;
+	}
+	return [
+		`${tasks.length} tasks`,
+		counts.in_progress ? `${counts.in_progress} in progress` : "",
+		counts.pending ? `${counts.pending} pending` : "",
+		counts.completed ? `${counts.completed} completed` : "",
+	]
+		.filter(Boolean)
+		.join(" · ");
+}
+
+function renderExpandedTaskResult(
+	toolName: string,
+	text: string,
+	theme: any,
+	isError: boolean,
+): any | undefined {
+	if (isError) return undefined;
+	if (toolName === "TaskList") {
+		const tasks = parseTaskList(text);
+		if (!tasks.length) return undefined;
+		const limit = Math.max(1, config.expandedPreviewMaxLines);
+		const rows = tasks.slice(0, limit).map((task) => {
+			const color =
+				task.status === "completed"
+					? "success"
+					: task.status === "in_progress"
+						? "warning"
+						: "muted";
+			return `${theme.fg("accent", `#${task.id}`)} ${theme.fg(color, task.status)} ${theme.fg("dim", task.subject)}`;
+		});
+		if (tasks.length > rows.length)
+			rows.push(theme.fg("muted", `… ${tasks.length - rows.length} more tasks`));
+		// 贴左：外层展开卡片 Box(1,1) 提供 1 格 padding
+		return new Text(
+			`↳ ${theme.fg("muted", taskListSummary(tasks))}\n${rows.map((r) => `  ${r}`).join("\n")}`,
+			0,
+			0,
+		);
+	}
+	const line = text.trim();
+	if (!line || line.includes("\n")) return undefined;
+	let formatted: string | undefined;
+	let match: RegExpMatchArray | null;
+	if (
+		toolName === "TaskCreate" &&
+		(match = line.match(/^Task #(\d+) created successfully: (.+)$/))
+	) {
+		formatted = `${theme.fg("success", "Created task")} ${theme.fg("accent", `#${match[1]}`)} ${theme.fg("muted", match[2])}`;
+	} else if (toolName === "TaskUpdate" && (match = line.match(/^Updated task #(\d+) (.+)$/))) {
+		formatted = `${theme.fg("success", "Updated task")} ${theme.fg("accent", `#${match[1]}`)} ${theme.fg("muted", match[2])}`;
+	} else if (toolName === "TaskExecute") {
+		formatted = `${theme.fg("success", "Started")} ${theme.fg("muted", line)}`;
+	} else if (toolName === "TaskStop") {
+		formatted = `${theme.fg("success", "Stopped")} ${theme.fg("muted", line)}`;
+	}
+	return formatted ? new Text(`↳ ${formatted}`, 0, 0) : undefined;
+}
+
+/**
+ * shell 的耗时文本。Pi 原生 shell 渲染器会在结果底部报一行，ccstyle 的通用折叠行把它盖掉了。
+ *
+ * 两条路都要：新 Pi 在渲染上下文里给 `durationMs`（单调，restore 出来的行也带得到），优先用它；
+ * 拿不到（旧 Pi、无耗时的结果）再退回自己的时钟——开始时间在 renderCall 记，结束时间在结果定型时定一次。
+ * 运行中的实时计时也只能走时钟。
+ */
+function shellDurationText(toolName: string, context: any, isPartial: boolean): string {
+	if (!SHELL_TOOL_NAMES.has(toolName)) return "";
+	const recorded = context?.durationMs;
+	if (!isPartial && typeof recorded === "number" && Number.isFinite(recorded) && recorded >= 0) {
+		return formatToolDuration(recorded);
+	}
+	const startedAt = context?.state?.ccstyleShellStartedAt;
+	if (typeof startedAt !== "number") return "";
+	const endedAt = context?.state?.ccstyleShellEndedAt;
+	const end = typeof endedAt === "number" ? endedAt : Date.now();
+	// 时钟回拨时别吐负数；快照固定时钟也会走到这。
+	return formatToolDuration(Math.max(0, end - startedAt));
+}
+
+/** 用 ccstyle call/result 包装任意工具定义。 */
+export function createCcstyleTool(
+	originalTool: any,
+	writeExecutionMetadata: WriteExecutionMetadataStore,
+	toolName: string,
+): any {
+	const label = originalTool.label || toolName;
+	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
+	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
+	const title = mcpToolTitle({ toolName, definition: originalTool }) ?? defaultTitle;
+
+	return {
+		...originalTool,
+		renderShell: "self",
+		renderCall(args: any, theme: any, context: any) {
+			if (config.mode === "off") {
+				return renderDefault(originalTool, "renderCall", [args, theme, context], String(toolName));
+			}
+
+			// shell 的耗时从执行开始算；restore 出来的行没有 executionStarted，不参与。
+			if (
+				SHELL_TOOL_NAMES.has(toolName) &&
+				context?.executionStarted &&
+				context.state &&
+				context.state.ccstyleShellStartedAt === undefined
+			) {
+				context.state.ccstyleShellStartedAt = Date.now();
+			}
+
+			const visualState = resolveToolVisualState(context);
+			const isPending =
+				visualState === "pending" ||
+				(!visualState && (context?.isPartial || context?.executionStarted));
+			// 等待窗口（声明流式中或等待派发）也要转：Pi 要到 assistant 消息结束
+			// 才派发执行，这段只靠 executionStarted 会一直冻在第一帧。
+			const animating =
+				isPending && (Boolean(context?.executionStarted) || isLiveToolCall(context?.toolCallId));
+			if (animating) scheduleAnimation(context, { light: true });
+			const settledRawIcon = isPending ? "" : settledIcon(toolName, visualState);
+			const settledIconStyled =
+				visualState === "success"
+					? `${BRIGHT_GREEN}${settledRawIcon}${ANSI_FG_RESET}`
+					: theme.fg(toolIconColor(context), settledRawIcon);
+			// 逐帧 spinner：帧在 render() 内取，动画定时器只需 requestRender，
+			// 不再每次 tick 走 updateDisplay 把整张卡重建一遍。
+			const pendingIconStyled = () => theme.fg(toolIconColor(context), pendingIcon(toolName));
+			const summary = toolCallSummary(toolName, args, {
+				title,
+				variant: "default",
+				cwd: context?.cwd,
+			});
+			// ask_user_question：问题原文在折叠结果树里逐条列出，标题只留工具名和问题数，
+			// 否则第一个问题会在标题和树里各出现一次。
+			if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
+				// Pi 的渲染上下文不带 result，问题数从这里取。
+				const questionCount = askUserQuestionCount(context?.result, args);
+				summary.main = title;
+				summary.detail = questionCount === undefined ? "" : ` (+${questionCount})`;
+				summary.payload = undefined;
+			}
+			let writeStatsText = "";
+			let writeStatsStyled = "";
+			// 折叠 0 行预览时计数由正文那行（↳ diff +A -D · created …）显示，标题不重复。
+			const statsInBody = writeStatsInCollapsedBody(
+				Boolean(context?.expanded),
+				getToolDisplayConfig(),
+			);
+			if (toolName === "write" && visualState === "success" && !statsInBody) {
+				const meta = writeExecutionMetadata.get(context?.toolCallId);
+				const stats = countWriteDiffStats(
+					typeof args?.content === "string" ? args.content : undefined,
+					meta?.previousContent,
+					meta?.fileExistedBeforeWrite,
+				);
+				if (stats) {
+					const counts = styleChangeCounts(
+						(color, text) => theme.fg(color, text),
+						stats.added,
+						stats.removed,
+					);
+					writeStatsText = counts.text;
+					writeStatsStyled = counts.styled;
+				}
+			}
+			const extraText = writeStatsText || summary.detail;
+			const extraStyled = writeStatsStyled || theme.fg("dim", summary.detail);
+			let cachedWidth: number | undefined;
+			let cachedLine: string | undefined;
+			let cachedIcon: string | undefined;
+			const expanded = Boolean(context?.expanded);
+			return {
+				render(width: number) {
+					// 轻量 tick 只会 requestRender，靠这里续期，动画才能自维持。
+					if (animating) scheduleAnimation(context, { light: true });
+					const icon = isPending ? pendingIconStyled() : settledIconStyled;
+					if (cachedLine !== undefined && cachedWidth === width && cachedIcon === icon) {
+						return [cachedLine];
+					}
+					const viewportWidth = toolViewportWidth(width);
+					// 展开态贴左（外层 Box 已 pad 1）；折叠 self-shell 保留 1 格前导空格
+					const lead = expanded ? "" : " ";
+					const callWidth = Math.max(
+						0,
+						viewportWidth - visibleWidth(icon) - 1 - (expanded ? 0 : 1),
+					);
+					const mainWidth = Math.max(0, callWidth - visibleWidth(extraText));
+					cachedWidth = width;
+					cachedIcon = icon;
+					// 路径按最终可用宽度中间截断，避免整行二次截断隐藏文件名。
+					cachedLine = `${lead}${icon} ${renderToolSummary(summary, mainWidth, theme.fg.bind(theme))}${extraStyled}`;
+					return [truncateToWidth(cachedLine, viewportWidth, "")];
+				},
+				invalidate() {
+					cachedLine = undefined;
+					cachedIcon = undefined;
+				},
+			};
+		},
+		renderResult(result: any, options: any, theme: any, context: any) {
+			if (config.mode === "off") {
+				return renderDefault(
+					originalTool,
+					"renderResult",
+					[result, options, theme, context],
+					textFromResult(result),
+				);
+			}
+
+			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),
+				});
+			}
+			// ask_user_question：折叠态摊成问答树，展开态按问题逐条列出选择。
+			if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
+				if (!options?.isPartial) setToolVisualState(context, isError ? "error" : "success");
+				if (options?.isPartial) {
+					// 折叠态 1 格缩进：与完成后的 ├/└ 对齐标题行的勾。
+					const pending = expanded ? "↳ Pending…" : " ↳ Pending…";
+					return new Text(theme.fg("muted", pending), 0, 0);
+				}
+				if (expanded) {
+					return renderExpandedToolResult(
+						askUserExpandedBody(result),
+						theme,
+						isError,
+						context?.lastComponent,
+						context?.args,
+						context,
+						true,
+					);
+				}
+				if (context?.state) context.state.ccstyleIoView = undefined;
+				const toolCallId = context?.toolCallId;
+				return createAskUserResultComponent({
+					result,
+					theme,
+					isError,
+					isHovered: () => isToolCallHovered(toolCallId),
+				});
+			}
+			if (options?.isPartial) {
+				// 折叠态保持 3 格：与完成后的 `   ↳ …` 同列，工具跑完那行不横跳。
+				// 展开态贴左（Box 提供 1 格 pad）。
+				const pending = expanded ? "↳ Pending…" : "   ↳ Pending…";
+				if (!SHELL_TOOL_NAMES.has(toolName)) {
+					return new Text(theme.fg("muted", pending), 0, 0);
+				}
+				// shell 运行中报已用时间：数字在 render() 内取，动画 tick 才能带上新值。
+				return {
+					render(width: number) {
+						const elapsed = shellDurationText(toolName, context, true);
+						const suffix = elapsed ? theme.fg("dim", ` · ${elapsed}`) : "";
+						return [truncateToWidth(theme.fg("muted", pending) + suffix, width, "")];
+					},
+					invalidate(): void {},
+				};
+			}
+
+			// shell：结果定型时定一次结束时间，这一行之后不再变。
+			if (
+				SHELL_TOOL_NAMES.has(toolName) &&
+				context?.state &&
+				context.state.ccstyleShellEndedAt === undefined
+			) {
+				context.state.ccstyleShellEndedAt = Date.now();
+			}
+			// 折叠行接在摘要后，展开态接在 Output 正文后（原生也是在结果底部报一行）。
+			const duration = shellDurationText(toolName, context, false);
+
+			setToolVisualState(context, isError ? "error" : "success");
+			const toolCallId = context?.toolCallId;
+			if (shouldRenderRichDiff(config.mode, toolName, Boolean(isError))) {
+				// getter 保证 Diff indicator / wrap / limits 下次绘制即更新
+				const richResult = renderRichToolResult(
+					toolName,
+					result,
+					{
+						...options,
+						expanded,
+						// 全局共享状态避免 /reload 后旧 result renderer 闭包失联
+						isHovered: () => isToolCallHovered(toolCallId),
+					},
+					theme,
+					context,
+					writeExecutionMetadata,
+					getToolDisplayConfig,
+				);
+				// 展开态由 Box(1,1) 提供内边距；折叠态 inset 一级缩进
+				if (richResult) return expanded ? richResult : insetComponent(richResult);
+			}
+
+			const text = textFromResult(result, expanded);
+			const args = context?.args;
+			if (expanded) {
+				const taskResult = renderExpandedTaskResult(toolName, text, theme, Boolean(isError));
+				if (taskResult) return taskResult;
+			}
+			const tasks = !isError && toolName === "TaskList" ? parseTaskList(text) : [];
+			const rendered = tasks.length
+				? taskListSummary(tasks)
+				: collapsedResultSummary({ result, toolName, text, isError });
+			const expandable = !expanded && (tasks.length > 0 || hasExpandableDetail(text, args));
+			const hintText = showMoreHintText();
+			const hintPrefix = expandable ? theme.fg("dim", " · ") : "";
+			const hint = expandable ? hintPrefix + theme.fg("dim", hintText) : "";
+			const hoveredHint = expandable ? hintPrefix + theme.fg("text", hintText) : "";
+			if (expanded) {
+				const view = renderExpandedToolResult(
+					text || "",
+					theme,
+					Boolean(isError),
+					context?.lastComponent,
+					args,
+					context,
+					true, // mode=on：贴左，由外层 Box(1,1) 提供 1 格 padding
+				);
+				// 尾部附注只能挂在 IoView 上：鼠标层按对象识别它，包一层会断掉命中。
+				// 与折叠态保持同一写法：裸值，不写 Took。
+				if (isExpandedToolIoView(view)) view.setFooter(duration || undefined);
+				return view;
+			}
+			if (context?.state) context.state.ccstyleIoView = undefined;
+			// 折叠态的耗时接在摘要后、展开提示前（提示必须留在行尾供鼠标层识别）。
+			const body = duration ? `${rendered}${theme.fg("dim", ` · ${duration}`)}` : rendered;
+			let cachedWidth: number | undefined;
+			let cachedLine: string | undefined;
+			let cachedHoveredLine: string | undefined;
+			return {
+				render(width: number) {
+					if (cachedLine === undefined || cachedWidth !== width) {
+						cachedWidth = width;
+						cachedLine = theme.fg(
+							isError ? "error" : "muted",
+							renderCollapsedToolResultToWidth(body, hint, width),
+						);
+						cachedHoveredLine = theme.fg(
+							isError ? "error" : "muted",
+							renderCollapsedToolResultToWidth(body, hoveredHint, width),
+						);
+					}
+					return [isToolCallHovered(toolCallId) ? cachedHoveredLine! : cachedLine];
+				},
+				invalidate() {},
+			};
+		},
+	};
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/codemode.ts

@@ -19,15 +19,15 @@ import {
 	renderToolSummary,
 	toolCallSummary,
 } from "./names.ts";
-import { showMoreHintText } from "./show-more-hint.ts";
-import { headTruncateToWidth, toolViewportWidth } from "./result.ts";
+import { showMoreHintText } from "./names.ts";
+import { formatToolDuration, headTruncateToWidth, toolViewportWidth } from "./result.ts";
 
 export const CODEMODE_TOOL_NAME = "codemode";
 
 /** 折叠态最多列几条子调用（与 pi 原生一致，更早的折叠成一行）。 */
 const COLLAPSED_CALL_LIMIT = 8;
-/** 折叠态正文缩进，与 `   ↳ …` 对齐。 */
-const INDENT = "   ";
+/** 折叠态正文缩进：1 格，让 ├/└ 落在标题行勾号（" ✓"）的正下方。 */
+const INDENT = " ";
 
 /** 脚本结果头；只有整块正文恰好等于它时才算头。 */
 const SCRIPT_HEADER = /^Script (completed|failed)\nWall time [\d.]+ seconds\nOutput:\n$/;
@@ -94,10 +94,6 @@ function fitSummaryParts(parts: readonly string[], width: number): string {
 	return visibleWidth(text) <= width ? text : headTruncateToWidth(text, width);
 }
 
-function formatDuration(ms: number): string {
-	return ms < 1000 ? `${Math.round(ms)}ms` : `${(ms / 1000).toFixed(1)}s`;
-}
-
 /** 与 pi 原生一致：不到 1 分显示两位有效数字。 */
 function formatCost(cost: number): string {
 	return `$${cost >= 0.01 ? cost.toFixed(2) : cost.toPrecision(2)}`;
@@ -108,7 +104,7 @@ function callMeta(call: CodemodeNestedCall): string[] {
 	const out: string[] = [];
 	const duration = call?.durationMs;
 	if (typeof duration === "number" && Number.isFinite(duration) && duration >= 0) {
-		out.push(formatDuration(duration));
+		out.push(formatToolDuration(duration));
 	}
 	const cost = call?.cost;
 	if (typeof cost === "number" && Number.isFinite(cost) && cost > 0) out.push(formatCost(cost));

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/ansi-utils.ts

@@ -1,4 +1,4 @@
-const ANSI_SGR_PATTERN = /\x1b\[([0-9;:]*)m/g;
+const ANSI_SGR_PATTERN = /\x1b\[([0-9;]*)m/g;
 const STYLE_RESET_PARAMS = [39, 22, 23, 24, 25, 27, 28, 29, 59] as const;
 
 export { ANSI_SGR_PATTERN, STYLE_RESET_PARAMS };
@@ -88,35 +88,12 @@ export function stripBackgroundSgrParams(params: readonly number[]): number[] {
 	return sanitized;
 }
 
-function isKeptColonSgr(token: string): boolean {
-	const parts = token.split(":");
-	if (parts[0] === "48") return false;
-	if (parts[0] !== "38") return true;
-	const channels =
-		parts[1] === "5" && parts.length === 3
-			? parts.slice(2)
-			: parts[1] === "2" && (parts.length === 5 || parts.length === 6)
-				? parts.slice(-3)
-				: undefined;
-	return !!channels?.every((c) => /^\d+$/.test(c) && Number(c) <= 255);
-}
-
 export function filterSgrSequences(text: string, filter: (params: number[]) => number[]): string {
 	if (!text || !text.includes("\x1b[")) {
 		return text;
 	}
 
 	return text.replace(ANSI_SGR_PATTERN, (_sequence, rawParams: string) => {
-		if (rawParams.includes(":")) {
-			// 冒号形式 (ISO 8613-6)：逐段处理；去掉 48:*，校验 38:*，其余原样保留
-			const kept = rawParams.split(";").flatMap((token) => {
-				if (!token.includes(":")) {
-					return token ? filter(toSgrParams(token)).map(String) : [];
-				}
-				return isKeptColonSgr(token) ? [token] : [];
-			});
-			return kept.length > 0 ? `\x1b[${kept.join(";")}m` : "";
-		}
 		const parsed = toSgrParams(rawParams);
 		if (parsed.length === 0) {
 			return "";

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -1,6 +1,7 @@
-import { Text, type Component } from "@earendil-works/pi-tui";
+import { Text, visibleWidth, type Component } from "@earendil-works/pi-tui";
 import type { EditToolDetails } from "@earendil-works/pi-coding-agent";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../names.ts";
 import {
 	getLineNumberWidth,
 	parseDiff,
@@ -20,6 +21,7 @@ import {
 import { renderDiffFrameLine, renderHeaderRows, renderSingleDiffRow } from "./diff-header.ts";
 import {
 	applyLineLimit,
+	clampDiffLineToWidth,
 	clampDiffLinesToWidth,
 	resolveDiffDisplayLimit,
 	resolveDiffProcessBudget,
@@ -40,6 +42,7 @@ import {
 	buildDiffSummaryText,
 	normalizeDiffRenderWidth,
 	resolveDiffPresentationMode,
+	styleDiffSummaryLine,
 } from "./diff-presentation.ts";
 
 function safeGetDiff(details: unknown): string {
@@ -81,6 +84,28 @@ export function countEditDiffStats(
 	}
 }
 
+/** Keep counts in the result row: the default-mode edit title does not include them. */
+function renderEditCollapsedSummaryLine(
+	stats: ParsedDiff["stats"],
+	width: number,
+	theme: DiffTheme,
+	hovered: boolean,
+): string {
+	const counts = `+${stats.added} -${stats.removed}`;
+	const hint = showMoreHintText();
+	const candidates = [
+		`↳ diff ${counts} · ${hint}`,
+		`↳ ${counts} · ${hint}`,
+		`${counts} · ${hint}`,
+		`↳ diff ${counts}`,
+		counts,
+		"diff",
+		"…",
+	];
+	const text = candidates.find((candidate) => visibleWidth(candidate) <= width) ?? "";
+	return clampDiffLineToWidth(styleDiffSummaryLine(text, stats, hint, theme, hovered), width);
+}
+
 export function renderEditDiffResult(
 	details: unknown,
 	options: DiffRenderOptions,
@@ -110,29 +135,41 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(renderEntries);
-	const showHashlineAnchors =
-		options.expanded === true &&
-		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
-		cache.invalidate();
-		options.invalidate?.();
-	});
+	// Summary-only previews need parsed counts, not split rows or syntax highlighting.
+	// Keep detailed data lazy so a live setting change can still reveal the same diff.
+	function buildDetailedData() {
+		const showHashlineAnchors =
+			options.expanded === true &&
+			renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+		return {
+			splitRows: buildSplitRows(renderEntries),
+			showHashlineAnchors,
+			lineNumberWidth: getLineNumberWidth(renderEntries, showHashlineAnchors),
+			highlightLine: createCodeLineHighlighter(language, theme, renderEntries, () => {
+				cache.invalidate();
+				options.invalidate?.();
+			}),
+		};
+	}
+	let detailedData: ReturnType<typeof buildDetailedData> | undefined;
 
 	return {
 		[RICH_DIFF_COMPONENT]: true,
-		/** 鼠标层只在真正的 remainder 行上提供展开入口。 */
+		/** Only the current summary/remainder row is an expand target, never diff body text. */
 		isCollapsedHintLine(plainLine: string): boolean {
 			const hint = cache.getHintLine();
 			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
 		},
+		/** 正文首行（diff 头行/0 行摘要行）自带 +A -D：标题不再重复计数。 */
+		bodyShowsStats(): boolean {
+			return true;
+		},
 		render(width: number): string[] {
 			// Live config: panel can change indicator/wrap/limits after this component is created.
 			const live = resolveLiveDisplayConfig(config);
@@ -147,6 +184,20 @@ export function renderEditDiffResult(
 				return cached;
 			}
 
+			// Like write's zero-line preview, handle this before the normal body limiter.
+			if (!options.expanded && live.editDiffCollapsedLines === 0) {
+				const summary = renderEditCollapsedSummaryLine(parsed.stats, safeWidth, theme, hovered);
+				return cache.set(
+					safeWidth,
+					options.expanded,
+					mode,
+					configKey,
+					hovered,
+					[summary],
+					normalizeCollapsedHintLine(summary),
+				);
+			}
+
 			if (mode === "summary") {
 				return cache.set(
 					safeWidth,
@@ -166,6 +217,8 @@ export function renderEditDiffResult(
 				);
 			}
 
+			const { splitRows, showHashlineAnchors, lineNumberWidth, highlightLine } = (detailedData ??=
+				buildDetailedData());
 			const headerRows = renderHeaderRows(parsed.stats, mode, safeWidth, theme);
 			const displayLimit = resolveDiffDisplayLimit(options.expanded, live.editDiffCollapsedLines);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/diff-limits.ts

@@ -1,6 +1,6 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { DEFAULT_TOOL_DISPLAY_CONFIG, type ToolDisplayConfig } from "../../../config/config.ts";
-import { showMoreHintText } from "../show-more-hint.ts";
+import { showMoreHintText } from "../names.ts";
 import {
 	buildCollapsedDiffHintText,
 	clampRenderedLineToWidth,