pi-cc-extensions 0.8.63 → 0.8.65

package/README.en.md

@@ -51,24 +51,38 @@ Run `/reload` after installation.
 
 ```js
 {
-  "mode": "on",                            // on: Claude Code style; compact: one-line summaries; off: Pi native rendering
-  "excludeRenderers": [],                  // exact tool names that keep their native renderer; Agent always keeps its dedicated renderer
-  "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
-  "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
-  "useSummaryTitlesAsThinkingTitle": true, // use the latest provider summary as the active thinking title
-  "previewLines": 3,                       // thinking preview lines; 0 hides the preview body
-  "animationIntervalMs": 90,               // thinking title animation interval in ms
-  "showStartupHeader": true,               // custom startup header (logo + tips) toggle
-  "scrollStepLines": 3                     // fullscreen mouse wheel scroll lines
+  "mode": "on",                            // on / compact / off
+  "excludeRenderers": [],                  // tools keeping the native renderer; Agent always keeps its dedicated renderer
+
+  // diff
+  "diffViewMode": "auto",                  // layout: auto / split / unified
+  "diffIndicatorMode": "bars",             // change indicators: bars / classic / none
+  "diffSplitMinWidth": 120,                // min terminal width for side-by-side columns
+  "editDiffCollapsedLines": 24,            // Edit collapse lines; beyond that shows the expand hint
+  "writeDiffCollapsedLines": 0,            // write collapse lines; 0 = creation summary only
+  "diffWordWrap": true,                    // wrap long diff lines
+  "expandedPreviewMaxLines": 40,           // max lines for expanded bodies
+
+  // thinking
+  "useSummaryTitlesAsThinkingTitle": true, // use latest summary as thinking title
+  "previewLines": 3,                       // preview lines; 0 hides
+  "animationIntervalMs": 90,               // title animation interval (ms)
+
+  // ui
+  "showStartupHeader": true,               // startup header (logo + tips) toggle
+  "scrollStepLines": 3,                    // fullscreen wheel scroll step
+
+  // features
+  "enableSessionReference": true,          // @ session references
+  "enableSubagentAutocomplete": true,      // @ subagent completion and delegation hints
+  "enableContextCommand": true,            // /context usage check
+  "enableAgentSummary": true,              // per-turn tool summary
+  "enableWorkingMessage": true,            // Working... bottom token/elapsed
+  "enableAliases": true                    // /clear, /exit aliases
 }
 ```
 
-> **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.
+> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. Double-click an expanded panel to collapse it.
 >
 > **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.
 

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="./assets/readme/hero.svg" width="100%" alt="pi-cc-extensions：Pi 终端效率扩展套件">
+  <img src="./assets/readme/hero.svg" width="100%">
 </p>
 
 <p align="center">
