@fyeeme/pi-statusline 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -7,6 +7,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+
+- `getCachedUsage` crash when TTL expires and model provider has no registered UsageProvider (TypeError on null)
+- `scanWeeklyTokens` UTC/local timezone mismatch: file date parsing now uses local timezone to match `startOfCurrentWeekLocal`
+- Unhandled rejection in `refreshUsage` fire-and-forget callers: added catch-all error handler
+
+### Changed
+
+- Background usage refresh now deduplicates concurrent TTL-expired callers via memoized `refreshInFlight` promise
+- Weekly token scan results cached for 1 minute to reduce redundant filesystem I/O
+
+### Removed
+
+- MCP server status segment from footer and its event listeners (`mcp:status`/`mcp:disconnect`): no pi version emits these events
+
+## [1.0.1] - 2026-06-19
+
+### Fixed
+
+- ZAI weekly token count for plans without a `unit:6` weekly quota now comes from the backend `model-usage` API for the current natural week (Mon 00:00 UTC → now) instead of scanning local session files, so it matches the backend's per-week tally. Footer label changed from `7d:` to `W:` to reflect the natural-week window.
+
+### Changed
+
+- Natural-week window (DeepSeek local scan and ZAI fallback) now uses the host's local timezone instead of UTC, so "this week" matches the user's expectation. Both providers share the same boundary via `startOfCurrentWeekLocal`.
+
+### Removed
+
+- `quota/` directory (`QuotaCalculator` and its DeepSeek/ZAI implementations) and the `quotaCalculator` field on `UsageProvider`. These were never invoked at runtime; the live logic lives in the providers directly.
+
 ## [1.0.1] - 2026-06-19
 
 ### 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,41 @@ 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)
+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.
+
+## 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

@@ -12,9 +12,13 @@ interface CacheEntry {
 const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 
 let usageCache: CacheEntry | null = null;
+let refreshInFlight: Promise<ProviderUsageResult> | null = null;
+let refreshGeneration = 0;
 
 export function resetUsageCache(): void {
 	usageCache = null;
+	refreshInFlight = null;
+	refreshGeneration += 1;
 }
 
 export function getUsageCache(): CacheEntry | null {
@@ -33,13 +37,22 @@ export async function refreshUsage(
 		return null;
 	}
 
-	const result = await provider.fetchUsage(modelRegistry, model);
-	if (result) {
-		usageCache = { result, fetchedAt: Date.now() };
-	} else {
-		usageCache = null;
+	const gen = ++refreshGeneration;
+	try {
+		const result = await provider.fetchUsage(modelRegistry, model);
+		// Drop stale responses from older generations
+		if (gen !== refreshGeneration) return usageCache?.result ?? null;
+		if (result) {
+			usageCache = { result, fetchedAt: Date.now() };
+		} else {
+			usageCache = null;
+		}
+		return result;
+	} catch {
+		// Total catch: fire-and-forget callers must never see an unhandled rejection
+		if (gen === refreshGeneration) usageCache = null;
+		return null;
 	}
-	return result;
 }
 
 export function getUsageCacheAge(): number | null {
@@ -53,11 +66,22 @@ export function getCachedUsage(
 	lastModel: ExtensionContext["model"] | undefined,
 ): ProviderUsageResult {
 	if (!usageCache) return null;
-	if (Date.now() - usageCache.fetchedAt > CACHE_TTL_MS) {
-		// TTL expired: return stale data but trigger background refresh
+	// Capture local snapshot before triggering background refresh: refreshUsage
+	// 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;
+	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.
 		if (lastCtx && lastModel) {
-			void refreshUsage(providers, lastCtx.modelRegistry, lastModel);
+			if (!refreshInFlight) {
+				const promise = refreshUsage(providers, lastCtx.modelRegistry, lastModel);
+				refreshInFlight = promise;
+				promise.finally(() => {
+					if (refreshInFlight === promise) refreshInFlight = null;
+				});
+			}
 		}
 	}
-	return usageCache.result;
+	return cache.result;
 }

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/footer.ts

@@ -75,7 +75,6 @@ export function buildStatLine(
 	providers: Record<string, UsageProvider>,
 	getElapsedSec: () => number,
 	lastTps: number,
-	mcpStatuses: Map<string, { connected: boolean; toolCount: number }>,
 ): string {
 	const mods: string[] = [];
 
@@ -131,15 +130,8 @@ export function buildStatLine(
 		if (t.length) mods.push(t.join(" "));
 	}
 
-	// MCP: MCP:2(15) or MCP:0
-	{
-		const entries = Array.from(mcpStatuses.entries());
-		if (entries.length) {
-			const connected = entries.filter(([, s]) => s.connected).length;
-			const tools = entries.reduce((sum, [, s]) => sum + s.toolCount, 0);
-			mods.push(connected > 0 ? `MCP:${connected}(${tools})` : "MCP:0");
-		}
-	}
+	// MCP status: no pi version emits mcp:status/mcp:disconnect events.
+	// The segment is disabled until a documented event source exists.
 
 	return mods.join(" · ");
 }

package/index.ts

@@ -22,6 +22,11 @@ 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 {
+	applyDeepSeekPricingPatch,
+	setCostCurrencyOverride,
+	getCostCurrencyOverride,
+} from "./cost.ts";
 import { refreshUsage, getCachedUsage, getUsageCacheAge } from "./cache.ts";
 import { formatCwd, buildStatLine, buildInfoLine } from "./footer.ts";
 
@@ -45,11 +50,8 @@ let lastModel: ExtensionContext["model"] = undefined;
 let agentRunning = false;
 let lastElapsedSec = 0;
 let lastTps = 0;
-let currencyOverride: "¥" | "$" | undefined = undefined;
 
-const mcpStatuses = new Map<string, { connected: boolean; toolCount: number }>();
-
-const tokenCalculator = new SessionTokenUsageCalculator(() => currencyOverride);
+const tokenCalculator = new SessionTokenUsageCalculator(() => getCostCurrencyOverride());
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -99,14 +101,6 @@ export default function (pi: ExtensionAPI) {
 		}
 	});
 
-	pi.events.on("mcp:status", (raw) => {
-		const data = raw as { id: string; connected: boolean; toolCount: number };
-		mcpStatuses.set(data.id, { connected: data.connected, toolCount: data.toolCount });
-	});
-	pi.events.on("mcp:disconnect", (raw) => {
-		mcpStatuses.delete((raw as { id: string }).id);
-	});
-
 	// ---- /status-debug ----
 	pi.registerCommand("status-debug", {
 		description: "Dump session stats to /tmp/pi-status-debug.log + console.error",
@@ -168,17 +162,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);
 		},
 	});
 
