dsh-cost-meter 1.5.35 → 1.5.37

package/README.en.md

@@ -6,7 +6,7 @@
 
 Per-conversation cost · daily totals · OpenCode Go subscription quota display · budget with usage percentage · official account balance · custom provider balance · balance progress bar · history · peak/off-peak pricing hours display (peak hours UTC 01:00–04:00, 06:00–10:00) · pre-switch popup & system-notification alerts for peak/off-peak changes (position / lead time / alert type configurable) · one-click price sync from the official docs · Codex-style token usage heat grid · multi-vendor model pricing (built-in 90+ model price catalog with auto-matching) · mainstream Coding Plan quota queries & display (Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow / CommandCode / SCNet) · quota strip above the input box (budget / Go / coding-plan usage in one row, toggleable)
 
-[![version](https://img.shields.io/badge/version-1.5.35-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.37-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -228,22 +228,22 @@ Real captures from an actual DSH sidebar of the period strip and collapsed verti
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.35`** — review the script before running):
+**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.37`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.35/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.37/install.ps1 | iex
 ```
 
 **Or a plain command line** (the machine must already have pnpm and git; also pinned to the tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.35
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.37
 ```
 
 Without git, use the GitHub tag archive:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.35.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.37.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):

package/README.md

@@ -6,7 +6,7 @@
 
 本会话费用 · 当日费用 · OpenCode Go 订阅额度显示 · 预算与已用百分比 · 官方账户余额 · 自定义 Provider 余额查询(可配任意 HTTP 端点) · 余额三段进度条 · 历史记录 · 峰谷计价时段显示(UTC 01:00–04:00、06:00–10:00 为峰时段) · 峰/谷切换前弹窗与系统通知提醒(位置/提前量/提醒类型可配) · 官方价格一键同步 · 类 Codex Token 用量热图 · 多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配) · 主流 Coding Plan 额度查询与显示(Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow / CommandCode / SCNet 八家) · 输入框上方额度横条(预算/Go/Coding Plan 用量一条横排显示,可开关)
 
