dsh-cost-meter 1.5.10 → 1.5.12

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) · 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)
 
-[![version](https://img.shields.io/badge/version-1.5.10-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.12-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)
@@ -191,22 +191,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.10`** — 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.12`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.10/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.12/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.10
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.12
 ```
 
 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.10.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.12.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 六家)
 
-[![version](https://img.shields.io/badge/version-1.5.10-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.12-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)
@@ -193,22 +193,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.10`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.12`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.10/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.12/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.10
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.12
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.10.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.12.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/client.js

@@ -1261,8 +1261,8 @@ window.__ModuleLoader__.load({
           invocation: { kind: 'direct' },
           parameters: [
             { name: 'limit', wire: 'limit', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionLimit', schema: limitCodec } },
-            { name: 'sort', wire: 'sort', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSort', schema: sortCodec } },
-            { name: 'dir', wire: 'dir', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSortDir', schema: sortCodec } },
+            { name: 'sort', wire: 'sort', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSort', schema: sortCodec }, acceptsUndefined: true },
+            { name: 'dir', wire: 'dir', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSortDir', schema: sortCodec }, acceptsUndefined: true },
           ],
           result: { mode: 'strict', typeSymbol: 'dsh-cost-meter#TopSessions', schema: topSessionsCodec },
         },

package/lib/index.js

@@ -18,7 +18,7 @@ import fs from 'node:fs'
 import { join } from 'node:path'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
-import { Ledger, applyConfigPatch, localDayKey, reconcileBalanceDelta, zeroDay } from './store.js'
+import { Ledger, applyConfigPatch, localDayKey, pickBalanceInfo, reconcileBalanceDelta, zeroDay } from './store.js'
 import { backfillLegacyLedger } from './backfill.js'
 import { OFFICIAL_PRICING_URL, normalizePrice, parsePricingHtml, costOf, priceEntryFor, providerPriceEntryFor, buildPriceCatalog } from './pricing.js'
 import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, emptyCustomBalance, queryCustomBalance } from './coding-plans.js'
@@ -467,7 +467,8 @@ async function queryBalance(ctx, locale) {
   })
   if (!response.ok) throw new Error(tmsg(locale, 'balanceHttp', { code: String(response.status) }))
   const data = await response.json()
-  const info = Array.isArray(data?.balance_infos) ? data.balance_infos[0] : undefined
+  // 多币种账号返回 CNY/USD 两条且顺序不稳定(#24/#25):按余额与币种挑选,不固定取首条。
+  const info = pickBalanceInfo(data?.balance_infos)
   if (info === undefined) throw new Error(tmsg(locale, 'balanceNoInfos'))
   const num = value => {
     const parsed = Number(value)
@@ -525,10 +526,13 @@ function buildState(ledger, balance = emptyBalance(), goQuota = emptyGoQuota(),
   const check = stateSchema.safeParse(state)
   if (check.success) return state
   console.warn('[dsh-cost-meter] state 与 codec 漂移,尝试降级恢复可用性:', JSON.stringify(check.error.issues?.slice(0, 3) ?? check.error))
+  // 注意剔除键必须用解构省略而非赋 undefined:priceCatalog 是 schema 声明的
+  // optional 键,显式 undefined 键会被网关 JSON 安全校验拒绝(值合法但属性不安全)。
+  const { priceCatalog: _dropped, ...stateNoCatalog } = state
   const attempts = [
-    { ...state, priceCatalog: undefined },
-    { ...state, priceCatalog: undefined, codingPlans: {} },
-    { ...state, priceCatalog: undefined, codingPlans: {}, balance: emptyBalance(), goQuota: emptyGoQuota(), customBalance: emptyCustomBalance() },
+    stateNoCatalog,
+    { ...stateNoCatalog, codingPlans: {} },
+    { ...stateNoCatalog, codingPlans: {}, balance: emptyBalance(), goQuota: emptyGoQuota(), customBalance: emptyCustomBalance() },
   ]
   for (const fallback of attempts) {
     if (stateSchema.safeParse(fallback).success) return fallback
@@ -926,11 +930,9 @@ function createService(ctx, ledger) {
         if (sortKey === 'recent' && !asc) rows.reverse()
         for (const s of rows) {
           if (s === null || typeof s !== 'object') continue
-          all.push({
+          const row = {
             date,
             id: String(s.id ?? ''),
-            title: typeof s.title === 'string' && s.title.length > 0 ? s.title : undefined,
-            at: Number.isFinite(Number(s.at)) && Number(s.at) > 0 ? Number(s.at) : undefined,
             input: s.input ?? 0,
             output: s.output ?? 0,
             cacheRead: s.cacheRead ?? 0,
@@ -939,7 +941,14 @@ function createService(ctx, ledger) {
             calls: s.calls ?? 0,
             cost: s.cost ?? 0,
             byProviderModel: s.byProviderModel ?? {},
-          })
+          }
+          // title/at 缺席时不得写入 undefined 键:网关对返回值做 JSON 安全校验,
+          // 显式 undefined 属性会被「undefined is not JSON-safe」拒绝,整个 RPC
+          // result-invalid,会话排行面板加载失败(未命名/无时间戳会话即触发)。
+          if (typeof s.title === 'string' && s.title.length > 0) row.title = s.title
+          const at = Number(s.at)
+          if (Number.isFinite(at) && at > 0) row.at = at
+          all.push(row)
         }
       }
       if (sortKey === 'cost') all.sort((a, b) => asc ? a.cost - b.cost : b.cost - a.cost)

package/lib/pricing.js

@@ -248,11 +248,13 @@ export const PROVIDER_MODEL_FAMILIES = {
  * 内置只读目录(含 DeepSeek 当前模型);「挂载」= 把条目复制进可编辑价格表。
  */
 export function buildPriceCatalog() {
-  const catalog = {}
+  const catalog = Object.create(null)
+  const isUnsafeKey = (key) => key === '__proto__' || key === 'constructor' || key === 'prototype'
   const put = (provider, id, entry) => {
     const family = PROVIDER_MODEL_FAMILIES[provider]?.[id] ?? id
-    if (catalog[provider] === undefined) catalog[provider] = {}
-    if (catalog[provider][family] === undefined) catalog[provider][family] = {}
+    if (isUnsafeKey(provider) || isUnsafeKey(family) || isUnsafeKey(id)) return
+    if (catalog[provider] === undefined) catalog[provider] = Object.create(null)
+    if (catalog[provider][family] === undefined) catalog[provider][family] = Object.create(null)
     catalog[provider][family][id] = entry
   }
   for (const [id, entry] of Object.entries(DEFAULT_PRICE_TABLE.models)) put('deepseek', id, entry)
@@ -654,12 +656,12 @@ export function formatMoney(usdCost, display) {
 function decodeEntities(text) {
   return text
     .replace(/ /g, ' ')
-    .replace(/&/g, '&')
     .replace(/&lt;/g, '<')
     .replace(/&gt;/g, '>')
     .replace(/&quot;/g, '"')
     .replace(/&#39;/g, "'")
     .replace(/&mdash;/g, '—')
+    .replace(/&amp;/g, '&')
 }
 
 function stripTags(html) {

package/lib/store.js

@@ -723,7 +723,9 @@ export class Ledger {
           const ref = parsed.balanceRef
           if (ref !== null && typeof ref === 'object' && typeof ref.date === 'string'
             && Number.isFinite(ref.total) && Number.isFinite(ref.granted) && Number.isFinite(ref.topped)) {
-            balanceRef = { date: ref.date, total: ref.total, granted: ref.granted, topped: ref.topped, at: Number(ref.at) || 0 }
+            // 旧账本无 currency 字段:保留 undefined,与新版首次拉取币种不等,
+            // reconcile 时自然重置基准一次(旧参考点可能录自 USD 0.00 误读,不可信)。
+            balanceRef = { date: ref.date, total: ref.total, granted: ref.granted, topped: ref.topped, currency: typeof ref.currency === 'string' ? ref.currency : undefined, at: Number(ref.at) || 0 }
           }
         }
       }
@@ -962,9 +964,10 @@ export class Ledger {
 /**
  * 余额差交叉校验(issue #18 讨论):用官方余额当日变动反推消费,与本地账本今日合计比对。
  * 仅当余额确实减少时才对账——订阅/Coding Plan 消费不动官方余额,若强行用余额差
- * 替代今日费用会把订阅用户全天消费归零;充值/额度结构变动时重置参考点防误判。
- * @param prevRef - 上一参考点({ date, total, granted, topped, at })或 null。
- * @param balance - 本次拉取结果({ totalBalance, grantedBalance, toppedUpBalance })。
+ * 替代今日费用会把订阅用户全天消费归零;充值/额度结构变动时重置参考点防误判;
+ * 参考点与本次拉取的币种不一致时(多币种条目挑选切换/旧账本无币种标记)同样重置。
+ * @param prevRef - 上一参考点({ date, total, granted, topped, currency, at })或 null。
+ * @param balance - 本次拉取结果({ currency, totalBalance, grantedBalance, toppedUpBalance })。
  * @param todayCost - 本地账本今日合计费用。
  * @param dayKey - 本地日期键(YYYY-MM-DD)。
  * @param nowMs - 当前时刻。
@@ -979,12 +982,18 @@ export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs
     total: balance.totalBalance,
     granted: Number.isFinite(balance.grantedBalance) ? balance.grantedBalance : 0,
     topped: Number.isFinite(balance.toppedUpBalance) ? balance.toppedUpBalance : 0,
+    currency: typeof balance.currency === 'string' ? balance.currency : '',
     at: nowMs,
   }
   // 新的一天(或首次/参考点形状异常):打基准,不对账。
   if (prevRef === null || typeof prevRef !== 'object' || prevRef.date !== dayKey) {
     return { ref: snap, event: { kind: 'baseline' } }
   }
+  // 币种变化(#24/#25):选中的条目币种切换(或旧参考点无币种标记)时金额不可比,
+  // 重置基准不对账——否则 USD 0.00 误读会让余额差虚高,触发 drift 误报。
+  if (prevRef.currency !== snap.currency) {
+    return { ref: snap, event: { kind: 'structure-reset' } }
+  }
   // 充值/额度授予变动:充值与授信只会让分项余额增加(消费只会减少),分项变大则旧参考点失效,重置不告警。
   if (snap.granted > prevRef.granted + 0.009 || snap.topped > prevRef.topped + 0.009) {
     return { ref: snap, event: { kind: 'structure-reset' } }
@@ -998,3 +1007,21 @@ export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs
   // ok/drift 都保留当日首次基准,后续拉取继续与早间基线比对。
   return { ref: prevRef, event: { kind: 'ok', spent, todayCost } }
 }
+
+/**
+ * 从官方余额接口的 balance_infos 中挑选要展示的条目(issues #24/#25)。
+ *
+ * 多币种账号同时返回 CNY/USD 两条,且实测两条的排列顺序每次请求不稳定——
+ * 固定取首条会在 USD 排前时读到 0.00,余额在正确值与 0 之间跳变。挑选规则:
+ *  - 优先取「有余额」的条目;同有余额时优先 CNY(开放平台主币种,确定性优先);
+ *  - 全部为零时优先 CNY(未充值/新账号,保证不随返回顺序跳变);
+ *  - 无 CNY 条目时兜底首条(单币种账号行为与旧版一致)。
+ * @param infos - balance_infos 数组(元素含 currency / total_balance 等官方字段)。
+ * @returns 选中的条目,或 undefined(无有效条目,调用方按缺 balance_infos 报错)。
+ */
+export function pickBalanceInfo(infos) {
+  const list = Array.isArray(infos) ? infos.filter(entry => entry !== null && typeof entry === 'object') : []
+  const positive = list.filter(entry => Number(entry.total_balance) > 0)
+  const cnyFirst = entries => entries.find(entry => String(entry.currency).toUpperCase() === 'CNY')
+  return cnyFirst(positive) ?? positive[0] ?? cnyFirst(list) ?? list[0]
+}

package/lib/typert.host.js

@@ -358,8 +358,11 @@ export const TYPERT = {
       invocation: { kind: 'direct' },
       parameters: [
         { name: 'limit', wire: 'limit', source: 'json', codec: _limit$codec },
-        { name: 'sort', wire: 'sort', source: 'json', codec: _sort$codec },
-        { name: 'dir', wire: 'dir', source: 'json', codec: _dir$codec },
+        // sort/dir 与服务端函数默认值(sort='cost', dir='desc')对应,声明可缺省:
+        // 网关对 args 字段做精确匹配,不声明 acceptsUndefined 时旧客户端单参数调用
+        // 会因 missing "sort"/"dir" 被拒,会话排行面板直接加载失败。
+        { name: 'sort', wire: 'sort', source: 'json', codec: _sort$codec, acceptsUndefined: true },
+        { name: 'dir', wire: 'dir', source: 'json', codec: _dir$codec, acceptsUndefined: true },
       ],
       result: _topSessions$codec,
     },
@@ -440,7 +443,7 @@ export const TYPERT = {
           {
             kind: 'method',
             name: 'getTopSessions',
-            signature: 'getTopSessions(limit: number, sort: string, dir: string): TopSessions',
+            signature: 'getTopSessions(limit: number, sort?: string, dir?: string): TopSessions',
             summary: '跨全部日期按指定排序返回前 N 个会话(不分日期视角)。Return the top N sessions across all days with the given sort.',
             jsDoc: '/**\n * 跨全部日期返回前 N 个会话(每条带所属日期/标题/创建时刻)。\n * @param limit - 返回条数上限(服务端限制 1-500)。\n * @param sort - cost(费用) | time(创建时间) | recent(实时顺序)。\n * @param dir - asc | desc(默认 desc)。\n * @returns 会话列表(含 date/title/at 字段)。\n * Return the top N sessions across all days (each tagged with date/title/createdAt).\n * @param limit - Max rows to return (server clamps to 1-500).\n * @param sort - cost | time | recent (ledger/sidebar order).\n * @param dir - asc | desc (defaults to desc).\n * @returns Session list with date/title/at fields.\n */',
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(6 家)、自定义 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 6 vendors, custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",