@@ -186,6 +183,7 @@ 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);
 		}
 	});
@@ -198,6 +196,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;
@@ -235,7 +236,7 @@ export default function (pi: ExtensionAPI) {
 
 					// Line 1: tokens + cost + provider usage + context + elapsed + tps + mcp
 					lines.push(truncateToWidth(
-						dim(buildStatLine(stats, cu, providerResult, providers, getElapsedSec, lastTps, mcpStatuses)),
+						dim(buildStatLine(stats, cu, providerResult, providers, getElapsedSec, lastTps)),
 						width,
 						dim("..."),
 					));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fyeeme/pi-statusline",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Rich custom status bar for pi with token usage, cost, DeepSeek balance, context window, timing, and MCP connection status.",
   "type": "module",
   "license": "MIT",
@@ -34,7 +34,6 @@
   "files": [
     "*.ts",
     "providers/*.ts",
-    "quota/*.ts",
     "README.md",
     "LICENSE",
     "CHANGELOG.md"

package/providers/deepseek.ts

@@ -1,13 +1,11 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { DeepSeekResult, ProviderUsageResult } from "../types.ts";
 import type { UsageProvider } from "./types.ts";
-import type { QuotaCalculator } from "../quota/types.ts";
-import { DeepSeekQuotaCalculator } from "../quota/deepseek.ts";
+import { applyDeepSeekPricingPatch, setDetectedDeepSeekCurrency } from "../cost.ts";
 import { scanWeeklyTokens } from "../session-scanner.ts";
 import { fmt } from "../footer.ts";
 
 export class DeepSeekUsageProvider implements UsageProvider {
-	quotaCalculator: QuotaCalculator = new DeepSeekQuotaCalculator();
 
 	async fetchUsage(
 		modelRegistry: ExtensionContext["modelRegistry"],
@@ -42,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/types.ts

@@ -1,6 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { ProviderUsageResult } from "../types.ts";
-import type { QuotaCalculator } from "../quota/types.ts";
 
 export interface UsageProvider {
 	fetchUsage(
@@ -9,5 +8,4 @@ export interface UsageProvider {
 	): Promise<ProviderUsageResult>;
 	formatForFooter(result: NonNullable<ProviderUsageResult>, sessionCost: number, currency: string): string;
 	debugDump(result: NonNullable<ProviderUsageResult>, w: (s: string) => void): void;
-	quotaCalculator: QuotaCalculator;
 }

package/providers/zai.ts

@@ -1,10 +1,8 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { ZaiResult, ProviderUsageResult } from "../types.ts";
 import type { UsageProvider } from "./types.ts";
-import type { QuotaCalculator } from "../quota/types.ts";
-import { ZaiQuotaCalculator } from "../quota/zai.ts";
 import { fmt, formatCountdown, formatWeeklyCountdown } from "../footer.ts";
-import { scanWeeklyTokens } from "../session-scanner.ts";
+import { startOfCurrentWeekLocal, startOfNextWeekLocal } from "../week.ts";
 
 /** Check if the provider name is a ZAI/GLM variant. */
 function isZaiProvider(provider: string): boolean {
@@ -12,7 +10,6 @@ function isZaiProvider(provider: string): boolean {
 }
 
 export class ZaiUsageProvider implements UsageProvider {
-	quotaCalculator: QuotaCalculator = new ZaiQuotaCalculator();
 
 	async fetchUsage(
 		modelRegistry: ExtensionContext["modelRegistry"],
@@ -75,16 +72,15 @@ export class ZaiUsageProvider implements UsageProvider {
 				const cycleStart = weeklyResetAt - 7 * 24 * 60 * 60 * 1000;
 				weeklyTokens = await this.fetchCycleUsage(origin, headers, cycleStart, now);
 			} else {
-				// No unit:6 — natural week fallback, same as DeepSeek
+				// No unit:6 — natural week fallback. Fetch real usage from the
+				// model-usage API for the current natural week (Mon 00:00 local → now)
+				// so the figure matches the backend's per-week tally instead of
+				// only counting tokens from local session files.
 				isNaturalWeek = true;
-				weeklyTokens = scanWeeklyTokens(model.provider);
-
 				const d = new Date(now);
-				const dayOfWeek = d.getUTCDay();
-				const daysUntilMonday = dayOfWeek === 0 ? 1 : 8 - dayOfWeek;
-				weeklyResetAt = Date.UTC(
-					d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + daysUntilMonday, 0, 0, 0, 0,
-				);
+				const cycleStart = startOfCurrentWeekLocal(d);
+				weeklyResetAt = startOfNextWeekLocal(d);
+				weeklyTokens = await this.fetchCycleUsage(origin, headers, cycleStart, now);
 			}
 
 			return {
@@ -114,7 +110,7 @@ export class ZaiUsageProvider implements UsageProvider {
 		// Weekly quota
 		if (zai.isNaturalWeek) {
 			if (zai.weeklyTokens > 0) {
-				parts.push(`7d:${fmt(zai.weeklyTokens)}`);
+				parts.push(`W:${fmt(zai.weeklyTokens)}`);
 			}
 		} else if (zai.weeklyTokens > 0 || zai.weeklyPct > 0) {
 			const weeklyCountdown = formatWeeklyCountdown(zai.weeklyResetAt);

package/session-scanner.ts

@@ -1,16 +1,25 @@
 import { readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { startOfCurrentWeekLocal } from "./week.ts";
+
+const SCAN_CACHE_TTL_MS = 60_000; // 1 minute
+let scanCache: { providerName: string; sessionsDir: string; weekStartMs: number; total: number; fetchedAt: number } | null = null;
 
 export function scanWeeklyTokens(providerName: string): number {
 	const sessionsDir = join(getAgentDir(), "sessions");
-	const now = new Date();
-	// Natural week: Monday 00:00 UTC
-	const dayOfWeek = now.getUTCDay();
-	const mondayOffset = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
-	const weekStart = new Date(
-		Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() - mondayOffset, 0, 0, 0, 0),
-	);
+	const weekStartMs = startOfCurrentWeekLocal();
+
+	// Return cached result if still valid for the same week window and sessions dir
+	if (
+		scanCache &&
+		scanCache.providerName === providerName &&
+		scanCache.sessionsDir === sessionsDir &&
+		scanCache.weekStartMs === weekStartMs &&
+		Date.now() - scanCache.fetchedAt < SCAN_CACHE_TTL_MS
+	) {
+		return scanCache.total;
+	}
 
 	let total = 0;
 
@@ -28,8 +37,8 @@ export function scanWeeklyTokens(providerName: string): number {
 			for (const fname of files) {
 				if (!fname.endsWith(".jsonl")) continue;
 				try {
-					const fileDate = new Date(fname.slice(0, 10) + "T00:00:00Z");
-					if (fileDate < weekStart) continue;
+					const fileDate = new Date(fname.slice(0, 10) + "T00:00:00");
+					if (fileDate.getTime() < weekStartMs) continue;
 				} catch {
 					continue;
 				}
@@ -60,5 +69,6 @@ export function scanWeeklyTokens(providerName: string): number {
 		// sessions dir doesn't exist or is unreadable
 	}
 
+	scanCache = { providerName, sessionsDir, weekStartMs, total, fetchedAt: Date.now() };
 	return total;
 }

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,6 +18,8 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 		let total = 0;
 		let cost = 0;
 
+		const billedInCny = deepSeekBilledInCny();
+
 		for (const entry of ctx.sessionManager.getEntries()) {
 			if (entry.type === "message" && entry.message.role === "assistant") {
 				const m = entry.message as AssistantMessage;
@@ -25,7 +28,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 +42,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 = deepSeekBilledInCny() ? "\u00a5" : "$";
 		}
 
 		return { input, output, cacheRead, cacheWrite, total, hitRate, cost, currency };

package/week.ts

@@ -0,0 +1,30 @@
+/**
+ * Natural-week window helpers.
+ *
+ * Both DeepSeek (local session scan) and ZAI (backend usage API) derive their
+ * weekly window from here, so the two providers always agree on the same
+ * natural-week boundary — Monday 00:00 in the host's local timezone.
+ *
+ * Note: UTC was used previously; local timezone is now intentional so the
+ * figures line up with how users perceive "this week".
+ */
+
+const DAY_MS = 24 * 60 * 60 * 1000;
+
+/**
+ * Epoch ms of the start of the current natural week (this Monday 00:00 local).
+ * `now` is overridable for testing.
+ */
+export function startOfCurrentWeekLocal(now: Date = new Date()): number {
+	const dayOfWeek = now.getDay(); // 0=Sun .. 6=Sat
+	const mondayOffset = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
+	return new Date(
+		now.getFullYear(), now.getMonth(), now.getDate() - mondayOffset,
+		0, 0, 0, 0,
+	).getTime();
+}
+
+/** Epoch ms of the start of the next natural week (next Monday 00:00 local). */
+export function startOfNextWeekLocal(now: Date = new Date()): number {
+	return startOfCurrentWeekLocal(now) + 7 * DAY_MS;
+}

package/quota/deepseek.ts

@@ -1,31 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { QuotaCalculator, QuotaInfo, WeeklyQuota } from "./types.ts";
-import { scanWeeklyTokens } from "../session-scanner.ts";
-
-export class DeepSeekQuotaCalculator implements QuotaCalculator {
-	async calculate(
-		_modelRegistry: ExtensionContext["modelRegistry"],
-		_model: ExtensionContext["model"],
-	): Promise<QuotaInfo> {
-		const weeklyTokens = scanWeeklyTokens("deepseek");
-
-		// Next Monday 00:00 UTC
-		const now = new Date();
-		const dayOfWeek = now.getUTCDay();
-		const daysUntilMonday = dayOfWeek === 0 ? 1 : 8 - dayOfWeek;
-		const nextMonday = new Date(
-			Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + daysUntilMonday, 0, 0, 0, 0),
-		);
-
-		const weekly: WeeklyQuota = {
-			usedTokens: weeklyTokens,
-			resetAt: nextMonday.getTime(),
-			crossesNaturalWeek: false,
-		};
-
-		return {
-			rolling: null,
-			weekly,
-		};
-	}
-}

package/quota/types.ts

@@ -1,34 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-
-/** Rolling quota window (e.g. ZAI 5-hour token quota) */
-export interface RollingQuota {
-	/** Usage percentage 0–100 */
-	usedPct: number;
-	/** Epoch ms when the window resets */
-	resetAt: number;
-}
-
-/** Weekly subscription quota */
-export interface WeeklyQuota {
-	/** Total tokens used in the subscription week */
-	usedTokens: number;
-	/** Epoch ms when the subscription week resets */
-	resetAt: number;
-	/** Whether resetAt crosses a natural week boundary */
-	crossesNaturalWeek: boolean;
-	/** Usage percentage from unit:6 TOKENS_LIMIT (0 if natural week) */
-	weeklyPct?: number;
-}
-
-/** Provider-specific quota. Fields are null when the provider doesn't support them. */
-export interface QuotaInfo {
-	rolling: RollingQuota | null;
-	weekly: WeeklyQuota | null;
-}
-
-export interface QuotaCalculator {
-	calculate(
-		modelRegistry: ExtensionContext["modelRegistry"],
-		model: ExtensionContext["model"],
-	): Promise<QuotaInfo>;
-}

package/quota/zai.ts

@@ -1,90 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { QuotaCalculator, QuotaInfo, WeeklyQuota } from "./types.ts";
-import { scanWeeklyTokens } from "../session-scanner.ts";
-
-export class ZaiQuotaCalculator implements QuotaCalculator {
-	async calculate(
-		modelRegistry: ExtensionContext["modelRegistry"],
-		model: ExtensionContext["model"],
-	): Promise<QuotaInfo> {
-		if (!model || (model.provider !== "zai" && model.provider !== "zai-coding-cn")) {
-			return { rolling: null, weekly: null };
-		}
-
-		const apiKey = await modelRegistry.getApiKeyForProvider(model.provider);
-		if (!apiKey) return { rolling: null, weekly: null };
-
-		const defaultOrigin = model.provider === "zai-coding-cn"
-			? "https://open.bigmodel.cn"
-			: "https://api.z.ai";
-		let origin = defaultOrigin;
-		try { origin = new URL(model.baseUrl ?? defaultOrigin).origin; } catch { /* use default */ }
-
-		const headers: Record<string, string> = {
-			Authorization: apiKey,
-			"Accept-Language": "en-US,en",
-			"Content-Type": "application/json",
-		};
-
-		let rolling: QuotaInfo["rolling"] = null;
-		let weekly: QuotaInfo["weekly"] = null;
-
-		try {
-			const quotaRes = await fetch(`${origin}/api/monitor/usage/quota/limit`, {
-				headers,
-				signal: AbortSignal.timeout(5000),
-			});
-			if (quotaRes.ok) {
-				const quotaData = (await quotaRes.json()) as {
-					data?: {
-						limits?: Array<{
-							type: string;
-							unit?: number;
-							percentage?: number;
-							nextResetTime?: number;
-						}>;
-					};
-				};
-
-				const limits = quotaData.data?.limits ?? [];
-				const fiveHourLimit = limits.find((l) => l.type === "TOKENS_LIMIT" && l.unit === 3);
-				const weeklyLimit = limits.find((l) => l.type === "TOKENS_LIMIT" && l.unit === 6);
-
-				if (fiveHourLimit) {
-					rolling = {
-						usedPct: fiveHourLimit.percentage ?? 0,
-						resetAt: fiveHourLimit.nextResetTime ?? 0,
-					};
-				}
-
-				if (weeklyLimit && weeklyLimit.nextResetTime && weeklyLimit.nextResetTime > 0) {
-					// unit:6 — weekly quota from API
-					weekly = {
-						usedTokens: 0, // actual token count fetched separately by provider
-						resetAt: weeklyLimit.nextResetTime ?? 0,
-						crossesNaturalWeek: true,
-						weeklyPct: weeklyLimit.percentage ?? 0,
-					};
-				} else {
-					// No unit:6 — natural week fallback
-					const weeklyTokens = scanWeeklyTokens(model.provider);
-					const now = new Date();
-					const dayOfWeek = now.getUTCDay();
-					const daysUntilMonday = dayOfWeek === 0 ? 1 : 8 - dayOfWeek;
-					const nextMonday = new Date(
-						Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + daysUntilMonday, 0, 0, 0, 0),
-					);
-					weekly = {
-						usedTokens: weeklyTokens,
-						resetAt: nextMonday.getTime(),
-						crossesNaturalWeek: false,
-					};
-				}
-			}
-		} catch {
-			// quota unavailable
-		}
-
-		return { rolling, weekly };
-	}
-}