pi-cc-extensions 0.8.68 → 0.8.70

package/extensions/renderer/tool/names.ts

@@ -1,3 +1,5 @@
+import { posix, win32 } from "node:path";
+import { visibleWidth } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
 import { oneLine } from "../../utils/format.ts";
 
@@ -31,8 +33,107 @@ export type ToolCallSummaryOptions = {
 	title?: string;
 	/** 文案变体；缺省 "default"。 */
 	variant?: ToolCallSummaryVariant;
+	/** 工具执行目录；仅用于生成展示路径，不修改调用参数。 */
+	cwd?: string;
 };
 
+export type ToolCallSummary = {
+	main: string;
+	detail: string;
+	/** 路径摘要保留结构，供最终渲染按实际宽度优先保留文件名。 */
+	path?: { prefix: string; value: string };
+};
+
+function pathApi(value: string) {
+	if (win32.isAbsolute(value)) return win32;
+	if (posix.isAbsolute(value)) return posix;
+	return undefined;
+}
+
+/** cwd 内绝对路径转相对路径；cwd 外路径保持不变。 */
+export function displayPath(value: unknown, cwd?: string): string {
+	const text = oneLine(value, 4096);
+	const base = cwd ? oneLine(cwd, 4096) : "";
+	const api = pathApi(text);
+	if (!api || !base || !api.isAbsolute(base)) return text;
+	const relative = api.relative(base, text);
+	if (!relative) return api.basename(text) || ".";
+	if (relative === ".." || relative.startsWith(`..${api.sep}`) || api.isAbsolute(relative)) {
+		return text;
+	}
+	return relative;
+}
+
+function headToWidth(text: string, width: number, ellipsis = ""): string {
+	if (visibleWidth(text) <= width) return text;
+	if (width <= 0) return "";
+	const suffix = visibleWidth(ellipsis) <= width ? ellipsis : "";
+	const contentWidth = width - visibleWidth(suffix);
+	let head = "";
+	for (const char of Array.from(text)) {
+		if (visibleWidth(head + char) > contentWidth) break;
+		head += char;
+	}
+	return head + suffix;
+}
+
+function tailToWidth(text: string, width: number): string {
+	if (width <= 0) return "";
+	let tail = "";
+	for (const char of Array.from(text).reverse()) {
+		if (visibleWidth(char + tail) > width) break;
+		tail = char + tail;
+	}
+	return tail;
+}
+
+/** 中间截断路径：目录保留开头，末尾优先完整保留文件名。 */
+export function truncatePathToWidth(path: string, width: number): string {
+	if (visibleWidth(path) <= width) return path;
+	if (width <= 1) return width === 1 ? "…" : "";
+	const separatorIndex = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
+	const filename = separatorIndex >= 0 ? path.slice(separatorIndex + 1) : path;
+	const filenameWidth = visibleWidth(filename);
+	if (separatorIndex >= 0 && filenameWidth + 1 <= width) {
+		const separator = path[separatorIndex]!;
+		const suffix = `${separator}${filename}`;
+		const prefixWidth = width - visibleWidth(suffix) - 1;
+		const prefix = headToWidth(path.slice(0, separatorIndex), Math.max(0, prefixWidth));
+		return `${prefix}…${prefix ? suffix : filename}`;
+	}
+	const leftWidth = Math.max(1, Math.floor((width - 1) * 0.45));
+	const rightWidth = Math.max(0, width - leftWidth - 1);
+	return `${headToWidth(filename, leftWidth)}…${tailToWidth(filename, rightWidth)}`;
+}
+
+/** 路径展示的统一入口：相对化后按配置和当前可用宽度截断。 */
+export function formatDisplayPath(value: unknown, cwd: string | undefined, width: number): string {
+	return truncatePathToWidth(displayPath(value, cwd), Math.min(width, config.inputClip));
+}
+
+/** 按最终终端宽度渲染摘要；路径摘要不会再被整行头部截断。 */
+export function fitToolCallSummary(summary: ToolCallSummary, width: number): string {
+	if (!summary.path) return headToWidth(summary.main, width, "…");
+	const prefix = summary.path.prefix;
+	const pathWidth = Math.max(0, width - visibleWidth(prefix) - 1);
+	if (pathWidth <= 0) return headToWidth(prefix, width, "…");
+	return `${prefix} ${truncatePathToWidth(summary.path.value, Math.min(pathWidth, config.inputClip))}`;
+}
+
+function pathSummary(
+	prefix: string,
+	value: unknown,
+	cwd: string | undefined,
+	detail = "",
+): ToolCallSummary {
+	const path = displayPath(value, cwd);
+	return {
+		main: `${prefix} ${truncatePathToWidth(path, config.inputClip)}`,
+		detail,
+		path: { prefix, value: path },
+	};
+}
+
 /**
  * 单工具调用摘要（{ main, detail }）。
  *
@@ -43,7 +144,7 @@ export function toolCallSummary(
 	toolName: string,
 	args: any,
 	opts: ToolCallSummaryOptions = {},
-): { main: string; detail: string } {
+): ToolCallSummary {
 	const title = opts.title ?? humanizeToolLabel(toolName);
 	const variant = opts.variant ?? "default";
 	if (!args || typeof args !== "object") return { main: title, detail: "" };
@@ -106,15 +207,13 @@ export function toolCallSummary(
 			args.offset !== undefined ? `offset=${args.offset}` : "",
 			args.limit !== undefined ? `limit=${args.limit}` : "",
 		].filter(Boolean);
-		if (variant === "grouping") {
-			return {
-				main: `Read ${clip(args.path || "...")}`,
-				detail: details.length ? ` (${details.join(", ")})` : "",
-			};
+		const detail = details.length ? ` (${details.join(", ")})` : "";
+		if (typeof args.path === "string" && args.path) {
+			return pathSummary(variant === "grouping" ? "Read" : title, args.path, opts.cwd, detail);
 		}
 		return {
-			main: `${title}${args.path ? ` ${clip(args.path)}` : ""}`,
-			detail: details.length ? ` (${details.join(", ")})` : "",
+			main: variant === "grouping" ? "Read ..." : title,
+			detail,
 		};
 	}
 	if (variant === "grouping") {
@@ -135,9 +234,11 @@ export function toolCallSummary(
 		}
 	}
 	if (variant === "default") {
+		const preferredPath = args.path ?? args.file_path;
+		if (typeof preferredPath === "string" && preferredPath) {
+			return pathSummary(title, preferredPath, opts.cwd);
+		}
 		const preferred =
-			args.path ??
-			args.file_path ??
 			args.command ??
 			args.query ??
 			args.question ??

package/extensions/renderer/tool/result.ts

@@ -204,7 +204,7 @@ export class ExpandedToolResultText {
 	}
 }
 
-/** Affordance next to truncated Input/Output headers — click opens full preview. */
+/** 截断体末行 `… +N more lines` 旁的展开提示，点击打开全量预览。 */
 export const SHOW_MORE_LABEL = "• click to show more";
 
 export type ToolIoSection = "input" | "output";
