@herbertgao/pi-extensions 2026.8.5 → 2026.8.7

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

@@ -12,7 +12,7 @@ export type ContextPart = {
 	color: "accent" | "success" | "warning" | "muted" | "dim";
 };
 
-type PreviewKey = "systemPrompt" | "tools" | "contextFiles" | "skills";
+type PreviewKey = "systemPrompt" | "tools" | "toolResults" | "contextFiles" | "skills";
 
 type ContextPreview = {
 	key: PreviewKey;
@@ -303,6 +303,48 @@ export function scaleParts(parts: ContextPart[], target: number): ContextPart[]
 	return scaled;
 }
 
+export function resolveUsedTokens(
+	usage: { tokens: number | null; percent: number | null } | undefined,
+	estimated: number,
+	contextWindow: number,
+): number {
+	const reported = usage?.tokens;
+	const fromPercent =
+		usage?.percent !== null && usage?.percent !== undefined && contextWindow > 0
+			? Math.round((usage.percent / 100) * contextWindow)
+			: undefined;
+	let resolved = reported ?? fromPercent ?? estimated;
+	if (reported !== null && reported !== undefined && fromPercent !== undefined) {
+		const tolerance = Math.max(32, Math.round(contextWindow * 0.001));
+		if (Math.abs(reported - fromPercent) > tolerance) resolved = fromPercent;
+	}
+	if (estimated > 0 && resolved < estimated * 0.25) return estimated;
+	return resolved;
+}
+
+export function capParts(parts: ContextPart[], target: number, fixedPrefix = 0): ContextPart[] {
+	const fixed = parts.slice(0, fixedPrefix);
+	const variable = parts.slice(fixedPrefix);
+	const fixedTokens = fixed.reduce((sum, part) => sum + part.tokens, 0);
+	const variableTarget = Math.max(0, target - fixedTokens);
+	const estimated = variable.reduce((sum, part) => sum + part.tokens, 0);
+	if (estimated <= variableTarget || estimated === 0) return parts;
+	if (variableTarget === 0) return [...fixed, ...variable.map((part) => ({ ...part, tokens: 0 }))];
+	let previous = 0;
+	let cumulative = 0;
+	const capped = variable.map((part, index) => {
+		cumulative += part.tokens;
+		const next =
+			index === variable.length - 1
+				? variableTarget
+				: Math.round((cumulative / estimated) * variableTarget);
+		const tokens = next - previous;
+		previous = next;
+		return { ...part, tokens };
+	});
+	return [...fixed, ...capped];
+}
+
 export function formatTokens(tokens: number): string {
 	if (tokens < 1_000) return String(tokens);
 	if (tokens < 100_000) return `${(tokens / 1_000).toFixed(1)}k`;
@@ -326,13 +368,14 @@ type ContextBreakdown = {
 	parts: ContextPart[];
 	options: SystemPromptOptions;
 	systemPrompt: string;
+	toolResults: string;
 };
 
 /**
  * Single pass over prompt options + session entries. Returns options/systemPrompt
  * so the /context UI does not re-fetch or re-stringify the same sources.
  */
-function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBreakdown {
+export function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBreakdown {
 	const options = (ctx.getSystemPromptOptions?.() ?? {}) as SystemPromptOptions;
 	const systemPrompt = typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "";
 
@@ -361,12 +404,16 @@ function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBreakdown
 	let assistant = 0;
 	let toolResults = 0;
 	let summaries = 0;
+	const toolResultPreview: string[] = [];
 	for (const entry of ctx.sessionManager.buildContextEntries()) {
 		if (entry.type === "message") {
 			const tokens = estimateTokens(entry.message);
 			if (entry.message.role === "user") user += tokens;
 			else if (entry.message.role === "assistant") assistant += tokens;
 			else toolResults += tokens;
+			if (entry.message.role === "toolResult") {
+				toolResultPreview.push(`## Tool result\n\n${JSON.stringify(entry.message, null, 2)}`);
+			}
 		} else if (entry.type === "compaction" || entry.type === "branch_summary") {
 			summaries += tokenEstimate(entry);
 		}
@@ -388,6 +435,7 @@ function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBreakdown
 		parts: parts.filter((part) => part.tokens > 0),
 		options,
 		systemPrompt,
+		toolResults: toolResultPreview.join("\n\n") || "No tool results in the current context.",
 	};
 }
 
@@ -398,10 +446,25 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			const usage = ctx.getContextUsage();
 			const contextWindow = usage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
 			const breakdown = collectContextBreakdown(ctx);
-			const used = usage?.tokens ?? breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
-			const parts = scaleParts(breakdown.parts, used);
+			const estimated = breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
+			const fixedParts = breakdown.parts.filter(
+				(part) => part.label === "System prompt" || part.label === "Tools",
+			);
+			const variableParts = breakdown.parts.filter(
+				(part) => part.label !== "System prompt" && part.label !== "Tools",
+			);
+			const orderedParts = [...fixedParts, ...variableParts];
+			const fixedTokens = fixedParts.reduce((sum, part) => sum + part.tokens, 0);
+			const used = Math.max(resolveUsedTokens(usage, estimated, contextWindow), fixedTokens);
+			const parts = capParts(orderedParts, used, fixedParts.length);
+			const attributed = parts.reduce((sum, part) => sum + part.tokens, 0);
+			const other = Math.max(0, used - attributed);
 			const free = Math.max(0, contextWindow - used);
-			const allParts = [...parts, { label: "Free space", tokens: free, color: "dim" as const }];
+			const allParts = [
+				...parts,
+				{ label: "Other", tokens: other, color: "muted" as const },
+				{ label: "Free space", tokens: free, color: "dim" as const },
+			];
 
 			if (ctx.mode !== "tui") {
 				const lines = allParts.map((part) => `${part.label}: ${formatTokens(part.tokens)} tokens`);
@@ -456,6 +519,12 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 					title: "Tools",
 					content: toolContent.join("\n\n") || "No active tools.",
 				},
+				{
+					key: "toolResults",
+					label: "Tool results",
+					title: "Tool Results",
+					content: breakdown.toolResults,
+				},
 				{
 					key: "contextFiles",
 					label: "Context files",

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/markdown-enhance.ts

@@ -80,14 +80,20 @@ function renderAdmonition(lines: string[], i: number): { output: string[]; next:
 // 裸 URL 转可点击超链接
 // ============================================================================
 
-const URL_RE = /(?<!<)(?<!\]\()https?:\/\/[^\s<>'"|，。；：！？、」』】]+/g;
-const TRIM_URL_RE = /[.,;:!?】」』"'》]+$/;
+const URL_RE = /(?<!<)(?<!\]\()https?:\/\/[^\s<>'"|，。；：！？、」』】（）【】《》『』「」]+/g;
+const TRIM_URL_RE = /[.,;:!?】」』"'》）}]+$/;
 
 /** 去掉 URL 尾部标点；括号按平衡保留（如 Wikipedia 链接含括号）。 */
 function trimUrl(url: string): string {
 	let t = url.replace(TRIM_URL_RE, "");
-	while (t.endsWith(")") && (t.match(/\(/g)?.length ?? 0) < (t.match(/\)/g)?.length ?? 0)) {
-		t = t.slice(0, -1);
+	while (true) {
+		if (t.endsWith(")") && (t.match(/\(/g)?.length ?? 0) < (t.match(/\)/g)?.length ?? 0)) {
+			t = t.slice(0, -1);
+		} else if (t.endsWith("]") && (t.match(/\[/g)?.length ?? 0) < (t.match(/\]/g)?.length ?? 0)) {
+			t = t.slice(0, -1);
+		} else {
+			break;
+		}
 	}
 	return t;
 }
@@ -246,6 +252,41 @@ function deCircled(markdown: string): string {
 	return output.join("\n");
 }
 
+// ============================================================================
+// 跨行链接规整
+// ============================================================================
+
+const MULTILINE_LINK_RE = /\[([^\]\n]*(?:\n[^\]\n]*)+)\](?=\()/g;
+
+/** 防止 Markdown 跨行链接把行尾填充空格纳入 OSC 8 点击区。 */
+function normalizeMultilineLinks(markdown: string): string {
+	const out: string[] = [];
+	let prose: string[] = [];
+	let fence: MarkdownFence | undefined;
+	const flush = () => {
+		if (prose.length === 0) return;
+		out.push(
+			prose.join("\n").replace(MULTILINE_LINK_RE, (_match, label: string) => {
+				const normalized = label.replace(/[ \t]*\n[ \t]*/g, " ").trim();
+				return `[${normalized}]`;
+			}),
+		);
+		prose = [];
+	};
+	for (const line of markdown.split("\n")) {
+		const scanned = scanMarkdownFence(line, fence);
+		fence = scanned.fence;
+		if (scanned.protected) {
+			flush();
+			out.push(line);
+		} else {
+			prose.push(line);
+		}
+	}
+	flush();
+	return out.join("\n");
+}
+
 // ============================================================================
 // 注册
 // ============================================================================
@@ -255,8 +296,9 @@ export default function (pi: ExtensionAPI): void {
 	// 所以三个转换合并为一次注册，内部按序链式执行。
 	pi.registerMarkdownTransformer((markdown, context) => {
 		const { messageType, isStreaming = false } = context ?? {};
-		// 与官方推荐一致：thinking 块与流式中间态不转换
-		if (messageType === "assistant-thinking" || isStreaming) return markdown;
+		if (messageType === "assistant-thinking") return markdown;
+		markdown = normalizeMultilineLinks(markdown);
+		if (isStreaming) return markdown;
 		// 0. 圈数字转半角括号（Nerd Font 补丁字形缺陷规避）
 		markdown = deCircled(markdown);
 		// 1. Mermaid 方言渲染

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

@@ -135,7 +135,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,16 @@ 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 hoveredToolIoView: ExpandedToolIoView | null = null;
 let hoveredToolIoSection: ToolIoSection | null = null;
 
@@ -98,6 +109,7 @@ export function cachedFullscreenComponentAtRow(
 export type FullscreenHoverTarget =
 	| { kind: "button" }
 	| { kind: "group"; component: ToolGroupComponent }
+	| { kind: "thinking"; component: ThinkingPreviewBlock }
 	| { kind: "assistant"; component: any }
 	| {
 			kind: "tool";
@@ -119,6 +131,8 @@ 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 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 } 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,7 @@ import {
 	sharedToolHoverState,
 	setHoveredToolCallId,
 	setHoveredToolGroup,
+	setHoveredThinking,
 	setHoveredToolIo,
 	type FullscreenHoverTarget,
 } from "./hover.ts";
@@ -151,6 +154,34 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 		tui.requestRender?.();
 }
 
+const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
+let lastExpandPanelClick: { card: any; at: number } | null = null;
+
+function isExpandPanelDoubleClick(card: any): boolean {
+	const now = Date.now();
+	const prev = lastExpandPanelClick;
+	lastExpandPanelClick = { card, at: now };
+	return Boolean(prev && prev.card === card && 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);
+	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 +189,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 +265,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 +298,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 +310,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 +339,13 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				}
 			}
 		}
-		// 整卡二次点击：内部工具仍归所属 group，保持整体展开/收起语义。
-		card.setExpanded(false);
+		// 双击收起：内部工具仍归所属 group。单击放行官方（选择/链接）。
+		return collapseExpandedCard(tui, card);
 	}
 	// 点击后清 hover 高亮。
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	card.invalidate?.();
@@ -361,6 +391,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 +416,9 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			} else if (isCompactAssistantComponent(component)) {
 				// compact 摘要行：折叠时仅提示文字高亮，展开卡整体高亮。
 				if (component.expanded || overHint) target = { kind: "assistant", component };
+			} else if (isMessageDisplayComponent(component)) {
+				// skill/compaction/branch：折叠只点 hint；展开后双击收起。
+				if (component.expanded || overHint) target = { kind: "assistant", component };
 			}
 		}
 	}
@@ -779,8 +814,10 @@ export function teardownToolMouseInteraction(
 	toolMouseInputUnsubscribe = null;
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
+	clearExpandPanelDoubleClick();
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
 		else getToolMouseTui()?.terminal?.write?.(TOOL_MOUSE_DISABLE);
@@ -804,6 +841,7 @@ export function teardownToolMouseInteraction(
 /** off 模式清理：清空 hover 与回到底部按钮状态（跨模块 rebind 统一经由此函数）。 */
 export function resetToolHoverState(): void {
 	setHoveredToolCallId(null);
+	setHoveredThinking(null);
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);