dsh-cost-meter 1.7.33 → 1.7.35

package/README.md

@@ -8,9 +8,9 @@
 
 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; from Aug 23, 2026 weekends are billed at off-peak prices all day, shown as “Weekend — all off-peak”) · 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 / Volcano Ark / Qwen / Xiaomi MiMo) plan/API dual-track billing (subscription quota vs pay-as-you-go money separated, per-1% & full-window token/equivalent-cost estimates with daily/weekly/monthly curves) · · quota strip above the input box (budget / Go / coding-plan usage in one row, toggleable)
 
-[![version](https://img.shields.io/badge/version-1.7.33-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.35-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.33** adds Xiaomi MiMo Token Plan quota support and a JSON request-body editor for custom provider POST balance queries, with format validation, per-entry persistence and support for clearing the body. See the [release notes](docs/release-notes/v1.7.33.md).
+**v1.7.35** adds Bailian CLI quota support, full model names on hover, bounded decoding of bare gzip responses, and per-endpoint GLM quota diagnostics. See the [release notes](docs/release-notes/v1.7.35.md).
 
 [![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)
@@ -316,22 +316,22 @@ On Node.js 20, use `npm install -g pnpm@10` instead. See [pnpm installation and
 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.7.33`** — 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.7.35`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.33/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.35/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.7.33
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.35
 ```
 
 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.7.33.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.35.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):

package/README.zh-CN.md

@@ -8,9 +8,9 @@
 
 本会话费用 · 当日费用 · OpenCode Go 订阅额度显示 · 预算与已用百分比 · 官方账户余额 · 自定义 Provider 余额查询(可配任意 HTTP 端点) · 余额三段进度条 · 历史记录 · 峰谷计价时段显示(UTC 01:00–04:00、06:00–10:00 为峰时段;2026-08-23 起周末全天按谷价,显示「周末时段——全谷价」) · 峰/谷切换前弹窗与系统通知提醒(位置/提前量/提醒类型可配) · 官方价格一键同步 · 类 Codex Token 用量热图 · 多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配) · 主流 Coding Plan 额度查询与显示(Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow / CommandCode / SCNet / 火山方舟 / 千问 / 小米 MiMo 十一家,含 Volcano Ark AK/SK 签名与 MiMo 控制台 Cookie 查询) · Plan/API 双轨计费(订阅额度与按量金额分离统计,每 1% 额度与满窗的 token/等值金额估算及日/周/月曲线) · 输入框上方额度横条(预算/Go/Coding Plan 用量一条横排显示,可开关)
 
-[![version](https://img.shields.io/badge/version-1.7.33-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.35-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.33**：新增小米 MiMo Token Plan 额度查询；自定义 Provider 余额新增 POST JSON 请求体编辑，支持格式校验、每条配置独立保存和清空请求体。详见[更新说明](docs/release-notes/v1.7.33.md)。
+**v1.7.35**：新增百炼 CLI 额度来源、模型全名悬停提示，修复裸 gzip 响应解析，并为 GLM 额度查询提供逐端点诊断。详见[更新说明](docs/release-notes/v1.7.35.md)。
 
 [![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)
@@ -316,22 +316,22 @@ Node.js 20 请改用 `npm install -g pnpm@10`。版本要求见 [pnpm 官方安
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.33`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.35`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.33/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.35/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.33
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.35
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.33.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.35.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/bailian-cli.js

@@ -0,0 +1,130 @@
+/**
+ * Official Bailian CLI bridge (GitHub modelstudioai/cli, npm bailian-cli, `bl` / `bailian`).
+ * Credentials remain owned by the CLI (bl auth login --console / --api-key).
+ * Reads Token Plan + Coding Plan quota windows via two fixed read-only subcommands.
+ */
+import { bridgeCode, resolveNpmCli, runCliJson } from './cli-bridge.js'
+
+export const BAILIAN_TOKEN_PLAN_ARGS = Object.freeze(['usage', 'token-plan', '--output', 'json', '--quiet'])
+export const BAILIAN_CODING_PLAN_ARGS = Object.freeze(['usage', 'coding-plan', '--output', 'json', '--quiet'])
+
+const MESSAGES = {
+  zh: {
+    missing: '未找到百炼 CLI。请在 DSH 所在机器安装 bailian-cli（npm install -g bailian-cli），运行 bl auth login --console，并重启 DSH 以更新 PATH。',
+    failed: '百炼 CLI 查询失败，请运行 bl auth status --output json 检查登录后重试。',
+    timeout: '百炼 CLI 查询超时，请检查网络后刷新。',
+    invalid: '百炼 CLI 返回的额度格式无效，请更新 CLI 后重试。',
+    unavailable: '百炼 CLI 未返回有效计划额度（可能未订阅 Token Plan / Coding Plan），请检查 CLI 或切换其他额度来源。',
+  },
+  en: {
+    missing: 'Bailian CLI not found. Install bailian-cli on the DSH host (npm install -g bailian-cli), run bl auth login --console, then restart DSH to refresh PATH.',
+    failed: 'Bailian CLI query failed. Check bl auth status --output json and retry.',
+    timeout: 'Bailian CLI query timed out. Check the network and refresh.',
+    invalid: 'Bailian CLI returned invalid quota data. Update the CLI and retry.',
+    unavailable: 'Bailian CLI returned no valid plan quota (no Token Plan / Coding Plan subscription). Check the CLI or select another quota source.',
+  },
+}
+const message = (locale, code) => MESSAGES[locale === 'en' ? 'en' : 'zh'][code]
+const fail = (locale, code) => Object.assign(new Error(message(locale, code)), { code, soft: code === 'missing' || code === 'unavailable' })
+const record = value => value !== null && typeof value === 'object' && !Array.isArray(value)
+const finite = value => typeof value === 'number' && Number.isFinite(value) && value >= 0
+
+const PERIOD_KEYS = [['per5Hour', 'fiveHour'], ['perWeek', 'weekly'], ['perBillMonth', 'monthly']]
+const WINDOW_ORDER = ['fiveHour', 'weekly', 'monthly']
+
+function windowOf(ratio, reset, locale) {
+  if (!finite(ratio)) throw fail(locale, 'invalid')
+  let resetsAt = ''
+  if (reset !== undefined && reset !== 0) {
+    if (!finite(reset) || !Number.isFinite(new Date(reset).getTime())) throw fail(locale, 'invalid')
+    resetsAt = new Date(reset).toISOString()
+  }
+  return { percent: Math.min(100, Math.round(ratio * 1000) / 10), resetsAt }
+}
+
+function tokenWindows(payload, locale) {
+  const windows = {}
+  for (const [prefix, name] of [['per5Hour', 'fiveHour'], ['per1Week', 'weekly']]) {
+    const ratio = payload[`${prefix}Percentage`]
+    if (ratio !== undefined) windows[name] = windowOf(ratio, payload[`${prefix}ResetTime`], locale)
+  }
+  return windows
+}
+
+function codingWindows(payload, locale) {
+  const windows = {}
+  for (const [rawKey, name] of PERIOD_KEYS) {
+    const cell = payload[rawKey]
+    if (cell === undefined) continue
+    if (!record(cell)) throw fail(locale, 'invalid')
+    const total = cell.totalQuota
+    // Unbounded or missing limits produce no window (the console prints "unlimited").
+    if (total === undefined || total === 0) continue
+    if (!finite(total)) throw fail(locale, 'invalid')
+    const ratio = cell.percentage ?? (finite(cell.usedQuota) ? cell.usedQuota / total : undefined)
+    if (ratio === undefined) continue
+    windows[name] = windowOf(ratio, cell.resetTime, locale)
+  }
+  return windows
+}
+
+/**
+ * Merge both payloads into the normalized windows contract.
+ * Token Plan wins same-name 5h/week windows; Coding Plan always contributes the
+ * billing-month window. `source` records which subscriptions answered.
+ */
+export function parseBailianUsage(payloads, locale = 'zh') {
+  const token = payloads?.token, coding = payloads?.coding
+  let invalid = false
+  const parse = (payload, reader) => {
+    if (payload === null || payload === undefined) return {}
+    try {
+      if (!record(payload)) throw fail(locale, 'invalid')
+      return reader(payload, locale)
+    } catch { invalid = true; return {} }
+  }
+  const tokenWins = parse(token, tokenWindows)
+  const codingWins = parse(coding, codingWindows)
+  const windows = {}
+  for (const name of WINDOW_ORDER) {
+    const win = tokenWins[name] ?? codingWins[name]
+    if (win !== undefined) windows[name] = win
+  }
+  if (Object.keys(windows).length === 0) throw fail(locale, invalid ? 'invalid' : 'unavailable')
+  const sources = []
+  if (Object.keys(tokenWins).length > 0) sources.push('Token Plan')
+  if (Object.keys(codingWins).length > 0) {
+    sources.push(typeof coding.instanceType === 'string' && coding.instanceType.length > 0
+      ? `Coding Plan (${coding.instanceType})` : 'Coding Plan')
+  }
+  windows.source = { resetsAt: '', text: `${sources.join(' + ')} (CLI)` }
+  return { windows }
+}
+
+export async function queryBailianCli(locale = 'zh', options = {}) {
+  const command = await resolveNpmCli({ packageName: 'bailian-cli', binName: 'bl', env: options.env, platform: options.platform })
+  if (!command) throw fail(locale, 'missing')
+  const { env = process.env, signal, timeoutMs = 15000, maxBuffer = 1024 * 1024 } = options
+  const run = args => runCliJson({ ...command, args: [...command.args, ...args], env, signal, timeoutMs, maxBuffer })
+  const settled = await Promise.allSettled([run(BAILIAN_TOKEN_PLAN_ARGS), run(BAILIAN_CODING_PLAN_ARGS)])
+  signal?.throwIfAborted()
+  if (settled.every(x => x.status === 'rejected')) {
+    const errors = settled.map(x => x.reason)
+    // Surface timeout first: it is the most actionable failure across both commands.
+    throw fail(locale, bridgeCode(errors.find(e => e.kind === 'timeout') ?? errors[0]))
+  }
+  try {
+    return parseBailianUsage({
+      token: settled[0].status === 'fulfilled' ? settled[0].value : null,
+      coding: settled[1].status === 'fulfilled' ? settled[1].value : null,
+    }, locale)
+  } catch (error) {
+    // With one command broken, a surviving source still answers; only when nothing
+    // valid remains does the broken command's real failure become the message.
+    if (error.code === 'unavailable') {
+      const broken = settled.map(x => x.reason).find((_, i) => settled[i].status === 'rejected')
+      if (broken) throw fail(locale, bridgeCode(broken))
+    }
+    throw error
+  }
+}

package/lib/cli-bridge.js

@@ -0,0 +1,68 @@
+/**
+ * 共享 CLI 子进程桥(qwen-cli / bailian-cli):PATH 解析 + 固定参数执行 + JSON 读取。
+ * 凭据始终由 CLI 自持;错误只携带分类标签(kind/exitCode),永不携带子进程输出或路径。
+ */
+import { execFile } from 'node:child_process'
+import { access, readFile, stat } from 'node:fs/promises'
+import { constants } from 'node:fs'
+import { delimiter, isAbsolute, join, relative, resolve } from 'node:path'
+
+/** Resolve an npm-installed CLI without a shell; Windows npm .cmd shims are never evaluated. */
+export async function resolveNpmCli({ packageName, binName, env = process.env, platform = process.platform } = {}) {
+  const pathValue = Object.entries(env).find(([key]) => key.toLowerCase() === 'path')?.[1] ?? ''
+  for (const raw of pathValue.split(platform === 'win32' ? ';' : delimiter)) {
+    const dir = raw.replace(/^"(.*)"$/, '$1')
+    // Empty/relative PATH entries must not execute a workspace-supplied program.
+    if (!isAbsolute(dir)) continue
+    if (platform === 'win32') {
+      // npm global installs put the package next to the Windows shim.
+      const root = join(dir, 'node_modules', packageName)
+      try {
+        const meta = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'))
+        const bin = meta.bin?.[binName]
+        if (meta.name === packageName && typeof bin === 'string') {
+          const target = resolve(root, bin), rel = relative(root, target)
+          if (rel && !rel.startsWith('..') && !isAbsolute(rel) && (await stat(target)).isFile()) {
+            return { file: process.execPath, args: [target] }
+          }
+        }
+      } catch { /* Try the next installed executable. */ }
+    }
+    const file = join(dir, binName + (platform === 'win32' ? '.exe' : ''))
+    try {
+      await access(file, platform === 'win32' ? constants.F_OK : constants.X_OK)
+      if ((await stat(file)).isFile()) return { file, args: [] }
+    } catch { /* Not installed in this PATH entry. */ }
+  }
+  return null
+}
+
+/**
+ * Run a fixed CLI command and parse stdout as JSON. Rejects only { kind, exitCode }:
+ * 'maxbuffer' | 'timeout' | 'exit' | 'spawn' | 'json' — never raw output or paths.
+ */
+export function runCliJson({ file, args, env = process.env, signal, timeoutMs = 15000, maxBuffer = 1024 * 1024 }) {
+  return new Promise((done, reject) => {
+    const child = execFile(file, args, {
+      encoding: 'utf8', windowsHide: true, shell: false, env, signal, timeout: timeoutMs, killSignal: 'SIGKILL', maxBuffer,
+    }, (error, out) => {
+      if (error) {
+        const kind = error.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER' ? 'maxbuffer'
+          : error.killed || error.code === 'ERR_CHILD_PROCESS_TIMEDOUT' ? 'timeout'
+          : typeof error.code === 'number' ? 'exit'
+          : 'spawn'
+        reject(Object.assign(new Error('cli'), { kind, exitCode: typeof error.code === 'number' ? error.code : undefined }))
+        return
+      }
+      try { done(JSON.parse(out)) } catch { reject(Object.assign(new Error('cli'), { kind: 'json' })) }
+    })
+    child.stdin?.end()
+  })
+}
+
+/** Map a bridge error kind to a per-CLI message code (exitCode may refine 'exit'). */
+export const bridgeCode = (error, { authExitCode } = {}) =>
+  error.kind === 'timeout' ? 'timeout'
+  : error.kind === 'maxbuffer' || error.kind === 'json' ? 'invalid'
+  : error.kind === 'exit' && authExitCode !== undefined && error.exitCode === authExitCode ? 'auth'
+  : 'failed'