pi-cc-extensions 0.8.61 → 0.8.62

package/README.en.md

@@ -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

package/README.md

@@ -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 正文的最大行数

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;
@@ -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 卡外置。
  *
@@ -526,6 +526,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 +546,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;

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/package.json

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