@herbertgao/pi-extensions 2026.9.19 → 2026.10.0

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

@@ -1,11 +1,21 @@
-import { ThinkingPreviewBlock, thinkingRunKey } from "../../feature/compact-thinking.ts";
+import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
 import { hasActiveTextPreview, showTextPreview } from "../../feature/context.ts";
+import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
+import {
+	patchRegistry,
+	TOOL_GROUPING_PARENT_KEY,
+	TOOL_MOUSE_OWNER_KEY,
+} from "../../utils/patch-keys.ts";
 import { ToolGroupComponent } from "../tool/grouping.ts";
-import { isCompactAssistantComponent, setHoveredCompactAssistant } from "../compact-mode.ts";
-import { isMessageDisplayComponent } from "../message-display.ts";
+import {
+	isCompactAssistantComponent,
+	markCompactRoundToolExpanded,
+	setHoveredCompactAssistant,
+} from "../compact-mode.ts";
+import { isMessageDisplayComponent } from "../tool/message-display.ts";
 import { config } from "../../config/config.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
-import { setToolTuiFullscreen } from "../show-more-hint.ts";
+import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/show-more-hint.ts";
 import {
 	type ExpandedToolIoView,
 	getActiveIoViewFrame,
@@ -17,6 +27,7 @@ import {
 import {
 	collectToolComponents,
 	extractToolFramePlacements,
+	isSgrIdleMotion,
 	isSgrLeftPress,
 	isSgrLeftRelease,
 	isToolExecutionComponent,
@@ -36,19 +47,18 @@ import {
 	isScrollbarColumnAt,
 } from "./layout.ts";
 import {
-	disableOfficialScrollToEnd,
 	fullscreenLazyTui,
 	hideScrollButton,
+	restoreOfficialScrollToEnd,
+	syncOfficialScrollToEnd,
 	isScrollBottomInput,
 	renderScrollButton,
 	resetScrollButtonState,
-	restoreOfficialScrollToEnd,
 	scheduleScrollButtonSync,
 	setScrollButtonHovered,
 	setScrollButtonVisible,
 	setScrollButtonWidget,
 	setToolMouseTui,
-	syncOfficialScrollToEnd,
 	getScrollButtonVisible,
 	getScrollButtonWidget,
 	getToolMouseTui,
@@ -74,7 +84,7 @@ type FrameToolRender = {
 };
 
 type InteractionRegion = {
-	kind: "collapsed-hint" | "expanded-card" | "show-more" | "scroll-bottom";
+	kind: "collapsed-hint" | "collapse-hint" | "expanded-card" | "show-more" | "scroll-bottom";
 	row: number;
 	startCol: number;
 	endCol: number;
@@ -89,9 +99,7 @@ const TOOL_MOUSE_WIDGET_KEY = "ccstyle-tool-mouse";
 const TOOL_MOUSE_MOTION_ENABLE = "\x1b[?1003h\x1b[?1006h";
 const TOOL_MOUSE_MOTION_DISABLE = "\x1b[?1003l";
 const FULLSCREEN_MOTION_ENABLED = Symbol("ccstyle.fullscreen-motion-enabled");
-const TOOL_MOUSE_OWNER_KEY = Symbol.for("pi.ccstyle.tool-mouse-owner");
-type ToolMouseOwner = object;
-const DEFAULT_TOOL_MOUSE_OWNER: ToolMouseOwner = {};
+const DEFAULT_TOOL_MOUSE_OWNER = {};
 export const TOOL_MOUSE_DISABLE = "\x1b[?1006l\x1b[?1003l\x1b[?1000l";
 
 let toolMouseUi: any = null;
@@ -101,7 +109,7 @@ let toolMouseRenderPatchOriginal: ((...args: any[]) => any) | null = null;
 let toolMouseRenderPatchWrapper: ((...args: any[]) => any) | null = null;
 let toolMouseRenderPatchState: { active: boolean } | null = null;
 let toolMouseRawWrite: ((data: string) => unknown) | null = null;
-let toolMouseInstallationOwner: ToolMouseOwner | null = null;
+let toolMouseInstallationOwner: object | null = null;
 let fullscreenMotionTerminal: any = null;
 let ownsFullscreenMotion = false;
 let sessionRenderTimer: ReturnType<typeof setTimeout> | null = null;
@@ -119,6 +127,7 @@ function interactionRegionAt(packet: SgrMousePacket): InteractionRegion | null {
 		matches.find((region) => region.kind === "show-more") ??
 		matches.find((region) => region.kind === "scroll-bottom") ??
 		matches.find((region) => region.kind === "collapsed-hint") ??
+		matches.find((region) => region.kind === "collapse-hint") ??
 		matches.find((region) => region.kind === "expanded-card") ??
 		null
 	);
@@ -135,18 +144,26 @@ function tryOpenToolIoShowMore(region: InteractionRegion): boolean {
 	}
 	const title = section === "input" ? "Tool Input" : "Tool Output";
 	const content = section === "input" ? ioView.getInputBody() : ioView.getOutputBody();
-	void showTextPreview({ ui }, title, content || "(empty)");
+	// 整段就是代码时包一层围栏：弹框按 Markdown 渲染，围栏代码块才会着色
+	const fence = section === "input" ? ioView.getInputCodeFence() : undefined;
+	const preview = fence ? `\`\`\`${fence.language}\n${fence.code}\n\`\`\`` : content;
+	void showTextPreview({ ui }, title, preview || "(empty)");
 	return true;
 }
 
 function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
-	if ((packet.code & 32) === 0 || packet.final !== "M") return;
+	if (!isSgrIdleMotion(packet)) return;
 	const region = interactionRegionAt(packet);
 	const nextScrollButtonHovered = region?.kind === "scroll-bottom";
 	const scrollButtonChanged = setScrollButtonHovered(nextScrollButtonHovered);
 	const component = region?.component;
 	const nextToolCallId = region?.kind === "collapsed-hint" ? (component?.toolCallId ?? null) : null;
-	const nextGroup = component instanceof ToolGroupComponent ? component : null;
+	// group 只在提示文字上高亮（展开卡整行都是 expanded-card，不能算 hint）。
+	const nextGroup =
+		(region?.kind === "collapsed-hint" || region?.kind === "collapse-hint") &&
+		component instanceof ToolGroupComponent
+			? component
+			: null;
 	const nextIoView = region?.kind === "show-more" ? (region.view ?? null) : null;
 	const nextIoSection = region?.kind === "show-more" ? (region.section ?? null) : null;
 	const changed = nextToolCallId !== sharedToolHoverState().toolCallId;
@@ -160,74 +177,92 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 		tui.requestRender?.();
 }
 
-const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
-const EXPAND_PANEL_CLICK_ARM_MS = 50;
-type ExpandPanelIdentity = string | object;
-let pendingExpandPress: { id: ExpandPanelIdentity } | null = null;
-let lastExpandClick: { id: ExpandPanelIdentity; at: number } | null = null;
-let armExpandClickTimer: ReturnType<typeof setTimeout> | null = null;
+/** 单击判定：按下与松开落在同一格（renderer 合成 click 的条件），位移与时限各留容差。 */
+const COLLAPSE_CLICK_MOVE_TOLERANCE = 1;
+const COLLAPSE_CLICK_MAX_MS = 600;
+/** 扩展收起自有卡后，官方 click 可能对同一次点击再 toggle 内部工具卡，短暂吞掉。 */
+const SUPPRESS_OFFICIAL_CARD_CLICK_MS = 300;
+/** 官方 fullscreen 的焦点事件串：发给原 handler 可清掉选区锚点（见 tui-alt-screen）。 */
+const FULLSCREEN_FOCUS_OUT = "\x1b[O";
 
-function expandPanelIdentity(card: any): ExpandPanelIdentity {
-	return card instanceof ThinkingPreviewBlock
-		? thinkingRunKey(card.messageTimestamp, card.runStartIndex)
-		: card;
-}
+let pendingCollapsePress: {
+	card: any;
+	/** 命中的最内层组件：官方工具卡由 MouseRegion 的 click 收起。 */
+	component: any;
+	col: number;
+	row: number;
+	at: number;
+} | null = null;
+let suppressOfficialCardClickUntil = 0;
 
-function isExpandPanelDoubleClick(card: any): boolean {
-	const now = Date.now();
-	const id = expandPanelIdentity(card);
-	const prev = lastExpandClick;
-	pendingExpandPress = { id };
-	if (prev && prev.id === id && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS) {
-		pendingExpandPress = null;
-		lastExpandClick = null;
-		return true;
-	}
-	return false;
-}
-
-function completeExpandPanelClick(): void {
-	if (!pendingExpandPress) return;
-	const click = { id: pendingExpandPress.id, at: Date.now() };
-	pendingExpandPress = null;
-	if (armExpandClickTimer) clearTimeout(armExpandClickTimer);
-	armExpandClickTimer = setTimeout(() => {
-		armExpandClickTimer = null;
-		if (pendingExpandPress) return;
-		lastExpandClick = click;
-	}, EXPAND_PANEL_CLICK_ARM_MS);
-	if (
-		typeof armExpandClickTimer === "object" &&
-		armExpandClickTimer &&
-		"unref" in armExpandClickTimer
-	) {
-		armExpandClickTimer.unref();
-	}
+function clearPendingCollapsePress(): void {
+	pendingCollapsePress = null;
 }
 
-function clearExpandPanelDoubleClick(): void {
-	pendingExpandPress = null;
-	lastExpandClick = null;
-	if (armExpandClickTimer) {
-		clearTimeout(armExpandClickTimer);
-		armExpandClickTimer = null;
+/** 带键拖动或滚轮：位置真的变了（超出抖动容差）就不再是单击。 */
+function clearPendingCollapsePressOnMove(packet: SgrMousePacket): void {
+	const press = pendingCollapsePress;
+	if (!press) return;
+	if ((packet.code & 64) !== 0) {
+		pendingCollapsePress = null;
+		return;
 	}
+	if (Math.abs(packet.col - press.col) <= COLLAPSE_CLICK_MOVE_TOLERANCE) {
+		if (Math.abs(packet.row - press.row) <= COLLAPSE_CLICK_MOVE_TOLERANCE) return;
+	}
+	pendingCollapsePress = null;
 }
 
-function collapseExpandedCard(tui: any, card: any): boolean {
-	// 单击也 consume，避免官方链再合成一次 press 把单击当成双击。
-	if (!isExpandPanelDoubleClick(card)) return true;
-	card.setExpanded(false);
+function clearHoverState(): void {
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
 	setHoveredThinking(null);
 	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
+}
+
+/** 收起一张展开卡（group 的 setExpanded 会传播到内部工具）。 */
+function collapseExpandedCard(tui: any, card: any): void {
+	card.setExpanded(false);
+	clearHoverState();
 	card.invalidate?.();
-	tui.requestRender?.();
-	clearExpandPanelDoubleClick();
-	return true;
+	tui?.requestRender?.();
+}
+
+function rememberCollapsePress(card: any, component: any, packet: SgrMousePacket): void {
+	pendingCollapsePress = { card, component, col: packet.col, row: packet.row, at: Date.now() };
+}
+
+/**
+ * 松手结算：只有"按下与松开在同一格"的完整单击才收起，拖动选择文本时保持展开。
+ * 官方工具卡（result 区的 MouseRegion）由 guard 在官方 click 里收起，这里必须跳过，
+ * 否则先收起会被官方 click 的 setExpanded(!expanded) 翻回来。
+ */
+function resolveCollapsePress(
+	tui: any,
+	packet: SgrMousePacket,
+	options: { skipOfficialCards: boolean },
+): any {
+	const press = pendingCollapsePress;
+	pendingCollapsePress = null;
+	if (!press || packet.final !== "m") return undefined;
+	if (Math.abs(packet.col - press.col) > COLLAPSE_CLICK_MOVE_TOLERANCE) return undefined;
+	if (Math.abs(packet.row - press.row) > COLLAPSE_CLICK_MOVE_TOLERANCE) return undefined;
+	if (Date.now() - press.at > COLLAPSE_CLICK_MAX_MS) return undefined;
+	if (options.skipOfficialCards && press.component instanceof ToolExecutionComponent)
+		return undefined;
+	const card = press.card;
+	if (
+		(card instanceof ToolGroupComponent || isCompactAssistantComponent(card)) &&
+		press.component !== card
+	) {
+		// 点击落在卡内工具行：官方 click 会对同一次点击再次 toggle，吞掉它。
+		suppressOfficialCardClickUntil = Date.now() + SUPPRESS_OFFICIAL_CARD_CLICK_MS;
+	}
+	collapseExpandedCard(tui, card);
+	// 返回收起的卡：调用方只对 compact 面板清官方选区。
+	return card;
 }
 
 function toggleToolAtMouseClick(tui: any, packet: SgrMousePacket): boolean {
@@ -237,12 +272,15 @@ function toggleToolAtMouseClick(tui: any, packet: SgrMousePacket): boolean {
 	if (region.kind === "show-more") return tryOpenToolIoShowMore(region);
 	const component = region.component;
 	if (!component) return false;
-	if (region.kind === "expanded-card") return collapseExpandedCard(tui, component);
+	if (region.kind === "expanded-card" || region.kind === "collapse-hint") {
+		// regular 模式没有官方 click 合成，按下先记账，松手结算是否收起。
+		rememberCollapsePress(component, component, packet);
+		return true;
+	}
 	component.setExpanded(true);
-	clearExpandPanelDoubleClick();
+	clearPendingCollapsePress();
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
-	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	component.invalidate?.();
 	tui.requestRender?.();
@@ -312,11 +350,37 @@ function releaseFullscreenToolMouseMotion(tui?: any): void {
 const FULLSCREEN_VIEWPORT_PATCH = Symbol("ccstyle.fullscreen-viewport-patch");
 const FULLSCREEN_WHEEL_SCROLL_ORIGINAL = Symbol("ccstyle.fullscreen-wheel-scroll-original");
 
+/**
+ * diff 结果组件自带 remainder 行：声明存在时只有那一行是展开入口（正文里的同名字样不算）；
+ * 未声明的组件继续用文本规则。
+ */
+function isCollapsedHintRow(component: any, finalLine: string): boolean {
+	const result = component?.resultRendererComponent;
+	return typeof result?.isCollapsedHintLine === "function"
+		? result.isCollapsedHintLine(finalLine)
+		: true;
+}
+
+/**
+ * pi 0.87 给工具结果区套了 MouseRegion：整卡左键 click 都会 setExpanded。
+ * 命中该区域时官方会跳过文本选区，所以可以安全吞掉；单行摘要卡没有声明
+ * remainder 行，继续走官方整行行为。
+ */
+function blocksOfficialCardToggle(component: any, event: any): boolean {
+	if (event?.type !== "click" || event.button !== "left" || component?.expanded) return false;
+	const result = component?.resultRendererComponent;
+	if (typeof result?.isCollapsedHintLine !== "function") return false;
+	const lines = component.render?.(Math.max(1, Math.floor(Number(event.width) || 0)));
+	const line = Array.isArray(lines) ? lines[event.y] : undefined;
+	return typeof line === "string" && !result.isCollapsedHintLine(line);
+}
+
 /**
  * 官方 fullscreen 工具卡点击：collapsed hint 单击展开
- * （有且仅保持一个展开：展开前收起其他工具卡），expanded 整卡双击收起，
- * 截断头 show-more 单击打开全量预览；回到底部按钮 scrollToBottom。
- * 滚动条列、含 OSC8 链接行、非工具区域、展开卡单击放行官方。
+ * （有且仅保持一个展开：展开前收起其他工具卡），expanded 卡放行官方 press，
+ * 位置不变的松手才收起（官方卡经 guard，思考/group/compact 自有卡由扩展结算），
+ * 拖动选择文本时不收起；截断头 show-more 单击打开全量预览；回到底部按钮 scrollToBottom。
+ * 滚动条列、含 OSC8 链接行、非工具区域、折叠卡正文放行官方。
  */
 function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const layout = tui.currentLayout;
@@ -334,7 +398,10 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const target = componentAtLocalRow(hit.box.component, hit.localRow, contentWidth);
 	if (!target) return false;
 	const component = target.component;
-	const card = target.group ?? component;
+	// compact 展开面板内命中时 owner 是面板：收起对象与记账对象都归面板，
+	// 否则 skipOfficialCards 会把内部工具当成官方卡跳过。
+	const card = target.group ?? target.owner ?? component;
+	const pressComponent = target.owner ?? component;
 	// 回到底部按钮：按组件引用命中，不依赖渲染行缓存。
 	if (getScrollButtonVisible() && component === getScrollButtonWidget()) {
 		tui.scrollToBottom?.();
@@ -352,20 +419,38 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
 		const hint = collapsedHintHitbox(line);
-		if (!hint || packet.col < hint.startCol || packet.col > hint.endCol) return false;
+		const onHint = Boolean(
+			hint &&
+				packet.col >= hint.startCol &&
+				packet.col <= hint.endCol &&
+				isCollapsedHintRow(component, line),
+		);
+		if (!onHint) {
+			// 面板内非提示区（工具卡标题/摘要行、thinking 预览正文）：单击收起整块面板。
+			if (target.owner) rememberCollapsePress(target.owner, target.owner, packet);
+			return false;
+		}
 		// single-expand：展开前收起其他已展开工具卡/group。
 		const others: any[] = [];
 		collectFullscreenToolCards(hit.box.component, others);
 		for (const other of others) {
 			if (other !== component && other.expanded) {
-				// 展开 round 内 thinking 时不要把外层 compact 卡收起。
-				if (isThinking && isCompactAssistantComponent(other)) continue;
+				// 展开 round 卡内 thinking/工具时，外层 compact 卡是它的容器，不能收起。
+				// 面板挂在摘要行时，anchor 与摘要行是同一张外层卡，点内部工具不能收起它。
+				if (
+					(isThinking || isTool) &&
+					isCompactAssistantComponent(other) &&
+					(other === target.owner || other === target.owner?.roundAnchor)
+				)
+					continue;
 				other.setExpanded(false);
 				other.invalidate?.();
 			}
 		}
+		// 展开 round 卡内工具时，让 compact 的强制折叠放行它（非 round 内工具为空操作）。
+		if (isTool) markCompactRoundToolExpanded(component);
 		component.setExpanded(true);
-		clearExpandPanelDoubleClick();
+		clearPendingCollapsePress();
 	} else {
 		// 普通工具截断头 show-more：打开全量预览（不收起）。
 		const view = isTool ? component.resultRendererComponent : null;
@@ -373,7 +458,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 			const plain = stripTerminalSequencesPreservingLayout(line);
 			const section = view.matchShowMoreLine(plain);
 			if (section) {
-				clearExpandPanelDoubleClick();
+				clearPendingCollapsePress();
 				const box = view.showMoreHitbox(plain);
 				return tryOpenToolIoShowMore({
 					kind: "show-more",
@@ -386,17 +471,20 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				});
 			}
 		}
-		// 双击收起：内部工具仍归所属 group。单击放行官方（选择/链接）。
-		return collapseExpandedCard(tui, card);
+		// 其余放行官方：选区、OSC8 链接与 click 合成都交给 renderer。
+		// 完整单击的收起：官方卡由 guard 处理，自有卡在松手时结算。
+		rememberCollapsePress(card, pressComponent, packet);
+		return false;
 	}
-	// 点击后清 hover 高亮。
+	// 点击后清 hover 高亮。只 invalidate 点中的组件（或它所在的 group），
+	// 不要动 owner 面板：面板 invalidate 会连带重跑 updateContent，重建 thinking 实例。
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
 	setHoveredThinking(null);
 	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
-	card.invalidate?.();
+	(target.group ?? component).invalidate?.();
 	tui.requestRender?.();
 	return true;
 }
@@ -406,7 +494,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
  * expanded 卡截断头 show-more、回到底部按钮。motion 不 consume，官方链照常。
  */
 function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
-	if (packet.final !== "M") return;
+	if (!isSgrIdleMotion(packet)) return;
 	const layout = tui.currentLayout;
 	if (!layout?.root) return;
 	const x = packet.col - 1;
@@ -500,17 +588,33 @@ function patchFullscreenViewportInput(tui: any): void {
 			if (packets && tui.hasOverlay?.() && hasActiveTextPreview()) return undefined;
 			if (packets && !tui.hasOverlay?.()) {
 				for (const packet of packets) {
-					if (isSgrLeftRelease(packet)) completeExpandPanelClick();
+					if (isSgrLeftRelease(packet)) {
+						// 只给 compact 面板清选区：自有面板收起会重排布局，官方选区锚点
+						// 还停在旧布局上，同一次 release 会结算出多行高亮。
+						if (
+							isCompactAssistantComponent(
+								resolveCollapsePress(tui, packet, { skipOfficialCards: true }),
+							)
+						) {
+							try {
+								Reflect.apply(original, this, [FULLSCREEN_FOCUS_OUT]);
+							} catch {
+								/* 老版本没有选区状态 */
+							}
+						}
+					} else if (!isSgrLeftPress(packet) && !isSgrIdleMotion(packet))
+						clearPendingCollapsePressOnMove(packet);
 					if (isSgrLeftPress(packet) && handleFullscreenToolClick(tui, packet)) {
 						return { consume: true };
 					}
-					if ((packet.code & 32) !== 0 && packet.final === "M") {
+					// 仅无按键移动走 hover；左键拖动（文本多选）放行官方选区，避免每像素命中+重绘。
+					if (isSgrIdleMotion(packet)) {
 						handleFullscreenToolHover(tui, packet);
 					}
 				}
 			}
 		}
-		return original.apply(this, [data]);
+		return Reflect.apply(original, this, [data]);
 	};
 }
 
@@ -574,7 +678,11 @@ function buildInteractionFrame(
 			const line = placement.finalLine;
 			if (!component.expanded) {
 				const box = collapsedHintHitbox(line);
-				if (box && COLLAPSED_TOOL_SUMMARY.test(stripTerminalSequences(line))) {
+				if (
+					box &&
+					COLLAPSED_TOOL_SUMMARY.test(stripTerminalSequences(line)) &&
+					isCollapsedHintRow(component, line)
+				) {
 					regions.push({ kind: "collapsed-hint", row: finalRow, ...box, component });
 				}
 				continue;
@@ -608,6 +716,11 @@ function buildInteractionFrame(
 			if (placement.componentRow < cardStart) continue;
 			const finalRow = lineIndexToScreenRow(placement.lineIndex);
 			if (finalRow >= 1 && finalRow <= visibleRows) {
+				// 展开态的 ↑ Collapse 提示单独成区：hover 高亮 hint，点击仍收起整卡。
+				const hintBox = collapsedHintHitbox(placement.finalLine);
+				if (hintBox && isCollapseHintLine(stripTerminalSequences(placement.finalLine))) {
+					regions.push({ kind: "collapse-hint", row: finalRow, ...hintBox, component });
+				}
 				regions.push({
 					kind: "expanded-card",
 					row: finalRow,
@@ -650,7 +763,7 @@ function wrapToolRendersForFrame(
 				) {
 					const boxOriginal = box.render;
 					const boxWrapped = function (this: any, ...boxArgs: any[]) {
-						const boxLines = boxOriginal.apply(this, boxArgs);
+						const boxLines = Reflect.apply(boxOriginal, this, boxArgs);
 						if (Array.isArray(boxLines)) contentBoxLines = boxLines.length;
 						return boxLines;
 					};
@@ -660,7 +773,7 @@ function wrapToolRendersForFrame(
 					}
 				}
 				try {
-					const lines = originalRender.apply(this, renderArgs);
+					const lines = Reflect.apply(originalRender, this, renderArgs);
 					if (!Array.isArray(lines)) return lines;
 					renderedTools.push({
 						component,
@@ -736,10 +849,10 @@ function patchToolMouseMotionAfterRender(tui: any): void {
 	const rawWrite = typeof terminal?.write === "function" ? terminal.write : undefined;
 	if (typeof original !== "function") return;
 
-	toolMouseRawWrite = rawWrite ? (data) => rawWrite.apply(terminal, [data]) : null;
+	toolMouseRawWrite = rawWrite ? (data) => Reflect.apply(rawWrite, terminal, [data]) : null;
 	const patchState = { active: true };
 	const wrapper = function (this: any, ...args: any[]) {
-		if (!patchState.active) return original.apply(this, args);
+		if (!patchState.active) return Reflect.apply(original, this, args);
 		const renderedTools: FrameToolRender[] = [];
 		const idToComponent = new Map<number, any>();
 		const frame: IoViewFrameState = {
@@ -756,7 +869,7 @@ function patchToolMouseMotionAfterRender(tui: any): void {
 		let sawTuiRender = false;
 		if (originalTuiRender) {
 			const wrappedTuiRender = function (this: any, ...renderArgs: any[]) {
-				const lines = originalTuiRender.apply(this, renderArgs);
+				const lines = Reflect.apply(originalTuiRender, this, renderArgs);
 				if (!Array.isArray(lines)) return lines;
 				sawTuiRender = true;
 				const extracted = extractToolFramePlacements(
@@ -773,7 +886,7 @@ function patchToolMouseMotionAfterRender(tui: any): void {
 		const previousFrame = getActiveIoViewFrame();
 		setActiveIoViewFrame(frame);
 		try {
-			const result = original.apply(this, args);
+			const result = Reflect.apply(original, this, args);
 			succeeded = true;
 			// Test harnesses may paint via doRender without tui.render; recover markers there.
 			if (!sawTuiRender && Array.isArray(this.previousLines)) {
@@ -837,8 +950,15 @@ function handleToolMouseInput(data: string): { consume: true } | undefined {
 	let consumed = false;
 	for (const packet of packets) {
 		updateToolSummaryHover(getToolMouseTui(), packet);
-		if (isSgrLeftRelease(packet)) completeExpandPanelClick();
-		if (!isSgrLeftPress(packet)) continue;
+		if (isSgrLeftRelease(packet)) {
+			resolveCollapsePress(getToolMouseTui(), packet, { skipOfficialCards: false });
+			continue;
+		}
+		if (!isSgrLeftPress(packet)) {
+			// 带键拖动或滚轮：位置变了就不再是单击。
+			if (!isSgrIdleMotion(packet)) clearPendingCollapsePressOnMove(packet);
+			continue;
+		}
 		if (toggleToolAtMouseClick(getToolMouseTui(), packet)) {
 			consumed = true;
 		}
@@ -851,10 +971,10 @@ function handleToolMouseInput(data: string): { consume: true } | undefined {
 }
 
 export function teardownToolMouseInteraction(
-	owner: ToolMouseOwner = toolMouseInstallationOwner ?? DEFAULT_TOOL_MOUSE_OWNER,
+	owner: object = toolMouseInstallationOwner ?? DEFAULT_TOOL_MOUSE_OWNER,
 ): void {
-	const host = globalThis as any;
-	if (host[TOOL_MOUSE_OWNER_KEY] && host[TOOL_MOUSE_OWNER_KEY] !== owner) return;
+	const current = patchRegistry.get<object>(TOOL_MOUSE_OWNER_KEY);
+	if (current && current !== owner) return;
 	if (sessionRenderTimer) {
 		clearTimeout(sessionRenderTimer);
 		sessionRenderTimer = null;
@@ -867,7 +987,9 @@ export function teardownToolMouseInteraction(
 	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
-	clearExpandPanelDoubleClick();
+	releaseToolCardMouseGuard();
+	clearPendingCollapsePress();
+	suppressOfficialCardClickUntil = 0;
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
 		else getToolMouseTui()?.terminal?.write?.(TOOL_MOUSE_DISABLE);
@@ -885,7 +1007,7 @@ export function teardownToolMouseInteraction(
 	resetScrollButtonState();
 	setToolMouseTui(null);
 	toolMouseUi = null;
-	if (host[TOOL_MOUSE_OWNER_KEY] === owner) delete host[TOOL_MOUSE_OWNER_KEY];
+	patchRegistry.dispose(TOOL_MOUSE_OWNER_KEY, owner);
 	if (toolMouseInstallationOwner === owner) toolMouseInstallationOwner = null;
 }
 
@@ -901,9 +1023,66 @@ export function resetToolHoverState(): void {
 	releaseFullscreenToolMouseMotion(getToolMouseTui());
 }
 
+/**
+ * pi 0.87 起工具卡结果区自带 MouseRegion，整卡左键 click 都会 setExpanded。
+ * ccstyle 的多行折叠卡（rich diff）只允许声明的 remainder 行展开，
+ * 其余位置直接吞掉 click，避免官方把 diff 正文当展开入口。
+ * 0.84 及更早没有 handleMouse，安装时跳过。
+ */
+const TOOL_CARD_MOUSE_GUARD_KEY = Symbol.for("pi.ccstyle.tool-card-mouse-guard");
+
+type ToolCardMouseGuard = {
+	prototype: any;
+	original: (event: any) => any;
+	wrapper: (event: any) => any;
+};
+
+/** 官方 click 落在展开卡上：同一 group 的任意内部工具行都收起整个 group。 */
+function collapseExpandedCardFromOfficialClick(component: any): void {
+	if (typeof component?.setExpanded !== "function") return;
+	const group = component?.[TOOL_GROUPING_PARENT_KEY];
+	collapseExpandedCard(getToolMouseTui(), group instanceof ToolGroupComponent ? group : component);
+}
+
+function installToolCardMouseGuard(): void {
+	const prototype = (ToolExecutionComponent as any)?.prototype;
+	if (typeof prototype?.handleMouse !== "function") return;
+	const previous = (globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] as ToolCardMouseGuard | undefined;
+	if (previous && previous.prototype === prototype && prototype.handleMouse === previous.wrapper)
+		return;
+	// 每次取当前值作为下游，可能是别的扩展的包装。
+	const original = prototype.handleMouse;
+	const wrapper = function (this: any, event: any) {
+		if (event?.type === "click" && event.button === "left") {
+			// 扩展刚收起过自有卡：这次 click 属于同一次单击，吞掉避免内部工具被翻回展开。
+			if (suppressOfficialCardClickUntil && Date.now() <= suppressOfficialCardClickUntil) {
+				suppressOfficialCardClickUntil = 0;
+				if (this?.expanded) collapseExpandedCardFromOfficialClick(this);
+				return { handled: true };
+			}
+			// 展开卡整卡 click：接管官方 toggle，改为收起（group 内部工具行收起整个 group）。
+			if (this?.expanded && typeof this.setExpanded === "function") {
+				collapseExpandedCardFromOfficialClick(this);
+				return { handled: true };
+			}
+		}
+		if (blocksOfficialCardToggle(this, event)) return { handled: true };
+		return original.call(this, event);
+	};
+	prototype.handleMouse = wrapper;
+	(globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] = { prototype, original, wrapper };
+}
+
+function releaseToolCardMouseGuard(): void {
+	const guard = (globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] as ToolCardMouseGuard | undefined;
+	if (!guard) return;
+	if (guard.prototype?.handleMouse === guard.wrapper) guard.prototype.handleMouse = guard.original;
+	(globalThis as any)[TOOL_CARD_MOUSE_GUARD_KEY] = undefined;
+}
+
 export function installToolMouseInteraction(
 	ctx: any,
-	owner: ToolMouseOwner = DEFAULT_TOOL_MOUSE_OWNER,
+	owner: object = DEFAULT_TOOL_MOUSE_OWNER,
 ): void {
 	teardownToolMouseInteraction(toolMouseInstallationOwner ?? owner);
 	if (ctx?.mode !== "tui" || !ctx?.hasUI) return;
@@ -911,7 +1090,8 @@ export function installToolMouseInteraction(
 		return;
 
 	toolMouseInstallationOwner = owner;
-	(globalThis as any)[TOOL_MOUSE_OWNER_KEY] = owner;
+	patchRegistry.install(TOOL_MOUSE_OWNER_KEY, owner);
+	installToolCardMouseGuard();
 	setHoveredToolCallId(null);
 	toolMouseUi = ctx.ui;
 	// 0.84+ 的 tui 是惰性 Proxy：regular 保留原生 scrollback；fullscreen
@@ -920,14 +1100,14 @@ export function installToolMouseInteraction(
 		setToolMouseTui(tui);
 		setToolTuiFullscreen(fullscreenLazyTui(tui));
 		if (isLazyProxyTui(tui)) {
-			syncOfficialScrollToEnd(tui);
 			patchFullscreenViewportInput(tui);
 			ensureFullscreenToolMouseMotion(tui);
+			syncOfficialScrollToEnd(tui);
 			setScrollButtonWidget({
 				render: (width: number) => {
-					syncOfficialScrollToEnd(tui);
 					patchFullscreenViewportInput(tui);
 					ensureFullscreenToolMouseMotion(tui);
+					syncOfficialScrollToEnd(tui);
 					return renderScrollButton(width, theme);
 				},
 				invalidate() {},
@@ -969,10 +1149,3 @@ export function scheduleSessionRender(refresh?: () => void): void {
 		tui.requestRender(true);
 	}, 0);
 }
-
-export {
-	hoveredToolCallId,
-	isToolCallHovered,
-	setHoveredToolGroup,
-	setHoveredToolIo,
-} from "./hover.ts";