@herbertgao/pi-extensions 2026.9.18 → 2026.9.20

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/layout.ts

@@ -1,8 +1,8 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
 import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { isCompactAssistantComponent } from "../compact-mode.ts";
-import { isMessageDisplayComponent } from "../message-display.ts";
 import { ToolGroupComponent } from "../tool/grouping.ts";
+import { isMessageDisplayComponent } from "../tool/message-display.ts";
 import { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
 import { getScrollButtonWidget } from "./scroll.ts";
 
@@ -11,12 +11,17 @@ export type ComponentRowHit = {
 	row: number;
 	/** 内部工具命中时所属的展开 group；普通卡点击仍折叠整个 group。 */
 	group?: ToolGroupComponent;
+	/** compact 展开面板内的命中：外层面板，单击非提示区时收起它。 */
+	owner?: any;
 };
 
-/** 行内 [click to show more] 提示的命中列区间（1-based，含两端）。 */
+/** 行内 [click to show more] / [↑ Collapse] 提示的命中列区间（1-based，含两端）。 */
 export function collapsedHintHitbox(line: string): { startCol: number; endCol: number } | null {
 	const plain = stripTerminalSequencesPreservingLayout(line);
-	const match = /(\([^()\n]* \/ click\)|click to show more|to show more)(?=\)?\s*$)/.exec(plain);
+	const match =
+		/(\([^()\n]* \/ click\)|click to show more|to show more|↑ Collapse|to collapse)(?=\)?\s*$)/.exec(
+			plain,
+		);
 	if (!match?.[1]) return null;
 	const startCol = visibleWidth(plain.slice(0, match.index)) + 1;
 	return { startCol, endCol: startCol + visibleWidth(match[1]) - 1 };
