@herbertgao/pi-extensions 2026.10.4 → 2026.10.6

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

@@ -3,6 +3,7 @@ import {
 	type ExtensionAPI,
 	type ExtensionCommandContext,
 	type ToolInfo,
+	copyToClipboard,
 	estimateTokens,
 	formatSkillsForPrompt,
 	getMarkdownTheme,
@@ -54,6 +55,30 @@ export function escCloseHitbox(bounds: DialogBounds): {
 	};
 }
 
+const COPY_LABEL = "[copy]";
+const ESC_LABEL = "[esc]";
+
+/** 测试可替换；生产使用 pi 的剪贴板实现。 */
+let copyTextImpl: (text: string) => Promise<void> = (text) => copyToClipboard(text);
+
+export function setPreviewCopyImpl(impl: ((text: string) => Promise<void>) | null): void {
+	copyTextImpl = impl ?? ((text) => copyToClipboard(text));
+}
+
+/** 1-based terminal hitbox of the [copy] button, one space left of [esc] on the same title row. */
+export function copyButtonHitbox(bounds: DialogBounds): {
+	row: number;
+	startCol: number;
+	endCol: number;
+} {
+	const esc = escCloseHitbox(bounds);
+	return {
+		row: esc.row,
+		startCol: esc.startCol - visibleWidth(COPY_LABEL) - 1,
+		endCol: esc.startCol - 2,
+	};
+}
+
 let activeContextOverlays = 0;
 
 /** fullscreen 输入包装用于把鼠标事件继续传给当前 context 主弹框或文本预览 overlay。 */
