pi-cc-extensions 1.0.0 → 1.0.1

package/README.en.md

@@ -81,6 +81,8 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 
   // footer
   "enableCustomFooter": true, // custom status bar
+  "footerTokenRate": true, // output rate chip; false hides it
+  "footerTokenRateMode": "average", // average: whole-prompt avg; live: trailing 1s rate
   "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

package/README.md

@@ -63,7 +63,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "expandedCardBackground": "userMessageBg", // 展开卡背景槽位；userMessageBg 与用户消息同色，toolPendingBg 为中性灰
   "toolLabelClip": 0,                      // 工具摘要 path/command 折叠字符数；0 = 按可用宽度
   "showStartupHeader": true,               // 启动头（logo + tips）开关
-  "stickyUserMessage": true,              // fullscreen：userMessage 正文首行滚出视口上沿后钉住，直到下一条指令接手
+  "stickyUserMessage": true,               // fullscreen：userMessage 正文首行滚出视口上沿后钉住，直到下一条指令接手
 
   // diff
   "diffViewMode": "auto",                  // 布局：auto / split / unified
@@ -81,6 +81,8 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // footer
   "enableCustomFooter": true,              // 自定义状态栏
+  "footerTokenRate": true,                  // 输出速率芯片；false 隐藏
+  "footerTokenRateMode": "average",         // average：整段指令平均（avg）；live：最近 1 秒瞬时（live）
   "footerCurrency": "USD",                 // 底栏费用的显示币种
   "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
   "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本

package/extensions/config/config.ts

@@ -14,6 +14,7 @@ export type CompactStyleMode = "on" | "compact" | "off";
 export type DiffViewMode = "auto" | "split" | "unified";
 export type DiffIndicatorMode = "bars" | "classic" | "none";
 export type FooterGitStatsMode = "working" | "branch";