@@ -119,11 +124,15 @@ export function componentAtLocalRow(
 		return { component, row: localRow };
 	}
 	if (isCompactAssistantComponent(component)) {
-		// 折叠：整行摘要。展开：先命中内部 thinking hint，其余仍归外层卡片。
+		// 折叠：整行摘要。展开：先命中面板内 thinking/工具卡/文本，其余（空行）仍归外层卡片。
 		if (component.expanded === true) {
 			const inner = nestedChildAtRow(component, localRow, width);
-			if (inner instanceof ThinkingPreviewBlock) {
-				return { component: inner, row: localRow };
+			if (inner) {
+				// 展开的 thinking 有自己的展开态：点它只收它自己，不收整块面板。
+				const ownExpandable = inner instanceof ThinkingPreviewBlock && inner.expanded === true;
+				return ownExpandable
+					? { component: inner, row: localRow }
+					: { component: inner, row: localRow, owner: component };
 			}
 		}
 		return { component, row: localRow };

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/packets.ts

@@ -1,12 +1,16 @@
 import type { ExpandedToolIoView, ToolIoSection } from "../tool/result.ts";
-
-/** SGR 鼠标协议包（code;col;row + M/m 终结符）。 */
-export type SgrMousePacket = {
-	code: number;
-	col: number;
-	row: number;
-	final: "M" | "m";
-};
+import { walkComponentTree } from "../../utils/component-tree.ts";
+export {
+	stripTerminalSequences,
+	stripTerminalSequencesPreservingLayout,
+} from "../../utils/ansi-text.ts";
+export {
+	parseSgrMousePackets,
+	isSgrLeftPress,
+	isSgrLeftRelease,
+	isSgrIdleMotion,
+	type SgrMousePacket,
+} from "../../utils/sgr-mouse.ts";
 
 /** Final painted placement of one outermost tool/group row after parent layout. */
 export type FrameToolPlacement = {
@@ -24,53 +28,6 @@ const TOOL_FRAME_MARKER_RE = /\x1b_cc:t(\d+):(\d+)\x07/g;
 const TOOL_VIEW_MARKER_RE = /\x1b_cc:v(\d+):([io])\x07/g;
 export const toolFrameMarker = (id: number, row: number) => `\x1b_cc:t${id}:${row}\x07`;
 
-/**
- * 解析整段终端输入为 SGR 鼠标包序列；数据必须完全由连续 SGR 包组成
- * （夹杂其他字节返回 null，交由常规输入链处理）。
- */
-export function parseSgrMousePackets(data: string): SgrMousePacket[] | null {
-	const pattern = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
-	const packets: SgrMousePacket[] = [];
-	let offset = 0;
-
-	for (const match of data.matchAll(pattern)) {
-		if (match.index !== offset) return null;
-		offset = match.index + match[0].length;
-		packets.push({
-			code: Number(match[1]),
-			col: Number(match[2]),
-			row: Number(match[3]),
-			final: match[4] as "M" | "m",
-		});
-	}
-
-	return packets.length > 0 && offset === data.length ? packets : null;
-}
-
-/** 是否为左键按下（排除修饰键、32 表示 motion 事件）。 */
-export function isSgrLeftPress(packet: SgrMousePacket): boolean {
-	const baseButton = packet.code & ~(4 | 8 | 16 | 32);
-	return packet.final === "M" && baseButton === 0 && (packet.code & 32) === 0;
-}
-
-/** 是否为左键松开。 */
-export function isSgrLeftRelease(packet: SgrMousePacket): boolean {
-	const baseButton = packet.code & ~(4 | 8 | 16 | 32);
-	return packet.final === "m" && baseButton === 0 && (packet.code & 32) === 0;
-}
-
-/** 仅剥离终端序列、保留原布局（换行/空白不动），用于命中区间计算。 */
-export function stripTerminalSequencesPreservingLayout(value: string): string {
-	return value
-		.replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
-		.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
-}
-
-/** 剥离终端序列并折叠空白（用于纯文本比较）。 */
-export function stripTerminalSequences(value: string): string {
-	return stripTerminalSequencesPreservingLayout(value).replace(/\s+/g, " ").trim();
-}
-
 /** 工具执行组件识别（toolCallId + setExpanded + render）。 */
 export function isToolExecutionComponent(value: any): boolean {
 	return Boolean(
@@ -83,24 +40,13 @@ export function isToolExecutionComponent(value: any): boolean {
 }
 
 /** 深度收集组件树中的工具执行组件（含 getMountedRoots 分支）。 */
-export function collectToolComponents(component: any, tools: any[], seen = new Set<any>()): void {
-	if (!component || typeof component !== "object" || seen.has(component)) return;
-	seen.add(component);
-	if (isToolExecutionComponent(component)) {
-		tools.push(component);
-		return;
-	}
-	if (Array.isArray(component.children)) {
-		for (const child of component.children) collectToolComponents(child, tools, seen);
-	}
-	try {
-		const mounted = component.getMountedRoots?.();
-		if (Array.isArray(mounted)) {
-			for (const root of mounted) collectToolComponents(root, tools, seen);
+export function collectToolComponents(component: any, tools: any[]): void {
+	walkComponentTree(component, (value: any) => {
+		if (isToolExecutionComponent(value)) {
+			tools.push(value);
+			return false;
 		}
-	} catch {
-		// renderer 切换中的惰性 Proxy 可能暂时没有 mounted roots。
-	}
+	});
 }
 
 /** 剥离一行中的零宽帧/视图 marker。 */

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/scroll.ts

@@ -8,35 +8,39 @@ import {
 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,
+} from "../../utils/patch-keys.ts";
 
 const ZENTUI_PAGE_UP_INPUT = /^\x1b\[5;9(?::[12])?~$|^\x1b\[57421;9(?::[12])?u$|^\x1b\[1;6A$/;
 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()，避免拿到加载时的快照。
- */
-const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi.ccstyle.tool-mouse-tui");
-(globalThis as any)[TOOL_MOUSE_TUI_SLOT] ??= null;
+patchRegistry.ensure(TOOL_MOUSE_TUI_SLOT, () => null);
 export function getToolMouseTui(): any {
-	return (globalThis as any)[TOOL_MOUSE_TUI_SLOT];
+	return patchRegistry.get(TOOL_MOUSE_TUI_SLOT);
 }
 export function setToolMouseTui(tui: any): void {
-	(globalThis as any)[TOOL_MOUSE_TUI_SLOT] = tui;
+	patchRegistry.install(TOOL_MOUSE_TUI_SLOT, tui);
 }
 
-// 滚动按钮状态同 toolMouseTui：镜像到 globalThis（Symbol 槽），跨模块读取
-// 一律用 getter（jiti 转译下模块级 let 绑定是初始值快照）。
-const SCROLL_BUTTON_STATE_SLOT = Symbol.for("pi.ccstyle.scroll-button-state");
-type ScrollButtonState = { visible: boolean; hovered: boolean; widget: any };
+type ScrollButtonState = {
+	visible: boolean;
+	hovered: boolean;
+	widget: any;
+	/** 按钮可见期间新落的 transcript 块数（消息 + 工具卡）。 */
+	newCount: number;
+};
 function scrollButtonState(): ScrollButtonState {
-	const host = globalThis as any;
-	return (host[SCROLL_BUTTON_STATE_SLOT] ??= { visible: false, hovered: false, widget: null });
+	return patchRegistry.ensure(SCROLL_BUTTON_STATE_SLOT, () => ({
+		visible: false,
+		hovered: false,
+		widget: null,
+		newCount: 0,
+	}));
 }
 export function getScrollButtonVisible(): boolean {
 	return scrollButtonState().visible;
@@ -47,8 +51,32 @@ export function getScrollButtonHovered(): boolean {
 export function getScrollButtonWidget(): any {
 	return scrollButtonState().widget;
 }
+export function getScrollButtonNewCount(): number {
+	return scrollButtonState().newCount;
+}
 export function setScrollButtonVisible(visible: boolean): void {
-	scrollButtonState().visible = visible;
+	const state = scrollButtonState();
+	state.visible = visible;
+	// 计数只在离开底部期间有效：跟随输出即清零，文案回到 Back to bottom。
+	if (!visible) state.newCount = 0;
+}
+
+/**
+ * 记账一块新落进 transcript 的内容（用户/助手消息、工具卡）。
+ * 仅在按钮可见（已滚动离开底部）时累加，并请求重绘让按钮文案立即更新。
+ */
+export function noteNewTranscriptItem(): void {
+	const state = scrollButtonState();
+	const tui = getToolMouseTui();
+	if (!state.visible || !tui) return;
+	// 提交新消息时官方可能直接跳回底部（不经过滚动输入）：先按实时跟随状态校正，
+	// 否则跟随期间的内容会被当成“离开底部时的新消息”计入。
+	if (isAtTranscriptBottom(tui)) {
+		hideScrollButton(tui);
+		return;
+	}
+	state.newCount += 1;
+	tui.requestRender?.();
 }
 
 /** 返回是否发生变化（调用方据此决定是否需要重渲染）。 */
@@ -67,15 +95,16 @@ export function resetScrollButtonState(): void {
 	scrollButtonState().visible = false;
 	scrollButtonState().hovered = false;
 	scrollButtonState().widget = null;
+	scrollButtonState().newCount = 0;
 	scrollButtonSyncScheduled = false;
 }
 
 let scrollButtonSyncScheduled = false;
 
+// 交互开关只取决于配置模式：原实现按 isLazyProxyTui(toolMouseTui) 分两分支，
+// 两分支恒真（0.84+ 惰性 Proxy 下判定不再影响开关），折叠为单条件。
 export function toolMouseInteractionActive(): boolean {
-	if (config.mode === "off") return false;
-	if (isLazyProxyTui(getToolMouseTui())) return true;
-	return true;
+	return config.mode !== "off";
 }
 
 /** 惰性 Proxy 官方 fullscreen（TuiAltScreen）判定。 */
@@ -83,13 +112,12 @@ export function fullscreenLazyTui(tui: any): boolean {
 	return isLazyProxyTui(tui) && tui.mode === "fullscreen";
 }
 
-const OFFICIAL_SCROLL_TO_END_KEY = Symbol.for("pi.ccstyle.official-scroll-to-end");
-
 /** 关掉 pi 0.85 Jump to latest overlay，避免和本仓库 dock 按钮叠两层。 */
 export function disableOfficialScrollToEnd(tui: any): void {
 	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 };
 	}
@@ -210,12 +238,19 @@ export function updateScrollButtonFromInput(tui: any, data: string): void {
 	if (matchesKey(data, "enter") || matchesKey(data, "return")) hideScrollButton(tui);
 }
 
+/** 无新内容时提示原文案；有新内容时换成累计条数。 */
+function scrollButtonText(): string {
+	const count = getScrollButtonNewCount();
+	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
+	if (count <= 0) return `Back to bottom · ${shortcut}`;
+	return `${count} new message${count === 1 ? "" : "s"} · ${shortcut}`;
+}
+
 export function renderScrollButton(width: number, theme: any): string[] {
 	if (!getScrollButtonVisible() || !fullscreenLazyTui(getToolMouseTui())) return [];
-	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
 	const label = theme.fg(
 		getScrollButtonHovered() ? "text" : "accent",
-		`[ ↓ Back to bottom · ${shortcut} ]`,
+		`[ ↓ ${scrollButtonText()} ]`,
 	);
 	const leftPad = Math.max(0, Math.floor((width - visibleWidth(label)) / 2));
 	return [`${" ".repeat(leftPad)}${truncateToWidth(label, width, "…")}`];

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/ansi-utils.ts

@@ -1,5 +1,4 @@
-const ANSI_SGR_PATTERN = /\x1b\[([0-9;]*)m/g;
-const ANSI_SGR_WITH_COLON_PATTERN = /\x1b\[([0-9;:]*)m/g;
+const ANSI_SGR_PATTERN = /\x1b\[([0-9;:]*)m/g;
 const STYLE_RESET_PARAMS = [39, 22, 23, 24, 25, 27, 28, 29, 59] as const;
 
 export { ANSI_SGR_PATTERN, STYLE_RESET_PARAMS };
@@ -89,12 +88,35 @@ export function stripBackgroundSgrParams(params: readonly number[]): number[] {
 	return sanitized;
 }
 
+function isKeptColonSgr(token: string): boolean {
+	const parts = token.split(":");
+	if (parts[0] === "48") return false;
+	if (parts[0] !== "38") return true;
+	const channels =
+		parts[1] === "5" && parts.length === 3
+			? parts.slice(2)
+			: parts[1] === "2" && (parts.length === 5 || parts.length === 6)
+				? parts.slice(-3)
+				: undefined;
+	return !!channels?.every((c) => /^\d+$/.test(c) && Number(c) <= 255);
+}
+
 export function filterSgrSequences(text: string, filter: (params: number[]) => number[]): string {
 	if (!text || !text.includes("\x1b[")) {
 		return text;
 	}
 
 	return text.replace(ANSI_SGR_PATTERN, (_sequence, rawParams: string) => {
+		if (rawParams.includes(":")) {
+			// 冒号形式 (ISO 8613-6)：逐段处理；去掉 48:*，校验 38:*，其余原样保留
+			const kept = rawParams.split(";").flatMap((token) => {
+				if (!token.includes(":")) {
+					return token ? filter(toSgrParams(token)).map(String) : [];
+				}
+				return isKeptColonSgr(token) ? [token] : [];
+			});
+			return kept.length > 0 ? `\x1b[${kept.join(";")}m` : "";
+		}
 		const parsed = toSgrParams(rawParams);
 		if (parsed.length === 0) {
 			return "";
@@ -109,60 +131,6 @@ export function filterSgrSequences(text: string, filter: (params: number[]) => n
 	});
 }
 
-function isValidColonForeground(segment: string): boolean {
-	const params = segment.split(":");
-	const isByte = (value: string | undefined) =>
-		value !== undefined && /^\d+$/.test(value) && Number(value) <= 255;
-	if (params[0] !== "38") return false;
-	if (params[1] === "5") return params.length === 3 && isByte(params[2]);
-	return (
-		params[1] === "2" &&
-		params.length === 6 &&
-		(params[2] === "" || /^\d+$/.test(params[2] ?? "")) &&
-		params.slice(3).every(isByte)
-	);
-}
-
-function sanitizeColonSgr(rawParams: string): string {
-	const segments = rawParams.split(";");
-	const sanitized: string[] = [];
-	for (let index = 0; index < segments.length; index++) {
-		const segment = segments[index] ?? "";
-		if (segment.includes(":")) {
-			const code = Number.parseInt(segment, 10);
-			if (code !== 48 && (code !== 38 || isValidColonForeground(segment))) {
-				sanitized.push(segment);
-			}
-			continue;
-		}
-		const param = Number.parseInt(segment, 10);
-		if (!Number.isFinite(param)) continue;
-		if (param === 0) {
-			sanitized.push(...STYLE_RESET_PARAMS.map(String));
-			continue;
-		}
-		if (param === 49 || (param >= 40 && param <= 47) || (param >= 100 && param <= 107)) {
-			continue;
-		}
-		if (param === 38 || param === 48) {
-			const mode = Number.parseInt(segments[index + 1] ?? "", 10);
-			const advance = mode === 5 ? 2 : mode === 2 ? 4 : 0;
-			if (advance > 0) {
-				if (param === 38) sanitized.push(...segments.slice(index, index + advance + 1));
-				index += advance;
-				continue;
-			}
-		}
-		sanitized.push(segment);
-	}
-	return sanitized.length > 0 ? `\x1b[${sanitized.join(";")}m` : "";
-}
-
 export function sanitizeAnsiForThemedOutput(text: string): string {
-	if (!text || !text.includes("\x1b[")) return text;
-	return text.replace(ANSI_SGR_WITH_COLON_PATTERN, (sequence, rawParams: string) =>
-		rawParams.includes(":")
-			? sanitizeColonSgr(rawParams)
-			: filterSgrSequences(sequence, stripBackgroundSgrParams),
-	);
+	return filterSgrSequences(text, stripBackgroundSgrParams);
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/diff-component.ts

@@ -0,0 +1,125 @@
+import {
+	DEFAULT_TOOL_DISPLAY_CONFIG,
+	type DiffIndicatorMode,
+	type ToolDisplayConfig,
+} from "../../../config/config.ts";
+import { stripTerminalSequencesPreservingLayout } from "../../../utils/ansi-text.ts";
+import { RICH_DIFF_COMPONENT } from "../../../utils/patch-keys.ts";
+import type { DiffPresentationMode } from "./diff-presentation.ts";
+export { RICH_DIFF_COMPONENT };
+
+/** Snapshot or live getter — panel changes must apply on the next paint. */
+export type DisplayConfigInput = ToolDisplayConfig | (() => ToolDisplayConfig);
+
+export interface DiffRenderOptions {
+	expanded: boolean;
+	filePath?: string;
+	previousContent?: string;
+	fileExistedBeforeWrite?: boolean;
+	headerLabel?: string;
+	/** Live hover state for the collapsed hint row (muted → text on hover). */
+	isHovered?: () => boolean;
+	invalidate?: () => void;
+}
+
+export function isRichDiffComponent(value: unknown): boolean {
+	return Boolean(
+		value &&
+			typeof value === "object" &&
+			(value as Record<symbol, unknown>)[RICH_DIFF_COMPONENT] === true,
+	);
+}
+
+export function resolveLiveDisplayConfig(input: DisplayConfigInput): ToolDisplayConfig {
+	return typeof input === "function" ? input() : input;
+}
+
+/**
+ * 比对用归一化：ANSI、缩进前缀和右侧填充不影响判断。
+ * 折叠态 remainder 行里有任意正文，入口必须先由组件声明再比对文本。
+ */
+export function normalizeCollapsedHintLine(line: string | undefined): string | undefined {
+	if (line === undefined) return undefined;
+	return stripTerminalSequencesPreservingLayout(line).replace(/\s+/g, " ").trim();
+}
+
+/** Cache key fragment so indicator/wrap/limits invalidate without host recreate. */
+export function displayConfigCacheKey(config: ToolDisplayConfig): string {
+	return [
+		config.diffViewMode,
+		config.diffIndicatorMode,
+		String(config.diffSplitMinWidth),
+		String(config.editDiffCollapsedLines),
+		String(config.writeDiffCollapsedLines),
+		config.diffWordWrap ? "1" : "0",
+	].join(":");
+}
+
+export function resolveDiffIndicatorMode(
+	config: Partial<Pick<ToolDisplayConfig, "diffIndicatorMode">>,
+): DiffIndicatorMode {
+	return config.diffIndicatorMode ?? DEFAULT_TOOL_DISPLAY_CONFIG.diffIndicatorMode;
+}
+
+export function createDiffRenderCache() {
+	let cachedWidth: number | undefined;
+	let cachedExpanded: boolean | undefined;
+	let cachedMode: DiffPresentationMode | undefined;
+	let cachedConfigKey: string | undefined;
+	let cachedHovered: boolean | undefined;
+	let cachedLines: string[] | undefined;
+	/** 与 cachedLines 同一次渲染的折叠态 remainder 行文本。 */
+	let cachedHintLine: string | undefined;
+
+	return {
+		get(
+			width: number,
+			expanded: boolean,
+			mode: DiffPresentationMode,
+			configKey: string,
+			hovered: boolean,
+		): string[] | undefined {
+			if (
+				cachedLines &&
+				cachedWidth === width &&
+				cachedExpanded === expanded &&
+				cachedMode === mode &&
+				cachedConfigKey === configKey &&
+				cachedHovered === hovered
+			) {
+				return cachedLines;
+			}
+			return undefined;
+		},
+		getHintLine(): string | undefined {
+			return cachedHintLine;
+		},
+		set(
+			width: number,
+			expanded: boolean,
+			mode: DiffPresentationMode,
+			configKey: string,
+			hovered: boolean,
+			lines: string[],
+			hintLine?: string,
+		): string[] {
+			cachedWidth = width;
+			cachedExpanded = expanded;
+			cachedMode = mode;
+			cachedConfigKey = configKey;
+			cachedHovered = hovered;
+			cachedLines = lines;
+			cachedHintLine = hintLine;
+			return lines;
+		},
+		invalidate(): void {
+			cachedWidth = undefined;
+			cachedExpanded = undefined;
+			cachedMode = undefined;
+			cachedConfigKey = undefined;
+			cachedHovered = undefined;
+			cachedLines = undefined;
+			cachedHintLine = undefined;
+		},
+	};
+}