dsh-cost-meter 1.6.9 → 1.6.11

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

package/lib/backfill.js

@@ -13,9 +13,10 @@
 import { readdirSync, readFileSync, statSync } from 'node:fs'
 import { join } from 'node:path'
 import * as zlib from 'node:zlib'
-import { costOf, providerPriceEntryFor, usdFromCost, isWrapperProviderId } from './pricing.js'
+import { costOf, providerPriceEntryFor, usdFromCost, isWrapperProviderId, wrapperUpstreamProvider } from './pricing.js'
 import { localDayKey, zeroDay, splitLedgerApiCost } from './store.js'
 import { billingClassOf, enabledPlanSetOf } from './plan-billing.js'
+import { USAGE_DEDUP_WINDOW_MS, usageFingerprint } from './usage-dedup.js'
 
 const ZSTD_MAGIC = 4247762216
 /** 打包行(文本/推理/工具调用增量游程)不含 header 与 usage,回放时跳过。 */
@@ -218,6 +219,42 @@ export function replaySessionRecords(records, config, wantDates = null) {
       apiCost: (current.apiCost ?? 0) + sign * (sample.apiCost ?? sample.cost),
     }
   }
+  // 两遍扫预扫描(issue #76):按与主循环一致的 header 状态机,收集全部非包装
+  // provider 的 (model, 五桶) 指纹及其事件时刻。主循环遇到包装层 provider 的
+  // usage 时,仅当窗口内不存在相同指纹的非包装样本才改挂上游计入——上游真实
+  // 流无论出现在包装层事件之前还是之后,转发对都只计一次(与实时投影/账本
+  // 入账钩子的指纹窗口去重同语义,保证回放与实时逐位一致)。
+  const plainFingerprints = new Map()
+  let preProvider = 'deepseek'
+  let preModel = 'default'
+  for (const event of records) {
+    if (event === null || typeof event !== 'object') continue
+    if (event.type === 'session/title') continue
+    if (PACKED_ROW_TYPES.has(event.type)) continue
+    if (event.type === 'request/header') {
+      const m = event.data?.header?.config?.model
+      const p = event.data?.header?.config?.provider
+      preModel = typeof m === 'string' && m.length > 0 ? m : 'default'
+      preProvider = typeof p === 'string' && p.length > 0 ? p : 'deepseek'
+      continue
+    }
+    let u = null
+    if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'usage' && event.data.chunk.usage != null) u = event.data.chunk.usage
+    else if (event.type === 'assistant/message' && event.data?.usage != null) u = event.data.usage
+    else continue
+    if (isWrapperProviderId(preProvider)) continue
+    const at = Number(event.time)
+    if (!Number.isFinite(at) || at <= 0) continue
+    const fp = usageFingerprint(preModel, {
+      input: num(u.inputTokens), output: num(u.outputTokens), cacheRead: num(u.cacheReadTokens),
+      cacheWrite: num(u.cacheWriteTokens), reasoning: num(u.reasoningTokens),
+    })
+    const times = plainFingerprints.get(fp)
+    if (times === undefined) plainFingerprints.set(fp, [at])
+    else times.push(at)
+  }
+  // 本回放已计入的改挂样本(fp + 时刻):包装层重复分发(窗口内同指纹两次)只计一次。
+  let remappedAdmitted = []
   for (const event of records) {
     if (event === null || typeof event !== 'object') continue
     if (event.type === 'session' && typeof event.id === 'string') {
@@ -266,11 +303,6 @@ export function replaySessionRecords(records, config, wantDates = null) {
     if (!Number.isFinite(atMs) || atMs <= 0) continue
     const date = localDayKey(atMs)
     if (wantDates !== null && !wantDates.has(date)) continue
-    // modlens 视觉包装层(modlens-<upstream> / deepseek-modlens)把同一份 usage
-    // 经上游 llm.stream 再转发一次:日志里同一调用出现两套 header+usage 事件,
-    // 且因 provider 不同绕过 (turn, step) 键去重,回放会翻倍(issue #70)。与
-    // 实时钩子/投影一致,包装层 provider 状态下的 usage 事件跳过,只记上游真实流。
-    if (isWrapperProviderId(provider)) continue
     const buckets = {
       input: num(usage.inputTokens),
       output: num(usage.outputTokens),
@@ -278,17 +310,33 @@ export function replaySessionRecords(records, config, wantDates = null) {
       cacheWrite: num(usage.cacheWriteTokens),
       reasoning: num(usage.reasoningTokens),
     }
+    // modlens 视觉包装层转发对去重(issue #70/#76):包装层样本先改挂上游 id
+    // (与账本入账钩子/实时投影同口径),仅当窗口内既无相同 (model, 五桶) 的
+    // 非包装样本(预扫描集)、也无本回放已计入的改挂样本时才计入——上游真实流
+    // 先到或后到都只计一次。v1.6.10 及之前对包装层一律跳过,整条链路均为包装型
+    // id 的转售路由(如 modlens-go-ds4f)因此整单漏计(账本 sessions=0)。
+    let effectiveProvider = provider
+    if (isWrapperProviderId(provider)) {
+      effectiveProvider = wrapperUpstreamProvider(provider) ?? provider
+      const fp = usageFingerprint(model, buckets)
+      remappedAdmitted = remappedAdmitted.filter(entry => atMs - entry.at <= USAGE_DEDUP_WINDOW_MS)
+      const plainTimes = plainFingerprints.get(fp)
+      const plainHit = plainTimes !== undefined && plainTimes.some(t => Math.abs(atMs - t) <= USAGE_DEDUP_WINDOW_MS)
+      if (plainHit || remappedAdmitted.some(entry => entry.fp === fp)) continue
+      remappedAdmitted.push({ fp, at: atMs })
+    }
     const key = `${turn}:${step}`
     // 去重与旧版完全一致:单一 (turn,step) 状态机跨种子/own 段连续生效。
     const prev = last !== null && last.key === key ? last : null
-    if (prev !== null && prev.providerKey === `${provider}:${model}`
+    if (prev !== null && prev.providerKey === `${effectiveProvider}:${model}`
       && prev.buckets.input === buckets.input && prev.buckets.output === buckets.output
       && prev.buckets.cacheRead === buckets.cacheRead && prev.buckets.cacheWrite === buckets.cacheWrite
       && prev.buckets.reasoning === buckets.reasoning) {
       continue
     }
     // 按事件时刻计费(历史正确):峰谷时代前用 legacyBase,之后按峰谷两档。
-    const resolved = providerPriceEntryFor(provider, model, config?.prices, {
+    // 计价/归类/归因一律用改挂后的 effectiveProvider(包装层转发对挂语义上游)。
+    const resolved = providerPriceEntryFor(effectiveProvider, model, config?.prices, {
       mode: config?.priceMatch === 'exact' ? 'exact' : 'auto',
       overrides: config?.priceOverrides,
     })
@@ -305,8 +353,8 @@ export function replaySessionRecords(records, config, wantDates = null) {
       config?.exchangeRate)
     // Plan/API 双轨分类(issue #64):与 store.account() 同一分类器,回放条目
     // 的 apiCost 只含真金白银部分(plan 类金额仅记等值);传 prices 供路由判定。
-    const apiCost = billingClassOf(provider, model, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'api' ? cost : 0
-    const providerKey = `${provider}:${model}`
+    const apiCost = billingClassOf(effectiveProvider, model, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'api' ? cost : 0
+    const providerKey = `${effectiveProvider}:${model}`
     // 聚合目标按事件分段路由;被替换的旧样本从它当时所在的段扣回(与旧版
     // 单流先减后加的净效果一致,仅种子段的量落到 seedDays 而非 days)。
     if (prev !== null) shift(prev, -1, prev.seed ? seedDays : days)