@herbertgao/pi-extensions 2026.8.6 → 2026.8.8

package/README.md

@@ -11,18 +11,20 @@ pi install npm:@herbertgao/pi-extensions
 The package bundles 11 active `@herbertgao/*` child packages, including `@herbertgao/pi-cc-extensions`, plus the following upstream packages under their original names:
 
 - `@dietrichgebert/ponytail@4.9.0`
-- `@juicesharp/rpiv-ask-user-question@2.6.0`
-- `@narumitw/pi-btw@0.52.0`
-- `@pi-plugins/fast-mode@0.1.9`
-- `pi-mcp-adapter@2.26.0`
+- `@juicesharp/rpiv-ask-user-question@2.7.0`
+- `@narumitw/pi-btw@0.55.1`
+- `@pi-plugins/fast-mode@0.1.10`
+- `pi-mcp-adapter@2.27.0`
 - `pi-footer@0.5.1`
-- `pi-lens@4.0.1`
-- `pi-web-access@0.23.0`
+- `pi-lens@4.1.1`
+- `pi-web-access@0.24.1`
 - `remote-pi@0.7.0`
 - `@czottmann/pi-automode@1.11.0`
 
 Pi loads their extensions and skills through `node_modules/` paths inside one package root. The upstream companions are pinned and bundled, not forked or renamed.
 