@@ -51,30 +51,38 @@ pi install git:github.com/minuque/pi-cc-extensions
 
 ```js
 {
-  "mode": "on",                            // on：Claude Code 风格；compact：单行摘要；off：Pi 原生渲染
-  "excludeRenderers": [],                  // 走原生渲染的工具名列表（精确匹配），Agent 始终保留专用渲染器
-  "diffViewMode": "auto",                  // diff 布局：auto / split / unified
-  "diffIndicatorMode": "bars",             // diff 变更指示：bars / classic / none
-  "diffSplitMinWidth": 120,                // 自动布局下使用左右分栏的最小终端宽度
-  "editDiffCollapsedLines": 24,            // Edit 折叠行数；超出显示展开提示（Ctrl+O / 点击）
-  "writeDiffCollapsedLines": 0,            // write 折叠行数；0 = ↳ created • 展开提示（统计在标题）
-  "diffWordWrap": true,                    // 长 diff 行是否换行（否则截断）
-  "expandedPreviewMaxLines": 40,           // 展开后输出/diff 正文的最大行数
-  "useSummaryTitlesAsThinkingTitle": true, // 用最新 provider 摘要作为思考标题
-  "previewLines": 3,                       // thinking 预览行数，0 隐藏预览正文
-  "animationIntervalMs": 90,               // thinking 标题动画间隔（毫秒）
-  "showStartupHeader": true,               // 自定义启动头（logo + tips）开关
-  "scrollStepLines": 3,                     // fullscreen 滚轮滚动步进行数
-  "enableSessionReference": true,           // @ session 引用（搜历史会话注入上下文）
-  "enableSubagentAutocomplete": true,       // @ subagent 自动补全与委派提示
-  "enableContextCommand": true,             // /context 上下文占用检查
-  "enableAgentSummary": true,               // 每回合工具统计摘要
-  "enableWorkingMessage": true,             // Working... 底部 token/耗时展示
-  "enableAliases": true                     // /clear、/exit 别名
+  "mode": "on",                            // on / compact / off
+  "excludeRenderers": [],                  // 走原生渲染的工具名；Agent 始终保留专用渲染器
+
+  // diff
+  "diffViewMode": "auto",                  // 布局：auto / split / unified
+  "diffIndicatorMode": "bars",             // 变更指示：bars / classic / none
+  "diffSplitMinWidth": 120,                // 左右分栏的最小终端宽度
+  "editDiffCollapsedLines": 24,            // Edit 折叠行数，超出显示展开提示
+  "writeDiffCollapsedLines": 0,            // write 折叠行数，0 仅显示创建摘要
+  "diffWordWrap": true,                    // 长 diff 行换行
+  "expandedPreviewMaxLines": 40,           // 展开正文最大行数
+
+  // thinking
+  "useSummaryTitlesAsThinkingTitle": true, // 用最新摘要作思考标题
+  "previewLines": 3,                       // 预览行数，0 隐藏
+  "animationIntervalMs": 90,               // 标题动画间隔（毫秒）
+
+  // ui
+  "showStartupHeader": true,               // 启动头（logo + tips）开关
+  "scrollStepLines": 3,                    // fullscreen 滚轮步进
+
+  // features
+  "enableSessionReference": true,          // @ session 引用
+  "enableSubagentAutocomplete": true,      // @ subagent 补全与委派提示
+  "enableContextCommand": true,            // /context 上下文检查
+  "enableAgentSummary": true,              // 每回合工具摘要
+  "enableWorkingMessage": true,            // Working... 底部 token/耗时
+  "enableAliases": true                    // /clear、/exit 别名
 }
 ```
 
