@fyeeme/pi-statusline 1.2.4 → 1.2.5

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.5] - 2026-09-18
+
+### Changed
+
+- Compact token segment: `tokens 78.9%(↑in ↓out Rcache)` replaces `tokens total(in, out, cache,hit%)`. Cache hit rate moves to the front; the total and cache-write numbers are no longer displayed.
+- ZAI quota segments made symmetric and labeled: `5h 42%(1.2M,1h23m) · wk 35%(12M,3d4h)` replaces `Usage 42%(1h23m) · W:35%(1.2M,3d4h)`. Both windows now show in-window token usage (the 5h window is summed via the model-usage API over `[resetAt - 5h, now]`); the natural-week fallback stays `wk 1.2M`. The context segment gains a `Ctx` prefix (`Ctx 45.2%/64k`).
+
 ## [1.2.4] - 2026-09-10
 
 ### Changed

package/README.md

@@ -9,7 +9,7 @@ A rich custom status bar for [pi](https://pi.dev) that replaces the default foot
 
 - **Provider-aware usage** — special support for DeepSeek and GLM/ZAI (see [Provider Support](#provider-support))
 - **DeepSeek peak/off-peak pricing** — session cost follows DeepSeek's 2026-08-17 peak/off-peak billing (peak 9:00-12:00 / 14:00-18:00 Beijing time on weekdays; weekends are off-peak all day since 2026-08-23), priced per-message by timestamp, with a live `peak`/`off-peak` indicator in the footer (see [DeepSeek](#deepseek))
-- **Token usage**: input, output, cache read/write, total per session, with cache hit rate
+- **Token usage**: compact `tokens 78.9%(↑in ↓out Rcache)` segment 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
@@ -62,12 +62,12 @@ Shows **5-hour rolling quota** and **weekly quota** (or natural-week usage as fa
 
 | 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) |
+| 5h quota | `5h 42%(1.2M,1h23m)` | `quota/limit` (`unit:3`) + `model-usage` API |
+| Weekly quota | `wk 35%(12M,3d4h)` | `quota/limit` (`unit:6`) + `model-usage` API |
+| Natural week | `wk 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)
+- **5-hour rolling window**: percentage used, in-window token usage, countdown to reset
+- **Weekly quota**: if the plan exposes a `unit:6` weekly limit, shows percentage, in-week token usage, 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
 
@@ -121,7 +121,7 @@ See the Pi Packages guide on [pi.dev](https://pi.dev) for the full list of sourc
 
 ```
 ~/projects/my-repo (main)                    deepseek-v4-pro · xhigh
-tokens 65k(in 12k, out 8k, cache 45k) · ¥0.12/50.00 · 7d:1.2M · off-peak · 45.2%/64k · 2m30s 38.2tok/s
+tokens 78.9%(↑12k ↓8k R45k) · ¥0.12/50.00 · 7d:1.2M · off-peak · Ctx 45.2%/64k · 2m30s 38.2tok/s
 ```
 
 **Line 1**: cwd + git branch (left) | model + thinking level (right)
@@ -132,7 +132,7 @@ tokens 65k(in 12k, out 8k, cache 45k) · ¥0.12/50.00 · 7d:1.2M · off-peak ·
 
 ```
 ~/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
+tokens 78.9%(↑12k ↓8k R45k) · 5h 42%(1.2M,1h23m) · wk 35%(12M,3d4h) · Ctx 45.2%/64k · 2m30s 38.2tok/s
 ```
 
 ## Environment Variables

package/footer.ts

@@ -78,22 +78,17 @@ export function buildStatLine(
 ): string {
 	const mods: string[] = [];
 
-	// tokens 566k(in 29k, out 22k, cache 515k,45.2%)
+	// tokens 45.2%(↑29k ↓22k R515k)
 	{
 		const tok: string[] = [];
-		if (stats.input) tok.push(`in ${fmt(stats.input)}`);
-		if (stats.output) tok.push(`out ${fmt(stats.output)}`);
-		const cache = stats.cacheRead + stats.cacheWrite;
-		if (cache) {
-			const cacheStr = stats.hitRate > 0
-				? `cache ${fmt(cache)},${(stats.hitRate * 100).toFixed(1)}%`
-				: `cache ${fmt(cache)}`;
-			tok.push(cacheStr);
-		}
-		if (tok.length > 0 && stats.total) {
-			mods.push(`tokens ${fmt(stats.total)}(${tok.join(", ")})`);
-		} else if (tok.length > 0) {
-			mods.push(tok.join(", "));
+		if (stats.input) tok.push(`↑${fmt(stats.input)}`);
+		if (stats.output) tok.push(`↓${fmt(stats.output)}`);
+		if (stats.cacheRead) tok.push(`R${fmt(stats.cacheRead)}`);
+		if (tok.length > 0) {
+			const pct = stats.hitRate > 0 ? ` ${(stats.hitRate * 100).toFixed(1)}%` : "";
+			mods.push(`tokens${pct}(${tok.join(" ")})`);
+		} else if (stats.total) {
+			mods.push(`tokens ${fmt(stats.total)}`);
 		}
 	}
 
@@ -111,13 +106,13 @@ export function buildStatLine(
 		}
 	}
 
-	// context: 45.2%/16k or ?/16k
+	// Ctx: 45.2%/16k or ?/16k
 	if (contextUsage) {
 		const w = fmt(contextUsage.contextWindow);
 		mods.push(
 			contextUsage.percent !== null
-				? `${contextUsage.percent.toFixed(1)}%/${w}`
-				: `?/${w}`,
+				? `Ctx ${contextUsage.percent.toFixed(1)}%/${w}`
+				: `Ctx ?/${w}`,
 		);
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fyeeme/pi-statusline",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Rich custom status bar for pi with token usage, cost, DeepSeek balance, context window, and timing.",
   "type": "module",
   "license": "MIT",

package/providers/zai.ts

@@ -60,6 +60,7 @@ export class ZaiUsageProvider implements UsageProvider {
 			const level = quotaData.data?.level ?? "";
 
 			const now = Date.now();
+			let fiveHourTokens = 0;
 			let weeklyTokens = 0;
 			let weeklyResetAt = 0;
 			let weeklyPct = 0;
@@ -83,10 +84,23 @@ export class ZaiUsageProvider implements UsageProvider {
 				weeklyTokens = await this.fetchCycleUsage(origin, headers, cycleStart, now);
 			}
 
+			// 5h rolling window: GLM starts the 5h window at the first request, so
+			// the current window spans [resetAt - 5h, now]. Sum model-usage over it.
+			const tokensResetAt = fiveHourLimit?.nextResetTime ?? 0;
+			if (tokensResetAt > 0) {
+				fiveHourTokens = await this.fetchCycleUsage(
+					origin,
+					headers,
+					tokensResetAt - 5 * 60 * 60 * 1000,
+					now,
+				);
+			}
+
 			return {
 				provider: model.provider,
 				tokensLimitPct: fiveHourLimit?.percentage ?? 0,
-				tokensResetAt: fiveHourLimit?.nextResetTime ?? 0,
+				tokensResetAt,
+				fiveHourTokens,
 				level,
 				weeklyTokens,
 				weeklyResetAt,
@@ -103,18 +117,18 @@ export class ZaiUsageProvider implements UsageProvider {
 		const zai = result as ZaiResult;
 		const parts: string[] = [];
 
-		// 5-hour rolling quota
-		const countdown = formatCountdown(zai.tokensResetAt);
-		parts.push(`Usage ${zai.tokensLimitPct}%(${countdown})`);
+		// 5h 42%(1.2M,1h23m) — 5-hour rolling window: pct(in-window tokens,reset countdown)
+		if (zai.tokensResetAt > 0) {
+			parts.push(`5h ${zai.tokensLimitPct}%(${fmt(zai.fiveHourTokens)},${formatCountdown(zai.tokensResetAt)})`);
+		}
 
-		// Weekly quota
+		// wk 35%(12M,3d4h) — weekly quota; natural-week fallback has no pct → wk 1.2M
 		if (zai.isNaturalWeek) {
 			if (zai.weeklyTokens > 0) {
-				parts.push(`W:${fmt(zai.weeklyTokens)}`);
+				parts.push(`wk ${fmt(zai.weeklyTokens)}`);
 			}
-		} else if (zai.weeklyTokens > 0 || zai.weeklyPct > 0) {
-			const weeklyCountdown = formatWeeklyCountdown(zai.weeklyResetAt);
-			parts.push(`W:${zai.weeklyPct}%(${fmt(zai.weeklyTokens)},${weeklyCountdown})`);
+		} else if (zai.weeklyResetAt > 0) {
+			parts.push(`wk ${zai.weeklyPct}%(${fmt(zai.weeklyTokens)},${formatWeeklyCountdown(zai.weeklyResetAt)})`);
 		}
 
 		return parts.join(" · ");
@@ -125,6 +139,7 @@ export class ZaiUsageProvider implements UsageProvider {
 		const zai = result as ZaiResult;
 		w(`  tokensLimitPct: ${zai.tokensLimitPct}%`);
 		w(`  tokensResetAt: ${new Date(zai.tokensResetAt).toISOString()}`);
+		w(`  fiveHourTokens: ${zai.fiveHourTokens}`);
 		w(`  level: ${zai.level}`);
 		w(`  weeklyTokens: ${zai.weeklyTokens}`);
 		w(`  weeklyPct: ${zai.weeklyPct}%`);

package/types.ts

@@ -33,6 +33,8 @@ export type ZaiResult = {
 	provider: "zai" | "zai-coding-cn";
 	tokensLimitPct: number;
 	tokensResetAt: number;
+	/** tokens used within the current 5-hour window (0 when unknown) */
+	fiveHourTokens: number;
 	level: string;
 	weeklyTokens: number;
 	weeklyResetAt: number;