pi-cc-extensions 0.8.69 → 0.8.70

package/extensions/renderer/compact-mode.ts

@@ -36,8 +36,8 @@ import { renderRichToolResult } from "./tool/diff/index.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
 import { insetComponent, renderExpandedToolResult, scheduleAnimation } from "./tool/result.ts";
-import { oneLine } from "../utils/format.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
+import { formatDisplayPath } from "./tool/names.ts";
 import { hasVisibleText, stripBackgroundAnsi } from "../utils/ansi-text.ts";
 import { walkComponentTree } from "../utils/component-tree.ts";
 import {
@@ -502,13 +502,12 @@ function compactEditWriteLine(
 	const theme = themeOf();
 	const name = String(component.toolName ?? "tool");
 	const args = component.args ?? {};
-	const path = sanitizeToolResultText(
+	const path =
 		typeof args.path === "string" && args.path
 			? args.path
 			: typeof args.file_path === "string" && args.file_path
 				? args.file_path
-				: "",
-	);
+				: "";
 	const isError = component.result?.isError === true;
 	const isPending = !component.result || component.isPartial === true;
 	const icon = isError ? "✗" : isPending ? toolLoadingIcon() : "✓";
@@ -542,7 +541,8 @@ function compactEditWriteLine(
 		visibleWidth(statsText) +
 		visibleWidth(hintText);
 	const pathWidth = Math.max(0, width - fixedWidth - (path ? 1 : 0));
-	const pathPart = pathWidth > 0 && path ? ` ${oneLine(path, pathWidth)}` : "";
+	const pathPart =
+		pathWidth > 0 && path ? ` ${formatDisplayPath(path, component.cwd, pathWidth)}` : "";
 	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintText ? theme.fg("dim", hintText) : ""}`;
 	return ["", truncateToWidth(line, width, "")];
 }

package/extensions/renderer/default-mode.ts

@@ -17,7 +17,6 @@ import { isToolCallHovered } from "./mouse/hover.ts";
 import {
 	countLines,
 	hasExpandableDetail,
-	headTruncateToWidth,
 	insetComponent,
 	isToolExpanded,
 	outputLineCount,
@@ -37,7 +36,7 @@ import { showMoreHintText } from "./tool/show-more-hint.ts";
 import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult, type WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
+import { fitToolCallSummary, humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
 
 // 成功勾：亮绿 truecolor（与 message-display 一致）
 const BRIGHT_GREEN = "\x1b[38;2;80;220;100m";
@@ -235,6 +234,7 @@ function createCcstyleTool(
 			const summary = toolCallSummary(toolName, args, {
 				title: label === toolName ? humanizeToolLabel(label) : label,
 				variant: "default",
+				cwd: context?.cwd,
 			});
 			let writeStatsText = "";
 			let writeStatsStyled = "";
@@ -267,8 +267,8 @@ function createCcstyleTool(
 					);
 					const mainWidth = Math.max(0, callWidth - visibleWidth(extraText));
 					cachedWidth = width;
-					// 纯文本先截断再着色（省略号不带 ANSI）；从头截断，与多 tool 一致
-					cachedLine = `${lead}${icon} ${theme.fg("toolTitle", headTruncateToWidth(summary.main, mainWidth))}${extraStyled}`;
+					// 路径按最终可用宽度中间截断，避免整行二次截断隐藏文件名。
+					cachedLine = `${lead}${icon} ${theme.fg("toolTitle", fitToolCallSummary(summary, mainWidth))}${extraStyled}`;
 					return [truncateToWidth(cachedLine, viewportWidth, "")];
 				},
 				invalidate() {},

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

@@ -40,6 +40,9 @@ export interface DiffStats {
 
 const CANONICAL_LINE_PATTERN = /^([+\- ])(\s*\d+)\|(.*)$/;
 const HASHLINE_ANCHOR_LINE_PATTERN = /^([+\- ])(\s*\d+)#([A-Za-z0-9]+| {2}):(.*)$/;
+// Pi still emits space-separated numbered rows, unlike OMP's pipe-delimited format.
+const PI_LINE_PATTERN = /^([+\- ])(\s*\d+)\s(.*)$/;
+const PI_OMISSION_LINE_PATTERN = /^ {3,}\.\.\.$/;
 const HUNK_HEADER_PATTERN = /^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@(.*)$/;
 const MIN_LINE_NUMBER_WIDTH = 2;
 
@@ -62,7 +65,10 @@ function toParsedDiffLine(
 	return { lineKind: "context", lineNumber: normalizedLineNumber, content };
 }
 
-function parseCanonicalDiffLine(line: string): {
+function parseCanonicalDiffLine(
+	line: string,
+	allowPiFormat: boolean,
+): {
 	lineKind: DiffLineKind;
 	lineNumber: string;
 	content: string;
@@ -80,7 +86,8 @@ function parseCanonicalDiffLine(line: string): {
 		};
 	}
 
-	const match = line.match(CANONICAL_LINE_PATTERN);
+	const match =
+		line.match(CANONICAL_LINE_PATTERN) ?? (allowPiFormat ? line.match(PI_LINE_PATTERN) : null);
 	return match ? toParsedDiffLine(match[1] ?? " ", match[2] ?? "", match[3] ?? "") : null;
 }
 
@@ -187,12 +194,14 @@ export function parseDiff(diffText: string): ParsedDiff {
 	let oldLineCursor: number | null = null;
 	let newLineCursor: number | null = null;
 	let lineNumberDelta = 0;
+	let hasHunkHeader = false;
 
 	for (const rawLine of diffText.replace(/\r/g, "").split("\n")) {
 		stats.lines++;
 
 		const hunkMatch = rawLine.match(HUNK_HEADER_PATTERN);
 		if (hunkMatch) {
+			hasHunkHeader = true;
 			hunkIndex++;
 			stats.hunks = Math.max(stats.hunks, hunkIndex);
 			oldLineCursor = toNumber(hunkMatch[1]);
@@ -217,7 +226,14 @@ export function parseDiff(diffText: string): ParsedDiff {
 			lineNumberDelta = 0;
 		}
 
-		const canonical = parseCanonicalDiffLine(rawLine);
+		// Pi pads omitted context with a blank line number; it is not a source row.
+		if (!hasHunkHeader && PI_OMISSION_LINE_PATTERN.test(rawLine)) {
+			entries.push(createMetaEntry(rawLine, hunkIndex));
+			continue;
+		}
+
+		// Pi's headerless format is ambiguous with numeric source text in unified hunks.
+		const canonical = parseCanonicalDiffLine(rawLine, !hasHunkHeader);
 		if (canonical) {
 			hunkIndex = ensureImplicitHunk(hunkIndex);
 			stats.hunks = Math.max(stats.hunks, hunkIndex);

package/extensions/renderer/tool/grouping.ts

@@ -10,7 +10,12 @@ import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-load
 import { isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
 import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
-import { humanizeToolLabel, toolCallSummary } from "./names.ts";
+import {
+	fitToolCallSummary,
+	humanizeToolLabel,
+	toolCallSummary,
+	type ToolCallSummary,
+} from "./names.ts";
 import {
 	patchRegistry,
 	TOOL_GROUPING_GENERATION_KEY as GENERATION_KEY,
@@ -142,8 +147,11 @@ export function paddedBackgroundRow(
 	return `${bgAnsi}${stable}\x1b[49m`;
 }
 
-function toolSummary(tool: any): { main: string; detail: string } {
-	return toolCallSummary(toolName(tool), tool?.args ?? {}, { variant: "grouping" });
+function toolSummary(tool: any): ToolCallSummary {
+	return toolCallSummary(toolName(tool), tool?.args ?? {}, {
+		variant: "grouping",
+		cwd: tool?.cwd,
+	});
 }
 
 function toolNameList(tools: any[]): string {
@@ -331,11 +339,14 @@ export class ToolGroupComponent extends Container {
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
 				const summary = toolSummary(tool);
+				const prefix = ` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} `;
+				const detail = fg("dim", summary.detail);
+				const mainWidth = Math.max(0, width - visibleWidth(prefix) - visibleWidth(detail));
 				lines.push(
 					truncateToWidth(
-						` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} ${fg("toolTitle", summary.main)}${fg("dim", summary.detail)}`,
+						`${prefix}${fg("toolTitle", fitToolCallSummary(summary, mainWidth))}${detail}`,
 						width,
-						"…",
+						"",
 					),
 				);
 				continue;

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.69",
+	"version": "0.8.70",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",