+`pi-lens@4.1.1` improves diagnostics, cache, and LSP observability; prevents session-switch crashes; restores oxlint warnings; speeds large ignored-tree scans; and retries failed log writes once.
+
 If `pi-footer` was installed separately before upgrading to an aggregate release that includes it, remove the standalone source shown by `pi list` so only the bundled copy loads. For the pinned standalone install used while preparing this integration:
 
 ```bash

package/node_modules/@herbertgao/pi-cc-extensions/README.en.md

@@ -55,7 +55,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,                // diff body lines shown when collapsed; beyond that shows the expand hint (Ctrl+O / click)
+  "editDiffCollapsedLines": 24,                // diff body lines shown when collapsed; beyond that shows the expand hint (Ctrl+O / click)
   "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
@@ -101,5 +101,5 @@ bun run typecheck
 
 ## Credits
 
-- Derived from [`minuque/pi-cc-extensions`](https://github.com/minuque/pi-cc-extensions) under the MIT license.
+- Derived from [`minuque/pi-cc-extensions` v0.8.64](https://github.com/minuque/pi-cc-extensions/releases/tag/v0.8.64) (`4709081`) under the MIT license.
 - Rich diffs are adapted from [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display) (MIT). See [`extensions/renderer/tool/diff/ATTRIBUTION.md`](./extensions/renderer/tool/diff/ATTRIBUTION.md).

package/node_modules/@herbertgao/pi-cc-extensions/README.md

@@ -55,7 +55,7 @@ pi install npm:@herbertgao/pi-cc-extensions
   "diffViewMode": "auto",                  // diff 布局：auto / split / unified
   "diffIndicatorMode": "bars",             // diff 变更指示：bars / classic / none
   "diffSplitMinWidth": 120,                // 自动布局下使用左右分栏的最小终端宽度
-  "diffCollapsedLines": 24,                // 折叠时展示的 diff 行数，超出显示展开提示（Ctrl+O / 点击）
+  "editDiffCollapsedLines": 24,                // 折叠时展示的 diff 行数，超出显示展开提示（Ctrl+O / 点击）
   "diffWordWrap": true,                    // 长 diff 行是否换行（否则截断）
   "expandedPreviewMaxLines": 40,           // 展开后输出/diff 正文的最大行数
   "useSummaryTitlesAsThinkingTitle": true, // 用最新 provider 摘要作为思考标题
@@ -101,5 +101,5 @@ bun run typecheck
 
 ## 致谢
 
-- 基于 MIT 许可的 [`minuque/pi-cc-extensions`](https://github.com/minuque/pi-cc-extensions) 衍生维护。
+- 基于 MIT 许可的 [`minuque/pi-cc-extensions` v0.8.64](https://github.com/minuque/pi-cc-extensions/releases/tag/v0.8.64)（`4709081`）衍生维护。
 - Rich diff 改编自 [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display)（MIT）；详见 [`extensions/renderer/tool/diff/ATTRIBUTION.md`](./extensions/renderer/tool/diff/ATTRIBUTION.md)。

package/node_modules/@herbertgao/pi-cc-extensions/extensions/config/config.ts

@@ -17,7 +17,8 @@ export type Config = {
 	diffViewMode: DiffViewMode;
 	diffIndicatorMode: DiffIndicatorMode;
 	diffSplitMinWidth: number;
-	diffCollapsedLines: number;
+	editDiffCollapsedLines: number;
+	writeDiffCollapsedLines: number;
 	diffWordWrap: boolean;
 	expandedPreviewMaxLines: number;
 	useSummaryTitlesAsThinkingTitle: boolean;
@@ -40,6 +41,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"];
@@ -65,7 +68,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,
@@ -134,12 +138,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,
@@ -182,7 +192,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,
 	};
@@ -199,7 +210,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/node_modules/@herbertgao/pi-cc-extensions/extensions/config/panel.ts

@@ -27,6 +27,7 @@ import {
 	SCROLL_STEP_LINES_VALUES,
 	THINKING_ANIMATION_INTERVAL_VALUES,
 	THINKING_PREVIEW_LINES_VALUES,
+	WRITE_DIFF_COLLAPSED_LINES_VALUES,
 	type CompactStyleMode,
 } from "./config.ts";
 
@@ -38,7 +39,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 stay single-line until expanded.";
 	}
 	if (mode === "off") {
 		return "Pi native tool rendering. Diff options below still apply independently.";
@@ -285,15 +286,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. 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",
@@ -446,14 +457,23 @@ export async function showCcstylePanel(
 					);
 					diffSplitSetting.currentValue = String(config.diffSplitMinWidth);
 					break;
-				case "diffCollapsedLines":
-					config.diffCollapsedLines = pickPositiveInt(
+				case "editDiffCollapsedLines":
+					config.editDiffCollapsedLines = pickPositiveInt(
 						value,
-						DEFAULT_CONFIG.diffCollapsedLines,
+						DEFAULT_CONFIG.editDiffCollapsedLines,
 						1,
 						500,
 					);
-					diffCollapsedSetting.currentValue = String(config.diffCollapsedLines);
+					diffCollapsedSetting.currentValue = String(config.editDiffCollapsedLines);
+					break;
+				case "writeDiffCollapsedLines":
+					config.writeDiffCollapsedLines = pickPositiveInt(
+						value,
+						DEFAULT_CONFIG.writeDiffCollapsedLines,
+						0,
+						500,
+					);
+					writeDiffCollapsedSetting.currentValue = String(config.writeDiffCollapsedLines);
 					break;
 				case "diffWordWrap":
 					config.diffWordWrap = value === "on";
@@ -519,6 +539,7 @@ export async function showCcstylePanel(
 					diffIndicatorSetting,
 					diffSplitSetting,
 					diffCollapsedSetting,
+					writeDiffCollapsedSetting,
 					diffWordWrapSetting,
 					expandedMaxSetting,
 				],

package/node_modules/@herbertgao/pi-cc-extensions/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/show-more-hint.ts";
 import {
 	animateCompactThinkingText,
 	formatThoughtDuration,
@@ -159,30 +165,316 @@ 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();
+	expandedWrapCache.clear();
+}
+
+type ExpandedWrapEntry = { text: string; lines: string[] };
+const expandedWrapCache = new Map<string, ExpandedWrapEntry>();
+export const THINKING_EXPANDED_WRAP_CACHE_MAX = 64;
+
+export function thinkingRunKey(messageTimestamp: number, runStartIndex: number): string {
+	return `${messageTimestamp}:${runStartIndex}`;
+}
+
+function expandedWrapKey(messageTimestamp: number, runStartIndex: number, width: number): string {
+	return `${thinkingRunKey(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 {
+	const prefix = `${thinkingRunKey(messageTimestamp, runStartIndex)}:`;
+	for (const key of expandedWrapCache.keys()) {
+		if (key.startsWith(prefix)) 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;
+	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<string>();
+
+/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、双击整块收起，对齐工具卡。 */
+export class ThinkingPreviewBlock implements Component {
+	private heading: string;
 	private text: string;
 	private padding: number;
+	readonly messageTimestamp: number;
+	readonly runStartIndex: 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 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,
+		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(thinkingRunKey(messageTimestamp, runStartIndex));
+	}
+
+	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;
+		const key = thinkingRunKey(this.messageTimestamp, this.runStartIndex);
+		if (expanded) expandedThinking.add(key);
+		else {
+			expandedThinking.delete(key);
+			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
+		}
+	}
+
+	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) {
+			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 };
 	}
 
 	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;
+	}
 }
 
 function parseSummaryPart(text: string): SummaryPart | undefined {
@@ -456,14 +748,18 @@ 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,
+					runStartIndex,
+				),
+			);
 
 			const hasVisibleContentAfter = message.content
 				.slice(i + 1)
@@ -728,6 +1024,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) {