-> **Fullscreen 点击**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要。单击截断的 Input/Output 打开全量预览。双击展开面板收起。展开卡上的单击仍可选择文本、打开链接。
+> **Fullscreen**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要，双击展开面板收起。
 >
 > **建议**：`markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。
 
@@ -88,7 +96,7 @@ npm run typecheck
 
 ## 兼容性
 
-- Node.js `>=22.19.0`，Pi `^0.84.0`（通过根目录 `package.json` 的 `pi.extensions` 和 `pi.themes` 加载）
+- Node.js `>=22.19.0`，Pi `^0.84.0`
 
 ## 推荐搭配
 

package/extensions/feature/compact-thinking.ts

@@ -200,12 +200,58 @@ function cachePreview(key: string, entry: PreviewCacheEntry): void {
 
 export function clearThinkingPreviewCache(): void {
 	previewCache.clear();
+	expandedWrapCache.clear();
+}
+
+type ExpandedWrapEntry = { text: string; lines: string[] };
+const expandedWrapCache = new Map<string, ExpandedWrapEntry>();
+export const THINKING_EXPANDED_WRAP_CACHE_MAX = 64;
+
+function expandedWrapKey(messageTimestamp: number, runStartIndex: number, width: number): string {
+	return `${messageTimestamp}:${runStartIndex}:${width}`;
+}
+
+function wrapExpandedThinking(
+	messageTimestamp: number,
+	runStartIndex: number,
+	text: string,
+	width: number,
+): string[] {
+	const key = expandedWrapKey(messageTimestamp, runStartIndex, width);
+	const hit = expandedWrapCache.get(key);
+	if (hit && hit.text === text) {
+		expandedWrapCache.delete(key);
+		expandedWrapCache.set(key, hit);
+		return hit.lines;
+	}
+	const lines = wrapTextWithAnsi(text.replace(/\t/g, "   "), Math.max(1, width));
+	expandedWrapCache.delete(key);
+	while (expandedWrapCache.size >= THINKING_EXPANDED_WRAP_CACHE_MAX) {
+		const oldest = expandedWrapCache.keys().next().value;
+		if (oldest === undefined) break;
+		expandedWrapCache.delete(oldest);
+	}
+	expandedWrapCache.set(key, { text, lines });
+	return lines;
+}
+
+function evictExpandedWraps(messageTimestamp: number, runStartIndex: number): void {
+	for (const key of expandedWrapCache.keys()) {
+		const [ts, run] = key.split(":");
+		if (Number(ts) === messageTimestamp && Number(run) === runStartIndex) {
+			expandedWrapCache.delete(key);
+		}
+	}
 }
 
 export function thinkingPreviewCacheSize(): number {
 	return previewCache.size;
 }
 
+export function thinkingExpandedWrapCacheSize(): number {
+	return expandedWrapCache.size;
+}
+
 /** 按可见宽度估算折行数，不走 Text 全量 wrap。无换行长段也能计到隐藏行。 */
 function countWrappedLines(text: string, contentWidth: number): number {
 	if (!text) return 0;
@@ -285,12 +331,12 @@ export class ThinkingPreviewBlock implements Component {
 	private heading: string;
 	private text: string;
 	private padding: number;
-	private messageTimestamp: number;
+	readonly messageTimestamp: number;
+	readonly runStartIndex: number;
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
 	private _expanded: boolean;
 	private hintHovered = false;
-	private expandedBody: { width: number; lines: string[] } | undefined;
 	private collapsedMemo:
 		| {
 				width: number;
@@ -308,11 +354,13 @@ export class ThinkingPreviewBlock implements Component {
 		messageTimestamp: number,
 		style: (text: string) => string,
 		theme?: Theme,
+		runStartIndex = 0,
 	) {
 		this.heading = heading;
 		this.text = text;
 		this.padding = padding;
 		this.messageTimestamp = messageTimestamp;
+		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
 		this._expanded = expandedThinking.has(messageTimestamp);
@@ -334,7 +382,7 @@ export class ThinkingPreviewBlock implements Component {
 		if (expanded) expandedThinking.add(this.messageTimestamp);
 		else {
 			expandedThinking.delete(this.messageTimestamp);
-			this.expandedBody = undefined;
+			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
 	}
 
@@ -368,13 +416,10 @@ export class ThinkingPreviewBlock implements Component {
 			return { lines: [], hiddenLines: 0 };
 		}
 		if (this._expanded) {
-			if (this.expandedBody?.width !== width) {
-				this.expandedBody = {
-					width,
-					lines: wrapTextWithAnsi(this.text.replace(/\t/g, "   "), Math.max(1, width)),
-				};
-			}
-			return { lines: this.expandedBody.lines, hiddenLines: 0 };
+			return {
+				lines: wrapExpandedThinking(this.messageTimestamp, this.runStartIndex, this.text, width),
+				hiddenLines: 0,
+			};
 		}
 		const preview = layoutThinkingPreview(this.text, width, padding);
 		return { lines: preview.visible, hiddenLines: preview.hiddenLines };
@@ -430,7 +475,6 @@ export class ThinkingPreviewBlock implements Component {
 
 	invalidate() {
 		this.collapsedMemo = undefined;
-		this.expandedBody = undefined;
 	}
 }
 
@@ -715,6 +759,7 @@ function compactThinking(pi: ExtensionAPI) {
 					message.timestamp,
 					thinkingStyle,
 					activeTheme,
+					runStartIndex,
 				),
 			);
 

package/extensions/feature/context.ts

@@ -13,10 +13,10 @@ import { padLine } from "../utils/format.ts";
 export type ContextPart = {
 	label: string;
 	tokens: number;
-	color: "accent" | "success" | "warning" | "customMessageLabel" | "muted" | "dim";
+	color: "accent" | "success" | "warning" | "customMessageLabel" | "muted" | "dim" | "error";
 };
 
-type PreviewKey = "systemPrompt" | "tools" | "toolResults" | "contextFiles";
+type PreviewKey = "systemPrompt" | "memoryFiles" | "tools" | "toolResults" | "contextFiles";
 
 type ContextPreview = {
 	key: PreviewKey;
@@ -47,11 +47,16 @@ export function escCloseHitbox(bounds: DialogBounds): {
 	};
 }
 
-let activeTextPreviews = 0;
+let activeContextOverlays = 0;
 
-/** fullscreen 输入包装用于把鼠标事件继续传给当前文本预览 overlay。 */
+/** fullscreen 输入包装用于把鼠标事件继续传给当前 context 主弹框或文本预览 overlay。 */
 export function hasActiveTextPreview(): boolean {
-	return activeTextPreviews > 0;
+	return activeContextOverlays > 0;
+}
+
+/** 官方 fullscreen 打开 overlay 时会退回 1002；重新启用 1003 才能收到无按键 hover。 */
+function ensureFullscreenMouseMotion(tui: any): void {
+	if (tui.mode === "fullscreen") tui.terminal?.write?.("\x1b[?1003h\x1b[?1006h");
 }
 
 export async function showTextPreview(
@@ -60,10 +65,11 @@ export async function showTextPreview(
 	rawContent: string,
 ): Promise<void> {
 	const content = normalizePreviewText(rawContent);
-	activeTextPreviews++;
+	activeContextOverlays++;
 	try {
 		await ctx.ui.custom(
 			(tui, theme, _keybindings, done) => {
+				ensureFullscreenMouseMotion(tui);
 				let scrollOffset = 0;
 				let pageSize = 1;
 				let totalLines = 1;
@@ -249,7 +255,7 @@ export async function showTextPreview(
 			},
 		);
 	} finally {
-		activeTextPreviews--;
+		activeContextOverlays--;
 	}
 }
 
@@ -337,6 +343,13 @@ export function collectContextBreakdown(
 	let toolResultTokens = 0;
 	let contextTokens = 0;
 
+	const memoryPreview: string[] = [];
+	let memoryTokens = 0;
+	for (const file of options.contextFiles ?? []) {
+		memoryTokens += tokenEstimate(file.content);
+		memoryPreview.push(`## ${file.path}\n\n${previewValue(file.content)}`);
+	}
+
 	for (const tool of allTools) {
 		if (!selectedTools.has(tool.name)) continue;
 		const definition = {
@@ -397,12 +410,14 @@ export function collectContextBreakdown(
 	return {
 		parts: [
 			{ label: "System prompt", tokens: tokenEstimate(systemPrompt), color: "accent" },
+			{ label: "Memory", tokens: memoryTokens, color: "error" },
 			{ label: "Tools", tokens: toolDefinitionTokens, color: "success" },
 			{ label: "Tool results", tokens: toolResultTokens, color: "customMessageLabel" },
 			{ label: "Context", tokens: contextTokens, color: "warning" },
 		] satisfies ContextPart[],
 		previews: {
 			systemPrompt: systemPrompt || "No system prompt.",
+			memoryFiles: memoryPreview.join("\n\n") || "No memory files in context.",
 			tools: toolDefinitionPreview.join("\n\n") || "No active tool definitions.",
 			toolResults: toolResultPreview.join("\n\n") || "No tool results in the current context.",
 			contextFiles: contextPreview.join("\n\n") || "No conversation context.",
@@ -419,9 +434,10 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			const tools = pi.getAllTools();
 			const breakdown = collectContextBreakdown(ctx, tools);
 			const estimated = breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
-			const fixedTokens = breakdown.parts.slice(0, 2).reduce((sum, part) => sum + part.tokens, 0);
+			// System prompt、Memory、Tools 为固定项，capParts 时保持原值不压缩。
+			const fixedTokens = breakdown.parts.slice(0, 3).reduce((sum, part) => sum + part.tokens, 0);
 			const used = Math.max(resolveUsedTokens(usage, estimated, contextWindow), fixedTokens);
-			const parts = capParts(breakdown.parts, used, 2);
+			const parts = capParts(breakdown.parts, used, 3);
 			const attributed = parts.reduce((sum, part) => sum + part.tokens, 0);
 			const other = Math.max(0, used - attributed);
 			const free = Math.max(0, contextWindow - used);
@@ -444,6 +460,12 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 					title: "System Prompt",
 					content: breakdown.previews.systemPrompt,
 				},
+				{
+					key: "memoryFiles",
+					label: "Memory",
+					title: "Memory Files",
+					content: breakdown.previews.memoryFiles,
+				},
 				{
 					key: "tools",
 					label: "Tools",
@@ -474,158 +496,187 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			let selectedPreviewIndex = 0;
 
 			while (true) {
-				const action = await ctx.ui.custom(
-					(tui, theme, _keybindings, done) => {
-						let previewHitboxes: Array<{
-							key: PreviewKey;
-							row: number;
-							startCol: number;
-							endCol: number;
-						}> = [];
-						let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
-
-						return {
-							invalidate() {},
-							handleInput(data: string) {
-								if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
-									done(undefined);
-									return;
-								}
-								if (matchesKey(data, Key.up) && visiblePreviews.length > 0) {
-									selectedPreviewIndex =
-										(selectedPreviewIndex - 1 + visiblePreviews.length) % visiblePreviews.length;
-									tui.requestRender();
-									return;
-								}
-								if (matchesKey(data, Key.down) && visiblePreviews.length > 0) {
-									selectedPreviewIndex = (selectedPreviewIndex + 1) % visiblePreviews.length;
-									tui.requestRender();
-									return;
-								}
-								if (matchesKey(data, Key.enter)) {
-									done(visiblePreviews[selectedPreviewIndex]?.key);
-									return;
-								}
-
-								const mouse = parseSgrMousePacket(data);
-								if (
-									mouse?.final !== "M" ||
-									mouseBaseButton(mouse.code) !== 0 ||
-									(mouse.code & 32) !== 0
-								)
-									return;
-								if (
-									escHitbox &&
-									mouse.row === escHitbox.row &&
-									mouse.col >= escHitbox.startCol &&
-									mouse.col <= escHitbox.endCol
-								) {
-									done(undefined);
-									return;
-								}
-								const hitbox = previewHitboxes.find(
-									(candidate) =>
-										mouse.row === candidate.row &&
-										mouse.col >= candidate.startCol &&
-										mouse.col <= candidate.endCol,
-								);
-								if (hitbox) {
-									selectedPreviewIndex = Math.max(
-										0,
-										visiblePreviews.findIndex((preview) => preview.key === hitbox.key),
+				// 主弹框也计入活动 overlay，fullscreen 下官方输入链才会把鼠标包放行给行点击。
+				activeContextOverlays++;
+				let action;
+				try {
+					action = await ctx.ui.custom(
+						(tui, theme, _keybindings, done) => {
+							ensureFullscreenMouseMotion(tui);
+							let previewHitboxes: Array<{
+								key: PreviewKey;
+								row: number;
+								startCol: number;
+								endCol: number;
+							}> = [];
+							let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
+							let escHovered = false;
+							let hoveredKey: PreviewKey | undefined;
+
+							return {
+								invalidate() {},
+								handleInput(data: string) {
+									if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
+										done(undefined);
+										return;
+									}
+									if (matchesKey(data, Key.up) && visiblePreviews.length > 0) {
+										selectedPreviewIndex =
+											(selectedPreviewIndex - 1 + visiblePreviews.length) % visiblePreviews.length;
+										tui.requestRender();
+										return;
+									}
+									if (matchesKey(data, Key.down) && visiblePreviews.length > 0) {
+										selectedPreviewIndex = (selectedPreviewIndex + 1) % visiblePreviews.length;
+										tui.requestRender();
+										return;
+									}
+									if (matchesKey(data, Key.enter)) {
+										done(visiblePreviews[selectedPreviewIndex]?.key);
+										return;
+									}
+
+									const mouse = parseSgrMousePacket(data);
+									if (!mouse || mouse.final !== "M") return;
+									if ((mouse.code & 32) !== 0) {
+										// SGR 1003 的无按键 hover code 为 35，不能按左键事件过滤。
+										const overEsc = Boolean(
+											escHitbox &&
+												mouse.row === escHitbox.row &&
+												mouse.col >= escHitbox.startCol &&
+												mouse.col <= escHitbox.endCol,
+										);
+										const hovered = previewHitboxes.find(
+											(candidate) =>
+												mouse.row === candidate.row &&
+												mouse.col >= candidate.startCol &&
+												mouse.col <= candidate.endCol,
+										);
+										if (overEsc !== escHovered || hovered?.key !== hoveredKey) {
+											escHovered = overEsc;
+											hoveredKey = hovered?.key;
+											tui.requestRender();
+										}
+										return;
+									}
+									if (mouseBaseButton(mouse.code) !== 0) return;
+									if (
+										escHitbox &&
+										mouse.row === escHitbox.row &&
+										mouse.col >= escHitbox.startCol &&
+										mouse.col <= escHitbox.endCol
+									) {
+										done(undefined);
+										return;
+									}
+									const hitbox = previewHitboxes.find(
+										(candidate) =>
+											mouse.row === candidate.row &&
+											mouse.col >= candidate.startCol &&
+											mouse.col <= candidate.endCol,
 									);
-									done(hitbox.key);
-								}
-							},
-							render(width: number) {
-								const inner = Math.max(1, width - 2);
-								const escWidth = visibleWidth("[esc]");
-								const percent = contextWindow > 0 ? (used / contextWindow) * 100 : 0;
-								const title = theme.bold(theme.fg("accent", "Context Usage"));
-								const subtitle = `${formatTokens(used)} / ${formatTokens(contextWindow)} tokens (${percent.toFixed(1)}%)`;
-								const barWidth = Math.max(1, Math.min(60, inner - 2));
-								let remaining = barWidth;
-								const segments = allParts
-									.map((part, index) => {
-										const cells =
-											index === allParts.length - 1
-												? remaining
-												: Math.min(
-														remaining,
-														Math.round((part.tokens / Math.max(1, contextWindow)) * barWidth),
-													);
-										remaining -= cells;
-										return theme.fg(part.color, "█".repeat(Math.max(0, cells)));
-									})
-									.join("");
-								const labelWidth = Math.min(
-									24,
-									Math.max(...allParts.map((part) => part.label.length)),
-								);
-								const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
-								const partRows = allParts.map((part) => {
-									const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
-									const swatch = theme.fg(part.color, "■");
-									const label = part.label.padEnd(labelWidth);
-									const amount = `${formatTokens(part.tokens).padStart(7)}  ${pct.toFixed(1).padStart(5)}%`;
-									const selected = part.label === selectedLabel;
-									const prefix = selected ? "› " : "  ";
-									const row = padLine(`${prefix}${swatch} ${label} ${amount}`, inner);
-									return selected ? theme.bg("selectedBg", row) : row;
-								});
-								const border = (text: string) => theme.fg("border", text);
-								const lines = [
-									border(`╭${"─".repeat(inner)}╮`),
-									`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg("muted", "[esc]")}${border("│")}`,
-									`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
-									`${border("│")}${padLine(` ${segments}`, inner)}${border("│")}`,
-									`${border("│")}${" ".repeat(inner)}${border("│")}`,
-									...partRows.map((row) => `${border("│")}${row}${border("│")}`),
-									`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
-									`${border("│")}${padLine(theme.fg("dim", " ↑↓ select · Click / Enter to preview · [esc] close"), inner)}${border("│")}`,
-									border(`╰${"─".repeat(inner)}╯`),
-								];
-
-								const terminalHeight = Math.max(1, tui.terminal.rows);
-								const maxHeight = Math.min(
-									Math.max(1, Math.floor(terminalHeight * 0.9)),
-									Math.max(1, terminalHeight - 2),
-								);
-								const visibleHeight = Math.min(lines.length, maxHeight);
-								const overlayTop =
-									1 + Math.floor((Math.max(1, terminalHeight - 2) - visibleHeight) / 2);
-								const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
-								escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
-								previewHitboxes = visiblePreviews.flatMap((preview) => {
-									const partIndex = allParts.findIndex((part) => part.label === preview.label);
-									const line = 5 + partIndex;
-									return partIndex >= 0 && line < visibleHeight
-										? [
-												{
-													key: preview.key,
-													row: overlayTop + line + 1,
-													startCol: overlayLeft + 1,
-													endCol: overlayLeft + width,
-												},
-											]
-										: [];
-								});
-
-								return lines;
+									if (hitbox) {
+										selectedPreviewIndex = Math.max(
+											0,
+											visiblePreviews.findIndex((preview) => preview.key === hitbox.key),
+										);
+										done(hitbox.key);
+									}
+								},
+								render(width: number) {
+									const inner = Math.max(1, width - 2);
+									const escWidth = visibleWidth("[esc]");
+									const percent = contextWindow > 0 ? (used / contextWindow) * 100 : 0;
+									const title = theme.bold(theme.fg("accent", "Context Usage"));
+									const subtitle = `${formatTokens(used)} / ${formatTokens(contextWindow)} tokens (${percent.toFixed(1)}%)`;
+									const barWidth = Math.max(1, Math.min(60, inner - 2));
+									let remaining = barWidth;
+									const segments = allParts
+										.map((part, index) => {
+											const cells =
+												index === allParts.length - 1
+													? remaining
+													: Math.min(
+															remaining,
+															Math.round((part.tokens / Math.max(1, contextWindow)) * barWidth),
+														);
+											remaining -= cells;
+											return theme.fg(part.color, "█".repeat(Math.max(0, cells)));
+										})
+										.join("");
+									const labelWidth = Math.min(
+										24,
+										Math.max(...allParts.map((part) => part.label.length)),
+									);
+									const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
+									const partRows = allParts.map((part) => {
+										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
+										const swatch = theme.fg(part.color, "■");
+										const label = part.label.padEnd(labelWidth);
+										const amount = `${formatTokens(part.tokens).padStart(7)}  ${pct.toFixed(1).padStart(5)}%`;
+										const selected = part.label === selectedLabel;
+										const hoverLabel = visiblePreviews.find((p) => p.key === hoveredKey)?.label;
+										const prefix = selected ? "› " : "  ";
+										const row = padLine(`${prefix}${swatch} ${label} ${amount}`, inner);
+										if (selected) return theme.bg("selectedBg", row);
+										return part.label === hoverLabel ? theme.bg("customMessageBg", row) : row;
+									});
+									const border = (text: string) => theme.fg("border", text);
+									const lines = [
+										border(`╭${"─".repeat(inner)}╮`),
+										`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
+										`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
+										`${border("│")}${padLine(` ${segments}`, inner)}${border("│")}`,
+										`${border("│")}${" ".repeat(inner)}${border("│")}`,
+										...partRows.map((row) => `${border("│")}${row}${border("│")}`),
+										`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
+										`${border("│")}${padLine(theme.fg("dim", " ↑↓ select · Click / Enter to preview · [esc] close"), inner)}${border("│")}`,
+										border(`╰${"─".repeat(inner)}╯`),
+									];
+
+									const terminalHeight = Math.max(1, tui.terminal.rows);
+									const maxHeight = Math.min(
+										Math.max(1, Math.floor(terminalHeight * 0.9)),
+										Math.max(1, terminalHeight - 2),
+									);
+									const visibleHeight = Math.min(lines.length, maxHeight);
+									const overlayTop =
+										1 + Math.floor((Math.max(1, terminalHeight - 2) - visibleHeight) / 2);
+									const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
+									escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
+									previewHitboxes = visiblePreviews.flatMap((preview) => {
+										const partIndex = allParts.findIndex((part) => part.label === preview.label);
+										const line = 5 + partIndex;
+										return partIndex >= 0 && line < visibleHeight
+											? [
+													{
+														key: preview.key,
+														row: overlayTop + line + 1,
+														startCol: overlayLeft + 1,
+														endCol: overlayLeft + width,
+													},
+												]
+											: [];
+									});
+
+									return lines;
+								},
+							};
+						},
+						{
+							overlay: true,
+							overlayOptions: {
+								anchor: "center",
+								width: 64,
+								minWidth: 44,
+								maxHeight: "90%",
+								margin: 1,
 							},
-						};
-					},
-					{
-						overlay: true,
-						overlayOptions: {
-							anchor: "center",
-							width: 64,
-							minWidth: 44,
-							maxHeight: "90%",
-							margin: 1,
 						},
-					},
-				);
+					);
+				} finally {
+					activeContextOverlays--;
+				}
 
 				if (!action) break;
 				const preview = previewByKey.get(action as PreviewKey);

package/extensions/index.ts

@@ -5,7 +5,6 @@ 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";
@@ -23,7 +22,6 @@ 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/mouse/hover.ts

@@ -54,6 +54,16 @@ export function setHoveredThinking(block: ThinkingPreviewBlock | null): boolean
 	return true;
 }
 
+let hoveredMessageDisplay: any = null;
+
+export function setHoveredMessageDisplay(component: any): boolean {
+	if (component === hoveredMessageDisplay) return false;
+	hoveredMessageDisplay?.setHintHovered?.(false);
+	hoveredMessageDisplay = component;
+	component?.setHintHovered?.(true);
+	return true;
+}
+
 let hoveredToolIoView: ExpandedToolIoView | null = null;
 let hoveredToolIoSection: ToolIoSection | null = null;
 
@@ -110,6 +120,7 @@ export type FullscreenHoverTarget =
 	| { kind: "button" }
 	| { kind: "group"; component: ToolGroupComponent }
 	| { kind: "thinking"; component: ThinkingPreviewBlock }
+	| { kind: "message"; component: any }
 	| { kind: "assistant"; component: any }
 	| {
 			kind: "tool";
@@ -133,6 +144,8 @@ export function applyFullscreenHover(tui: any, target: FullscreenHoverTarget | n
 	if (setHoveredToolGroup(nextGroup)) changed = true;
 	const nextThinking = target?.kind === "thinking" ? target.component : null;
 	if (setHoveredThinking(nextThinking)) changed = true;
+	const nextMessage = target?.kind === "message" ? target.component : null;
+	if (setHoveredMessageDisplay(nextMessage)) changed = true;
 	const nextAssistant = target?.kind === "assistant" ? target.component : null;
 	if (setHoveredCompactAssistant(nextAssistant)) changed = true;
 	const nextView = target?.kind === "tool" ? target.view : null;

package/extensions/renderer/mouse/interaction.ts

@@ -59,6 +59,7 @@ import {
 	setHoveredToolCallId,
 	setHoveredToolGroup,
 	setHoveredThinking,
+	setHoveredMessageDisplay,
 	setHoveredToolIo,
 	type FullscreenHoverTarget,
 } from "./hover.ts";
@@ -155,13 +156,20 @@ function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 }
 
 const EXPAND_PANEL_DOUBLE_CLICK_MS = 400;
-let lastExpandPanelClick: { card: any; at: number } | null = null;
+let lastExpandPanelClick: { id: unknown; at: number } | null = null;
+
+function expandPanelIdentity(card: any): unknown {
+	return card instanceof ThinkingPreviewBlock
+		? `${card.messageTimestamp}:${card.runStartIndex}`
+		: card;
+}
 
 function isExpandPanelDoubleClick(card: any): boolean {
 	const now = Date.now();
+	const id = expandPanelIdentity(card);
 	const prev = lastExpandPanelClick;
-	lastExpandPanelClick = { card, at: now };
-	return Boolean(prev && prev.card === card && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS);
+	lastExpandPanelClick = { id, at: now };
+	return Boolean(prev && prev.id === id && now - prev.at <= EXPAND_PANEL_DOUBLE_CLICK_MS);
 }
 
 function clearExpandPanelDoubleClick(): void {
@@ -174,6 +182,7 @@ function collapseExpandedCard(tui: any, card: any): boolean {
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
 	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	card.invalidate?.();
@@ -345,6 +354,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
 	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	card.invalidate?.();
@@ -416,8 +426,7 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 				// 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 };
+				if (overHint) target = { kind: "message", component };
 			}
 		}
 	}
@@ -814,6 +823,7 @@ export function teardownToolMouseInteraction(
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
 	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	clearExpandPanelDoubleClick();
@@ -841,6 +851,7 @@ export function teardownToolMouseInteraction(
 export function resetToolHoverState(): void {
 	setHoveredToolCallId(null);
 	setHoveredThinking(null);
+	setHoveredMessageDisplay(null);
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);

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

@@ -55,6 +55,15 @@ const BRANCH_KIND: DisplayKind = {
 	body: (component) => String(component.message?.summary ?? ""),
 };
 
+function ensureHintHover(component: any): void {
+	if (typeof component.setHintHovered === "function") return;
+	component.setHintHovered = function (this: any, hovered: boolean) {
+		if (this.hintHovered === hovered) return;
+		this.hintHovered = hovered;
+		this.invalidate?.();
+	};
+}
+
 function renderCcstyle(component: any, kind: DisplayKind): void {
 	const theme = displayTheme;
 	if (!theme) return; // 主题未就绪时保留原生渲染
@@ -64,13 +73,21 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 		component.paddingY = 0; // 工具组件 paddingY=0；原生 Box 默认 1，会上下各留一个空行
 	}
 	component.clear();
+	ensureHintHover(component);
 	const icon = `${BRIGHT_GREEN}✓${ANSI_FG_RESET}`; // 已完成消息，等同工具成功态
 	const title = theme.fg("toolTitle", kind.title(component));
 	if (!component.expanded) {
-		const hint = theme.fg("dim", ` • ${showMoreHintText()}`);
+		const hovered = component.hintHovered === true;
+		const hint = `${theme.fg("dim", " • ")}${theme.fg(hovered ? "text" : "dim", showMoreHintText())}`;
 		component.addChild(new Text(`${icon} ${title}${hint}`, 0, 0));
 		return;
 	}
+	// 展开卡与 tool 一致：userMessageBg + 上下左右 1 格
+	component.paddingX = 1;
+	component.paddingY = 1;
+	if (typeof theme.bg === "function" && typeof component.setBgFn === "function") {
+		component.setBgFn((text: string) => theme.bg("userMessageBg", text));
+	}
 	component.addChild(new Text(`${icon} ${title}`, 0, 0));
 	component.addChild(new Spacer(1));
 	component.addChild(

package/package.json

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

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

@@ -1,19 +0,0 @@
-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));
-}