pi-cc-extensions 0.8.59 → 0.8.61

package/extensions/feature/context.ts

@@ -13,10 +13,10 @@ import { padLine } from "../utils/format.ts";
 export type ContextPart = {
 	label: string;
 	tokens: number;
-	color: "accent" | "success" | "warning" | "muted" | "dim";
+	color: "accent" | "success" | "warning" | "customMessageLabel" | "muted" | "dim";
 };
 
-type PreviewKey = "systemPrompt" | "tools" | "contextFiles" | "skills";
+type PreviewKey = "systemPrompt" | "tools" | "toolResults" | "contextFiles";
 
 type ContextPreview = {
 	key: PreviewKey;
@@ -259,20 +259,30 @@ const tokenEstimate = (value: unknown): number => {
 	return Math.max(0, Math.ceil(text.length / 4));
 };
 
-export function scaleParts(parts: ContextPart[], target: number): ContextPart[] {
-	const estimated = parts.reduce((sum, part) => sum + part.tokens, 0);
-	if (estimated === 0 || target <= 0) return parts;
-	const scaled = parts.map((part) => ({
-		...part,
-		tokens: Math.round((part.tokens / estimated) * target),
-	}));
-	const delta = target - scaled.reduce((sum, part) => sum + part.tokens, 0);
-	const largest = scaled.reduce(
-		(best, part, index) => (part.tokens > scaled[best]!.tokens ? index : best),
-		0,
-	);
-	scaled[largest]!.tokens += delta;
-	return scaled;
+export function capParts(parts: ContextPart[], target: number, fixedPrefix = 0): ContextPart[] {
+	const fixed = parts.slice(0, fixedPrefix);
+	const variable = parts.slice(fixedPrefix);
+	const fixedTokens = fixed.reduce((sum, part) => sum + part.tokens, 0);
+	const variableTarget = Math.max(0, target - fixedTokens);
+	const estimated = variable.reduce((sum, part) => sum + part.tokens, 0);
+	if (estimated <= variableTarget || estimated === 0) return parts;
+	if (variableTarget === 0) {
+		return [...fixed, ...variable.map((part) => ({ ...part, tokens: 0 }))];
+	}
+
+	let previous = 0;
+	let cumulative = 0;
+	const capped = variable.map((part, index) => {
+		cumulative += part.tokens;
+		const next =
+			index === variable.length - 1
+				? variableTarget
+				: Math.round((cumulative / estimated) * variableTarget);
+		const tokens = next - previous;
+		previous = next;
+		return { ...part, tokens };
+	});
+	return [...fixed, ...capped];
 }
 
 export function formatTokens(tokens: number): string {
@@ -281,72 +291,122 @@ export function formatTokens(tokens: number): string {
 	return `${Math.round(tokens / 1_000)}k`;
 }
 
+export function resolveUsedTokens(
+	usage: { tokens: number | null; percent: number | null } | undefined,
+	estimated: number,
+	contextWindow: number,
+): number {
+	const reported = usage?.tokens;
+	const fromPercent =
+		usage?.percent !== null && usage?.percent !== undefined && contextWindow > 0
+			? Math.round((usage.percent / 100) * contextWindow)
+			: undefined;
+	let resolved = reported ?? fromPercent ?? estimated;
+	if (reported !== null && reported !== undefined && fromPercent !== undefined) {
+		// 某些 Provider 会返回异常 totalTokens；百分比与底部状态栏不一致时优先采用百分比。
+		const tolerance = Math.max(32, Math.round(contextWindow * 0.001));
+		if (Math.abs(reported - fromPercent) > tolerance) resolved = fromPercent;
+	}
+	// tokens 与 percent 可能同时源自异常 usage；数量级明显偏小时回退到实际内容估算。
+	if (estimated > 0 && resolved < estimated * 0.25) return estimated;
+	return resolved;
+}
+
 type ContextBreakdown = {
 	parts: ContextPart[];
-	options: BuildSystemPromptOptions;
-	systemPrompt: string;
+	previews: Record<PreviewKey, string>;
 };
 
-/**
- * Single pass over prompt options + session entries. Returns options/systemPrompt
- * so the /context UI does not re-fetch or re-stringify the same sources.
- */
-function collectContextBreakdown(ctx: ExtensionCommandContext): ContextBreakdown {
+function previewValue(value: unknown): string {
+	if (typeof value === "string") return value;
+	return `\`\`\`json\n${JSON.stringify(value, null, 2)}\n\`\`\``;
+}
+
+/** 按真实请求的 systemPrompt、tools、messages 三部分同步组装计数与预览。 */
+export function collectContextBreakdown(
+	ctx: ExtensionCommandContext,
+	allTools: ToolInfo[],
+): ContextBreakdown {
 	const options = (ctx.getSystemPromptOptions?.() ?? {}) as BuildSystemPromptOptions;
 	const systemPrompt = typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "";
-
-	const contextFileTokens = (options.contextFiles ?? []).reduce(
-		(sum, file) => sum + tokenEstimate(file.content),
-		0,
-	);
-	// Prefer field-level estimates over JSON.stringify(whole skill).
-	const skillTokens = (options.skills ?? []).reduce((sum, skill) => {
-		if (!skill || typeof skill !== "object") return sum + tokenEstimate(skill);
-		return (
-			sum +
-			tokenEstimate(skill.name) +
-			tokenEstimate(skill.description) +
-			tokenEstimate(skill.filePath)
-		);
-	}, 0);
-	const tools = options.selectedTools ?? [];
-	const snippets = options.toolSnippets;
-	let toolTokens = tokenEstimate(options.promptGuidelines);
-	for (const name of tools) {
-		toolTokens += tokenEstimate(name) + tokenEstimate(snippets?.[name]);
+	const selectedTools = new Set(options.selectedTools ?? ["read", "bash", "edit", "write"]);
+	const toolDefinitionPreview: string[] = [];
+	const toolResultPreview: string[] = [];
+	const contextPreview: string[] = [];
+	let toolDefinitionTokens = 0;
+	let toolResultTokens = 0;
+	let contextTokens = 0;
+
+	for (const tool of allTools) {
+		if (!selectedTools.has(tool.name)) continue;
+		const definition = {
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.parameters,
+		};
+		toolDefinitionTokens += tokenEstimate(definition);
+		toolDefinitionPreview.push(`## Definition: ${tool.name}\n\n${previewValue(definition)}`);
 	}
 
-	let user = 0;
-	let assistant = 0;
-	let toolResults = 0;
-	let summaries = 0;
 	for (const entry of ctx.sessionManager.buildContextEntries()) {
 		if (entry.type === "message") {
-			const tokens = estimateTokens(entry.message);
-			if (entry.message.role === "user") user += tokens;
-			else if (entry.message.role === "assistant") assistant += tokens;
-			else toolResults += tokens;
+			const message = entry.message;
+			if (message.role === "assistant") {
+				for (const block of message.content) {
+					if (block.type === "toolCall") {
+						contextTokens += tokenEstimate(block.name) + tokenEstimate(block.arguments);
+						contextPreview.push(
+							`## Assistant tool call: ${block.name}\n\n${previewValue(block.arguments)}`,
+						);
+					} else if (block.type === "text") {
+						contextTokens += tokenEstimate(block.text);
+						contextPreview.push(`## Assistant\n\n${block.text}`);
+					} else if (block.type === "thinking") {
+						contextTokens += tokenEstimate(block.thinking);
+						contextPreview.push(`## Assistant thinking\n\n${block.thinking}`);
+					}
+				}
+			} else if (message.role === "toolResult") {
+				toolResultTokens += estimateTokens(message);
+				toolResultPreview.push(
+					`## Result: ${message.toolName}\n\n${previewValue(message.content)}`,
+				);
+			} else if (message.role === "bashExecution") {
+				toolResultTokens += estimateTokens(message);
+				toolResultPreview.push(
+					`## Bash\n\nCommand:\n\n${previewValue(message.command)}\n\nOutput:\n\n${previewValue(message.output)}`,
+				);
+			} else if (message.role === "branchSummary" || message.role === "compactionSummary") {
+				contextTokens += estimateTokens(message);
+				contextPreview.push(`## ${message.role}\n\n${message.summary}`);
+			} else {
+				contextTokens += estimateTokens(message);
+				contextPreview.push(`## ${message.role}\n\n${previewValue(message.content)}`);
+			}
 		} else if (entry.type === "compaction" || entry.type === "branch_summary") {
-			summaries += tokenEstimate(entry);
+			contextTokens += tokenEstimate(entry.summary);
+			contextPreview.push(
+				`## ${entry.type === "compaction" ? "Compaction" : "Branch summary"}\n\n${entry.summary}`,
+			);
+		} else if (entry.type === "custom_message") {
+			contextTokens += tokenEstimate(entry.content);
+			contextPreview.push(`## Custom: ${entry.customType}\n\n${previewValue(entry.content)}`);
 		}
 	}
 
-	const systemTotal = tokenEstimate(systemPrompt);
-	const baseSystem = Math.max(0, systemTotal - contextFileTokens - skillTokens - toolTokens);
-	const parts: ContextPart[] = [
-		{ label: "System prompt", tokens: baseSystem, color: "accent" },
-		{ label: "Tools", tokens: toolTokens, color: "success" },
-		{ label: "Context files", tokens: contextFileTokens, color: "warning" },
-		{ label: "Skills", tokens: skillTokens, color: "warning" },
-		{ label: "User messages", tokens: user, color: "muted" },
-		{ label: "Assistant messages", tokens: assistant, color: "accent" },
-		{ label: "Tool results", tokens: toolResults, color: "dim" },
-		{ label: "Compaction summaries", tokens: summaries, color: "success" },
-	];
 	return {
-		parts: parts.filter((part) => part.tokens > 0),
-		options,
-		systemPrompt,
+		parts: [
+			{ label: "System prompt", tokens: tokenEstimate(systemPrompt), color: "accent" },
+			{ label: "Tools", tokens: toolDefinitionTokens, color: "success" },
+			{ label: "Tool results", tokens: toolResultTokens, color: "customMessageLabel" },
+			{ label: "Context", tokens: contextTokens, color: "warning" },
+		] satisfies ContextPart[],
+		previews: {
+			systemPrompt: systemPrompt || "No system prompt.",
+			tools: toolDefinitionPreview.join("\n\n") || "No active tool definitions.",
+			toolResults: toolResultPreview.join("\n\n") || "No tool results in the current context.",
+			contextFiles: contextPreview.join("\n\n") || "No conversation context.",
+		},
 	};
 }
 
@@ -356,11 +416,20 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 		handler: async (_args, ctx) => {
 			const usage = ctx.getContextUsage();
 			const contextWindow = usage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
-			const breakdown = collectContextBreakdown(ctx);
-			const used = usage?.tokens ?? breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
-			const parts = scaleParts(breakdown.parts, used);
+			const tools = pi.getAllTools();
+			const breakdown = collectContextBreakdown(ctx, tools);
+			const estimated = breakdown.parts.reduce((sum, part) => sum + part.tokens, 0);
+			const fixedTokens = breakdown.parts.slice(0, 2).reduce((sum, part) => sum + part.tokens, 0);
+			const used = Math.max(resolveUsedTokens(usage, estimated, contextWindow), fixedTokens);
+			const parts = capParts(breakdown.parts, used, 2);
+			const attributed = parts.reduce((sum, part) => sum + part.tokens, 0);
+			const other = Math.max(0, used - attributed);
 			const free = Math.max(0, contextWindow - used);
-			const allParts = [...parts, { label: "Free space", tokens: free, color: "dim" as const }];
+			const allParts = [
+				...parts,
+				{ label: "Other", tokens: other, color: "muted" as const },
+				{ label: "Free space", tokens: free, color: "dim" as const },
+			];
 
 			if (ctx.mode !== "tui") {
 				const lines = allParts.map((part) => `${part.label}: ${formatTokens(part.tokens)} tokens`);
@@ -368,64 +437,30 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 				return;
 			}
 
-			const options = breakdown.options;
-			const toolByName = new Map<string, ToolInfo>(
-				pi.getAllTools().map((tool) => [tool.name, tool] as const),
-			);
-			const toolContent = (options.selectedTools ?? []).map((name) => {
-				const tool = toolByName.get(name);
-				const lines = [`## ${name}`];
-				if (tool?.description) lines.push(tool.description);
-				if (options.toolSnippets?.[name]) lines.push(`Prompt: ${options.toolSnippets[name]}`);
-				if (tool?.promptGuidelines?.length) {
-					lines.push("Guidelines:", ...tool.promptGuidelines.map((guideline) => `- ${guideline}`));
-				}
-				return lines.join("\n");
-			});
-			if (options.promptGuidelines?.length) {
-				toolContent.push(
-					`## Shared prompt guidelines\n${options.promptGuidelines.map((guideline) => `- ${guideline}`).join("\n")}`,
-				);
-			}
-			const contextFilesContent = (options.contextFiles ?? [])
-				.map((file) => `===== ${file.path} =====\n${file.content}`)
-				.join("\n\n");
-			const skillsContent = (options.skills ?? [])
-				.map((skill) =>
-					[
-						`## ${skill.name}`,
-						skill.description,
-						`Path: ${skill.filePath}`,
-						`Model invocation: ${skill.disableModelInvocation ? "disabled" : "enabled"}`,
-					]
-						.filter(Boolean)
-						.join("\n"),
-				)
-				.join("\n\n");
 			const rawPreviews: ContextPreview[] = [
 				{
 					key: "systemPrompt",
 					label: "System prompt",
 					title: "System Prompt",
-					content: breakdown.systemPrompt,
+					content: breakdown.previews.systemPrompt,
 				},
 				{
 					key: "tools",
 					label: "Tools",
 					title: "Tools",
-					content: toolContent.join("\n\n") || "No active tools.",
+					content: breakdown.previews.tools,
 				},
 				{
-					key: "contextFiles",
-					label: "Context files",
-					title: "Context Files",
-					content: contextFilesContent || "No context files loaded.",
+					key: "toolResults",
+					label: "Tool results",
+					title: "Tool Results",
+					content: breakdown.previews.toolResults,
 				},
 				{
-					key: "skills",
-					label: "Skills",
-					title: "Skills",
-					content: skillsContent || "No skills loaded.",
+					key: "contextFiles",
+					label: "Context",
+					title: "Context",
+					content: breakdown.previews.contextFiles,
 				},
 			];
 			const previews = rawPreviews.map((preview) => ({

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
+ * 与 `diffCollapsedLines` / `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,50 @@ function compactEditWriteLine(
 	return ["", truncateToWidth(line, width, "")];
 }
 
-/** compact edit/write 展开：复用 mode=on 的 rich diff；不可用时回退 Input/Output。 */
-function compactEditWriteExpandedLines(
+/**
+ * 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(
-				String(component.toolName ?? ""),
-				result,
-				{
-					expanded: true,
-					isPartial: component.isPartial === true,
-					isError,
-				},
-				theme,
-				component,
-				writeMetadata,
-				getToolDisplayConfig,
-			)
-		: undefined;
-	let detail: any;
-	if (isRichDiffComponent(candidate)) {
+	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;
+	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 +591,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 +812,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				return;
 			}
 			try {
-				uiRef?.requestRender?.(true);
+				// 非 force：保留 fullscreen 布局缓存和差分绘制。
+				uiRef?.requestRender?.();
 			} catch {
 				/* 无 UI */
 			}
@@ -864,18 +889,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 +968,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 +1137,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() {},