pi-cc-extensions 0.8.69 → 0.8.71

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/mouse/interaction.ts

@@ -37,9 +37,10 @@ import {
 	isScrollbarColumnAt,
 } from "./layout.ts";
 import {
-	disableOfficialScrollToEnd,
 	fullscreenLazyTui,
 	hideScrollButton,
+	restoreOfficialScrollToEnd,
+	syncOfficialScrollToEnd,
 	isScrollBottomInput,
 	renderScrollButton,
 	resetScrollButtonState,
@@ -878,6 +879,7 @@ export function teardownToolMouseInteraction(
 	}
 	restoreToolMouseRenderPatch();
 	restoreFullscreenViewportInput(getToolMouseTui());
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	resetScrollButtonState();
 	setToolMouseTui(null);
 	toolMouseUi = null;
@@ -893,6 +895,7 @@ export function resetToolHoverState(): void {
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	releaseFullscreenToolMouseMotion(getToolMouseTui());
 }
 
@@ -917,12 +920,12 @@ export function installToolMouseInteraction(
 		if (isLazyProxyTui(tui)) {
 			patchFullscreenViewportInput(tui);
 			ensureFullscreenToolMouseMotion(tui);
-			disableOfficialScrollToEnd(tui);
+			syncOfficialScrollToEnd(tui);
 			setScrollButtonWidget({
 				render: (width: number) => {
 					patchFullscreenViewportInput(tui);
 					ensureFullscreenToolMouseMotion(tui);
-					disableOfficialScrollToEnd(tui);
+					syncOfficialScrollToEnd(tui);
 					return renderScrollButton(width, theme);
 				},
 				invalidate() {},

package/extensions/renderer/mouse/scroll.ts

@@ -9,6 +9,7 @@ import { config } from "../../config/config.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
 import { parseSgrMousePackets } from "./packets.ts";
 import {
+	OFFICIAL_SCROLL_TO_END_KEY,
 	patchRegistry,
 	SCROLL_BUTTON_STATE_SLOT,
 	TOOL_MOUSE_TUI_SLOT,
@@ -81,7 +82,28 @@ export function fullscreenLazyTui(tui: any): boolean {
 
 /** 关掉 pi 0.85 Jump to latest overlay，避免和本仓库 dock 按钮叠两层。 */
 export function disableOfficialScrollToEnd(tui: any): void {
-	if (typeof tui?.scrollToEndIndicator === "function") tui.scrollToEndIndicator = undefined;
+	if (!tui) return;
+	const current = tui.scrollToEndIndicator;
+	if (typeof current !== "function") return;
+	// 原函数放 object 里，避免惰性 Proxy 对 function 属性再包一层。
+	if (!tui[OFFICIAL_SCROLL_TO_END_KEY]) {
+		tui[OFFICIAL_SCROLL_TO_END_KEY] = { original: current };
+	}
+	tui.scrollToEndIndicator = undefined;
+}
+
+/** /ccstyle off 或 teardown 时还回官方 overlay。 */
+export function restoreOfficialScrollToEnd(tui: any): void {
+	if (!tui) return;
+	const original = tui[OFFICIAL_SCROLL_TO_END_KEY]?.original;
+	if (typeof original === "function") tui.scrollToEndIndicator = original;
+	tui[OFFICIAL_SCROLL_TO_END_KEY] = undefined;
+}
+
+/** on/compact 用 dock 按钮；off 还回 pi 原生 Jump to latest。 */
+export function syncOfficialScrollToEnd(tui: any): void {
+	if (toolMouseInteractionActive()) disableOfficialScrollToEnd(tui);
+	else restoreOfficialScrollToEnd(tui);
 }
 
 /** 官方 fullscreen：是否已跟随 transcript 底部（按钮隐藏条件）。 */

package/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -1,7 +1,12 @@
 import { Text, type Component } from "@earendil-works/pi-tui";
 import type { EditToolDetails } from "@earendil-works/pi-coding-agent";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
-import { getLineNumberWidth, parseDiff, type ParsedDiff } from "./diff-parse.ts";
+import {
+	getLineNumberWidth,
+	parseDiff,
+	type ParsedDiff,
+	type ParsedDiffEntry,
+} from "./diff-parse.ts";
 import { buildInlineHighlightMap, buildSplitRows } from "./diff-inline.ts";
 import { resolveDiffPalette, type DiffTheme } from "./diff-palette.ts";
 import { createCodeLineHighlighter, resolveLanguageFromPath } from "./diff-highlight.ts";
@@ -44,6 +49,20 @@ function safeGetDiff(details: unknown): string {
 	return typeof typed.diff === "string" ? typed.diff : "";
 }
 
+// Pi appends an omission marker after final context to say the file continues.
+// It does not separate visible diff regions, so keep only omissions before a rendered line.
+function omitTerminalOmissions(entries: ParsedDiffEntry[]): ParsedDiffEntry[] {
+	let lastLineIndex = -1;
+	for (let index = entries.length - 1; index >= 0; index--) {
+		if (entries[index]?.kind === "line") {
+			lastLineIndex = index;
+			break;
+		}
+	}
+
+	return entries.filter((entry, index) => entry.kind !== "omission" || index < lastLineIndex);
+}
+
 /**
  * edit 变更行统计（compact 单行 `(+A -D)` 用）：复用现有 parser，diff 文件头不计入。
  * 无 diff 或解析失败时返回 undefined，不把未知状态误报为零变更。
@@ -85,22 +104,23 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("warning", `↳ unable to render diff: ${message}`), 0, 0);
 	}
 
-	if (parsed.entries.length === 0) {
+	const renderEntries = omitTerminalOmissions(parsed.entries);
+	if (renderEntries.length === 0) {
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(parsed.entries);
+	const splitRows = buildSplitRows(renderEntries);
 	const showHashlineAnchors =
 		options.expanded === true &&
-		parsed.entries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(parsed.entries, showHashlineAnchors);
+		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, parsed.entries, () => {
+	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
 		cache.invalidate();
 		options.invalidate?.();
 	});
@@ -149,7 +169,7 @@ export function renderEditDiffResult(
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
 			// Only highlight/render a prefix that can fill the display limit; full-diff
 			// LCS + syntax highlight on thousands of hidden lines is pure waste when collapsed.
-			const entryBudget = takeEntriesForLineBudget(parsed.entries, processBudget);
+			const entryBudget = takeEntriesForLineBudget(renderEntries, processBudget);
 			const splitBudget = takeSplitRowsForBudget(splitRows, processBudget);
 			const inlineHighlights = buildInlineHighlightMap(splitBudget.rows);
 			const renderCtx: DiffRenderContext = {

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

@@ -1,5 +1,10 @@
 import { normalizeCodeWhitespace } from "./diff-text.ts";
-import type { DiffLineEntry, DiffMetaEntry, ParsedDiffEntry } from "./diff-parse.ts";
+import type {
+	DiffLineEntry,
+	DiffMetaEntry,
+	DiffOmissionEntry,
+	ParsedDiffEntry,
+} from "./diff-parse.ts";
 
 export interface DiffSpan {
 	start: number;
@@ -9,6 +14,7 @@ export interface DiffSpan {
 export interface SplitDiffRow {
 	left?: DiffLineEntry;
 	right?: DiffLineEntry;
+	omission?: DiffOmissionEntry;
 	meta?: DiffMetaEntry;
 	hunkIndex: number | null;
 }
@@ -240,6 +246,12 @@ export function buildSplitRows(entries: ParsedDiffEntry[]): SplitDiffRow[] {
 			break;
 		}
 
+		if (entry.kind === "omission") {
+			rows.push({ omission: entry, hunkIndex: entry.hunkIndex || null });
+			index++;
+			continue;
+		}
+
 		if (entry.kind !== "line") {
 			rows.push({ meta: entry, hunkIndex: entry.hunkIndex || null });
 			index++;

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

@@ -16,6 +16,7 @@ import {
 	type DiffLineEntry,
 	type DiffLineKind,
 	type DiffMetaEntry,
+	type DiffOmissionEntry,
 	type ParsedDiffEntry,
 } from "./diff-parse.ts";
 import { getCellLineNumber, type DiffSpan, type SplitDiffRow } from "./diff-inline.ts";
@@ -27,6 +28,8 @@ export interface RenderedRow {
 	hunkIndex: number | null;
 }
 
+type MaterializedDiffEntry = DiffLineEntry | DiffMetaEntry;
+
 interface LineCellRenderParams {
 	kind: DiffLineKind;
 	code: string;
@@ -51,6 +54,7 @@ export interface DiffRenderContext {
 }
 
 const SPLIT_SEPARATOR = " │ ";
+const OMISSION_GLYPH = "⋮";
 const MIN_SPLIT_COLUMN_WIDTH = 24;
 
 function resolveIndicatorGlyph(
@@ -364,6 +368,29 @@ function renderLineCell(
 	);
 }
 
+// Reuse line-cell layout without treating omissions as parsed source lines.
+function createOmissionRenderLine(entry: DiffOmissionEntry, compact = false): DiffLineEntry {
+	return {
+		kind: "line",
+		lineKind: "context",
+		oldLineNumber: null,
+		newLineNumber: null,
+		fallbackLineNumber: compact ? "" : OMISSION_GLYPH,
+		content: compact ? OMISSION_GLYPH : "",
+		raw: entry.raw,
+		hunkIndex: entry.hunkIndex,
+	};
+}
+
+function materializeOmissionEntries(
+	entries: ParsedDiffEntry[],
+	compact = false,
+): MaterializedDiffEntry[] {
+	return entries.map((entry) =>
+		entry.kind === "omission" ? createOmissionRenderLine(entry, compact) : entry,
+	);
+}
+
 function pushDiffLineRows(rows: RenderedRow[], lines: string[], entry: DiffLineEntry): void {
 	rows.push(
 		...lines.map((text) => ({
@@ -374,7 +401,7 @@ function pushDiffLineRows(rows: RenderedRow[], lines: string[], entry: DiffLineE
 }
 
 function processDiffEntries(
-	entries: ParsedDiffEntry[],
+	entries: MaterializedDiffEntry[],
 	ctx: DiffRenderContext,
 	processLine: (entry: DiffLineEntry) => string[],
 ): RenderedRow[] {
@@ -395,7 +422,7 @@ export function renderUnified(
 	ctx: DiffRenderContext,
 	lineNumberWidth: number,
 ): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries), ctx, (entry) => {
 		const lineNumber =
 			entry.lineKind === "add"
 				? formatLineNumberLabel(
@@ -445,6 +472,10 @@ function toUnifiedFallbackRows(
 ): RenderedRow[] {
 	const flattened: ParsedDiffEntry[] = [];
 	for (const row of rows) {
+		if (row.omission) {
+			flattened.push(row.omission);
+			continue;
+		}
 		if (row.meta) {
 			flattened.push(row.meta);
 			continue;
@@ -460,7 +491,7 @@ function toUnifiedFallbackRows(
 }
 
 export function renderCompact(entries: ParsedDiffEntry[], ctx: DiffRenderContext): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries, true), ctx, (entry) => {
 		const codeText = normalizeCodeWhitespace(
 			getCompactLineRenderContent(entry, ctx.showHashlineAnchors),
 		);
@@ -679,8 +710,9 @@ export function renderSplit(
 			continue;
 		}
 
+		const omissionLine = row.omission ? createOmissionRenderLine(row.omission) : undefined;
 		const leftCells = renderSplitCell(
-			row.left,
+			omissionLine ?? row.left,
 			"left",
 			leftWidth,
 			splitLineNumberWidth,
@@ -694,7 +726,7 @@ export function renderSplit(
 			showHashlineAnchors,
 		);
 		const rightCells = renderSplitCell(
-			row.right,
+			omissionLine ?? row.right,
 			"right",
 			rightWidth,
 			splitLineNumberWidth,

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

@@ -2,7 +2,7 @@ import { visibleWidth } from "@earendil-works/pi-tui";
 import { fitToWidth } from "./diff-text.ts";
 
 export type DiffLineKind = "add" | "remove" | "context";
-export type DiffEntryKind = "line" | "meta" | "hunk" | "file";
+export type DiffEntryKind = "line" | "omission" | "meta" | "hunk" | "file";
 
 export interface DiffLineEntry {
 	kind: "line";
@@ -16,13 +16,19 @@ export interface DiffLineEntry {
 	hunkIndex: number;
 }
 
+export interface DiffOmissionEntry {
+	kind: "omission";
+	raw: string;
+	hunkIndex: number;
+}
+
 export interface DiffMetaEntry {
-	kind: Exclude<DiffEntryKind, "line">;
+	kind: Exclude<DiffEntryKind, "line" | "omission">;
 	raw: string;
 	hunkIndex: number;
 }
 
-export type ParsedDiffEntry = DiffLineEntry | DiffMetaEntry;
+export type ParsedDiffEntry = DiffLineEntry | DiffOmissionEntry | DiffMetaEntry;
 
 export interface ParsedDiff {
 	entries: ParsedDiffEntry[];
@@ -40,6 +46,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 +71,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 +92,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;
 }
 
@@ -156,6 +169,14 @@ function pushParsedLineEntry(
 	});
 }
 
+function createOmissionEntry(raw: string, hunkIndex: number): DiffOmissionEntry {
+	return {
+		kind: "omission",
+		raw,
+		hunkIndex,
+	};
+}
+
 function createMetaEntry(raw: string, hunkIndex: number): DiffMetaEntry {
 	return {
 		kind: classifyMetaLine(raw),
@@ -187,12 +208,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 +240,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(createOmissionEntry(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/extensions/utils/patch-keys.ts

@@ -42,6 +42,7 @@ export const TOOL_GROUPING_GENERATION_KEY = Symbol.for("pi.ccstyle.tool-grouping
 export const TOOL_MOUSE_OWNER_KEY = Symbol.for("pi.ccstyle.tool-mouse-owner");
 export const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi.ccstyle.tool-mouse-tui");
 export const SCROLL_BUTTON_STATE_SLOT = Symbol.for("pi.ccstyle.scroll-button-state");
+export const OFFICIAL_SCROLL_TO_END_KEY = Symbol.for("pi.ccstyle.official-scroll-to-end");
 export const FLUSH_DOCKED_BASH_PATCH = Symbol.for("pi.ccstyle.flush-docked-bash-patch");
 export const TOOL_HOVER_STATE_KEY = Symbol.for("pi.ccstyle.tool-hover-state");
 

package/package.json

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