@herbertgao/pi-extensions 2026.8.6 → 2026.8.8

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/compact-mode.ts

@@ -331,70 +331,93 @@ function editWriteExpandedCard(theme: any): any {
 	);
 }
 
-/** compact 展开卡：外卡片保持 userMessageBg 原色；内部 tool call card（addToolChild）
- *  背景更深一层且只覆盖内容区（左右内缩、上下限首尾文本行），形成嵌套层次。
- *  逐行重建背景同时修复嵌套 Box 的右侧截断。 */
-function expandedToolCard(theme: any): any {
+/** compact 展开卡：保留本地嵌套工具背景，并记录 thinking 的点击行区间。 */
+function layoutExpandedToolCard(
+	theme: any,
+	children: any[],
+	width: number,
+): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
 	const slot = "userMessageBg";
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
+	const innerWidth = Math.max(0, width - 2);
+	const lines: string[] = [];
+	const hits: Array<{ child: any; start: number; end: number }> = [];
+	lines.push(paddedBackgroundRow(theme, slot, "", width));
+	let skipLeadingBlank = true;
+	for (const child of children) {
+		const childLines = child.render(innerWidth);
+		if (!child.__ccToolCard) {
+			let start = 0;
+			if (skipLeadingBlank) {
+				while (start < childLines.length && !hasVisibleText(childLines[start])) start++;
+				skipLeadingBlank = false;
+			}
+			const rangeStart = lines.length;
+			for (let i = start; i < childLines.length; i++) {
+				lines.push(paddedBackgroundRow(theme, slot, childLines[i], width));
+			}
+			if (lines.length > rangeStart) hits.push({ child, start: rangeStart, end: lines.length });
+			continue;
+		}
+		skipLeadingBlank = false;
+		let first = -1;
+		let last = -1;
+		for (let i = 0; i < childLines.length; i++) {
+			if (hasVisibleText(childLines[i])) {
+				if (first < 0) first = i;
+				last = i;
+			}
+		}
+		if (first < 0) {
+			for (const line of childLines) {
+				lines.push(paddedBackgroundRow(theme, slot, line, width));
+			}
+			continue;
+		}
+		lines.push(paddedBackgroundRow(theme, slot, "", width));
+		lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
+		for (let i = first; i <= last; i++) {
+			lines.push(toolCardBgRow(theme, slot, toolBgAnsi, childLines[i], width));
+		}
+		lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
+	}
+	lines.push(paddedBackgroundRow(theme, slot, "", width));
+	return { lines, hits };
+}
+
+function compactRoundCard(
+	cardItems: Array<{ child?: any; tool?: any }>,
+	toolRender: (tool: any, width: number) => string[],
+): any {
 	const children: any[] = [];
+	for (const item of cardItems) {
+		if (item.child) children.push(item.child);
+		else if (item.tool) {
+			const tool = item.tool;
+			children.push({
+				__ccToolCard: true,
+				render: (innerWidth: number) => toolRender(tool, innerWidth),
+				invalidate: () => tool.invalidate?.(),
+			});
+		}
+	}
 	return {
 		children,
-		addChild(child: any) {
-			children.push(child);
-		},
-		addToolChild(child: any) {
-			child.__ccToolCard = true;
-			children.push(child);
-		},
 		render(width: number): string[] {
-			const innerWidth = Math.max(0, width - 2);
-			const lines: string[] = [];
-			lines.push(paddedBackgroundRow(theme, slot, "", width));
-			// 展开不再显示摘要行：跳过第一个 child 的首行空白，避免白占一行
-			let skipLeadingBlank = true;
-			for (const child of children) {
-				const childLines = child.render(innerWidth);
-				if (!child.__ccToolCard) {
-					let start = 0;
-					if (skipLeadingBlank) {
-						while (start < childLines.length && !hasVisibleText(childLines[start])) start++;
-						skipLeadingBlank = false;
-					}
-					for (let i = start; i < childLines.length; i++) {
-						lines.push(paddedBackgroundRow(theme, slot, childLines[i], width));
-					}
-					continue;
-				}
-				// 工具卡：前导 1 空行 + 首尾文本行之间的内容区（深色）；不保留尾随，
-				// 相邻工具卡之间正好 1 空行，底部由卡片 padding 收尾。
-				skipLeadingBlank = false;
-				let first = -1;
-				let last = -1;
-				for (let i = 0; i < childLines.length; i++) {
-					if (hasVisibleText(childLines[i])) {
-						if (first < 0) first = i;
-						last = i;
-					}
-				}
-				if (first < 0) {
-					for (const line of childLines) {
-						lines.push(paddedBackgroundRow(theme, slot, line, width));
-					}
-					continue;
-				}
-				lines.push(paddedBackgroundRow(theme, slot, "", width));
-				// 子卡片内部上下各 1 行深色 padding
-				lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
-				for (let i = first; i <= last; i++) {
-					lines.push(toolCardBgRow(theme, slot, toolBgAnsi, childLines[i], width));
-				}
-				lines.push(toolCardBgRow(theme, slot, toolBgAnsi, "", width));
+			return ["", ...layoutExpandedToolCard(themeOf(), children, 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) {
+				if (row >= hit.start && row < hit.end) return hit.child;
 			}
-			lines.push(paddedBackgroundRow(theme, slot, "", width));
-			return lines;
+			return null;
+		},
+		invalidate() {
+			for (const child of children) child.invalidate?.();
 		},
-		invalidate() {},
 	};
 }
 
@@ -930,27 +953,21 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					tool.updateDisplay?.();
 				}
 			}
