pi-cc-extensions 0.9.5 → 0.9.7

package/extensions/renderer/default-mode.ts

@@ -221,7 +221,7 @@ function createCcstyleTool(
 		...originalTool,
 		renderShell: "self",
 		renderCall(args: any, theme: any, context: any) {
-			if (config.mode !== "on") {
+			if (config.mode === "off") {
 				return renderDefault(originalTool, "renderCall", [args, theme, context], String(toolName));
 			}
 
@@ -293,7 +293,7 @@ function createCcstyleTool(
 			};
 		},
 		renderResult(result: any, options: any, theme: any, context: any) {
-			if (config.mode !== "on") {
+			if (config.mode === "off") {
 				return renderDefault(
 					originalTool,
 					"renderResult",
@@ -416,8 +416,9 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 	const builtInDefinition = component.builtInToolDefinition;
 	const definition = extensionDefinition ?? builtInDefinition;
 	const toolName = String(component.toolName || definition?.name || "");
+	// compact 也复用同一套 ccstyle call/result，避免折叠态工具卡回落到 Pi 原生样式。
 	const useCcstyle =
-		patch.mode() === "on" &&
+		patch.mode() !== "off" &&
 		!DEDICATED_RENDERER_TOOLS.has(toolName) &&
 		!preservesOriginalRenderer(extensionDefinition, toolName, builtInDefinition);
 	component[COMPONENT_TOOL_RENDER_MODE] = useCcstyle;
@@ -585,19 +586,27 @@ function installGlobalToolRendering(
 			return originalRender.call(this, width);
 		}
 		const cache = patch.paintCache;
-		const hit = cache?.get(this);
+		// A running partial tool owns a time-varying spinner. Light animation ticks
+		// request a repaint without invalidating the component, so settled-content
+		// caching must not intercept those paints.
+		const cacheable = !(this.executionStarted && this.isPartial);
+		const hit = cacheable ? cache?.get(this) : undefined;
 		if (hit && toolPaintMatches(hit, this, width)) return hit.lines;
 		const lines = originalRender.call(this, width);
-		cache?.set(this, {
-			width,
-			expanded: Boolean(this.expanded),
-			isPartial: Boolean(this.isPartial),
-			result: this.result,
-			args: this.args,
-			callHover: isToolCallHovered(this.toolCallId),
-			ioHover: ioHoverOf(this),
-			lines,
-		});
+		if (cacheable) {
+			cache?.set(this, {
+				width,
+				expanded: Boolean(this.expanded),
+				isPartial: Boolean(this.isPartial),
+				result: this.result,
+				args: this.args,
+				callHover: isToolCallHovered(this.toolCallId),
+				ioHover: ioHoverOf(this),
+				lines,
+			});
+		} else {
+			cache?.delete(this);
+		}
 		return lines;
 	};
 	patch.invalidatePaint = function (this: any): void {

package/extensions/renderer/index.ts

@@ -30,7 +30,7 @@ import {
 	teardownToolMouseInteraction,
 	TOOL_MOUSE_DISABLE,
 } from "./mouse/interaction.ts";
-import { getToolMouseTui } from "./mouse/scroll.ts";
+import { getToolMouseTui, noteNewTranscriptItem } from "./mouse/scroll.ts";
 import { setHoveredToolGroup, setHoveredToolIo } from "./mouse/hover.ts";
 import { clearAllAnimations } from "./tool/result.ts";
 import { installWriteOverride, WriteExecutionMetadataStore } from "./tool/diff/index.ts";
@@ -189,6 +189,13 @@ export default function (
 		}
 	});
 
+	// 回到底部按钮的累计计数：离开底部期间每落一块内容 +1。
+	pi.on("message_start", async (event) => {
+		const role = event.message?.role;
+		// toolResult 不单独成块（渲染在工具卡内），跳过以免与工具卡重复计数。
+		if (role === "user" || role === "assistant" || role === "custom") noteNewTranscriptItem();
+	});
+
 	pi.on("tool_execution_end", async (event) => {
 		if (config.mode !== "compact") return;
 		// Agent 等工具收尾后延迟刷新，让 compact-thinking 先落最终态。
@@ -243,6 +250,7 @@ export default function (
 
 	pi.on("tool_execution_start", async (_event, ctx) => {
 		installation?.toolGrouping.setTheme(ctx.ui.theme);
+		noteNewTranscriptItem();
 	});
 
 	pi.on("session_shutdown", async () => {

package/extensions/renderer/mouse/interaction.ts

@@ -1,13 +1,21 @@
 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_MOUSE_OWNER_KEY } from "../../utils/patch-keys.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 {
+	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 "../tool/show-more-hint.ts";
+import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/show-more-hint.ts";
 import {
 	type ExpandedToolIoView,
 	getActiveIoViewFrame,
@@ -76,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;
@@ -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
 	);
@@ -146,7 +155,12 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 	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,75 +174,92 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 		tui.requestRender?.();
 }
 
-const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
-/** 松开后短时间内的重复按下视为同一次单击（终端会在 mouseup 后再打一次 press）。 */
-const EXPAND_PANEL_CLICK_ARM_MS = 50;
-let pendingExpandPress: { id: unknown } | null = null;
-let lastExpandClick: { id: unknown; 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): unknown {
-	return card instanceof ThinkingPreviewBlock
-		? `${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 clearPendingCollapsePress(): void {
+	pendingCollapsePress = null;
 }
 
-function completeExpandPanelClick(): void {
-	if (!pendingExpandPress) return;
-	const click = { id: pendingExpandPress.id, at: Date.now() };
-	pendingExpandPress = null;
-	if (armExpandClickTimer) clearTimeout(armExpandClickTimer);
-	armExpandClickTimer = setTimeout(() => {
-		armExpandClickTimer = null;
-		// 50ms 内又按下：仍是同一次单击，不能武装成双击。
-		if (pendingExpandPress) return;
-		lastExpandClick = click;
-	}, EXPAND_PANEL_CLICK_ARM_MS);
-	if (
-		typeof armExpandClickTimer === "object" &&
-		armExpandClickTimer &&
-		"unref" in armExpandClickTimer
-	) {
-		armExpandClickTimer.unref();
+/** 带键拖动或滚轮：位置真的变了（超出抖动容差）就不再是单击。 */
+function clearPendingCollapsePressOnMove(packet: SgrMousePacket): void {
+	const press = pendingCollapsePress;
+	if (!press) return;
+	if ((packet.code & 64) !== 0) {
+		pendingCollapsePress = null;
+		return;
 	}
-}
-
-function clearExpandPanelDoubleClick(): void {
-	pendingExpandPress = null;
-	lastExpandClick = null;
-	if (armExpandClickTimer) {
-		clearTimeout(armExpandClickTimer);
-		armExpandClickTimer = null;
+	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 {
@@ -238,9 +269,13 @@ 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);
 	setHoveredToolIo(null, null);
@@ -339,9 +374,10 @@ function blocksOfficialCardToggle(component: any, event: any): boolean {
 
 /**
  * 官方 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;
@@ -359,7 +395,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?.();
@@ -377,21 +416,32 @@ 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;
-		if (!isCollapsedHintRow(component, line)) 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 卡是它的容器，不能收起。
+				if ((isThinking || isTool) && isCompactAssistantComponent(other)) 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;
@@ -399,7 +449,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",
@@ -412,17 +462,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;
 }
@@ -526,7 +579,22 @@ 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 };
 					}
@@ -639,6 +707,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,
@@ -868,8 +941,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;
 		}
@@ -899,7 +979,8 @@ export function teardownToolMouseInteraction(
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	releaseToolCardMouseGuard();
-	clearExpandPanelDoubleClick();
+	clearPendingCollapsePress();
+	suppressOfficialCardClickUntil = 0;
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
 		else getToolMouseTui()?.terminal?.write?.(TOOL_MOUSE_DISABLE);
@@ -947,6 +1028,13 @@ type ToolCardMouseGuard = {
 	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;
@@ -956,6 +1044,19 @@ function installToolCardMouseGuard(): void {
 	// 每次取当前值作为下游，可能是别的扩展的包装。
 	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);
 	};

package/extensions/renderer/mouse/layout.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/extensions/renderer/mouse/scroll.ts

@@ -27,12 +27,19 @@ export function setToolMouseTui(tui: any): void {
 	patchRegistry.install(TOOL_MOUSE_TUI_SLOT, tui);
 }
 
-type ScrollButtonState = { visible: boolean; hovered: boolean; widget: any };
+type ScrollButtonState = {
+	visible: boolean;
+	hovered: boolean;
+	widget: any;
+	/** 按钮可见期间新落的 transcript 块数（消息 + 工具卡）。 */
+	newCount: number;
+};
 function scrollButtonState(): ScrollButtonState {
 	return patchRegistry.ensure(SCROLL_BUTTON_STATE_SLOT, () => ({
 		visible: false,
 		hovered: false,
 		widget: null,
+		newCount: 0,
 	}));
 }
 export function getScrollButtonVisible(): boolean {
@@ -44,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?.();
 }
 
 /** 返回是否发生变化（调用方据此决定是否需要重渲染）。 */
@@ -64,6 +95,7 @@ export function resetScrollButtonState(): void {
 	scrollButtonState().visible = false;
 	scrollButtonState().hovered = false;
 	scrollButtonState().widget = null;
+	scrollButtonState().newCount = 0;
 	scrollButtonSyncScheduled = false;
 }
 
@@ -206,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/extensions/renderer/tool/grouping.ts

@@ -9,7 +9,7 @@ import {
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { mcpToolTitle } from "./mcp-title.ts";
-import { isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
+import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
 import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 import {
@@ -372,7 +372,8 @@ export class ToolGroupComponent extends Container {
 		const overallColor = overall === "pending" ? "accent" : overall;
 		const nameList = names.size > 1 ? ` ${fg("dim", `• ${toolNameList(this.children)}`)}` : "";
 		// 圆点保持 dim；hover 只高亮可点击文字。
-		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", showMoreHintText())}`;
+		const hintText = this._expanded ? collapseHintText() : showMoreHintText();
+		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
 		const lines = [
 			"",
 			truncateToWidth(

package/extensions/renderer/tool/show-more-hint.ts

@@ -36,3 +36,13 @@ export function expandShortcutText(): string {
 export function showMoreHintText(): string {
 	return isToolTuiFullscreen() ? "click to show more" : `${expandShortcutText()} to show more`;
 }
+
+/** 展开卡的收起提示，与折叠态 showMoreHintText 同一位置对称。 */
+export function collapseHintText(): string {
+	return isToolTuiFullscreen() ? "↑ Collapse" : `${expandShortcutText()} to collapse`;
+}
+
+/** 该行是否带展开态收起提示（用于展开卡的 hint hover 命中）。 */
+export function isCollapseHintLine(plainLine: string): boolean {
+	return plainLine.includes(collapseHintText());
+}