@herbertgao/pi-extensions 2026.10.4 → 2026.10.5

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/shell/footer.ts

@@ -14,13 +14,14 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { execFile } from "node:child_process";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 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,
@@ -28,7 +29,11 @@ import {
 	visibleFooterPluginTexts,
 	type FooterChipLayout,
 } 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";
 
 const GIT_REFRESH_INTERVAL_MS = 10_000;
 const USAGE_REFRESH_INTERVAL_MS = 5 * 60 * 1000;
@@ -48,7 +53,45 @@ export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string;
 		: { git: "", cache: "", mcp: "" };
 }
 
-type GitStats = { add: number; del: number };
+/** 思考等级的填充圆标：等级越高填得越满。 */
+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<{
@@ -61,19 +104,6 @@ type XaiFooterReport = {
 	metrics?: Array<{ id?: string; value?: unknown }>;
 };
 
-export function parseGitStats(stdout: string): GitStats {
-	let add = 0;
-	let del = 0;
-	for (const line of stdout.split("\n")) {
-		const match = line.match(/^(\d+)\s+(\d+)/);
-		if (match) {
-			add += Number(match[1]);
-			del += Number(match[2]);
-		}
-	}
-	return { add, del };
-}
-
 export function formatXaiFooterChip(report: XaiFooterReport): string | undefined {
 	const included = report.buckets?.find((b) => b.id === "included-allowance");
 	if (included?.unit === "percent" && typeof included.used === "number") {
@@ -180,7 +210,12 @@ function colorUsageChip(theme: any, text: string): string {
 }
 
 let currentTui: any = undefined;
-let refreshCurrentGitStats: (() => void) | undefined;
+let refreshCurrentGitStats: ((reset?: boolean) => void) | undefined;
+
+/** Apply a /ccstyle Git mode change immediately, without recreating the footer. */
+export function refreshFooterGitStats(): void {
+	refreshCurrentGitStats?.(true);
+}
 let refreshCurrentUsage: (() => void) | undefined;
 let refreshCurrentMcpChip: (() => void) | undefined;
 /** 工具/命令列表在 pi API 上，而 footer 工厂只拿得到 ctx，加载时记下来。 */
@@ -192,33 +227,23 @@ const createCustomFooterFactory =
 		const sep = theme.fg("muted", " · ");
 		const joinChips = (parts: string[]) => parts.filter(Boolean).join(sep);
 		let gitStats: GitStats | undefined;
-		let gitRefreshRunning = false;
 		let localUsageChip = "";
 		let usageGeneration = 0;
 		let usageAbort: AbortController | undefined;
 		let disposed = false;
 
-		// 查询在 render 外执行，保留旧值；仅统计结果真正变化时重绘，避免周期性清零抖动。
-		const refreshGitStats = () => {
-			if (gitRefreshRunning || disposed) return;
-			gitRefreshRunning = true;
-			execFile(
-				"git",
-				["diff", "--numstat", "HEAD"],
-				{ cwd: ctx.cwd, timeout: 2000 },
-				(err, stdout) => {
-					gitRefreshRunning = false;
-					if (err || disposed) return;
-					const next = parseGitStats(stdout);
-					if (gitStats?.add === next.add && gitStats.del === next.del) return;
-					gitStats = next;
-					tui.requestRender();
-				},
-			);
-		};
-		refreshCurrentGitStats = refreshGitStats;
-		refreshGitStats();
-		const gitRefreshTimer = setInterval(refreshGitStats, GIT_REFRESH_INTERVAL_MS);
+		// 查询在 render 外执行；模式/分支变化清旧值，普通轮询只在统计变化时重绘。
+		const gitRefresher = createGitStatsRefresher({
+			getMode: () => config.footerGitStatsMode,
+			query: (mode, signal) => readGitStats(ctx.cwd, mode, signal),
+			onChange: (next) => {
+				gitStats = next;
+				tui.requestRender();
+			},
+		});
+		refreshCurrentGitStats = gitRefresher.refresh;
+		gitRefresher.refresh();
+		const gitRefreshTimer = setInterval(() => gitRefresher.refresh(), GIT_REFRESH_INTERVAL_MS);
 		gitRefreshTimer.unref?.();
 
 		const refreshUsage = () => {
@@ -314,19 +339,13 @@ const createCustomFooterFactory =
 		const mcpRefreshTimer = setInterval(refreshMcp, MCP_REFRESH_INTERVAL_MS);
 		mcpRefreshTimer.unref?.();
 
-		// 分支变化时同步更新分支名和相对 HEAD 的统计。
+		// 分支变化时重新选择基准，并拒绝旧分支的异步查询结果。
 		const unsubBranch = footerData.onBranchChange(() => {
-			refreshGitStats();
+			gitRefresher.refresh(true);
 			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;
@@ -417,16 +436,26 @@ 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("dim", `$${cost.toFixed(2)}`) +
-						(usingSubscription ? theme.fg("warning", " sub") : "")
+					? theme.fg(
+							"dim",
+							formatFooterCost(cost, config.footerCurrency, config.footerCurrencyRate),
+						) + (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,
 			]);
@@ -439,14 +468,17 @@ const createCustomFooterFactory =
 			}
 			const branch = footerData.getGitBranch();
 			if (branch) {
-				const stats =
-					gitStats && (gitStats.add || gitStats.del)
-						? theme.fg("dim", " (") +
-							theme.fg("success", `+${gitStats.add}`) +
-							" " +
-							theme.fg("error", `−${gitStats.del}`) +
-							theme.fg("dim", ")")
-						: "";
+				const s = gitStats;
+				let stats = "";
+				if (s && s.status)
+					stats = theme.fg("dim", " [") + colorGitStatus(theme, s.status) + theme.fg("dim", "]");
+				if (s && (s.add || s.del))
+					stats +=
+						theme.fg("dim", "(") +
+						theme.fg("success", `+${s.add}`) +
+						" " +
+						theme.fg("error", `−${s.del}`) +
+						theme.fg("dim", ")");
 				const gitLabel = glyphs.git ? `${glyphs.git} ${branch}` : branch;
 				place += theme.fg("muted", " on ") + gitColor(gitLabel) + stats;
 			}
@@ -467,6 +499,7 @@ const createCustomFooterFactory =
 			},
 			dispose(): void {
 				disposed = true;
+				gitRefresher.dispose();
 				usageAbort?.abort();
 				usageAbort = undefined;
 				clearInterval(gitRefreshTimer);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/shell/git-stats.ts

@@ -0,0 +1,162 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import type { FooterGitStatsMode } from "../../config/config.ts";
+
+export type GitStats = { add: number; del: number; status?: string };
+
+const execFileAsync = promisify(execFile);
+const BRANCH_BASE_REFS = ["refs/remotes/origin/HEAD", "refs/heads/main", "refs/heads/master"];
+
+export function parseGitStats(stdout: string): GitStats {
+	let add = 0;
+	let del = 0;
+	for (const line of stdout.split("\n")) {
+		const match = line.match(/^(\d+)\s+(\d+)/);
+		if (match) {
+			add += Number(match[1]);
+			del += Number(match[2]);
+		}
+	}
+	return { add, del };
+}
+
+const CONFLICT_CODES = new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
+
+/**
+ * git status --porcelain --branch 的第一行带分支头（## branch...origin/branch [ahead N, behind M]），
+ * 其余行是 XY 文件状态。返回 Starship 风格的状态符号串（= ! ? ⇡⇣），无变化时 undefined。
+ */
+export function parseGitStatus(stdout: string): string | undefined {
+	let conflicted = false;
+	let modified = false;
+	let untracked = false;
+	let ahead: number | undefined;
+	let behind: number | undefined;
+	for (const line of stdout.split("\n")) {
+		if (line.startsWith("## ")) {
+			ahead = Number(line.match(/ahead (\d+)/)?.[1]) || undefined;
+			behind = Number(line.match(/behind (\d+)/)?.[1]) || undefined;
+			continue;
+		}
+		const code = line.slice(0, 2);
+		if (code === "??") untracked = true;
+		else if (CONFLICT_CODES.has(code)) {
+			// 冲突文件必然也有未提交内容，! 与 = 同时出现
+			conflicted = true;
+			modified = true;
+		} else if (line.trim()) modified = true;
+	}
+	let status = "";
+	if (conflicted) status += "=";
+	if (modified) status += "!";
+	if (untracked) status += "?";
+	if (ahead) status += `⇡${ahead}`;
+	if (behind) status += `⇣${behind}`;
+	return status || undefined;
+}
+
+/** Read only local refs and tracked files; never fetch or change the index. */
+export async function readGitStats(
+	cwd: string,
+	mode: FooterGitStatsMode,
+	signal?: AbortSignal,
+): Promise<GitStats | undefined> {
+	const git = async (args: string[]) => {
+		const { stdout } = await execFileAsync("git", args, {
+			cwd,
+			timeout: 2000,
+			maxBuffer: 16 * 1024 * 1024,
+			signal,
+		});
+		return stdout.trim();
+	};
+	try {
+		let base = "HEAD";
+		if (mode === "branch") {
+			let baseCommit: string | undefined;
+			for (const ref of BRANCH_BASE_REFS) {
+				try {
+					baseCommit = await git(["rev-parse", "--verify", `${ref}^{commit}`]);
+					break;
+				} catch {
+					if (signal?.aborted) return undefined;
+					// Missing/dangling remote HEAD: try the local default branches.
+				}
+			}
+			if (!baseCommit) return undefined;
+			base = await git(["merge-base", "HEAD", baseCommit]);
+		}
+		// One comparison includes committed + staged + unstaged net changes,
+		// without double-counting edits that are later reverted. Untracked files are excluded.
+		const [numstat, statusOut] = await Promise.all([
+			git(["diff", "--numstat", base, "--"]),
+			git(["status", "--porcelain", "--branch"]).catch(() => ""),
+		]);
+		if (signal?.aborted) return undefined;
+		const stats = parseGitStats(numstat);
+		const status = parseGitStatus(statusOut);
+		return status ? { ...stats, status } : stats;
+	} catch {
+		// Non-repository, unborn HEAD, unrelated histories, timeout, etc.
+		return undefined;
+	}
+}
+
+/** Coalesce overlapping refreshes and reject stale results after a mode/branch change. */
+export function createGitStatsRefresher(options: {
+	getMode: () => FooterGitStatsMode;
+	query: (mode: FooterGitStatsMode, signal: AbortSignal) => Promise<GitStats | undefined>;
+	onChange: (stats: GitStats | undefined) => void;
+}): { refresh: (reset?: boolean) => void; dispose: () => void } {
+	let stats: GitStats | undefined;
+	let mode = options.getMode();
+	let generation = 0;
+	let running = false;
+	let pending = false;
+	let disposed = false;
+	let controller: AbortController | undefined;
+	const publish = (next: GitStats | undefined) => {
+		if (stats?.add === next?.add && stats?.del === next?.del && stats?.status === next?.status)
+			return;
+		stats = next;
+		options.onChange(next);
+	};
+	const refresh = (reset = false) => {
+		if (disposed) return;
+		const nextMode = options.getMode();
+		if (reset || mode !== nextMode) publish(undefined);
+		mode = nextMode;
+		const request = ++generation;
+		if (running) {
+			pending = true;
+			return;
+		}
+		running = true;
+		const queryController = new AbortController();
+		controller = queryController;
+		void (async () => {
+			let next: GitStats | undefined;
+			try {
+				next = await options.query(nextMode, queryController.signal);
+			} catch {
+				// Failed queries clear the old numbers rather than leaving a stale chip.
+			} finally {
+				if (!disposed && request === generation && nextMode === options.getMode()) publish(next);
+				running = false;
+				controller = undefined;
+				if (pending && !disposed) {
+					pending = false;
+					refresh();
+				}
+			}
+		})();
+	};
+	return {
+		refresh,
+		dispose: () => {
+			disposed = true;
+			generation++;
+			controller?.abort();
+		},
+	};
+}

package/node_modules/@herbertgao/pi-cc-extensions/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}`;
+}