@@ -251,8 +251,8 @@ export class ExpandedToolIoView {
 		inputBody: string,
 		outputBody: string,
 		isError: boolean,
-		maxOutputLines = config.expandedPreviewMaxLines,
-		maxInputLines = config.expandedPreviewMaxLines,
+		maxOutputLines = config.expandedOutputMaxLines,
+		maxInputLines = config.expandedInputMaxLines,
 		flushLeft = false,
 	) {
 		this.theme = theme;
@@ -309,12 +309,12 @@ export class ExpandedToolIoView {
 		this.invalidate();
 	}
 
-	/** True when the plain header line is a truncated section with show-more. */
+	/** True when the plain truncation footer carries show-more. Input 续行带 │，Output 不带。 */
 	matchShowMoreLine(plainLine: string): ToolIoSection | null {
 		const line = plainLine.replace(/\x1b\[[0-9;]*m/g, "");
-		if (!line.includes(` • ${showMoreHintText()}`)) return null;
-		if (/\bInput\b/.test(line) && this.truncated.input) return "input";
-		if (/\bOutput\b/.test(line) && this.truncated.output) return "output";
+		if (!line.includes(` • ${showMoreHintText()}`) || !/\+\d+ more lines/.test(line)) return null;
+		if (this.truncated.input && line.includes("│")) return "input";
+		if (this.truncated.output) return "output";
 		return null;
 	}
 
@@ -360,24 +360,13 @@ export class ExpandedToolIoView {
 		this.truncated = { input: false, output: false };
 		this.showMoreHeaderRows = {};
 
-		const pushHeader = (
-			corner: "├" | "└",
-			label: string,
-			section: ToolIoSection,
-			showMore: boolean,
-		) => {
+		const pushHeader = (corner: "├" | "└", label: string) => {
 			const mark = theme.fg("dim", `${lead}${corner} `);
 			const title = theme.fg(
 				"accent",
 				typeof theme.bold === "function" ? theme.bold(label) : label,
 			);
-			// hover 只高亮文字，圆点保持 dim（与 group hint 一致）。
-			const more = showMore
-				? theme.fg("dim", " •") +
-					theme.fg(this.hoveredSection === section ? "text" : "dim", ` ${showMoreHintText()}`)
-				: "";
-			if (showMore) this.showMoreHeaderRows[section] = lines.length;
-			lines.push(truncateToWidth(mark + title + more, safeWidth, ""));
+			lines.push(truncateToWidth(mark + title, safeWidth, ""));
 		};
 
 		const pushRailLine = (styledContent: string, continued = true) => {
@@ -400,7 +389,7 @@ export class ExpandedToolIoView {
 
 		const pushBody = (
 			body: string,
-			opts: { input?: boolean; limit: number; continued?: boolean },
+			opts: { input?: boolean; limit: number; continued?: boolean; section: ToolIoSection },
 		): boolean /* truncated */ => {
 			const raw = body.replace(/\t/g, "   ").replace(/\n+$/, "");
 			if (!raw.trim()) {
@@ -423,7 +412,15 @@ export class ExpandedToolIoView {
 			if (truncated) {
 				const hidden = Math.max(0, wrapped.length - visible.length);
 				if (hidden > 0) {
-					pushRailLine(theme.fg("dim", `… +${hidden} more lines`), opts.continued);
+					// hover 只高亮文字，圆点保持 dim（与 group hint 一致）。
+					const more =
+						theme.fg("dim", " •") +
+						theme.fg(
+							this.hoveredSection === opts.section ? "text" : "dim",
+							` ${showMoreHintText()}`,
+						);
+					pushRailLine(theme.fg("dim", `… +${hidden} more lines`) + more, opts.continued);
+					this.showMoreHeaderRows[opts.section] = lines.length - 1;
 				}
 			}
 			return truncated;
@@ -447,20 +444,29 @@ export class ExpandedToolIoView {
 
 		if (hasInput) {
 			this.truncated.input = inputWouldTruncate;
-			pushHeader("├", "Input", "input", inputWouldTruncate);
+			pushHeader("├", "Input");
 			pushBody(this.inputBody, {
 				input: true,
 				limit: this.maxInputLines,
 				continued: true,
+				section: "input",
 			});
 			pushBlankRail();
 			this.truncated.output = outputWouldTruncate;
-			pushHeader("└", "Output", "output", outputWouldTruncate);
-			pushBody(outputText, { limit: this.maxOutputLines, continued: false });
+			pushHeader("└", "Output");
+			pushBody(outputText, {
+				limit: this.maxOutputLines,
+				continued: false,
+				section: "output",
+			});
 		} else {
 			this.truncated.output = outputWouldTruncate;
-			pushHeader("└", "Output", "output", outputWouldTruncate);
-			pushBody(outputText, { limit: this.maxOutputLines, continued: false });
+			pushHeader("└", "Output");
+			pushBody(outputText, {
+				limit: this.maxOutputLines,
+				continued: false,
+				section: "output",
+			});
 		}
 
 		this.cachedWidth = width;
@@ -663,13 +669,21 @@ export function renderExpandedToolResult(
 ): ExpandedToolIoView | ExpandedToolResultText | Text {
 	const inputBody = formatToolInputArgs(args);
 	const outputBody = body;
-	const maxLines = config.expandedPreviewMaxLines;
+	const maxOutputLines = config.expandedOutputMaxLines;
+	const maxInputLines = config.expandedInputMaxLines;
 
 	// Prefer structured Input/Output when we have args or non-empty output.
 	if (inputBody.trim() || outputBody.trim()) {
 		let view: ExpandedToolIoView;
 		if (isExpandedToolIoView(lastComponent)) {
-			lastComponent.setContent(inputBody, outputBody, isError, maxLines, maxLines, flushLeft);
+			lastComponent.setContent(
+				inputBody,
+				outputBody,
+				isError,
+				maxOutputLines,
+				maxInputLines,
+				flushLeft,
+			);
 			view = lastComponent;
 		} else {
 			view = new ExpandedToolIoView(
@@ -677,8 +691,8 @@ export function renderExpandedToolResult(
 				inputBody,
 				outputBody,
 				isError,
-				maxLines,
-				maxLines,
+				maxOutputLines,
+				maxInputLines,
 				flushLeft,
 			);
 		}

package/extensions/utils/patch-keys.ts

@@ -18,13 +18,10 @@ export const COMPACT_THINKING_PATCH_KEY = Symbol.for("pi.ccstyle.compact-thinkin
 export const PROTOTYPE_ORIGINAL_KEY = Symbol.for("pi.ccstyle.prototype-original");
 export const COMPACT_THINKING_OWNER = Symbol.for("pi.ccstyle.compact-thinking-owner");
 
-// ── assistant 展开状态（实例标记；description 供旧模块按 symbol.description 清理） ──
-export const ASSISTANT_SET_EXPANDED_DESCRIPTION = "pi.ccstyle.compact-assistant-set-expanded";
-export const ASSISTANT_TOGGLE_ROUND_DESCRIPTION = "pi.ccstyle.compact-assistant-toggle-round";
-export const ASSISTANT_REENTRY_DESCRIPTION = "pi.ccstyle.compact-assistant-reentry";
-export const ASSISTANT_SET_EXPANDED_KEY = Symbol.for(ASSISTANT_SET_EXPANDED_DESCRIPTION);
-export const ASSISTANT_TOGGLE_ROUND_KEY = Symbol.for(ASSISTANT_TOGGLE_ROUND_DESCRIPTION);
-export const ASSISTANT_REENTRY_KEY = Symbol.for(ASSISTANT_REENTRY_DESCRIPTION);
+// ── assistant 展开状态（实例标记） ──
+export const ASSISTANT_SET_EXPANDED_KEY = Symbol.for("pi.ccstyle.compact-assistant-set-expanded");
+export const ASSISTANT_TOGGLE_ROUND_KEY = Symbol.for("pi.ccstyle.compact-assistant-toggle-round");
+export const ASSISTANT_REENTRY_KEY = Symbol.for("pi.ccstyle.compact-assistant-reentry");
 
 // ── 工具渲染补丁 ──
 export const GLOBAL_TOOL_RENDER_PATCH = Symbol.for("pi.ccstyle.global-tool-render-patch");
@@ -36,9 +33,6 @@ export const TOOL_EXPANDED_BACKGROUND_PATCH = Symbol.for(
 // ── 消息组件补丁 ──
 export const MESSAGE_DISPLAY_PATCH = Symbol.for("pi.ccstyle.message-display-patch");
 
-// ── 压缩渲染补丁（/reload 残留 deactivate 用） ──
-export const GLOBAL_COMPACTION_RENDER_PATCH = Symbol.for("pi.ccstyle.compaction-render-patch");
-
 // ── 工具分组 ──
 export const TOOL_GROUPING_PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patch");
 export const TOOL_GROUPING_PARENT_KEY = Symbol.for("pi.ccstyle.tool-grouping-parent");

package/extensions/utils/sgr-mouse.ts

@@ -53,6 +53,12 @@ export function isSgrLeftPress(packet: SgrMousePacket): boolean {
 	return packet.final === "M" && baseButton === 0 && (packet.code & 32) === 0;
 }
 
+/** 是否为左键松开。 */
+export function isSgrLeftRelease(packet: SgrMousePacket): boolean {
+	const baseButton = mouseBaseButton(packet.code);
+	return packet.final === "m" && baseButton === 0 && (packet.code & 32) === 0;
+}
+
 /** 剥离修饰键位（4/8/16/32：shift/meta/ctrl/motion），得到基础按键码。 */
 export function mouseBaseButton(code: number): number {
 	return code & ~(4 | 8 | 16 | 32);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.68",
+	"version": "0.8.70",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",
@@ -39,10 +39,10 @@
 	},
 	"scripts": {
 		"test": "node --test tests/**/*.test.ts",
-		"typecheck": "node scripts/typecheck.mjs",
+		"typecheck": "tsc --noEmit",
 		"format": "biome format --write .",
 		"format:check": "biome format .",
-		"docs:tool-render": "node scripts/generate-tool-render-examples.mjs",
+		"docs:tool-render": "node --experimental-strip-types scripts/generate-tool-render-examples.ts",
 		"lint": "biome check .",
 		"preversion": "npm run format && npm run lint && npm run typecheck && npm test && npm run docs:tool-render",
 		"release": "npm version patch && npm publish",