pi-cc-extensions 0.8.61 → 0.8.63

package/README.en.md

@@ -39,7 +39,7 @@ Run `/reload` after installation.
 | --------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------- |
 | Claude Code Output          | Tool summaries, expand/collapse, rich edit/write diffs, and`on` / `compact` / `off` modes | `/ccstyle`                                      |
 | Markdown enhancements      | Mermaid art, admonitions, URL linking, and more                                           | Automatic                                        |
-| Fullscreen mode             | Tool card/group click-to-toggle, previews, hover highlight, and a back-to-bottom button   | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
+| Fullscreen mode             | Tool card/group click to expand, double-click to collapse, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
 | Settings panel              | `Style / Diff / Thinking / Feature` tabs: startup header toggle and wheel step            | `/ccstyle`                                      |
 | Context inspection          | Usage breakdown and previews for the system prompt, tools, skills, and messages           | `/context`                                      |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents          | `@`                                             |
@@ -56,7 +56,7 @@ Run `/reload` after installation.
   "diffViewMode": "auto",                  // diff layout: auto / split / unified
   "diffIndicatorMode": "bars",             // diff change indicators: bars / classic / none
   "diffSplitMinWidth": 120,                // min terminal width before auto layout uses side-by-side columns
-  "diffCollapsedLines": 24,                // edit/diff body lines shown when collapsed; beyond that shows the expand hint (Ctrl+O / click)
+  "editDiffCollapsedLines": 24,            // Edit collapsed lines; beyond that shows the expand hint (Ctrl+O / click)
   "writeDiffCollapsedLines": 0,            // write collapsed body lines; 0 = ↳ created • expand hint (stats stay on the title)
   "diffWordWrap": true,                    // whether long diff lines wrap (otherwise truncated)
   "expandedPreviewMaxLines": 40,           // max body lines for expanded output/diff
@@ -68,6 +68,8 @@ Run `/reload` after installation.
 }
 ```
 
+> **Fullscreen clicks**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. Click a truncated Input/Output header to open the full preview. Double-click an expanded panel to collapse it. Single clicks on an expanded card still select text and open links.
+>
 > **Tip**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.
 
 ## Local development

package/README.md

@@ -39,7 +39,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 | --------------------- | ------------------------------------------------------------------------------- | ----------------------------------------------- |
 | Claude Code UI        | 工具摘要、折叠展开、rich edit/write diff，以及`on` / `compact` / `off` 三种模式 | `/ccstyle`                                      |
 | Markdown 增强         | Mermaid 图、提示框、URL 链接化等                                                        | 自动生效                                        |
-| Fullscreen mode       | 工具卡/group 点击展开与收起、预览、hover 高亮、回到底部按钮                     | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
+| Fullscreen mode       | 工具卡/group 单击展开、双击收起、预览、hover 高亮、回到底部按钮                 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
 | 配置面板              | `Style / Diff / Thinking / Feature` 四页签，含启动头开关与滚轮步进              | `/ccstyle`                                      |
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Tools、Skills 和消息内容                  | `/context`                                      |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
@@ -56,7 +56,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "diffViewMode": "auto",                  // diff 布局：auto / split / unified
   "diffIndicatorMode": "bars",             // diff 变更指示：bars / classic / none
   "diffSplitMinWidth": 120,                // 自动布局下使用左右分栏的最小终端宽度
-  "diffCollapsedLines": 24,                // 折叠时展示的 edit/diff 行数，超出显示展开提示（Ctrl+O / 点击）
+  "editDiffCollapsedLines": 24,            // Edit 折叠行数；超出显示展开提示（Ctrl+O / 点击）
   "writeDiffCollapsedLines": 0,            // write 折叠行数；0 = ↳ created • 展开提示（统计在标题）
   "diffWordWrap": true,                    // 长 diff 行是否换行（否则截断）
   "expandedPreviewMaxLines": 40,           // 展开后输出/diff 正文的最大行数
@@ -74,6 +74,8 @@ pi install git:github.com/minuque/pi-cc-extensions
 }
 ```
 
