pi-cc-extensions 0.8.60 → 0.8.62

package/README.en.md

@@ -56,7 +56,8 @@ 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,                // 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
   "useSummaryTitlesAsThinkingTitle": true, // use the latest provider summary as the active thinking title

package/README.md

@@ -56,7 +56,8 @@ 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,                // 折叠时展示的 diff 行数，超出显示展开提示（Ctrl+O / 点击）
+  "editDiffCollapsedLines": 24,            // Edit 折叠行数；超出显示展开提示（Ctrl+O / 点击）
+  "writeDiffCollapsedLines": 0,            // write 折叠行数；0 = ↳ created • 展开提示（统计在标题）
   "diffWordWrap": true,                    // 长 diff 行是否换行（否则截断）
   "expandedPreviewMaxLines": 40,           // 展开后输出/diff 正文的最大行数
   "useSummaryTitlesAsThinkingTitle": true, // 用最新 provider 摘要作为思考标题

package/extensions/config/config.ts

@@ -15,7 +15,9 @@ 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;
 	expandedPreviewMaxLines: number;
 }
@@ -24,8 +26,13 @@ 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).
+	 */
+	writeDiffCollapsedLines: 0,
 	diffWordWrap: true,
 	/**
 	 * Expanded tool/diff body cap. 40 ≈ one screen of content after title,
@@ -41,7 +48,8 @@ export type Config = {
 	diffViewMode: DiffViewMode;
 	diffIndicatorMode: DiffIndicatorMode;
 	diffSplitMinWidth: number;
-	diffCollapsedLines: number;
+	editDiffCollapsedLines: number;
+	writeDiffCollapsedLines: number;
 	diffWordWrap: boolean;
 	expandedPreviewMaxLines: number;
 	useSummaryTitlesAsThinkingTitle: boolean;
@@ -64,6 +72,8 @@ export const DIFF_VIEW_MODES: DiffViewMode[] = ["auto", "split", "unified"];
 export const DIFF_INDICATOR_MODES: DiffIndicatorMode[] = ["bars", "classic", "none"];
 export const DIFF_SPLIT_MIN_WIDTH_VALUES = ["80", "100", "120", "140", "160", "180"];
 export const DIFF_COLLAPSED_LINES_VALUES = ["12", "24", "36", "48", "80", "120"];
+/** Write collapsed presets. 0 = stats only (`+N -0` + expand hint). */
+export const WRITE_DIFF_COLLAPSED_LINES_VALUES = ["0", "4", "8", "12", "24", "36"];
 /** Presets for expanded body height — keep low options first so cycling stays TUI-friendly. */
 export const EXPANDED_PREVIEW_MAX_LINES_VALUES = ["40", "60", "80", "120", "200", "500", "2000"];
 export const THINKING_PREVIEW_LINES_VALUES = ["0", "1", "3", "5", "10"];
@@ -89,7 +99,8 @@ 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,
 	useSummaryTitlesAsThinkingTitle: true,
@@ -158,12 +169,18 @@ 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,
 		),
+		writeDiffCollapsedLines: pickPositiveInt(
+			source.writeDiffCollapsedLines,
+			DEFAULT_CONFIG.writeDiffCollapsedLines,
+			0,
+			500,
+		),
 		diffWordWrap: source.diffWordWrap !== false,
 		expandedPreviewMaxLines: pickPositiveInt(
 			source.expandedPreviewMaxLines,
@@ -206,7 +223,8 @@ 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,
 	};
