dsh-cost-meter 1.7.23 → 1.7.24

package/README.en.md

@@ -6,9 +6,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) 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.23-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.24-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.23** right-aligns custom balances in the sidebar. Long names use an ellipsis, with the full name available on hover. See the [recovery guide](docs/session-history-recovery.md#english) for sessions affected by the earlier native-search log issue.
+**v1.7.24** discovers OpenCode Go credentials from your official Go route, regardless of its name. See [credential discovery](docs/opencode-go-credentials.md#english). See the [recovery guide](docs/session-history-recovery.md#english) for sessions affected by the earlier native-search log issue.
 
 [![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)
@@ -31,7 +31,7 @@ English | [中文](README.md)
 | Per-conversation cost | Below the composer / session title bar | Live accumulated cost + input/cache/output tokens; position configurable |
 | Official balance | Sidebar top / Settings page (configurable) | Total / granted / topped-up balance, auto-refresh + manual refresh; optional three-segment progress bar (blue/orange/gray), whose today segment only counts official-channel spend (coding plans / custom providers excluded) |
 | Custom provider balance | Sidebar / Settings page (configurable) | Configurable HTTP balance lookup (e.g. LiteLLM); bilingual labels, currency, extract rules (dot path / number / add / subtract / divide — use divide for NewApi-style quota endpoints, see [example](#custom-provider-balance-example-newapi-template)); collapsible panel alongside Coding Plan quotas |
-| OpenCode Go quota | Sidebar / Settings / bottom-right dock (configurable) | Rolling-5h / weekly / monthly usage percent and reset times, each window toggleable independently, budget used % can show alongside; key auto-discovered (DSH credential store OPENCODE_GO_API_KEY / env / opencode login) or entered manually |
+| OpenCode Go quota | Sidebar / Settings / bottom-right dock (configurable) | Rolling-5h / weekly / monthly usage percent and reset times, each window toggleable independently, budget used % can show alongside; key auto-discovered (dedicated ref / official Go route apiKeyEnv / env / opencode login) or entered manually |
 | Coding plan quotas | Sidebar / Settings page (per vendor) | Multi-vendor coding-plan quota queries (Anthropic Claude Pro/Max, Z.ai / Zhipu GLM Coding Plan, MiniMax Token Plan, Kimi Code weekly + 5-hour quotas with PAYG balance fallback when no subscription key, OpenRouter credits, SiliconFlow balance, CommandCode 5h/weekly windows + monthly credits balance); per-vendor enable switch, key, display position and refresh interval (sidebar card in the same box style as the Go quota; the collapsed rail shows percentages), credentials only sent to official endpoints; neutral hints when no credentials/subscription; SCNet Token Plan supports [external console snapshots](docs/scnet-official-snapshot.md#english); without a valid snapshot, monthly usage is estimated from the local ledger via the official credits deduction table (no credentials needed) |
 | Quota strip | Above the input box (toggle in Display settings) | One compact chip row for budget used % / the Go main window / each enabled coding-plan usage window (short label + mini progress bar, ≥80% warn, ≥100% over, hover for reset times); click any chip to refresh its data source (budget → state, Go → Go quota, vendor → all its windows); multiple windows of one vendor merge into a single segmented chip; a first-run guide card lets you decide whether to enable it; hides itself when there is no quota data |
 | Click to refresh | Sidebar balance/quota boxes | Click the official balance / custom balance / coding-plan box (collapsed rail included) to fetch the latest data immediately; the box pulses while refreshing, failures keep the previous value and surface the reason in the hover tooltip; keyboard Enter/Space also triggers; a one-time guide card appears after the update |
@@ -261,22 +261,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.7.23`** — 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.24`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.23/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.24/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.23
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.24
 ```
 
 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.23.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.24.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,9 +6,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 / 火山方舟 九家,含 Volcano Ark AK/SK 签名) · Plan/API 双轨计费(订阅额度与按量金额分离统计,每 1% 额度与满窗的 token/等值金额估算及日/周/月曲线) · 输入框上方额度横条(预算/Go/Coding Plan 用量一条横排显示,可开关)
 
-[![version](https://img.shields.io/badge/version-1.7.23-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.24-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.23**：侧栏自定义余额靠右对齐，长名称自动省略、悬停可看全名。此前受原生搜索日志问题影响的会话，仍可按 [恢复说明](docs/session-history-recovery.md) 备份修复。
+**v1.7.24**：OpenCode Go 额度自动读取官方 Go 路由配置的凭据，路由名无需固定。见 [凭据发现说明](docs/opencode-go-credentials.md)。此前受原生搜索日志问题影响的会话，仍可按 [恢复说明](docs/session-history-recovery.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)
@@ -31,7 +31,7 @@
 | 本会话费用 | 输入区下方 / 会话标题栏 | 实时累计费用 + 输入/缓存/输出 token,位置可配 |
 | 官方余额 | 侧边栏顶部 / 设置页(可配) | 总余额 / 赠送 / 充值,自动刷新 + 手动刷新;可选三段进度条(蓝/橙/灰),当日段只统计官方渠道费用(不含 Coding Plan / 自定义 Provider) |
 | 自定义 Provider 余额 | 侧边栏 / 设置页(可配) | 可配置 HTTP 查询任意 Provider 余额(LiteLLM 等);中/英名称、币种、extract 规则(点路径 / 数字常量 / add / subtract / divide,divide 适配 NewApi 等 quota 端点,见下方[示例](#自定义-provider-余额配置示例newapi-模板));与 Coding Plan 同区可折叠配置 |
-| OpenCode Go 额度 | 侧边栏 / 设置页 / 右下角(dock,可配) | 滚动 5 小时 / 本周 / 本月用量百分比与重置时间,三档可分别开关,可同时显示预算已用%;Key 自动发现(DSH 凭据库 OPENCODE_GO_API_KEY / 环境变量 / opencode 登录态)或手动填写 |
+| OpenCode Go 额度 | 侧边栏 / 设置页 / 右下角(dock,可配) | 滚动 5 小时 / 本周 / 本月用量百分比与重置时间,三档可分别开关,可同时显示预算已用%;Key 自动发现(专用引用 / 官方 Go 路由 apiKeyEnv / 环境变量 / opencode 登录态)或手动填写 |
 | Coding Plan 额度 | 侧边栏 / 设置页(每家可配) | 多厂商 coding plan 订阅额度查询(Anthropic Claude Pro/Max、Z.ai/智谱 GLM、MiniMax Token Plan、Kimi Code 本周/5 小时配额(无订阅 Key 时回落 PAYG 余额)、OpenRouter credits、SiliconFlow 余额、CommandCode 5h/周窗口与月度 Credits 余额、火山方舟 Volcano Ark 5h/周/月三档(需 AK/SK 管控面 HMAC 签名,需 ArkReadOnlyAccess + BillingCenterReadOnlyAccess)),各家独立启用开关、凭据、显示位置与刷新间隔(侧边栏卡片与 Go 额度同款,收起窄栏显示百分比),凭据只发往官方端点;无凭据/无订阅为中性提示;SCNet 超算互联网 Token Plan 支持[外部控制台额度快照](docs/scnet-official-snapshot.md)，无有效快照时按官方 Credits 抵扣表由本地账本估算月度用量(无需凭据) |
 | 额度横条 | 输入框上方(显示设置可开关) | 一条横排 chips 实时显示预算已用% / Go 主窗口 / 各已启用 Coding Plan 用量窗口(短标签+迷你进度条,≥80% 预警、≥100% 超支,悬停见重置时刻);点击任意 chip 即刷新对应数据源(budget→状态、Go→Go 额度、厂商→该家全部窗口),同一厂商多窗口融合为一条 chip 分段显示;首次更新弹引导卡由用户自主决定开关;无可用数据自动隐藏 |
 | 点击立即刷新 | 侧边栏余额/额度图框 | 官方余额 / 自定义余额 / Coding Plan 图框(含窄栏收起态)点击即触发一次查询,刷新中呼吸闪烁,失败保持原值并在悬停提示说明;键盘 Enter/Space 可触发;更新后首次进入有引导提示 |
@@ -263,22 +263,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.23`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.24`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.23/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.24/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.23
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.24
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.23.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.24.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/index.js

@@ -52,7 +52,7 @@ const SERVER_MESSAGES = {
     balanceRefreshed: '余额已刷新',
     balanceQueryFailed: '余额查询失败:{message}',
     reconcileWarn: '对账提示:本地账本今日官方渠道费用 {cost} 与官方余额当日变动 {delta} 偏差较大,请核对价格表或近期账单',
-    goQuotaKeyMissing: '未找到 OpenCode Go API Key。有 Go 订阅的话:运行 opencode login、导出 OPENCODE_GO_API_KEY 环境变量,或在显示设置中填写 Key;没有订阅可关闭上方「启用」开关。',
+    goQuotaKeyMissing: '未找到可用的 OpenCode Go API Key。请检查模型设置中 https://opencode.ai/zen/go/v1 路由的凭据，或在费用显示设置中填写 Go Key、导出 OPENCODE_GO_API_KEY、运行 opencode login；没有订阅可关闭「启用」。',
     goQuotaHttp: 'OpenCode Go 额度接口 HTTP {code}',
     goQuotaNoSub: '没有检测到生效的 OpenCode Go 订阅(接口返回 {code}),或 API Key 无效。没有订阅可关闭上方「启用」开关。',
     goQuotaNoUsage: 'OpenCode Go 额度响应缺少 usage 字段',
@@ -120,7 +120,7 @@ const SERVER_MESSAGES = {
     balanceRefreshed: 'Balance refreshed',
     balanceQueryFailed: 'Balance query failed: {message}',
     reconcileWarn: 'Reconciliation notice: today\'s local official-channel cost ({cost}) deviates significantly from the official balance change ({delta}); please check the price table or recent bills',
-    goQuotaKeyMissing: 'OpenCode Go API key not found. If you have a Go subscription: run opencode login, export OPENCODE_GO_API_KEY, or set the key in Display settings; otherwise turn off the Enable switch above.',
+    goQuotaKeyMissing: 'No usable OpenCode Go API key found. Check the credential for your https://opencode.ai/zen/go/v1 route in Models, set a Go key in Cost display settings, export OPENCODE_GO_API_KEY, or run opencode login; otherwise turn off Enable.',
     goQuotaHttp: 'OpenCode Go quota API returned HTTP {code}',
     goQuotaNoSub: 'No active OpenCode Go subscription detected (API returned {code}), or the API key is invalid. Turn off the Enable switch above if you have no subscription.',
     goQuotaNoUsage: 'OpenCode Go quota response is missing the usage field',
@@ -684,9 +684,35 @@ function findGoKeyInAuthJson() {
 }
 
 /**
- * 解析 OpenCode Go API Key(v1.6.8 起优先级调整):
- * DSH 凭据库(OPENCODE_GO_API_KEY)→ 环境变量 OPENCODE_GO_API_KEY → 兼容旧名
- * OPENCODE_API_KEY → opencode auth.json 自动发现 → config 遗留明文兜底。
+ * 查询与配置状态共用候选顺序。只从官方 Go 端点读取 apiKeyEnv，避免
+ * 将其他提供商、代理或 OpenCode Zen 路由的凭据用于 Go 额度查询。
+ * 每次读取当前 settings 快照，路由改名或凭据轮换后无需重启插件。
+ */
+function goKeyRefs(ctx) {
+  const refs = new Set(['OPENCODE_GO_API_KEY'])
+  try {
+    const providers = ctx?.get?.('settings')?.get?.('llm-pi-ai')?.providers
+    if (providers && typeof providers === 'object' && !Array.isArray(providers)) {
+      for (const profile of Object.values(providers)) {
+        if (typeof profile?.baseURL !== 'string' || typeof profile?.apiKeyEnv !== 'string') continue
+        try {
+          const url = new URL(profile.baseURL)
+          if (url.origin !== 'https://opencode.ai' || !/^\/zen\/go\/v1\/?$/.test(url.pathname)
+            || url.username || url.password || url.search || url.hash) continue
+          const ref = profile.apiKeyEnv.trim()
+          if (ref) refs.add(credentialRef(ref))
+        } catch { /* 无效端点不参与发现。 */ }
+      }
+    }
+  } catch { /* 旧宿主无此设置段时仍使用既有来源。 */ }
+  refs.add('OPENCODE_API_KEY')
+  return [...refs]
+}
+
+/**
+ * 解析 OpenCode Go API Key：专用引用 → 官方 Go 路由引用 → 兼容旧名
+ * OPENCODE_API_KEY → opencode auth.json → config 遗留明文。
+ * 每个引用先查 DSH 凭据库，再查同名环境变量。
  *
  * 「显式配置」由首选降为**末位兜底**:v1.6.8 起密钥统一由 DSH 凭据库托管,config 里的
  * goQuota.apiKey 只是迁移前遗留的明文(启动期 runSecretMigration 导入凭据库后即清空,
@@ -697,15 +723,15 @@ function findGoKeyInAuthJson() {
  */
 async function resolveGoKey(ctx, config) {
   const credentials = ctx.get('credentials')
-  if (credentials !== undefined) {
-    try {
-      const hit = await credentials.resolve(credentialRef('OPENCODE_GO_API_KEY'))
-      if (typeof hit?.value === 'string' && hit.value.length > 0) return hit.value
-    } catch {
-      // 凭证解析失败时回退到环境变量。
+  for (const name of goKeyRefs(ctx)) {
+    if (credentials !== undefined) {
+      try {
+        const hit = await credentials.resolve(credentialRef(name))
+        if (typeof hit?.value === 'string' && hit.value.trim().length > 0) return hit.value.trim()
+      } catch {
+        // 单个引用不可用时继续尝试环境变量及其他候选。
+      }
     }
-  }
-  for (const name of ['OPENCODE_GO_API_KEY', 'OPENCODE_API_KEY']) {
     const value = String(process.env[name] ?? '').trim()
     if (value.length > 0) return value
   }
@@ -1000,7 +1026,7 @@ async function buildState(ledger, balance = emptyBalance(), goQuota = emptyGoQuo
   const dayKey = localDayKey(now)
   const monthKey = dayKey.slice(0, 7)
   const secretMigration = secretMigrationNotice(ledger)
-  const goKeyInfo = await describeGoKey(ctx?.get?.('credentials'), ledger.config)
+  const goKeyInfo = await describeGoKey(ctx, ledger.config)
   // 自定义余额 {{VAR}} 占位符的凭据配置状态(v1.7.6,issue #86):与 keyConfigured 同
   // 语义的 describe 摘要,前端据此渲染 write-only 输入框;无占位符/凭据服务缺席时空表。
   const customVarStatus = {}
@@ -1229,23 +1255,24 @@ async function describePlanKey(credentials, id, config) {
 
 /**
  * 查询 OpenCode Go 密钥的配置状态(永不返回值本身),语义同 describePlanKey。
- * @param credentials - 宿主凭据服务(可能 undefined)。
+ * @param ctx - 宿主上下文(可能 null)。
  * @param config - 插件配置(用于判定遗留明文)。
  * @returns {{ keyConfigured: boolean, keySource: string }}
  */
-async function describeGoKey(credentials, config) {
+async function describeGoKey(ctx, config) {
+  const credentials = ctx?.get?.('credentials')
   const fallback = { keyConfigured: false, keySource: '' }
   const legacy = readSecret(config, 'goQuota').length > 0
-  const ref = secretRefOf('goQuota')
-  if (ref === null) return fallback
-  if (credentials === undefined) return legacy ? { keyConfigured: true, keySource: 'legacy' } : fallback
-  try {
-    const info = await credentials.describe(credentialRef(ref))
-    if (info?.configured === true) {
-      return { keyConfigured: true, keySource: typeof info.source === 'string' ? info.source : '' }
+  for (const name of goKeyRefs(ctx)) {
+    if (credentials !== undefined) {
+      try {
+        const info = await credentials.describe(credentialRef(name))
+        if (info?.configured === true) {
+          return { keyConfigured: true, keySource: typeof info.source === 'string' ? info.source : '' }
+        }
+      } catch { /* 单个引用不可用时继续尝试其他来源。 */ }
     }
-  } catch {
-    // describe 不可用:退回遗留明文判定。
+    if (String(process.env[name] ?? '').trim()) return { keyConfigured: true, keySource: 'env' }
   }
   // 自动发现路径(opencode auth.json)也是「已配置」,但不暴露来源文件细节。
   if (findGoKeyInAuthJson() !== null) return { keyConfigured: true, keySource: 'auto' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.23",
+  "version": "1.7.24",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(9 家,含 SCNet Token Plan 本地 Credits 计量与火山方舟 Volcano Ark Coding Plan AK/SK 签名查询)、自定义 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 9 vendors (incl. local credits metering for the SCNet Token Plan and Volcano Ark Coding Plan via AK/SK signature), plan/API dual-track billing with per-1% & full-window Token Plan usage estimates, 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",