@herbertgao/pi-extensions 2026.8.7 → 2026.8.9

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/compact-thinking.ts

@@ -196,12 +196,60 @@ function cachePreview(key: string, entry: PreviewCacheEntry): void {
 
 export function clearThinkingPreviewCache(): void {
 	previewCache.clear();
+	expandedWrapCache.clear();
+}
+
+type ExpandedWrapEntry = { text: string; lines: string[] };
+const expandedWrapCache = new Map<string, ExpandedWrapEntry>();
+export const THINKING_EXPANDED_WRAP_CACHE_MAX = 64;
+
+export function thinkingRunKey(messageTimestamp: number, runStartIndex: number): string {
+	return `${messageTimestamp}:${runStartIndex}`;
+}
+
+function expandedWrapKey(messageTimestamp: number, runStartIndex: number, width: number): string {
+	return `${thinkingRunKey(messageTimestamp, runStartIndex)}:${width}`;
+}
+
+function wrapExpandedThinking(
+	messageTimestamp: number,
+	runStartIndex: number,
+	text: string,
+	width: number,
+): string[] {
+	const key = expandedWrapKey(messageTimestamp, runStartIndex, width);
+	const hit = expandedWrapCache.get(key);
+	if (hit && hit.text === text) {
+		expandedWrapCache.delete(key);
+		expandedWrapCache.set(key, hit);
+		return hit.lines;
+	}
+	const lines = wrapTextWithAnsi(text.replace(/\t/g, "   "), Math.max(1, width));
+	expandedWrapCache.delete(key);
+	while (expandedWrapCache.size >= THINKING_EXPANDED_WRAP_CACHE_MAX) {
+		const oldest = expandedWrapCache.keys().next().value;
+		if (oldest === undefined) break;
+		expandedWrapCache.delete(oldest);
+	}
+	expandedWrapCache.set(key, { text, lines });
+	return lines;
+}
+
+function evictExpandedWraps(messageTimestamp: number, runStartIndex: number): void {
+	const prefix = `${thinkingRunKey(messageTimestamp, runStartIndex)}:`;
+	for (const key of expandedWrapCache.keys()) {
+		if (key.startsWith(prefix)) expandedWrapCache.delete(key);
+	}
 }
 
 export function thinkingPreviewCacheSize(): number {
 	return previewCache.size;
 }
 
+export function thinkingExpandedWrapCacheSize(): number {
+	return expandedWrapCache.size;
+}
+
 /** 按可见宽度估算折行数，不走 Text 全量 wrap。无换行长段也能计到隐藏行。 */
 function countWrappedLines(text: string, contentWidth: number): number {
 	if (!text) return 0;
@@ -274,19 +322,19 @@ function hiddenPreviewHint(
 	return undefined;
 }
 
-const expandedThinking = new Set<number>();
+const expandedThinking = new Set<string>();
 
 /** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、双击整块收起，对齐工具卡。 */
 export class ThinkingPreviewBlock implements Component {
 	private heading: string;
 	private text: string;
 	private padding: number;
-	private messageTimestamp: number;
+	readonly messageTimestamp: number;
+	readonly runStartIndex: number;
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
 	private _expanded: boolean;
 	private hintHovered = false;
-	private expandedBody: { width: number; lines: string[] } | undefined;
 	private collapsedMemo:
 		| {
 				width: number;
@@ -304,14 +352,16 @@ export class ThinkingPreviewBlock implements Component {
 		messageTimestamp: number,
 		style: (text: string) => string,
 		theme?: Theme,
+		runStartIndex = 0,
 	) {
 		this.heading = heading;
 		this.text = text;
 		this.padding = padding;
 		this.messageTimestamp = messageTimestamp;
+		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
-		this._expanded = expandedThinking.has(messageTimestamp);
+		this._expanded = expandedThinking.has(thinkingRunKey(messageTimestamp, runStartIndex));
 	}
 
 	private paint(color: string, text: string): string {
@@ -327,10 +377,11 @@ export class ThinkingPreviewBlock implements Component {
 	setExpanded(expanded: boolean): void {
 		if (this._expanded !== expanded) this.collapsedMemo = undefined;
 		this._expanded = expanded;
-		if (expanded) expandedThinking.add(this.messageTimestamp);
+		const key = thinkingRunKey(this.messageTimestamp, this.runStartIndex);
+		if (expanded) expandedThinking.add(key);
 		else {
-			expandedThinking.delete(this.messageTimestamp);
-			this.expandedBody = undefined;
+			expandedThinking.delete(key);
+			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
 	}
 
@@ -364,13 +415,10 @@ export class ThinkingPreviewBlock implements Component {
 			return { lines: [], hiddenLines: 0 };
 		}
 		if (this._expanded) {
-			if (this.expandedBody?.width !== width) {
-				this.expandedBody = {
-					width,
-					lines: wrapTextWithAnsi(this.text.replace(/\t/g, "   "), Math.max(1, width)),
-				};
-			}
-			return { lines: this.expandedBody.lines, hiddenLines: 0 };
+			return {
+				lines: wrapExpandedThinking(this.messageTimestamp, this.runStartIndex, this.text, width),
+				hiddenLines: 0,
+			};
 		}
 		const preview = layoutThinkingPreview(this.text, width, padding);
 		return { lines: preview.visible, hiddenLines: preview.hiddenLines };
@@ -426,7 +474,6 @@ export class ThinkingPreviewBlock implements Component {
 
 	invalidate() {
 		this.collapsedMemo = undefined;
-		this.expandedBody = undefined;
 	}
 }
 
@@ -710,6 +757,7 @@ function compactThinking(pi: ExtensionAPI) {
 					message.timestamp,
 					thinkingStyle,
 					activeTheme,
+					runStartIndex,
 				),
 			);
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/context.ts

@@ -9,7 +9,7 @@ import { Key, Markdown, matchesKey, truncateToWidth, visibleWidth } from "@earen
 export type ContextPart = {
 	label: string;
 	tokens: number;
-	color: "accent" | "success" | "warning" | "muted" | "dim";
+	color: "accent" | "success" | "warning" | "muted" | "dim" | "error";
 };
 
 type PreviewKey = "systemPrompt" | "tools" | "toolResults" | "contextFiles" | "skills";
@@ -43,11 +43,16 @@ export function escCloseHitbox(bounds: DialogBounds): {
 	};
 }
 
-let activeTextPreviews = 0;
+let activeContextOverlays = 0;
 
-/** fullscreen 输入包装用于把鼠标事件继续传给当前文本预览 overlay。 */
+/** fullscreen 输入包装用于把鼠标事件继续传给当前 context overlay。 */
 export function hasActiveTextPreview(): boolean {
-	return activeTextPreviews > 0;
+	return activeContextOverlays > 0;
+}
+
+/** fullscreen overlays fall back to 1002; restore motion events for hover states. */
+function ensureFullscreenMouseMotion(tui: any): void {
+	if (tui.mode === "fullscreen") tui.terminal?.write?.("\x1b[?1003h\x1b[?1006h");
 }
 
 export async function showTextPreview(
@@ -56,10 +61,11 @@ export async function showTextPreview(
 	rawContent: string,
 ): Promise<void> {
 	const content = normalizePreviewText(rawContent);
-	activeTextPreviews++;
+	activeContextOverlays++;
 	try {
 		await ctx.ui.custom(
 			(tui, theme, _keybindings, done) => {
+				ensureFullscreenMouseMotion(tui);
 				let scrollOffset = 0;
 				let pageSize = 1;
 				let totalLines = 1;
@@ -249,7 +255,7 @@ export async function showTextPreview(
 			},
 		);
 	} finally {
-		activeTextPreviews--;
+		activeContextOverlays--;
 	}
 }
 
@@ -424,7 +430,7 @@ export function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBr
 	const parts: ContextPart[] = [
 		{ label: "System prompt", tokens: baseSystem, color: "accent" },
 		{ label: "Tools", tokens: toolTokens, color: "success" },
-		{ label: "Context files", tokens: contextFileTokens, color: "warning" },
+		{ label: "Memory", tokens: contextFileTokens, color: "error" },
 		{ label: "Skills", tokens: skillTokens, color: "warning" },
 		{ label: "User messages", tokens: user, color: "muted" },
 		{ label: "Assistant messages", tokens: assistant, color: "accent" },
@@ -448,10 +454,12 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			const breakdown = collectContextBreakdown(ctx);
 			const estimated = breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
 			const fixedParts = breakdown.parts.filter(
-				(part) => part.label === "System prompt" || part.label === "Tools",
+				(part) =>
+					part.label === "System prompt" || part.label === "Memory" || part.label === "Tools",
 			);
 			const variableParts = breakdown.parts.filter(
-				(part) => part.label !== "System prompt" && part.label !== "Tools",
+				(part) =>
+					part.label !== "System prompt" && part.label !== "Memory" && part.label !== "Tools",
 			);
 			const orderedParts = [...fixedParts, ...variableParts];
 			const fixedTokens = fixedParts.reduce((sum, part) => sum + part.tokens, 0);
@@ -527,9 +535,9 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 				},
 				{
 					key: "contextFiles",
-					label: "Context files",
-					title: "Context Files",
-					content: contextFilesContent || "No context files loaded.",
+					label: "Memory",
+					title: "Memory Files",
+					content: contextFilesContent || "No memory files loaded.",
 				},
 				{
 					key: "skills",
@@ -549,8 +557,10 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			let selectedPreviewIndex = 0;
 
 			while (true) {
-				const action = await ctx.ui.custom(
+				activeContextOverlays++;
+				const actionPromise = ctx.ui.custom(
 					(tui, theme, _keybindings, done) => {
+						ensureFullscreenMouseMotion(tui);
 						let previewHitboxes: Array<{
 							key: PreviewKey;
 							row: number;
@@ -558,6 +568,8 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 							endCol: number;
 						}> = [];
 						let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
+						let escHovered = false;
+						let hoveredKey: PreviewKey | undefined;
 
 						const padLine = (text: string, width: number): string => {
 							const truncated = truncateToWidth(text, width, "…");
@@ -588,27 +600,32 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 								}
 
 								const mouse = parseSgrMousePacket(data);
-								if (
-									mouse?.final !== "M" ||
-									mouseBaseButton(mouse.code) !== 0 ||
-									(mouse.code & 32) !== 0
-								)
-									return;
-								if (
+								if (!mouse || mouse.final !== "M") return;
+								const overEsc = Boolean(
 									escHitbox &&
-									mouse.row === escHitbox.row &&
-									mouse.col >= escHitbox.startCol &&
-									mouse.col <= escHitbox.endCol
-								) {
-									done(undefined);
-									return;
-								}
+										mouse.row === escHitbox.row &&
+										mouse.col >= escHitbox.startCol &&
+										mouse.col <= escHitbox.endCol,
+								);
 								const hitbox = previewHitboxes.find(
 									(candidate) =>
 										mouse.row === candidate.row &&
 										mouse.col >= candidate.startCol &&
 										mouse.col <= candidate.endCol,
 								);
+								if ((mouse.code & 32) !== 0) {
+									if (overEsc !== escHovered || hitbox?.key !== hoveredKey) {
+										escHovered = overEsc;
+										hoveredKey = hitbox?.key;
+										tui.requestRender();
+									}
+									return;
+								}
+								if (mouseBaseButton(mouse.code) !== 0) return;
+								if (overEsc) {
+									done(undefined);
+									return;
+								}
 								if (hitbox) {
 									selectedPreviewIndex = Math.max(
 										0,
@@ -643,6 +660,9 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 									Math.max(...allParts.map((part) => part.label.length)),
 								);
 								const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
+								const hoverLabel = visiblePreviews.find(
+									(preview) => preview.key === hoveredKey,
+								)?.label;
 								const partRows = allParts.map((part) => {
 									const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
 									const swatch = theme.fg(part.color, "■");
@@ -651,12 +671,13 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 									const selected = part.label === selectedLabel;
 									const prefix = selected ? "› " : "  ";
 									const row = padLine(`${prefix}${swatch} ${label} ${amount}`, inner);
-									return selected ? theme.bg("selectedBg", row) : row;
+									if (selected) return theme.bg("selectedBg", row);
+									return part.label === hoverLabel ? theme.bg("customMessageBg", row) : row;
 								});
 								const border = (text: string) => theme.fg("border", text);
 								const lines = [
 									border(`╭${"─".repeat(inner)}╮`),
-									`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg("muted", "[esc]")}${border("│")}`,
+									`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
 									`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 									`${border("│")}${padLine(` ${segments}`, inner)}${border("│")}`,
 									`${border("│")}${" ".repeat(inner)}${border("│")}`,
@@ -706,6 +727,12 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 						},
 					},
 				);
+				let action;
+				try {
+					action = await actionPromise;
+				} finally {
+					activeContextOverlays--;
+				}
 
 				if (!action) break;
 				const preview = previewByKey.get(action as PreviewKey);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/message-display.ts

@@ -17,6 +17,9 @@ import { showMoreHintText } from "./show-more-hint.ts";
  */
 
 const MESSAGE_DISPLAY_PATCH = Symbol.for("pi.ccstyle.message-display-patch");
+const MESSAGE_DISPLAY_ORIGINAL_BG = Symbol.for("pi.ccstyle.message-display-original-bg");
+const MESSAGE_DISPLAY_ORIGINAL_PADDING = Symbol.for("pi.ccstyle.message-display-original-padding");
+const MESSAGE_DISPLAY_ORIGINAL_SAVED = Symbol.for("pi.ccstyle.message-display-original-saved");
 
 // 与 renderer/index.ts renderCall 的成功勾一致：亮绿 ✓（truecolor ANSI）。
 const BRIGHT_GREEN = "\x1b[38;2;80;220;100m";
@@ -55,21 +58,54 @@ const BRANCH_KIND: DisplayKind = {
 	body: (component) => String(component.message?.summary ?? ""),
 };
 
-function renderCcstyle(component: any, kind: DisplayKind): void {
+function ensureHintHover(component: any): void {
+	if (typeof component.setHintHovered === "function") return;
+	component.setHintHovered = function (this: any, hovered: boolean) {
+		if (this.hintHovered === hovered) return;
+		this.hintHovered = hovered;
+		this.invalidate?.();
+	};
+}
+
+function rememberMessageDisplay(component: any): void {
+	if (component[MESSAGE_DISPLAY_ORIGINAL_SAVED]) return;
+	component[MESSAGE_DISPLAY_ORIGINAL_BG] = component.bgFn;
+	component[MESSAGE_DISPLAY_ORIGINAL_PADDING] = [component.paddingX, component.paddingY];
+	component[MESSAGE_DISPLAY_ORIGINAL_SAVED] = true;
+}
+
+function restoreMessageDisplay(component: any): void {
+	if (!component[MESSAGE_DISPLAY_ORIGINAL_SAVED]) return;
+	const [paddingX, paddingY] = component[MESSAGE_DISPLAY_ORIGINAL_PADDING];
+	component.paddingX = paddingX;
+	component.paddingY = paddingY;
+	component.setBgFn?.(component[MESSAGE_DISPLAY_ORIGINAL_BG]);
+	delete component[MESSAGE_DISPLAY_ORIGINAL_BG];
+	delete component[MESSAGE_DISPLAY_ORIGINAL_PADDING];
+	delete component[MESSAGE_DISPLAY_ORIGINAL_SAVED];
+}
+
+function renderCcstyle(component: any, kind: DisplayKind): boolean {
 	const theme = displayTheme;
-	if (!theme) return; // 主题未就绪时保留原生渲染
+	if (!theme) return false; // 主题未就绪时回退原生渲染
+	rememberMessageDisplay(component);
 	if (component.bgFn) component.setBgFn?.(undefined); // 与工具调用一致，去掉灰底
-	if (component.paddingY !== 0) {
-		component._ccstyleOriginalPaddingY = component.paddingY;
-		component.paddingY = 0; // 工具组件 paddingY=0；原生 Box 默认 1，会上下各留一个空行
-	}
+	component.paddingY = 0; // 工具组件 paddingY=0；原生 Box 默认 1，会上下各留一个空行
 	component.clear();
+	ensureHintHover(component);
 	const icon = `${BRIGHT_GREEN}✓${ANSI_FG_RESET}`; // 已完成消息，等同工具成功态
 	const title = theme.fg("toolTitle", kind.title(component));
 	if (!component.expanded) {
-		const hint = theme.fg("dim", ` • ${showMoreHintText()}`);
+		const hovered = component.hintHovered === true;
+		const hint = `${theme.fg("dim", " • ")}${theme.fg(hovered ? "text" : "dim", showMoreHintText())}`;
 		component.addChild(new Text(`${icon} ${title}${hint}`, 0, 0));
-		return;
+		return true;
+	}
+	// 展开卡与 tool 一致：userMessageBg + 上下左右 1 格
+	component.paddingX = 1;
+	component.paddingY = 1;
+	if (typeof theme.bg === "function" && typeof component.setBgFn === "function") {
+		component.setBgFn((text: string) => theme.bg("userMessageBg", text));
 	}
 	component.addChild(new Text(`${icon} ${title}`, 0, 0));
 	component.addChild(new Spacer(1));
@@ -78,6 +114,7 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 			color: (text: string) => theme.fg("customMessageText", text),
 		}),
 	);
+	return true;
 }
 
 type PatchEntry = {
@@ -91,28 +128,42 @@ export function installMessageDisplayRendering(): () => void {
 	const host = globalThis as any;
 	const previous = host[MESSAGE_DISPLAY_PATCH];
 	if (previous) previous.dispose();
-	const patch: { active: boolean; entries: PatchEntry[]; dispose: () => void } = {
+	const patch: {
+		active: boolean;
+		entries: PatchEntry[];
+		components: Set<WeakRef<any>>;
+		tracked: WeakSet<object>;
+		dispose: () => void;
+	} = {
 		active: true,
 		entries: [],
+		components: new Set(),
+		tracked: new WeakSet(),
 		dispose: () => {},
 	};
+	const track = (component: Record<PropertyKey, unknown>): void => {
+		for (const ref of patch.components) {
+			if (!ref.deref()) patch.components.delete(ref);
+		}
+		if (patch.tracked.has(component)) return;
+		patch.tracked.add(component);
+		patch.components.add(new WeakRef(component));
+	};
 	const installOne = (ComponentClass: any, kind: DisplayKind): void => {
 		const prototype = ComponentClass.prototype;
 		const original = prototype.updateDisplay;
 		const installed = function (this: any) {
 			if (patch.active && config.mode !== "off") {
 				try {
-					renderCcstyle(this, kind);
-					return;
+					if (renderCcstyle(this, kind)) {
+						track(this);
+						return;
+					}
 				} catch {
 					// 渲染失败回退原生
 				}
 			}
-			// 回退原生前恢复 paddingY，避免原生渲染丢失上下内边距
-			if (this._ccstyleOriginalPaddingY !== undefined) {
-				this.paddingY = this._ccstyleOriginalPaddingY;
-				delete this._ccstyleOriginalPaddingY;
-			}
+			restoreMessageDisplay(this);
 			original.call(this);
 		};
 		prototype.updateDisplay = installed;
@@ -128,6 +179,17 @@ export function installMessageDisplayRendering(): () => void {
 				entry.prototype.updateDisplay = entry.original;
 			}
 		}
+		for (const ref of patch.components) {
+			const component = ref.deref();
+			if (!component) continue;
+			try {
+				restoreMessageDisplay(component);
+				component.updateDisplay();
+			} catch {
+				// 单个陈旧组件不应阻断其余原型与组件恢复
+			}
+		}
+		patch.components.clear();
 		if (host[MESSAGE_DISPLAY_PATCH] === patch) delete host[MESSAGE_DISPLAY_PATCH];
 	};
 	host[MESSAGE_DISPLAY_PATCH] = patch;

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

@@ -54,6 +54,16 @@ export function setHoveredThinking(block: ThinkingPreviewBlock | null): boolean
 	return true;
 }
 
+let hoveredMessageDisplay: any = null;
+
+export function setHoveredMessageDisplay(component: any): boolean {
+	if (component === hoveredMessageDisplay) return false;
+	hoveredMessageDisplay?.setHintHovered?.(false);
+	hoveredMessageDisplay = component;
+	component?.setHintHovered?.(true);
+	return true;
+}
+
 let hoveredToolIoView: ExpandedToolIoView | null = null;
 let hoveredToolIoSection: ToolIoSection | null = null;
 
@@ -110,6 +120,7 @@ export type FullscreenHoverTarget =
 	| { kind: "button" }
 	| { kind: "group"; component: ToolGroupComponent }
 	| { kind: "thinking"; component: ThinkingPreviewBlock }
+	| { kind: "message"; component: any }
 	| { kind: "assistant"; component: any }
 	| {
 			kind: "tool";
@@ -133,6 +144,8 @@ export function applyFullscreenHover(tui: any, target: FullscreenHoverTarget | n
 	if (setHoveredToolGroup(nextGroup)) changed = true;
 	const nextThinking = target?.kind === "thinking" ? target.component : null;
 	if (setHoveredThinking(nextThinking)) changed = true;
+	const nextMessage = target?.kind === "message" ? target.component : null;
+	if (setHoveredMessageDisplay(nextMessage)) changed = true;
 	const nextAssistant = target?.kind === "assistant" ? target.component : null;
 	if (setHoveredCompactAssistant(nextAssistant)) changed = true;
 	const nextView = target?.kind === "tool" ? target.view : null;