pi-cc-extensions 1.0.3 → 1.0.5

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);
 }
 

package/extensions/renderer/tool/result.ts

@@ -33,6 +33,30 @@ export function insetComponent(component: any): any {
 	return wrapped;
 }
 
+/**
+ * 展开卡内嵌组件：`↳` 行右移 2 格（Box pad 1 + 2 = 标题文字列），其余行贴左。
+ * 与折叠态 insetComponent 的 `   ↳` 同一视觉列。
+ */
+export function expandedBodyComponent(component: any): any {
+	const wrapped: Record<string, unknown> = {
+		render: (width: number) =>
+			component
+				.render(width)
+				.map((line: string) =>
+					truncateToWidth(
+						line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳"),
+						Math.max(0, width),
+						"",
+					),
+				),
+		invalidate: () => component.invalidate?.(),
+	};
+	if (typeof component.isCollapsedHintLine === "function") {
+		wrapped.isCollapsedHintLine = (line: string) => component.isCollapsedHintLine(line);
+	}
+	return wrapped;
+}
+
 function rawTextFromResult(result: any): string {
 	return Array.isArray(result?.content)
 		? result.content

package/extensions/renderer/tool/tool-state.ts

@@ -1,3 +1,4 @@
+import type { ThemeBg } from "@earendil-works/pi-coding-agent";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 
@@ -93,6 +94,54 @@ export function pendingIcon(_name: string): string {
 
 type ToolVisualState = "pending" | "success" | "error";
 
+/** 展开卡底色槽位：与工具状态一一对应，不再读配置。 */
+export const TOOL_CARD_BG_SLOT: Record<ToolVisualState, ThemeBg> = {
+	pending: "toolPendingBg",
+	success: "toolSuccessBg",
+	error: "toolErrorBg",
+};
+
+/** 单张工具卡的状态。有失败取失败，没有结果或仍在输出取进行中，其余取成功。 */
+export function toolCardStatus(tool: any): ToolVisualState {
+	if (tool?.result?.isError === true || tool?.isError === true) return "error";
+	if (tool?.isPartial === true || (tool?.executionStarted && !tool?.result) || !tool?.result) {
+		return "pending";
+	}
+	return "success";
+}
+
+/**
+ * 一张卡里多个工具的汇总状态。
+ * 有一个失败取失败；没有失败但还有进行中取进行中；全部成功取成功。
+ */
+export function aggregateToolCardStatus(tools: readonly any[]): ToolVisualState {
+	let pending = false;
+	for (const tool of tools) {
+		const value = toolCardStatus(tool);
+		if (value === "error") return "error";
+		if (value === "pending") pending = true;
+	}
+	return pending ? "pending" : "success";
+}
+
+/**
+ * 单张工具卡的底色。
+ * edit/write 的新增行底色由 toolSuccessBg 混出，成功卡不能再用同一块绿，否则两层叠在一起。
+ * 成功的 edit/write 改用中性的 toolPendingBg；失败卡仍用 toolErrorBg。
+ */
+export function toolCardBgSlot(tool: any): ThemeBg {
+	const status = toolCardStatus(tool);
+	const name = String(tool?.toolName ?? "");
+	if ((name === "edit" || name === "write") && status !== "error") {
+		return TOOL_CARD_BG_SLOT.pending;
+	}
+	return TOOL_CARD_BG_SLOT[status];
+}
+
+export function aggregateToolCardBgSlot(tools: readonly any[]): string {
+	return TOOL_CARD_BG_SLOT[aggregateToolCardStatus(tools)];
+}
+
 export function settledIcon(name: string, state: ToolVisualState | undefined): string {
 	if (state === "success") return "✓";
 	if (state === "error") return "✗";
@@ -124,11 +173,11 @@ export function resolveToolVisualState(context: any): ToolVisualState | undefine
 	return settledState;
 }
 
-export function toolIconColor(context: any): "accent" | "error" | "success" | "muted" {
+export function toolIconColor(context: any): "dim" | "error" | "success" | "muted" {
 	const visualState = getToolVisualState(context);
 	if (context?.isError || visualState === "error") return "error";
 	if (visualState === "success") return "success";
-	if (context?.isPartial || context?.executionStarted || visualState === "pending") return "accent";
+	if (context?.isPartial || context?.executionStarted || visualState === "pending") return "dim";
 	return "muted";
 }
 

package/package.json

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

package/themes/cc-dark.json

@@ -1,91 +1,92 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "cc-dark",
+	"appearance": "dark",
 	"vars": {
-		"bg": "#131217",
-		"panel": "#1b1922",
-		"surface": "#211e2b",
-		"surfaceRaised": "#292533",
-		"border": "#36313f",
-		"borderMuted": "#292631",
-		"accent": "#5e9cff",
-		"accentBright": "#8ab4ff",
-		"purple": "#c084fc",
-		"pink": "#f472b6",
-		"cyan": "#67e8f9",
-		"blue": "#60a5fa",
-		"green": "#4ade80",
-		"red": "#fb7185",
-		"yellow": "#facc15",
-		"orange": "#fb923c",
-		"text": "#e4e4e7",
-		"muted": "#a1a1aa",
-		"dim": "#71717a",
-		"selectedBg": "#252035",
-		"userMessageBg": "#1e1e2e",
-		"toolPendingBg": "#1b1924",
-		"toolSuccessBg": "#1e1e2e",
-		"toolErrorBg": "#2a1b22",
-		"customMessageBg": "#211c30"
+		"fg": "#d6dde3",
+		"fgMuted": "#929eab",
+		"fgSubtle": "#768494",
+		"canvas": "#0d1117",
+		"canvasSubtle": "#1c2033",
+		"canvasInset": "#161a2b",
+		"border": "#1c2d44",
+		"borderMuted": "#16233a",
+		"blue": "#4f9eff",
+		"blueBright": "#79c0ff",
+		"green": "#37b34a",
+		"red": "#ff6e62",
+		"redSoft": "#ff7b72",
+		"yellow": "#cb9214",
+		"orange": "#f0883e",
+		"orangeSoft": "#ffa657",
+		"purple": "#be8fff",
+		"pink": "#f778ba",
+		"cyan": "#39c5cf",
+		"selection": "#1a4480",
+		"diffAddBg": "#0f2a24",
+		"diffDelBg": "#261418"
 	},
 	"colors": {
-		"accent": "accent",
+		"accent": "blue",
 		"border": "border",
-		"borderAccent": "accent",
+		"borderAccent": "blue",
 		"borderMuted": "borderMuted",
 		"success": "green",
 		"error": "red",
 		"warning": "yellow",
-		"muted": "muted",
-		"dim": "dim",
-		"text": "text",
-		"thinkingText": "muted",
-		"selectedBg": "selectedBg",
-		"scrollbarThumb": "selectedBg",
-		"userMessageBg": "userMessageBg",
-		"userMessageText": "text",
-		"customMessageBg": "customMessageBg",
-		"customMessageText": "text",
-		"customMessageLabel": "purple",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolTitle": "accentBright",
-		"toolOutput": "muted",
-		"mdHeading": "accentBright",
-		"mdLink": "cyan",
-		"mdLinkUrl": "muted",
-		"mdCode": "accentBright",
-		"mdCodeBlock": "text",
+		"muted": "fgMuted",
+		"dim": "#71717a",
+		"text": "fg",
+		"thinkingText": "fgMuted",
+		"selectedBg": "selection",
+		"scrollbarTrack": "borderMuted",
+		"scrollbarThumb": "#3a5274",
+		"searchMatchBg": "#1e1800",
+		"searchMatchText": "fg",
+		"userMessageBg": "canvasSubtle",
+		"userMessageText": "fg",
+		"customMessageBg": "borderMuted",
+		"customMessageText": "fgMuted",
+		"customMessageLabel": "blue",
+		"toolPendingBg": "canvasSubtle",
+		"toolSuccessBg": "diffAddBg",
+		"toolErrorBg": "diffDelBg",
+		"toolTitle": "fg",
+		"toolOutput": "fgMuted",
+		"mdHeading": "blueBright",
+		"mdLink": "blue",
+		"mdLinkUrl": "fgMuted",
+		"mdCode": "#a5d6ff",
+		"mdCodeBlock": "fg",
 		"mdCodeBlockBorder": "border",
-		"mdQuote": "muted",
-		"mdQuoteBorder": "accent",
-		"mdHr": "borderMuted",
-		"mdListBullet": "accent",
+		"mdQuote": "fgMuted",
+		"mdQuoteBorder": "#2a4060",
+		"mdHr": "border",
+		"mdListBullet": "blueBright",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "muted",
-		"syntaxComment": "#6b7280",
-		"syntaxKeyword": "pink",
-		"syntaxFunction": "accentBright",
-		"syntaxVariable": "blue",
-		"syntaxString": "green",
-		"syntaxNumber": "orange",
-		"syntaxType": "cyan",
-		"syntaxOperator": "text",
-		"syntaxPunctuation": "muted",
-		"thinkingOff": "muted",
-		"thinkingMinimal": "dim",
+		"toolDiffContext": "fgMuted",
+		"syntaxComment": "fgMuted",
+		"syntaxKeyword": "redSoft",
+		"syntaxFunction": "purple",
+		"syntaxVariable": "orangeSoft",
+		"syntaxString": "#a5d6ff",
+		"syntaxNumber": "blueBright",
+		"syntaxType": "orange",
+		"syntaxOperator": "redSoft",
+		"syntaxPunctuation": "fg",
+		"thinkingOff": "fgMuted",
+		"thinkingMinimal": "fgSubtle",
 		"thinkingLow": "blue",
-		"thinkingMedium": "accent",
-		"thinkingHigh": "accentBright",
-		"thinkingXhigh": "#4db9cd",
+		"thinkingMedium": "blue",
+		"thinkingHigh": "blueBright",
+		"thinkingXhigh": "cyan",
 		"thinkingMax": "cyan",
 		"bashMode": "green"
 	},
 	"export": {
-		"pageBg": "bg",
-		"cardBg": "panel",
-		"infoBg": "surface"
+		"pageBg": "#0a1424",
+		"cardBg": "canvasSubtle",
+		"infoBg": "#122544"
 	}
 }