pi-cc-extensions 1.0.4 → 1.0.6

package/extensions/renderer/tool/codemode.ts

@@ -8,8 +8,11 @@
  * - 输出以 "Script completed\nWall time …\nOutput:\n" 开头（pi 原生也切掉），行数统计与展开正文都得去掉它，
  *   否则折叠摘要会多算 3 行。
  */
+import { highlightCode } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { config } from "../../config/config.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
+import { oneLine } from "../../utils/format.ts";
 import { toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
 import { mcpToolTitle } from "./mcp-title.ts";
@@ -94,6 +97,105 @@ function fitSummaryParts(parts: readonly string[], width: number): string {
 	return visibleWidth(text) <= width ? text : headTruncateToWidth(text, width);
 }
 
+/**
+ * 摘要行的打分：调用最能说明脚本在干什么，字符串次之，行长只在前两者相同时决胜。
+ * 调用权重必须大于「字符串分 + 行长上限」，否则长赋值会压过短调用。
+ */
+const CODE_SUMMARY_CALL_SCORE = 4;
+const CODE_SUMMARY_STRING_SCORE = 2;
+
+/**
+ * 无子调用时的脚本摘要：取信息量最大的一行语句，压成单行。
+ *
+ * 要的是一段真实的 JavaScript 片段，折叠行才能用 highlightCode 着色；
+ * 标识符链（`a → b → c`）着色器认不出，染不上。跳过注释、空行和 `// @options`。
+ * 只是折叠行的提示，不求还原语义；看代码还是展开 Input。
+ */
+export function codemodeCodeSummary(code: unknown): string | undefined {
+	if (typeof code !== "string" || !code.trim()) return undefined;
+	let best: { text: string; score: number } | undefined;
+	let skippingBlock = false;
+	for (const raw of code.split("\n")) {
+		const line = raw.trim();
+		if (skippingBlock) {
+			if (line.includes("*/")) skippingBlock = false;
+			continue;
+		}
+		if (line.startsWith("/*")) {
+			if (!line.includes("*/")) skippingBlock = true;
+			continue;
+		}
+		if (!line || line.startsWith("//") || line.startsWith("*")) continue;
+		const text = oneLine(line);
+		if (!text) continue;
+		const score =
+			(text.includes("(") ? CODE_SUMMARY_CALL_SCORE : 0) +
+			(/["'`]/.test(text) ? CODE_SUMMARY_STRING_SCORE : 0) +
+			Math.min(text.length, 100) / 100;
+		if (!best || score > best.score) best = { text, score };
+	}
+	return best?.text;
+}
+
+/**
+ * 没有子调用时的脚本行：语句逐行用 │ 树线列出，行数跟 expandedInputMaxLines。
+ * 超出的收成一行 `… N more lines`。注释、空行和 `// @options` 不占行。
+ */
+export function codemodeCodeLines(
+	code: unknown,
+	fg: (color: string, text: string) => string,
+	rowWidth: number,
+): string[] {
+	if (typeof code !== "string" || !code.trim()) return [];
+	const statements: string[] = [];
+	let skippingBlock = false;
+	for (const raw of code.split("\n")) {
+		const line = raw.trim();
+		if (skippingBlock) {
+			if (line.includes("*/")) skippingBlock = false;
+			continue;
+		}
+		if (line.startsWith("/*")) {
+			if (!line.includes("*/")) skippingBlock = true;
+			continue;
+		}
+		if (!line || line.startsWith("//") || line.startsWith("*")) continue;
+		const text = oneLine(line);
+		if (text) statements.push(text);
+	}
+	if (statements.length === 0) return [];
+	const limit = Math.max(1, config.expandedInputMaxLines);
+	const visible = statements.slice(0, limit);
+	const rail = `${INDENT}${fg("dim", "│")} `;
+	const lines = visible.map((statement) =>
+		truncateToWidth(`${rail}${highlightCodeSummary(statement)}`, rowWidth, ""),
+	);
+	const hidden = statements.length - visible.length;
+	if (hidden > 0) {
+		lines.push(
+			truncateToWidth(
+				`${rail}${fg("dim", `… ${hidden} more ${hidden === 1 ? "line" : "lines"}`)}`,
+				rowWidth,
+				"",
+			),
+		);
+	}
+	return lines;
+}
+
+/**
+ * 所以包一层 `() => { … }` 再取中间那一行。失败或没着色时退回原文。
+ */
+export function highlightCodeSummary(summary: string): string {
+	try {
+		const lines = highlightCode(`() => { ${summary} }`, "javascript");
+		const colored = lines[0]?.replace(/^\(\) => \{ /, "").replace(/ \}$/, "");
+		return colored && stripAnsi(colored) === summary ? colored : summary;
+	} catch {
+		return summary;
+	}
+}
+
 /** 与 pi 原生一致：不到 1 分显示两位有效数字。 */
 function formatCost(cost: number): string {
 	return `$${cost >= 0.01 ? cost.toFixed(2) : cost.toPrecision(2)}`;
@@ -159,9 +261,12 @@ function callSummary(call: CodemodeNestedCall): ToolCallSummary {
 	const parsed = parseCallArgs(raw);
 	if (parsed) {
 		const summary = toolCallSummary(name, parsed.args, { title, variant: "default" });
-		// 截断串只恢复出部分字段：字段链认出来了才用，认不出仍旧贴原文，
-		// 免得把不完整的 JSON 当成完整入参摊开。
-		if (parsed.complete || summary.payload === undefined) return summary;
+		// 截断串只恢复出部分字段：字段链认出来了才用（payload 是字段链挑出的值，
+		// path/main 的兜底标题不算）；认不出仍旧贴原文，免得把不完整的 JSON 当成完整入参摊开。
+		const recognized = summary.payload !== undefined || summary.path !== undefined;
+		// 完全还原的入参：标题与载荷分色后的 summary 直接用；恢复了字段的也用结构化
+		// 结果（字段链认出的值比截断原文更可读）。认不出的才退回贴原文。
+		if (parsed.complete || recognized) return summary;
 	}
 	return { main: title, detail: "", payload: raw };
 }
@@ -176,7 +281,7 @@ function statusIcon(status: unknown, theme: any): string {
 			return theme.fg("muted", "⊘");
 		default:
 			// 运行中：帧在 render() 内取，动画定时器只负责 requestRender
-			return theme.fg("accent", toolLoadingIcon());
+			return theme.fg("dim", toolLoadingIcon());
 	}
 }
 
@@ -209,6 +314,8 @@ export function codemodeCollapsedLines(options: {
 	width: number;
 	/** 鼠标悬停整卡时展开提示用 text 色，与其它折叠卡一致。 */
 	hovered?: boolean;
+	/** 脚本源码；没有子调用时用来补一行 `code:` 摘要。 */
+	code?: unknown;
 }): string[] {
 	const { result, theme, running, isError } = options;
 	const fg = theme.fg.bind(theme);
@@ -216,6 +323,11 @@ export function codemodeCollapsedLines(options: {
 	const rowWidth = toolViewportWidth(options.width);
 	const shown = calls.slice(-COLLAPSED_CALL_LIMIT);
 	const lines: string[] = [];
+	// 没有子调用时脚本本身是唯一线索：逐行用 │ 树线列出，行数跟 expandedInputMaxLines，
+	// 汇总行仍用 └ 收尾。
+	if (shown.length === 0) {
+		lines.push(...codemodeCodeLines(options.code, fg, rowWidth));
+	}
 	if (shown.length < calls.length) {
 		const hidden = calls.length - shown.length;
 		lines.push(
@@ -229,8 +341,8 @@ export function codemodeCollapsedLines(options: {
 	for (const call of shown) lines.push(callRow(call, theme, rowWidth));
 
 	const summary = codemodeSummaryParts(calls, codemodeOutputLineCount(result), running);
-	// 没有子调用时不画衔接符，避免孤零零一个 └
-	const prefix = shown.length > 0 ? `${INDENT}${fg("dim", "└")} ` : INDENT;
+	// 上面已有行（子调用或代码摘要）时用 └ 收尾，否则不画衔接符
+	const prefix = lines.length > 0 ? `${INDENT}${fg("dim", "└")} ` : INDENT;
 	// 圆点保持 dim；hover 只高亮可点击文字。
 	const hint = running
 		? ""
@@ -281,6 +393,8 @@ export function createCodemodeResultComponent(options: {
 	isError: boolean;
 	/** 折叠态 hover 查询，与 diff 卡同一套（mouse/hover）。 */
 	isHovered?: () => boolean;
+	/** 脚本源码；没有子调用时用来补一行 `code:` 摘要。 */
+	code?: unknown;
 }): any {
 	const { result, theme, running, isError } = options;
 	return {
@@ -292,6 +406,7 @@ export function createCodemodeResultComponent(options: {
 				isError,
 				width,
 				hovered: options.isHovered?.() ?? false,
+				code: options.code,
 			});
 		},
 		invalidate(): void {},

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

@@ -135,10 +135,11 @@ export function applyLineLimit(
 	const clickLabel = showMoreHintText();
 	const clickIndex = hintText.lastIndexOf(clickLabel);
 	// 展开态不会再截断，剩下的分支必是折叠态提示。
+	// 提示文本与其余折叠卡一致用 dim，hover 时 clickLabel 提到 text。
 	const styledHint =
-		hovered && clickIndex >= 0
+		clickIndex >= 0
 			? theme.fg("muted", hintText.slice(0, clickIndex)) +
-				theme.fg("text", clickLabel) +
+				theme.fg(hovered ? "text" : "dim", clickLabel) +
 				theme.fg("muted", hintText.slice(clickIndex + clickLabel.length))
 			: theme.fg("muted", hintText);
 	return {

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

@@ -31,12 +31,18 @@ export interface DiffPalette {
 	removeEmphasisBgAnsi: string;
 }
 
-const ADD_ROW_BACKGROUND_MIX_RATIO = 0.12;
+const ADD_ROW_BACKGROUND_MIX_RATIO = 0.04;
 const REMOVE_ROW_BACKGROUND_MIX_RATIO = 0.12;
 const ADD_INLINE_EMPHASIS_MIX_RATIO = 0.26;
-const REMOVE_INLINE_EMPHASIS_MIX_RATIO = 0.26;
+const REMOVE_INLINE_EMPHASIS_MIX_RATIO = 0.5;
 const ADDITION_TINT_TARGET: RgbColor = { r: 84, g: 190, b: 118 };
 const DELETION_TINT_TARGET: RgbColor = { r: 232, g: 95, b: 122 };
+// GitHub dark 删除行底 ~#67060c：混向深酒红目标，压掉主题基底的粉/灰感。
+const DELETION_ROW_TARGET: RgbColor = { r: 103, g: 6, b: 12 };
+const DELETION_EMPHASIS_TARGET: RgbColor = { r: 160, g: 17, b: 23 };
+// 行底/强调底混完再向自身亮度去饱和，留灰感，避免纯色底过艳。
+const ROW_DESATURATE_RATIO = 0.3;
+const EMPHASIS_DESATURATE_RATIO = 0.2;
 export const ANSI_BG_RESET = "\x1b[49m";
 
 export function emphasis(theme: DiffTheme, text: string): string {
@@ -202,6 +208,11 @@ function rgbToBgAnsi(color: RgbColor): string {
 	return `\x1b[48;2;${r};${g};${b}m`;
 }
 
+function desaturateRgb(color: RgbColor, ratio: number): RgbColor {
+	const luma = (color.r * 299 + color.g * 587 + color.b * 114) / 1000;
+	return mixRgb(color, { r: luma, g: luma, b: luma }, ratio);
+}
+
 function mixRgb(base: RgbColor, tint: RgbColor, ratio: number): RgbColor {
 	const clamped = Math.max(0, Math.min(1, ratio));
 	return {
@@ -263,9 +274,11 @@ export function readThemeAnsi(
 }
 
 export function resolveDiffPalette(theme: DiffTheme): DiffPalette {
-	const baseBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolSuccessBg")) ??
-		parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolPendingBg")) ??
+	const fallbackBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolPendingBg")) ??
 		parseAnsiColorCode(readThemeAnsi(theme, "bg", "userMessageBg")) ?? { r: 32, g: 35, b: 42 };
+	// 删除行用 toolErrorBg 做基底（主题里是 diffDelBg 暗红）；不定义时退回通用基底混 tint。
+	const addBaseBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolSuccessBg")) ?? fallbackBg;
+	const removeBaseBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolErrorBg")) ?? addBaseBg;
 	const addFg = parseAnsiColorCode(readThemeAnsi(theme, "fg", "toolDiffAdded")) ?? {
 		r: 88,
 		g: 173,
@@ -279,10 +292,28 @@ export function resolveDiffPalette(theme: DiffTheme): DiffPalette {
 	const addTint = mixRgb(addFg, ADDITION_TINT_TARGET, 0.35);
 	const removeTint = mixRgb(removeFg, DELETION_TINT_TARGET, 0.65);
 
-	const addRowBg = mixRgb(baseBg, addTint, ADD_ROW_BACKGROUND_MIX_RATIO);
-	const removeRowBg = mixRgb(baseBg, removeTint, REMOVE_ROW_BACKGROUND_MIX_RATIO);
-	const addEmphasisBg = mixRgb(baseBg, addTint, ADD_INLINE_EMPHASIS_MIX_RATIO);
-	const removeEmphasisBg = mixRgb(baseBg, removeTint, REMOVE_INLINE_EMPHASIS_MIX_RATIO);
+	const addRowBg = desaturateRgb(
+		mixRgb(addBaseBg, addTint, ADD_ROW_BACKGROUND_MIX_RATIO),
+		ROW_DESATURATE_RATIO,
+	);
+	const addEmphasisBg = desaturateRgb(
+		mixRgb(addBaseBg, addTint, ADD_INLINE_EMPHASIS_MIX_RATIO),
+		EMPHASIS_DESATURATE_RATIO,
+	);
+	// 暗色基底下向 GitHub 深酒红（~#67060c）加权，压掉主题基底的粉/灰感；
+	// 浅色基底保持原 tint 口径，免得行底深得盖过文字。
+	const removeBaseLuminance =
+		(removeBaseBg.r * 299 + removeBaseBg.g * 587 + removeBaseBg.b * 114) / 1000;
+	const removeRowTarget = removeBaseLuminance < 128 ? DELETION_ROW_TARGET : removeTint;
+	const removeEmphasisTarget = removeBaseLuminance < 128 ? DELETION_EMPHASIS_TARGET : removeTint;
+	const removeRowBg = desaturateRgb(
+		mixRgb(removeBaseBg, removeRowTarget, REMOVE_ROW_BACKGROUND_MIX_RATIO),
+		ROW_DESATURATE_RATIO,
+	);
+	const removeEmphasisBg = desaturateRgb(
+		mixRgb(removeBaseBg, removeEmphasisTarget, REMOVE_INLINE_EMPHASIS_MIX_RATIO),
+		EMPHASIS_DESATURATE_RATIO,
+	);
 
 	return {
 		addRowBgAnsi: rgbToBgAnsi(addRowBg),

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

@@ -71,7 +71,7 @@ export function buildDiffSummaryText(stats: DiffSummaryStats, width: number): st
 }
 
 /**
- * 折叠摘要行样式：整行 muted，`+A -D` 用 diff 头行同一套绿/红，hover 只把动作词提到 text。
+ * 折叠摘要行样式：整行 muted，`+A -D` 用 diff 头行同一套绿/红，`click to show more` 与其余折叠卡一致用 dim，hover 提到 text。
  * 0 行预览与多行预览共用这一套颜色：改折叠行数时同一处信息不变色。
  */
 export function styleDiffSummaryLine(
@@ -103,7 +103,7 @@ export function styleDiffSummaryLine(
 	}
 	if (hintIndex >= cursor) {
 		pushMuted(hintIndex);
-		pieces.push(theme.fg(hovered ? "text" : "muted", hint));
+		pieces.push(theme.fg(hovered ? "text" : "dim", hint));
 		cursor = hintIndex + hint.length;
 	}
 	pushMuted(text.length);

package/extensions/renderer/tool/grouping.ts

@@ -7,6 +7,7 @@ import {
 	type Component,
 } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
+import { aggregateToolCardBgSlot, toolCardStatus } from "./tool-state.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import {
 	ASK_USER_QUESTION_TOOL_NAME,
@@ -105,9 +106,7 @@ function previousSibling(
 type ToolStatus = "pending" | "success" | "error";
 
 function status(tool: any): ToolStatus {
-	if (tool?.result?.isError) return "error";
-	if (tool?.isPartial === true || (tool?.executionStarted && !tool?.result)) return "pending";
-	return tool?.result ? "success" : "pending";
+	return toolCardStatus(tool);
 }
 
 function statusIcon(value: ToolStatus): string {
@@ -235,14 +234,15 @@ function askUserResultSummary(tool: any): ToolCallSummary | undefined {
 		.map((entry) => entry.answer);
 	if (answers.length === 0) {
 		const label = tool.result?.details?.cancelled === true ? "Declined" : "Done";
-		return { main: `${toolTitle(tool)} ${label}`, detail: "" };
+		return { main: toolTitle(tool), detail: "", payload: label };
 	}
 	const first = answers[0]!;
 	const question = String(first.question ?? "").trim() || "Question";
 	const more = answers.length > 1 ? ` (+${answers.length - 1})` : "";
 	return {
-		main: `${toolTitle(tool)} ${question} -> ${askUserAnswerText(first)}${more}`,
+		main: toolTitle(tool),
 		detail: "",
+		payload: `${question} -> ${askUserAnswerText(first)}${more}`,
 	};
 }
 
@@ -253,7 +253,7 @@ function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
 		codemodeOutputLineCount(tool.result),
 		tool?.isPartial === true,
 	);
-	return { main: `${toolTitle(tool)} ${parts.join(" · ")}`, detail: "" };
+	return { main: toolTitle(tool), detail: "", payload: parts.join(" · ") };
 }
 
 /**
@@ -283,7 +283,7 @@ function collapsedGroupToolLine(
 	width: number,
 ): string {
 	const toolStatus = status(tool);
-	const color = toolStatus === "pending" ? "accent" : toolStatus;
+	const color = toolStatus === "pending" ? "dim" : toolStatus;
 	const summary = askUserResultSummary(tool) ?? codemodeResultSummary(tool) ?? toolSummary(tool);
 	const prefix = ` ${fg("dim", last ? "└" : "├")} ${fg(color, statusIcon(toolStatus))} `;
 	const detail = fg("dim", summary.detail);
@@ -311,7 +311,7 @@ function groupCountText(
 		.filter((key) => counts[key])
 		.map((key) => {
 			const label = key === "pending" ? "running" : key === "success" ? "done" : "failed";
-			const color = key === "pending" ? "accent" : key;
+			const color = key === "pending" ? "dim" : key;
 			return `${fg(color, String(counts[key]))} ${label}`;
 		})
 		.join(` ${fg("dim", "·")} `);
@@ -499,7 +499,7 @@ export class ToolGroupComponent extends Container {
 		const label = names.size === 1 ? toolTitle(this.children[0]) : "Multiple Tools";
 		const overall = groupOverallStatus(counts);
 		if ((this.children as any[]).some(isAnimatingTool)) scheduleGroupAnimation(this.patch);
-		const overallColor = overall === "pending" ? "accent" : overall;
+		const overallColor = overall === "pending" ? "dim" : overall;
 		// 圆点保持 dim；hover 只高亮可点击文字。
 		const hintText = this._expanded ? collapseHintText() : showMoreHintText();
 		const hint = `${fg("dim", "·")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
@@ -527,7 +527,7 @@ export class ToolGroupComponent extends Container {
 				expandedHit.hover === this.hintHovered &&
 				expandedHit.theme === this.patch.theme &&
 				expandedHit.fullscreen === isToolTuiFullscreen() &&
-				expandedHit.bgSlot === config.expandedCardBackground &&
+				expandedHit.bgSlot === aggregateToolCardBgSlot(this.children) &&
 				expandedHit.paints.length === childPaints.length &&
 				expandedHit.paints.every((paint, index) => paint === childPaints[index])
 			) {
@@ -538,7 +538,7 @@ export class ToolGroupComponent extends Container {
 		for (let index = 0; index < total; index++) {
 			const tool = this.children[index];
 			const toolStatus = status(tool);
-			const color = toolStatus === "pending" ? "accent" : toolStatus;
+			const color = toolStatus === "pending" ? "dim" : toolStatus;
 			const branch = index === total - 1 ? "└" : "├";
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
@@ -564,8 +564,8 @@ export class ToolGroupComponent extends Container {
 			}
 		}
 		if (this._expanded) {
-			// 展开面板统一一个背景槽位（ccstyle 约定），不按状态区分。
-			const backgroundSlot = config.expandedCardBackground;
+			// 有一个失败整卡用失败底色；没有失败但还有进行中用进行中底色。
+			const backgroundSlot = aggregateToolCardBgSlot(this.children);
 			for (const line of expandedLines) {
 				lines.push(paddedBackgroundRow(theme, backgroundSlot, line, width));
 			}

package/extensions/renderer/tool/message-display.ts

@@ -6,6 +6,7 @@ import {
 import { Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import { MESSAGE_DISPLAY_PATCH, patchRegistry } from "../../utils/patch-keys.ts";
 import { config } from "../../config/config.ts";
+import { TOOL_CARD_BG_SLOT } from "./tool-state.ts";
 import { showMoreHintText } from "./names.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 
@@ -82,11 +83,11 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 		component.addChild(new Text(`${icon} ${title}${hint}`, 0, 0));
 		return;
 	}
-	// 展开卡与 tool 一致：同一个展开卡背景 + 上下左右 1 格
+	// 展开卡与成功的工具卡同底色，上下左右各 1 格。
 	component.paddingX = 1;
 	component.paddingY = 1;
 	if (typeof theme.bg === "function" && typeof component.setBgFn === "function") {
-		component.setBgFn((text: string) => theme.bg(config.expandedCardBackground, text));
+		component.setBgFn((text: string) => theme.bg(TOOL_CARD_BG_SLOT.success, text));
 	}
 	component.addChild(new Text(`${icon} ${title}`, 0, 0));
 	component.addChild(new Spacer(1));

package/extensions/renderer/tool/names.ts

@@ -14,7 +14,7 @@ function clip(value: unknown): string {
 	return oneLine(value, clipLimit());
 }
 
-/** 载荷（入参 JSON / 脚本代码）至少留出这么多宽度才显示，否则整段省略（避免只剩一个孤零零的 " {…"）。 */
+/** 载荷（入参 JSON / 脚本代码 / 路径值）至少留出这么多宽度才显示，否则整段省略（避免只剩一个孤零零的 " {…"）。 */
 const MIN_PAYLOAD_WIDTH = 10;
 
 /** 品牌大小写固定写法；humanize 推导不出来的工具名写在这里。 */
@@ -62,7 +62,7 @@ export type ToolCallSummary = {
 	detail: string;
 	/** 路径摘要保留结构，供最终渲染按实际宽度优先保留文件名。 */
 	path?: { prefix: string; value: string };
-	/** 标题之外的原始载荷（完整入参 JSON、脚本代码…），已压成单行，渲染时用 dim 接在标题后。 */
+	/** 标题之外的原始载荷（入参 JSON、脚本代码、命令、路径、查询…），已压成单行，渲染时用 muted 接在标题后。 */
 	payload?: string;
 };
 
@@ -149,11 +149,8 @@ function pathSummary(
 	detail = "",
 ): ToolCallSummary {
 	const path = displayPath(value, cwd);
-	return {
-		main: `${prefix} ${truncatePathToWidth(path, clipLimit())}`,
-		detail,
-		path: { prefix, value: path },
-	};
+	// main 只留标题：渲染时 prefix 用标题色、路径值用次级色，截断按 path 结构走中间省略。
+	return { main: prefix, detail, path: { prefix, value: path } };
 }
 
 /** 入参是 shell 命令的工具。 */
@@ -192,7 +189,7 @@ const GENERIC_SUMMARY_FIELDS = [
 ] as const;
 
 /** 通用字段链取值：字符串直接用；数组取首个可展示项并标注剩余条数。 */
-type SummaryValue = { text: string; more: number };
+type SummaryValue = { text: string; more: number; input: boolean };
 
 function arrayItemText(item: unknown): string | undefined {
 	if (typeof item === "string" && item) return item;
@@ -205,7 +202,7 @@ function arrayItemText(item: unknown): string | undefined {
 }
 
 function summaryFieldValue(value: unknown): SummaryValue | undefined {
-	if (typeof value === "string" && value) return { text: value, more: 0 };
+	if (typeof value === "string" && value) return { text: value, more: 0, input: true };
 	if (!Array.isArray(value)) return undefined;
 	let first: string | undefined;
 	let count = 0;
@@ -215,7 +212,7 @@ function summaryFieldValue(value: unknown): SummaryValue | undefined {
 		count += 1;
 		first ??= text;
 	}
-	return first === undefined ? undefined : { text: first, more: count - 1 };
+	return first === undefined ? undefined : { text: first, more: count - 1, input: true };
 }
 
 /** 通用字段链取值；无可用字段时返回 undefined，交给调用方继续降级。 */
@@ -225,7 +222,7 @@ function genericSummary(title: string, args: any): ToolCallSummary | undefined {
 		if (!found) continue;
 		// (+N) 追加在截断之后，避免首个元素过长时把条数挤没
 		const more = found.more > 0 ? ` (+${found.more})` : "";
-		return { main: `${title} ${clip(found.text)}${more}`, detail: "" };
+		return { main: title, detail: "", payload: `${clip(found.text)}${more}` };
 	}
 	return undefined;
 }
@@ -261,45 +258,39 @@ export function toolCallSummary(
 
 	const value = (fallback: string, ...keys: string[]) => {
 		const found = keys.map((key) => args[key]).find((item) => typeof item === "string" && item);
-		return `${title} ${clip(found || fallback)}`;
+		return { main: title, detail: "", payload: clip(found || fallback) };
 	};
 
 	if (variant === "default" && AGENT_FAMILY_TOOL_NAMES.has(toolName) && args.agent_id) {
-		return { main: `${title} ${clip(args.agent_id)}`, detail: "" };
+		return { main: title, detail: "", payload: clip(args.agent_id) };
 	}
 	if (variant === "grouping" && (name === "agent" || name === "agents")) {
 		const displayName = args.subagent_type ?? args.agent_type ?? args.agent;
 		if (typeof displayName === "string" && displayName) {
-			return { main: `${title} ${displayName}`, detail: "" };
+			return { main: title, detail: "", payload: displayName };
 		}
-		return {
-			main: value(name === "agent" ? "launch agent" : "launch agents", "description", "prompt"),
-			detail: "",
-		};
+		return value(name === "agent" ? "launch agent" : "launch agents", "description", "prompt");
 	}
 	if (variant === "grouping" && (name === "get_subagent_result" || name === "steer_subagent")) {
-		return {
-			main: value(name === "get_subagent_result" ? "agent result" : "steer agent", "agent_id"),
-			detail: "",
-		};
+		return value(name === "get_subagent_result" ? "agent result" : "steer agent", "agent_id");
 	}
 	if (variant === "default" && name === "agents") {
-		return { main: value("launch agents", "description", "prompt"), detail: "" };
+		return value("launch agents", "description", "prompt");
 	}
-	if (name === "skill") return { main: value("run skill", "name"), detail: "" };
+	if (name === "skill") return value("run skill", "name");
 	if (name === "enterplanmode" || name === "enter_plan_mode") {
-		return { main: `${title} enable read-only planning`, detail: "" };
+		return { main: title, detail: "", payload: "enable read-only planning" };
 	}
 	if (name === "exitplanmode" || name === "exit_plan_mode") {
-		return { main: `${title} present plan`, detail: "" };
+		return { main: title, detail: "", payload: "present plan" };
 	}
-	if (name === "taskcreate") return { main: value("create task", "subject"), detail: "" };
-	if (name === "tasklist") return { main: `${title} task list`, detail: "" };
+	if (name === "taskcreate") return value("create task", "subject");
+	if (name === "tasklist") return { main: title, detail: "", payload: "task list" };
 	if (name === "taskget" || name === "taskupdate") {
-		return { main: value("task", "taskId", "task_id"), detail: "" };
+		return value("task", "taskId", "task_id");
 	}
 	if (name === "taskoutput" || name === "taskstop") {
-		return { main: value("background task", "task_id", "taskId"), detail: "" };
+		return value("background task", "task_id", "taskId");
 	}
 	if (name === "taskexecute") {
 		const ids = Array.isArray(args.task_ids)
@@ -310,7 +301,7 @@ export function toolCallSummary(
 		const summary = ids.length
 			? `${ids[0]}${ids.length > 1 ? ` (+${ids.length - 1} tasks)` : ""}`
 			: "start tasks";
-		return { main: `${title} ${summary}`, detail: "" };
+		return { main: title, detail: "", payload: summary };
 	}
 	if (toolName === "read") {
 		const details = [
@@ -322,20 +313,21 @@ export function toolCallSummary(
 			return pathSummary(variant === "grouping" ? "Read" : title, args.path, opts.cwd, detail);
 		}
 		return {
-			main: variant === "grouping" ? "Read ..." : title,
+			main: variant === "grouping" ? "Read" : title,
 			detail,
+			payload: variant === "grouping" ? "..." : undefined,
 		};
 	}
 	if (variant === "grouping" && SHELL_TOOL_NAMES.has(name)) {
 		// 分组行缺 command 时保留占位，避免与单工具卡一样只剩标题
-		return { main: value("...", "command"), detail: "" };
+		return value("...", "command");
 	}
 
 	// 检索类：pattern 是正文，path 只是范围；两个变体同格式
 	if (typeof args.pattern === "string" || SEARCH_TOOL_NAMES.has(name)) {
 		const pattern = clip(args.pattern || "...");
 		const scope = typeof args.path === "string" && args.path ? ` in ${clip(args.path)}` : "";
-		return { main: `${title} ${JSON.stringify(pattern)}${scope}`, detail: "" };
+		return { main: title, detail: "", payload: `${JSON.stringify(pattern)}${scope}` };
 	}
 
 	const generic = genericSummary(title, args);
@@ -368,28 +360,29 @@ function mcpGatewaySummary(title: string, args: any): ToolCallSummary | undefine
 	const action = text(args.action);
 	const scoped = (target: string) => (server ? `${target} @ ${server}` : target);
 
-	if (action === "ui-messages") return { main: `${title} ${action}`, detail: "" };
+	if (action === "ui-messages") return { main: title, detail: "", payload: action };
 	if (tool) {
-		const main = `${title} call ${scoped(tool)}`;
-		const payload = innerArgsPayload(args.args);
-		return payload ? { main, detail: "", payload } : { main, detail: "" };
+		const argsPayload = innerArgsPayload(args.args);
+		const payload = argsPayload ? `call ${scoped(tool)} ${argsPayload}` : `call ${scoped(tool)}`;
+		return { main: title, detail: "", payload };
 	}
-	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 (connect) return { main: title, detail: "", payload: `connect ${connect}` };
+	if (describe) return { main: title, detail: "", payload: `describe ${scoped(describe)}` };
+	if (instructions) return { main: title, detail: "", payload: `instructions ${instructions}` };
 	if (search) {
 		const flags = [
 			args.regex === true ? "regex" : "",
 			args.includeSchemas === false ? "schemas hidden" : "",
 		].filter(Boolean);
 		return {
-			main: `${title} search ${scoped(search)}`,
+			main: title,
 			detail: flags.length ? ` (${flags.join(", ")})` : "",
+			payload: `search ${scoped(search)}`,
 		};
 	}
-	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: "" };
+	if (server) return { main: title, detail: "", payload: `list ${server}` };
+	if (action) return { main: title, detail: "", payload: action };
+	if (Object.keys(args).length === 0) return { main: title, detail: "", payload: "status" };
 	return undefined;
 }
 
@@ -411,20 +404,27 @@ function jsonArgs(args: any): string {
 }
 
 /**
- * 标题行内容：标题用调用方的 toolTitle 色，原始载荷（入参 JSON / 脚本代码）单独用 dim。
- * 标题优先占宽（它是身份），剩下的宽度给载荷；载荷超宽时尾部省略，连
- * MIN_PAYLOAD_WIDTH 都放不下时整段省略。
+ * 标题行内容：main 是身份（工具名），用 toolTitle 色；路径值与载荷（入参 JSON、
+ * 脚本代码、命令、查询…）是输入，单独用 muted。标题优先占宽，剩下的宽度给载荷；
+ * 载荷超宽时尾部省略，连 MIN_PAYLOAD_WIDTH 都放不下时整段省略。
  */
 export function renderToolSummary(
 	summary: ToolCallSummary,
 	width: number,
 	fg: (color: ThemeColor, text: string) => string,
 ): string {
+	// 路径摘要：前缀用标题色，值用次级色并按可用宽度中间截断（文件名优先保留）。
+	if (summary.path) {
+		const prefix = headToWidth(summary.path.prefix, width, "…");
+		const pathWidth = width - visibleWidth(prefix) - 1;
+		if (pathWidth < MIN_PAYLOAD_WIDTH) return fg("toolTitle", prefix);
+		return `${fg("toolTitle", prefix)} ${fg("muted", truncatePathToWidth(summary.path.value, Math.min(pathWidth, clipLimit())))}`;
+	}
 	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)}${fg("muted", headTruncateToWidth(` ${summary.payload}`, room))}`
 		: fg("toolTitle", title);
 }