coding-usage-bar 0.5.1 → 0.6.1

package/README.md

@@ -114,6 +114,8 @@ Coding Usage Bar calls the Zhipu AI quota API (`GET /api/monitor/usage/quota/lim
 
 Get your API key from the [Zhipu AI console](https://open.bigmodel.cn). Without this key, GLM monitoring will report `GLM_API_KEY_MISSING`.
 
+Zhipu meters newer Coding Plans in credits (积分) instead of raw tokens and reports them as `CREDIT_LIMIT` windows. Coding Usage Bar keys off the response shape, records `quotaUnit` as `credits` or `tokens` in `status.json`, and labels the dropdown with `metered in credits` so the 5h/7d percentages read correctly for either plan generation. This detection has not been verified against a real V3 (points-based) account yet; it is based on the `CREDIT_LIMIT` shape observed on existing plans. If you are on a V3 plan, a redacted `coding-usage-bar status --refresh` output in an issue would confirm it.
+
 ## DeepSeek
 
 Coding Usage Bar calls `GET https://api.deepseek.com/user/balance` to read your account balance. DeepSeek exposes balance rather than 5h/7d usage windows, so the menu bar shows `Available` or `Depleted` plus the currency amount. Set `deepseek.apiKey` in `~/.coding-usage-bar/config.json`:
@@ -129,6 +131,17 @@ Coding Usage Bar calls `GET https://api.deepseek.com/user/balance` to read your
 
 Without this key, DeepSeek monitoring will report `DEEPSEEK_API_KEY_MISSING`.
 
+## Peak and off-peak pricing
+
+GLM Coding Plan and the DeepSeek API both publish a clock-based discount, and both state it in Beijing time. Coding Usage Bar computes the current tier on the producer side, stores it in `status.json` as `pricing`, and shows it in the CLI table (`price` row), the dropdown, and the usage card, together with the time of the next flip:
+
+| Provider | Peak (Asia/Shanghai) | Off-peak | Holidays |
+|---|---|---|---|
+| DeepSeek API | Mon–Fri 09:00–12:00 and 14:00–18:00 | 50% of the peak rate | Chinese public holidays are off-peak all day |
+| GLM Coding Plan | Mon–Fri 14:00–18:00 | credits deducted at 50% | Not excluded by the published rule |
+
+Sources: [DeepSeek pricing](https://api-docs.deepseek.com/quick_start/pricing) and the [GLM Coding Plan overview](https://docs.bigmodel.cn/cn/coding-plan/overview). The 2026 holiday table follows the State Council notice (国办发明电〔2025〕7号); adjusted working weekends stay off-peak because both vendors phrase the rule as Monday to Friday. Time-boxed promotions are not modelled. The tier only tells you what the provider charges right now; it does not change the burn analysis.
+
 ## MiniMax (M3)
 
 Coding Usage Bar calls `GET https://api.minimaxi.com/v1/token_plan/remains` to read 5h and 7d usage windows. MiniMax returns two signals per model: a count-based ratio (`current_*_usage_count` / `current_*_total_count`) for tiered models like `video`, and a credit-based `current_*_remaining_percent` (0-100) for the `general` model where the count stays at 0. Coding Usage Bar prefers the count ratio when total > 0 and otherwise derives used% as `100 - remaining_percent`. Set `minimax.apiKey` and (optionally) `minimax.region` in `~/.coding-usage-bar/config.json`:

package/README.zh-CN.md

@@ -50,6 +50,17 @@ coding-usage-bar status
 - Claude Code、Codex 本地优先，不依赖额外遥测服务
 - 展示层只读稳定的 `status.json`，不会在打开菜单时临时访问数据源
 - 接近限额或燃烧节奏异常时发送系统通知
+- 国产套餐规则内置：GLM Coding Plan 与 DeepSeek 的峰谷时段按北京时间计算，法定节假日按国办通知处理，CLI、下拉菜单和卡片都会显示当前是高峰还是谷时、几折、几点切换
+- GLM 新版 Coding Plan 按积分（`CREDIT_LIMIT`）计量时自动识别，标注"按积分计量"，5h/7d 百分比不会因为套餐换代而失真。该识别基于现有套餐观测到的 `CREDIT_LIMIT` 形状，尚未用真实 V3 积分制账号实测；V3 用户可在 issue 里贴脱敏的 `coding-usage-bar status --refresh` 输出帮助确认
+
+## 峰谷时段
+
+| Provider | 高峰（北京时间） | 谷时 | 法定节假日 |
+|---|---|---|---|
+| DeepSeek API | 周一至周五 09:00–12:00、14:00–18:00 | 高峰价的 50% | 全天谷时 |
+| GLM Coding Plan | 周一至周五 14:00–18:00 | 积分按 50% 抵扣 | 官方规则未排除，按工作日字面处理 |
+
+依据 [DeepSeek 定价页](https://api-docs.deepseek.com/quick_start/pricing)与 [GLM Coding Plan 概览](https://docs.bigmodel.cn/cn/coding-plan/overview)。2026 年节假日表来自国办发明电〔2025〕7号；调休上班的周末仍按周末处理，因为两家都把规则写成"周一至周五"。限时活动（如双节全天谷时）不建模。峰谷只说明厂商此刻怎么计费，不改变燃烧节奏分析。
 
 完整命令、Provider 配置和实现边界请查看[英文 README](README.md)。
 

package/dist/deepseek.js

@@ -1,3 +1,4 @@
+import { deepseekPricing } from "./pricing.js";
 const DEFAULT_BASE_URL = "https://api.deepseek.com";
 export async function fetchDeepseekBalance(config) {
     const url = `${DEFAULT_BASE_URL}/user/balance`;
@@ -19,11 +20,13 @@ export function usageFromDeepseekBalance(balance, options) {
     if (!info) {
         return null;
     }
+    const observedAt = options.observedAt ?? new Date().toISOString();
     return {
         provider: "deepseek",
         source: options.source,
-        observedAt: options.observedAt ?? new Date().toISOString(),
+        observedAt,
         planType: null,
+        pricing: deepseekPricing(new Date(observedAt)),
         windows: [],
         balance: {
             total: info.total_balance,

package/dist/format.js

@@ -62,10 +62,24 @@ export function usageBar(usedPercent, width = 12) {
     const usedCells = Math.max(0, Math.min(width, Math.round((usedPercent / 100) * width)));
     return `[${"#".repeat(usedCells)}${"-".repeat(width - usedCells)}] ${Math.round(usedPercent)}%`;
 }
+function pricingRow(usage) {
+    if (!usage.pricing) {
+        return null;
+    }
+    const tier = usage.pricing.tier === "off_peak" ? `off-peak ${usage.pricing.discountPercent}% off` : "peak, full price";
+    return [
+        providerLabel(usage.provider).padEnd(8),
+        "price".padEnd(8),
+        tier.padEnd(19),
+        formatDurationUntil(usage.pricing.until).padEnd(10),
+        usage.quotaUnit === "credits" ? "credits" : "",
+    ].join("");
+}
 export function formatStatusRows(usages, analyses) {
     const rows = ["Provider  Period  Usage              Reset     State"];
     for (const usage of usages) {
         const analysis = analyses.find((item) => item.provider === usage.provider);
+        const price = pricingRow(usage);
         if (usage.balance && usage.windows.length === 0) {
             const currency = usage.balance.currency === "CNY" ? "¥" : "$";
             rows.push([
@@ -75,6 +89,8 @@ export function formatStatusRows(usages, analyses) {
                 "".padEnd(10),
                 analysis?.state ?? "RAW",
             ].join(""));
+            if (price)
+                rows.push(price);
             continue;
         }
         for (const window of usage.windows) {
@@ -86,6 +102,8 @@ export function formatStatusRows(usages, analyses) {
                 analysis?.state ?? "RAW",
             ].join(""));
         }
+        if (price)
+            rows.push(price);
     }
     return rows.join("\n");
 }

package/dist/glm.js

@@ -1,4 +1,5 @@
 import { makeProviderUsage, normalizeWindow } from "./usage.js";
+import { glmPricing } from "./pricing.js";
 const DEFAULT_BASE_URL = "https://open.bigmodel.cn";
 export async function fetchGlmQuota(config) {
     const baseUrl = config.baseUrl || DEFAULT_BASE_URL;
@@ -50,7 +51,7 @@ function pickTokenWindows(limits) {
     for (const type of ["TOKENS_LIMIT", "CREDIT_LIMIT"]) {
         const picked = pickTokenWindowsOfType(limits.filter((limit) => limit.type === type));
         if (picked) {
-            return picked;
+            return { ...picked, unit: type === "CREDIT_LIMIT" ? "credits" : "tokens" };
         }
     }
     return null;
@@ -77,7 +78,7 @@ export function usageFromGlmQuota(quota, options) {
     if (!fiveHour || !sevenDay) {
         return null;
     }
-    return makeProviderUsage({
+    const usage = makeProviderUsage({
         provider: "glm",
         source: options.source,
         observedAt: options.observedAt,
@@ -85,6 +86,11 @@ export function usageFromGlmQuota(quota, options) {
         fiveHour,
         sevenDay,
     });
+    return {
+        ...usage,
+        quotaUnit: picked.unit,
+        pricing: glmPricing(new Date(usage.observedAt)),
+    };
 }
 export async function collectGlmUsage(config) {
     if (!config.apiKey) {

package/dist/menubar.d.ts

@@ -5,6 +5,7 @@ export type TitleMode = "auto" | TitleTier;
 export declare function readTitleMode(paths?: RuntimePaths): TitleMode;
 export declare function writeTitleMode(mode: TitleMode, paths?: RuntimePaths): TitleMode;
 export declare function cycleTitleMode(paths?: RuntimePaths): TitleMode;
+export declare function resolveTitleTier(mode: TitleMode, display: StatusSnapshot["display"], providerCount: number): TitleTier;
 export declare function pickTitleTier(display: StatusSnapshot["display"], providerCount: number): TitleTier;
 export declare function swiftBarPluginPath(paths?: RuntimePaths): {
     dir: string;

package/dist/menubar.js

@@ -4,6 +4,7 @@ import { execFileSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { ensureDir, isFile } from "./fs-util.js";
 import { formatProviderLabel, formatResetTime } from "./format.js";
+import { pricingLabel } from "./pricing.js";
 import { buildPaths } from "./paths.js";
 import { stableNodeExecutable } from "./node-runtime.js";
 import { loadDisplayStatusSnapshot } from "./runtime.js";
@@ -170,6 +171,20 @@ export function cycleTitleMode(paths = buildPaths()) {
     const next = TITLE_MODE_CYCLE[(TITLE_MODE_CYCLE.indexOf(current) + 1) % TITLE_MODE_CYCLE.length];
     return writeTitleMode(next, paths);
 }
+const TITLE_TIER_WIDTH_RANK = { icon: 0, single: 1, full: 2 };
+// A manual mode may narrow the title but never widen it past a measured budget:
+// an overflowing item is pushed under the notch, and the Title row that would
+// undo the choice lives in that item's own dropdown, so the user is locked out.
+// With no measurement the manual choice stands, since autoTier is only a guess.
+export function resolveTitleTier(mode, display, providerCount) {
+    const autoTier = pickTitleTier(display, providerCount);
+    if (mode === "auto") {
+        return autoTier;
+    }
+    const budget = display?.extrasBudgetPt;
+    const measured = typeof budget === "number" && Number.isFinite(budget);
+    return measured && TITLE_TIER_WIDTH_RANK[mode] > TITLE_TIER_WIDTH_RANK[autoTier] ? autoTier : mode;
+}
 export function pickTitleTier(display, providerCount) {
     if (providerCount === 0) {
         return "icon";
@@ -661,10 +676,13 @@ function titleLine(tier, providers, title, topState, prefersDark) {
         ? line(text, { ...titleIconParams(), dropdown: false })
         : iconLine();
 }
-function titleModeLabel(mode, autoTier) {
-    return mode === "auto"
-        ? `Title  Auto (${TITLE_TIER_LABEL[autoTier]})`
-        : `Title  ${TITLE_TIER_LABEL[mode]}`;
+function titleModeLabel(mode, autoTier, tier) {
+    if (mode === "auto") {
+        return `Title  Auto (${TITLE_TIER_LABEL[autoTier]})`;
+    }
+    return mode === tier
+        ? `Title  ${TITLE_TIER_LABEL[mode]}`
+        : `Title  ${TITLE_TIER_LABEL[mode]} (no room, ${TITLE_TIER_LABEL[tier]})`;
 }
 // Carries the "why" behind a degraded title without spending a menu row on it.
 function titleModeTooltip(display, autoTier) {
@@ -768,7 +786,9 @@ function cardProviderBlock(item, now) {
             darkColor,
             headline: `${currency}${item.usage.balance.total}`,
             rows: [],
-            note: "Pay-as-you-go · no windowed quota",
+            note: item.usage.pricing
+                ? `Pay-as-you-go · ${pricingLabel(item.usage.pricing, formatResetTime(item.usage.pricing.until, now))}`
+                : "Pay-as-you-go · no windowed quota",
             message: null,
             updated: observedUpdatedLabel(item, now),
         };
@@ -792,7 +812,9 @@ function cardProviderBlock(item, now) {
         darkColor,
         headline: headlinePct ? `${Math.round(headlinePct.usedPercent)}%` : STATE_LABEL[item.analysis.state],
         rows,
-        note: null,
+        note: item.usage.pricing
+            ? `${pricingLabel(item.usage.pricing, formatResetTime(item.usage.pricing.until, now))}${item.usage.quotaUnit === "credits" ? " · credits" : ""}`
+            : null,
         message: shortCardMessage(item),
         updated: observedUpdatedLabel(item, now),
     };
@@ -834,8 +856,8 @@ export function renderMenuBar(snapshot = loadDisplayStatusSnapshot(), paths = bu
     const providers = titleProviders(snapshot);
     const title = providers.map(titleSegment).join(` ${TITLE_SEPARATOR} `);
     const autoTier = pickTitleTier(snapshot.display, providers.length);
-    const tier = mode === "auto" ? autoTier : mode;
-    const modeLine = line(titleModeLabel(mode, autoTier), {
+    const tier = resolveTitleTier(mode, snapshot.display, providers.length);
+    const modeLine = line(titleModeLabel(mode, autoTier, tier), {
         bash: stableNodeExecutable(),
         param1: appCliPath(paths),
         param2: "menubar",
@@ -901,6 +923,9 @@ export function renderMenuBar(snapshot = loadDisplayStatusSnapshot(), paths = bu
                     font: ROW_FONT,
                     size: 12,
                 }));
+                if (item.usage.pricing) {
+                    lines.push(muted(pricingLabel(item.usage.pricing, formatResetTime(item.usage.pricing.until, now))));
+                }
                 lines.push(line(item.analysis.message, { color: MUTED_COLOR, size: 12, length: 84 }));
                 lines.push("---");
                 continue;
@@ -920,6 +945,10 @@ export function renderMenuBar(snapshot = loadDisplayStatusSnapshot(), paths = bu
             if (item.usage.blocked) {
                 lines.push(muted(`Blocked  ${item.usage.blocked.reason}. 5h/7d numbers above still reflect the window quotas.`));
             }
+            if (item.usage.pricing) {
+                const unit = item.usage.quotaUnit === "credits" ? " · metered in credits" : "";
+                lines.push(muted(`${pricingLabel(item.usage.pricing, formatResetTime(item.usage.pricing.until, now))}${unit}`));
+            }
             lines.push(muted(targetLabel(item)));
             lines.push(line(item.analysis.message, { color: MUTED_COLOR, size: 12, length: 84 }));
             lines.push("---");

package/dist/pricing.d.ts

@@ -0,0 +1,5 @@
+import { PricingInfo } from "./types.js";
+export declare function isCnPublicHoliday(date: Date): boolean;
+export declare function deepseekPricing(now?: Date): PricingInfo;
+export declare function glmPricing(now?: Date): PricingInfo;
+export declare function pricingLabel(pricing: PricingInfo, until: string): string;

package/dist/pricing.js

@@ -0,0 +1,115 @@
+// Peak / off-peak pricing tiers for the two providers that publish a clock-based
+// discount. Both rules are stated by the vendor in Beijing time (UTC+8, no DST),
+// so the arithmetic below deliberately avoids the host time zone.
+//
+// DeepSeek (api-docs.deepseek.com/quick_start/pricing): peak is 01:00-04:00 and
+// 06:00-10:00 UTC, Monday through Friday, excluding Chinese public holidays;
+// every other hour is off-peak at 50% of the peak rate. In Beijing time that is
+// 09:00-12:00 and 14:00-18:00.
+//
+// GLM Coding Plan V3 (docs.bigmodel.cn/cn/coding-plan/overview): 高峰时段 is
+// 每周一至周五的 14:00~18:00 (UTC+8) at the base credit deduction; all other
+// hours deduct 50% of the base credits. The page does not exclude public
+// holidays, and time-boxed promotions (e.g. all-day off-peak during a holiday
+// campaign) are not modelled here: the tier follows the standing rule only.
+const BEIJING_OFFSET_MINUTES = 8 * 60;
+const MINUTES_PER_DAY = 24 * 60;
+const LOOKAHEAD_DAYS = 40;
+// Rest days from 国务院办公厅关于2026年部分节假日安排的通知 (国办发明电〔2025〕7号,
+// 2025-11-04). Adjusted working weekends (调休上班) are intentionally not
+// promoted to weekdays: both vendors phrase the peak rule as Monday-Friday.
+const CN_PUBLIC_HOLIDAYS = {
+    2026: new Set([
+        "01-01", "01-02", "01-03",
+        "02-15", "02-16", "02-17", "02-18", "02-19", "02-20", "02-21", "02-22", "02-23",
+        "04-04", "04-05", "04-06",
+        "05-01", "05-02", "05-03", "05-04", "05-05",
+        "06-19", "06-20", "06-21",
+        "09-25", "09-26", "09-27",
+        "10-01", "10-02", "10-03", "10-04", "10-05", "10-06", "10-07",
+    ]),
+};
+const DEEPSEEK_RULE = {
+    peakSegments: [[9 * 60, 12 * 60], [14 * 60, 18 * 60]],
+    excludePublicHolidays: true,
+    offPeakDiscountPercent: 50,
+    rule: "DeepSeek API: peak Mon-Fri 09:00-12:00 & 14:00-18:00 Asia/Shanghai excluding CN public holidays; off-peak 50% off",
+};
+const GLM_RULE = {
+    peakSegments: [[14 * 60, 18 * 60]],
+    excludePublicHolidays: false,
+    offPeakDiscountPercent: 50,
+    rule: "GLM Coding Plan: peak Mon-Fri 14:00-18:00 Asia/Shanghai; off-peak credits deducted at 50%",
+};
+function beijingParts(date) {
+    const shifted = new Date(date.getTime() + BEIJING_OFFSET_MINUTES * 60_000);
+    return {
+        year: shifted.getUTCFullYear(),
+        month: shifted.getUTCMonth() + 1,
+        day: shifted.getUTCDate(),
+        weekday: shifted.getUTCDay(),
+        minutes: shifted.getUTCHours() * 60 + shifted.getUTCMinutes(),
+    };
+}
+function beijingInstant(year, month, day, minutes) {
+    return new Date(Date.UTC(year, month - 1, day, 0, minutes - BEIJING_OFFSET_MINUTES));
+}
+export function isCnPublicHoliday(date) {
+    const parts = beijingParts(date);
+    const key = `${String(parts.month).padStart(2, "0")}-${String(parts.day).padStart(2, "0")}`;
+    return CN_PUBLIC_HOLIDAYS[parts.year]?.has(key) ?? false;
+}
+function tierAt(rule, date) {
+    const parts = beijingParts(date);
+    if (parts.weekday === 0 || parts.weekday === 6) {
+        return "off_peak";
+    }
+    if (rule.excludePublicHolidays && isCnPublicHoliday(date)) {
+        return "off_peak";
+    }
+    const inPeak = rule.peakSegments.some(([start, end]) => parts.minutes >= start && parts.minutes < end);
+    return inPeak ? "peak" : "off_peak";
+}
+// The tier can only flip at a segment edge or at midnight, so walking those
+// instants day by day finds the next change without minute-level scanning.
+function nextTierChange(rule, date) {
+    const current = tierAt(rule, date);
+    const start = beijingParts(date);
+    const edges = Array.from(new Set([0, ...rule.peakSegments.flatMap(([a, b]) => [a, b])]))
+        .filter((m) => m < MINUTES_PER_DAY)
+        .sort((a, b) => a - b);
+    for (let offset = 0; offset <= LOOKAHEAD_DAYS; offset += 1) {
+        for (const edge of edges) {
+            const candidate = beijingInstant(start.year, start.month, start.day + offset, edge);
+            if (candidate.getTime() <= date.getTime()) {
+                continue;
+            }
+            if (tierAt(rule, candidate) !== current) {
+                return candidate;
+            }
+        }
+    }
+    // Unreachable with the rules above (every week has weekdays); keep a sane bound.
+    return beijingInstant(start.year, start.month, start.day + LOOKAHEAD_DAYS, 0);
+}
+function pricingFor(rule, date) {
+    const tier = tierAt(rule, date);
+    return {
+        tier,
+        discountPercent: tier === "off_peak" ? rule.offPeakDiscountPercent : 0,
+        until: nextTierChange(rule, date).toISOString(),
+        timezone: "Asia/Shanghai",
+        rule: rule.rule,
+    };
+}
+export function deepseekPricing(now = new Date()) {
+    return pricingFor(DEEPSEEK_RULE, now);
+}
+export function glmPricing(now = new Date()) {
+    return pricingFor(GLM_RULE, now);
+}
+export function pricingLabel(pricing, until) {
+    return pricing.tier === "off_peak"
+        ? `Off-peak · ${pricing.discountPercent}% off until ${until}`
+        : `Peak · full price until ${until}`;
+}

package/dist/types.d.ts

@@ -8,11 +8,20 @@ export interface UsageWindow {
     usedPercent: number;
     resetsAt: string;
 }
+export interface PricingInfo {
+    tier: "peak" | "off_peak";
+    discountPercent: number;
+    until: string;
+    timezone: string;
+    rule: string;
+}
 export interface ProviderUsage {
     provider: ProviderId;
     source: string;
     observedAt: string;
     planType?: string | null;
+    quotaUnit?: "tokens" | "credits";
+    pricing?: PricingInfo;
     windows: UsageWindow[];
     balance?: {
         total: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-usage-bar",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "description": "macOS menu bar usage monitor for Claude Code, Codex, GLM, DeepSeek, and MiniMax.",
   "author": "hanzhangzzz",
   "license": "MIT",