-[![version](https://img.shields.io/badge/version-1.5.35-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.37-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -230,22 +230,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.35`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.37`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.35/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.37/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.35
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.37
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.35.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.37.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/client.js

@@ -2435,7 +2435,7 @@ window.__ModuleLoader__.load({
         body: el(Fragment, null,
           el('div', { className: 'cm-bbox-head' },
             el('span', { className: 'cm-bbox-label' }, t('goQuotaRowLabel') + ' ' + shortOf(mainKey)),
-            el('span', { className: 'cm-bbox-pct cm-num' }, pct.toFixed(1) + '%')),
+            el('span', { className: 'cm-bbox-pct cm-num' }, Math.round(pct) + '%')),
           el('div', { className: 'cm-bbox-bar' },
             el('div', { className: 'cm-bbox-fill', style: { width: Math.min(100, pct) + '%' } })),
           detail

package/lib/coding-plans.js

@@ -124,16 +124,63 @@ export function parseAnthropicUsage(data) {
 }
 
 /**
- * 解析 Z.ai / 智谱 GLM Coding Plan 用量响应
- * (GET {api.z.ai|open.bigmodel.cn}/api/coding/paas/{v3|v4}/dashboard/billing/coding_plan/usage;2026-08 起 v3 优先,见 CODING_PLAN_ENDPOINTS)。
- * 兼容两种已见形态:
+ * 解析 Z.ai / 智谱 GLM Coding Plan 用量响应。
+ * 兼容三种已见形态(按优先级):
+ *  - { data: { limits: [{ type, unit, number, percentage, nextResetTime, usage,
+ *      currentValue, ... }], level } }(2026-08 起的监控端点
+ *      /api/monitor/usage/quota/limit,issue #42;TOKENS_LIMIT 为 token 窗口(Pro/Max),
+ *      CREDIT_LIMIT 为 Credit 计费窗口(Lite,percentage/currentValue 语义与
+ *      TOKENS_LIMIT 一致,issue #44),两者均按 unit 3=小时档、6=周档映射;
+ *      TIME_LIMIT 为 MCP/工具调用月度额度、量纲不同不纳入;unit 缺失时按
+ *      nextResetTime 排序兜底——0% 用量的滚动窗口不返回重置时间,排最前)
  *  - { plans: [{ status, total_units, used_units, available_units, period_end, capabilities }] }
- *    (period_end 语义按数值大小推断:重置跨度 >1 天视为周档,否则为 5 小时档)
+ *    (旧计费端点;period_end 语义按数值大小推断:重置跨度 >1 天视为周档,否则为 5 小时档)
  *  - { five_hour: { utilization|percent, resets_at }, weekly|week|seven_day: {...} }
  */
 export function parseZaiUsage(data) {
   if (data === null || typeof data !== 'object') return null
   const windows = {}
+  // 形态零:监控端点 quota/limit(issue #42)。
+  {
+    const limits = data.data !== null && typeof data.data === 'object' && Array.isArray(data.data.limits)
+      ? data.data.limits : null
+    if (limits !== null) {
+      // 已按 unit 明确分配的窗口;unit 缺失/未知的条目留待重置时间排序兜底。
+      const monWindows = {}
+      const rest = []
+      for (const limit of limits) {
+        // TOKENS_LIMIT(Pro/Max token 窗口)与 CREDIT_LIMIT(Lite Credit 窗口,issue #44)
+        // 的 percentage/currentValue/usage 与 unit 语义完全一致,一并接受。
+        if (limit === null || typeof limit !== 'object' || (limit.type !== 'TOKENS_LIMIT' && limit.type !== 'CREDIT_LIMIT')) continue
+        // percentage 已是 0-100 百分数;缺失时用 currentValue/usage 反推。
+        const pct = limit.percentage !== undefined ? clampPct(Number(limit.percentage))
+          : Number.isFinite(Number(limit.usage)) && Number(limit.usage) > 0 && Number.isFinite(Number(limit.currentValue))
+            ? clampPct((Number(limit.currentValue) / Number(limit.usage)) * 100)
+            : null
+        if (pct === null) continue
+        const resetsAt = normalizeResetAt(limit.nextResetTime)
+        const unit = Number(limit.unit)
+        if (unit === 3 && monWindows.fiveHour === undefined) monWindows.fiveHour = { percent: pct, resetsAt }
+        else if (unit === 6 && monWindows.weekly === undefined) monWindows.weekly = { percent: pct, resetsAt }
+        else if (!Number.isFinite(unit)) rest.push({ pct, resetsAt, resetMs: Number(limit.nextResetTime) })
+      }
+      if (rest.length > 0) {
+        // 无 unit 条目:重置时间升序(0% 滚动窗口无重置时间视为最近,排最前),
+        // 依次补位到 5 小时档 → 周档(老套餐仅一条时只出 5 小时档)。
+        rest.sort((a, b) => {
+          const av = Number.isFinite(a.resetMs) && a.resetMs > 0 ? a.resetMs : 0
+          const bv = Number.isFinite(b.resetMs) && b.resetMs > 0 ? b.resetMs : 0
+          return av - bv
+        })
+        for (const item of rest) {
+          if (monWindows.fiveHour === undefined) monWindows.fiveHour = { percent: item.pct, resetsAt: item.resetsAt }
+          else if (monWindows.weekly === undefined) monWindows.weekly = { percent: item.pct, resetsAt: item.resetsAt }
+        }
+      }
+      if (Object.keys(monWindows).length > 0) return monWindows
+      // limits 中无可解析 token 窗口:落回后续形态,最终由调用方透传错误信封。
+    }
+  }
   // 形态一:plans 数组(zcode 逆向确认的计费 API 形状)。
   if (Array.isArray(data.plans)) {
     for (const plan of data.plans) {
@@ -513,7 +560,11 @@ export function scnetTokenPlanWindows(days, entry, nowMs) {
 export const CODING_PLAN_ENDPOINTS = {
   anthropic: ['https://api.anthropic.com/api/oauth/usage'],
   zai: [
-    // 2026-08 接口变更:带有效 Coding Plan Key 请求 v4 返回 404,v3 存活(issue #17);v3 两域优先,v4 保留兑底。
+    // 2026-08 接口变更(issue #42):额度查询迁移到监控端点 /api/monitor/usage/quota/limit(国内 Key 对应
+    // bigmodel.cn、国际 Key 对应 z.ai,两域 Key 不互通——401 时继续换域尝试,见 queryCodingPlan)。
+    'https://open.bigmodel.cn/api/monitor/usage/quota/limit',
+    'https://api.z.ai/api/monitor/usage/quota/limit',
+    // 旧计费端点兜底:v3 存活(issue #17)、v4 历史;monitor 端点不可达时仍可出数。
     'https://api.z.ai/api/coding/paas/v3/dashboard/billing/coding_plan/usage',
     'https://open.bigmodel.cn/api/coding/paas/v3/dashboard/billing/coding_plan/usage',
     'https://api.z.ai/api/coding/paas/v4/dashboard/billing/coding_plan/usage',
@@ -563,6 +614,10 @@ export async function queryCodingPlan(provider, key, locale, t) {
   const urls = CODING_PLAN_ENDPOINTS[provider]
   const parse = CODING_PLAN_PARSERS[provider]
   let lastError = null
+  // 200 但解析失败的「结构化错误」(业务信封 / 结构已变):比后续端点的 404 等传输层
+  // 错误更有诊断价值,单独保留且最终优先抛出——否则最后端点的 404 会盖住 monitor
+  // 端点解析失败的真实原因(issue #44 的误导性报错即由此而来)。
+  let parseError = null
   for (const url of urls) {
     let response
     try {
@@ -580,6 +635,9 @@ export async function queryCodingPlan(provider, key, locale, t) {
     if (response.status === 401 || response.status === 403) {
       const error = new Error(t(locale, 'codingPlanUnauthorized', { provider: meta.label, code: String(response.status) }))
       error.soft = true // Key 无效/无订阅属预期场景,面板中性提示
+      // zai 国内(bigmodel.cn)/国际(z.ai)域名 Key 不互通:单域 401 只说明 Key
+      // 不属于该域,继续尝试下一域;全部 401 才认定为凭据无效(issue #42)。
+      if (provider === 'zai') { lastError = error; continue }
       throw error
     }
     if (!response.ok) {
@@ -593,14 +651,16 @@ export async function queryCodingPlan(provider, key, locale, t) {
       // 200 但业务失败(如 Z.ai 的错误信封 {code:1001,msg:...}):透出服务端 msg,避免误报「接口结构已变」。
       const envelope = data !== null && typeof data === 'object' && typeof data.code === 'number' && data.code !== 0
         && typeof (data.msg ?? data.message) === 'string' ? (data.msg ?? data.message) : null
-      lastError = envelope !== null
+      const error = envelope !== null
         ? new Error(`${meta.label}: ${envelope}`)
         : new Error(t(locale, 'codingPlanNoUsage', { provider: meta.label }))
+      parseError ??= error
+      lastError = error
       continue
     }
     return { windows, endpoint: url }
   }
-  throw lastError ?? new Error(t(locale, 'codingPlanNoUsage', { provider: meta.label }))
+  throw parseError ?? lastError ?? new Error(t(locale, 'codingPlanNoUsage', { provider: meta.label }))
 }
 
 export { CUSTOM_BALANCE_ADAPTER_ID, emptyCustomBalance, extractByRule, queryCustomBalance } from './custom-balance.js'

package/lib/index.js

@@ -341,6 +341,14 @@ function makeCostUsageProjection(ledger) {
   }
 }
 
+/**
+ * 测试导出(verify.mjs 行为级断言用;不参与宿主加载路径)。
+ * issue #43 教训:宿主 restore() 对版本匹配的 checkpoint 行调用
+ * stateSchema.parse(row.val) 且无 try-catch——schema 与真实 state 的
+ * 匹配性必须行为级验证,源码字符串断言不能发现字段漂移。
+ */
+export const __testProjection = { usageProjectionSchema, usageProjectionStateSchema, projectionView, makeCostUsageProjection }
+
 // ── 服务 ───────────────────────────────────────────────────────────────────
 
 /** 余额占位(未开启显示或查询失败时的空值)。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.5.35",
+  "version": "1.5.37",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(7 家,含 SCNet Token Plan 本地 Credits 计量)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条、峰谷计价时段显示与切换前弹窗/系统通知提醒(位置/提前量/类型可配),界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 7 vendors (incl. local credits metering for the SCNet Token Plan), custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, plus peak/off-peak pricing display with pre-switch popup & system-notification alerts (position / lead time / type configurable), in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",