pi-cc-extensions 0.8.63 → 0.8.64

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/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.64",
 	"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));
-}