@@ -223,7 +241,8 @@ 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}`,
 		`thinkingTitle=${source.useSummaryTitlesAsThinkingTitle ? "summary" : "default"}`,

package/extensions/config/panel.ts

@@ -25,6 +25,7 @@ import {
 	SCROLL_STEP_LINES_VALUES,
 	THINKING_ANIMATION_INTERVAL_VALUES,
 	THINKING_PREVIEW_LINES_VALUES,
+	WRITE_DIFF_COLLAPSED_LINES_VALUES,
 	updateConfig,
 	type CompactStyleMode,
 	type Config,
@@ -40,7 +41,7 @@ export type CcstylePanelHooks = {
 
 function modeSettingDescription(mode: CompactStyleMode): string {
 	if (mode === "compact") {
-		return "(Experimental) One summary line per assistant round; expanded edit/write rows show rich diffs.";
+		return "(Experimental) One summary line per assistant round; edit/write reuse the same Diff preview settings as on.";
 	}
 	if (mode === "off") {
 		return "Pi native tool rendering. Diff options below still apply independently.";
@@ -287,15 +288,25 @@ export async function showCcstylePanel(
 				buildNumberInputSubmenu(theme, diffSplitSetting, closeSubmenu),
 		};
 		const diffCollapsedSetting = {
-			id: "diffCollapsedLines",
-			label: "Collapsed lines",
+			id: "editDiffCollapsedLines",
+			label: "Edit collapsed lines",
 			description:
-				"How many diff body lines to show before the expand hint (Ctrl+O / click). Enter to type a custom value.",
-			currentValue: String(config.diffCollapsedLines),
+				"How many edit/diff body lines to show before the expand hint (Ctrl+O / click). Write uses its own setting below.",
+			currentValue: String(config.editDiffCollapsedLines),
 			values: [...DIFF_COLLAPSED_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
 				buildNumberInputSubmenu(theme, diffCollapsedSetting, closeSubmenu),
 		};
+		const writeDiffCollapsedSetting = {
+			id: "writeDiffCollapsedLines",
+			label: "Write collapsed lines",
+			description:
+				"Write-only collapsed body lines. 0 shows ↳ created + expand hint (stats stay on the title). Enter to type a custom value.",
+			currentValue: String(config.writeDiffCollapsedLines),
+			values: [...WRITE_DIFF_COLLAPSED_LINES_VALUES],
+			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
+				buildNumberInputSubmenu(theme, writeDiffCollapsedSetting, closeSubmenu),
+		};
 		const diffWordWrapSetting = {
 			id: "diffWordWrap",
 			label: "Diff word wrap",
@@ -447,11 +458,27 @@ export async function showCcstylePanel(
 					});
 					diffSplitSetting.currentValue = String(config.diffSplitMinWidth);
 					break;
-				case "diffCollapsedLines":
+				case "editDiffCollapsedLines":
+					updateConfig({
+						editDiffCollapsedLines: pickPositiveInt(
+							value,
+							DEFAULT_CONFIG.editDiffCollapsedLines,
+							1,
+							500,
+						),
+					});
+					diffCollapsedSetting.currentValue = String(config.editDiffCollapsedLines);
+					break;
+				case "writeDiffCollapsedLines":
 					updateConfig({
-						diffCollapsedLines: pickPositiveInt(value, DEFAULT_CONFIG.diffCollapsedLines, 1, 500),
+						writeDiffCollapsedLines: pickPositiveInt(
+							value,
+							DEFAULT_CONFIG.writeDiffCollapsedLines,
+							0,
+							500,
+						),
 					});
-					diffCollapsedSetting.currentValue = String(config.diffCollapsedLines);
+					writeDiffCollapsedSetting.currentValue = String(config.writeDiffCollapsedLines);
 					break;
 				case "diffWordWrap":
 					updateConfig({ diffWordWrap: value === "on" });
@@ -519,6 +546,7 @@ export async function showCcstylePanel(
 					diffIndicatorSetting,
 					diffSplitSetting,
 					diffCollapsedSetting,
+					writeDiffCollapsedSetting,
 					diffWordWrapSetting,
 					expandedMaxSetting,
 				],

package/extensions/feature/compact-thinking.ts

@@ -11,8 +11,14 @@ import {
 	type ExtensionAPI,
 	type Theme,
 } from "@earendil-works/pi-coding-agent";
-import { getKeybindings } from "@earendil-works/pi-tui";
-import { Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
+import {
+	getKeybindings,
+	truncateToWidth,
+	visibleWidth,
+	wrapTextWithAnsi,
+} from "@earendil-works/pi-tui";
+import { Box, Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
+import { isToolTuiFullscreen } from "../renderer/tool/show-more-hint.ts";
 import {
 	animateCompactThinkingText,
 	formatThoughtDuration,
@@ -163,30 +169,269 @@ function getThinkingToggleHint() {
 	return keys.length > 0 ? `${keys.join("/")} to expand` : undefined;
 }
 
-class StrictThinkingPreview implements Component {
+function thinkingExpandAction(): string | undefined {
+	return isToolTuiFullscreen() ? "click to show more" : getThinkingToggleHint();
+}
+
+// 只 wrap 尾部窗口；缓存未着色折行，着色放到取出时做，避免主题切换命中旧 ANSI。
+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;
+	const width = Math.max(1, contentWidth);
+	let lines = 0;
+	for (const raw of text.replace(/\t/g, "   ").split(/\r\n|\r|\n/)) {
+		const w = visibleWidth(raw);
+		lines += w === 0 ? 1 : Math.ceil(w / width);
+	}
+	return lines;
+}
+
+function padPreviewLine(line: string, width: number, padding: number): string {
+	const left = padding > 0 ? " ".repeat(padding) : "";
+	const right = padding > 0 ? " ".repeat(padding) : "";
+	const withMargins = left + line + right;
+	return withMargins + " ".repeat(Math.max(0, width - visibleWidth(withMargins)));
+}
+
+function layoutThinkingPreview(
+	text: string,
+	width: number,
+	padding: number,
+): { visible: string[]; hiddenLines: number } {
+	if (!text || config.previewLines <= 0) return { visible: [], hiddenLines: 0 };
+	const contentWidth = Math.max(1, width - padding * 2);
+	const budget = Math.max(
+		width * (config.previewLines + PREVIEW_BUDGET_SLACK_LINES),
+		PREVIEW_BUDGET_MIN_CHARS,
+	);
+	let source = text;
+	let cut = 0;
+	if (source.length > budget) {
+		const start = source.length - budget;
+		const newline = source.indexOf("\n", start);
+		cut = newline === -1 ? start : newline + 1;
+		if (cut < source.length) source = source.slice(cut);
+		else cut = 0;
+	}
+	const cacheKey = `${width}:${padding}:${cut}:${source}`;
+	let entry = getCachedPreview(cacheKey);
+	if (!entry) {
+		entry = {
+			lines: wrapTextWithAnsi(source.replace(/\t/g, "   "), contentWidth),
+			hiddenBefore: cut > 0 ? countWrappedLines(text.slice(0, cut), contentWidth) : 0,
+		};
+		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;
+	return { visible, hiddenLines };
+}
+
+function hiddenPreviewHint(
+	hiddenLines: number,
+	forceExpandHint = false,
+): { prefix: string; action: string; suffix: string } | undefined {
+	const action = thinkingExpandAction() ?? "";
+	if (hiddenLines > 0) {
+		const noun = hiddenLines === 1 ? "line" : "lines";
+		return {
+			prefix: ` • (${hiddenLines} more ${noun}${action ? ", " : ""}`,
+			action,
+			suffix: ")",
+		};
+	}
+	if (forceExpandHint && isToolTuiFullscreen()) {
+		return { prefix: " • ", action: "click to show more", suffix: "" };
+	}
+	return undefined;
+}
+
+const expandedThinking = new Set<number>();
+
+/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、再点整块收起，对齐工具卡。 */
+export class ThinkingPreviewBlock implements Component {
+	private heading: string;
 	private text: string;
 	private padding: number;
+	private messageTimestamp: number;
 	private style: (text: string) => string;
-
-	constructor(text: string, padding: number, 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;
+				previewLines: number;
+				hintHovered: boolean;
+				expandAction: string | undefined;
+				lines: string[];
+		  }
+		| undefined;
+
+	constructor(
+		heading: string,
+		text: string,
+		padding: number,
+		messageTimestamp: number,
+		style: (text: string) => string,
+		theme?: Theme,
+	) {
+		this.heading = heading;
 		this.text = text;
 		this.padding = padding;
+		this.messageTimestamp = messageTimestamp;
 		this.style = style;
+		this.theme = theme;
+		this._expanded = expandedThinking.has(messageTimestamp);
+	}
+
+	private paint(color: string, text: string): string {
+		return this.theme && typeof this.theme.fg === "function"
+			? this.theme.fg(color as never, text)
+			: text;
+	}
+
+	get expanded(): boolean {
+		return this._expanded;
+	}
+
+	setExpanded(expanded: boolean): void {
+		if (this._expanded !== expanded) this.collapsedMemo = undefined;
+		this._expanded = expanded;
+		if (expanded) expandedThinking.add(this.messageTimestamp);
+		else {
+			expandedThinking.delete(this.messageTimestamp);
+			this.expandedBody = undefined;
+		}
+	}
+
+	setHintHovered(hovered: boolean): void {
+		if (this.hintHovered !== hovered) this.collapsedMemo = undefined;
+		this.hintHovered = hovered;
+	}
+
+	private headingLines(width: number, hiddenLines: number, padding: number): string[] {
+		const hint = this._expanded
+			? undefined
+			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && config.previewLines <= 0);
+		if (!hint) return new Text(this.heading, padding, 0).render(width);
+		const rawHint = hint.prefix + hint.action + hint.suffix;
+		const contentWidth = Math.max(1, width - padding * 2);
+		const headingBudget = Math.max(0, contentWidth - visibleWidth(rawHint));
+		const clipped =
+			visibleWidth(this.heading) > headingBudget
+				? truncateToWidth(this.heading, headingBudget, "")
+				: this.heading;
+		const action = this.paint(this.hintHovered ? "text" : "dim", hint.action);
+		return new Text(
+			clipped + this.paint("dim", hint.prefix) + action + this.paint("dim", hint.suffix),
+			padding,
+			0,
+		).render(width);
+	}
+
+	private bodyLines(width: number, padding: number): { lines: string[]; hiddenLines: number } {
+		if (!this.text || (config.previewLines <= 0 && !this._expanded)) {
+			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 };
+		}
+		const preview = layoutThinkingPreview(this.text, width, padding);
+		return { lines: preview.visible, hiddenLines: preview.hiddenLines };
 	}
 
 	render(width: number) {
-		const lines = new Text(this.style(this.text), this.padding, 0).render(width);
-		if (lines.length <= config.previewLines) return lines;
+		if (this._expanded) {
+			const innerWidth = Math.max(1, width - 2);
+			const body = this.bodyLines(innerWidth, 0);
+			const heading = this.headingLines(innerWidth, 0, 0);
+			const inner = body.lines.length
+				? [...heading, ...body.lines.map((line) => this.style(line))]
+				: heading;
+			const bgFn =
+				this.theme && typeof this.theme.bg === "function"
+					? (text: string) => this.theme!.bg("userMessageBg" as never, text)
+					: undefined;
+			const box = new Box(1, 1, bgFn);
+			box.addChild({
+				render: () => inner,
+				invalidate() {},
+			});
+			return box.render(width);
+		}
 
-		const hiddenLines = lines.length - config.previewLines;
-		const noun = hiddenLines === 1 ? "line" : "lines";
-		const toggleHint = getThinkingToggleHint();
-		const hint = `... (${hiddenLines} more ${noun}${toggleHint ? `, ${toggleHint}` : ""})`;
-		const hintLines = new Text(this.style(hint), this.padding, 0).render(width);
-		return [...hintLines, ...lines.slice(-config.previewLines)];
+		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);
+		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 {
@@ -461,14 +706,17 @@ function compactThinking(pi: ExtensionAPI) {
 					durationText ? `Thought for ${durationText}` : (latestSummary?.title ?? "Thought"),
 				);
 			}
-			self.contentContainer.addChild(new Text(heading, self.outputPad, 0));
-
-			const previewSource = latestSummary?.body ?? thinkingBlocks.join("\n\n");
-			if (config.previewLines > 0 && previewSource.trim()) {
-				self.contentContainer.addChild(
-					new StrictThinkingPreview(previewSource.trim(), self.outputPad, thinkingStyle),
-				);
-			}
+			const previewSource = (latestSummary?.body ?? thinkingBlocks.join("\n\n")).trim();
+			self.contentContainer.addChild(
+				new ThinkingPreviewBlock(
+					heading,
+					previewSource,
+					self.outputPad,
+					message.timestamp,
+					thinkingStyle,
+					activeTheme,
+				),
+			);
 
 			const hasVisibleContentAfter = message.content
 				.slice(i + 1)
@@ -733,6 +981,8 @@ function compactThinking(pi: ExtensionAPI) {
 		latestComponentTimestamp = undefined;
 		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

@@ -1,8 +1,9 @@
 /**
  * Compact mode：每条含 toolCall 的 assistant message 折叠为一条逐步累加的摘要行
- * （`Ran for 8s, bash×2, read×2`），edit/write 独立单行（`✓ write <path> (+25 -0)`），
+ * （`Ran for 8s, bash×2, read×2`），edit/write 独立标题行（`✓ write <path> (+25 -0)`），
  * 普通工具折叠时不显示独立行；展开（Ctrl+O / fullscreen 点击）在单个工具卡中恢复
- * compact-thinking/Pi 原生或专用 renderer。edit/write 折叠时显示统计，展开时显示 rich diff。
+ * compact-thinking/Pi 原生或专用 renderer。edit/write 复用 mode=on 的 rich diff
+ * 与 `editDiffCollapsedLines` / `writeDiffCollapsedLines` / `expandedPreviewMaxLines`。
  * Agent/Task 族：调用只进摘要计数，tool 卡始终折叠（避免 pending→完成高度闪动）。
  * 底部 Agents/Tasks 面板由 pi-subagents/pi-tasks 独立 widget 负责，不经 tool 卡外置。
  *
@@ -19,7 +20,7 @@ import {
 	ToolExecutionComponent,
 	type Theme,
 } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth, visibleWidth, Box } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth, Box, Spacer } from "@earendil-works/pi-tui";
 import { config, getToolDisplayConfig } from "../config/config.ts";
 import { toolLoadingIcon } from "../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
@@ -33,6 +34,7 @@ import {
 } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult } from "./tool/diff/index.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
+import { isToolCallHovered } from "./mouse/hover.ts";
 import { insetComponent, renderExpandedToolResult, scheduleAnimation } from "./tool/result.ts";
 import { oneLine } from "../utils/format.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
@@ -475,6 +477,7 @@ function compactEditWriteLine(
 	component: any,
 	width: number,
 	writeMetadata?: WriteExecutionMetadataStore,
+	options: { hint?: boolean } = {},
 ): string[] {
 	const theme = themeOf();
 	const name = String(component.toolName ?? "tool");
@@ -510,7 +513,8 @@ function compactEditWriteLine(
 	}
 	const iconPart = ` ${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
-	const hintText = component.expanded ? "" : ` • ${showMoreHintText()}`;
+	const hintText =
+		options.hint !== false && component.expanded !== true ? ` • ${showMoreHintText()}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -522,34 +526,66 @@ function compactEditWriteLine(
 	return ["", truncateToWidth(line, width, "")];
 }
 
-/** compact edit/write 展开：复用 mode=on 的 rich diff；不可用时回退 Input/Output。 */
-function compactEditWriteExpandedLines(
+/** expanded 写进 rich diff 闭包，折叠/展开分槽缓存，避免每帧 parseDiff。 */
+const compactRichDiffCache = new WeakMap<
+	object,
+	{ result: unknown; collapsed?: unknown; expanded?: unknown }
+>();
+
+/**
+ * compact edit/write：标题行 + mode=on 同一套 rich diff。
+ * 折叠/展开都走 `renderRichToolResult`，limits 不另开一套。
+ */
+function compactEditWriteLines(
 	component: any,
 	width: number,
 	writeMetadata?: WriteExecutionMetadataStore,
 ): string[] {
 	const theme = themeOf();
 	const result = component.result;
+	const expanded = component.expanded === true;
 	const isError = result?.isError === true;
-	const candidate = writeMetadata
-		? renderRichToolResult(
+	const isPending = !result || component.isPartial === true;
+	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: true,
+					expanded,
 					isPartial: component.isPartial === true,
 					isError,
+					isHovered: () => isToolCallHovered(component.toolCallId),
 				},
 				theme,
 				component,
 				writeMetadata,
 				getToolDisplayConfig,
-			)
-		: undefined;
-	let detail: any;
-	if (isRichDiffComponent(candidate)) {
+			);
+			if (isRichDiffComponent(candidate)) entry[slot] = candidate;
+		}
+	}
+	const hasRich = isRichDiffComponent(candidate);
+	if (hasRich) {
 		component.resultRendererComponent = candidate;
-		detail = insetComponent(candidate as any);
+	}
+
+	const title = compactEditWriteLine(component, width, writeMetadata, { hint: !hasRich });
+	if (!hasRich && !expanded) {
+		return title;
+	}
+
+	let detail: any;
+	if (hasRich) {
+		detail = expanded ? candidate : insetComponent(candidate as any);
 	} else {
 		const outputText = sanitizeToolResultText(
 			Array.isArray(result?.content)
@@ -571,10 +607,14 @@ function compactEditWriteExpandedLines(
 		component.resultRendererComponent = detail;
 	}
 
+	if (!expanded) {
+		return [...title, ...detail.render(width)];
+	}
+
 	const box = editWriteExpandedCard(theme);
 	box.addChild({
 		render(innerWidth: number): string[] {
-			return compactEditWriteLine(component, innerWidth, writeMetadata).slice(1);
+			return compactEditWriteLine(component, innerWidth, writeMetadata, { hint: false }).slice(1);
 		},
 		invalidate() {},
 	});
@@ -788,7 +828,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				return;
 			}
 			try {
-				uiRef?.requestRender?.(true);
+				// 非 force：保留 fullscreen 布局缓存和差分绘制。
+				uiRef?.requestRender?.();
 			} catch {
 				/* 无 UI */
 			}
@@ -864,18 +905,65 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 
 		if (round.anchor.expanded === true) {
-			const assistantChildren: any[] = [];
+			const toolsById = new Map<string, any>();
+			for (const tool of trackedToolComponents) {
+				if (typeof tool?.toolCallId === "string") toolsById.set(tool.toolCallId, tool);
+			}
+			const cardItems: Array<{ child?: any; tool?: any }> = [];
+			const placedToolIds = new Set<string>();
+			const takeAssistantRun = (kids: any[], cursor: { i: number }) => {
+				while (cursor.i < kids.length && kids[cursor.i] instanceof Spacer) {
+					cardItems.push({ child: kids[cursor.i++] });
+				}
+				if (cursor.i < kids.length) cardItems.push({ child: kids[cursor.i++] });
+			};
+			const placeTool = (id: string, fallbackName?: string) => {
+				const tool = toolsById.get(id);
+				if (!tool || EDIT_WRITE_TOOLS.has(String(tool.toolName ?? fallbackName ?? ""))) return;
+				if (placedToolIds.has(id)) return;
+				placedToolIds.add(id);
+				cardItems.push({ tool });
+			};
 			for (const [component, message] of round.messages) {
 				passThroughAssistant(component, message);
-				if (Array.isArray(component.contentContainer?.children)) {
-					assistantChildren.push(...component.contentContainer.children);
-				}
+				const kids = Array.isArray(component.contentContainer?.children)
+					? [...component.contentContainer.children]
+					: [];
 				component.contentContainer?.clear?.();
+				const cursor = { i: 0 };
+				let inThinkingRun = false;
+				for (const item of Array.isArray(message?.content) ? message.content : []) {
+					if (item?.type === "thinking") {
+						if (!String(item.thinking ?? "").trim()) continue;
+						if (!inThinkingRun) {
+							takeAssistantRun(kids, cursor);
+							inThinkingRun = true;
+						}
+						continue;
+					}
+					inThinkingRun = false;
+					if (item?.type === "text" && String(item.text ?? "").trim()) {
+						takeAssistantRun(kids, cursor);
+						continue;
+					}
+					if (item?.type === "toolCall" && typeof item.id === "string") {
+						placeTool(item.id, item.name);
+					}
+				}
+				while (cursor.i < kids.length) cardItems.push({ child: kids[cursor.i++] });
+			}
+			for (const message of round.detachedMessages) {
+				for (const item of Array.isArray(message?.content) ? message.content : []) {
+					if (item?.type === "toolCall" && typeof item.id === "string") {
+						placeTool(item.id, item.name);
+					}
+				}
 			}
 			const ids = roundToolCallIds(round);
 			for (const id of ids) {
 				round.suppressedToolIds.add(id);
 				expandedRoundToolIds.add(id);
+				if (!placedToolIds.has(id)) placeTool(id);
 			}
 			// Round 展开只打开外层卡片。普通工具保持折叠，避免长输出递归撑满屏幕。
 			for (const tool of trackedToolComponents) {
@@ -896,21 +984,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				render(width: number): string[] {
 					const theme = themeOf();
 					const box = expandedToolCard(theme);
-					for (const child of assistantChildren) box.addChild(child);
-					const ids = roundToolCallIds(round);
-					for (const tool of trackedToolComponents) {
-						if (!ids.has(tool.toolCallId) || EDIT_WRITE_TOOLS.has(String(tool.toolName ?? ""))) {
-							continue;
+					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?.(),
+							});
 						}
-						box.addToolChild({
-							render: (innerWidth: number) => patch.toolOriginalRender.call(tool, innerWidth),
-							invalidate: () => tool.invalidate?.(),
-						});
 					}
 					return ["", ...box.render(width)];
 				},
 				invalidate() {
-					for (const child of assistantChildren) child.invalidate?.();
+					for (const item of cardItems) item.child?.invalidate?.();
 				},
 			});
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
@@ -1066,9 +1153,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		const name = String(this.toolName ?? "");
 		if (EDIT_WRITE_TOOLS.has(name)) {
 			if (!this.result || this.isPartial === true) scheduleAnimation(this);
-			const lines = compactEditWriteLine(this, width, deps.writeMetadata);
-			if (this.expanded !== true) return lines;
-			return compactEditWriteExpandedLines(this, width, deps.writeMetadata);
+			return compactEditWriteLines(this, width, deps.writeMetadata);
 		}
 		// Agent/Task 等同普通工具：折叠不外置（live 面板走独立 widget）。
 		if (expandedRoundToolIds.has(String(this.toolCallId ?? ""))) return [];

package/extensions/renderer/default-mode.ts

@@ -34,6 +34,7 @@ import {
 } from "./tool/result.ts";
 import { oneLine } from "../utils/format.ts";
 import { showMoreHintText } from "./tool/show-more-hint.ts";
+import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult, type WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
 import { humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
@@ -242,6 +243,22 @@ function createCcstyleTool(
 				title: label === toolName ? humanizeToolLabel(label) : label,
 				variant: "default",
 			});
+			let writeStatsText = "";
+			let writeStatsStyled = "";
+			if (toolName === "write" && visualState === "success") {
+				const meta = writeExecutionMetadata.get(context?.toolCallId);
+				const stats = countWriteDiffStats(
+					typeof args?.content === "string" ? args.content : undefined,
+					meta?.previousContent,
+					meta?.fileExistedBeforeWrite,
+				);
+				if (stats) {
+					writeStatsText = ` (+${stats.added} -${stats.removed})`;
+					writeStatsStyled = ` ${theme.fg("dim", "(")}${theme.fg("success", `+${stats.added}`)} ${theme.fg("error", `-${stats.removed}`)}${theme.fg("dim", ")")}`;
+				}
+			}
+			const extraText = writeStatsText || summary.detail;
+			const extraStyled = writeStatsStyled || theme.fg("dim", summary.detail);
 			let cachedWidth: number | undefined;
 			let cachedLine: string | undefined;
 			const expanded = Boolean(context?.expanded);
@@ -255,10 +272,10 @@ function createCcstyleTool(
 						0,
 						viewportWidth - visibleWidth(icon) - 1 - (expanded ? 0 : 1),
 					);
-					const mainWidth = Math.max(0, callWidth - visibleWidth(summary.detail));
+					const mainWidth = Math.max(0, callWidth - visibleWidth(extraText));
 					cachedWidth = width;
 					// 纯文本先截断再着色（省略号不带 ANSI）；从头截断，与多 tool 一致
-					cachedLine = `${lead}${icon} ${theme.fg("toolTitle", headTruncateToWidth(summary.main, mainWidth))}${theme.fg("dim", summary.detail)}`;
+					cachedLine = `${lead}${icon} ${theme.fg("toolTitle", headTruncateToWidth(summary.main, mainWidth))}${extraStyled}`;
 					return [truncateToWidth(cachedLine, viewportWidth, "")];
 				},
 				invalidate() {},

package/extensions/renderer/mouse/hover.ts

@@ -1,3 +1,4 @@
+import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { setHoveredCompactAssistant } from "../compact-mode.ts";
 import { patchRegistry, TOOL_HOVER_STATE_KEY } from "../../utils/patch-keys.ts";
 import {
@@ -43,6 +44,16 @@ export function setHoveredToolGroup(group: ToolGroupComponent | null): boolean {
 	return true;
 }
 
+let hoveredThinking: ThinkingPreviewBlock | null = null;
+
+export function setHoveredThinking(block: ThinkingPreviewBlock | null): boolean {
+	if (block === hoveredThinking) return false;
+	hoveredThinking?.setHintHovered(false);
+	hoveredThinking = block;
+	block?.setHintHovered(true);
+	return true;
+}
+
 let hoveredToolIoView: ExpandedToolIoView | null = null;
 let hoveredToolIoSection: ToolIoSection | null = null;
 
@@ -98,6 +109,7 @@ export function cachedFullscreenComponentAtRow(
 export type FullscreenHoverTarget =
 	| { kind: "button" }
 	| { kind: "group"; component: ToolGroupComponent }
+	| { kind: "thinking"; component: ThinkingPreviewBlock }
 	| { kind: "assistant"; component: any }
 	| {
 			kind: "tool";
@@ -119,6 +131,8 @@ export function applyFullscreenHover(tui: any, target: FullscreenHoverTarget | n
 	}
 	const nextGroup = target?.kind === "group" ? target.component : null;
 	if (setHoveredToolGroup(nextGroup)) changed = true;
+	const nextThinking = target?.kind === "thinking" ? target.component : null;
+	if (setHoveredThinking(nextThinking)) changed = true;
 	const nextAssistant = target?.kind === "assistant" ? target.component : null;
 	if (setHoveredCompactAssistant(nextAssistant)) changed = true;
 	const nextView = target?.kind === "tool" ? target.view : null;

package/extensions/renderer/mouse/interaction.ts

@@ -1,4 +1,5 @@
 import { hasActiveTextPreview, showTextPreview } from "../../feature/context.ts";
+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";
@@ -56,6 +57,7 @@ import {
 	sharedToolHoverState,
 	setHoveredToolCallId,
 	setHoveredToolGroup,
+	setHoveredThinking,
 	setHoveredToolIo,
 	type FullscreenHoverTarget,
 } from "./hover.ts";
@@ -273,7 +275,8 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const isTool = isToolExecutionComponent(component);
 	const isGroup = component instanceof ToolGroupComponent;
 	const isAssistant = isCompactAssistantComponent(component);
-	if (!isTool && !isGroup && !isAssistant) return false;
+	const isThinking = component instanceof ThinkingPreviewBlock;
+	if (!isTool && !isGroup && !isAssistant && !isThinking) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
 		const hint = collapsedHintHitbox(line);
@@ -315,6 +318,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	// 点击后清 hover 高亮。
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	card.invalidate?.();
@@ -360,6 +364,8 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			);
 			if (component instanceof ToolGroupComponent) {
 				if (overHint) target = { kind: "group", component };
+			} else if (component instanceof ThinkingPreviewBlock) {
+				if (component.expanded || overHint) target = { kind: "thinking", component };
 			} else if (isToolExecutionComponent(component)) {
 				let view: ExpandedToolIoView | null = null;
 				let section: ToolIoSection | null = null;
@@ -778,6 +784,7 @@ export function teardownToolMouseInteraction(
 	toolMouseInputUnsubscribe = null;
 	setHoveredToolCallId(null);
 	setHoveredToolGroup(null);
+	setHoveredThinking(null);
 	setHoveredToolIo(null, null);
 	setHoveredCompactAssistant(null);
 	try {
@@ -803,6 +810,7 @@ export function teardownToolMouseInteraction(
 /** off 模式清理：清空 hover 与回到底部按钮状态（跨模块 rebind 统一经由此函数）。 */
 export function resetToolHoverState(): void {
 	setHoveredToolCallId(null);
+	setHoveredThinking(null);
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);

package/extensions/renderer/mouse/layout.ts

@@ -1,4 +1,5 @@
 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 { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
@@ -97,6 +98,9 @@ export function componentAtLocalRow(
 		// compact 摘要行整体作为可展开卡片（折叠摘要 / 展开内容）。
 		return { component, row: localRow };
 	}
+	if (component instanceof ThinkingPreviewBlock) {
+		return { component, row: localRow };
+	}
 	if (component === getScrollButtonWidget()) {
 		return { component, row: localRow };
 	}
@@ -134,7 +138,8 @@ export function collectFullscreenToolCards(
 	if (
 		isToolExecutionComponent(component) ||
 		component instanceof ToolGroupComponent ||
-		isCompactAssistantComponent(component)
+		isCompactAssistantComponent(component) ||
+		component instanceof ThinkingPreviewBlock
 	) {
 		out.push(component);
 		return;

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

@@ -39,7 +39,8 @@ 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),
 	].join(":");

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

@@ -1,5 +1,5 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { DEFAULT_TOOL_DISPLAY_CONFIG } from "../../../config/config.ts";
+import { DEFAULT_TOOL_DISPLAY_CONFIG, type ToolDisplayConfig } from "../../../config/config.ts";
 import { showMoreHintText } from "../show-more-hint.ts";
 import {
 	buildCollapsedDiffHintText,
@@ -41,10 +41,24 @@ 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 `editDiffCollapsedLines`. */
+export function resolveWriteCollapsedLimit(
+	config: Pick<ToolDisplayConfig, "writeDiffCollapsedLines" | "editDiffCollapsedLines">,
+): number {
+	const value = config.writeDiffCollapsedLines;
+	if (Number.isFinite(value)) {
+		return Math.max(0, value);
+	}
+	const fallback = Number.isFinite(config.editDiffCollapsedLines)
+		? config.editDiffCollapsedLines
+		: DEFAULT_TOOL_DISPLAY_CONFIG.writeDiffCollapsedLines;
+	return Math.max(0, fallback);
+}
+
 /**
  * How many source rows/entries to fully highlight+render before applyLineLimit.
  * Extra headroom covers word-wrap expansion so the display limit can still fill.

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

@@ -1,5 +1,6 @@
 import { Text, truncateToWidth, visibleWidth, type Component } from "@earendil-works/pi-tui";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 import { splitWriteContentLines } from "./diff-text.ts";
 import {
 	collectDiffStats,
@@ -31,9 +32,11 @@ import {
 import { renderDiffFrameLine, renderSingleDiffRow, renderWriteHeader } from "./diff-header.ts";
 import {
 	applyLineLimit,
+	clampDiffLineToWidth,
 	clampDiffLinesToWidth,
 	resolveDiffDisplayLimit,
 	resolveDiffProcessBudget,
+	resolveWriteCollapsedLimit,
 	takeEntriesForLineBudget,
 	takeSplitRowsForBudget,
 } from "./diff-limits.ts";
@@ -286,6 +289,41 @@ function renderWriteOverwriteGuardRows(
 	return renderSingleDiffRow(buildWriteOverwriteGuardText(guard, width), "warning", width, theme);
 }
 
+/** Folded write with `writeDiffCollapsedLines: 0`: `↳ created • click to show more`. */
+function renderWriteCollapsedHintLine(
+	wasOverwrite: boolean,
+	width: number,
+	theme: DiffTheme,
+	hovered: boolean,
+	headerLabel?: string,
+): string[] {
+	const safeWidth = normalizeDiffRenderWidth(width);
+	if (safeWidth === 0) {
+		return [""];
+	}
+	const actionLabel = headerLabel?.trim() || (wasOverwrite ? "overwritten" : "created");
+	const clickLabel = showMoreHintText();
+	const candidates = [`↳ ${actionLabel} • ${clickLabel}`, `↳ ${actionLabel}`, actionLabel, "…"];
+	let text = candidates[candidates.length - 1] ?? "…";
+	for (const candidate of candidates) {
+		if (visibleWidth(candidate) <= safeWidth) {
+			text = candidate;
+			break;
+		}
+	}
+	if (visibleWidth(text) > safeWidth) {
+		text = truncateToWidth(text, safeWidth, "");
+	}
+	const clickIndex = text.lastIndexOf(clickLabel);
+	const styled =
+		hovered && clickIndex >= 0
+			? theme.fg("muted", text.slice(0, clickIndex)) +
+				theme.fg("text", clickLabel) +
+				theme.fg("muted", text.slice(clickIndex + clickLabel.length))
+			: theme.fg("muted", text);
+	return [clampDiffLineToWidth(styled, safeWidth)];
+}
+
 /**
  * write 变更行统计（compact 单行用）：复用当前 write diff 算法。
  * 新文件 = 全部新内容为 added；覆盖已有文件用 LCS 精确统计。
@@ -392,6 +430,28 @@ export function renderWriteDiffResult(
 				return cached;
 			}
 
+			const writeCollapsedLimit = resolveWriteCollapsedLimit(live);
+			const statsOnlyCollapsed = !options.expanded && writeCollapsedLimit === 0;
+			if (statsOnlyCollapsed) {
+				return cache.set(
+					safeWidth,
+					options.expanded,
+					mode,
+					configKey,
+					hovered,
+					clampDiffLinesToWidth(
+						renderWriteCollapsedHintLine(
+							options.fileExistedBeforeWrite === true,
+							safeWidth,
+							theme,
+							hovered,
+							options.headerLabel,
+						),
+						safeWidth,
+					),
+				);
+			}
+
 			const header = renderWriteHeader(
 				options.fileExistedBeforeWrite === true,
 				safeWidth,
@@ -442,7 +502,7 @@ export function renderWriteDiffResult(
 			const data = getDetailedData();
 			const displayLimit = resolveDiffDisplayLimit(
 				options.expanded,
-				live.diffCollapsedLines,
+				writeCollapsedLimit,
 				live.expandedPreviewMaxLines,
 			);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
@@ -480,7 +540,7 @@ export function renderWriteDiffResult(
 				bodyRows,
 				safeWidth,
 				options.expanded,
-				live.diffCollapsedLines,
+				writeCollapsedLimit,
 				live.expandedPreviewMaxLines,
 				data.hunkCount,
 				theme,

package/extensions/renderer/tool/grouping.ts

@@ -7,7 +7,7 @@ import {
 	type Component,
 } from "@earendil-works/pi-tui";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
-import { showMoreHintText } from "./show-more-hint.ts";
+import { isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
 import { stripAnsi, stripBackgroundAnsi, stripLeadingStatusIcon } from "../../utils/ansi-text.ts";
 import { walkComponentTree } from "../../utils/component-tree.ts";
 import { humanizeToolLabel, toolCallSummary } from "./names.ts";
@@ -149,6 +149,17 @@ function toolNameList(tools: any[]): string {
 
 let nextGroupId = 1;
 
+type SettledGroupCache = {
+	width: number;
+	hover: boolean;
+	theme: unknown;
+	fullscreen: boolean;
+	children: readonly unknown[];
+	args: unknown[];
+	results: unknown[];
+	lines: string[];
+};
+
 export class ToolGroupComponent extends Container {
 	readonly toolCallId = `ccstyle-tool-group-${nextGroupId++}`;
 	readonly toolName = "Tool group";
@@ -159,6 +170,8 @@ export class ToolGroupComponent extends Container {
 	}
 	private hintHovered = false;
 	private readonly patch: Patch;
+	/** 仅缓存已完成且折叠的分组；pending / expanded 每帧现算。 */
+	private settledCache: SettledGroupCache | undefined;
 
 	constructor(patch: Patch) {
 		super();
@@ -167,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);
@@ -179,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;
 	}
 
@@ -219,10 +237,53 @@ export class ToolGroupComponent extends Container {
 	}
 
 	invalidate(): void {
+		this.settledCache = undefined;
 		for (const tool of this.children) tool.invalidate?.();
 	}
 
+	private settledCacheHit(width: number): string[] | undefined {
+		const cache = this.settledCache;
+		if (!cache || this._expanded) return;
+		if (
+			cache.width !== width ||
+			cache.hover !== this.hintHovered ||
+			cache.theme !== this.patch.theme ||
+			cache.fullscreen !== isToolTuiFullscreen()
+		) {
+			return;
+		}
+		const tools = this.children as any[];
+		if (cache.children.length !== tools.length) return;
+		for (let i = 0; i < tools.length; i++) {
+			const tool = tools[i];
+			if (
+				cache.children[i] !== tool ||
+				cache.args[i] !== tool?.args ||
+				cache.results[i] !== tool?.result ||
+				status(tool) === "pending"
+			) {
+				return;
+			}
+		}
+		return cache.lines;
+	}
+
+	private storeSettledCache(width: number, lines: string[]): void {
+		this.settledCache = {
+			width,
+			hover: this.hintHovered,
+			theme: this.patch.theme,
+			fullscreen: isToolTuiFullscreen(),
+			children: [...this.children],
+			args: (this.children as any[]).map((tool) => tool?.args),
+			results: (this.children as any[]).map((tool) => tool?.result),
+			lines,
+		};
+	}
+
 	render(width: number): string[] {
+		const cached = this.settledCacheHit(width);
+		if (cached) return cached;
 		const theme = this.patch.theme;
 		const fg = (color: string, text: string) => theme?.fg?.(color, text) ?? text;
 		const counts = { pending: 0, success: 0, error: 0 };
@@ -296,6 +357,8 @@ export class ToolGroupComponent extends Container {
 				lines.push(paddedBackgroundRow(theme, backgroundSlot, line, width));
 			}
 			lines.push(paddedBackgroundRow(theme, backgroundSlot, "", width));
+		} else if (counts.pending === 0) {
+			this.storeSettledCache(width, lines);
 		}
 		return lines;
 	}

package/package.json

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