dsh-cost-meter 1.7.39 → 1.7.41

package/lib/external-usage.js

@@ -30,7 +30,7 @@ function summary(days, dayKey) {
   return { today, month, total, history }
 }
 
-/** A snapshot replaces its predecessor; it never mutates the DSH ledger or balance reconciliation. */
+/** A snapshot replaces its predecessor; it never mutates the DSH ledger. */
 export function parseExternalUsageSnapshot(value, config, nowMs = Date.now()) {
   if (!object(value)) return null
   if (Object.hasOwn(value, 'sources') && !Array.isArray(value.sources)) return null
@@ -75,7 +75,7 @@ export function parseExternalUsageSnapshot(value, config, nowMs = Date.now()) {
           effectiveAtMs: Date.parse(config?.peakEffectiveAt ?? ''), windows: config?.peakWindows, holidays: config?.peakHolidays }
         const tokens = { input: raw.input, output: raw.output, cacheRead: raw.cached, cacheWrite: raw.cacheWrite ?? 0, reasoning: raw.reasoning ?? 0 }
         const priced = costOf(tokens, resolved.entry, at, peak)
-        const usd = usdFromCost(priced, resolved.billingMode === 'deepseek-peak' && config?.prices?.currency === 'CNY' ? 'CNY' : 'USD', config?.exchangeRate)
+        const usd = usdFromCost(priced, resolved.currency, config?.exchangeRate)
         const date = localDayKey(at)
         const day = days[date] ?? (days[date] = zeroDay(date))
         for (const key of ['input', 'output', 'cacheRead', 'cacheWrite', 'reasoning']) day[key] += tokens[key]
@@ -109,3 +109,10 @@ export async function readExternalUsageSnapshot(path, config, nowMs = Date.now()
     return parseExternalUsageSnapshot(JSON.parse(buffer.subarray(0, length).toString('utf8')), config, nowMs)
   } catch { return null } finally { await file?.close().catch(() => {}) }
 }
+
+/** Fresh external usage participates in same-account balance reconciliation. */
+export function externalTodayCostForReconcile(snapshot) {
+  if (snapshot?.stale === true) return null
+  const cost = snapshot?.combined?.today?.cost
+  return Number.isFinite(cost) && cost >= 0 ? cost : 0
+}

package/lib/index.js

