@fyeeme/pi-statusline 1.0.2 → 1.1.1

package/CHANGELOG.md

@@ -7,6 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1] - 2026-08-08
+
+### Fixed
+
+- 会话级 token/cost/tok-s 在分叉会话（`/fork`、`/tree`）后不再把整棵树计入：`SessionTokenUsageCalculator.compute` 与 `agent_end` 累计输出改用 `sessionManager.getBranch()`（仅当前分支）；`/status-debug` 仍保留全量 `getEntries()` 用于诊断。
+- 切换 provider（`/model` deepseek↔zai）后状态栏不再短暂显示上一个 provider 的用量段：`getCachedUsage` 在缓存 provider 与当前 provider 不匹配时返回 null，等待 `model_select` 触发的新刷新落地。
+- ZAI 用量段对 `zai-coding-cn` provider 不再永久漏显示：`ZaiResult.provider` 记录实际 provider key（`zai`/`zai-coding-cn`），provider guard 不再因字面量 `"zai"` 误判（code-review #1）。
+- tok/s 改用本次 agent run 的 output/耗时（`event.messages`），分子分母同口径，不再受 /fork 放弃分支的累计耗时影响；同时消除 `agent_end` 对模块级 `lastCtx` 的依赖（code-review #2）。
+- `/status-debug` 的 msg 遍历改用 `getBranch()`，与 `tokenCalculator.compute` 口径一致（code-review #7）。
+- `SessionTokenUsageCalculator.compute` 内 `deepSeekBilledInCny()` 冗余的第二次调用复用已有变量（code-review #8）。
+
+### Changed
+
+- 移除 `package.json` 中已废弃的 MCP 描述与 keyword（MCP 状态段自 1.0.2 起已移除）。
+- 新增 `session_shutdown` 清理 usage cache：`/resume` 或 `/new` 进入不同 provider 时立即刷新，而非沿用上一会话缓存。
+- `devDependencies` 对齐当前平台（`@earendil-works/pi-coding-agent`/`pi-ai`/`pi-tui` `0.77.0` → `0.84.1`），便于利用 `thinking_level_select`、`getAvailableProviderCount` 等新类型。
+- README 状态栏示例 `deepseek-v3` → `deepseek-v4-pro`（`deepseek-v3` 已不在 0.84.x 模型库）。
+
+## [1.1.0] - 2026-08-07
+
+### Added
+
+- DeepSeek 结算币种感知定价（新模块 `cost.ts`）：CNY 计费账户按官方 ¥ 单价重算（flash ¥1/¥2/¥0.02、pro ¥3/¥6/¥0.025 每百万 tokens），修正 pi 内置 USD 价低估约 7 倍；USD 计费账户保持 pi 内置价。
+- balance API 自动探测账户结算币种；`/currency` 手动覆盖（auto/¥/$），切换后即时刷新注册表定价。
+- 币种判定后即时对齐运行时注册表定价（覆盖与还原均可逆、跟随结算币种）。
+
+### Fixed
+
+- USD 计费账户启动后不再整场会话停在 CNY 价：balance 探测到币种后立即重新应用定价补丁。
+- 会话内新增 deepseek 模型（编辑 `models.json` + reload）后再次应用定价补丁时，不再因陈旧快照 + `registerProvider` 整表替换丢弃新增模型。
+
 ## [1.0.2] - 2025-07-15
 
 ### Fixed

package/README.md

@@ -1,17 +1,55 @@
 # pi-statusline
 
