pi-cc-extensions 0.8.70 → 0.8.72

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[];
@@ -163,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),
@@ -228,7 +242,7 @@ export function parseDiff(diffText: string): ParsedDiff {
 
 		// 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));
+			entries.push(createOmissionEntry(rawLine, hunkIndex));
 			continue;
 		}
 

package/extensions/renderer/tool/grouping.ts

@@ -173,6 +173,15 @@ type SettledGroupCache = {
 	lines: string[];
 };
 
+type ExpandedGroupCache = {
+	width: number;
+	hover: boolean;
+	theme: unknown;
+	fullscreen: boolean;
+	paints: readonly unknown[];
+	lines: string[];
+};
+
 export class ToolGroupComponent extends Container {
 	readonly toolCallId = `ccstyle-tool-group-${nextGroupId++}`;
 	readonly toolName = "Tool group";
@@ -183,8 +192,10 @@ export class ToolGroupComponent extends Container {
 	}
 	private hintHovered = false;
 	private readonly patch: Patch;
-	/** 仅缓存已完成且折叠的分组；pending / expanded 每帧现算。 */
+	/** 仅缓存已完成且折叠的分组；pending 每帧现算。 */
 	private settledCache: SettledGroupCache | undefined;
+	/** 展开分组：子工具 paint 引用未变则复用整卡行。 */
+	private expandedPaintCache: ExpandedGroupCache | undefined;
 
 	constructor(patch: Patch) {
 		super();
@@ -192,14 +203,19 @@ export class ToolGroupComponent extends Container {
 		patch.groups.add(this);
 	}
 
-	addTool(tool: any): void {
+	private clearPaintCache(): void {
 		this.settledCache = undefined;
+		this.expandedPaintCache = undefined;
+	}
+
+	addTool(tool: any): void {
+		this.clearPaintCache();
 		this.children.push(tool);
 		tool[PARENT_KEY] = this;
 	}
 
 	releaseTools(): any[] {
-		this.settledCache = undefined;
+		this.clearPaintCache();
 		const tools = [...this.children];
 		this.children.length = 0;
 		this.patch.groups.delete(this);
@@ -207,21 +223,21 @@ export class ToolGroupComponent extends Container {
 	}
 
 	removeTool(tool: any): void {
-		this.settledCache = undefined;
+		this.clearPaintCache();
 		const index = this.children.indexOf(tool);
 		if (index >= 0) this.children.splice(index, 1);
 		if (tool?.[PARENT_KEY] === this) delete tool[PARENT_KEY];
 	}
 
 	setExpanded(expanded: boolean): void {
-		if (this._expanded !== expanded) this.settledCache = undefined;
+		if (this._expanded !== expanded) this.clearPaintCache();
 		this._expanded = expanded;
 		for (const tool of this.children)
 			(tool as Component & { setExpanded?: (expanded: boolean) => void }).setExpanded?.(expanded);
 	}
 
 	setHintHovered(hovered: boolean): void {
-		if (this.hintHovered !== hovered) this.settledCache = undefined;
+		if (this.hintHovered !== hovered) this.clearPaintCache();
 		this.hintHovered = hovered;
 	}
 
@@ -250,7 +266,7 @@ export class ToolGroupComponent extends Container {
 	}
 
 	invalidate(): void {
-		this.settledCache = undefined;
+		this.clearPaintCache();
 		for (const tool of this.children) tool.invalidate?.();
 	}
 
@@ -330,6 +346,23 @@ export class ToolGroupComponent extends Container {
 			),
 		];
 		const total = this.children.length;
+		const childPaints = this._expanded
+			? (this.children as any[]).map((tool) => tool.render?.(Math.max(1, width - 2)))
+			: undefined;
+		if (this._expanded && childPaints) {
+			const expandedHit = this.expandedPaintCache;
+			if (
+				expandedHit &&
+				expandedHit.width === width &&
+				expandedHit.hover === this.hintHovered &&
+				expandedHit.theme === this.patch.theme &&
+				expandedHit.fullscreen === isToolTuiFullscreen() &&
+				expandedHit.paints.length === childPaints.length &&
+				expandedHit.paints.every((paint, index) => paint === childPaints[index])
+			) {
+				return expandedHit.lines;
+			}
+		}
 		const expandedLines: string[] = [];
 		for (let index = 0; index < total; index++) {
 			const tool = this.children[index];
@@ -351,7 +384,7 @@ export class ToolGroupComponent extends Container {
 				);
 				continue;
 			}
-			const rendered = visibleLines(tool.render(Math.max(1, width - 2)));
+			const rendered = visibleLines(Array.isArray(childPaints?.[index]) ? childPaints[index] : []);
 			if (rendered.length) {
 				rendered[0] = stripLeadingStatusIcon(rendered[0])
 					.replace(/^ +/, "")
@@ -376,6 +409,14 @@ export class ToolGroupComponent extends Container {
 				lines.push(paddedBackgroundRow(theme, backgroundSlot, line, width));
 			}
 			lines.push(paddedBackgroundRow(theme, backgroundSlot, "", width));
+			this.expandedPaintCache = {
+				width,
+				hover: this.hintHovered,
+				theme: this.patch.theme,
+				fullscreen: isToolTuiFullscreen(),
+				paints: childPaints ?? [],
+				lines,
+			};
 		} else if (counts.pending === 0) {
 			this.storeSettledCache(width, lines);
 		}

package/extensions/renderer/tool/result.ts

@@ -15,9 +15,9 @@ export function toolViewportWidth(width: number): number {
 export function insetComponent(component: any): any {
 	return {
 		render: (width: number) =>
-			component.render(Math.max(1, width - 1)).map((line: string) => {
+			component.render(Math.max(1, width - 3)).map((line: string) => {
 				const nestedMarker = line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳");
-				return ` ${nestedMarker}`;
+				return truncateToWidth(` ${nestedMarker}`, Math.max(0, width), "");
 			}),
 		invalidate: () => component.invalidate?.(),
 	};
@@ -309,6 +309,10 @@ export class ExpandedToolIoView {
 		this.invalidate();
 	}
 
+	getHoveredSection(): ToolIoSection | null {
+		return this.hoveredSection;
+	}
+
 	/** 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, "");

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/extensions/utils/sgr-mouse.ts

@@ -59,6 +59,11 @@ export function isSgrLeftRelease(packet: SgrMousePacket): boolean {
 	return packet.final === "m" && baseButton === 0 && (packet.code & 32) === 0;
 }
 
+/** 无按键按住的指针移动（DECSET 1003 的 35）。左键拖动（32，文本选区）不是 hover。 */
+export function isSgrIdleMotion(packet: SgrMousePacket): boolean {
+	return packet.final === "M" && (packet.code & 32) !== 0 && mouseBaseButton(packet.code) === 3;
+}
+
 /** 剥离修饰键位（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.70",
+	"version": "0.8.72",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",