pi-cc-extensions 0.8.70 → 0.8.72

package/extensions/renderer/compact-mode.ts

@@ -327,6 +327,7 @@ function layoutExpandedToolCard(
 	theme: any,
 	children: any[],
 	width: number,
+	paints?: string[][],
 ): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
 	const slot = "userMessageBg";
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
@@ -337,8 +338,10 @@ function layoutExpandedToolCard(
 	lines.push(paddedBackgroundRow(theme, slot, "", width));
 	// 展开不再显示摘要行：跳过第一个 child 的首行空白，避免白占一行
 	let skipLeadingBlank = true;
-	for (const child of children) {
-		const childLines = child.render(innerWidth);
+	for (let childIndex = 0; childIndex < children.length; childIndex++) {
+		const child = children[childIndex];
+		const painted = paints?.[childIndex];
+		const childLines = Array.isArray(painted) ? painted : child.render(innerWidth);
 		// 展开的 thinking 与 tool 一样走嵌套深色卡，避免贴在外卡同色底上看不见。
 		const nest = child.__ccToolCard || (isThinkingPreview(child) && child.expanded === true);
 		if (!nest) {
@@ -401,21 +404,56 @@ function compactRoundCard(
 			});
 		}
 	}
+	let paint:
+		| {
+				width: number;
+				theme: unknown;
+				paints: unknown[];
+				lines: string[];
+				hits: Array<{ child: any; start: number; end: number }>;
+		  }
+		| undefined;
+	const layout = (width: number) => {
+		const theme = themeOf();
+		const innerWidth = Math.max(0, width - 2);
+		const paints = children.map((child) => {
+			const lines = child.render?.(innerWidth);
+			return Array.isArray(lines) ? lines : [];
+		});
+		if (
+			paint &&
+			paint.width === width &&
+			paint.theme === theme &&
+			paint.paints.length === paints.length &&
+			paint.paints.every((item, index) => item === paints[index])
+		) {
+			return paint;
+		}
+		const laid = layoutExpandedToolCard(theme, children, width, paints);
+		paint = {
+			width,
+			theme,
+			paints,
+			lines: ["", ...laid.lines],
+			hits: laid.hits,
+		};
+		return paint;
+	};
 	return {
 		children,
 		render(width: number): string[] {
-			return ["", ...layoutExpandedToolCard(themeOf(), children, width).lines];
+			return layout(width).lines;
 		},
 		childAtRow(localRow: number, width: number) {
 			if (localRow < 1) return null;
 			const row = localRow - 1;
-			const { hits } = layoutExpandedToolCard(themeOf(), children, width);
-			for (const hit of hits) {
+			for (const hit of layout(width).hits) {
 				if (row >= hit.start && row < hit.end) return hit.child;
 			}
 			return null;
 		},
 		invalidate() {
+			paint = undefined;
 			for (const child of children) child.invalidate?.();
 		},
 	};
@@ -553,14 +591,77 @@ const compactRichDiffCache = new WeakMap<
 	{ result: unknown; collapsed?: unknown; expanded?: unknown }
 >();
 
+type CompactEditPaintHit = {
+	width: number;
+	theme: unknown;
+	expanded: boolean;
+	result: unknown;
+	isPartial: boolean;
+	args: unknown;
+	hover: boolean;
+	ioHover: unknown;
+	lines: string[];
+};
+const compactEditPaintCache = new WeakMap<object, CompactEditPaintHit>();
+
+function compactEditIoHover(component: any): unknown {
+	const view = component?.resultRendererComponent;
+	return typeof view?.getHoveredSection === "function" ? view.getHoveredSection() : null;
+}
+
 /**
  * compact edit/write：标题行 + mode=on 同一套 rich diff。
  * 折叠/展开都走 `renderRichToolResult`，limits 不另开一套。
+ * 已完成的结果跨帧复用行；pending 不缓存，避免 loader 动画冻住。
  */
 function compactEditWriteLines(
 	component: any,
 	width: number,
 	writeMetadata?: WriteExecutionMetadataStore,
+): string[] {
+	const expanded = component.expanded === true;
+	const isPartial = component.isPartial === true;
+	const pending = !component.result || isPartial;
+	const hover = isToolCallHovered(component.toolCallId);
+	const ioHover = compactEditIoHover(component);
+	const theme = themeOf();
+	if (!pending) {
+		const hit = compactEditPaintCache.get(component);
+		if (
+			hit &&
+			hit.width === width &&
+			hit.theme === theme &&
+			hit.expanded === expanded &&
+			hit.result === component.result &&
+			hit.isPartial === isPartial &&
+			hit.args === component.args &&
+			hit.hover === hover &&
+			hit.ioHover === ioHover
+		) {
+			return hit.lines;
+		}
+	}
+	const lines = paintCompactEditWrite(component, width, writeMetadata);
+	if (!pending) {
+		compactEditPaintCache.set(component, {
+			width,
+			theme,
+			expanded,
+			result: component.result,
+			isPartial,
+			args: component.args,
+			hover,
+			ioHover: compactEditIoHover(component),
+			lines,
+		});
+	}
+	return lines;
+}
+
+function paintCompactEditWrite(
+	component: any,
+	width: number,
+	writeMetadata?: WriteExecutionMetadataStore,
 ): string[] {
 	const theme = themeOf();
 	const result = component.result;
@@ -656,15 +757,45 @@ function compactAssistantLineComponent(
 	options: { hint?: boolean; leadingBlank?: boolean; pad?: number } = {},
 ): any {
 	const self = component as any;
+	let paint:
+		| {
+				width: number;
+				theme: unknown;
+				resolved: string;
+				hover: boolean;
+				hint: boolean;
+				pad: number;
+				frame: number;
+				leadingBlank: boolean;
+				lines: string[];
+		  }
+		| undefined;
 	return {
 		render(width: number): string[] {
 			const theme = themeOf();
 			const pad = Math.max(0, options.pad ?? (Number(self.outputPad) || 0));
 			const available = Math.max(0, width - pad);
-			const hintText = options.hint === false ? "" : ` • ${showMoreHintText()}`;
+			const hint = options.hint !== false;
+			const hintText = hint ? ` • ${showMoreHintText()}` : "";
 			const summaryWidth = Math.max(0, available - visibleWidth(hintText));
 			const resolved = typeof summary === "function" ? summary() : summary;
 			const runningActive = resolved.startsWith("Running...");
+			const hover = hoveredAssistantComponent === component;
+			const frame = runningActive ? (query?.getThinkingAnimationFrame?.() ?? 0) : 0;
+			const leadingBlank = options.leadingBlank !== false;
+			if (
+				paint &&
+				paint.width === width &&
+				paint.theme === theme &&
+				paint.resolved === resolved &&
+				paint.hover === hover &&
+				paint.hint === hint &&
+				paint.pad === pad &&
+				paint.frame === frame &&
+				paint.leadingBlank === leadingBlank
+			) {
+				return paint.lines;
+			}
 			const plainText = truncateToWidth(resolved, summaryWidth, "…");
 			let text = theme.fg("muted", plainText);
 			if (runningActive || plainText.startsWith("Ran for ")) {
@@ -684,12 +815,26 @@ function compactAssistantLineComponent(
 					text = `${styleCompactThinkingText(heading, theme)}${theme.fg("muted", tools)}`;
 				}
 			}
-			const hintColor = hoveredAssistantComponent === component ? "text" : "dim";
+			const hintColor = hover ? "text" : "dim";
 			const line = `${text}${hintText ? theme.fg(hintColor, hintText) : ""}`;
 			const rendered = `${" ".repeat(pad)}${truncateToWidth(line, available, "")}`;
-			return options.leadingBlank === false ? [rendered] : ["", rendered];
+			const lines = leadingBlank ? ["", rendered] : [rendered];
+			paint = {
+				width,
+				theme,
+				resolved,
+				hover,
+				hint,
+				pad,
+				frame,
+				leadingBlank,
+				lines,
+			};
+			return lines;
+		},
+		invalidate() {
+			paint = undefined;
 		},
-		invalidate() {},
 	};
 }
 

package/extensions/renderer/default-mode.ts

@@ -58,6 +58,17 @@ type ToolRenderMethods = {
 	getResultRenderer: (...args: any[]) => any;
 };
 
+type ToolPaintHit = {
+	width: number;
+	expanded: boolean;
+	isPartial: boolean;
+	result: unknown;
+	args: unknown;
+	callHover: boolean;
+	ioHover: string | null;
+	lines: string[];
+};
+
 type GlobalToolRenderPatch = {
 	version: 2;
 	prototype: any;
@@ -68,6 +79,11 @@ type GlobalToolRenderPatch = {
 	byName: Map<string, any>;
 	downstream: ToolRenderMethods;
 	installed: ToolRenderMethods;
+	originalRender?: (width: number) => string[];
+	originalInvalidate?: () => void;
+	renderPaint?: (width: number) => string[];
+	invalidatePaint?: () => void;
+	paintCache?: WeakMap<object, ToolPaintHit>;
 };
 
 type ToolExpandedBackgroundPatch = {
@@ -478,12 +494,38 @@ function disconnectGlobalToolRenderPatch(patch: GlobalToolRenderPatch | undefine
 	patch.byName.clear();
 }
 
+function ioHoverOf(tool: any): string | null {
+	const view = tool?.resultRendererComponent;
+	if (!view || typeof view.getHoveredSection !== "function") return null;
+	return view.getHoveredSection();
+}
+
+function toolPaintMatches(hit: ToolPaintHit, tool: any, width: number): boolean {
+	return (
+		hit.width === width &&
+		hit.expanded === Boolean(tool.expanded) &&
+		hit.isPartial === Boolean(tool.isPartial) &&
+		hit.result === tool.result &&
+		hit.args === tool.args &&
+		hit.callHover === isToolCallHovered(tool.toolCallId) &&
+		hit.ioHover === ioHoverOf(tool)
+	);
+}
+
 function installGlobalToolRendering(
 	writeExecutionMetadata: WriteExecutionMetadataStore,
 ): GlobalToolRenderPatch {
 	const prototype = (ToolExecutionComponent as any).prototype;
 	const previous = patchRegistry.get<GlobalToolRenderPatch>(GLOBAL_TOOL_RENDER_PATCH);
 	const downstream = downstreamForGlobalToolInstall(prototype, previous);
+	const originalRender =
+		previous?.originalRender && prototype.render === previous.renderPaint
+			? previous.originalRender
+			: prototype.render;
+	const originalInvalidate =
+		previous?.originalInvalidate && prototype.invalidate === previous.invalidatePaint
+			? previous.originalInvalidate
+			: prototype.invalidate;
 	if (isOwnershipAwarePatch(previous)) disconnectGlobalToolRenderPatch(previous);
 
 	const patch: GlobalToolRenderPatch = {
@@ -496,6 +538,9 @@ function installGlobalToolRendering(
 		byName: new Map(),
 		downstream,
 		installed: undefined as any,
+		originalRender,
+		originalInvalidate,
+		paintCache: new WeakMap(),
 	};
 
 	patch.installed = {
@@ -532,6 +577,33 @@ function installGlobalToolRendering(
 	prototype.getRenderShell = patch.installed.getRenderShell;
 	prototype.getCallRenderer = patch.installed.getCallRenderer;
 	prototype.getResultRenderer = patch.installed.getResultRenderer;
+	// fullscreen 滚动/选区每帧整树 render；内容未变时复用上一帧行，避免重做 diff/Box。
+	patch.renderPaint = function (this: any, width: number): string[] {
+		if (!patch.active || patch.mode() === "off") {
+			return originalRender.call(this, width);
+		}
+		const cache = patch.paintCache;
+		const hit = cache?.get(this);
+		if (hit && toolPaintMatches(hit, this, width)) return hit.lines;
+		const lines = originalRender.call(this, width);
+		cache?.set(this, {
+			width,
+			expanded: Boolean(this.expanded),
+			isPartial: Boolean(this.isPartial),
+			result: this.result,
+			args: this.args,
+			callHover: isToolCallHovered(this.toolCallId),
+			ioHover: ioHoverOf(this),
+			lines,
+		});
+		return lines;
+	};
+	patch.invalidatePaint = function (this: any): void {
+		patch.paintCache?.delete(this);
+		originalInvalidate.call(this);
+	};
+	prototype.render = patch.renderPaint;
+	prototype.invalidate = patch.invalidatePaint;
 	patchRegistry.install(GLOBAL_TOOL_RENDER_PATCH, patch);
 	return patch;
 }
@@ -552,6 +624,16 @@ function deactivateGlobalToolRendering(patch: GlobalToolRenderPatch): void {
 	if (prototype.getResultRenderer === patch.installed.getResultRenderer) {
 		prototype.getResultRenderer = patch.downstream.getResultRenderer;
 	}
+	if (patch.renderPaint && prototype.render === patch.renderPaint && patch.originalRender) {
+		prototype.render = patch.originalRender;
+	}
+	if (
+		patch.invalidatePaint &&
+		prototype.invalidate === patch.invalidatePaint &&
+		patch.originalInvalidate
+	) {
+		prototype.invalidate = patch.originalInvalidate;
+	}
 }
 
 /** 展开面板背景统一为 user message 背景色；折叠行保持原生状态色。

package/extensions/renderer/mouse/interaction.ts

@@ -18,6 +18,7 @@ import {
 import {
 	collectToolComponents,
 	extractToolFramePlacements,
+	isSgrIdleMotion,
 	isSgrLeftPress,
 	isSgrLeftRelease,
 	isToolExecutionComponent,
@@ -37,9 +38,10 @@ import {
 	isScrollbarColumnAt,
 } from "./layout.ts";
 import {
-	disableOfficialScrollToEnd,
 	fullscreenLazyTui,
 	hideScrollButton,
+	restoreOfficialScrollToEnd,
+	syncOfficialScrollToEnd,
 	isScrollBottomInput,
 	renderScrollButton,
 	resetScrollButtonState,
@@ -137,7 +139,7 @@ function tryOpenToolIoShowMore(region: InteractionRegion): boolean {
 }
 
 function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
-	if ((packet.code & 32) === 0 || packet.final !== "M") return;
+	if (!isSgrIdleMotion(packet)) return;
 	const region = interactionRegionAt(packet);
 	const nextScrollButtonHovered = region?.kind === "scroll-bottom";
 	const scrollButtonChanged = setScrollButtonHovered(nextScrollButtonHovered);
@@ -403,7 +405,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
  * expanded 卡截断头 show-more、回到底部按钮。motion 不 consume，官方链照常。
  */
 function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
-	if (packet.final !== "M") return;
+	if (!isSgrIdleMotion(packet)) return;
 	const layout = tui.currentLayout;
 	if (!layout?.root) return;
 	const x = packet.col - 1;
@@ -501,7 +503,8 @@ function patchFullscreenViewportInput(tui: any): void {
 					if (isSgrLeftPress(packet) && handleFullscreenToolClick(tui, packet)) {
 						return { consume: true };
 					}
-					if ((packet.code & 32) !== 0 && packet.final === "M") {
+					// 仅无按键移动走 hover；左键拖动（文本多选）放行官方选区，避免每像素命中+重绘。
+					if (isSgrIdleMotion(packet)) {
 						handleFullscreenToolHover(tui, packet);
 					}
 				}
@@ -878,6 +881,7 @@ export function teardownToolMouseInteraction(
 	}
 	restoreToolMouseRenderPatch();
 	restoreFullscreenViewportInput(getToolMouseTui());
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	resetScrollButtonState();
 	setToolMouseTui(null);
 	toolMouseUi = null;
@@ -893,6 +897,7 @@ export function resetToolHoverState(): void {
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	releaseFullscreenToolMouseMotion(getToolMouseTui());
 }
 
@@ -917,12 +922,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/packets.ts

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

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++;