+> **Fullscreen 点击**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要。单击截断的 Input/Output 打开全量预览。双击展开面板收起。展开卡上的单击仍可选择文本、打开链接。
+>
 > **建议**：`markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。
 
 ## 本地开发

package/extensions/config/config.ts

@@ -15,7 +15,7 @@ export interface ToolDisplayConfig {
 	diffViewMode: DiffViewMode;
 	diffIndicatorMode: DiffIndicatorMode;
 	diffSplitMinWidth: number;
-	diffCollapsedLines: number;
+	editDiffCollapsedLines: number;
 	/** Write-only collapsed body lines. 0 = `↳ created • click to show more`. */
 	writeDiffCollapsedLines: number;
 	diffWordWrap: boolean;
@@ -26,8 +26,8 @@ export const DEFAULT_TOOL_DISPLAY_CONFIG: ToolDisplayConfig = {
 	diffViewMode: "auto",
 	diffIndicatorMode: "bars",
 	diffSplitMinWidth: 120,
-	/** Collapsed tool/diff body: ~half a typical terminal after chrome. */
-	diffCollapsedLines: 24,
+	/** Collapsed edit/diff body: ~half a typical terminal after chrome. */
+	editDiffCollapsedLines: 24,
 	/**
 	 * Write create/overwrite collapsed body.
 	 * 0 = `↳ created • click to show more` (stats stay on the title).
@@ -48,7 +48,7 @@ export type Config = {
 	diffViewMode: DiffViewMode;
 	diffIndicatorMode: DiffIndicatorMode;
 	diffSplitMinWidth: number;
-	diffCollapsedLines: number;
+	editDiffCollapsedLines: number;
 	writeDiffCollapsedLines: number;
 	diffWordWrap: boolean;
 	expandedPreviewMaxLines: number;
@@ -99,7 +99,7 @@ export const DEFAULT_CONFIG: Config = {
 	diffViewMode: DEFAULT_TOOL_DISPLAY_CONFIG.diffViewMode,
 	diffIndicatorMode: DEFAULT_TOOL_DISPLAY_CONFIG.diffIndicatorMode,
 	diffSplitMinWidth: DEFAULT_TOOL_DISPLAY_CONFIG.diffSplitMinWidth,
-	diffCollapsedLines: DEFAULT_TOOL_DISPLAY_CONFIG.diffCollapsedLines,
+	editDiffCollapsedLines: DEFAULT_TOOL_DISPLAY_CONFIG.editDiffCollapsedLines,
 	writeDiffCollapsedLines: DEFAULT_TOOL_DISPLAY_CONFIG.writeDiffCollapsedLines,
 	diffWordWrap: DEFAULT_TOOL_DISPLAY_CONFIG.diffWordWrap,
 	expandedPreviewMaxLines: DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines,
@@ -169,9 +169,9 @@ export function normalizeConfig(input: unknown): Config {
 			40,
 			300,
 		),
-		diffCollapsedLines: pickPositiveInt(
-			source.diffCollapsedLines,
-			DEFAULT_CONFIG.diffCollapsedLines,
+		editDiffCollapsedLines: pickPositiveInt(
+			source.editDiffCollapsedLines ?? source.diffCollapsedLines,
+			DEFAULT_CONFIG.editDiffCollapsedLines,
 			1,
 			500,
 		),
@@ -223,7 +223,7 @@ export function getToolDisplayConfig(source: Config = config): ToolDisplayConfig
 		diffViewMode: source.diffViewMode,
 		diffIndicatorMode: source.diffIndicatorMode,
 		diffSplitMinWidth: source.diffSplitMinWidth,
-		diffCollapsedLines: source.diffCollapsedLines,
+		editDiffCollapsedLines: source.editDiffCollapsedLines,
 		writeDiffCollapsedLines: source.writeDiffCollapsedLines,
 		diffWordWrap: source.diffWordWrap,
 		expandedPreviewMaxLines: source.expandedPreviewMaxLines,
@@ -241,7 +241,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`diffView=${source.diffViewMode}`,
 		`diffIndicator=${source.diffIndicatorMode}`,
 		`diffSplitMin=${source.diffSplitMinWidth}`,
-		`diffCollapsed=${source.diffCollapsedLines}`,
+		`editCollapsed=${source.editDiffCollapsedLines}`,
 		`writeCollapsed=${source.writeDiffCollapsedLines}`,
 		`diffWordWrap=${source.diffWordWrap ? "on" : "off"}`,
 		`expandedMax=${source.expandedPreviewMaxLines}`,

package/extensions/config/panel.ts

@@ -288,11 +288,11 @@ export async function showCcstylePanel(
 				buildNumberInputSubmenu(theme, diffSplitSetting, closeSubmenu),
 		};
 		const diffCollapsedSetting = {
-			id: "diffCollapsedLines",
+			id: "editDiffCollapsedLines",
 			label: "Edit collapsed lines",
 			description:
 				"How many edit/diff body lines to show before the expand hint (Ctrl+O / click). Write uses its own setting below.",
-			currentValue: String(config.diffCollapsedLines),
+			currentValue: String(config.editDiffCollapsedLines),
 			values: [...DIFF_COLLAPSED_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
 				buildNumberInputSubmenu(theme, diffCollapsedSetting, closeSubmenu),
@@ -458,11 +458,16 @@ export async function showCcstylePanel(
 					});
 					diffSplitSetting.currentValue = String(config.diffSplitMinWidth);
 					break;
-				case "diffCollapsedLines":
+				case "editDiffCollapsedLines":
 					updateConfig({
-						diffCollapsedLines: pickPositiveInt(value, DEFAULT_CONFIG.diffCollapsedLines, 1, 500),
+						editDiffCollapsedLines: pickPositiveInt(
+							value,
+							DEFAULT_CONFIG.editDiffCollapsedLines,
+							1,
+							500,
+						),
 					});
-					diffCollapsedSetting.currentValue = String(config.diffCollapsedLines);
+					diffCollapsedSetting.currentValue = String(config.editDiffCollapsedLines);
 					break;
 				case "writeDiffCollapsedLines":
 					updateConfig({

package/extensions/feature/compact-thinking.ts

@@ -174,11 +174,38 @@ function thinkingExpandAction(): string | undefined {
 }
 
 // 只 wrap 尾部窗口；缓存未着色折行，着色放到取出时做，避免主题切换命中旧 ANSI。
-const previewCache = new Map<string, { lines: string[]; hiddenBefore: number }>();
-const PREVIEW_CACHE_MAX = 500;
+type PreviewCacheEntry = { lines: string[]; hiddenBefore: number };
+const previewCache = new Map<string, PreviewCacheEntry>();
+export const THINKING_PREVIEW_CACHE_MAX = 2_048;
 const PREVIEW_BUDGET_MIN_CHARS = 2_000;
 const PREVIEW_BUDGET_SLACK_LINES = 2;
 
+function getCachedPreview(key: string): PreviewCacheEntry | undefined {
+	const entry = previewCache.get(key);
+	if (!entry) return undefined;
+	previewCache.delete(key);
+	previewCache.set(key, entry);
+	return entry;
+}
+
+function cachePreview(key: string, entry: PreviewCacheEntry): void {
+	previewCache.delete(key);
+	while (previewCache.size >= THINKING_PREVIEW_CACHE_MAX) {
+		const oldest = previewCache.keys().next().value;
+		if (oldest === undefined) break;
+		previewCache.delete(oldest);
+	}
+	previewCache.set(key, entry);
+}
+
+export function clearThinkingPreviewCache(): void {
+	previewCache.clear();
+}
+
+export function thinkingPreviewCacheSize(): number {
+	return previewCache.size;
+}
+
 /** 按可见宽度估算折行数，不走 Text 全量 wrap。无换行长段也能计到隐藏行。 */
 function countWrappedLines(text: string, contentWidth: number): number {
 	if (!text) return 0;
@@ -219,14 +246,13 @@ function layoutThinkingPreview(
 		else cut = 0;
 	}
 	const cacheKey = `${width}:${padding}:${cut}:${source}`;
-	let entry = previewCache.get(cacheKey);
+	let entry = getCachedPreview(cacheKey);
 	if (!entry) {
 		entry = {
 			lines: wrapTextWithAnsi(source.replace(/\t/g, "   "), contentWidth),
 			hiddenBefore: cut > 0 ? countWrappedLines(text.slice(0, cut), contentWidth) : 0,
 		};
-		if (previewCache.size >= PREVIEW_CACHE_MAX) previewCache.clear();
-		previewCache.set(cacheKey, entry);
+		cachePreview(cacheKey, entry);
 	}
 	const hiddenLines = entry.hiddenBefore + Math.max(0, entry.lines.length - config.previewLines);
 	const visible = hiddenLines > 0 ? entry.lines.slice(-config.previewLines) : entry.lines;
@@ -254,7 +280,7 @@ function hiddenPreviewHint(
 
 const expandedThinking = new Set<number>();
 
-/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、再点整块收起，对齐工具卡。 */
+/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、双击整块收起，对齐工具卡。 */
 export class ThinkingPreviewBlock implements Component {
 	private heading: string;
 	private text: string;
@@ -265,6 +291,15 @@ export class ThinkingPreviewBlock implements Component {
 	private _expanded: boolean;
 	private hintHovered = false;
 	private expandedBody: { width: number; lines: string[] } | undefined;
+	private collapsedMemo:
+		| {
+				width: number;
+				previewLines: number;
+				hintHovered: boolean;
+				expandAction: string | undefined;
+				lines: string[];
+		  }
+		| undefined;
 
 	constructor(
 		heading: string,
@@ -294,6 +329,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	setExpanded(expanded: boolean): void {
+		if (this._expanded !== expanded) this.collapsedMemo = undefined;
 		this._expanded = expanded;
 		if (expanded) expandedThinking.add(this.messageTimestamp);
 		else {
@@ -303,6 +339,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	setHintHovered(hovered: boolean): void {
+		if (this.hintHovered !== hovered) this.collapsedMemo = undefined;
 		this.hintHovered = hovered;
 	}
 
@@ -362,16 +399,39 @@ export class ThinkingPreviewBlock implements Component {
 			});
 			return box.render(width);
 		}
+
+		const expandAction = thinkingExpandAction();
+		if (
+			this.collapsedMemo?.width === width &&
+			this.collapsedMemo.previewLines === config.previewLines &&
+			this.collapsedMemo.hintHovered === this.hintHovered &&
+			this.collapsedMemo.expandAction === expandAction
+		) {
+			return this.collapsedMemo.lines;
+		}
+
 		const body = this.bodyLines(width, this.padding);
 		const heading = this.headingLines(width, body.hiddenLines, this.padding);
-		if (!body.lines.length) return heading;
-		return [
-			...heading,
-			...body.lines.map((line) => padPreviewLine(this.style(line), width, this.padding)),
-		];
+		const lines = body.lines.length
+			? [
+					...heading,
+					...body.lines.map((line) => padPreviewLine(this.style(line), width, this.padding)),
+				]
+			: heading;
+		this.collapsedMemo = {
+			width,
+			previewLines: config.previewLines,
+			hintHovered: this.hintHovered,
+			expandAction,
+			lines,
+		};
+		return lines;
 	}
 
-	invalidate() {}
+	invalidate() {
+		this.collapsedMemo = undefined;
+		this.expandedBody = undefined;
+	}
 }
 
 function parseSummaryPart(text: string): SummaryPart | undefined {
@@ -922,6 +982,7 @@ function compactThinking(pi: ExtensionAPI) {
 		completedDurations.clear();
 		streamingComponents.clear();
 		expandedThinking.clear();
+		clearThinkingPreviewCache();
 		if (ctx.mode === "tui") ctx.ui.setWidget(WIDGET_ID, undefined);
 
 		if (patchInstalled) {

package/extensions/feature/shell/model-status.ts

@@ -0,0 +1,19 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+function modelLabel(model: any): string | undefined {
+	if (!model) return undefined;
+	const name = model.name || model.id;
+	if (!name) return undefined;
+	return model.provider ? `${model.provider} · ${name}` : name;
+}
+
+function apply(ctx: any): void {
+	if (!ctx?.hasUI) return;
+	ctx.ui?.setStatus?.("model", modelLabel(ctx.model));
+}
+
+/** 用 setStatus 挂模型名，不 setFooter，不接管原生 footer。 */
+export default function (pi: ExtensionAPI): void {
+	pi.on("session_start", async (_event, ctx) => apply(ctx));
+	pi.on("model_select", async (_event, ctx) => apply(ctx));
+}

package/extensions/index.ts

@@ -5,6 +5,7 @@ import { config } from "./config/config.ts";
 import piAliases from "./feature/shell/aliases.ts";
 import piStartupHeader from "./feature/shell/startup-header.ts";
 import workingMessage from "./feature/shell/working-message.ts";
+import modelStatus from "./feature/shell/model-status.ts";
 
 // feature
 import agentAutocomplete from "./feature/reference/subagent.ts";
@@ -22,6 +23,7 @@ export default function (pi: ExtensionAPI): void {
 	if (config.enableAliases) piAliases(pi);
 	piStartupHeader(pi);
 	if (config.enableWorkingMessage) workingMessage(pi);
+	modelStatus(pi);
 
 	// render stack：thinking controller 直接交给 style 作 query
 	markdownEnhance(pi);

package/extensions/renderer/compact-mode.ts

@@ -3,7 +3,7 @@
  * （`Ran for 8s, bash×2, read×2`），edit/write 独立标题行（`✓ write <path> (+25 -0)`），
  * 普通工具折叠时不显示独立行；展开（Ctrl+O / fullscreen 点击）在单个工具卡中恢复
  * compact-thinking/Pi 原生或专用 renderer。edit/write 复用 mode=on 的 rich diff
- * 与 `diffCollapsedLines` / `writeDiffCollapsedLines` / `expandedPreviewMaxLines`。
+ * 与 `editDiffCollapsedLines` / `writeDiffCollapsedLines` / `expandedPreviewMaxLines`。
  * Agent/Task 族：调用只进摘要计数，tool 卡始终折叠（避免 pending→完成高度闪动）。
  * 底部 Agents/Tasks 面板由 pi-subagents/pi-tasks 独立 widget 负责，不经 tool 卡外置。
  *
@@ -322,70 +322,104 @@ function editWriteExpandedCard(theme: any): any {
 	);
 }
 
-/** compact 展开卡：外卡片保持 userMessageBg 原色；内部 tool call card（addToolChild）
+/** compact 展开卡：外卡片保持 userMessageBg 原色；内部 tool call card
  *  背景更深一层且只覆盖内容区（左右内缩、上下限首尾文本行），形成嵌套层次。
- *  逐行重建背景同时修复嵌套 Box 的右侧截断。 */
-function expandedToolCard(theme: any): any {
+ *  hits：非工具子卡（thinking）的行区间，供展开后点击 hint。 */
+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 }> = [];
+	const isThinkingPreview = (child: any) => typeof child?.setHintHovered === "function";
+	lines.push(paddedBackgroundRow(theme, slot, "", width));
+	// 展开不再显示摘要行：跳过第一个 child 的首行空白，避免白占一行
+	let skipLeadingBlank = true;
+	for (const child of children) {
+		const childLines = child.render(innerWidth);
+		// 展开的 thinking 与 tool 一样走嵌套深色卡，避免贴在外卡同色底上看不见。
+		const nest = child.__ccToolCard || (isThinkingPreview(child) && child.expanded === true);
+		if (!nest) {
+			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;
+		}
+		// 工具卡：前导 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));
+		const rangeStart = lines.length;
+		// 子卡片内部上下各 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));
+		if (isThinkingPreview(child)) hits.push({ child, start: rangeStart, end: lines.length });
+	}
+	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() {},
 	};
 }
 
@@ -477,7 +511,7 @@ function compactEditWriteLine(
 	component: any,
 	width: number,
 	writeMetadata?: WriteExecutionMetadataStore,
-	options: { hint?: boolean } = {},
+	options: { hint?: boolean; flushLeft?: boolean } = {},
 ): string[] {
 	const theme = themeOf();
 	const name = String(component.toolName ?? "tool");
@@ -511,7 +545,8 @@ function compactEditWriteLine(
 			statsStyled = ` ${theme.fg("dim", "(")}${theme.fg("success", `+${stats.added}`)} ${theme.fg("error", `-${stats.removed}`)}${theme.fg("dim", ")")}`;
 		}
 	}
-	const iconPart = ` ${theme.fg(iconColor, icon)} `;
+	// 展开卡 Box(1,1) 已 pad；折叠行自己留 1 格前导空格
+	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
 	const hintText =
 		options.hint !== false && component.expanded !== true ? ` • ${showMoreHintText()}` : "";
@@ -526,6 +561,12 @@ function compactEditWriteLine(
 	return ["", truncateToWidth(line, width, "")];
 }
 
+/** expanded 写进 rich diff 闭包，折叠/展开分槽缓存，避免每帧 parseDiff。 */
+const compactRichDiffCache = new WeakMap<
+	object,
+	{ result: unknown; collapsed?: unknown; expanded?: unknown }
+>();
+
 /**
  * compact edit/write：标题行 + mode=on 同一套 rich diff。
  * 折叠/展开都走 `renderRichToolResult`，limits 不另开一套。
@@ -540,23 +581,33 @@ function compactEditWriteLines(
 	const expanded = component.expanded === true;
 	const isError = result?.isError === true;
 	const isPending = !result || component.isPartial === true;
-	const candidate =
-		!isPending && writeMetadata
-			? renderRichToolResult(
-					String(component.toolName ?? ""),
-					result,
-					{
-						expanded,
-						isPartial: component.isPartial === true,
-						isError,
-						isHovered: () => isToolCallHovered(component.toolCallId),
-					},
-					theme,
-					component,
-					writeMetadata,
-					getToolDisplayConfig,
-				)
-			: undefined;
+	let candidate: unknown;
+	if (!isPending && writeMetadata) {
+		let entry = compactRichDiffCache.get(component);
+		if (!entry || entry.result !== result) {
+			entry = { result };
+			compactRichDiffCache.set(component, entry);
+		}
+		const slot = expanded ? "expanded" : "collapsed";
+		candidate = entry[slot];
+		if (!isRichDiffComponent(candidate)) {
+			candidate = renderRichToolResult(
+				String(component.toolName ?? ""),
+				result,
+				{
+					expanded,
+					isPartial: component.isPartial === true,
+					isError,
+					isHovered: () => isToolCallHovered(component.toolCallId),
+				},
+				theme,
+				component,
+				writeMetadata,
+				getToolDisplayConfig,
+			);
+			if (isRichDiffComponent(candidate)) entry[slot] = candidate;
+		}
+	}
 	const hasRich = isRichDiffComponent(candidate);
 	if (hasRich) {
 		component.resultRendererComponent = candidate;
@@ -587,6 +638,7 @@ function compactEditWriteLines(
 			state.ccstyleIoView,
 			component.args,
 			component,
+			true, // 外层 Box(1,1) 已 pad
 		);
 		component.resultRendererComponent = detail;
 	}
@@ -598,12 +650,16 @@ function compactEditWriteLines(
 	const box = editWriteExpandedCard(theme);
 	box.addChild({
 		render(innerWidth: number): string[] {
-			return compactEditWriteLine(component, innerWidth, writeMetadata, { hint: false }).slice(1);
+			return compactEditWriteLine(component, innerWidth, writeMetadata, {
+				hint: false,
+				flushLeft: true,
+			}).slice(1);
 		},
 		invalidate() {},
 	});
 	box.addChild(detail);
-	return box.render(width);
+	// 与原生 ToolExecutionComponent 一样：Spacer(1) + Box，否则贴上一条 tool 少 1 行间距
+	return ["", ...box.render(width)];
 }
 
 function compactAssistantLineComponent(
@@ -964,26 +1020,11 @@ 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 item of cardItems) {
-						if (item.child) box.addChild(item.child);
-						else if (item.tool) {
-							const tool = item.tool;
-							box.addToolChild({
-								render: (innerWidth: number) => patch.toolOriginalRender.call(tool, innerWidth),
-								invalidate: () => tool.invalidate?.(),
-							});
-						}
-					}
-					return ["", ...box.render(width)];
-				},
-				invalidate() {
-					for (const item of cardItems) item.child?.invalidate?.();
-				},
-			});
+			round.anchor.contentContainer.addChild(
+				compactRoundCard(cardItems, (tool, innerWidth) =>
+					patch.toolOriginalRender.call(tool, innerWidth),
+				),
+			);
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
 			appendStopStatus(round.anchor, stopStatus);
 			return;

package/extensions/renderer/mouse/interaction.ts

@@ -3,6 +3,7 @@ import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { patchRegistry, 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 "../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";
@@ -153,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;
@@ -160,16 +189,9 @@ 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") {
-		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);
 	setHoveredToolIo(null, null);
@@ -242,10 +264,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;
@@ -276,7 +298,8 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const isGroup = component instanceof ToolGroupComponent;
 	const isAssistant = isCompactAssistantComponent(component);
 	const isThinking = component instanceof ThinkingPreviewBlock;
-	if (!isTool && !isGroup && !isAssistant && !isThinking) return false;
+	const isMessage = isMessageDisplayComponent(component);
+	if (!isTool && !isGroup && !isAssistant && !isThinking && !isMessage) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
 		const hint = collapsedHintHitbox(line);
@@ -286,11 +309,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;
@@ -312,8 +338,8 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				}
 			}
 		}
-		// 整卡二次点击：内部工具仍归所属 group，保持整体展开/收起语义。
-		card.setExpanded(false);
+		// 双击收起：内部工具仍归所属 group。单击放行官方（选择/链接）。
+		return collapseExpandedCard(tui, card);
 	}
 	// 点击后清 hover 高亮。
 	setHoveredToolCallId(null);
@@ -389,6 +415,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 };
 			}
 		}
 	}
@@ -787,6 +816,7 @@ export function teardownToolMouseInteraction(
 	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
+	clearExpandPanelDoubleClick();
 	try {
 		if (isLazyProxyTui(getToolMouseTui())) releaseFullscreenToolMouseMotion(getToolMouseTui());
 		else getToolMouseTui()?.terminal?.write?.(TOOL_MOUSE_DISABLE);

package/extensions/renderer/mouse/layout.ts

@@ -2,6 +2,7 @@ import { visibleWidth } from "@earendil-works/pi-tui";
 import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { isCompactAssistantComponent } from "../compact-mode.ts";
 import { ToolGroupComponent } from "../tool/grouping.ts";
+import { isMessageDisplayComponent } from "../tool/message-display.ts";
 import { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
 import { getScrollButtonWidget } from "./scroll.ts";
 
@@ -77,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 内。按局部行遍历组件树，定位实际命中的子组件。
@@ -95,12 +119,21 @@ 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()) {
 		return { component, row: localRow };
 	}
@@ -139,7 +172,8 @@ export function collectFullscreenToolCards(
 		isToolExecutionComponent(component) ||
 		component instanceof ToolGroupComponent ||
 		isCompactAssistantComponent(component) ||
-		component instanceof ThinkingPreviewBlock
+		component instanceof ThinkingPreviewBlock ||
+		isMessageDisplayComponent(component)
 	) {
 		out.push(component);
 		return;

package/extensions/renderer/tool/diff/diff-component.ts

@@ -39,7 +39,7 @@ export function displayConfigCacheKey(config: ToolDisplayConfig): string {
 		config.diffViewMode,
 		config.diffIndicatorMode,
 		String(config.diffSplitMinWidth),
-		String(config.diffCollapsedLines),
+		String(config.editDiffCollapsedLines),
 		String(config.writeDiffCollapsedLines),
 		config.diffWordWrap ? "1" : "0",
 		String(config.expandedPreviewMaxLines),

package/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -143,7 +143,7 @@ export function renderEditDiffResult(
 			const headerRows = renderHeaderRows(parsed.stats, mode, safeWidth, theme);
 			const displayLimit = resolveDiffDisplayLimit(
 				options.expanded,
-				live.diffCollapsedLines,
+				live.editDiffCollapsedLines,
 				live.expandedPreviewMaxLines,
 			);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
@@ -177,7 +177,7 @@ export function renderEditDiffResult(
 				bodyRows,
 				safeWidth,
 				options.expanded,
-				live.diffCollapsedLines,
+				live.editDiffCollapsedLines,
 				live.expandedPreviewMaxLines,
 				parsed.stats.hunks,
 				theme,

package/extensions/renderer/tool/diff/diff-limits.ts

@@ -41,20 +41,20 @@ export function resolveDiffDisplayLimit(
 		: DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines;
 	const collapsedLimit = Number.isFinite(maxCollapsedLines)
 		? maxCollapsedLines
-		: DEFAULT_TOOL_DISPLAY_CONFIG.diffCollapsedLines;
+		: DEFAULT_TOOL_DISPLAY_CONFIG.editDiffCollapsedLines;
 	return expanded ? Math.max(0, expandedLimit) : Math.max(1, collapsedLimit);
 }
 
-/** Write collapsed body limit. Missing/NaN falls back to edit's `diffCollapsedLines`. */
+/** Write collapsed body limit. Missing/NaN falls back to edit's `editDiffCollapsedLines`. */
 export function resolveWriteCollapsedLimit(
-	config: Pick<ToolDisplayConfig, "writeDiffCollapsedLines" | "diffCollapsedLines">,
+	config: Pick<ToolDisplayConfig, "writeDiffCollapsedLines" | "editDiffCollapsedLines">,
 ): number {
 	const value = config.writeDiffCollapsedLines;
 	if (Number.isFinite(value)) {
 		return Math.max(0, value);
 	}
-	const fallback = Number.isFinite(config.diffCollapsedLines)
-		? config.diffCollapsedLines
+	const fallback = Number.isFinite(config.editDiffCollapsedLines)
+		? config.editDiffCollapsedLines
 		: DEFAULT_TOOL_DISPLAY_CONFIG.writeDiffCollapsedLines;
 	return Math.max(0, fallback);
 }

package/extensions/renderer/tool/grouping.ts

@@ -180,11 +180,13 @@ export class ToolGroupComponent extends Container {
 	}
 
 	addTool(tool: any): void {
+		this.settledCache = undefined;
 		this.children.push(tool);
 		tool[PARENT_KEY] = this;
 	}
 
 	releaseTools(): any[] {
+		this.settledCache = undefined;
 		const tools = [...this.children];
 		this.children.length = 0;
 		this.patch.groups.delete(this);
@@ -192,18 +194,21 @@ export class ToolGroupComponent extends Container {
 	}
 
 	removeTool(tool: any): void {
+		this.settledCache = undefined;
 		const index = this.children.indexOf(tool);
 		if (index >= 0) this.children.splice(index, 1);
 		if (tool?.[PARENT_KEY] === this) delete tool[PARENT_KEY];
 	}
 
 	setExpanded(expanded: boolean): void {
+		if (this._expanded !== expanded) this.settledCache = undefined;
 		this._expanded = expanded;
 		for (const tool of this.children)
 			(tool as Component & { setExpanded?: (expanded: boolean) => void }).setExpanded?.(expanded);
 	}
 
 	setHintHovered(hovered: boolean): void {
+		if (this.hintHovered !== hovered) this.settledCache = undefined;
 		this.hintHovered = hovered;
 	}
 
@@ -232,6 +237,7 @@ export class ToolGroupComponent extends Container {
 	}
 
 	invalidate(): void {
+		this.settledCache = undefined;
 		for (const tool of this.children) tool.invalidate?.();
 	}
 

package/extensions/renderer/tool/message-display.ts

@@ -134,7 +134,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.61",
+	"version": "0.8.63",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",