-			round.anchor.contentContainer.addChild({
-				render(width: number): string[] {
-					const theme = themeOf();
-					const box = expandedToolCard(theme);
-					for (const child of assistantChildren) box.addChild(child);
-					const ids = roundToolCallIds(round);
-					for (const tool of trackedToolComponents) {
-						if (!ids.has(tool.toolCallId) || EDIT_WRITE_TOOLS.has(String(tool.toolName ?? ""))) {
-							continue;
-						}
-						box.addToolChild({
-							render: (innerWidth: number) => patch.toolOriginalRender.call(tool, innerWidth),
-							invalidate: () => tool.invalidate?.(),
-						});
-					}
-					return ["", ...box.render(width)];
-				},
-				invalidate() {
-					for (const child of assistantChildren) child.invalidate?.();
-				},
-			});
+			const cardItems: Array<{ child?: any; tool?: any }> = assistantChildren.map((child) => ({
+				child,
+			}));
+			const roundIds = roundToolCallIds(round);
+			for (const tool of trackedToolComponents) {
+				if (!roundIds.has(tool.toolCallId) || EDIT_WRITE_TOOLS.has(String(tool.toolName ?? ""))) {
+					continue;
+				}
+				cardItems.push({ tool });
+			}
+			round.anchor.contentContainer.addChild(
+				compactRoundCard(cardItems, (tool, innerWidth) =>
+					patch.toolOriginalRender.call(tool, innerWidth),
+				),
+			);
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
 			appendStopStatus(round.anchor, stopStatus);
 			return;

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: object): 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;
@@ -135,7 +197,7 @@ export function installMessageDisplayRendering(): () => void {
 }
 
 /** 三个消息组件共享的结构特征；CustomMessageComponent 用 rebuild 无 updateDisplay，不命中。 */
