@fyeeme/pi-statusline 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -7,6 +7,24 @@ 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

package/README.md

@@ -95,7 +95,7 @@ See the Pi Packages guide on [pi.dev](https://pi.dev) for the full list of sourc
 ## Status Bar Layout
 
 ```
-~/projects/my-repo (main)                    deepseek-v3 · xhigh
+~/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
 ```
 
@@ -120,6 +120,8 @@ The extension registers a `UsageProvider` per supported provider and refreshes u
 
 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).

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

@@ -27,7 +27,7 @@ import {
 	setCostCurrencyOverride,
 	getCostCurrencyOverride,
 } from "./cost.ts";
-import { refreshUsage, getCachedUsage, getUsageCacheAge } from "./cache.ts";
+import { refreshUsage, getCachedUsage, getUsageCacheAge, resetUsageCache } from "./cache.ts";
 import { formatCwd, buildStatLine, buildInfoLine } from "./footer.ts";
 
 // ---------------------------------------------------------------------------
@@ -79,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) {
@@ -132,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}] ---`);
@@ -188,6 +183,12 @@ export default function (pi: ExtensionAPI) {
 		}
 	});
 
+	// ---- 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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fyeeme/pi-statusline",
-  "version": "1.1.0",
-  "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/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

@@ -20,7 +20,10 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 
 		const billedInCny = deepSeekBilledInCny();
 
-		for (const entry of ctx.sessionManager.getEntries()) {
+		// 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;
@@ -42,7 +45,7 @@ export class SessionTokenUsageCalculator implements TokenUsageCalculator {
 			currency = override;
 		} else {
 			const p = ctx.model?.provider ?? "";
-			if (p.toLowerCase().includes("deepseek")) currency = deepSeekBilledInCny() ? "\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;