dsh-cost-meter 1.6.4 → 1.6.5

package/README.en.md

@@ -231,22 +231,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.6.4`** — 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.6.5`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.6.4/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.6.5/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.6.4
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.6.5
 ```
 
 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.6.4.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.6.5.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):
@@ -263,7 +263,7 @@ Cause: your environment (pnpm config or a policy bundled into the invoking insta
 
 Fix:
 
-1. **Upgrade to v1.6.4+**: all three runtime dependencies (`@deepseek-ai/dsh-credentials`, `@deepseek-ai/dsh-home-paths`, `zod`) are now exact-pinned — a pinned version's publish date never changes, so it satisfies any age threshold and this plugin can no longer trigger the error;
+1. **Upgrade to v1.6.5+**: all three runtime dependencies (`@deepseek-ai/dsh-credentials`, `@deepseek-ai/dsh-home-paths`, `zod`) are now exact-pinned — a pinned version's publish date never changes, so it satisfies any age threshold and this plugin can no longer trigger the error;
 2. If the error is triggered by **another plugin's** dependencies instead, append an exclusion for the offending `name@version` printed in the error to the profile's `pnpm-workspace.yaml` (default `$DSH_HOME/profiles/web/pnpm-workspace.yaml`) and retry:
 
 ```yaml

package/README.md

@@ -233,22 +233,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.6.4`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.6.5`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.6.4/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.6.5/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.6.4
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.6.5
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.6.4.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.6.5.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):
@@ -265,7 +265,7 @@ dsh web
 
 处理:
 
