pi-cc-extensions 0.8.70 → 0.8.71

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[];
@@ -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/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.70",
+	"version": "0.8.71",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",