+export type FooterTokenRateMode = "average" | "live";
 
 export interface ToolDisplayConfig {
 	diffViewMode: DiffViewMode;
@@ -74,6 +75,10 @@ export type Config = {
 	enableWorkingMessage: boolean;
 	enableAliases: boolean;
 	enableCustomFooter: boolean;
+	/** footer 输出速率芯片。关则不显示。 */
+	footerTokenRate: boolean;
+	/** average：整段指令墙钟平均；live：最近 1 秒瞬时速率，空档回退平均。 */
+	footerTokenRateMode: FooterTokenRateMode;
 	/** ISO 4217 显示币种。USD 时不换算。 */
 	footerCurrency: string;
 	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
@@ -93,6 +98,7 @@ const LEGACY_CONFIG_PATH = join(AGENT_DIR, "claude-code-style.json");
 export const DIFF_VIEW_MODES: DiffViewMode[] = ["auto", "split", "unified"];
 export const DIFF_INDICATOR_MODES: DiffIndicatorMode[] = ["bars", "classic", "none"];
 export const FOOTER_GIT_STATS_MODES: FooterGitStatsMode[] = ["working", "branch"];
+export const FOOTER_TOKEN_RATE_MODES: FooterTokenRateMode[] = ["average", "live"];
 export const DIFF_SPLIT_MIN_WIDTH_VALUES = ["80", "100", "120", "140", "160", "180"];
 export const DIFF_COLLAPSED_LINES_VALUES = ["0", "12", "24", "36", "48", "80", "120"];
 /** Write collapsed presets. 0 = stats only (`+N -0` + expand hint). */
@@ -163,6 +169,8 @@ export const DEFAULT_CONFIG: Config = {
 	enableWorkingMessage: true,
 	enableAliases: true,
 	enableCustomFooter: true,
+	footerTokenRate: true,
+	footerTokenRateMode: "average",
 	footerCurrency: "USD",
 	footerCurrencyRate: null,
 	footerNerdIcons: true,
@@ -293,6 +301,12 @@ export function normalizeConfig(input: unknown): Config {
 		enableWorkingMessage: source.enableWorkingMessage !== false,
 		enableAliases: source.enableAliases !== false,
 		enableCustomFooter: source.enableCustomFooter !== false,
+		footerTokenRate: source.footerTokenRate !== false,
+		footerTokenRateMode: pickEnum(
+			source.footerTokenRateMode,
+			FOOTER_TOKEN_RATE_MODES,
+			DEFAULT_CONFIG.footerTokenRateMode,
+		),
 		footerCurrency: normalizeCurrency(source.footerCurrency),
 		footerCurrencyRate: normalizeFooterCurrencyRate(source.footerCurrencyRate),
 		footerNerdIcons: source.footerNerdIcons !== false,
@@ -356,6 +370,8 @@ export function formatConfigStatus(source: Config = config): string {
 		`workingMsg=${source.enableWorkingMessage ? "on" : "off"}`,
 		`aliases=${source.enableAliases ? "on" : "off"}`,
 		`footer=${source.enableCustomFooter ? "on" : "off"}`,
+		`footerTokenRate=${source.footerTokenRate ? "on" : "off"}`,
+		`footerTokenRateMode=${source.footerTokenRateMode}`,
 		`footerCurrency=${source.footerCurrency}`,
 		`footerRate=${source.footerCurrencyRate ?? "-"}`,
 		`footerIcons=${source.footerNerdIcons ? "nerd" : "plain"}`,

package/extensions/config/panel.ts

@@ -43,6 +43,7 @@ import {
 	EXPANDED_OUTPUT_MAX_LINES_VALUES,
 	EXPANDED_PREVIEW_MAX_LINES_VALUES,
 	FOOTER_GIT_STATS_MODES,
+	FOOTER_TOKEN_RATE_MODES,
 	formatExcludeRenderers,
 	getCompactThinkingConfig,
 	pickPositiveInt,
@@ -58,6 +59,7 @@ import {
 	type DiffIndicatorMode,
 	type DiffViewMode,
 	type FooterGitStatsMode,
+	type FooterTokenRateMode,
 } from "./config.ts";
 
 /** renderer 注入的渲染副作用，面板自身不触碰渲染状态。 */
@@ -87,6 +89,18 @@ function customFooterDescription(enabled: boolean): string {
 	return "Custom status bar with model, context, cache, cost, git, and plugin chips.";
 }
 
+function footerTokenRateDescription(enabled: boolean): string {
+	return enabled
+		? "Output rate chip after the cache hit rate. Turn off to hide it."
+		: "Output rate chip hidden.";
+}
+
+function footerTokenRateModeDescription(mode: FooterTokenRateMode): string {
+	return mode === "live"
+		? "Sliding 1s rate while generating (live). Tool waits are excluded. Falls back to the run average between chunks and after the prompt."
+		: "Average over the whole user prompt (avg), including tool waits. Stays until the next prompt.";
+}
+
 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."
@@ -730,6 +744,20 @@ export async function showCcstylePanel(
 			currentValue: config.footerGitStatsMode,
 			values: FOOTER_GIT_STATS_MODES,
 		};
+		const footerTokenRateSetting = {
+			id: "footerTokenRate",
+			label: "Token rate",
+			description: footerTokenRateDescription(config.footerTokenRate),
+			currentValue: config.footerTokenRate ? "on" : "off",
+			values: ["on", "off"],
+		};
+		const footerTokenRateModeSetting = {
+			id: "footerTokenRateMode",
+			label: "Token rate mode",
+			description: footerTokenRateModeDescription(config.footerTokenRateMode),
+			currentValue: config.footerTokenRateMode,
+			values: FOOTER_TOKEN_RATE_MODES,
+		};
 		const pluginChipsSetting = {
 			id: "footerPluginChips",
 			label: "Plugin chips",
@@ -802,6 +830,23 @@ export async function showCcstylePanel(
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
+			if (id === "footerTokenRate") {
+				const enabled = value === "on";
+				updateConfig({ footerTokenRate: enabled });
+				footerTokenRateSetting.currentValue = enabled ? "on" : "off";
+				footerTokenRateSetting.description = footerTokenRateDescription(enabled);
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
+			if (id === "footerTokenRateMode") {
+				updateConfig({ footerTokenRateMode: value as FooterTokenRateMode });
+				footerTokenRateModeSetting.currentValue = config.footerTokenRateMode;
+				footerTokenRateModeSetting.description = footerTokenRateModeDescription(
+					config.footerTokenRateMode,
+				);
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
 			if (id === "footerNerdIcons") {
 				const enabled = value === "on";
 				updateConfig({ footerNerdIcons: enabled });
@@ -1020,6 +1065,8 @@ export async function showCcstylePanel(
 				label: "Footer",
 				items: [
 					customFooterSetting,
+					footerTokenRateSetting,
+					footerTokenRateModeSetting,
 					footerCurrencySetting,
 					footerCurrencyRateSetting,
 					footerNerdIconsSetting,

package/extensions/feature/shell/footer.ts

@@ -21,6 +21,7 @@ import { pathToFileURL } from "node:url";
 import { config } from "../../config/config.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
 import { formatFooterCost } from "./footer-currency.ts";
+import { formatTokenCount } from "../../utils/format.ts";
 import {
 	PI_USAGE_KEY,
 	isSkippedFooterStatusKey,
@@ -30,6 +31,7 @@ import {
 } from "./footer-layout.ts";
 import { createGitStatsRefresher, readGitStats, type GitStats } from "./git-stats.ts";
 import { MCP_STATUS_KEY, buildMcpChip } from "./mcp-chip.ts";
+import { currentTtftMs, displayTokenRate, formatTokenRate } from "./token-rate.ts";
 
 export { parseGitStats } from "./git-stats.ts";
 
@@ -51,6 +53,46 @@ export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string;
 		: { git: "", cache: "", mcp: "" };
 }
 
+/** 思考等级的填充圆标：等级越高填得越满。 */
+const EFFORT_SYMBOL: Record<string, string> = {
+	minimal: "\u25cc",
+	low: "\u25cb",
+	medium: "\u25d4",
+	high: "\u25d1",
+	xhigh: "\u25d5",
+	max: "\u25cf",
+};
+
+/** 模型名后直接接圆标和等级，中间不用分隔点。 */
+export function modelChip(
+	theme: { fg: (color: string, text: string) => string },
+	modelLabel: string,
+	level: string,
+	thinkingColor: (text: string) => string,
+): string {
+	const symbol = EFFORT_SYMBOL[level];
+	if (!symbol) return theme.fg("accent", modelLabel);
+	return `${theme.fg("accent", modelLabel)} ${thinkingColor(symbol)} ${theme.fg("dim", level)}`;
+}
+
+/** git 状态符号按职能分色：冲突/落后 error，修改 warning，未跟踪 muted，领先 success。 */
+export function colorGitStatus(
+	theme: { fg: (color: string, text: string) => string },
+	status: string,
+): string {
+	let out = "";
+	let color = "dim";
+	for (const ch of status) {
+		if (ch === "=" || ch === "\u21e3") color = "error";
+		else if (ch === "!") color = "warning";
+		else if (ch === "?") color = "muted";
+		else if (ch === "\u21e1") color = "success";
+		else if (!/[0-9]/.test(ch)) color = "dim";
+		out += theme.fg(color, ch);
+	}
+	return out;
+}
+
 type XaiFooterReport = {
 	buckets?: Array<{
 		id?: string;
@@ -303,13 +345,7 @@ const createCustomFooterFactory =
 			tui.requestRender();
 		});
 
-		const fmt = (n: number): string => {
-			if (n < 1000) return `${n}`;
-			if (n < 10000) return `${(n / 1000).toFixed(1)}k`;
-			if (n < 1000000) return `${Math.round(n / 1000)}k`;
-			if (n < 10000000) return `${(n / 1000000).toFixed(1)}M`;
-			return `${Math.round(n / 1000000)}M`;
-		};
+		const fmt = formatTokenCount;
 
 		// ---- pi-cc-status 风格：上下文条形图 ----
 		const BAR_WIDTH = 10;
@@ -400,6 +436,14 @@ const createCustomFooterFactory =
 			const glyphs = footerGlyphs(config.footerNerdIcons);
 			const cacheLabel =
 				cachePct > 0 ? `${glyphs.cache ? `${glyphs.cache} ` : ""}${Math.floor(cachePct)}%` : "";
+			const rateLabel = config.footerTokenRate
+				? formatTokenRate(
+						displayTokenRate(config.footerTokenRateMode),
+						currentTtftMs(),
+						config.footerTokenRateMode,
+					)
+				: "";
+			const rateChip = rateLabel ? theme.fg("dim", rateLabel) : "";
 			const costChip =
 				cost || usingSubscription
 					? theme.fg(
@@ -408,10 +452,10 @@ const createCustomFooterFactory =
 						) + (usingSubscription ? theme.fg("warning", " sub") : "")
 					: "";
 			const line1 = joinChips([
-				theme.fg("accent", modelLabel),
-				model?.reasoning ? thinkingColor(thinkingLevelStr) : "",
+				modelChip(theme, modelLabel, model?.reasoning ? thinkingLevelStr : "", thinkingColor),
 				barGauge(percent ?? 0) + theme.fg("dim", ` ${pctLabel}/${fmt(contextWindow)}`),
 				cacheLabel ? theme.fg("dim", cacheLabel) : "",
+				rateChip,
 				costChip,
 				...line1Plugins,
 			]);
@@ -427,7 +471,7 @@ const createCustomFooterFactory =
 				const s = gitStats;
 				let stats = "";
 				if (s && s.status)
-					stats = theme.fg("dim", " [") + gitColor(s.status) + theme.fg("dim", "]");
+					stats = theme.fg("dim", " [") + colorGitStatus(theme, s.status) + theme.fg("dim", "]");
 				if (s && (s.add || s.del))
 					stats +=
 						theme.fg("dim", "(") +

package/extensions/feature/shell/token-rate.ts

@@ -0,0 +1,192 @@
+/**
+ * footer 输出速率的共享状态：working-message 负责采集，footer 负责显示。
+ *
+ * average：一次用户指令的墙钟平均（工具等待计入分母），显示 `avg`。
+ * live：最近 1 秒的瞬时速率，生成期暂停时钟，显示 `live`；指令结束定格为整段平均。
+ * token 与 working-message 同源：优先 provider `usage.output`，否则按 delta 增量估算
+ * （CJK 1 token，其余 chars/4）。provider 值回填到本段消息窗口。
+ * Pi 的 turn 是单次 assistant 消息，工具调用结束会开新 turn。token 跨 turn 累加，
+ * 计时与 TTFT 直到下一条用户指令才重置。
+ * TTFT：用户指令开始到第一个内容块（text/thinking/toolcall）开始的毫秒数，
+ * 同一指令内只记第一次，定格后保留到下一条指令覆盖。
+ */
+
+export type TokenRateMode = "average" | "live";
+
+const LIVE_WINDOW_MS = 1_000;
+const MIN_SPAN_MS = 250;
+const CJK_CHARS =
+	/[\u3000-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uac00-\ud7af\uf900-\ufaff\uff00-\uffef]/g;
+
+interface TokenSample {
+	t: number;
+	cum: number;
+}
+
+let runStartTime = 0;
+let carriedTokens = 0;
+let currentTokens = 0;
+let pauseStartedAt = 0;
+/** 并行工具调用数；>0 时瞬时采样暂停。 */
+let activeTools = 0;
+let lastRate = 0;
+let lastLiveRate = 0;
+let firstTokenAt = 0;
+let samples: TokenSample[] = [];
+let usageAnchorTime = 0;
+let usageAnchorTokens = 0;
+let countedUsage = 0;
+
+/** 新的用户指令：重置计时、累计 token、定格值与 TTFT。 */
+export function resetTokenRate(startAt = 0): void {
+	runStartTime = startAt;
+	carriedTokens = 0;
+	currentTokens = 0;
+	pauseStartedAt = 0;
+	activeTools = 0;
+	lastRate = 0;
+	lastLiveRate = 0;
+	firstTokenAt = 0;
+	samples = [];
+	usageAnchorTime = 0;
+	usageAnchorTokens = 0;
+	countedUsage = 0;
+}
+
+/**
+ * 一段 assistant 回复结束：保留计时与 TTFT，把本段已计 token 结算进累计。
+ * 下一段的 token 从 0 重计，采样时加回来。
+ */
+export function carryTokenRate(): void {
+	if (currentTokens > 0) carriedTokens += currentTokens;
+	currentTokens = 0;
+	countedUsage = 0;
+}
+
+/** 工具开始执行：计数 +1，第一个工具才真正暂停瞬时采样。 */
+export function pauseTokenRate(now = Date.now()): void {
+	if (!runStartTime) return;
+	activeTools += 1;
+	if (activeTools === 1 && !pauseStartedAt) pauseStartedAt = now;
+}
+
+/** 工具执行结束：计数 -1，最后一个工具结束才恢复采样。 */
+export function resumeTokenRate(): void {
+	activeTools = Math.max(0, activeTools - 1);
+	if (activeTools === 0 && pauseStartedAt) {
+		pauseStartedAt = 0;
+	}
+}
+
+/** 本指令第一个内容块开始时调用；同一指令后续消息不覆盖。 */
+export function markFirstToken(now = Date.now()): void {
+	if (runStartTime && !firstTokenAt) firstTokenAt = now;
+}
+
+function estimateTokens(text: string): number {
+	if (!text) return 0;
+	const cjk = text.match(CJK_CHARS)?.length ?? 0;
+	return Math.ceil(cjk + (text.length - cjk) / 4);
+}
+
+function pushSample(time: number, cum: number): void {
+	samples.push({ t: time, cum });
+	const cutoff = time - LIVE_WINDOW_MS;
+	while (samples.length > 1 && samples[0]!.t < cutoff) samples.shift();
+}
+
+function updateRates(now: number): void {
+	const total = carriedTokens + currentTokens;
+	const elapsed = (now - runStartTime) / 1000;
+	if (elapsed > 0) lastRate = total / elapsed;
+	if (samples.length < 2) return;
+	const first = samples[0]!;
+	const last = samples[samples.length - 1]!;
+	const span = last.t - first.t;
+	if (span >= MIN_SPAN_MS) {
+		lastLiveRate = ((last.cum - first.cum) * 1000) / span;
+	}
+}
+
+/** 每个文本增量采样一次。工具暂停期的增量只累计 token，不进窗口。 */
+export function sampleTokenDelta(delta: string, now = Date.now()): void {
+	if (!runStartTime) return;
+	const added = estimateTokens(delta);
+	if (added <= 0) return;
+	currentTokens += added;
+	if (pauseStartedAt) return;
+	pushSample(now, carriedTokens + currentTokens);
+	updateRates(now);
+}
+
+/**
+ * 记录本段 provider `usage.output`。usage 按锚点摊回窗口：
+ * 首次报告从消息起点铺到现在，之后每次把增量摊在上次报告之后。
+ */
+export function recordProviderUsage(output: number, now = Date.now()): void {
+	if (!runStartTime || output <= 0) return;
+	const firstReport = countedUsage === 0;
+	const jump = output - countedUsage;
+	countedUsage = output;
+	// provider 是权威计数；首次报告以它为准，之后增量接管。
+	currentTokens = output;
+	if (firstReport) {
+		samples = samples.filter((sample) => sample.t < usageAnchorTime);
+		pushSample(usageAnchorTime, carriedTokens + usageAnchorTokens);
+	}
+	const span = Math.max(now - usageAnchorTime, 1);
+	const count = Math.min(Math.max(Math.ceil(jump / 16), 1), 32);
+	const base = firstReport
+		? carriedTokens + usageAnchorTokens
+		: carriedTokens + currentTokens - jump;
+	for (let i = 1; i <= count; i++) {
+		pushSample(usageAnchorTime + (span * i) / count, base + (jump * i) / count);
+	}
+	usageAnchorTime = now;
+	usageAnchorTokens = currentTokens;
+	updateRates(now);
+}
+
+/** 本段消息开始：重置 provider 锚点。 */
+export function startMessageSegment(now = Date.now()): void {
+	if (!runStartTime) return;
+	usageAnchorTime = now;
+	usageAnchorTokens = currentTokens;
+	countedUsage = 0;
+}
+
+/** 整段指令的累计 token 数：已结转段 + 当前段。 */
+export function totalTokens(): number {
+	return carriedTokens + currentTokens;
+}
+
+/** average 的当前值：指令中为实时平均，指令外为上一段定格值。 */
+export function currentTokenRate(): number {
+	return lastRate;
+}
+
+/**
+ * 按显示模式取值。live 在生成中取窗口速率，窗口数据不足或指令结束后回到整段平均。
+ * 工具暂停期间时钟不动，显示上一条窗口值。
+ */
+export function displayTokenRate(mode: TokenRateMode): number {
+	if (mode === "live" && samples.length >= 2 && lastLiveRate > 0) {
+		return lastLiveRate;
+	}
+	return lastRate;
+}
+
+/** 本指令 TTFT（毫秒）；未出首 token 或无活动指令返回 0。定格后保留。 */
+export function currentTtftMs(): number {
+	if (!runStartTime || !firstTokenAt) return 0;
+	return Math.max(0, firstTokenAt - runStartTime);
+}
+
+/** `avg 1.2k tok/s (TTFT: 812ms)`；无数据显示空串，未出首 token 时无括号段。 */
+export function formatTokenRate(rate: number, ttftMs = 0, mode: TokenRateMode = "average"): string {
+	if (!Number.isFinite(rate) || rate <= 0) return "";
+	const value = rate >= 1000 ? `${(rate / 1000).toFixed(1)}k` : `${Math.round(rate)}`;
+	const ttft = Number.isFinite(ttftMs) && ttftMs > 0 ? ` (TTFT: ${Math.round(ttftMs)}ms)` : "";
+	const label = mode === "live" ? "live" : "avg";
+	return `${label} ${value} tok/s${ttft}`;
+}

package/extensions/feature/shell/working-message.ts

@@ -5,43 +5,28 @@ import {
 	getToolMouseTui,
 	isFullscreenAtBottom,
 } from "../../renderer/mouse/scroll.ts";
-import { formatDuration } from "../../utils/format.ts";
+import { formatDuration, formatTokenCount } from "../../utils/format.ts";
+import {
+	resetTokenRate,
+	carryTokenRate,
+	pauseTokenRate,
+	resumeTokenRate,
+	markFirstToken,
+	sampleTokenDelta,
+	recordProviderUsage,
+	startMessageSegment,
+	totalTokens,
+} from "./token-rate.ts";
 
 const REFRESH_INTERVAL_MS = 1_000;
 /** Elapsed time is only shown once the turn has run this long. */
 const SHOW_TIMER_AFTER_MS = 3_000;
 
-function formatCount(value: number): string {
-	return new Intl.NumberFormat("en-US").format(value);
-}
-
-type ContentBlock = {
-	type?: unknown;
-	text?: unknown;
-	thinkingSignature?: { body?: unknown };
-};
-
 type StreamMessage = {
 	content?: unknown;
 	usage?: { output?: unknown };
 };
 
-/** 每个 content index 的可见文本/思考长度；无对应块的 index 保持稀疏洞。 */
-function textBlockLengths(message: StreamMessage): number[] {
-	const content = message.content;
-	if (!Array.isArray(content)) return [];
-	const lengths: number[] = [];
-	for (let index = 0; index < content.length; index++) {
-		const block = content[index] as ContentBlock;
-		if (block?.type === "text" && typeof block.text === "string") {
-			lengths[index] = block.text.length;
-		} else if (block?.type === "thinking" && block.thinkingSignature?.body) {
-			lengths[index] = (block.thinkingSignature.body as string).length;
-		}
-	}
-	return lengths;
-}
-
 function outputUsage(message: StreamMessage): number {
 	const value = Number(message?.usage?.output);
 	return Number.isFinite(value) && value > 0 ? Math.round(value) : 0;
@@ -55,39 +40,24 @@ type WorkingUi = {
  * Extend Pi's footer working row while preserving its spinner and "Working...":
  * `⠋ Working... (↓ 1,234 tokens · 12s)`
  *
- * Live tokens use the same chars/4 estimate as pi-claude-code-ui, then switch to
- * provider `usage.output` whenever the stream exposes an actual count.
- */
+ * token 数直接读 token-rate 的累计（估算 → provider usage 同源），不再本地重数。 */
 export default function (pi: ExtensionAPI): void {
 	let turnActive = false;
 	let agentStartTime = 0;
 	let turnStartTime = 0;
-	let responseLength = 0;
-	let responseTextBlockLengths: number[] = [];
-	let providerOutputTokens = 0;
+	/** 当前用户指令的起点；工具调用后的 turn 复用它，直到下一条指令。 */
+	let rateRunStartTime = 0;
 	let refreshTimer: ReturnType<typeof setTimeout> | null = null;
 	let lastMessage: string | null = null;
 	let activeCtx: { ui: WorkingUi | undefined; hasUI: boolean } | null = null;
 
 	function tokenCount(): number {
-		return providerOutputTokens || Math.max(0, Math.round(responseLength / 4));
-	}
-
-	function setTextBlockLength(index: number, length: number): void {
-		const previous = responseTextBlockLengths[index] ?? 0;
-		responseTextBlockLengths[index] = Math.max(0, length);
-		responseLength = Math.max(0, responseLength + responseTextBlockLengths[index] - previous);
-	}
-
-	function resetResponseTracking(message?: StreamMessage): void {
-		responseTextBlockLengths = message ? textBlockLengths(message) : [];
-		responseLength = responseTextBlockLengths.reduce((sum, length) => sum + length, 0);
-		providerOutputTokens = message ? outputUsage(message) : 0;
+		return totalTokens();
 	}
 
 	function updateProviderUsage(message: StreamMessage): void {
 		const output = outputUsage(message);
-		if (output > 0) providerOutputTokens = output;
+		if (output > 0) recordProviderUsage(output);
 	}
 
 	/**
@@ -103,7 +73,7 @@ export default function (pi: ExtensionAPI): void {
 	function buildWorkingMessage(): string {
 		const parts: string[] = [];
 		const tokens = tokenCount();
-		if (tokens > 0) parts.push(`↓ ${formatCount(tokens)} tokens`);
+		if (tokens > 0) parts.push(`↓ ${formatTokenCount(tokens)} tokens`);
 		// compact 活动回合且已滚出摘要行：直接用摘要行文案（自带回合时长，不叠 agent 计时）。
 		const compactStatus = compactMirrorText();
 		if (compactStatus) return [compactStatus, ...parts].join(" · ");
@@ -179,7 +149,7 @@ export default function (pi: ExtensionAPI): void {
 		stopRefreshLoop();
 		agentStartTime = 0;
 		turnStartTime = 0;
-		resetResponseTracking();
+		// 不重置 token-rate：footer 定格显示上一回合速率
 		restoreDefaultWorkingMessage();
 	}
 
@@ -187,12 +157,19 @@ export default function (pi: ExtensionAPI): void {
 		if (!agentStartTime) agentStartTime = Date.now();
 	});
 
-	pi.on("turn_start", async (_event, ctx) => {
+	pi.on("turn_start", async (event, ctx) => {
 		turnActive = true;
 		activeCtx = ctx;
-		turnStartTime = Date.now();
+		// 事件时间戳在 handler 之前产生；用 Date.now() 会和紧随的采样落在同一毫秒，分母变成 0。
+		turnStartTime = event?.timestamp || Date.now();
 		if (!agentStartTime) agentStartTime = turnStartTime;
-		resetResponseTracking();
+		// 工具调用后的 turn 属于同一条用户指令：计时、TTFT 与累计 token 保持到下一条指令。
+		// 速率起点用本指令第一个 turn 的时间戳；before_agent_start 只当指令 id。
+		if (rateRunStartTime !== agentStartTime) {
+			rateRunStartTime = agentStartTime;
+			resetTokenRate(turnStartTime);
+		}
+		startMessageSegment(turnStartTime);
 		syncWorkingMessage(true);
 		scheduleRefreshTick();
 	});
@@ -203,24 +180,25 @@ export default function (pi: ExtensionAPI): void {
 		if (!evt) return;
 
 		if (evt.type === "start") {
-			resetResponseTracking(evt.partial);
-		} else if (evt.type === "thinking_start" || evt.type === "text_start") {
-			setTextBlockLength(evt.contentIndex, 0);
+			// 新 assistant 消息起点：速率分段已在 turn_start 处理。
+		} else if (
+			evt.type === "thinking_start" ||
+			evt.type === "text_start" ||
+			evt.type === "toolcall_start"
+		) {
+			// TTFT 的首块含 toolcall_start：模型直接发起 tool call（thinking/text 省略）时也算首 token
+			markFirstToken();
+			startMessageSegment();
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "thinking_delta" || evt.type === "text_delta") {
-			const add = typeof evt.delta === "string" ? evt.delta.length : 0;
-			setTextBlockLength(evt.contentIndex, (responseTextBlockLengths[evt.contentIndex] ?? 0) + add);
+			if (typeof evt.delta === "string") sampleTokenDelta(evt.delta);
 			updateProviderUsage(evt.partial);
-		} else if (evt.type === "text_end") {
-			setTextBlockLength(
-				evt.contentIndex,
-				typeof evt.content === "string" ? evt.content.length : 0,
-			);
+		} else if (evt.type === "text_end" || evt.type === "thinking_end") {
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "done") {
-			resetResponseTracking(evt.message);
+			updateProviderUsage(evt.message);
 		} else if (evt.type === "error") {
-			resetResponseTracking(evt.error);
+			updateProviderUsage(evt.error);
 		} else {
 			updateProviderUsage(evt.partial);
 		}
@@ -229,11 +207,20 @@ export default function (pi: ExtensionAPI): void {
 		scheduleRefreshTick();
 	});
 
+	pi.on("tool_execution_start", async () => {
+		pauseTokenRate();
+	});
+
+	pi.on("tool_execution_end", async () => {
+		resumeTokenRate();
+	});
+
 	pi.on("turn_end", async (_event, ctx) => {
 		turnActive = false;
 		activeCtx = ctx;
 		stopRefreshLoop();
-		resetResponseTracking();
+		// 本段 token 结转进累计，下一段 turn 继续累加；此处不清速率。
+		carryTokenRate();
 		// No completion message: return immediately to Pi's default idle state.
 		restoreDefaultWorkingMessage();
 	});

package/extensions/renderer/tool/grouping.ts

@@ -34,11 +34,9 @@ import {
 	type ToolCallSummary,
 } from "./names.ts";
 import {
-	collapsedResultSummary,
 	formatToolDuration,
 	headTruncateToWidth,
 	isLiveToolCall,
-	textFromResult,
 	toolViewportWidth,
 } from "./result.ts";
 import {
@@ -263,8 +261,8 @@ function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
 }
 
 /**
- * 组内 shell 行的尾巴：只报耗时（`· 12.4s`）。行数是冗余信息，展开就能看到；
- * 失败另报错误首行，那条不该只在展开后可见。
+ * 组内 shell 行的尾巴：只报耗时（`· 12.4s`）。输出和错误正文都在展开后看；
+ * 失败靠行首的 ✗，组头另有 failed 计数。
  * 耗时取 pi 记在结果上的 durationMs（单卡渲染上下文里的同一个值），运行中还拿不到就不报。
  */
 function shellResultTail(
@@ -273,23 +271,12 @@ function shellResultTail(
 	toolStatus: ToolStatus,
 ): string {
 	if (!SHELL_TOOL_NAMES.has(toolName(tool)) || toolStatus === "pending" || !tool?.result) return "";
-	const isError = tool.result?.isError === true;
-	// 失败报错误首行（不该只在展开后可见）；成功只报耗时，行数是冗余信息。
-	const failure = isError
-		? collapsedResultSummary({
-				result: tool.result,
-				toolName: toolName(tool),
-				text: textFromResult(tool.result),
-				isError: true,
-			})
-		: "";
 	const durationMs = tool.result?.durationMs;
 	const duration =
 		typeof durationMs === "number" && Number.isFinite(durationMs) && durationMs >= 0
 			? formatToolDuration(durationMs)
 			: "";
-	const tail = [failure, duration].filter(Boolean).join(" · ");
-	return tail ? ` ${fg("dim", `· ${tail}`)}` : "";
+	return duration ? ` ${fg("dim", `· ${duration}`)}` : "";
 }
 
 /**

package/extensions/utils/format.ts

@@ -1,6 +1,15 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { sanitizeToolResultText } from "./tool-result-sanitize.ts";
 
+/** token/计数缩写：<1k 原数，<1M 用 k，≥1M 用 M。footer 与 working message 共用。 */
+export function formatTokenCount(value: number): string {
+	if (value < 1000) return `${value}`;
+	if (value < 10_000) return `${(value / 1000).toFixed(1)}k`;
+	if (value < 1_000_000) return `${Math.round(value / 1000)}k`;
+	if (value < 10_000_000) return `${(value / 1_000_000).toFixed(1)}M`;
+	return `${Math.round(value / 1_000_000)}M`;
+}
+
 /** 毫秒 → "1h 2m 3s"/"2m 3s"/"3s"；低于 1 秒返回 ""（省略）。 */
 export function formatDuration(ms: number): string {
 	const totalSec = Math.floor(ms / 1000);

package/package.json

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