pi-cc-extensions 0.8.68 → 0.8.70

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";
@@ -62,20 +61,13 @@ type ToolRenderMethods = {
 type GlobalToolRenderPatch = {
 	version: 2;
 	prototype: any;
-	owner: object;
 	active: boolean;
-	enabled: () => boolean;
 	mode: () => CompactStyleMode;
 	wrap: (tool: any) => any;
 	byDefinition: WeakMap<object, any>;
 	byName: Map<string, any>;
 	downstream: ToolRenderMethods;
 	installed: ToolRenderMethods;
-	// 兼容旧扩展读取 Symbol 上的 legacy 字段。
-	originalHasRendererDefinition: ToolRenderMethods["hasRendererDefinition"];
-	originalGetRenderShell: ToolRenderMethods["getRenderShell"];
-	originalGetCallRenderer: ToolRenderMethods["getCallRenderer"];
-	originalGetResultRenderer: ToolRenderMethods["getResultRenderer"];
 };
 
 type ToolExpandedBackgroundPatch = {
@@ -242,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 = "";
@@ -274,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() {},
@@ -450,63 +443,39 @@ function isOwnershipAwarePatch(value: any): value is GlobalToolRenderPatch {
 	);
 }
 
-function downstreamForGlobalToolInstall(prototype: any, previous: any): ToolRenderMethods {
+function downstreamForGlobalToolInstall(
+	prototype: any,
+	previous: GlobalToolRenderPatch | undefined,
+): ToolRenderMethods {
 	const current = prototypeToolRenderMethods(prototype);
-	if (!previous || previous.prototype !== prototype) return current;
-	if (isOwnershipAwarePatch(previous)) {
-		return {
-			hasRendererDefinition:
-				current.hasRendererDefinition === previous.installed.hasRendererDefinition
-					? previous.downstream.hasRendererDefinition
-					: current.hasRendererDefinition,
-			getRenderShell:
-				current.getRenderShell === previous.installed.getRenderShell
-					? previous.downstream.getRenderShell
-					: current.getRenderShell,
-			getCallRenderer:
-				current.getCallRenderer === previous.installed.getCallRenderer
-					? previous.downstream.getCallRenderer
-					: current.getCallRenderer,
-			getResultRenderer:
-				current.getResultRenderer === previous.installed.getResultRenderer
-					? previous.downstream.getResultRenderer
-					: current.getResultRenderer,
-		};
+	if (!previous || previous.prototype !== prototype || !isOwnershipAwarePatch(previous)) {
+		return current;
 	}
-
-	// pre-v2 Symbol：originalX 显式记录真实下游（native 原型方法），无需源码嗅探。
-	// 缺失字段回退到当前原型方法（视作 external）。
-	const originalOrCurrent = (field: string, method: Function): Function =>
-		typeof previous[field] === "function" ? previous[field] : method;
 	return {
-		hasRendererDefinition: originalOrCurrent(
-			"originalHasRendererDefinition",
-			current.hasRendererDefinition,
-		) as ToolRenderMethods["hasRendererDefinition"],
-		getRenderShell: originalOrCurrent(
-			"originalGetRenderShell",
-			current.getRenderShell,
-		) as ToolRenderMethods["getRenderShell"],
-		getCallRenderer: originalOrCurrent(
-			"originalGetCallRenderer",
-			current.getCallRenderer,
-		) as ToolRenderMethods["getCallRenderer"],
-		getResultRenderer: originalOrCurrent(
-			"originalGetResultRenderer",
-			current.getResultRenderer,
-		) as ToolRenderMethods["getResultRenderer"],
+		hasRendererDefinition:
+			current.hasRendererDefinition === previous.installed.hasRendererDefinition
+				? previous.downstream.hasRendererDefinition
+				: current.hasRendererDefinition,
+		getRenderShell:
+			current.getRenderShell === previous.installed.getRenderShell
+				? previous.downstream.getRenderShell
+				: current.getRenderShell,
+		getCallRenderer:
+			current.getCallRenderer === previous.installed.getCallRenderer
+				? previous.downstream.getCallRenderer
+				: current.getCallRenderer,
+		getResultRenderer:
+			current.getResultRenderer === previous.installed.getResultRenderer
+				? previous.downstream.getResultRenderer
+				: current.getResultRenderer,
 	};
 }
 
-function disconnectGlobalToolRenderPatch(patch: any): void {
-	if (!patch || typeof patch !== "object") return;
+function disconnectGlobalToolRenderPatch(patch: GlobalToolRenderPatch | undefined): void {
+	if (!patch) return;
 	patch.active = false;
-	patch.enabled = () => false;
-	patch.mode = () => "off";
-	patch.wrap = (tool: any) => tool;
 	patch.byDefinition = new WeakMap();
-	if (patch.byName && typeof patch.byName.clear === "function") patch.byName.clear();
-	else patch.byName = new Map();
+	patch.byName.clear();
 }
 
 function installGlobalToolRendering(
@@ -515,25 +484,18 @@ function installGlobalToolRendering(
 	const prototype = (ToolExecutionComponent as any).prototype;
 	const previous = patchRegistry.get<GlobalToolRenderPatch>(GLOBAL_TOOL_RENDER_PATCH);
 	const downstream = downstreamForGlobalToolInstall(prototype, previous);
-	// 外部仍持有的旧 wrapper 先变为无回调 pass-through，再挂新安装。
-	disconnectGlobalToolRenderPatch(previous);
+	if (isOwnershipAwarePatch(previous)) disconnectGlobalToolRenderPatch(previous);
 
 	const patch: GlobalToolRenderPatch = {
 		version: 2,
 		prototype,
-		owner: {},
 		active: true,
-		enabled: () => config.mode === "on",
 		mode: () => config.mode,
 		wrap: (tool: any) => createCcstyleTool(tool, writeExecutionMetadata),
 		byDefinition: new WeakMap(),
 		byName: new Map(),
 		downstream,
 		installed: undefined as any,
-		originalHasRendererDefinition: downstream.hasRendererDefinition,
-		originalGetRenderShell: downstream.getRenderShell,
-		originalGetCallRenderer: downstream.getCallRenderer,
-		originalGetResultRenderer: downstream.getResultRenderer,
 	};
 
 	patch.installed = {

package/extensions/renderer/index.ts

@@ -14,7 +14,6 @@ import {
 } from "./default-mode.ts";
 import { isLazyProxyTui } from "../utils/fullscreen-detect.ts";
 import { showCcstylePanel } from "../config/panel.ts";
-import { GLOBAL_COMPACTION_RENDER_PATCH, patchRegistry } from "../utils/patch-keys.ts";
 import {
 	config,
 	formatConfigStatus,
@@ -93,16 +92,6 @@ function applyStyleMode(mode: CompactStyleMode, ctx: any, toolGrouping?: ToolGro
 	ctx.ui.notify(`Claude Code style: ${mode}`, "info");
 }
 
-type LegacyCompactionRenderPatch = {
-	enabled?: () => boolean;
-};
-
-/** Disable the pre-native compaction monkey patch left alive by /reload. */
-function deactivateLegacyCompactionRendering() {
-	const patch = patchRegistry.get<LegacyCompactionRenderPatch>(GLOBAL_COMPACTION_RENDER_PATCH);
-	if (patch) patch.enabled = () => false;
-}
-
 export default function (
 	pi: ExtensionAPI,
 	configOverride?: Partial<Config>,
@@ -137,7 +126,6 @@ export default function (
 		const disposeMessageDisplay = installMessageDisplayRendering();
 		// 展开背景必须在 compact-mode 之后装，shutdown 时先于 compact 释放。
 		const disposeToolExpandedBackground = installToolExpandedBackground();
-		deactivateLegacyCompactionRendering();
 		installation = {
 			defaultMode,
 			toolGrouping,
@@ -270,7 +258,6 @@ export default function (
 		current.compactMode.shutdown();
 		compactModeHooks = undefined;
 		current.disposeMessageDisplay();
-		deactivateLegacyCompactionRendering();
 		clearAllAnimations();
 		installation = undefined;
 	});

package/extensions/renderer/mouse/hover.ts

@@ -21,13 +21,8 @@ export function sharedToolHoverState(): SharedToolHoverState {
 	return patchRegistry.ensure(TOOL_HOVER_STATE_KEY, () => ({ toolCallId: null }));
 }
 
-// 状态单源在 globalThis 槽；hoveredToolCallId 变量仅为兼容旧 deep import 保留
-// （外部扩展可能直接从 interaction.ts re-export 读取），内部读取一律走槽。
-export let hoveredToolCallId: string | null = sharedToolHoverState().toolCallId;
-
 export function setHoveredToolCallId(toolCallId: string | null): void {
 	sharedToolHoverState().toolCallId = toolCallId;
-	hoveredToolCallId = toolCallId;
 }
 
 export function isToolCallHovered(toolCallId: string | null | undefined): boolean {

package/extensions/renderer/mouse/interaction.ts

@@ -19,6 +19,7 @@ import {
 	collectToolComponents,
 	extractToolFramePlacements,
 	isSgrLeftPress,
+	isSgrLeftRelease,
 	isToolExecutionComponent,
 	parseSgrMousePackets,
 	stripTerminalSequences,
@@ -36,6 +37,7 @@ import {
 	isScrollbarColumnAt,
 } from "./layout.ts";
 import {
+	disableOfficialScrollToEnd,
 	fullscreenLazyTui,
 	hideScrollButton,
 	isScrollBottomInput,
@@ -156,7 +158,11 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 }
 
 const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
-let lastExpandPanelClick: { id: unknown; at: number } | null = null;
+/** 松开后短时间内的重复按下视为同一次单击（终端会在 mouseup 后再打一次 press）。 */
+const EXPAND_PANEL_CLICK_ARM_MS = 50;
+let pendingExpandPress: { id: unknown } | null = null;
+let lastExpandClick: { id: unknown; at: number } | null = null;
+let armExpandClickTimer: ReturnType<typeof setTimeout> | null = null;
 
 function expandPanelIdentity(card: any): unknown {
 	return card instanceof ThinkingPreviewBlock
@@ -167,17 +173,48 @@ function expandPanelIdentity(card: any): unknown {
 function isExpandPanelDoubleClick(card: any): boolean {
 	const now = Date.now();
 	const id = expandPanelIdentity(card);
-	const prev = lastExpandPanelClick;
-	lastExpandPanelClick = { id, at: now };
-	return Boolean(prev && prev.id === id && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS);
+	const prev = lastExpandClick;
+	pendingExpandPress = { id };
+	if (prev && prev.id === id && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS) {
+		pendingExpandPress = null;
+		lastExpandClick = null;
+		return true;
+	}
+	return false;
+}
+
+function completeExpandPanelClick(): void {
+	if (!pendingExpandPress) return;
+	const click = { id: pendingExpandPress.id, at: Date.now() };
+	pendingExpandPress = null;
+	if (armExpandClickTimer) clearTimeout(armExpandClickTimer);
+	armExpandClickTimer = setTimeout(() => {
+		armExpandClickTimer = null;
+		// 50ms 内又按下：仍是同一次单击，不能武装成双击。
+		if (pendingExpandPress) return;
+		lastExpandClick = click;
+	}, EXPAND_PANEL_CLICK_ARM_MS);
+	if (
+		typeof armExpandClickTimer === "object" &&
+		armExpandClickTimer &&
+		"unref" in armExpandClickTimer
+	) {
+		armExpandClickTimer.unref();
+	}
 }
 
 function clearExpandPanelDoubleClick(): void {
-	lastExpandPanelClick = null;
+	pendingExpandPress = null;
+	lastExpandClick = null;
+	if (armExpandClickTimer) {
+		clearTimeout(armExpandClickTimer);
+		armExpandClickTimer = null;
+	}
 }
 
 function collapseExpandedCard(tui: any, card: any): boolean {
-	if (!isExpandPanelDoubleClick(card)) return false;
+	// 单击也 consume，避免官方链再合成一次 press 把单击当成双击。
+	if (!isExpandPanelDoubleClick(card)) return true;
 	card.setExpanded(false);
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
@@ -333,18 +370,17 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 			const plain = stripTerminalSequencesPreservingLayout(line);
 			const section = view.matchShowMoreLine(plain);
 			if (section) {
+				clearExpandPanelDoubleClick();
 				const box = view.showMoreHitbox(plain);
-				if (box && x + 1 >= box.startCol && x + 1 <= box.endCol) {
-					return tryOpenToolIoShowMore({
-						kind: "show-more",
-						row: 0,
-						startCol: box.startCol,
-						endCol: box.endCol,
-						component,
-						view,
-						section,
-					});
-				}
+				return tryOpenToolIoShowMore({
+					kind: "show-more",
+					row: 0,
+					startCol: box?.startCol ?? 1,
+					endCol: box?.endCol ?? 1,
+					component,
+					view,
+					section,
+				});
 			}
 		}
 		// 双击收起：内部工具仍归所属 group。单击放行官方（选择/链接）。
@@ -461,6 +497,7 @@ function patchFullscreenViewportInput(tui: any): void {
 			if (packets && tui.hasOverlay?.() && hasActiveTextPreview()) return undefined;
 			if (packets && !tui.hasOverlay?.()) {
 				for (const packet of packets) {
+					if (isSgrLeftRelease(packet)) completeExpandPanelClick();
 					if (isSgrLeftPress(packet) && handleFullscreenToolClick(tui, packet)) {
 						return { consume: true };
 					}
@@ -797,6 +834,7 @@ function handleToolMouseInput(data: string): { consume: true } | undefined {
 	let consumed = false;
 	for (const packet of packets) {
 		updateToolSummaryHover(getToolMouseTui(), packet);
+		if (isSgrLeftRelease(packet)) completeExpandPanelClick();
 		if (!isSgrLeftPress(packet)) continue;
 		if (toggleToolAtMouseClick(getToolMouseTui(), packet)) {
 			consumed = true;
@@ -879,10 +917,12 @@ export function installToolMouseInteraction(
 		if (isLazyProxyTui(tui)) {
 			patchFullscreenViewportInput(tui);
 			ensureFullscreenToolMouseMotion(tui);
+			disableOfficialScrollToEnd(tui);
 			setScrollButtonWidget({
 				render: (width: number) => {
 					patchFullscreenViewportInput(tui);
 					ensureFullscreenToolMouseMotion(tui);
+					disableOfficialScrollToEnd(tui);
 					return renderScrollButton(width, theme);
 				},
 				invalidate() {},
@@ -924,13 +964,3 @@ export function scheduleSessionRender(refresh?: () => void): void {
 		tui.requestRender(true);
 	}, 0);
 }
-
-// toolMouseTui 跨模块读取一律走 getToolMouseTui()（jiti 转译下 let 绑定可能是快照）；
-// 此 re-export 仅保留兼容旧导入，新代码请用 getToolMouseTui。
-export { toolMouseTui } from "./scroll.ts";
-export {
-	hoveredToolCallId,
-	isToolCallHovered,
-	setHoveredToolGroup,
-	setHoveredToolIo,
-} from "./hover.ts";

package/extensions/renderer/mouse/packets.ts

@@ -7,6 +7,7 @@ export {
 export {
 	parseSgrMousePackets,
 	isSgrLeftPress,
+	isSgrLeftRelease,
 	type SgrMousePacket,
 } from "../../utils/sgr-mouse.ts";
 

package/extensions/renderer/mouse/scroll.ts

@@ -18,26 +18,14 @@ const ZENTUI_PAGE_UP_INPUT = /^\x1b\[5;9(?::[12])?~$|^\x1b\[57421;9(?::[12])?u$|
 const ZENTUI_PAGE_DOWN_INPUT = /^\x1b\[6;9(?::[12])?~$|^\x1b\[57422;9(?::[12])?u$|^\x1b\[1;6B$/;
 const SCROLL_BOTTOM_SHORTCUT = "ctrl+end";
 
-/**
- * 当前安装的 tui 宿主。宿主放本模块（滚动按钮/调度依赖它），
- * 由 mouse-interaction 经 setToolMouseTui 维护；跨模块一律经绑定/setter 访问。
- *
- * 状态镜像到 globalThis（Symbol 槽）：jiti 转译下经 re-export 链读取的
- * 模块级 let 绑定是初始值快照（死绑定，实测恒 null），函数调用才是活引用。
- * 跨模块读取一律用 getToolMouseTui()，避免拿到加载时的快照。
- */
 patchRegistry.ensure(TOOL_MOUSE_TUI_SLOT, () => null);
-export let toolMouseTui: any = null;
 export function getToolMouseTui(): any {
 	return patchRegistry.get(TOOL_MOUSE_TUI_SLOT);
 }
 export function setToolMouseTui(tui: any): void {
-	toolMouseTui = tui;
 	patchRegistry.install(TOOL_MOUSE_TUI_SLOT, tui);
 }
 
-// 滚动按钮状态同 toolMouseTui：镜像到 globalThis（Symbol 槽），跨模块读取
-// 一律用 getter（jiti 转译下模块级 let 绑定是初始值快照）。
 type ScrollButtonState = { visible: boolean; hovered: boolean; widget: any };
 function scrollButtonState(): ScrollButtonState {
 	return patchRegistry.ensure(SCROLL_BUTTON_STATE_SLOT, () => ({
@@ -91,6 +79,11 @@ export function fullscreenLazyTui(tui: any): boolean {
 	return isLazyProxyTui(tui) && tui.mode === "fullscreen";
 }
 
+/** 关掉 pi 0.85 Jump to latest overlay，避免和本仓库 dock 按钮叠两层。 */
+export function disableOfficialScrollToEnd(tui: any): void {
+	if (typeof tui?.scrollToEndIndicator === "function") tui.scrollToEndIndicator = undefined;
+}
+
 /** 官方 fullscreen：是否已跟随 transcript 底部（按钮隐藏条件）。 */
 export function isFullscreenAtBottom(tui: any): boolean {
 	const following = tui.isFollowingOutput ?? tui.getPrimaryScrollView?.()?.isFollowingEnd ?? true;
@@ -164,7 +157,7 @@ export function scheduleScrollButtonSync(tui: any, data: string): void {
 	const previousLines = tui.previousLines;
 	const check = (attempt: number) => {
 		scrollButtonSyncScheduled = false;
-		if (toolMouseTui !== tui) return;
+		if (getToolMouseTui() !== tui) return;
 		// Pi renders on its own frame timer. Inspect the resulting viewport before
 		// showing the button so empty or non-scrollable transcripts never flash it.
 		const rendered = tui.previousLines !== previousLines;
@@ -192,7 +185,7 @@ export function updateScrollButtonFromInput(tui: any, data: string): void {
 }
 
 export function renderScrollButton(width: number, theme: any): string[] {
-	if (!getScrollButtonVisible() || !fullscreenLazyTui(toolMouseTui)) return [];
+	if (!getScrollButtonVisible() || !fullscreenLazyTui(getToolMouseTui())) return [];
 	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
 	const label = theme.fg(
 		getScrollButtonHovered() ? "text" : "accent",

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

@@ -45,18 +45,10 @@ export function resolveDiffDisplayLimit(
 	return expanded ? Math.max(0, expandedLimit) : Math.max(1, collapsedLimit);
 }
 
-/** Write collapsed body limit. Missing/NaN falls back to edit's `editDiffCollapsedLines`. */
 export function resolveWriteCollapsedLimit(
-	config: Pick<ToolDisplayConfig, "writeDiffCollapsedLines" | "editDiffCollapsedLines">,
+	config: Pick<ToolDisplayConfig, "writeDiffCollapsedLines">,
 ): number {
-	const value = config.writeDiffCollapsedLines;
-	if (Number.isFinite(value)) {
-		return Math.max(0, value);
-	}
-	const fallback = Number.isFinite(config.editDiffCollapsedLines)
-		? config.editDiffCollapsedLines
-		: DEFAULT_TOOL_DISPLAY_CONFIG.writeDiffCollapsedLines;
-	return Math.max(0, fallback);
+	return Math.max(0, config.writeDiffCollapsedLines);
 }
 
 /**

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

@@ -40,7 +40,9 @@ export interface DiffStats {
 
 const CANONICAL_LINE_PATTERN = /^([+\- ])(\s*\d+)\|(.*)$/;
 const HASHLINE_ANCHOR_LINE_PATTERN = /^([+\- ])(\s*\d+)#([A-Za-z0-9]+| {2}):(.*)$/;
-const LEGACY_LINE_PATTERN = /^([+\- ])(\s*\d+)\s(.*)$/;
+// 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;
 
@@ -63,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;
@@ -81,14 +86,9 @@ function parseCanonicalDiffLine(line: string): {
 		};
 	}
 
-	const canonicalMatch = line.match(CANONICAL_LINE_PATTERN);
-	const legacyMatch = canonicalMatch ? null : line.match(LEGACY_LINE_PATTERN);
-	const matched = canonicalMatch ?? legacyMatch;
-	if (!matched) {
-		return null;
-	}
-
-	return toParsedDiffLine(matched[1] ?? " ", matched[2] ?? "", matched[3] ?? "");
+	const match =
+		line.match(CANONICAL_LINE_PATTERN) ?? (allowPiFormat ? line.match(PI_LINE_PATTERN) : null);
+	return match ? toParsedDiffLine(match[1] ?? " ", match[2] ?? "", match[3] ?? "") : null;
 }
 
 function toNumber(value: string | undefined): number | null {
@@ -194,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]);
@@ -224,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;