-1. **升级到 v1.6.4+**:三个运行时依赖(`@deepseek-ai/dsh-credentials`、`@deepseek-ai/dsh-home-paths`、`zod`)已全部精确锁版——锁定版本的发布时间固定不变,对任意年龄阈值永远满足,本插件不再可能触发该错误;
+1. **升级到 v1.6.5+**:三个运行时依赖(`@deepseek-ai/dsh-credentials`、`@deepseek-ai/dsh-home-paths`、`zod`)已全部精确锁版——锁定版本的发布时间固定不变,对任意年龄阈值永远满足,本插件不再可能触发该错误;
 2. 若报错由**其他插件**的依赖触发,可在 profile 目录的 `pnpm-workspace.yaml`(默认 `$DSH_HOME/profiles/web/pnpm-workspace.yaml`)按报错列出的条目追加排除后重试:
 
 ```yaml

package/lib/index.js

@@ -973,13 +973,22 @@ function createService(ctx, ledger) {
       if ((ledger.config?.balance?.reconcile ?? true) === true && balanceCache.value.status === 'ok') {
         const nowMs = Date.now()
         const usd = v => '$' + Number(v).toFixed(4)
-        const { ref, event } = reconcileBalanceDelta(ledger.balanceRef, balanceCache.value, ledger.todayOfficialCost(), localDayKey(nowMs), nowMs)
+        // 变动金额按余额条目的真实币种显示符号(CNY 余额账号此前被错标成 $),
+        // 并附 ≈USD 折算参考与本地账本同币种可比(zh/en 两份模板共用参数,不做字典改动)。
+        const nativeDelta = event => {
+          const symbol = String(event.spentCurrency ?? '').toUpperCase() === 'CNY' ? '¥' : '$'
+          const converted = Number.isFinite(event.spentUsd) && Math.abs(event.spentUsd - event.spent) > 0.005
+            ? '（≈' + usd(event.spentUsd) + '）'
+            : ''
+          return symbol + Number(event.spent).toFixed(4) + converted
+        }
+        const { ref, event } = reconcileBalanceDelta(ledger.balanceRef, balanceCache.value, ledger.todayOfficialCost(), localDayKey(nowMs), nowMs, { exchangeRate: ledger.config.exchangeRate })
         if (ref !== ledger.balanceRef) {
           ledger.balanceRef = ref
           ledger.scheduleWrite()
         }
         reconcileNotice = event !== null && event.kind === 'drift'
-          ? { ok: false, message: tmsg(localeOf(ledger.config), 'reconcileWarn', { cost: usd(event.todayCost), delta: usd(event.spent) }) }
+          ? { ok: false, message: tmsg(localeOf(ledger.config), 'reconcileWarn', { cost: usd(event.todayCost), delta: nativeDelta(event) }) }
           : { ok: true, message: '' }
       }
     }, error => {

package/lib/store.js

@@ -182,8 +182,10 @@ export function zeroDay(date) {
 
 /**
  * 聚合某日账本中归属 DeepSeek 官方渠道的费用(USD;issue #36)。
- * 只累加 byProviderModel 里 provider 前缀为 deepseek 的条目(账本记账时未标注
- * provider 的调用同样归入 deepseek);Coding Plan / 自定义 Provider 等渠道不计入。
+ * 只累加 byProviderModel 里 provider 前缀为官方渠道的条目:'deepseek'(账本记账时
+ * 未标注 provider 的调用归入此键)与 'deepseek-official'(profile 内置官方路由的
+ * 实际 provider id,实测账本键形如 deepseek-official:deepseek-v4-flash);Coding
+ * Plan / 自定义 Provider / go、zen 等第三方网关不计入。
  * 无按渠道拆分的旧数据(byProviderModel 缺失/为空)退回全量 cost,保持升级前行为。
  * @param day - 单日账本记录(可能为 undefined)。
  */
@@ -194,7 +196,8 @@ export function officialCostOfDay(day) {
   let sum = 0
   for (const [key, value] of Object.entries(by)) {
     const idx = key.indexOf(':')
-    if ((idx >= 0 ? key.slice(0, idx) : key) !== 'deepseek') continue
+    const provider = idx >= 0 ? key.slice(0, idx) : key
+    if (provider !== 'deepseek' && provider !== 'deepseek-official') continue
     sum += Number(value?.cost) || 0
   }
   return sum
@@ -1590,14 +1593,18 @@ export class Ledger {
  * 仅当余额确实减少时才对账——订阅/Coding Plan 消费不动官方余额,若强行用余额差
  * 替代今日费用会把订阅用户全天消费归零;充值/额度结构变动时重置参考点防误判;
  * 参考点与本次拉取的币种不一致时(多币种条目挑选切换/旧账本无币种标记)同样重置。
+ * 币种折算(用户实测:CNY 余额账号恒报 drift):余额差按 snap.currency 计价(开放平台
+ * 主币种为 ¥),而账本金额恒为 USD——直接相减/比阈值是跨币种错配。折算入 USD 后再比;
+ * CNY 折算率取 options.exchangeRate(非法回落 7.2 默认展示汇率),非 CNY 按 1:1。
  * @param prevRef - 上一参考点({ date, total, granted, topped, currency, at })或 null。
  * @param balance - 本次拉取结果({ currency, totalBalance, grantedBalance, toppedUpBalance })。
- * @param todayCost - 本地账本今日合计费用。
+ * @param todayCost - 本地账本今日合计费用(USD)。
  * @param dayKey - 本地日期键(YYYY-MM-DD)。
  * @param nowMs - 当前时刻。
- * @returns {{ ref, event }} event.kind ∈ baseline | structure-reset | flat | ok | drift(drift 携带 spent/todayCost)。
+ * @param [options] - { exchangeRate }:CNY→USD 折算率(1 USD 兑 X CNY)。
+ * @returns {{ ref, event }} event.kind ∈ baseline | structure-reset | flat | ok | drift(drift 携带 spent/spentCurrency/spentUsd/todayCost)。
  */
-export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs) {
+export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs, options) {
   if (balance === null || typeof balance !== 'object' || !Number.isFinite(balance.totalBalance)) {
     return { ref: prevRef ?? null, event: null }
   }
@@ -1622,14 +1629,19 @@ export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs
   if (snap.granted > prevRef.granted + 0.009 || snap.topped > prevRef.topped + 0.009) {
     return { ref: snap, event: { kind: 'structure-reset' } }
   }
+  const isCny = snap.currency.toUpperCase() === 'CNY'
+  const fallbackRate = isCny ? 7.2 : 1
+  const configuredRate = Number(options?.exchangeRate)
+  const exchangeRate = Number.isFinite(configuredRate) && configuredRate > 0 ? configuredRate : fallbackRate
   const spent = prevRef.total - snap.total
+  const spentUsd = isCny ? spent / exchangeRate : spent
   // 余额未减少:无法对账(可能整天走订阅扣费),静默。
   if (spent <= 0.009) return { ref: prevRef, event: { kind: 'flat' } }
-  const dev = Math.abs(spent - todayCost)
-  const threshold = Math.max(0.3, 0.15 * Math.max(spent, todayCost))
-  if (dev > threshold) return { ref: prevRef, event: { kind: 'drift', spent, todayCost } }
+  const dev = Math.abs(spentUsd - todayCost)
+  const threshold = Math.max(0.3, 0.15 * Math.max(spentUsd, todayCost))
+  if (dev > threshold) return { ref: prevRef, event: { kind: 'drift', spent, spentCurrency: snap.currency, spentUsd, todayCost } }
   // ok/drift 都保留当日首次基准,后续拉取继续与早间基线比对。
-  return { ref: prevRef, event: { kind: 'ok', spent, todayCost } }
+  return { ref: prevRef, event: { kind: 'ok', spent, spentCurrency: snap.currency, spentUsd, todayCost } }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "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",