@@ -81,7 +106,9 @@ export async function showTextPreview(
 				let pageSize = 1;
 				let totalLines = 1;
 				let escHovered = false;
+				let copyHovered = false;
 				let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
+				let copyHitbox: { row: number; startCol: number; endCol: number } | undefined;
 				let scrollbarHitbox:
 					| {
 							col: number;
@@ -108,6 +135,24 @@ export async function showTextPreview(
 					tui.requestRender();
 				};
 
+				const setCopyHovered = (hovered: boolean): void => {
+					if (hovered === copyHovered) return;
+					copyHovered = hovered;
+					tui.requestRender();
+				};
+
+				const copyPreview = (): void => {
+					void copyTextImpl(content)
+						.then(() => {
+							const flash = (tui as { flash?: (message: string) => void }).flash;
+							if (typeof flash === "function") flash("Copied!");
+							else ctx.ui.notify("Copied preview to clipboard", "info");
+						})
+						.catch((error: unknown) => {
+							ctx.ui.notify(error instanceof Error ? error.message : "Copy failed", "error");
+						});
+				};
+
 				const dragScrollbarTo = (mouseRow: number): void => {
 					if (!scrollbarHitbox || scrollbarDragOffset === null) return;
 					const trackSize = scrollbarHitbox.endRow - scrollbarHitbox.startRow + 1;
@@ -151,7 +196,14 @@ export async function showTextPreview(
 									mouse.col >= escHitbox.startCol &&
 									mouse.col <= escHitbox.endCol,
 							);
+							const overCopy = Boolean(
+								copyHitbox &&
+									mouse.row === copyHitbox.row &&
+									mouse.col >= copyHitbox.startCol &&
+									mouse.col <= copyHitbox.endCol,
+							);
 							setEscHovered(overEsc);
+							setCopyHovered(overCopy);
 							const button = mouseBaseButton(mouse.code);
 							const motion = (mouse.code & 32) !== 0;
 							if (button === 0 && !motion) {
@@ -159,6 +211,10 @@ export async function showTextPreview(
 									done(undefined);
 									return;
 								}
+								if (overCopy) {
+									copyPreview();
+									return;
+								}
 								if (
 									scrollbarHitbox &&
 									mouse.col === scrollbarHitbox.col &&
@@ -187,7 +243,7 @@ export async function showTextPreview(
 
 					render(width: number) {
 						const inner = Math.max(1, width - 2);
-						const escWidth = visibleWidth("[esc]");
+						const actionsWidth = visibleWidth(`${COPY_LABEL} ${ESC_LABEL}`);
 						const bodyInner = Math.max(1, inner - 1);
 						const bodyWidth = Math.max(1, bodyInner - 1);
 						const terminalHeight = Math.max(1, tui.terminal.rows);
@@ -205,6 +261,7 @@ export async function showTextPreview(
 						const overlayTop = 2 + Math.floor((availableHeight - viewportHeight) / 2);
 						const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
 						escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
+						copyHitbox = copyButtonHitbox({ left: overlayLeft, top: overlayTop, width });
 						const visible = wrapped.slice(scrollOffset, scrollOffset + pageSize);
 						const border = (text: string) => theme.fg("border", text);
 						const scrollable = totalLines > pageSize;
@@ -237,11 +294,11 @@ export async function showTextPreview(
 						});
 						const start = totalLines === 0 ? 0 : scrollOffset + 1;
 						const end = Math.min(totalLines, scrollOffset + pageSize);
-						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · [esc] close`;
+						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · [copy] · [esc] close`;
 
 						return [
 							border(`╭${"─".repeat(inner)}╮`),
-							`${border("│")}${padLine(` ${theme.bold(theme.fg("accent", title))}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
+							`${border("│")}${padLine(` ${theme.bold(theme.fg("accent", title))}`, inner - actionsWidth)}${theme.fg(copyHovered ? "text" : "muted", COPY_LABEL)} ${theme.fg(escHovered ? "text" : "muted", ESC_LABEL)}${border("│")}`,
 							`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 							...bodyRows,
 							`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
@@ -273,6 +330,27 @@ const tokenEstimate = (value: unknown): number => {
 	return Math.max(0, Math.ceil(text.length / 4));
 };
 
+/** system 消息对请求的贡献：正文 + 各 section 文本 + 声明的工具 schema，与 pi 的 estimateTokens 同口径。 */
+function systemMessageTokens(message: {
+	content?: unknown;
+	sections?: Record<string, string | null> | null;
+	toolsAdded?: unknown;
+	toolsRemoved?: unknown;
+}): number {
+	let chars = typeof message.content === "string" ? message.content.length : 0;
+	for (const section of Object.values(message.sections ?? {})) {
+		if (typeof section === "string") chars += section.length;
+	}
+	if (message.toolsAdded) chars += JSON.stringify(message.toolsAdded).length;
+	if (message.toolsRemoved) chars += JSON.stringify(message.toolsRemoved).length;
+	return Math.ceil(chars / 4);
+}
+
+/** prompt 组装会把 CRLF 归一成 LF，匹配前对齐行尾。 */
+function normalizeLineEndings(text: string): string {
+	return text.replace(/\r\n?/g, "\n");
+}
+
 /** 只统计确实嵌进 system prompt 的片段，避免源文件预览把占用加两遍。 */
 function embeddedTokens(prompt: string, chunk: string): number {
 	if (!chunk || !prompt.includes(chunk)) return 0;
@@ -348,24 +426,24 @@ export function collectContextBreakdown(
 	allTools: ToolInfo[],
 ): ContextBreakdown {
 	const options = (ctx.getSystemPromptOptions?.() ?? {}) as BuildSystemPromptOptions;
-	const systemPrompt = typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "";
 	const selectedTools = new Set(options.selectedTools ?? ["read", "bash", "edit", "write"]);
 	const toolDefinitionPreview: string[] = [];
 	const toolResultPreview: string[] = [];
 	const contextPreview: string[] = [];
+	const systemPromptPreview: string[] = [];
 	let toolDefinitionTokens = 0;
 	let toolResultTokens = 0;
 	let contextTokens = 0;
+	let systemTokens = 0;
 
 	const memoryPreview: string[] = [];
-	let memoryTokens = 0;
-	for (const file of options.contextFiles ?? []) {
-		memoryTokens += embeddedTokens(systemPrompt, file.content);
+	const contextFiles = options.contextFiles ?? [];
+	for (const file of contextFiles) {
 		memoryPreview.push(`## ${file.path}\n\n${previewValue(file.content)}`);
 	}
 
-	const skillsText = formatSkillsForPrompt(options.skills ?? []).trim();
-	const skillsTokens = embeddedTokens(systemPrompt, skillsText);
+	const skills = options.skills ?? [];
+	const skillsText = formatSkillsForPrompt(skills).trim();
 
 	for (const tool of allTools) {
 		if (!selectedTools.has(tool.name)) continue;
@@ -378,21 +456,51 @@ export function collectContextBreakdown(
 		toolDefinitionPreview.push(`## Definition: ${tool.name}\n\n${previewValue(definition)}`);
 	}
 
-	for (const entry of ctx.sessionManager.buildContextEntries()) {
-		if (entry.type === "message") {
-			const message = entry.message;
-			if (message.role === "assistant") {
+	let memoryTokens = 0;
+	let skillsTokens = 0;
+	for (const projected of ctx.sessionManager.buildSessionProjection().entries) {
+		const source = projected.sourceEntry;
+		for (const message of projected.messages) {
+			if (message.role === "system") {
+				systemTokens += systemMessageTokens(message);
+				// Memory / skills 按投影中的实际 section 文本切分，与 system prompt 增量互补、不重不漏。
+				const sections = (message.sections ?? {}) as Record<string, string | null>;
+				const projectContext =
+					typeof sections.project_context === "string"
+						? normalizeLineEndings(sections.project_context)
+						: "";
+				for (const file of contextFiles) {
+					const chunk = `<project_instructions path="${file.path}">\n${normalizeLineEndings(file.content)}\n</project_instructions>`;
+					memoryTokens += embeddedTokens(projectContext, chunk);
+					systemTokens -= embeddedTokens(projectContext, chunk);
+				}
+				const skillsSection =
+					typeof sections.skills === "string" ? normalizeLineEndings(sections.skills) : "";
+				skillsTokens += embeddedTokens(skillsSection, skillsText);
+				systemTokens -= embeddedTokens(skillsSection, skillsText);
+				systemPromptPreview.push(
+					(source.type === "compaction"
+						? "## System prompt snapshot at compaction\n\n"
+						: "## System prompt update\n\n") +
+						previewValue({
+							content: message.content,
+							sections: message.sections,
+							toolsAdded: (message.toolsAdded ?? []).map((tool: { name?: string }) => tool?.name),
+							toolsRemoved: (message.toolsRemoved ?? []).map(
+								(tool: { name?: string }) => tool?.name,
+							),
+						}),
+				);
+			} else if (message.role === "assistant") {
+				contextTokens += estimateTokens(message);
 				for (const block of message.content) {
 					if (block.type === "toolCall") {
-						contextTokens += tokenEstimate(block.name) + tokenEstimate(block.arguments);
 						contextPreview.push(
 							`## Assistant tool call: ${block.name}\n\n${previewValue(block.arguments)}`,
 						);
 					} else if (block.type === "text") {
-						contextTokens += tokenEstimate(block.text);
 						contextPreview.push(`## Assistant\n\n${block.text}`);
 					} else if (block.type === "thinking") {
-						contextTokens += tokenEstimate(block.thinking);
 						contextPreview.push(`## Assistant thinking\n\n${block.thinking}`);
 					}
 				}
@@ -402,8 +510,8 @@ export function collectContextBreakdown(
 					`## Result: ${message.toolName}\n\n${previewValue(message.content)}`,
 				);
 			} else if (message.role === "bashExecution") {
-				toolResultTokens += estimateTokens(message);
-				toolResultPreview.push(
+				contextTokens += estimateTokens(message);
+				contextPreview.push(
 					`## Bash\n\nCommand:\n\n${previewValue(message.command)}\n\nOutput:\n\n${previewValue(message.output)}`,
 				);
 			} else if (message.role === "branchSummary" || message.role === "compactionSummary") {
@@ -413,18 +521,10 @@ export function collectContextBreakdown(
 				contextTokens += estimateTokens(message);
 				contextPreview.push(`## ${message.role}\n\n${previewValue(message.content)}`);
 			}
-		} else if (entry.type === "compaction" || entry.type === "branch_summary") {
-			contextTokens += tokenEstimate(entry.summary);
-			contextPreview.push(
-				`## ${entry.type === "compaction" ? "Compaction" : "Branch summary"}\n\n${entry.summary}`,
-			);
-		} else if (entry.type === "custom_message") {
-			contextTokens += tokenEstimate(entry.content);
-			contextPreview.push(`## Custom: ${entry.customType}\n\n${previewValue(entry.content)}`);
 		}
 	}
 
-	const systemTokens = Math.max(0, tokenEstimate(systemPrompt) - memoryTokens - skillsTokens);
+	systemTokens = Math.max(0, systemTokens);
 	return {
 		parts: [
 			{ label: "System prompt", tokens: systemTokens, color: "accent" },
@@ -435,7 +535,10 @@ export function collectContextBreakdown(
 			{ label: "Context", tokens: contextTokens, color: "warning" },
 		] satisfies ContextPart[],
 		previews: {
-			systemPrompt: systemPrompt || "No system prompt.",
+			systemPrompt:
+				systemPromptPreview.join("\n\n") ||
+				(typeof ctx.getSystemPrompt === "function" ? ctx.getSystemPrompt() : "") ||
+				"No system prompt.",
 			memoryFiles: memoryPreview.join("\n\n") || "No memory files in context.",
 			skills: skillsText || "No skills in context.",
 			tools: toolDefinitionPreview.join("\n\n") || "No active tool definitions.",

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/reference/index.ts

@@ -439,6 +439,8 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("before_agent_start", async (event, ctx) => {
+		// Pi 1.2.0 custom events have no prompt. Older hosts omit messageType.
+		if (!("prompt" in event)) return;
 		const referenceIds = extractSessionReferenceIds(event.prompt);
 		if (referenceIds.length === 0) return;
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/reference/subagent.ts

@@ -26,6 +26,7 @@ const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
 const SUBAGENT_REFERENCE_PATTERN = /(?:^|\s)@subagent:\[([^\]]+)](?![\w-])/g;
 
 function getAgentDir(): string {
+	// PI_CODING_AGENT_DIR 本身就是 agent 目录（默认 ~/.pi/agent），不是家目录。
 	const override = process.env.PI_CODING_AGENT_DIR;
 	return join(override ? override : join(homedir(), ".pi", "agent"), "agents");
 }
@@ -214,6 +215,8 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 
 	// Inject as a request message, not systemPrompt, so the cached prefix stays stable.
 	pi.on("before_agent_start", async (event, _ctx) => {
+		// Pi 1.2.0 custom events have no prompt. Older hosts omit messageType.
+		if (!("prompt" in event)) return;
 		const agents = getAgents();
 		if (agents.length === 0) return;
 

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

@@ -0,0 +1,29 @@
+const KNOWN_CURRENCIES = new Set(Intl.supportedValuesOf("currency"));
+
+/** 1 美元费用对应的显示币种数量。面板切换币种时写入。 */
+export const FOOTER_CURRENCY_RATES = {
+	CNY: 7.12,
+	EUR: 0.92,
+	JPY: 150,
+	GBP: 0.76,
+	INR: 96.25,
+	HKD: 7.78,
+} as const;
+
+export const FOOTER_CURRENCY_PRESETS = ["USD", ...Object.keys(FOOTER_CURRENCY_RATES)] as const;
+
+/** 不在表里的币种，包括 USD，返回 null。 */
+export function presetFooterCurrencyRate(currency: string): number | null {
+	const code = currency.trim().toUpperCase();
+	return FOOTER_CURRENCY_RATES[code as keyof typeof FOOTER_CURRENCY_RATES] ?? null;
+}
+
+/** 底栏费用文本。USD 或不支持的币种保持美元写法。没有倍率时只换符号。 */
+export function formatFooterCost(cost: number, currency: string, rate: number | null): string {
+	const usd = `$${cost.toFixed(2)}`;
+	if (currency === "USD" || !KNOWN_CURRENCIES.has(currency)) return usd;
+	const formatted = new Intl.NumberFormat("en", { style: "currency", currency }).format(
+		rate === null ? cost : cost * rate,
+	);
+	return rate === null ? formatted : `≈${formatted}`;
+}

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,48 @@ 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: "\u25cb",
+	low: "\u25ce",
+	medium: "\u25d4",
+	high: "\u25d5",
+	xhigh: "\u25c9",
+	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} ${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 +107,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 +213,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 +230,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 +342,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 +439,27 @@ 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,
+						config.footerTokenRateTtft,
+					)
+				: "";
+			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 +472,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 +503,7 @@ const createCustomFooterFactory =
 			},
 			dispose(): void {
 				disposed = true;
+				gitRefresher.dispose();
 				usageAbort?.abort();
 				usageAbort = undefined;
 				clearInterval(gitRefreshTimer);