pi-cc-extensions 1.0.0 → 1.0.2

package/extensions/renderer/tool/grouping.ts

@@ -22,7 +22,7 @@ import {
 } from "./codemode.ts";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { mcpToolTitle } from "./mcp-title.ts";
-import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
+import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./names.ts";
 import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 import {
@@ -33,14 +33,8 @@ import {
 	toolCallSummary,
 	type ToolCallSummary,
 } from "./names.ts";
-import {
-	collapsedResultSummary,
-	formatToolDuration,
-	headTruncateToWidth,
-	isLiveToolCall,
-	textFromResult,
-	toolViewportWidth,
-} from "./result.ts";
+import { formatToolDuration, headTruncateToWidth, toolViewportWidth } from "./result.ts";
+import { isLiveToolCall } from "./tool-state.ts";
 import {
 	patchRegistry,
 	TOOL_GROUPING_GENERATION_KEY as GENERATION_KEY,
@@ -263,8 +257,8 @@ function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
 }
 
 /**
- * 组内 shell 行的尾巴：只报耗时（`· 12.4s`）。行数是冗余信息，展开就能看到；
- * 失败另报错误首行，那条不该只在展开后可见。
+ * 组内 shell 行的尾巴：只报耗时（`· 12.4s`）。输出和错误正文都在展开后看；
+ * 失败靠行首的 ✗，组头另有 failed 计数。
  * 耗时取 pi 记在结果上的 durationMs（单卡渲染上下文里的同一个值），运行中还拿不到就不报。
  */
 function shellResultTail(
@@ -273,23 +267,59 @@ function shellResultTail(
 	toolStatus: ToolStatus,
 ): string {
 	if (!SHELL_TOOL_NAMES.has(toolName(tool)) || toolStatus === "pending" || !tool?.result) return "";
-	const isError = tool.result?.isError === true;
-	// 失败报错误首行（不该只在展开后可见）；成功只报耗时，行数是冗余信息。
-	const failure = isError
-		? collapsedResultSummary({
-				result: tool.result,
-				toolName: toolName(tool),
-				text: textFromResult(tool.result),
-				isError: true,
-			})
-		: "";
 	const durationMs = tool.result?.durationMs;
 	const duration =
 		typeof durationMs === "number" && Number.isFinite(durationMs) && durationMs >= 0
 			? formatToolDuration(durationMs)
 			: "";
-	const tail = [failure, duration].filter(Boolean).join(" · ");
-	return tail ? ` ${fg("dim", `· ${tail}`)}` : "";
+	return duration ? ` ${fg("dim", `· ${duration}`)}` : "";
+}
+
+/** 分组折叠态的一行子工具：`├/└` + 状态图标 + 与组内同一套摘要。 */
+function collapsedGroupToolLine(
+	tool: any,
+	last: boolean,
+	fg: (color: string, text: string) => string,
+	width: number,
+): string {
+	const toolStatus = status(tool);
+	const color = toolStatus === "pending" ? "accent" : toolStatus;
+	const summary = askUserResultSummary(tool) ?? codemodeResultSummary(tool) ?? toolSummary(tool);
+	const prefix = ` ${fg("dim", last ? "└" : "├")} ${fg(color, statusIcon(toolStatus))} `;
+	const detail = fg("dim", summary.detail);
+	const result = shellResultTail(tool, fg, toolStatus);
+	const rowWidth = toolViewportWidth(width);
+	const mainWidth = Math.max(
+		0,
+		rowWidth - visibleWidth(prefix) - visibleWidth(detail) - visibleWidth(result),
+	);
+	return truncateToWidth(
+		`${prefix}${renderToolSummary(summary, mainWidth, fg)}${detail}${result}`,
+		rowWidth,
+		"",
+	);
+}
+
+type GroupHeaderCounts = { pending: number; success: number; error: number };
+
+/** 组头计数：`2 done · 1 failed`。没有计数时返回空串。 */
+function groupCountText(
+	counts: GroupHeaderCounts,
+	fg: (color: string, text: string) => string,
+): string {
+	return (["pending", "success", "error"] as const)
+		.filter((key) => counts[key])
+		.map((key) => {
+			const label = key === "pending" ? "running" : key === "success" ? "done" : "failed";
+			const color = key === "pending" ? "accent" : key;
+			return `${fg(color, String(counts[key]))} ${label}`;
+		})
+		.join(` ${fg("dim", "·")} `);
+}
+
+/** 组头圆点色：有失败取 error，否则有运行中取 accent，否则 success。 */
+function groupOverallStatus(counts: GroupHeaderCounts): ToolStatus {
+	return counts.error ? "error" : counts.pending ? "pending" : "success";
 }
 
 /**
@@ -464,17 +494,10 @@ export class ToolGroupComponent extends Container {
 		const fg = (color: string, text: string) => theme?.fg?.(color, text) ?? text;
 		const counts = { pending: 0, success: 0, error: 0 };
 		for (const tool of this.children) counts[status(tool)]++;
-		const countText = (["pending", "success", "error"] as const)
-			.filter((key) => counts[key])
-			.map((key) => {
-				const label = key === "pending" ? "running" : key === "success" ? "done" : "failed";
-				const color = key === "pending" ? "accent" : key;
-				return `${fg(color, String(counts[key]))} ${label}`;
-			})
-			.join(` ${fg("dim", "·")} `);
+		const countText = groupCountText(counts, fg);
 		const names = new Set(this.children.map(toolName));
 		const label = names.size === 1 ? toolTitle(this.children[0]) : "Multiple Tools";
-		const overall: ToolStatus = counts.error ? "error" : counts.pending ? "pending" : "success";
+		const overall = groupOverallStatus(counts);
 		if ((this.children as any[]).some(isAnimatingTool)) scheduleGroupAnimation(this.patch);
 		const overallColor = overall === "pending" ? "accent" : overall;
 		// 圆点保持 dim；hover 只高亮可点击文字。
@@ -519,24 +542,7 @@ export class ToolGroupComponent extends Container {
 			const branch = index === total - 1 ? "└" : "├";
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
-				const summary =
-					askUserResultSummary(tool) ?? codemodeResultSummary(tool) ?? toolSummary(tool);
-				const prefix = ` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} `;
-				const detail = fg("dim", summary.detail);
-				const result = shellResultTail(tool, fg, toolStatus);
-				// 与单工具卡标题同宽，宽屏右侧留白一致
-				const rowWidth = toolViewportWidth(width);
-				const mainWidth = Math.max(
-					0,
-					rowWidth - visibleWidth(prefix) - visibleWidth(detail) - visibleWidth(result),
-				);
-				lines.push(
-					truncateToWidth(
-						`${prefix}${renderToolSummary(summary, mainWidth, fg)}${detail}${result}`,
-						rowWidth,
-						"",
-					),
-				);
+				lines.push(collapsedGroupToolLine(tool, index === total - 1, fg, width));
 				continue;
 			}
 			const rendered = visibleLines(Array.isArray(childPaints?.[index]) ? childPaints[index] : []);

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

@@ -6,7 +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 { showMoreHintText } from "./show-more-hint.ts";
+import { showMoreHintText } from "./names.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 
 /**

package/extensions/renderer/tool/names.ts

@@ -1,6 +1,6 @@
 import { posix, win32 } from "node:path";
 import type { ThemeColor } from "@earendil-works/pi-coding-agent";
-import { visibleWidth } from "@earendil-works/pi-tui";
+import { getKeybindings, visibleWidth } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
 import { oneLine } from "../../utils/format.ts";
 import { headTruncateToWidth } from "./result.ts";
@@ -427,3 +427,43 @@ export function renderToolSummary(
 		? `${fg("toolTitle", title)}${fg("dim", headTruncateToWidth(` ${summary.payload}`, room))}`
 		: fg("toolTitle", title);
 }
+
+let toolTuiFullscreen: boolean | undefined;
+
+export function setToolTuiFullscreen(value: boolean): void {
+	toolTuiFullscreen = value;
+}
+
+export function isToolTuiFullscreen(): boolean {
+	return toolTuiFullscreen !== false;
+}
+
+function formatKeyPart(part: string): string {
+	// 与 pi 内置 keybinding-hints 一致：macOS 上 alt 显示为 option
+	return process.platform === "darwin" && part.toLowerCase() === "alt" ? "option" : part;
+}
+
+/** 默认展开快捷键（app.tools.expand）显示文本；未配置时回退 ctrl+o。 */
+export function expandShortcutText(): string {
+	const keys = getKeybindings().getKeys("app.tools.expand");
+	if (keys.length === 0) return "ctrl+o";
+	return keys
+		.join("/")
+		.split("/")
+		.map((part) => part.split("+").map(formatKeyPart).join("+"))
+		.join("/");
+}
+
+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());
+}