-function isMessageDisplayComponent(value: any): boolean {
+export function isMessageDisplayComponent(value: any): boolean {
 	return Boolean(
 		value &&
 			typeof value === "object" &&

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

@@ -1,3 +1,4 @@
+import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { setHoveredCompactAssistant } from "../compact-mode.ts";
 import {
 	isExpandedToolIoView,
@@ -43,6 +44,26 @@ export function setHoveredToolGroup(group: ToolGroupComponent | null): boolean {
 	return true;
 }
 
+let hoveredThinking: ThinkingPreviewBlock | null = null;
+
+export function setHoveredThinking(block: ThinkingPreviewBlock | null): boolean {
+	if (block === hoveredThinking) return false;
+	hoveredThinking?.setHintHovered(false);
+	hoveredThinking = block;
+	block?.setHintHovered(true);
+	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;
 
@@ -98,6 +119,8 @@ export function cachedFullscreenComponentAtRow(
 export type FullscreenHoverTarget =
 	| { kind: "button" }
 	| { kind: "group"; component: ToolGroupComponent }
+	| { kind: "thinking"; component: ThinkingPreviewBlock }
+	| { kind: "message"; component: any }
 	| { kind: "assistant"; component: any }
 	| {
 			kind: "tool";
@@ -119,6 +142,10 @@ export function applyFullscreenHover(tui: any, target: FullscreenHoverTarget | n
 	}
 	const nextGroup = target?.kind === "group" ? target.component : null;
 	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;

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

@@ -1,6 +1,8 @@
+import { ThinkingPreviewBlock, thinkingRunKey } from "../../feature/compact-thinking.ts";
 import { hasActiveTextPreview, showTextPreview } from "../../feature/context.ts";
 import { ToolGroupComponent } from "../tool/grouping.ts";
 import { isCompactAssistantComponent, setHoveredCompactAssistant } from "../compact-mode.ts";
+import { isMessageDisplayComponent } from "../message-display.ts";
 import { config } from "../../config/config.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
 import { setToolTuiFullscreen } from "../show-more-hint.ts";
@@ -55,6 +57,8 @@ import {
 	sharedToolHoverState,
 	setHoveredToolCallId,
 	setHoveredToolGroup,
+	setHoveredThinking,
+	setHoveredMessageDisplay,
 	setHoveredToolIo,
 	type FullscreenHoverTarget,
 } from "./hover.ts";
@@ -151,6 +155,42 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 		tui.requestRender?.();
 }
 
+const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
+let lastExpandPanelClick: { id: unknown; at: number } | null = null;
+
+function expandPanelIdentity(card: any): unknown {
+	return card instanceof ThinkingPreviewBlock
+		? thinkingRunKey(card.messageTimestamp, card.runStartIndex)
+		: card;
+}
+
+function isExpandPanelDoubleClick(card: any): boolean {
+	const now = Date.now();
+	const id = expandPanelIdentity(card);
+	const prev = lastExpandPanelClick;
+	lastExpandPanelClick = { id, at: now };
+	return Boolean(prev && prev.id === id && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS);
+}
+
+function clearExpandPanelDoubleClick(): void {
+	lastExpandPanelClick = null;
+}
+
+function collapseExpandedCard(tui: any, card: any): boolean {
+	if (!isExpandPanelDoubleClick(card)) return false;
+	card.setExpanded(false);
+	setHoveredToolCallId(null);
+	setHoveredToolGroup(null);
+	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
+	setHoveredToolIo(null, null);
+	setHoveredCompactAssistant(null);
+	card.invalidate?.();
+	tui.requestRender?.();
+	clearExpandPanelDoubleClick();
+	return true;
+}
+
 function toggleToolAtMouseClick(tui: any, packet: SgrMousePacket): boolean {
 	const region = interactionRegionAt(packet);
 	if (!region) return false;
@@ -158,19 +198,12 @@ function toggleToolAtMouseClick(tui: any, packet: SgrMousePacket): boolean {
 	if (region.kind === "show-more") return tryOpenToolIoShowMore(region);
 	const component = region.component;
 	if (!component) return false;
-	const width = Math.max(1, Number(tui?.terminal?.columns) || 80);
-	if (region.kind === "expanded-card") {
-		component.setExpanded(false);
-		setHoveredToolCallId(null);
-		setHoveredToolGroup(null);
-		setHoveredToolIo(null, null);
-		component.invalidate?.();
-		tui.requestRender?.();
-		return true;
-	}
+	if (region.kind === "expanded-card") return collapseExpandedCard(tui, component);
 	component.setExpanded(true);
+	clearExpandPanelDoubleClick();
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	component.invalidate?.();
 	tui.requestRender?.();
@@ -241,10 +274,10 @@ const FULLSCREEN_VIEWPORT_PATCH = Symbol("ccstyle.fullscreen-viewport-patch");
 const FULLSCREEN_WHEEL_SCROLL_ORIGINAL = Symbol("ccstyle.fullscreen-wheel-scroll-original");
 
 /**
- * 官方 fullscreen 工具卡点击：collapsed hint 点击展开
- * （有且仅保持一个展开：展开前收起其他工具卡），expanded 整卡二次点击收起，
- * 截断头 show-more 打开全量预览；回到底部按钮 scrollToBottom。
- * 滚动条列、含 OSC8 链接行、非工具区域放行官方。
+ * 官方 fullscreen 工具卡点击：collapsed hint 单击展开
+ * （有且仅保持一个展开：展开前收起其他工具卡），expanded 整卡双击收起，
+ * 截断头 show-more 单击打开全量预览；回到底部按钮 scrollToBottom。
+ * 滚动条列、含 OSC8 链接行、非工具区域、展开卡单击放行官方。
  */
 function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const layout = tui.currentLayout;
@@ -274,7 +307,9 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const isTool = isToolExecutionComponent(component);
 	const isGroup = component instanceof ToolGroupComponent;
 	const isAssistant = isCompactAssistantComponent(component);
-	if (!isTool && !isGroup && !isAssistant) return false;
+	const isThinking = component instanceof ThinkingPreviewBlock;
+	const isMessage = isMessageDisplayComponent(component);
+	if (!isTool && !isGroup && !isAssistant && !isThinking && !isMessage) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
 		const hint = collapsedHintHitbox(line);
@@ -284,11 +319,14 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 		collectFullscreenToolCards(hit.box.component, others);
 		for (const other of others) {
 			if (other !== component && other.expanded) {
+				// 展开 round 内 thinking 时不要把外层 compact 卡收起。
+				if (isThinking && isCompactAssistantComponent(other)) continue;
 				other.setExpanded(false);
 				other.invalidate?.();
 			}
 		}
 		component.setExpanded(true);
+		clearExpandPanelDoubleClick();
 	} else {
 		// 普通工具截断头 show-more：打开全量预览（不收起）。
 		const view = isTool ? component.resultRendererComponent : null;
@@ -310,12 +348,14 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				}
 			}
 		}
-		// 整卡二次点击：内部工具仍归所属 group，保持整体展开/收起语义。
-		card.setExpanded(false);
+		// 双击收起：内部工具仍归所属 group。单击放行官方（选择/链接）。
+		return collapseExpandedCard(tui, card);
 	}
 	// 点击后清 hover 高亮。
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	card.invalidate?.();
@@ -361,6 +401,8 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			);
 			if (component instanceof ToolGroupComponent) {
 				if (overHint) target = { kind: "group", component };
+			} else if (component instanceof ThinkingPreviewBlock) {
+				if (component.expanded || overHint) target = { kind: "thinking", component };
 			} else if (isToolExecutionComponent(component)) {
 				let view: ExpandedToolIoView | null = null;
 				let section: ToolIoSection | null = null;
@@ -384,6 +426,8 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			} else if (isCompactAssistantComponent(component)) {
 				// compact 摘要行：折叠时仅提示文字高亮，展开卡整体高亮。
 				if (component.expanded || overHint) target = { kind: "assistant", component };
+			} else if (isMessageDisplayComponent(component)) {
+				if (overHint) target = { kind: "message", component };
 			}
 		}
 	}
@@ -779,8 +823,11 @@ export function teardownToolMouseInteraction(
 	toolMouseInputUnsubscribe = null;
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
+	clearExpandPanelDoubleClick();
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
 		else getToolMouseTui()?.terminal?.write?.(TOOL_MOUSE_DISABLE);
@@ -804,6 +851,8 @@ export function teardownToolMouseInteraction(
 /** off 模式清理：清空 hover 与回到底部按钮状态（跨模块 rebind 统一经由此函数）。 */
 export function resetToolHoverState(): void {
 	setHoveredToolCallId(null);
+	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);

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

@@ -1,5 +1,7 @@
 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 { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
 import { getScrollButtonWidget } from "./scroll.ts";
@@ -76,6 +78,29 @@ export function isScrollbarColumnAt(layout: any, x: number): boolean {
 	return hit;
 }
 
+/** compact 展开卡用 childAtRow 映射 thinking；其余按 render 行数下钻。 */
+function nestedChildAtRow(node: any, localRow: number, width: number): any {
+	if (typeof node?.childAtRow === "function") {
+		return node.childAtRow(localRow, width);
+	}
+	if (!Array.isArray(node?.children)) return null;
+	let offset = 0;
+	for (const child of node.children) {
+		let count = 0;
+		try {
+			const rendered = child.render?.(width);
+			if (Array.isArray(rendered)) count = rendered.length;
+		} catch {
+			count = 0;
+		}
+		if (localRow < offset + count) {
+			return nestedChildAtRow(child, localRow - offset, width);
+		}
+		offset += count;
+	}
+	return null;
+}
+
 /**
  * 布局 leaf box 的组件通常是容器（documentContainer/dock 容器等），工具卡与
  * widget 在其 children 内。按局部行遍历组件树，定位实际命中的子组件。
@@ -94,7 +119,19 @@ export function componentAtLocalRow(
 		return { component, row: localRow };
 	}
 	if (isCompactAssistantComponent(component)) {
-		// compact 摘要行整体作为可展开卡片（折叠摘要 / 展开内容）。
+		// 折叠：整行摘要。展开：先命中内部 thinking hint，其余仍归外层卡片。
+		if (component.expanded === true) {
+			const inner = nestedChildAtRow(component, localRow, width);
+			if (inner instanceof ThinkingPreviewBlock) {
+				return { component: inner, row: localRow };
+			}
+		}
+		return { component, row: localRow };
+	}
+	if (component instanceof ThinkingPreviewBlock) {
+		return { component, row: localRow };
+	}
+	if (isMessageDisplayComponent(component)) {
 		return { component, row: localRow };
 	}
 	if (component === getScrollButtonWidget()) {
@@ -134,7 +171,9 @@ export function collectFullscreenToolCards(
 	if (
 		isToolExecutionComponent(component) ||
 		component instanceof ToolGroupComponent ||
-		isCompactAssistantComponent(component)
+		isCompactAssistantComponent(component) ||
+		component instanceof ThinkingPreviewBlock ||
+		isMessageDisplayComponent(component)
 	) {
 		out.push(component);
 		return;