-A rich custom status bar for [pi](https://pi.dev) that replaces the default footer.
+[![npm version](https://img.shields.io/npm/v/@fyeeme/pi-statusline)](https://www.npmjs.com/package/@fyeeme/pi-statusline)
+[![License](https://img.shields.io/npm/l/@fyeeme/pi-statusline)](LICENSE)
+
+A rich custom status bar for [pi](https://pi.dev) that replaces the default footer. Provider-aware: shows live account balance for **DeepSeek** and rolling quota for **GLM/ZAI**, plus session tokens, cost, context window, and timing.
 
 ## Features
 
-- **Token usage**: input, output, cache read/write, total per session
-- **Cost**: cumulative cost with currency auto-detection (¥ for DeepSeek, $ otherwise)
-- **DeepSeek balance**: live account balance fetched on startup and cached for 5 minutes
+- **Provider-aware usage** — special support for DeepSeek and GLM/ZAI (see [Provider Support](#provider-support))
+- **Token usage**: input, output, cache read/write, total per session, with cache hit rate
+- **Cost**: cumulative session cost with currency auto-detection (¥ for DeepSeek/CNY, $ otherwise)
 - **Context window**: usage percentage and size
 - **Timing**: elapsed time + tokens/sec for last response
-- **MCP status**: connected server count and total tool count
 - **Git branch**: current branch shown in cwd display
 
+## Provider Support
+
+This extension uses a provider-aware strategy: when the active model belongs to a supported provider, the status bar shows live account-level usage data fetched directly from that provider's API. Other providers fall back to session-scoped cost only.
+
+### DeepSeek
+
+Shows live **account balance** and **weekly token usage**.
+
+| Segment | Example | Source |
+|---------|---------|--------|
+| Balance | `¥0.12/50.00` | `GET /user/balance` (cached 5 min) |
+| Weekly tokens | `7d:1.2M` | Local session file scan (rolling 7 days) |
+
+- Currency auto-detected as `¥` (CNY) from the balance API response
+- Balance is fetched on startup and refreshed in the background; cached for 5 minutes
+- Triggered when `model.provider === "deepseek"`
+
+### GLM / ZAI
+
+Shows **5-hour rolling quota** and **weekly quota** (or natural-week usage as fallback).
+
+| Segment | Example | Source |
+|---------|---------|--------|
+| 5h quota | `Usage 42%(1h23m)` | `GET /api/monitor/usage/quota/limit` (`unit:3`) |
+| Weekly quota | `W:35%(1.2M,3d4h)` | `quota/limit` (`unit:6`) + `model-usage` API |
+| Natural week | `W:1.2M` | `model-usage` API (Mon 00:00 local → now) |
+
+- **5-hour rolling window**: percentage used + countdown to reset
+- **Weekly quota**: if the plan exposes a `unit:6` weekly limit, shows percentage, tokens, and reset countdown; otherwise falls back to real usage for the current natural week (host local timezone)
+- **Account level**: also fetched (visible in `/status-debug`)
+- Supports both `zai` (`api.z.ai`) and `zai-coding-cn` (`open.bigmodel.cn`) endpoints
+
+### Other providers
+
+Session-scoped cost only (`$0.12` or `¥0.12`), with no live account data.
+
 ## Install
 
 Requires the [pi](https://pi.dev) CLI.
@@ -20,16 +58,16 @@ Requires the [pi](https://pi.dev) CLI.
 
 ```bash
 # Global (user) install — available in every project
-pi install npm:@fyeeme/pi-statusline
+pi install @fyeeme/pi-statusline
 
 # Project-local — written to .pi/settings.json, shareable with your team
-pi install -l npm:@fyeeme/pi-statusline
+pi install -l @fyeeme/pi-statusline
 
 # Pinned version — skipped by `pi update`
-pi install npm:@fyeeme/pi-statusline@1.0.0
+pi install @fyeeme/pi-statusline@1.0.2
 
 # Try it once without saving (current run only)
-pi -e npm:@fyeeme/pi-statusline
+pi -e @fyeeme/pi-statusline
 ```
 
 ### From GitHub
@@ -40,7 +78,7 @@ Source: [`fyeeme/pi-packages`](https://github.com/fyeeme/pi-packages).
 # HTTPS shorthand
 pi install git:github.com/fyeeme/pi-packages
 # Pin to a tag or commit (skipped by `pi update`)
-pi install git:github.com/fyeeme/pi-packages@v1.0.0
+pi install git:github.com/fyeeme/pi-packages@v1.0.2
 # Raw URL form
 pi install https://github.com/fyeeme/pi-packages
 ```
@@ -51,20 +89,43 @@ See the Pi Packages guide on [pi.dev](https://pi.dev) for the full list of sourc
 
 | Command | Description |
 |---|---|
-| `/balance` | Force refresh DeepSeek account balance |
-| `/currency [auto\|¥\|$]` | Toggle cost currency display |
-| `/status-debug` | Dump session stats to `/tmp/pi-status-debug.log` |
+| `/currency [auto\|¥\|$]` | Toggle cost currency display (`auto` follows DeepSeek → ¥) |
+| `/status-debug` | Dump session stats + provider usage to `/tmp/pi-status-debug.log` |
 
 ## Status Bar Layout
 
 ```
-~/projects/my-repo (main)                    deepseek-v3 · xhigh
-in 12k, out 8k, cache 45k, total 65k · ¥0.12/50.00 · 12.3%/64k · 45s 38.2tok/s · MCP:2(15)
+~/projects/my-repo (main)                    deepseek-v4-pro · xhigh
+tokens 65k(in 12k, out 8k, cache 45k) · ¥0.12/50.00 · 7d:1.2M · 45.2%/64k · 2m30s 38.2tok/s
 ```
 
-Line 1: cwd + git branch (left) | model + thinking level (right)
-Line 2: token stats · cost/balance · context · timing · MCP
+**Line 1**: cwd + git branch (left) | model + thinking level (right)
+
+**Line 2**: token stats · provider usage · context window · timing
+
+### GLM/ZAI example
+
+```
+~/projects/my-repo (main)                       glm-4.6 · high
+tokens 65k(in 12k, out 8k, cache 45k) · Usage 42%(1h23m) · W:35%(1.2M,3d4h) · 45.2%/64k · 2m30s 38.2tok/s
+```
+
+## Environment Variables
+
+None required. API keys are resolved automatically by pi's model registry for the active provider.
+
+## How It Works
+
+The extension registers a `UsageProvider` per supported provider and refreshes usage data in the background (on startup, on model switch, and after each agent run). Results are cached with a 5-minute TTL (DeepSeek) or per-refresh (ZAI) to avoid hammering the provider APIs.
+
+All network calls are best-effort with a 5-second timeout — failures stay silent and never block the status bar.
+
+> **Platform API note:** the custom footer relies on `ctx.ui.setFooter`'s third parameter — `footerData: ReadonlyFooterDataProvider` (for `getGitBranch`/`getExtensionStatuses`/`onBranchChange`) — and on returning `dispose` from the footer factory. These are part of the 0.84.x `ExtensionAPI` surface (see `dist/core/extensions/types.d.ts`), but pi's `docs/extensions.md` currently documents only the `(tui, theme)` form. If a future pi release changes the `setFooter` signature, check this extension's footer wiring first.
+
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md).
 
-## MCP Integration
+## License
 
-When used with [pi-mcp-adapter](https://www.npmjs.com/package/pi-mcp-adapter), the status bar shows live MCP connection status via `mcp:status` and `mcp:disconnect` events.
+MIT

package/cache.ts

@@ -70,6 +70,13 @@ export function getCachedUsage(
 	// may synchronously set usageCache = null when the provider is not found,
 	// which would make the eventual `return cache.result` throw on null.
 	const cache = usageCache;
+	// Drop stale cache if the active provider changed since it was populated
+	// (e.g. deepseek -> zai via /model). model_select already kicked off a
+	// refresh; returning null avoids briefly showing the previous provider's
+	// segment until the new fetch lands.
+	if (lastModel && cache.result && cache.result.provider !== lastModel.provider) {
+		return null;
+	}
 	if (Date.now() - cache.fetchedAt > CACHE_TTL_MS) {
 		// TTL expired: return stale data but trigger background refresh.
 		// Memoize inflight promise so concurrent callers share one fetch.

package/cost.ts

@@ -0,0 +1,135 @@
+/**
+ * DeepSeek 定价修正（跟随结算币种）。
+ *
+ * 背景：pi 内置的 deepseek 定价数据（pi-ai 的 providers/data/deepseek.json）用的是官方 USD 价
+ * （flash $0.14/0.28/0.0028、pro $0.435/0.87/0.003625 每百万 tokens）。DeepSeek 账户分 CNY 与 USD
+ * 两种结算：CNY 账户按 ¥1/¥2/¥0.02、¥3/¥6/¥0.025 计费，此时 pi 记录的成本低估约 7 倍；USD 账户
+ * 按 USD 计费，pi 内置价本来就是对的。
+ *
+ * 因此所有"修正"都必须跟随结算币种：
+ *   1. `deepSeekBilledInCny()`：判定 DeepSeek 是否按 CNY 计价 —— 用户显式 `/currency` 优先；
+ *      否则按 balance API 探测到的账户币种（探测失败/未知时按 CNY，保持原行为）。
+ *   2. `deepseekMessageCostCny`：按官方 CNY 单价重算单条消息成本（仅 CNY 计价时用于兜底存量消息，
+ *      会话文件里已记录的 cost 无法追溯修正）。
+ *   3. `applyDeepSeekPricingPatch`：运行时把注册表中 deepseek 模型定价覆盖为官方 CNY 价（仅 CNY
+ *      计价时；USD 计价时还原为 pi 内置 USD 价）。内存补丁，不修改数据文件、pi 升级不丢。
+ */
+import type { Model, Api } from "@earendil-works/pi-ai";
+import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
+
+export interface DeepSeekPricedUsage {
+	input: number;
+	output: number;
+	cacheRead: number;
+	cacheWrite: number;
+}
+
+/** DeepSeek 官方 CNY 单价（元 / 百万 tokens）：缓存命中输入 / 未命中输入 / 输出（见官方定价页）。 */
+export const DEEPSEEK_CNY_PRICES: Record<string, DeepSeekPricedUsage> = {
+	"deepseek-v4-flash": { input: 1, output: 2, cacheRead: 0.02, cacheWrite: 0 },
+	"deepseek-v4-pro": { input: 3, output: 6, cacheRead: 0.025, cacheWrite: 0 },
+};
+
+const PER_MILLION = 1_000_000;
+
+// ---------------------------------------------------------------------------
+// 结算币种状态（DeepSeek）
+// ---------------------------------------------------------------------------
+
+/** balance API 探测到的账户结算币种（CNY / USD / 其他）。 */
+let detectedDeepSeekCurrency: string | null = null;
+/** 用户显式 `/currency` 设置，覆盖自动判定。 */
+let costCurrencyOverride: "¥" | "$" | undefined = undefined;
+/** 首次 applyDeepSeekPricingPatch 时缓存的原始模型定义（用于 USD 计价时还原）。 */
+let originalDeepSeekModels: Model<Api>[] | null = null;
+
+/** 记录 balance API 探测到的 DeepSeek 账户结算币种（fetchUsage 成功后写入；null 表示未知）。 */
+export function setDetectedDeepSeekCurrency(currency: string | null): void {
+	detectedDeepSeekCurrency = currency;
+}
+
+/** 设置用户显式币种偏好（`/currency` 命令）；undefined 恢复自动判定。 */
+export function setCostCurrencyOverride(override: "¥" | "$" | undefined): void {
+	costCurrencyOverride = override;
+}
+
+/** 当前用户显式币种偏好（undefined = 自动）。 */
+export function getCostCurrencyOverride(): "¥" | "$" | undefined {
+	return costCurrencyOverride;
+}
+
+/**
+ * DeepSeek 是否按 CNY 计价：用户显式偏好优先；否则仅当探测明确为 USD 时按 USD 计价，
+ * 其余情况（CNY 或未知）按 CNY —— 保持原有"deepseek → ¥"的默认行为。
+ */
+export function deepSeekBilledInCny(): boolean {
+	if (costCurrencyOverride === "$") return false;
+	if (costCurrencyOverride === "¥") return true;
+	return detectedDeepSeekCurrency !== "USD";
+}
+
+/** 重置币种状态与补丁缓存（测试用）。 */
+export function resetDeepSeekPricingState(): void {
+	detectedDeepSeekCurrency = null;
+	costCurrencyOverride = undefined;
+	originalDeepSeekModels = null;
+}
+
+// ---------------------------------------------------------------------------
+// 单条消息成本重算
+// ---------------------------------------------------------------------------
+
+/**
+ * 按官方 CNY 单价重算单条消息成本；模型不在定价表内返回 null（调用方回退 `m.usage.cost`）。
+ *
+ * @param model 消息模型 id（如 `deepseek-v4-flash`）
+ * @param usage 消息的 token 用量分解
+ */
+export function deepseekMessageCostCny(
+	model: string | undefined,
+	usage: DeepSeekPricedUsage,
+): number | null {
+	if (!model) return null;
+	const p = DEEPSEEK_CNY_PRICES[model];
+	if (!p) return null;
+	return (
+		(p.input * usage.input +
+			p.output * usage.output +
+			p.cacheRead * usage.cacheRead +
+			p.cacheWrite * usage.cacheWrite) /
+		PER_MILLION
+	);
+}
+
+// ---------------------------------------------------------------------------
+// 运行时注册表补丁（根治 pi 内置定价，可逆、跟随结算币种）
+// ---------------------------------------------------------------------------
+
+/**
+ * 把注册表中 deepseek 模型的定价与结算币种对齐：
+ *  - CNY 计价：cost 覆盖为官方 CNY 价；
+ *  - USD 计价：还原为 pi 内置 USD 价（首次调用时缓存原始定义，之后不再被 CNY 覆盖）。
+ * 未知/未来新增模型原样保留；重复调用幂等；注册表未加载模型时静默跳过（由调用方后续重试）。
+ */
+export function applyDeepSeekPricingPatch(registry: ModelRegistry): void {
+	const dsModels = registry.getAll().filter((m) => m.provider === "deepseek");
+	if (dsModels.length === 0) return;
+	if (!originalDeepSeekModels) {
+		originalDeepSeekModels = dsModels;
+	} else {
+		// Merge in deepseek models added after the first snapshot, so a later
+		// re-patch（币种切换 / model_select / 探测后纠正）不会丢掉它们：registerProvider
+		// 是整表替换，用陈旧快照 map 会把新增模型从 registry 里静默删掉。
+		const known = new Set(originalDeepSeekModels.map((m) => m.id));
+		for (const m of dsModels) if (!known.has(m.id)) originalDeepSeekModels.push(m);
+	}
+
+	const billedInCny = deepSeekBilledInCny();
+	const models = originalDeepSeekModels.map((m) => {
+		if (!billedInCny) return m;
+		const cny = DEEPSEEK_CNY_PRICES[m.id];
+		if (!cny) return m;
+		return { ...m, cost: { ...m.cost, ...cny } };
+	});
+	registry.registerProvider("deepseek", { models });
+}

package/index.ts

@@ -22,7 +22,12 @@ import { DeepSeekUsageProvider } from "./providers/deepseek.ts";
 import { ZaiUsageProvider } from "./providers/zai.ts";
 import type { UsageProvider } from "./providers/types.ts";
 import { SessionTokenUsageCalculator } from "./token-usage.ts";
-import { refreshUsage, getCachedUsage, getUsageCacheAge } from "./cache.ts";
+import {
+	applyDeepSeekPricingPatch,
+	setCostCurrencyOverride,
+	getCostCurrencyOverride,
+} from "./cost.ts";
+import { refreshUsage, getCachedUsage, getUsageCacheAge, resetUsageCache } from "./cache.ts";
 import { formatCwd, buildStatLine, buildInfoLine } from "./footer.ts";
 
 // ---------------------------------------------------------------------------
@@ -45,9 +50,8 @@ let lastModel: ExtensionContext["model"] = undefined;
 let agentRunning = false;
 let lastElapsedSec = 0;
 let lastTps = 0;
-let currencyOverride: "¥" | "$" | undefined = undefined;
 
-const tokenCalculator = new SessionTokenUsageCalculator(() => currencyOverride);
+const tokenCalculator = new SessionTokenUsageCalculator(() => getCostCurrencyOverride());
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -75,21 +79,14 @@ export default function (pi: ExtensionAPI) {
 		if (elapsedMs <= 0) return;
 		lastElapsedSec += elapsedMs / 1000;
 
-		// Compute cumulative output tokens from all assistant messages in the session
-		let cumulativeOutput = 0;
-		if (lastCtx) {
-			for (const entry of lastCtx.sessionManager.getEntries()) {
-				if (entry.type === "message" && entry.message.role === "assistant") {
-					cumulativeOutput += (entry.message as AssistantMessage).usage.output;
-				}
-			}
-		} else {
-			// fallback: use current turn's messages when no session context
-			for (const m of event.messages) {
-				if (m.role === "assistant") cumulativeOutput += (m as AssistantMessage).usage.output;
-			}
+		// tok/s = 本次 agent run 的 output / 本次 run 耗时（即时速度）。用 event.messages
+		// 而非 sessionManager 遍历：不依赖 lastCtx/分支语义，不受 /fork 放弃分支的耗时
+		// 累计影响（分子分母同为本 run 口径），也避开 lastCtx 在 session 切换边界的 staleness。
+		let turnOutput = 0;
+		for (const m of event.messages) {
+			if (m.role === "assistant") turnOutput += (m as AssistantMessage).usage.output;
 		}
-		lastTps = cumulativeOutput > 0 ? cumulativeOutput / lastElapsedSec : 0;
+		lastTps = turnOutput > 0 ? turnOutput / (elapsedMs / 1000) : 0;
 
 		// Schedule background refresh to pick up new usage data
 		if (lastCtx && lastModel) {
@@ -128,8 +125,10 @@ export default function (pi: ExtensionAPI) {
 			const cacheAge = getUsageCacheAge();
 			w(`  cacheAge: ${cacheAge !== null ? `${Math.round(cacheAge / 1000)}s` : "N/A"}`);
 
+			// status-debug dumps the current branch (same scope tokenCalculator.compute
+			// uses via getBranch), so the msg count (idx) lines up with computed totals.
 			let idx = 0;
-			for (const entry of ctx.sessionManager.getEntries()) {
+			for (const entry of ctx.sessionManager.getBranch()) {
 				if (entry.type === "message" && entry.message.role === "assistant") {
 					const m = entry.message as AssistantMessage;
 					w(`--- msg[${idx}] ---`);
@@ -158,17 +157,20 @@ export default function (pi: ExtensionAPI) {
 		handler: async (args, ctx) => {
 			const a = args.trim().toLowerCase();
 			if (a === "auto" || a === "") {
-				currencyOverride = undefined;
-				ctx.ui.notify("Currency: auto (deepseek→¥)", "info");
+				setCostCurrencyOverride(undefined);
+				ctx.ui.notify("Currency: auto (deepseek→¥ or balance currency)", "info");
 			} else if (a === "¥" || a === "rmb" || a === "cny") {
-				currencyOverride = "¥";
+				setCostCurrencyOverride("¥");
 				ctx.ui.notify("Currency: ¥", "info");
 			} else if (a === "$" || a === "usd") {
-				currencyOverride = "$";
+				setCostCurrencyOverride("$");
 				ctx.ui.notify("Currency: $", "info");
 			} else {
 				ctx.ui.notify("Usage: /currency [auto|¥|$]", "warning");
+				return;
 			}
+			// 币种变更后立即对齐注册表定价（CNY→覆盖为官方价；USD→还原 pi 内置价）
+			applyDeepSeekPricingPatch(ctx.modelRegistry);
 		},
 	});
 
@@ -176,10 +178,17 @@ export default function (pi: ExtensionAPI) {
 	pi.on("model_select", (event) => {
 		if (lastCtx) {
 			lastModel = event.model;
+			applyDeepSeekPricingPatch(lastCtx.modelRegistry);
 			void refreshUsage(providers, lastCtx.modelRegistry, event.model);
 		}
 	});
 
+	// ---- Session shutdown: drop usage cache so /resume into a different provider
+	// shows fresh data instead of the previous session's cached segment.
+	pi.on("session_shutdown", () => {
+		resetUsageCache();
+	});
+
 	// ---- Footer ----
 	pi.on("session_start", (_event, ctx) => {
 		if (!ctx.hasUI) return;
@@ -188,6 +197,9 @@ export default function (pi: ExtensionAPI) {
 		lastElapsedSec = 0;
 		lastTps = 0;
 
+		// 根治：运行时修正 deepseek 定价（pi 内置定价低估约 7 倍），使后续 usage.cost 记录全局正确
+		applyDeepSeekPricingPatch(ctx.modelRegistry);
+
 		// Prime usage cache on startup (non-blocking)
 		lastCtx = ctx;
 		lastModel = ctx.model;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fyeeme/pi-statusline",
-  "version": "1.0.2",
-  "description": "Rich custom status bar for pi with token usage, cost, DeepSeek balance, context window, timing, and MCP connection status.",
+  "version": "1.1.1",
+  "description": "Rich custom status bar for pi with token usage, cost, DeepSeek balance, context window, and timing.",
   "type": "module",
   "license": "MIT",
   "author": "fyeeme",
@@ -27,7 +27,6 @@
     "deepseek",
     "tokens",
     "cost",
-    "mcp",
     "balance",
     "footer"
   ],
@@ -48,14 +47,14 @@
     "typecheck": "tsc"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.77.0",
-    "@earendil-works/pi-ai": ">=0.77.0",
-    "@earendil-works/pi-tui": ">=0.77.0"
+    "@earendil-works/pi-coding-agent": ">=0.84.1",
+    "@earendil-works/pi-ai": ">=0.84.1",
+    "@earendil-works/pi-tui": ">=0.84.1"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.77.0",
-    "@earendil-works/pi-ai": "0.77.0",
-    "@earendil-works/pi-tui": "0.77.0",
+    "@earendil-works/pi-coding-agent": "0.84.1",
+    "@earendil-works/pi-ai": "0.84.1",
+    "@earendil-works/pi-tui": "0.84.1",
     "@types/node": "22.19.19",
     "typescript": "5.9.3"
   }

package/providers/deepseek.ts

@@ -1,6 +1,7 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { DeepSeekResult, ProviderUsageResult } from "../types.ts";
 import type { UsageProvider } from "./types.ts";
+import { applyDeepSeekPricingPatch, setDetectedDeepSeekCurrency } from "../cost.ts";
 import { scanWeeklyTokens } from "../session-scanner.ts";
 import { fmt } from "../footer.ts";
 
@@ -39,6 +40,13 @@ export class DeepSeekUsageProvider implements UsageProvider {
 			const info = data.balance_infos?.[0];
 			if (!info) return null;
 
+			// 记录账户结算币种：CNY 账户按官方 ¥ 价计费；USD 账户保持 pi 内置 USD 价（不覆盖）
+			setDetectedDeepSeekCurrency(info.currency ?? null);
+			// 探测到币种后立即重新对齐注册表定价：session_start 时（detectedDeepSeekCurrency 尚为
+			// null）已按默认 CNY 覆盖过一次；此处按真实币种纠正，避免 USD 账户停在被高估约 7 倍的
+			// CNY 价上，直到下一次 model_select/​/currency 才修正。
+			applyDeepSeekPricingPatch(modelRegistry);
+
 			const weeklyTokens = scanWeeklyTokens("deepseek");
 
 			return {

package/providers/zai.ts

@@ -5,7 +5,7 @@ import { fmt, formatCountdown, formatWeeklyCountdown } from "../footer.ts";
 import { startOfCurrentWeekLocal, startOfNextWeekLocal } from "../week.ts";
 
 /** Check if the provider name is a ZAI/GLM variant. */
-function isZaiProvider(provider: string): boolean {
+function isZaiProvider(provider: string): provider is "zai" | "zai-coding-cn" {
 	return provider === "zai" || provider === "zai-coding-cn";
 }
 
@@ -84,7 +84,7 @@ export class ZaiUsageProvider implements UsageProvider {
 			}
 
 			return {
-				provider: "zai",
+				provider: model.provider,
 				tokensLimitPct: fiveHourLimit?.percentage ?? 0,
 				tokensResetAt: fiveHourLimit?.nextResetTime ?? 0,
 				level,
@@ -99,7 +99,7 @@ export class ZaiUsageProvider implements UsageProvider {
 	}
 
 	formatForFooter(result: NonNullable<ProviderUsageResult>, _sessionCost: number, _currency: string): string {
-		if (result.provider !== "zai") return "";
+		if (!isZaiProvider(result.provider)) return "";
 		const zai = result as ZaiResult;
 		const parts: string[] = [];
 
@@ -121,7 +121,7 @@ export class ZaiUsageProvider implements UsageProvider {
 	}
 
 	debugDump(result: NonNullable<ProviderUsageResult>, w: (s: string) => void): void {
-		if (result.provider !== "zai") return;
+		if (!isZaiProvider(result.provider)) return;
 		const zai = result as ZaiResult;
 		w(`  tokensLimitPct: ${zai.tokensLimitPct}%`);
 		w(`  tokensResetAt: ${new Date(zai.tokensResetAt).toISOString()}`);

package/token-usage.ts

@@ -1,6 +1,7 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { TokenUsage, TokenUsageCalculator } from "./types.ts";
+import { deepSeekBilledInCny, deepseekMessageCostCny } from "./cost.ts";
 
 export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 	private getCurrencyOverride: () => "\u00a5" | "$" | undefined;
@@ -17,7 +18,12 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 		let total = 0;
 		let cost = 0;
 
-		for (const entry of ctx.sessionManager.getEntries()) {
+		const billedInCny = deepSeekBilledInCny();
+
+		// Use getBranch() (current branch only) so token/cost stats exclude abandoned
+		// sibling branches after /fork or /tree navigation. getEntries() would sum
+		// the whole tree and overcount in forked sessions.
+		for (const entry of ctx.sessionManager.getBranch()) {
 			if (entry.type === "message" && entry.message.role === "assistant") {
 				const m = entry.message as AssistantMessage;
 				input += m.usage.input;
@@ -25,7 +31,9 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 				cacheRead += m.usage.cacheRead;
 				cacheWrite += m.usage.cacheWrite;
 				total += m.usage.totalTokens;
-				cost += m.usage.cost.total;
+				// DeepSeek 仅按 CNY 计价时重算（pi 内置 USD 价低估约 7 倍）；USD 结算用户沿用 pi 记录的 cost
+				const dsCost = billedInCny ? deepseekMessageCostCny(m.model, m.usage) : null;
+				cost += dsCost !== null ? dsCost : (m.usage.cost?.total ?? 0);
 			}
 		}
 
@@ -37,7 +45,7 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 			currency = override;
 		} else {
 			const p = ctx.model?.provider ?? "";
-			if (p.toLowerCase().includes("deepseek")) currency = "\u00a5";
+			if (p.toLowerCase().includes("deepseek")) currency = billedInCny ? "\u00a5" : "$";
 		}
 
 		return { input, output, cacheRead, cacheWrite, total, hitRate, cost, currency };

package/types.ts

@@ -30,7 +30,7 @@ export type DeepSeekResult = {
 };
 
 export type ZaiResult = {
-	provider: "zai";
+	provider: "zai" | "zai-coding-cn";
 	tokensLimitPct: number;
 	tokensResetAt: number;
 	level: string;