pi-cc-extensions 1.0.12 → 1.0.14

package/README.en.md

@@ -33,7 +33,7 @@ Run `/reload` after installation.
 | Settings panel              | `Style / Features / UI / Diff / Thinking / Footer` tabs                                                                                      | `/ccstyle`                                      |
 | Context inspection          | Usage breakdown and previews for the system prompt, memory, skills, tools definition, and messages                                           | `/context`                                      |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents                                                             | `@`                                             |
-| Status bar                  | Shows model, context, cache, cost, and git; also works with `@narumitw/pi-usage` for live quota. Git/cache Nerd Font icons can be turned off | `/ccstyle`                                      |
+| Status bar                  | Shows model, context, cache, cost, the conversation token total, and git; also works with `@narumitw/pi-usage` for live quota. Git/cache Nerd Font icons can be turned off | `/ccstyle`                                      |
 | Theme                       | Bundled CC Dark and CC Light themes                                                                                                          | `/settings` → Theme                             |
 
 Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-examples-default.md) · [compact](./docs/tool-render-examples-compact.md)
@@ -77,7 +77,8 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 
   // thinking
   "useSummaryTitlesAsThinkingTitle": true, // use latest summary as thinking title
-  "previewLines": 3,                       // preview lines; 0 hides
+  "previewLines": 3,                       // preview lines while thinking; 0 hides
+  "completedPreviewLines": null,           // completed preview lines; null follows previewLines, 0 hides. Panel accepts any number or follow
   "animationIntervalMs": 90,               // title animation interval (ms)
 
   // footer
@@ -85,12 +86,13 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "footerTokenRate": true,                 // output rate chip; false hides it
   "footerTokenRateMode": "average",        // average: whole-prompt avg; live: trailing 1s rate
   "footerTokenRateTtft": true,             // append TTFT to the rate chip; false shows tok/s only
+  "footerSessionTokens": false,            // conversation token total chip (∑); sums usage.totalTokens from session entries. Off by default
   "footerCurrency": "USD",                 // display currency for the footer cost
   "footerCurrencyRate": null,              // display units per 1 cost unit; null changes the symbol only
   "footerNerdIcons": true,                 // Nerd Font glyphs for git/cache; false = plain text
   "footerGitStatsMode": "working",         // working (default): uncommitted; branch: cumulative net changes
   "footerHiddenKeys": [],                  // hidden chip keys
-  "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // chip order per line; builtins and plugins share one layout
+  "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "tokens", "pi-usage"], // chip order per line; builtins and plugins share one layout
   "footerLine2Keys": ["cwd", "git"],       // cwd: directory and session; git: branch and changes. Either can move to any line
   "footerLine3Keys": [],                   // painted only when a chip is visible
 }

package/README.md