@@ -33,7 +33,7 @@ import { queryGatewayQuota, emptyGatewayQuota, managementKeyVarOf, gatewaySource
 import { stateSchema, TYPERT } from './typert.host.js'
 import { customBalanceCredentialVars } from './custom-balance.js'
 import { readScnetSnapshot } from './scnet-snapshot.js'
-import { readExternalUsageSnapshot } from './external-usage.js'
+import { readExternalUsageSnapshot, externalTodayCostForReconcile } from './external-usage.js'
 import { queryQwenCli } from './qwen-cli.js'
 import { queryBailianCli } from './bailian-cli.js'
 import { getSessionCost as readSessionCost } from './session-tree.js'
@@ -55,7 +55,7 @@ const SERVER_MESSAGES = {
     balanceDisplayOff: '余额显示已关闭,请先在 显示设置 中开启',
     balanceRefreshed: '余额已刷新',
     balanceQueryFailed: '余额查询失败:{message}',
-    reconcileWarn: '对账提示:本地账本今日官方渠道费用 {cost} 与官方余额当日变动 {delta} 偏差较大,请核对价格表或近期账单',
+    reconcileWarn: '对账提示:本地账本及外部来源今日费用 {cost} 与官方余额当日变动 {delta} 偏差较大,请核对价格表或近期账单',
     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 无效。没有订阅可关闭上方「启用」开关。',
@@ -130,7 +130,7 @@ const SERVER_MESSAGES = {
     balanceDisplayOff: 'Balance display is off; enable it in Display settings first',
     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',
+    reconcileWarn: 'Reconciliation notice: today\'s local and external usage cost ({cost}) deviates significantly from the official balance change ({delta}); please check the price table or recent bills',
     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.',
@@ -591,9 +591,7 @@ function makeCostUsageProjection(ledger) {
       const peak = peakConfig()
       peak.enabled = resolved.billingMode === 'deepseek-peak' && peak.enabled
       const priced = resolved.priced ? costOf(buckets, resolved.entry, atMs, peak) : 0
-      const billed = usdFromCost(priced,
-        resolved.billingMode === 'deepseek-peak' && ledger.config.prices?.currency === 'CNY' ? 'CNY' : 'USD',
-        ledger.config.exchangeRate)
+      const billed = usdFromCost(priced, resolved.currency, ledger.config.exchangeRate)
       // 同一 (turn, step) 的最终样本替换流式样本,先减后加,避免重复计数。
       const totals = { ...state.totals, reasoning: state.totals.reasoning ?? 0 }
       const byModel = { ...state.byModel }
@@ -1440,9 +1438,9 @@ function createService(ctx, ledger, openRouterPrices) {
       if (balanceCache.inFlight === prev) break // 上一个任务结束后由本调用继续走新建流程
     }
     const controller = new AbortController()
-    const task = queryBalance(ctx, localeOf(ledger.config), controller.signal).then(result => {
+    const task = queryBalance(ctx, localeOf(ledger.config), controller.signal).then(async result => {
       if (!active || balanceCache.inFlight !== task) return
-      balanceCache = { fetchedAt: Date.now(), value: { status: 'ok', message: '', fetchedAt: Date.now(), ...result } }
+      balanceCache = { ...balanceCache, fetchedAt: Date.now(), value: { status: 'ok', message: '', fetchedAt: Date.now(), ...result } }
       // 余额差交叉校验(issue #18):官方余额当日变动 vs 本地账本今日官方渠道费用,偏差超阈提示。
       // issue #36:Coding Plan / 自定义 Provider 的费用不动官方余额,对账只统计 deepseek 渠道,否则订阅用户会恒报 drift。
       if ((ledger.config?.balance?.reconcile ?? true) === true && balanceCache.value.status === 'ok') {
@@ -1468,12 +1466,16 @@ function createService(ctx, ledger, openRouterPrices) {
             : ''
           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 })
+        const external = await readExternalUsageSnapshot(join(dirname(ledger.path), 'external_usage.json'), ledger.config, nowMs)
+        if (!active || balanceCache.inFlight !== task) return
+        const externalCost = externalTodayCostForReconcile(external)
+        const todayCost = ledger.todayOfficialCost() + (externalCost ?? 0)
+        const { ref, event } = reconcileBalanceDelta(ledger.balanceRef, balanceCache.value, todayCost, localDayKey(nowMs), nowMs, { exchangeRate: ledger.config.exchangeRate })
         if (ref !== ledger.balanceRef) {
           ledger.balanceRef = ref
           ledger.scheduleWrite()
         }
-        reconcileNotice = event !== null && event.kind === 'drift'
+        reconcileNotice = externalCost !== null && event !== null && event.kind === 'drift'
           ? { ok: false, message: tmsg(localeOf(ledger.config), 'reconcileWarn', { cost: nativeCost(event), delta: nativeDelta(event) }) }
           : { ok: true, message: '' }
       }

package/lib/plan-billing.js

@@ -123,14 +123,16 @@ export function isRoutedThirdPartyCall(provider, modelId, prices) {
 export function billingClassOf(provider, modelId, planBilling, enabledPlans, prices) {
   let planId = planProviderIdOf(provider)
   if (planId === null && isRoutedThirdPartyCall(provider, modelId, prices)) planId = 'go'
-  if (planId === null) return 'api'
   const models = planBilling?.models
   if (models !== null && typeof models === 'object') {
     const direct = models[`${provider}:${modelId}`]
     if (direct === 'plan' || direct === 'api') return direct
-    const canonical = models[`${planId}:${modelId}`]
-    if (canonical === 'plan' || canonical === 'api') return canonical
+    if (planId !== null) {
+      const canonical = models[`${planId}:${modelId}`]
+      if (canonical === 'plan' || canonical === 'api') return canonical
+    }
   }
+  if (planId === null) return 'api'
   const providers = planBilling?.providers
   const configured = providers !== null && typeof providers === 'object' ? providers[planId] : undefined
   if (configured === 'plan' || configured === 'api') return configured

package/lib/pricing.js

@@ -237,8 +237,18 @@ export const DEFAULT_PROVIDER_PRICE_TABLE = {
   },
   xiaomi: {
     models: {
-      'mimo-v2.5': { input: 0.14, cachedInput: 0.0028, output: 0.28, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
-      'mimo-v2.5-pro': { input: 0.435, cachedInput: 0.003625, output: 0.87, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
+      // MiMo V2.6(2026-09-28 官方价目页核对):官方把 2.6 与 2.5 两代并列同价并
+      // 标注 2.5 系即将下线;2.6-pro-ultraspeed 为速度优先档,单价是 pro 的 10 倍。
+      // 三者按官方 USD 价收录(2.6-pro 命中价官方页 $0.0036、Go 目录 $0.003625,
+      // opencode-go 目录随 Go 值);批量推理为实时价一半,官方人民币价一并记入
+      // notes。第三方 flat 条目恒按美元入账(store.account / 实时钩子 / 回放同
+      // 口径),而官方 CNY 与 USD 两套数字各自舍入(pro 系折算率 6.90、flash 系
+      // 7.14),人民币账单精度只能靠展示汇率对齐。
+      'mimo-v2.6-pro': { input: 0.435, cachedInput: 0.0036, output: 0.87, cny: { cacheHit: 0.025, cacheMiss: 3, output: 6 }, billingMode: 'flat', sourceUrl: 'https://mimo.mi.com/docs/zh-CN/price/pay-as-you-go', checkedAt: '2026-09-28', notes: '批量推理按半价' },
+      'mimo-v2.6-flash': { input: 0.14, cachedInput: 0.0028, output: 0.28, cny: { cacheHit: 0.02, cacheMiss: 1, output: 2 }, billingMode: 'flat', sourceUrl: 'https://mimo.mi.com/docs/zh-CN/price/pay-as-you-go', checkedAt: '2026-09-28', notes: '批量推理按半价' },
+      'mimo-v2.6-pro-ultraspeed': { input: 4.35, cachedInput: 0.036, output: 8.7, cny: { cacheHit: 0.25, cacheMiss: 30, output: 60 }, billingMode: 'flat', sourceUrl: 'https://mimo.mi.com/docs/zh-CN/price/pay-as-you-go', checkedAt: '2026-09-28', notes: '速度优先档;官方未提供批量推理档' },
+      'mimo-v2.5': { input: 0.14, cachedInput: 0.0028, output: 0.28, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17', notes: '官方标注即将下线,由 mimo-v2.6-flash 接替' },
+      'mimo-v2.5-pro': { input: 0.435, cachedInput: 0.003625, output: 0.87, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17', notes: '官方标注即将下线,由 mimo-v2.6-pro 接替' },
     },
   },
   upstage: {
@@ -267,7 +277,7 @@ export const DEFAULT_PROVIDER_PRICE_TABLE = {
       'mistral-small-4.0': { input: 0.15, cachedInput: 0.015, output: 0.6, billingMode: 'flat' },
     },
   },
-  // OpenCode Go 订阅($10/月)包含的模型中非 DeepSeek 的 19 个(不含免费档):订阅制下请求
+  // OpenCode Go 订阅($10/月)包含的模型中非 DeepSeek 的部分(不含免费档):订阅制下请求
   // 不按 token 扣费,此处为官方公布的参考单价(用于成本估算/对比),来源 opencode.ai/docs/go。
   // DeepSeek V4 Flash/Pro 与官方主表重复,以官方为准(含峰谷两档),Go 目录不重复收录(v1.5.2 移除)。
   'opencode-go': {
@@ -283,6 +293,10 @@ export const DEFAULT_PROVIDER_PRICE_TABLE = {
       'kimi-k3': { input: 3, cachedInput: 0.3, output: 15, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
       'kimi-k2.7-code': { input: 0.95, cachedInput: 0.19, output: 4, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
       'kimi-k2.6': { input: 0.95, cachedInput: 0.16, output: 4, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
+      // MiMo V2.6-Flash / V2.6-Pro 已在 Go 目录在册(2026-09-28 抓取),与 2.5 系同价;
+      // 速度优先档 Pro UltraSpeed 不在 Go 目录(见 xiaomi 目录,官方价)。
+      'mimo-v2.6-flash': { input: 0.14, cachedInput: 0.0028, output: 0.28, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-09-28' },
+      'mimo-v2.6-pro': { input: 0.435, cachedInput: 0.003625, output: 0.87, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-09-28' },
       'mimo-v2.5': { input: 0.14, cachedInput: 0.0028, output: 0.28, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
       'mimo-v2.5-pro': { input: 0.435, cachedInput: 0.003625, output: 0.87, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
       'minimax-m3': { input: 0.3, cachedInput: 0.06, output: 1.2, billingMode: 'flat', sourceUrl: 'https://opencode.ai/docs/go', checkedAt: '2026-08-17' },
@@ -404,7 +418,10 @@ export const PROVIDER_MODEL_FAMILIES = {
   alibaba: { 'qwen3.8-max': 'Qwen3.8', 'qwen3.7-max': 'Qwen3.7', 'qwen3.7-plus': 'Qwen3.7', 'qwen3.6-plus': 'Qwen3.6', 'qwen3.5-plus': 'Qwen3.5', 'qwen3-plus': 'Qwen3' },
   minimax: { 'minimax-m3': 'MiniMax M3', 'minimax-m2.7': 'MiniMax M2', 'minimax-m2.5': 'MiniMax M2' },
   tencent: { 'hunyuan-a13b': '混元', 'hy3': 'Hy3' },
-  xiaomi: { 'mimo-v2.5': 'MiMo V2.5', 'mimo-v2.5-pro': 'MiMo V2.5' },
+  xiaomi: {
+    'mimo-v2.6-pro': 'MiMo V2.6', 'mimo-v2.6-flash': 'MiMo V2.6', 'mimo-v2.6-pro-ultraspeed': 'MiMo V2.6',
+    'mimo-v2.5': 'MiMo V2.5', 'mimo-v2.5-pro': 'MiMo V2.5',
+  },
   upstage: { 'solar-pro4': 'Solar', 'solar-pro3': 'Solar' },
   nvidia: { 'nvidia/nemotron-3-ultra-550b-a55b': 'Nemotron' },
   mistral: { 'mistral-large-2512': 'Mistral Large', 'mistral-medium-3.5': 'Mistral Medium', 'mistral-small-4.0': 'Mistral Small' },
@@ -417,6 +434,7 @@ export const PROVIDER_MODEL_FAMILIES = {
   'opencode-go': {
     'gpt-5.6-luna': 'GPT', 'grok-4.5': 'Grok', 'glm-5.3': 'GLM', 'glm-5.3-flash': 'GLM Flash', 'glm-5.2': 'GLM', 'glm-5.1': 'GLM',
     'kimi-k3': 'Kimi', 'kimi-k2.7-code': 'Kimi', 'kimi-k2.6': 'Kimi',
+    'mimo-v2.6-pro': 'MiMo', 'mimo-v2.6-flash': 'MiMo',
     'mimo-v2.5': 'MiMo', 'mimo-v2.5-pro': 'MiMo', 'minimax-m3': 'MiniMax', 'minimax-m2.7': 'MiniMax',
     'qwen3.8-max': 'Qwen', 'qwen3.7-max': 'Qwen', 'qwen3.7-plus': 'Qwen', 'qwen3.6-plus': 'Qwen',
     'hy3': 'Hy3', 'longcat-2.0': 'LongCat', 'muse-spark-1.2-contributor': 'Muse Spark',
@@ -667,6 +685,11 @@ export function normalizePrice(value) {
   if (value.legacy === true) entry.legacy = true
   if (value.billingMode === 'flat' || value.billingMode === 'deepseek-peak' || value.billingMode === 'batch') entry.billingMode = value.billingMode
   for (const key of ['sourceUrl', 'checkedAt', 'notes']) if (typeof value[key] === 'string') entry[key] = value[key]
+  if (value.cny !== undefined) {
+    if (!value.cny || typeof value.cny !== 'object' || Array.isArray(value.cny)
+      || !['cacheHit', 'cacheMiss', 'output'].every(key => validRate(value.cny[key]))) return null
+    entry.cny = completeTier(value.cny)
+  }
   const offPeak = completeTier(value.offPeak)
   if (offPeak !== undefined) entry.offPeak = offPeak
   const peak = completeTier(value.peak)
@@ -719,7 +742,7 @@ export function priceEntryFor(modelId, table) {
   return table?.default ?? { cacheHit: 0, cacheMiss: 0, output: 0 }
 }
 
-// ── 模型名自动匹配(精确 → 手动覆盖 → 去后缀/前缀/家族相似) ───────────
+// ── 模型名自动匹配(精确 → 归一化 → 安全后缀) ───────────
 
 /**
  * 模型名归一化:小写,去掉括号括起的附注(如 (go)),再只保留字母与数字。
@@ -742,13 +765,9 @@ function stripIdDecor(id) {
   return out
 }
 
-const tokensOf = id => stripIdDecor(id).split(/[-_./:]+/).filter(Boolean)
-
 /**
  * 把请求模型 id 匹配到候选价格表 id。
- * 顺序:精确 → 归一化等价(忽略大小写/空格/横杠/点号/括号附注) → 宽泛包含
- * (请求名归一化后包含候选名即算命中,取最长候选) → 去日期/版本后缀精确
- * → 候选前缀(取最长) → 家族 token 相似(≥2 个前缀 token 且最长者胜)。
+ * 顺序:精确 → 归一化等价 → 去日期/版本后缀 → 只接受日期、版本、上下文长度等安全后缀。
  * @param modelId - 请求模型 id。
  * @param candidates - 候选 id 数组。
  * @returns 命中的候选 id,或 null。
@@ -764,64 +783,13 @@ export function matchModelId(modelId, candidates) {
   // 归一化后等价:'GPT-5.6 Luna' ≡ 'gpt-5.6-luna'。
   const byCanon = list.find(c => canonModelId(c) === canon)
   if (byCanon !== undefined) return byCanon
-  // 宽泛包含:'gpt5.6 luna(go)' 归一化后包含 'gpt56luna' 即命中;取最长候选,过短候选(≤3)防误配。
-  // 数字分叉守卫(issue #18 同源):候选是请求 canon 的真前缀且剩余段为 1-2 位
-  // 纯数字(glm-5 vs glm-5.3 → 'glm53' 含 'glm5' 余 '3')时视为版本分叉拒绝;
-  // '-20260821' 等日期快照(≥3 位)与 '-128k' 容量后缀不受影响。
-  let containHit = null
-  let containLen = 0
-  for (const c of list) {
-    const cc = canonModelId(c)
-    if (cc.length < 4 || cc === canon) continue
-    if (canon.includes(cc) && cc.length > containLen) {
-      const idx = canon.indexOf(cc)
-      if (/^\d{1,2}$/.test(canon.slice(idx + cc.length))) continue
-      containHit = c; containLen = cc.length
-    }
-  }
-  if (containHit !== null) return containHit
   const stripped = stripIdDecor(modelId)
   const byStripped = list.find(c => stripIdDecor(c) === stripped)
   if (byStripped !== undefined) return byStripped
-  // 前缀匹配:modelId(去饰后)以候选(去饰后)开头且紧接分隔符,取最长候选。
-  // 分隔符后的整段若为 1-2 位纯数字(gpt-5.9 的 '.9'、kimi-k2.6 的 '.6')同样
-  // 视为版本分叉拒绝;'-128k'/''-v3.1'/日期后缀等不受影响。
-  let prefixHit = null
-  for (const c of list) {
-    const cs = stripIdDecor(c)
-    if (cs.length === 0 || cs === stripped) continue
-    const rest = stripped.slice(cs.length)
-    if (stripped.startsWith(cs) && /^[\-_./:]/.test(rest)) {
-      if (/^\d{1,2}$/.test(rest.replace(/^[\-_./:]+/, ''))) continue
-      if (prefixHit === null || stripIdDecor(prefixHit).length < cs.length) prefixHit = c
-    }
-  }
-  if (prefixHit !== null) return prefixHit
-  // 家族 token 相似:前缀公共 token ≥2,取公共最长者;同长取候选最短(更泛化的家族)。
-  const mt = tokensOf(modelId)
-  if (mt.length < 2) return null
-  let best = null
-  let bestLen = 0
-  for (const c of list) {
-    const ct = tokensOf(c)
-    let n = 0
-    while (n < mt.length && n < ct.length && mt[n] === ct[n]) n += 1
-    // 防跨版本误配(issue #18):分歧位置两侧都有数字/版本号 token(如 glm-5.3 vs glm-5.2)
-    // 视为不同模型拒绝匹配——订阅制/新版本模型不应落到同家族其它版本的付费单价。
-    if (n < mt.length && n < ct.length && /^\d+$/.test(mt[n]) && /^\d+$/.test(ct[n])) continue
-    // 候选 token 耗尽而请求多出的部分全是 1-2 位纯数字 token(glm-5 vs glm-5.3)
-    // 同为版本分叉,拒绝;多出日期(≥3 位)或带字母的容量/变体 token 时放行。
-    if (n >= 2 && n === ct.length && n < mt.length && mt.slice(n).every(t => /^\d{1,2}$/.test(t))) continue
-    // 分歧位一侧为 1-2 位版本号、另一侧为变体名(gpt-5.9 的 '9' vs gpt-5-nano
-    // 的 'nano'):containment/prefix 守卫生效后不再掉进变体互配,一并拒绝。
-    if (n >= 2 && n < mt.length && n < ct.length
-      && ((/^\d{1,2}$/.test(mt[n]) && /^[a-z]/.test(ct[n])) || (/^\d{1,2}$/.test(ct[n]) && /^[a-z]/.test(mt[n])))) continue
-    if (n >= 2 && (n > bestLen || (n === bestLen && best !== null && c.length < best.length))) {
-      best = c
-      bestLen = n
-    }
-  }
-  return best
+  // 仅允许日期、显式版本及上下文长度等装饰后缀；新变体保持未定价。
+  const suffix = /^(?:[-_./:@](?:\d{4}-?\d{2}-?\d{2}|v\d+(?:\.\d+)*|\d+k|latest))+$/
+  return list.filter(c => stripped.startsWith(stripIdDecor(c)) && suffix.test(stripped.slice(stripIdDecor(c).length)))
+    .sort((a, b) => b.length - a.length)[0] ?? null
 }
 
 /**
@@ -924,6 +892,7 @@ function providerPriceEntryForNormalized(normalized, modelId, prices, options) {
   const catalog = providerTable?.models ?? {}
   let hit = Object.hasOwn(catalog, targetModel) ? targetModel : null
   if (hit === null && mode === 'auto') hit = matchModelId(targetModel, Object.keys(catalog))
+  if (hit === null && targetProvider === 'opencode-go') return { entry: null, billingMode: 'flat', priced: false }
   if (hit === null && mode === 'auto') {
     // 跨厂商兑底:请求携带的 provider 未在价格表登记(opencode / zen 等路由入口)时,
     // 按模型名全库查找——先查 DeepSeek 主表(保留峰谷两档),再取其余厂商中归一化最长命中。
@@ -1046,17 +1015,25 @@ export function providerPriceEntryFor(provider, modelId, prices, options) {
   const rawProvider = typeof provider === 'string' ? provider.trim().toLowerCase() : ''
   const normalized = rawProvider.startsWith('llm-') ? rawProvider.slice(4) : rawProvider
   const primary = providerPriceEntryForNormalized(normalized, modelId, prices, options)
-  if (primary.priced) return primary
+  if (primary.priced) return selectPriceCurrency(primary, prices)
   // issue #56:v1.5.42 及之前设置页下拉框把 DeepSeek 目标模型存成裸名(缺
   // 'deepseek:' 前缀),被按「同渠道换名」解析——映射键的渠道与 DeepSeek 不同时
   // 查无此价,金额归零。此处对「裸值覆盖 + 非 DeepSeek 渠道解析失败」回退按
   // DeepSeek 渠道再查一次,存量错误配置无需手工修正即自愈。
-  if (normalized === '' || normalized === 'deepseek' || normalized.includes('deepseek')) return primary
+  if (normalized === '' || normalized === 'deepseek' || normalized.includes('deepseek')) return selectPriceCurrency(primary, prices)
   const overrides = options?.overrides !== null && typeof options?.overrides === 'object' ? options.overrides : {}
   const override = overrides[normalized + ':' + modelId]
-  if (typeof override !== 'string' || override.length === 0 || override.includes(':')) return primary
+  if (typeof override !== 'string' || override.length === 0 || override.includes(':')) return selectPriceCurrency(primary, prices)
   const mode = options?.mode === 'exact' ? 'exact' : 'auto'
-  return deepseekExplicitEntry(override, prices, mode) ?? primary
+  return selectPriceCurrency(deepseekExplicitEntry(override, prices, mode) ?? primary, prices)
+}
+
+function selectPriceCurrency(result, prices) {
+  if (!result.priced) return { ...result, currency: 'USD' }
+  if (prices?.currency === 'CNY' && result.entry?.cny) {
+    return { ...result, entry: { ...result.entry.cny }, currency: 'CNY' }
+  }
+  return { ...result, currency: result.billingMode === 'deepseek-peak' && prices?.currency === 'CNY' ? 'CNY' : 'USD' }
 }
 
 /**

package/lib/store.js

@@ -139,6 +139,7 @@ export function defaultConfig() {
     showSessionId: false, // 会话列表中附显会话 ID(默认只显示标题,需要时开启)
     hideOfficialBalance: false, // 隐藏官方账户余额(issue #45):开启后侧边栏/会话页/设置页的官方余额 UI 整体不渲染
     hideTodayCost: false, // 隐藏今日消耗金额(issue #46):开启后侧栏今日费用行/预算明细今日行/概览今日卡片不渲染
+    sidebarTodayMetric: 'cost',
     showTotalWithPlan: false, // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计;默认按真金白银(apiCost)
     includeSubagentCost: false, // 本会话展示可合并连续子代理后代;不重复写入每日账本。
     codexQuotaEnabled: false, // Codex 额度按需开启,避免未使用 Codex 时显示卡片或查询。
@@ -148,7 +149,7 @@ export function defaultConfig() {
     sidebarStyle: 'standard', // 侧边栏进度条样式:standard(标准,纵向单列) | compact(紧凑,额度卡两列网格)
     legacyAutoImportedAt: 0, // 安装前历史自动导入标记(issue #27):完成时刻 ms;0 = 尚未跑过
     peakStyle: 'compact', // 峰谷时段条样式:compact(简洁单行/竖向同构) | classic(经典分段/胶囊芯片)
-    priceMatch: 'auto', // 未知模型名自动匹配价格表:auto(去后缀/前缀/家族相似) | exact(仅精确)
+    priceMatch: 'auto', // 未知模型名自动匹配价格表:auto(归一化/安全后缀) | exact(仅精确)
     priceMatchDismissed: [], // 从匹配设置中移除的 provider:model 行；不删除用量或改变计价规则。
     priceOverrides: {}, // 手动匹配覆盖:{ 'provider:modelId': 'provider:模型 | deepseek:__default__' };裸模型名 = 同渠道换名(旧版遗留,跨渠道裸 DeepSeek 名由查价兜底自愈,issue #56)
     priceTableDisplay: {}, // 费用设置直接显示(按模型):键 'provider:modelId' → 布尔;缺省 = DeepSeek 模型直接显示、第三方收入拓展价格表(含 DeepSeek 模型也可逐模型收入)
@@ -420,7 +421,7 @@ export function repairLedgerPricing(ledger, accepts = () => true) {
       // 只允许完整请求日志回放重算,否则多次短请求合计会误套长上下文价格。
       if (resolved.billingMode === 'deepseek-peak' || resolved.entry.longContext) continue
       const priced = costOf(tokens, resolved.entry, atMsSafe, { enabled: false })
-      const newCost = usdFromCost(priced, 'USD', ledger.config.exchangeRate)
+      const newCost = usdFromCost(priced, resolved.currency, ledger.config.exchangeRate)
       const oldCost = Number(bucket.cost) || 0
       if (!Number.isFinite(newCost) || Math.abs(newCost - oldCost) < 1e-9) continue
       const absDiff = Math.abs(newCost - oldCost)
@@ -461,7 +462,7 @@ export function repairLedgerPricing(ledger, accepts = () => true) {
           if (!resolved.priced || resolved.entry === null) continue
           if (resolved.billingMode === 'deepseek-peak' || resolved.entry.longContext) continue
           const priced = costOf(tokens, resolved.entry, sessAtMs, { enabled: false })
-          const newCost = usdFromCost(priced, 'USD', ledger.config.exchangeRate)
+          const newCost = usdFromCost(priced, resolved.currency, ledger.config.exchangeRate)
           const oldCost = Number(bucket.cost) || 0
           if (!Number.isFinite(newCost) || Math.abs(newCost - oldCost) < 1e-9) continue
           const absDiff = Math.abs(newCost - oldCost)
@@ -1138,6 +1139,7 @@ export function applyConfigPatch(current, rawPatch) {
   // UI 隐藏开关(issues #45/#46):布尔,可缺省(默认关);开启后对应区块整体不渲染。
   if (candidate.hideOfficialBalance !== undefined && typeof candidate.hideOfficialBalance !== 'boolean') errors.push(vmsg(locale, 'hideOfficialBalance'))
   if (candidate.hideTodayCost !== undefined && typeof candidate.hideTodayCost !== 'boolean') errors.push(vmsg(locale, 'hideTodayCost'))
+  if (candidate.sidebarTodayMetric !== undefined && !['cost', 'tokens'].includes(candidate.sidebarTodayMetric)) errors.push('sidebarTodayMetric must be cost or tokens')
   // 「含 Plan 总额」全局开关(v1.6.0):布尔,可缺省(默认关)。
   if (candidate.showTotalWithPlan !== undefined && typeof candidate.showTotalWithPlan !== 'boolean') errors.push(vmsg(locale, 'showTotalWithPlan'))
   for (const field of ['includeSubagentCost', 'codexQuotaEnabled']) {
@@ -1474,6 +1476,7 @@ export function sanitizeConfig(raw) {
   out.showSessionId = out.showSessionId === true
   out.hideOfficialBalance = out.hideOfficialBalance === true
   out.hideTodayCost = out.hideTodayCost === true
+  out.sidebarTodayMetric = oneOf(out.sidebarTodayMetric, ['cost', 'tokens'], 'cost')
   out.showTotalWithPlan = out.showTotalWithPlan === true
   out.includeSubagentCost = out.includeSubagentCost === true
   out.codexQuotaEnabled = out.codexQuotaEnabled === true
@@ -2053,9 +2056,7 @@ export class Ledger {
     // 兜底与跨厂商兑底命中)计出的成本为人民币,按展示汇率折算为美元入账;
     // 第三方 flat 恒为美元价,直接入账。
     const priced = resolved.priced ? costOf(tokens, entry, atMs, peak) : 0
-    const cost = usdFromCost(priced,
-      resolved.billingMode === 'deepseek-peak' && this.config.prices?.currency === 'CNY' ? 'CNY' : 'USD',
-      this.config.exchangeRate)
+    const cost = usdFromCost(priced, resolved.currency, this.config.exchangeRate)
     // Plan/API 双轨分类(issue #64):plan 类调用金额只记等值(cost),apiCost 记真金白银部分;
     // Plan 类调用同时进入 provider×小时聚合桶(供 5 小时滚动窗本地量聚合)。
     const planBilling = this.config.planBilling

package/lib/typert.host.js

@@ -88,6 +88,7 @@ const providerPriceSchema = z.object({
   cachedInput: num.optional(),
   cacheRead: num.optional(),
   cacheWrite: z.number().nonnegative().optional(),
+  cny: priceTierSchema.optional(),
   longContext: longContextSchema.optional(),
   cacheCreation5m: num.optional(),
   cacheCreation1h: num.optional(),
@@ -154,6 +155,7 @@ const configSchema = z.object({
   // UI 隐藏开关(issues #45/#46):开启后官方余额/今日消耗金额的对应 UI 区块整体不渲染。
   hideOfficialBalance: z.boolean().optional(),
   hideTodayCost: z.boolean().optional(),
+  sidebarTodayMetric: z.enum(['cost', 'tokens']).optional(),
   // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计。
   showTotalWithPlan: z.boolean().optional(),
   includeSubagentCost: z.boolean().optional(),

package/locale/en.json

@@ -0,0 +1,3 @@
+{
+  "meta": {}
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "费用计量 (dsh-cost-meter)",
+    "description": "费用计量：按会话统计 token 与成本，含各厂商余额与峰谷计价提醒"
+  }
+}

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.39",
+  "version": "1.7.41",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(11 家,含小米 MiMo Token Plan 控制台 Cookie 查询、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 11 vendors (incl. Xiaomi MiMo Token Plan via console cookie, 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",
-  "bin": { "dsh-cost-meter-repair-sessions": "./lib/repair-sessions-cli.js" },
+  "bin": {
+    "dsh-cost-meter-repair-sessions": "./lib/repair-sessions-cli.js"
+  },
   "exports": {
     ".": {
       "default": "./lib/index.js"
@@ -15,11 +17,16 @@
     "./typert": {
       "default": "./lib/typert.host.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./locale/*.json": "./locale/*.json"
   },
   "dsh": {
-    "bundle": {"patch": "./cordis.patch.yml"},
-    "client": {"platform": "web"},
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web"
+    },
     "compatibility": {
       "dsh": ">=0.1.0-rc.5",
       "dshReleases": {
@@ -82,6 +89,7 @@
     }
   },
   "files": [
+    "locale",
     "lib",
     "cordis.patch.yml",
     "docs/provider-pricing.json",
@@ -119,7 +127,11 @@
   "engines": {
     "node": ">=20"
   },
-  "os": ["darwin", "linux", "win32"],
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
   "scripts": {
     "build": "node scripts/build.mjs",
     "test": "node test/verify.mjs"