@@ -33,7 +33,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 | 配置面板              | `Style / Features / UI / Diff / Thinking / Footer` 六页签                       | `/ccstyle`                                      |
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Memory、Skills、Tools definition 和消息内容 | `/context`                                      |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
-| 状态栏                | 显示：模型、上下文、缓存、费用、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存图标可关 Nerd Font | `/ccstyle`                              |
+| 状态栏                | 显示：模型、上下文、缓存、费用、本次对话累计 token、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存图标可关 Nerd Font | `/ccstyle`                              |
 | 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/settings` → Theme                             |
 
 `on` / `compact` 两种模式的渲染样例：[默认模式](./docs/tool-render-examples-default.md) · [紧凑模式](./docs/tool-render-examples-compact.md)
@@ -77,7 +77,8 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // thinking
   "useSummaryTitlesAsThinkingTitle": true, // 用最新摘要作思考标题
-  "previewLines": 3,                       // 预览行数，0 隐藏
+  "previewLines": 3,                       // 思考中的预览行数，0 隐藏
+  "completedPreviewLines": null,           // 完成态预览行数，0 隐藏；null 跟随 previewLines。面板可输入任意值或 follow
   "animationIntervalMs": 90,               // 标题动画间隔（毫秒）
 
   // footer
@@ -85,12 +86,13 @@ pi install git:github.com/minuque/pi-cc-extensions
   "footerTokenRate": true,                 // 输出速率芯片；false 隐藏
   "footerTokenRateMode": "average",        // average：整段指令平均（avg）；live：最近 1 秒瞬时（live）
   "footerTokenRateTtft": true,             // 速率芯片是否带 TTFT；false 只显示 tok/s
+  "footerSessionTokens": false,            // 本次对话累计 token 芯片（∑）；累加会话条目的 usage.totalTokens，默认关
   "footerCurrency": "USD",                 // 底栏费用的显示币种
   "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
   "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本
   "footerGitStatsMode": "working",         // working（默认）：未提交改动；branch：分支累计净改动
   "footerHiddenKeys": [],                  // 隐藏的芯片 key
-  "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // 每行芯片顺序；内置项与插件同一套排布
+  "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "tokens", "pi-usage"], // 每行芯片顺序；内置项与插件同一套排布
   "footerLine2Keys": ["cwd", "git"],       // cwd：目录和会话名；git：分支和改动。可换到任意行
   "footerLine3Keys": []                    // 有可见芯片才占行
 }

package/extensions/config/config.ts

@@ -62,6 +62,8 @@ export type Config = {
 	toolLabelClip: number;
 	useSummaryTitlesAsThinkingTitle: boolean;
 	previewLines: number;
+	/** 思考完成后的折叠预览行数；null = 跟随 previewLines（保持旧行为）。 */
+	completedPreviewLines: number | null;
 	animationIntervalMs: number;
 	showStartupHeader: boolean;
 	/** fullscreen：userMessage 正文首行滚出视口上沿后钉住，直到下一条指令接手。 */
@@ -85,6 +87,8 @@ export type Config = {
 	footerTokenRateMode: FooterTokenRateMode;
 	/** 速率芯片是否带 TTFT。关则只显示速率。 */
 	footerTokenRateTtft: boolean;
+	/** 会话累计 token 芯片（累加会话条目的 usage.totalTokens）。默认关。 */
+	footerSessionTokens: boolean;
 	/** ISO 4217 显示币种。USD 时不换算。 */
 	footerCurrency: string;
 	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
@@ -119,6 +123,8 @@ export const EXPANDED_OUTPUT_MAX_LINES_VALUES = ["10", "20", "40", "80", "120"];
 /** 工具摘要里 path/command 等输入的折叠字符数；0 = 只按可用宽度截断。 */
 export const TOOL_LABEL_CLIP_VALUES = ["0", "40", "60", "80", "100", "120", "160"];
 export const THINKING_PREVIEW_LINES_VALUES = ["0", "1", "3", "5", "10"];
+/** 完成态思考预览预设；follow = 跟随 previewLines。 */
+export const COMPLETED_THINKING_PREVIEW_LINES_VALUES = ["follow", ...THINKING_PREVIEW_LINES_VALUES];
 export const THINKING_ANIMATION_INTERVAL_VALUES = ["40", "60", "90", "120", "180"];
 /** Tools commonly toggled in excludeRenderers via the settings panel. */
 export const EXCLUDE_RENDERER_CANDIDATES = [
@@ -150,6 +156,7 @@ export const DEFAULT_CONFIG: Config = {
 	toolLabelClip: 0,
 	useSummaryTitlesAsThinkingTitle: true,
 	previewLines: 3,
+	completedPreviewLines: null,
 	animationIntervalMs: 90,
 	showStartupHeader: true,
 	stickyUserMessage: true,
@@ -166,6 +173,7 @@ export const DEFAULT_CONFIG: Config = {
 	footerTokenRate: true,
 	footerTokenRateMode: "average",
 	footerTokenRateTtft: true,
+	footerSessionTokens: false,
 	footerCurrency: "USD",
 	footerCurrencyRate: null,
 	footerNerdIcons: true,
@@ -196,6 +204,13 @@ export function pickPositiveNumber(value: unknown, fallback: number, min = 1): n
 	return Number.isFinite(n) ? Math.max(min, n) : fallback;
 }
 
+/** 思考完成后的预览行数。null（缺失/空/非法）= 跟随 previewLines，保持旧配置行为。 */
+export function pickCompletedPreviewLines(value: unknown): number | null {
+	if (value === undefined || value === null || value === "") return null;
+	const n = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
+	return Number.isFinite(n) ? Math.max(0, Math.floor(n)) : null;
+}
+
 function normalizeCurrency(value: unknown): string {
 	return typeof value === "string" && /^[A-Za-z]{3}$/.test(value.trim())
 		? value.trim().toUpperCase()
@@ -277,6 +292,7 @@ export function normalizeConfig(input: unknown): Config {
 			0,
 			Number.MAX_SAFE_INTEGER,
 		),
+		completedPreviewLines: pickCompletedPreviewLines(source.completedPreviewLines),
 		animationIntervalMs: pickPositiveNumber(
 			source.animationIntervalMs,
 			DEFAULT_CONFIG.animationIntervalMs,
@@ -304,6 +320,7 @@ export function normalizeConfig(input: unknown): Config {
 			DEFAULT_CONFIG.footerTokenRateMode,
 		),
 		footerTokenRateTtft: source.footerTokenRateTtft !== false,
+		footerSessionTokens: source.footerSessionTokens === true,
 		footerCurrency: normalizeCurrency(source.footerCurrency),
 		footerCurrencyRate: normalizeFooterCurrencyRate(source.footerCurrencyRate),
 		footerNerdIcons: source.footerNerdIcons !== false,
@@ -320,6 +337,7 @@ export function getCompactThinkingConfig(source: Config = config): CompactThinki
 	return {
 		useSummaryTitlesAsThinkingTitle: source.useSummaryTitlesAsThinkingTitle,
 		previewLines: source.previewLines,
+		completedPreviewLines: source.completedPreviewLines,
 		animationIntervalMs: source.animationIntervalMs,
 	};
 }
@@ -393,6 +411,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`toolLabelClip=${source.toolLabelClip}`,
 		`thinkingTitle=${source.useSummaryTitlesAsThinkingTitle ? "summary" : "default"}`,
 		`thinkingPreview=${source.previewLines}`,
+		`thinkingPreviewDone=${source.completedPreviewLines ?? "follow"}`,
 		`thinkingAnimation=${source.animationIntervalMs}ms`,
 		`startupHeader=${source.showStartupHeader ? "on" : "off"}`,
 		`stickyUserMessage=${source.stickyUserMessage ? "on" : "off"}`,
@@ -409,6 +428,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`footerTokenRate=${source.footerTokenRate ? "on" : "off"}`,
 		`footerTokenRateMode=${source.footerTokenRateMode}`,
 		`footerTokenRateTtft=${source.footerTokenRateTtft ? "on" : "off"}`,
+		`footerSessionTokens=${source.footerSessionTokens ? "on" : "off"}`,
 		`footerCurrency=${source.footerCurrency}`,
 		`footerRate=${source.footerCurrencyRate ?? "-"}`,
 		`footerIcons=${source.footerNerdIcons ? "nerd" : "plain"}`,

package/extensions/config/panel.ts

@@ -33,6 +33,7 @@ import { applyStartupHeader, clearStartupHeader } from "../feature/shell/startup
 import type { ToolGroupingHooks } from "../renderer/tool/grouping.ts";
 import {
 	config,
+	COMPLETED_THINKING_PREVIEW_LINES_VALUES,
 	DEFAULT_CONFIG,
 	DIFF_COLLAPSED_LINES_VALUES,
 	DIFF_INDICATOR_MODES,
@@ -45,6 +46,7 @@ import {
 	FOOTER_TOKEN_RATE_MODES,
 	formatExcludeRenderers,
 	getCompactThinkingConfig,
+	pickCompletedPreviewLines,
 	pickPositiveInt,
 	pickPositiveNumber,
 	pickToolLabelClip,
@@ -111,6 +113,12 @@ function footerTokenRateTtftDescription(enabled: boolean): string {
 		: "Time to first token hidden. The rate chip shows tok/s only.";
 }
 
+function footerSessionTokensDescription(enabled: boolean): string {
+	return enabled
+		? "Cumulative tokens used in this conversation, summed from the session's usage.totalTokens. Turn off to hide it."
+		: "Conversation token total hidden.";
+}
+
 function footerGitStatsDescription(mode: FooterGitStatsMode): string {
 	return mode === "branch"
 		? "Net changes since the merge base, including uncommitted edits. Base: origin/HEAD, then local main/master. Untracked files excluded; unavailable stats hidden."
@@ -363,20 +371,28 @@ function buildValueInputSubmenu(
 	};
 }
 
-/** 数值项：预填当前值，空输入取消，非数字留下错误。 */
+/** 数值项：预填当前值，空输入取消，非法输入留下错误；allowFollow 时额外接受 follow。 */
 function buildNumberInputSubmenu(
 	theme: any,
 	setting: { label: string; currentValue: string },
 	closeSubmenu: (selected?: string) => void,
+	allowFollow = false,
 ) {
 	return buildValueInputSubmenu(
 		theme,
 		{
 			prompt: `  ${setting.label} — custom value:`,
 			initial: setting.currentValue,
-			hint: "  Enter to apply · Esc to go back",
-			accept: (raw) => (raw === "" ? undefined : Number.isFinite(Number(raw)) ? raw : null),
-			invalid: (raw) => `Invalid number: "${raw}"`,
+			hint: allowFollow
+				? "  Enter to apply · Esc to go back · follow = Preview lines"
+				: "  Enter to apply · Esc to go back",
+			accept: (raw) =>
+				raw === ""
+					? undefined
+					: (allowFollow && raw === "follow") || Number.isFinite(Number(raw))
+						? raw
+						: null,
+			invalid: (raw) => `${allowFollow ? "Invalid value" : "Invalid number"}: "${raw}"`,
 		},
 		closeSubmenu,
 	);
@@ -575,12 +591,23 @@ export async function showCcstylePanel(
 		const thinkingPreviewSetting = {
 			id: "previewLines",
 			label: "Preview lines",
-			description: "Thinking preview lines; 0 hides the preview body.",
+			description: "Thinking preview lines while a run is in progress; 0 hides the preview body.",
 			currentValue: String(config.previewLines),
 			values: [...THINKING_PREVIEW_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
 				buildNumberInputSubmenu(theme, thinkingPreviewSetting, closeSubmenu),
 		};
+		const completedThinkingPreviewSetting = {
+			id: "completedPreviewLines",
+			label: "Completed preview",
+			description:
+				"Thinking preview lines once the run finishes; follow = same as Preview lines. Enter to type a custom value or follow.",
+			currentValue:
+				config.completedPreviewLines === null ? "follow" : String(config.completedPreviewLines),
+			values: [...COMPLETED_THINKING_PREVIEW_LINES_VALUES],
+			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
+				buildNumberInputSubmenu(theme, completedThinkingPreviewSetting, closeSubmenu, true),
+		};
 		const thinkingAnimationSetting = {
 			id: "animationIntervalMs",
 			label: "Animation interval ms",
@@ -781,6 +808,13 @@ export async function showCcstylePanel(
 			currentValue: config.footerTokenRateTtft ? "on" : "off",
 			values: ["on", "off"],
 		};
+		const footerSessionTokensSetting = {
+			id: "footerSessionTokens",
+			label: "Conversation tokens",
+			description: footerSessionTokensDescription(config.footerSessionTokens),
+			currentValue: config.footerSessionTokens ? "on" : "off",
+			values: ["on", "off"],
+		};
 		const pluginChipsSetting = {
 			id: "footerPluginChips",
 			label: "Footer chips",
@@ -879,6 +913,14 @@ export async function showCcstylePanel(
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
+			if (id === "footerSessionTokens") {
+				const enabled = value === "on";
+				updateConfig({ footerSessionTokens: enabled });
+				footerSessionTokensSetting.currentValue = enabled ? "on" : "off";
+				footerSessionTokensSetting.description = footerSessionTokensDescription(enabled);
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
 			if (id === "enableEditorPrefix") {
 				const enabled = value === "on";
 				updateConfig({ enableEditorPrefix: enabled });
@@ -1007,6 +1049,13 @@ export async function showCcstylePanel(
 					updateConfig({ previewLines: pickPositiveInt(value, DEFAULT_CONFIG.previewLines, 0) });
 					thinkingPreviewSetting.currentValue = String(config.previewLines);
 					break;
+				case "completedPreviewLines":
+					updateConfig({
+						completedPreviewLines: value === "follow" ? null : pickCompletedPreviewLines(value),
+					});
+					completedThinkingPreviewSetting.currentValue =
+						config.completedPreviewLines === null ? "follow" : String(config.completedPreviewLines);
+					break;
 				case "animationIntervalMs":
 					updateConfig({
 						animationIntervalMs: pickPositiveNumber(value, DEFAULT_CONFIG.animationIntervalMs),
@@ -1094,7 +1143,12 @@ export async function showCcstylePanel(
 			{
 				id: "thinking",
 				label: "Thinking",
-				items: [thinkingTitleSetting, thinkingPreviewSetting, thinkingAnimationSetting],
+				items: [
+					thinkingTitleSetting,
+					thinkingPreviewSetting,
+					completedThinkingPreviewSetting,
+					thinkingAnimationSetting,
+				],
 			},
 			{
 				id: "footer",
@@ -1104,6 +1158,7 @@ export async function showCcstylePanel(
 					footerTokenRateSetting,
 					footerTokenRateModeSetting,
 					footerTokenRateTtftSetting,
+					footerSessionTokensSetting,
 					footerCurrencySetting,
 					footerCurrencyRateSetting,
 					footerNerdIconsSetting,

package/extensions/feature/agent-summary/core.ts

@@ -5,11 +5,11 @@
  * 计数：bash/powershell 按调用次数；read/edit/write 按非空 path/file_path 去重；other 按调用次数。
  * 失败单独累计；另记回合耗时。
  *
- * 呈现：`summaryLine` 纯文本，`summaryMarkdown` Markdown（可 box 引用块）。
+ * 呈现：`summarySegments` 分段（文字 + 语义色），渲染层自己拼行并上色。
+ * 不要经 Markdown 渲染：pi 的 Markdown 组件会剥掉输入里的终端序列，数字会失去语义色。
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { formatDuration } from "../../utils/format.ts";
 
 /** 工具分类。 */
 export type AgentToolCategory = "bash" | "read" | "edit" | "write" | "other";
@@ -113,25 +113,20 @@ function summaryParts(data: AgentSummaryData): string[] {
 	return parts;
 }
 
-export function summaryMarkdown(
-	data: AgentSummaryData,
-	colors: { success: string; failed: string } = { success: "", failed: "" },
-): string {
+/** 摘要段：一段文字 + 语义色；数字上色由渲染层完成。 */
+export type SummarySegment = { text: string; tone: "success" | "failed" };
+
+export function summarySegments(data: AgentSummaryData): SummarySegment[] {
 	const parts = summaryParts(data);
-	if (parts.length === 0) return "";
+	if (parts.length === 0) return [];
 	const capitalizeFirst = (part: string, first: boolean) => {
 		const verb = part.match(/^[a-z]+/)?.[0] ?? "";
 		return first && verb ? verb[0].toUpperCase() + verb.slice(1) + part.slice(verb.length) : part;
 	};
-	const paintNumber = (code: string, part: string) =>
-		code ? part.replace(/(\d+)/, `${code}$1\x1b[0m`) : part;
-	const text = parts
-		.map((part, index) => capitalizeFirst(part, index === 0))
-		.map((part) => paintNumber(part.endsWith("failed") ? colors.failed : colors.success, part))
-		.join(", ");
-	const duration = formatDuration(data.durationMs);
-	const line = duration ? `${text} · ${duration}` : text;
-	return `> *${line}*`;
+	return parts.map((part, index) => ({
+		text: capitalizeFirst(part, index === 0),
+		tone: part.endsWith("failed") ? "failed" : "success",
+	}));
 }
 
 /**

package/extensions/feature/agent-summary/index.ts

@@ -1,27 +1,76 @@
 /**
  * Agent 回合摘要展示：agent_end 时把本回合工具统计写入会话条目，
- * 由 entry renderer 渲染为 markdown 引用块 `> [!TIP] *斜体内容*`。
+ * 由 entry renderer 渲染成一行引用行 `│ Ran 1 command, wrote 1 file · 15s`。
  *
  * 统计复用 ./core.ts（bash|powershell/read/edit/write/other）。
  * appendEntry 不进 LLM 上下文，只显示在聊天区。
- * 引用块文字色取主题 mdQuote（cc 主题下为 muted 灰），内容用 *斜体* 语法。
+ *
+ * 不走 Markdown：pi 的 Markdown 组件会剥掉输入里的终端序列，
+ * 数字的语义色只能由组件自己拼。竖线取 mdQuoteBorder，文字取 mdQuote + 斜体，数字取 success/error。
  */
 
-import { Markdown } from "@earendil-works/pi-tui";
-import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import { wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { bindAgentSummary, summaryMarkdown, type AgentSummaryData } from "./core.ts";
+import { formatDuration } from "../../utils/format.ts";
+import { bindAgentSummary, summarySegments, type SummarySegment } from "./core.ts";
+import type { AgentSummaryData } from "./core.ts";
 
 export const AGENT_SUMMARY_ENTRY_TYPE = "agent-summary";
 
+type SummaryTheme = {
+	fg(color: string, text: string): string;
+	italic(text: string): string;
+	getFgAnsi(color: string): string;
+};
+
+/** 取样式函数在正文前产生的 SGR 前缀；行内 reset 之后要靠它把样式续上。 */
+function stylePrefix(style: (text: string) => string): string {
+	const sentinel = "\u0000";
+	const styled = style(sentinel);
+	const index = styled.indexOf(sentinel);
+	return index >= 0 ? styled.slice(0, index) : "";
+}
+
+/** 只给段内第一个数字上色；没有数字的段原样返回。 */
+function paintNumber(segment: SummarySegment, theme: SummaryTheme): string {
+	const match = /(\d+)/.exec(segment.text);
+	if (!match) return segment.text;
+	const ansi = theme.getFgAnsi(segment.tone === "failed" ? "error" : "success");
+	if (!ansi) return segment.text;
+	const start = match.index;
+	return `${segment.text.slice(0, start)}${ansi}${match[1]}\x1b[0m${segment.text.slice(start + match[1].length)}`;
+}
+
+/** 摘要行：左侧 mdQuoteBorder 竖线 + 斜体 mdQuote 正文，数字按成功/失败上色。 */
+class AgentSummaryLine {
+	private readonly body: string;
+	private readonly border: string;
+	private readonly theme: SummaryTheme;
+
+	constructor(segments: readonly SummarySegment[], duration: string, theme: SummaryTheme) {
+		this.theme = theme;
+		this.border = theme.fg("mdQuoteBorder", "│");
+		const quoteStyle = (text: string) => theme.italic(theme.fg("mdQuote", text));
+		const counts = segments.map((segment) => paintNumber(segment, theme)).join(", ");
+		const text = duration ? `${counts} · ${duration}` : counts;
+		const prefix = stylePrefix(quoteStyle);
+		this.body = quoteStyle(prefix ? text.replace(/\x1b\[0m/g, `\x1b[0m${prefix}`) : text);
+	}
+
+	invalidate(): void {}
+
+	render(width: number): string[] {
+		const contentWidth = Math.max(1, width - 4);
+		return wrapTextWithAnsi(this.body, contentWidth).map((line) => ` ${this.border} ${line}`);
+	}
+}
+
 export default function (pi: ExtensionAPI): void {
 	pi.registerEntryRenderer(AGENT_SUMMARY_ENTRY_TYPE, (entry, _options, theme) => {
-		const line = summaryMarkdown(entry.data as AgentSummaryData, {
-			success: theme.getFgAnsi("success"),
-			failed: theme.getFgAnsi("error"),
-		});
-		if (!line) return undefined;
-		return new Markdown(line, 1, 0, getMarkdownTheme());
+		const segments = summarySegments(entry.data as AgentSummaryData);
+		if (segments.length === 0) return undefined;
+		const duration = formatDuration((entry.data as AgentSummaryData).durationMs);
+		return new AgentSummaryLine(segments, duration, theme as unknown as SummaryTheme);
 	});
 
 	bindAgentSummary(pi, (data) => {

package/extensions/feature/compact-thinking.ts

@@ -41,6 +41,8 @@ type AssistantMessageComponentLike = InstanceType<typeof AssistantMessageCompone
 export type CompactThinkingConfig = {
 	useSummaryTitlesAsThinkingTitle: boolean;
 	previewLines: number;
+	/** 思考完成后的折叠预览行数；null = 跟随 previewLines（保持旧行为）。 */
+	completedPreviewLines: number | null;
 	animationIntervalMs: number;
 };
 
@@ -112,6 +114,7 @@ type PatchedPrototype = typeof AssistantMessageComponent.prototype & {
 const config: CompactThinkingConfig = {
 	useSummaryTitlesAsThinkingTitle: true,
 	previewLines: 3,
+	completedPreviewLines: null,
 	animationIntervalMs: 90,
 };
 
@@ -273,11 +276,12 @@ function layoutThinkingPreview(
 	text: string,
 	width: number,
 	padding: number,
+	previewLines: number,
 ): { visible: string[]; hiddenLines: number } {
-	if (!text || config.previewLines <= 0) return { visible: [], hiddenLines: 0 };
+	if (!text || 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),
+		width * (previewLines + PREVIEW_BUDGET_SLACK_LINES),
 		PREVIEW_BUDGET_MIN_CHARS,
 	);
 	let source = text;
@@ -298,8 +302,8 @@ function layoutThinkingPreview(
 		};
 		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;
+	const hiddenLines = entry.hiddenBefore + Math.max(0, entry.lines.length - previewLines);
+	const visible = hiddenLines > 0 ? entry.lines.slice(-previewLines) : entry.lines;
 	return { visible, hiddenLines };
 }
 
@@ -335,6 +339,8 @@ export class ThinkingPreviewBlock implements Component {
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
 	private hintHovered = false;
+	/** 构造时的活动态：活动块用 previewLines，完成块用 completedPreviewLines。 */
+	private active: boolean;
 	private collapsedMemo:
 		| {
 				width: number;
@@ -351,8 +357,9 @@ export class ThinkingPreviewBlock implements Component {
 		padding: number,
 		messageTimestamp: number,
 		style: (text: string) => string,
-		theme?: Theme,
-		runStartIndex = 0,
+		theme: Theme | undefined,
+		runStartIndex: number,
+		active: boolean,
 	) {
 		this.heading = heading;
 		this.text = text;
@@ -361,6 +368,14 @@ export class ThinkingPreviewBlock implements Component {
 		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
+		this.active = active;
+	}
+
+	/** 活动块用 previewLines；完成块用 completedPreviewLines（null 跟随 previewLines）。 */
+	private effectivePreviewLines(): number {
+		return this.active
+			? config.previewLines
+			: (config.completedPreviewLines ?? config.previewLines);
 	}
 
 	private paint(color: string, text: string): string {
@@ -393,7 +408,7 @@ export class ThinkingPreviewBlock implements Component {
 	private headingLines(width: number, hiddenLines: number, padding: number): string[] {
 		const hint = this.expanded
 			? undefined
-			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && config.previewLines <= 0);
+			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && this.effectivePreviewLines() <= 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);
@@ -411,7 +426,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private bodyLines(width: number, padding: number): { lines: string[]; hiddenLines: number } {
-		if (!this.text || (config.previewLines <= 0 && !this.expanded)) {
+		if (!this.text || (this.effectivePreviewLines() <= 0 && !this.expanded)) {
 			return { lines: [], hiddenLines: 0 };
 		}
 		if (this.expanded) {
@@ -420,7 +435,7 @@ export class ThinkingPreviewBlock implements Component {
 				hiddenLines: 0,
 			};
 		}
-		const preview = layoutThinkingPreview(this.text, width, padding);
+		const preview = layoutThinkingPreview(this.text, width, padding, this.effectivePreviewLines());
 		return { lines: preview.visible, hiddenLines: preview.hiddenLines };
 	}
 
@@ -447,7 +462,7 @@ export class ThinkingPreviewBlock implements Component {
 		const expandAction = thinkingExpandAction();
 		if (
 			this.collapsedMemo?.width === width &&
-			this.collapsedMemo.previewLines === config.previewLines &&
+			this.collapsedMemo.previewLines === this.effectivePreviewLines() &&
 			this.collapsedMemo.hintHovered === this.hintHovered &&
 			this.collapsedMemo.expandAction === expandAction
 		) {
@@ -464,7 +479,7 @@ export class ThinkingPreviewBlock implements Component {
 			: heading;
 		this.collapsedMemo = {
 			width,
-			previewLines: config.previewLines,
+			previewLines: this.effectivePreviewLines(),
 			hintHovered: this.hintHovered,
 			expandAction,
 			lines,
@@ -715,6 +730,8 @@ function compactThinking(pi: ExtensionAPI) {
 			}
 			const runEndIndex = i - 1;
 			i--;
+			// Keep this run-scoped snapshot: a timestamp-only render query would mark
+			// earlier thinking runs active when one message alternates text and thinking.
 			const active = isActiveRun(message, runStartIndex, runEndIndex);
 			// OpenAI can spend several seconds reasoning before it emits the first
 			// summary token. Keep an empty active block visible as animated
@@ -759,6 +776,7 @@ function compactThinking(pi: ExtensionAPI) {
 					thinkingStyle,
 					activeTheme,
 					runStartIndex,
+					active,
 				),
 			);
 

package/extensions/feature/shell/footer-layout.ts

@@ -13,6 +13,8 @@ export const FOOTER_CONTEXT_KEY = "context";
 export const FOOTER_CACHE_KEY = "cache";
 export const FOOTER_RATE_KEY = "rate";
 export const FOOTER_COST_KEY = "cost";
+/** 本次对话累计消耗 token（累加会话条目的 usage.totalTokens）。 */
+export const FOOTER_TOKENS_KEY = "tokens";
 export const FOOTER_CWD_KEY = "cwd";
 export const FOOTER_GIT_KEY = "git";
 
@@ -23,6 +25,7 @@ export const DEFAULT_FOOTER_LINE1_KEYS = [
 	FOOTER_CACHE_KEY,
 	FOOTER_RATE_KEY,
 	FOOTER_COST_KEY,
+	FOOTER_TOKENS_KEY,
 	PI_USAGE_KEY,
 ] as const;
 
@@ -40,7 +43,18 @@ const LEGACY_FIXED_FOOTER_KEYS = [
 	FOOTER_GIT_KEY,
 ] as const;
 
-const BUILTIN_FOOTER_KEYS = new Set<string>(LEGACY_FIXED_FOOTER_KEYS);
+/**
+ * 后加的内置芯片：老配置里不会出现，读取时补到默认行上 `after` 那个芯片后面。
+ * 与 LEGACY_FIXED_FOOTER_KEYS 分开，旧配置的「只排插件芯片」迁移判断才不会误判。
+ */
+const ADDED_FOOTER_KEYS: ReadonlyArray<{ key: string; after: string }> = [
+	{ key: FOOTER_TOKENS_KEY, after: FOOTER_COST_KEY },
+];
+
+const BUILTIN_FOOTER_KEYS = new Set<string>([
+	...LEGACY_FIXED_FOOTER_KEYS,
+	...ADDED_FOOTER_KEYS.map((item) => item.key),
+]);
 
 export function isBuiltinFooterKey(key: string): boolean {
 	return BUILTIN_FOOTER_KEYS.has(key);
@@ -62,9 +76,12 @@ export const DEFAULT_FOOTER_CHIP_LAYOUT: FooterChipLayout = {
 	footerLine3Keys: [],
 };
 
-/** 别的扩展写的 model 状态与本扩展的模型芯片重名，不当插件芯片接纳。配置里的 model 不受影响。 */
+/**
+ * 别的扩展写的 model / tokens 状态与本扩展的内置芯片重名，不当插件芯片接纳。
+ * 配置里的同名内置 key 不受影响。
+ */
 export function isSkippedFooterStatusKey(key: string): boolean {
-	return key === FOOTER_MODEL_KEY;
+	return key === FOOTER_MODEL_KEY || key === FOOTER_TOKENS_KEY;
 }
 
 /** 未单独配置时的默认行：内置项按原来的行，usage 类在 line1，其余 line2。不会默认进 line3。 */
@@ -113,7 +130,10 @@ function ensureBuiltinKeys(
 	if (LEGACY_FIXED_FOOTER_KEYS.some((key) => seen.has(key))) {
 		return { footerLine1Keys: line1, footerLine2Keys: line2, footerLine3Keys: line3 };
 	}
-	const line1Builtins = DEFAULT_FOOTER_LINE1_KEYS.filter((key) => key !== PI_USAGE_KEY);
+	// tokens 属于后加芯片，由 ensureAddedBuiltins 负责插入。
+	const line1Builtins = DEFAULT_FOOTER_LINE1_KEYS.filter(
+		(key) => key !== PI_USAGE_KEY && key !== FOOTER_TOKENS_KEY,
+	);
 	const usageAt = line1.indexOf(PI_USAGE_KEY);
 	const footerLine1Keys =
 		usageAt >= 0
@@ -126,6 +146,33 @@ function ensureBuiltinKeys(
 	};
 }
 
+function ensureAddedBuiltins(layout: FooterChipLayout): FooterChipLayout {
+	const present = new Set([
+		...layout.footerLine1Keys,
+		...layout.footerLine2Keys,
+		...layout.footerLine3Keys,
+		...layout.footerHiddenKeys,
+	]);
+	const missing = ADDED_FOOTER_KEYS.filter((item) => !present.has(item.key));
+	if (missing.length === 0) return layout;
+	const next: FooterChipLayout = {
+		...layout,
+		footerLine1Keys: [...layout.footerLine1Keys],
+		footerLine2Keys: [...layout.footerLine2Keys],
+		footerLine3Keys: [...layout.footerLine3Keys],
+	};
+	for (const item of missing) {
+		// 贴着锚点芯片所在的行放（如 tokens 跟 cost）。
+		const line = footerLineOfKey(next, item.after) ?? defaultFooterLine(item.key);
+		const keys = keysOnLine(next, line);
+		const anchorAt = keys.indexOf(item.after);
+		// 锚点被用户删掉时接到该行末尾：芯片留在布局里，面板菜单与开关才管得到。
+		// 默认关闭，不渲染就不占位，多出来的 key 不会让底栏多一行。
+		keys.splice(anchorAt >= 0 ? anchorAt + 1 : keys.length, 0, item.key);
+	}
+	return next;
+}
+
 /** 跨行去重（line1 → line2 → line3）；旧配置补上内置芯片。 */
 export function normalizeFooterChipLayout(source: Record<string, unknown>): FooterChipLayout {
 	const hasHidden = Array.isArray(source.footerHiddenKeys);
@@ -144,10 +191,10 @@ export function normalizeFooterChipLayout(source: Record<string, unknown>): Foot
 	const line1 = takeUnique(normalizeFooterKeyList(source.footerLine1Keys), seen);
 	const line2 = takeUnique(normalizeFooterKeyList(source.footerLine2Keys), seen);
 	const line3 = takeUnique(normalizeFooterKeyList(source.footerLine3Keys), seen);
-	return {
+	return ensureAddedBuiltins({
 		footerHiddenKeys: normalizeFooterKeyList(source.footerHiddenKeys),
 		...ensureBuiltinKeys(line1, line2, line3),
-	};
+	});
 }
 
 const BUILTIN_FOOTER_LABEL: Record<string, string> = {
@@ -156,6 +203,7 @@ const BUILTIN_FOOTER_LABEL: Record<string, string> = {
 	[FOOTER_CACHE_KEY]: "Cache hit rate",
 	[FOOTER_RATE_KEY]: "Output rate",
 	[FOOTER_COST_KEY]: "Session cost",
+	[FOOTER_TOKENS_KEY]: "Tokens used in this conversation",
 	[FOOTER_CWD_KEY]: "Working directory and session name",
 	[FOOTER_GIT_KEY]: "Branch and change stats",
 };

package/extensions/feature/shell/footer.ts

@@ -4,7 +4,7 @@
  * 默认第一行：model  thinking · ██████░░░░ 45%/200k · 󰆼 42% · $0.01 · pi-usage · 其余 line1 芯片
  * 默认第二行：cwd in session ·  branch (+16 −1) · 其余 line2 芯片
  * 第三行：仅当 line3 有可见芯片时出现
- * model / context / cache / rate / cost / cwd / git 与插件芯片同一套排布，可换行、调序、隐藏
+ * model / context / cache / rate / cost / tokens / cwd / git 与插件芯片同一套排布，可换行、调序、隐藏
  *
  *  - line1 短芯片，· 分隔；缓存用 zentui 󰆼，费用 success
  *  - line2 用 zentui 句式 in / on + 
@@ -31,6 +31,7 @@ import {
 	FOOTER_GIT_KEY,
 	FOOTER_MODEL_KEY,
 	FOOTER_RATE_KEY,
+	FOOTER_TOKENS_KEY,
 	PI_USAGE_KEY,
 	isBuiltinFooterKey,
 	isSkippedFooterStatusKey,
@@ -39,6 +40,7 @@ import {
 	type FooterChipLayout,
 } from "./footer-layout.ts";
 import { createGitStatsRefresher, readGitStats, type GitStats } from "./git-stats.ts";
+import { formatSessionTokenTotal, sessionEntryTokens } from "./session-tokens.ts";
 import { MCP_STATUS_KEY, buildMcpChip } from "./mcp-chip.ts";
 import { inputTextIndent } from "./prompt-editor.ts";
 import { currentTtftMs, displayTokenRate, formatTokenRate } from "./token-rate.ts";
@@ -391,7 +393,12 @@ const createCustomFooterFactory =
 		let statsMemoKey = "";
 		let statsMemoAt = 0;
 		let statsMemo:
-			| { contextUsage: ReturnType<typeof ctx.getContextUsage>; cost: number; cachePct: number }
+			| {
+					contextUsage: ReturnType<typeof ctx.getContextUsage>;
+					cost: number;
+					tokens: number;
+					cachePct: number;
+			  }
 			| undefined;
 		const sessionStats = () => {
 			const model = ctx.model;
@@ -404,19 +411,28 @@ const createCustomFooterFactory =
 				return statsMemo;
 			}
 			let cost = 0;
+			let tokens = 0;
 			for (const entry of ctx.sessionManager.getEntries()) {
 				if (entry.type === "message") {
 					const m = entry.message;
 					if (m.role === "assistant") cost += m.usage?.cost?.total || 0;
 					else if (m.role === "toolResult" && m.usage) cost += m.usage.cost?.total || 0;
 				} else if (
-					(entry.type === "branch_summary" || entry.type === "compaction") &&
+					(entry.type === "branch_summary" ||
+						entry.type === "compaction" ||
+						entry.type === "usage") &&
 					entry.usage
 				) {
 					cost += entry.usage.cost?.total || 0;
 				}
+				tokens += sessionEntryTokens(entry);
 			}
-			statsMemo = { contextUsage: ctx.getContextUsage(), cost, cachePct: getCachePct() };
+			statsMemo = {
+				contextUsage: ctx.getContextUsage(),
+				cost,
+				tokens,
+				cachePct: getCachePct(),
+			};
 			statsMemoKey = key;
 			statsMemoAt = performance.now();
 			return statsMemo;
@@ -424,7 +440,7 @@ const createCustomFooterFactory =
 
 		const render = (width: number): string[] => {
 			const model = ctx.model;
-			const { contextUsage, cost, cachePct } = sessionStats();
+			const { contextUsage, cost, tokens, cachePct } = sessionStats();
 			const contextWindow = contextUsage?.contextWindow ?? model?.contextWindow ?? 0;
 			const percent = contextUsage?.percent;
 
@@ -471,6 +487,7 @@ const createCustomFooterFactory =
 			const costChip = costLabel
 				? theme.fg("dim", costLabel) + (usingSubscription ? theme.fg("warning", " sub") : "")
 				: "";
+			const tokensLabel = config.footerSessionTokens ? formatSessionTokenTotal(tokens) : "";
 
 			const gitColor = theme.getThinkingBorderColor("medium");
 			let place = theme.fg("accent", cwdLabel);
@@ -508,6 +525,7 @@ const createCustomFooterFactory =
 				[FOOTER_CACHE_KEY, cacheLabel ? theme.fg("dim", cacheLabel) : ""],
 				[FOOTER_RATE_KEY, rateLabel ? theme.fg("dim", rateLabel) : ""],
 				[FOOTER_COST_KEY, costChip],
+				[FOOTER_TOKENS_KEY, tokensLabel ? theme.fg("dim", tokensLabel) : ""],
 				[FOOTER_CWD_KEY, place],
 				[FOOTER_GIT_KEY, gitChip],
 			]);

package/extensions/feature/shell/session-tokens.ts

@@ -0,0 +1,52 @@
+/**
+ * footer 的会话累计 token：统计 `sessionManager.getEntries()` 里每条条目的 usage。
+ *
+ * 口径是 `usage.totalTokens` 累加（输入 + 输出 + 缓存读 + 缓存写），
+ * 覆盖 assistant / toolResult 消息，以及 compaction、branch_summary 与 `usage` 条目
+ * 自己那次 LLM 调用的开销。整个会话全量累加，不沿当前分支裁剪：
+ * 回退/重发放弃的节点也算进「这次对话烧掉了多少 token」。
+ */
+
+import { formatTokenCount } from "../../utils/format.ts";
+
+type UnknownRecord = Record<string, unknown>;
+
+function asRecord(value: unknown): UnknownRecord | undefined {
+	return value && typeof value === "object" ? (value as UnknownRecord) : undefined;
+}
+
+/** `usage.totalTokens` 优先；缺失时用四项相加，非数字一律忽略。 */
+export function usageTokenTotal(usage: unknown): number {
+	const record = asRecord(usage);
+	if (!record) return 0;
+	const total = record.totalTokens;
+	if (typeof total === "number" && Number.isFinite(total) && total > 0) return total;
+	let sum = 0;
+	for (const key of ["input", "output", "cacheRead", "cacheWrite"] as const) {
+		const part = record[key];
+		if (typeof part === "number" && Number.isFinite(part) && part > 0) sum += part;
+	}
+	return sum;
+}
+
+/** 一条会话条目贡献的 token；user/system/自定义条目不消费 LLM token，返回 0。 */
+export function sessionEntryTokens(entry: unknown): number {
+	const record = asRecord(entry);
+	if (!record) return 0;
+	if (record.type === "message") {
+		const message = asRecord(record.message);
+		if (!message) return 0;
+		if (message.role !== "assistant" && message.role !== "toolResult") return 0;
+		return usageTokenTotal(message.usage);
+	}
+	if (record.type === "compaction" || record.type === "branch_summary" || record.type === "usage") {
+		return usageTokenTotal(record.usage);
+	}
+	return 0;
+}
+
+/** 芯片文案：`∑ 402k`；没有数据返回空串（不占位置）。 */
+export function formatSessionTokenTotal(total: number): string {
+	if (!Number.isFinite(total) || total <= 0) return "";
+	return `∑ ${formatTokenCount(Math.round(total))}`;
+}

package/extensions/renderer/compact-mode.ts

@@ -8,7 +8,8 @@
  * Agent/Task 族：调用只进摘要计数，tool 卡始终折叠（避免 pending→完成高度闪动）。
  * edit/write 与 ask_user_question 留在外层：不进摘要计数，折叠态也单独成行。
  * 外层行一旦在消息里出现，当前回合就地完结（不计静默期），后续消息另起回合：
- * 摘要行因此只折叠连续的一段工具调用，展开/收起不再跨外层行搬位置。
+ * 摘要行因此只折叠连续的一段工具调用。收尾后本回合的外层行排在摘要行之下，
+ * 摘要行覆盖的是它们之前的工具段；回合还在跑时它们留在原位，摘要行钉在可写底缘。
  * 用户消息是回合的硬边界：steer 消息插进回合中间、或上一回合没正文就收尾时，回合
  * 就地收口、后续消息另起一回合。custom 通知/summary 类组件既不是成员也不算外来行，
  * 原地留在两段之间，不打断统计也不被挪位。
@@ -1211,6 +1212,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		liveSlotToolIds: Set<string>;
 		/** 收尾后的静默期截止时间戳；期间仍按围观态渲染，到点才收拢。 */
 		settleUntil?: number;
+		/** 已请求收尾但回合还有活干（消息仍在流式、工具还在跑）：活干完再兑现。 */
+		endRequest?: { endTimestamp?: number };
 		/** 消息已有 toolCall、工具组件还没到：等它一 updateDisplay 就重画槽位。 */
 		pendingLiveTool?: boolean;
 		foldTimer?: ReturnType<typeof setTimeout>;
@@ -1235,6 +1238,19 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	let idleRef: (() => boolean) | undefined = deps.isIdle;
 	let roundTickTimer: ReturnType<typeof setInterval> | undefined;
 
+	/** 本进程见过的回合：活动回合、本次 pass 建起的、收尾静默期的、还挂着尾行的。 */
+	const allRounds = (): CompactRound[] => {
+		const rounds = new Set<CompactRound>();
+		if (activeRound) rounds.add(activeRound);
+		for (const round of liveRounds) rounds.add(round);
+		for (const round of pendingFoldRounds) rounds.add(round);
+		for (const tail of mountedTails) {
+			const round = tail.round as CompactRound | undefined;
+			if (round) rounds.add(round);
+		}
+		return [...rounds];
+	};
+
 	/** 会话是否空闲：回合活性的事实来源，取不到就当没空闲（宁可保留 Running）。 */
 	const sessionIdle = (): boolean => {
 		try {
@@ -1263,14 +1279,23 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		roundTickTimer = undefined;
 	};
 
+	/** 还有回合要盯就得继续 tick：活动回合的时长要跳，挂起的收尾请求要等活干完。 */
+	const roundTickNeeded = (): boolean => {
+		for (const round of allRounds()) {
+			if (round.active || round.endRequest !== undefined) return true;
+		}
+		return false;
+	};
+
 	// 自备 tick：getter 在 render 重算挂钟；兼驱动 Running 扫光（setCompactSummaryActive）。
 	const ensureRoundTick = (): void => {
 		if (roundTickTimer) return;
 		roundTickTimer = setInterval(() => {
-			if (!patch.active || !activeRound?.active) {
+			if (!patch.active || !roundTickNeeded()) {
 				stopRoundTick();
 				return;
 			}
+			for (const round of allRounds()) retryDeferredFinalize(round);
 			settleStrandedRounds();
 			try {
 				// 非 force：保留 fullscreen 布局缓存和差分绘制。
@@ -1302,9 +1327,15 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		value <= Date.now() + 60_000;
 
 	/** 结束回合活动态；不做任何重绘。更晚的消息 timestamp 用来保住回放时长；
-	 * 同一条消息的 timestamp 不动，活回合改用本进程挂钟，避免把历史 timestamp 收到「现在」。 */
-	const finalizeRound = (round: CompactRound, endTimestamp?: number): void => {
+	 * 同一条消息的 timestamp 不动，活回合改用本进程挂钟，避免把历史 timestamp 收到「现在」。
+	 * 回合还有活干时只记下收尾请求：提前翻成 Ran for 会把仍在跑的工具报成已结束。 */
+	const finalizeRound = (round: CompactRound, endTimestamp?: number): boolean => {
 		clearFoldTimer(round);
+		if (roundHasLiveWork(round)) {
+			round.endRequest ??= { endTimestamp };
+			return false;
+		}
+		round.endRequest = undefined;
 		round.active = false;
 		if (round.endedAt === undefined) {
 			let fallback = 0;
@@ -1321,22 +1352,26 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		if (activeRound === round) {
 			activeRound = undefined;
-			deps.query?.setCompactSummaryActive?.(false);
-			stopRoundTick();
+			// 还有回合在跑（另一个活动回合或挂起的收尾）：扫光与 tick 不能跟着一起停。
+			const stillLive = roundTickNeeded();
+			deps.query?.setCompactSummaryActive?.(stillLive);
+			if (!stillLive) stopRoundTick();
 		}
+		return true;
 	};
 
 	/**
 	 * 结束回合活动态；render=true 时走静默期，延迟 FOLD_SETTLE_MS 再收拢。
 	 * 分组语义不受影响：activeRound 立即让位，新消息不会被并进已收尾的回合。
+	 * 还有活干时整段跳过：回合保持 live，等活干完再收尾。
 	 */
 	const endRound = (round: CompactRound, render = false, endTimestamp?: number): void => {
-		if (!render || !round.active) {
-			finalizeRound(round, endTimestamp);
+		const wasActive = round.active;
+		if (!finalizeRound(round, endTimestamp)) return;
+		if (!render || !wasActive) {
 			if (render) renderRound(round);
 			return;
 		}
-		finalizeRound(round, endTimestamp);
 		if (round.foldTimer !== undefined) return;
 		round.settleUntil = Date.now() + FOLD_SETTLE_MS;
 		pendingFoldRounds.add(round);
@@ -1348,10 +1383,23 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}, FOLD_SETTLE_MS);
 	};
 
+	/**
+	 * 兑现挂起的收尾请求：活干完了当场收尾并重绘，摘要行从 Running 翻成 Ran for。
+	 * 挂在工具收尾与 tick 上，不另建定时器。
+	 */
+	const retryDeferredFinalize = (round: CompactRound): boolean => {
+		const request = round.endRequest;
+		if (!request || roundHasLiveWork(round)) return false;
+		endRound(round, true, request.endTimestamp);
+		renderRound(round);
+		return true;
+	};
+
 	/**
 	 * 外层行（edit/write/ask）切出的段落封口：跳过静默期直接定稿。
 	 * 静默期是为"正文 token 先于 toolCall 到达"的双重转场准备的；外层边界
 	 * 出现时摘要段内容已完整，立即收拢让 Ran for 当场落位，槽位卡一并撤走。
+	 * 本回合还有工具在跑时只挂起收尾：摘要行继续 Running，活干完再定稿。
 	 */
 	const sealRound = (round: CompactRound, endTimestamp?: number): void => {
 		finalizeRound(round, endTimestamp);
@@ -1428,6 +1476,24 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		return ids;
 	};
 
+	/**
+	 * 回合还有活干：成员消息仍在流式，或本回合的工具还没拿到最终结果。
+	 * 收尾要么按事实等活干完，要么摘要行就会把仍在跑的工具报成 Ran for。
+	 */
+	const roundHasLiveWork = (round: CompactRound): boolean => {
+		for (const component of round.messages.keys()) {
+			if (component?.isStreaming === true) return true;
+		}
+		const ids = roundToolCallIds(round);
+		if (ids.size === 0) return false;
+		for (const tool of trackedToolComponents) {
+			if (typeof tool?.toolCallId === "string" && ids.has(tool.toolCallId) && isRunningTool(tool)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
 	/**
 	 * 摘要行有东西可汇总才挂：普通工具（edit/write/ask 之外）或非空思考。
 	 * 只剩外层卡的回合不挂——那些卡各自能展开，空摘要点开只会跳位。
@@ -1602,6 +1668,12 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		return tail;
 	};
 
+	/** 它们排在摘要行之下；定位时不把它们当摘要行之前的成员。 */
+	const isOuterToolRow = (ids: Set<string>, value: any): boolean =>
+		typeof value?.toolCallId === "string" &&
+		ids.has(value.toolCallId) &&
+		OUTER_TOOLS.has(String(value.toolName ?? ""));
+
 	/**
 	 * 尾行归位。目标位：活回合（运行中/收尾静默期）且未展开 → 容器最末，
 	 * 计数行钉在 transcript 可写底缘，运行中到达的提示行/custom 条目只能落在
@@ -1621,22 +1693,33 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (!container || !Array.isArray(container.children)) return;
 		tail.container = container;
 		const children = container.children as any[];
+		const ids = roundToolCallIds(round);
+		const live = roundLive(round);
 		const isMember = roundMemberMatcher(round);
+		// 收尾后，本回合的外露行（edit/write/ask）一律排到摘要行之下；
+		// 回合还在跑时它们留在原位，摘要行才能钉在可写底缘。
+		const staysAbove = (value: any): boolean =>
+			isMember(value) && (!isOuterToolRow(ids, value) || live);
 		const current = children.indexOf(tail.host);
 		// 摘尾行前先定目标位，已在位就整段跳过。
 		let last = -1;
 		for (let i = 0; i < children.length; i++) {
-			if (children[i] === tail.host || !isMember(children[i])) continue;
+			if (children[i] === tail.host || !staysAbove(children[i])) continue;
 			last = i;
 		}
-		const pinToEnd = roundLive(round) && round.anchor?.expanded !== true;
+		// 外露行压在摘要行上方时仍要重排：尾行就算在目标位上也得让位。
+		const outerAbove =
+			!live &&
+			current > 0 &&
+			children.some((value: any, index: number) => index < current && isOuterToolRow(ids, value));
+		const pinToEnd = live && round.anchor?.expanded !== true;
 		const desired = pinToEnd || last < 0 ? children.length - 1 : last + 1;
-		if (current === desired) return;
+		if (current === desired && !outerAbove) return;
 		if (current >= 0) children.splice(current, 1);
 		let first = -1;
 		last = -1;
 		for (let i = 0; i < children.length; i++) {
-			if (!isMember(children[i])) continue;
+			if (!staysAbove(children[i])) continue;
 			if (first < 0) first = i;
 			last = i;
 		}
@@ -1646,7 +1729,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			// 用户消息永远留在原地：挪走会把别人的消息挪到用户消息下面去。
 			// custom 通知同理：它是回合内的透明行，不被统计也不挪位。
 			if (
-				isMember(children[i]) ||
+				staysAbove(children[i]) ||
 				isUserMessageComponent(children[i]) ||
 				isTransparentComponent(children[i])
 			) {
@@ -1681,8 +1764,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	 */
 	const syncTailForTool = (toolCallId: string): void => {
 		if (!toolCallId) return;
-		for (const round of [activeRound, ...pendingFoldRounds]) {
-			if (!round || !roundToolCallIds(round).has(toolCallId)) continue;
+		for (const round of allRounds()) {
+			if (!roundToolCallIds(round).has(toolCallId)) continue;
+			// 工具收尾后活干完了：挂起的收尾请求当场兑现，摘要行立刻翻成 Ran for。
+			if (retryDeferredFinalize(round)) return;
 			// 槽位是在消息更新时画的，当时工具组件还不存在：组件到了就补上。
 			// 参数流式更新也走这里，槽位卡跟着换内容。
 			if (round.pendingLiveTool || roundLive(round)) renderRound(round);
@@ -2288,6 +2373,14 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (hasText) {
 			const round = roundByComponent.get(this);
 			const previousMessage = round?.messages.get(this);
+			// 消息还在流式时正文不是回合边界：同一条消息常常先出正文、再出 toolCall，
+			// 这时收尾会在下一帧另起一条摘要行，一段工作被拆成两条。
+			// 正文先按成员渲染，等消息收尾（isStreaming=false）再判。
+			if (round && previousMessage && self.isStreaming === true) {
+				round.messages.set(this, message);
+				renderRound(round);
+				return undefined;
+			}
 			if (round && previousMessage && (round.anchor !== this || round.messages.size > 1)) {
 				// 最终回答开始后，当前组件恢复原生文本；它已完成的 thinking
 				// 留在上一轮摘要中，避免再次生成独立 Thought 行。

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

@@ -84,7 +84,7 @@ export async function executeWriteWithMetadata(
 	// 覆盖层只揽写前快照：路径解析（含 Windows 下 /mnt/<drive>、/cygdrive/<drive> 转换）、
 	// 目录创建、mutation queue 与错误文案全交回 pi 官方 write，参数与官方逐字一致。
 	const definition = createWriteToolDefinition(cwd, {
-		operations: writeSnapshotOperations(store, toolCallId),
+		operations: writeSnapshotOperations(store, toolCallId, signal),
 	}) as any;
 	try {
 		await definition.execute(toolCallId, params, signal, undefined, { cwd });
@@ -101,12 +101,16 @@ export async function executeWriteWithMetadata(
 function writeSnapshotOperations(
 	store: WriteExecutionMetadataStore,
 	toolCallId: string,
+	signal: AbortSignal | undefined,
 ): WriteOperations {
 	return {
 		mkdir: (dir) => mkdir(dir, { recursive: true }).then(() => {}),
 		writeFile: async (absolutePath, content) => {
 			store.delete(toolCallId);
 			const metadata = await capturePreviousContent(absolutePath);
+			// 官方只在进 operations 之前查 abort（紧接着这次调用，中间没有 await），
+			// 快照读盘期间的取消只能在这里补：抛错，不写文件，也不留 metadata。
+			if (signal?.aborted) throw new Error("Operation aborted");
 			await writeFile(absolutePath, content, "utf8");
 			// 写已生效：后续 abort 不得把这次写报成失败，快照先落下。
 			store.set(toolCallId, metadata);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "1.0.12",
+	"version": "1.0.14",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",