dsh-cost-meter 1.7.33 → 1.7.34

package/README.md

@@ -8,9 +8,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 / Volcano Ark / Qwen / Xiaomi MiMo) 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.33-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.34-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.33** adds Xiaomi MiMo Token Plan quota support and a JSON request-body editor for custom provider POST balance queries, with format validation, per-entry persistence and support for clearing the body. See the [release notes](docs/release-notes/v1.7.33.md).
+**v1.7.34** fixes concurrent ledger writes from web/headless processes, preserving session details, daily totals and plan usage. Update the plugin in every profile that uses it and restart all DSH processes. See the [release notes](docs/release-notes/v1.7.34.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)
@@ -316,22 +316,22 @@ On Node.js 20, use `npm install -g pnpm@10` instead. See [pnpm installation and
 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.33`** — 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.34`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.33/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.34/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.33
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.34
 ```
 
 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.33.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.34.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):

package/README.zh-CN.md

@@ -8,9 +8,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 / 火山方舟 / 千问 / 小米 MiMo 十一家,含 Volcano Ark AK/SK 签名与 MiMo 控制台 Cookie 查询) · Plan/API 双轨计费(订阅额度与按量金额分离统计,每 1% 额度与满窗的 token/等值金额估算及日/周/月曲线) · 输入框上方额度横条(预算/Go/Coding Plan 用量一条横排显示,可开关)
 
-[![version](https://img.shields.io/badge/version-1.7.33-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.34-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.33**：新增小米 MiMo Token Plan 额度查询；自定义 Provider 余额新增 POST JSON 请求体编辑，支持格式校验、每条配置独立保存和清空请求体。详见[更新说明](docs/release-notes/v1.7.33.md)。
+**v1.7.34**：修复 web/headless 等多进程写账本互相覆盖，保留会话明细、每日合计和套餐用量。请更新所有使用此插件的 profile，并重启全部 DSH 进程。详见[更新说明](docs/release-notes/v1.7.34.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)
@@ -316,22 +316,22 @@ Node.js 20 请改用 `npm install -g pnpm@10`。版本要求见 [pnpm 官方安
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.33`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.34`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.33/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.34/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.33
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.34
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.33.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.34.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/index.js

@@ -2231,11 +2231,7 @@ function createService(ctx, ledger, openRouterPrices) {
       // 清空全部历史:除 days 外,Plan 百分比采样/小时桶与余额对账基准一并
       // 重置,否则残留样本仍会推算出 planStats、对账基准继续引用旧日合计,
       // 与「清空全部历史」语义不一致。
-      ledger.days = {}
-      ledger.planSamples = {}
-      ledger.planHourBuckets = {}
-      ledger.balanceRef = null
-      ledger.scheduleWrite()
+      ledger.resetHistory()
       return build(false)
     },
 

package/lib/ledger-persistence.js

@@ -0,0 +1,223 @@
+/** Cross-process ledger transactions. Runtime secrets never enter these snapshots. */
+import { mkdirSync, readdirSync, writeFileSync, readFileSync, renameSync, unlinkSync, rmdirSync, statSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { randomUUID } from 'node:crypto'
+import { isDeepStrictEqual as equal } from 'node:util'
+import { appendHourBucket, pruneHourBuckets, PLAN_SAMPLE_CAP, PLAN_SAMPLE_MAX_AGE_MS } from './plan-billing.js'
+
+const fields = ['input', 'output', 'cacheRead', 'cacheWrite', 'reasoning', 'calls', 'cost', 'apiCost']
+const safe = key => !['__proto__', 'constructor', 'prototype'].includes(key)
+const object = value => value !== null && typeof value === 'object' && !Array.isArray(value)
+const clone = value => value === undefined ? undefined : structuredClone(value)
+const pause = new Int32Array(new SharedArrayBuffer(4))
+
+/** mkdir is exclusive on Windows and POSIX. A live owner is never evicted by age. */
+export function withLedgerLock(path, action, timeoutMs = 5000) {
+  mkdirSync(dirname(path), { recursive: true })
+  const lock = `${path}.lock`
+  const owner = `${process.pid}-${randomUUID()}`
+  const deadline = Date.now() + timeoutMs
+  for (;;) {
+    try {
+      mkdirSync(lock)
+      try { writeFileSync(join(lock, owner), '') } catch (error) { rmdirSync(lock); throw error }
+      break
+    } catch (error) {
+      // Windows can briefly report EPERM while another process finishes removing
+      // a directory whose last read handle has only just closed.
+      if (!['EEXIST', 'EPERM'].includes(error.code)) throw error
+      try {
+        const names = readdirSync(lock)
+        const previous = names.length === 1 && names[0].match(/^(\d+)-[a-f0-9-]+$/)
+        if (previous) {
+          let dead = false
+          try { process.kill(Number(previous[1]), 0) } catch (probe) { dead = probe.code === 'ESRCH' }
+          // Only the contender that removes this unique owner file may remove the
+          // directory. Other contenders cannot accidentally unlink a new lock.
+          if (dead) { unlinkSync(join(lock, names[0])); rmdirSync(lock); continue }
+        } else if (names.length === 0 && Date.now() - statSync(lock).mtimeMs > 30_000) {
+          rmdirSync(lock) // Also recovers a process killed between mkdir and owner creation.
+          continue
+        }
+      } catch (probe) {
+        if (!['ENOENT', 'ENOTEMPTY', 'EEXIST', 'EPERM'].includes(probe.code)) throw probe
+      }
+      if (Date.now() >= deadline) throw new Error('Ledger is busy; preserving pending changes for retry')
+      Atomics.wait(pause, 0, 0, 10)
+    }
+  }
+  try { return action() } finally {
+    unlinkSync(join(lock, owner))
+    rmdirSync(lock)
+  }
+}
+
+export function readLedger(path) {
+  let text
+  try { text = readFileSync(path, 'utf8') } catch (error) {
+    if (error.code === 'ENOENT') return null
+    throw error
+  }
+  const value = JSON.parse(text)
+  if (!object(value) || value.version !== 1) throw new Error('Unsupported ledger format')
+  return value
+}
+
+export function writeLedger(path, state) {
+  const temp = `${path}.${process.pid}-${randomUUID()}.tmp`
+  try {
+    writeFileSync(temp, JSON.stringify(state), { encoding: 'utf8', flag: 'wx' })
+    renameSync(temp, path)
+  } finally {
+    try { unlinkSync(temp) } catch (error) { if (error.code !== 'ENOENT') throw error }
+  }
+}
+
+const empty = () => Object.fromEntries(fields.map(key => [key, 0]))
+function add(target, values) {
+  for (const key of fields) target[key] = (Number(target[key]) || 0) + values[key]
+}
+
+/** Replay a priced call, not a snapshot: two equal calls are still two calls. */
+export function applyAccount(state, entry) {
+  const { date, sessionId, atMs, providerKey, values, planId } = entry
+  if (!object(state.days[date])) state.days[date] = { date, ...empty(), byProviderModel: {}, sessions: [] }
+  const day = state.days[date]
+  if (!Array.isArray(day.sessions)) day.sessions = []
+  const containers = [day]
+  if (typeof sessionId === 'string' && sessionId.length > 0) {
+    let session = day.sessions.find(s => s.id === sessionId)
+    if (!session) {
+      session = { id: sessionId, at: atMs, ...empty(), byProviderModel: {} }
+      day.sessions.push(session)
+      if (day.sessions.length > 200) day.sessions = day.sessions.slice(-200)
+    }
+    containers.push(session)
+  }
+  for (const container of containers) {
+    add(container, values)
+    container.byProviderModel ??= {}
+    const bucket = container.byProviderModel[providerKey] ??= empty()
+    add(bucket, values)
+  }
+  if (planId !== null) state.planHourBuckets = appendHourBucket(state.planHourBuckets, planId, atMs,
+    values.input + values.output + values.cacheRead + values.cacheWrite + values.reasoning, values.cost)
+}
+
+/** Three-way merge for settings and maintenance; unchanged local fields retain disk values. */
+function merge(base, local, disk, numeric = false) {
+  if (equal(local, base)) return clone(disk)
+  if (equal(disk, base) || equal(local, disk)) return clone(local)
+  if (object(local) && object(disk)) {
+    const out = {}
+    for (const key of new Set([...Object.keys(base ?? {}), ...Object.keys(local), ...Object.keys(disk)])) {
+      if (!safe(key)) continue
+      const value = merge(base?.[key], local[key], disk[key], numeric && (object(local[key]) || fields.includes(key) || key === 'tokens'))
+      if (value !== undefined) out[key] = value
+    }
+    return out
+  }
+  if (numeric && typeof local === 'number' && typeof disk === 'number') {
+    return Math.max(0, disk + local - (Number(base) || 0))
+  }
+  return clone(local)
+}
+
+const sessionMap = day => Object.fromEntries((day?.sessions ?? []).filter(s => safe(s.id)).map(s => [s.id, s]))
+function mergeDays(base, local, disk) {
+  const out = {}
+  for (const date of new Set([...Object.keys(local), ...Object.keys(disk)])) {
+    if (!safe(date)) continue
+    const b = base[date], l = local[date], d = disk[date]
+    if (equal(b, l)) { if (d !== undefined) out[date] = clone(d); continue }
+    if (!l || !d) { if (l) out[date] = clone(l); continue }
+    if (equal(l, d)) { out[date] = clone(d); continue }
+    const merged = merge(b, l, d, true)
+    const bs = sessionMap(b), ls = sessionMap(l), ds = sessionMap(d)
+    const sessions = merge(bs, ls, ds, true)
+    // Rebase aggregate deltas instead of rebuilding totals from the retained
+    // sessions. Identical numbers can describe different imported sessions.
+    const totals = (base, local, disk) => Object.fromEntries(fields.map(key => [key,
+      (disk?.[key] ?? 0) + (local?.[key] ?? 0) - (base?.[key] ?? 0)]))
+    Object.assign(merged, totals(b, l, d))
+    merged.byProviderModel = {}
+    for (const key of new Set([...Object.keys(b?.byProviderModel ?? {}), ...Object.keys(l.byProviderModel ?? {}), ...Object.keys(d.byProviderModel ?? {})])) {
+      if (safe(key)) merged.byProviderModel[key] = totals(b?.byProviderModel?.[key], l.byProviderModel?.[key], d.byProviderModel?.[key])
+    }
+    // Subtract only changes already represented in the merged session. This
+    // deduplicates overlapping imports/repairs while retaining anonymous usage
+    // and totals belonging to details pruned by the 200-session limit.
+    for (const id of Object.keys(ls)) {
+      if (!ds[id] || equal(bs[id], ls[id]) || equal(bs[id], ds[id])) continue
+      for (const key of fields) merged[key] -= (ls[id][key] ?? 0) - (bs[id]?.[key] ?? 0) - ((sessions[id]?.[key] ?? 0) - (ds[id][key] ?? 0))
+      for (const [key, bucket] of Object.entries(ls[id].byProviderModel ?? {})) {
+        if (!safe(key) || !merged.byProviderModel[key]) continue
+        for (const field of fields) merged.byProviderModel[key][field] -= (bucket[field] ?? 0) - (bs[id]?.byProviderModel?.[key]?.[field] ?? 0)
+          - ((sessions[id]?.byProviderModel?.[key]?.[field] ?? 0) - (ds[id].byProviderModel?.[key]?.[field] ?? 0))
+      }
+    }
+    for (const container of [merged, ...Object.values(merged.byProviderModel)]) {
+      for (const key of fields) container[key] = Math.max(0, container[key])
+    }
+    merged.sessions = Object.values(sessions).sort((a, b) => (a.at ?? 0) - (b.at ?? 0)).slice(-200)
+    out[date] = merged
+  }
+  return out
+}
+
+function mergeSamples(base, local, disk, now) {
+  const out = {}
+  for (const provider of new Set([...Object.keys(local), ...Object.keys(disk)])) {
+    if (!safe(provider)) continue
+    out[provider] = {}
+    for (const window of new Set([...Object.keys(local[provider] ?? {}), ...Object.keys(disk[provider] ?? {})])) {
+      if (!safe(window)) continue
+      const byTime = list => Object.fromEntries((Array.isArray(list) ? list : []).filter(s => s && Number.isFinite(s.t)).map(s => [s.t, s]))
+      const samples = merge(byTime(base[provider]?.[window]), byTime(local[provider]?.[window]), byTime(disk[provider]?.[window]))
+      out[provider][window] = Object.values(samples).filter(s => s.t >= now - PLAN_SAMPLE_MAX_AGE_MS)
+        .sort((a, b) => a.t - b.t).slice(-PLAN_SAMPLE_CAP)
+    }
+  }
+  return out
+}
+
+// Replay pending calls into both the baseline and current disk snapshot. The
+// remaining local-versus-baseline diff contains only edits/imports/repairs, so
+// repeated flushes cannot add an already committed call or hourly bucket twice.
+export function mergeLedger(base, local, disk, pending, now = Date.now()) {
+  const b = clone(base), l = clone(local), d = clone(disk ?? base)
+  const localReset = !equal(l.historyReset, b.historyReset)
+  const remoteReset = !equal(d.historyReset, b.historyReset)
+  const reset = localReset ? l.historyReset : d.historyReset
+  if (localReset || remoteReset) {
+    for (const state of [b, ...(localReset ? [d] : [l])]) {
+      state.days = {}; state.planSamples = {}; state.planHourBuckets = {}; state.balanceRef = null
+    }
+  }
+  for (const entry of pending) {
+    if (remoteReset && !localReset && entry.recordedAt <= (reset?.at ?? 0)) continue
+    applyAccount(b, entry)
+    applyAccount(d, entry)
+    if (remoteReset && !localReset) applyAccount(l, entry)
+  }
+  const out = {
+    version: 1,
+    config: merge(b.config, l.config, d.config),
+    days: mergeDays(b.days, l.days, d.days),
+    balanceRef: equal(b.balanceRef, l.balanceRef) ? d.balanceRef
+      : (d.balanceRef?.at ?? 0) > (l.balanceRef?.at ?? 0) ? d.balanceRef : l.balanceRef,
+    migrations: [...new Set([...(d.migrations ?? []), ...(l.migrations ?? [])])],
+    planSamples: mergeSamples(b.planSamples, l.planSamples, d.planSamples, now),
+    planHourBuckets: pruneHourBuckets(merge(b.planHourBuckets, l.planHourBuckets, d.planHourBuckets, true), now),
+    openrouterPriceHashes: merge(b.openrouterPriceHashes, l.openrouterPriceHashes, d.openrouterPriceHashes),
+    historyReset: reset ?? null,
+  }
+  const dates = Object.keys(out.days).sort()
+  const keep = Math.max(7, Math.min(3650, Number(out.config.historyDays) || 180))
+  while (dates.length > keep) delete out.days[dates.shift()]
+  return out
+}
+
+export function mergeRuntimeConfig(base, local, persisted) {
+  return merge(base, local, persisted)
+}

package/lib/store.js

@@ -5,8 +5,10 @@
  * 原子重命名,并做防抖;账本按 config.historyDays 保留最近 N 天。
  */
 
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
+import { readFileSync, renameSync } from 'node:fs'
+import { randomUUID } from 'node:crypto'
+import { withLedgerLock, readLedger, writeLedger, applyAccount, mergeLedger, mergeRuntimeConfig } from './ledger-persistence.js'
+import { join } from 'node:path'
 import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
 import {
   DEFAULT_PEAK_EFFECTIVE_AT,
@@ -24,10 +26,9 @@ import {
   isLocalOriginProviderOrModel,
 } from './pricing.js'
 import { CODING_PLAN_PROVIDER_IDS, normalizeMiniMaxBaseUrl } from './coding-plans.js'
-import { DEFAULT_PLAN_PROVIDER_CLASS, PLAN_PROVIDER_IDS, billingClassOf, enabledPlanSetOf, planProviderIdOf, appendHourBucket, pruneHourBuckets, convertRecentCallsToBuckets, isRoutedThirdPartyCall } from './plan-billing.js'
+import { DEFAULT_PLAN_PROVIDER_CLASS, PLAN_PROVIDER_IDS, billingClassOf, enabledPlanSetOf, planProviderIdOf, convertRecentCallsToBuckets, isRoutedThirdPartyCall } from './plan-billing.js'
 
 const LEDGER_VERSION = 1
-const MAX_SESSIONS_PER_DAY = 200
 const DEFAULT_HISTORY_DAYS = 180
 const GATEWAY_PROVIDER_IDS = ['antigravity', 'claude', 'codex', 'kimi', 'xai', 'workbuddy']
 const GATEWAY_DISPLAY_VALUES = ['sidebar', 'settings', 'both', 'off']
@@ -634,10 +635,6 @@ export function dedupeWrapperProviderDays(days) {
   return result
 }
 
-function zeroSession(id) {
-  return { id, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, calls: 0, cost: 0, apiCost: 0, byProviderModel: {} }
-}
-
 /** 账本数值清洗:非有限/负数(含历史版本写入的 null)一律归 0,防止污染聚合并击穿 Typert strict codec。 */
 function sanitizeNum(value) {
   const n = Number(value)
@@ -1934,7 +1931,9 @@ export class Ledger {
     this.closed = false
     this.pendingWrite = false
     // 余额差对账参考点({ date, total, granted, topped, at }),由 open() 载入、flush() 落盘。
-    this.balanceRef = null
+    this.balanceRef = extras.balanceRef ?? null
+    this.historyReset = extras.historyReset ?? null
+    this.pendingAccounts = []
     this.migrations = Array.isArray(migrations) ? migrations.filter(m => typeof m === 'string') : []
     // 存量密钥迁移状态(v1.6.8,**不落盘**):{ ran, pending }。由 runSecretMigration 写入、
     // buildState 读取,用于在 UI 提示未能自动导入凭据库的密钥。
@@ -1945,12 +1944,17 @@ export class Ledger {
     // 自动目录上次写入的价格指纹：重启后仍能识别用户手改价格，不下发到客户端。
     this.openrouterPriceHashes = Object.fromEntries(Object.entries(extras.openrouterPriceHashes ?? {})
       .filter(([key, value]) => !['__proto__', 'constructor', 'prototype'].includes(key) && typeof value === 'string' && /^[a-f0-9]{64}$/.test(value)))
+    this.writeBase = this.snapshot()
   }
 
   /** 在 $DSH_HOME 下创建/加载账本。 */
   static open() {
     const root = join(resolveDshHome(), 'storages', 'cost-meter')
     const path = join(root, 'ledger.json')
+    return withLedgerLock(path, () => Ledger.load(path))
+  }
+
+  static load(path) {
     let config = defaultConfig()
     let days = {}
     let balanceRef = null
@@ -1958,6 +1962,7 @@ export class Ledger {
     let planSamples = {}
     let planHourBuckets = {}
     let openrouterPriceHashes = {}
+    let historyReset = null
     try {
       const parsed = JSON.parse(readFileSync(path, 'utf8'))
       if (parsed !== null && typeof parsed === 'object') {
@@ -1966,6 +1971,7 @@ export class Ledger {
           try { renameSync(path, `${path}.corrupt-${Date.now()}`) } catch {}
           console.warn(`[dsh-cost-meter] 账本版本 ${String(parsed.version)} 不受支持,按空账本启动`)
         } else {
+          historyReset = parsed.historyReset ?? null
           const cfg = typeof parsed.config === 'object' && parsed.config !== null ? parsed.config : {}
           // 一次性迁移:先于清洗对原始配置执行,已应用过的(账本 migrations 标记)跳过。
           migrations = Array.isArray(parsed.migrations) ? parsed.migrations.filter(m => typeof m === 'string') : []
@@ -2009,8 +2015,7 @@ export class Ledger {
         console.warn(`[dsh-cost-meter] 账本读取失败,按空账本启动: ${String(error?.message ?? error)}`)
       }
     }
-    const ledger = new Ledger(config, days, path, migrations, { planSamples, planHourBuckets, openrouterPriceHashes })
-    ledger.balanceRef = balanceRef
+    const ledger = new Ledger(config, days, path, migrations, { planSamples, planHourBuckets, openrouterPriceHashes, balanceRef, historyReset })
     return ledger
   }
 
@@ -2058,74 +2063,15 @@ export class Ledger {
       cacheWrite: num(tokens?.cacheWrite),
       reasoning: num(tokens?.reasoning),
     }
-    const date = localDayKey(atMs)
-    let day = this.days[date]
-    if (day === undefined || day === null || typeof day !== 'object') {
-      day = zeroDay(date)
-      this.days[date] = day
-    }
-    day.input += buckets.input
-    day.output += buckets.output
-    day.cacheRead += buckets.cacheRead
-    day.cacheWrite += buckets.cacheWrite
-    day.reasoning += buckets.reasoning
-    day.calls += 1
-    day.cost += cost
-    day.apiCost = (day.apiCost ?? 0) + apiCost
-    const providerKey = `${typeof provider === 'string' && provider.length > 0 ? provider : 'deepseek'}:${String(modelId ?? 'default')}`
-    day.byProviderModel = day.byProviderModel ?? {}
-    const dayProvider = day.byProviderModel[providerKey] ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, calls: 0, cost: 0, apiCost: 0 }
-    day.byProviderModel[providerKey] = {
-      input: dayProvider.input + buckets.input,
-      output: dayProvider.output + buckets.output,
-      cacheRead: dayProvider.cacheRead + buckets.cacheRead,
-      cacheWrite: dayProvider.cacheWrite + buckets.cacheWrite,
-      reasoning: dayProvider.reasoning + buckets.reasoning,
-      calls: dayProvider.calls + 1,
-      cost: dayProvider.cost + cost,
-      apiCost: (dayProvider.apiCost ?? 0) + apiCost,
-    }
-    if (typeof sessionId === 'string' && sessionId.length > 0) {
-      let sessions = Array.isArray(day.sessions) ? day.sessions : []
-      let session = sessions.find(s => s.id === sessionId)
-      if (session === undefined) {
-        session = zeroSession(sessionId)
-        session.at = atMs // 会话首次入账时刻(按会话排行「按时间排序」用)。
-        sessions.push(session)
-        if (sessions.length > MAX_SESSIONS_PER_DAY) sessions = sessions.slice(-MAX_SESSIONS_PER_DAY)
-        day.sessions = sessions
-      }
-      session.input += buckets.input
-      session.output += buckets.output
-      session.cacheRead += buckets.cacheRead
-      session.cacheWrite += buckets.cacheWrite
-      session.reasoning += buckets.reasoning
-      session.calls += 1
-      session.cost += cost
-      session.apiCost = (session.apiCost ?? 0) + apiCost
-      session.byProviderModel = session.byProviderModel ?? {}
-      const sessionProvider = session.byProviderModel[providerKey] ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, calls: 0, cost: 0, apiCost: 0 }
-      session.byProviderModel[providerKey] = {
-        input: sessionProvider.input + buckets.input,
-        output: sessionProvider.output + buckets.output,
-        cacheRead: sessionProvider.cacheRead + buckets.cacheRead,
-        cacheWrite: sessionProvider.cacheWrite + buckets.cacheWrite,
-        reasoning: sessionProvider.reasoning + buckets.reasoning,
-        calls: sessionProvider.calls + 1,
-        cost: sessionProvider.cost + cost,
-        apiCost: (sessionProvider.apiCost ?? 0) + apiCost,
-      }
-    }
-    if (cls === 'plan') {
-      // 路由第三方调用(空/'deepseek' 前缀命中第三方目录)与直连 Plan 同样入小时桶,
-      // 与 aggregateUsageSince 整天段口径一致,否则今日段本地量漏算。
-      const planId = planProviderIdOf(provider)
-        ?? (isRoutedThirdPartyCall(provider, modelId, this.config.prices) ? 'go' : null)
-      if (planId !== null) {
-        this.planHourBuckets = appendHourBucket(this.planHourBuckets, planId, atMs,
-          buckets.input + buckets.output + buckets.cacheRead + buckets.cacheWrite + buckets.reasoning, cost)
-      }
+    const planId = cls === 'plan' ? (planProviderIdOf(provider)
+      ?? (isRoutedThirdPartyCall(provider, modelId, this.config.prices) ? 'go' : null)) : null
+    const call = {
+      date: localDayKey(atMs), sessionId, atMs, recordedAt: Date.now(), planId,
+      providerKey: `${typeof provider === 'string' && provider.length > 0 ? provider : 'deepseek'}:${String(modelId ?? 'default')}`,
+      values: { ...buckets, calls: 1, cost, apiCost },
     }
+    applyAccount(this, call)
+    this.pendingAccounts.push(call)
     this.prune()
     this.scheduleWrite()
   }
@@ -2146,28 +2092,54 @@ export class Ledger {
     }, 2000)
   }
 
-  /** 立即落盘(原子写);写失败保留脏标记并按防抖重试(close 之后不再重排)。 */
+  /** A detached, secret-free baseline for merging changes from other processes. */
+  snapshot() {
+    return structuredClone({
+      version: LEDGER_VERSION, config: stripSecrets(this.config), days: this.days,
+      balanceRef: this.balanceRef ?? null, migrations: this.migrations,
+      planSamples: this.planSamples ?? {}, planHourBuckets: this.planHourBuckets ?? {},
+      openrouterPriceHashes: this.openrouterPriceHashes ?? {}, historyReset: this.historyReset ?? null,
+    })
+  }
+
+  resetHistory() {
+    this.days = {}
+    this.planSamples = {}
+    this.planHourBuckets = {}
+    this.balanceRef = null
+    this.pendingAccounts = []
+    this.historyReset = { id: randomUUID(), at: Date.now() }
+    this.scheduleWrite()
+  }
+
+  /** Read, reconcile and atomically replace under one cross-process lock. */
   flush() {
     if (!this.pendingWrite || this.closed) return
     try {
-      mkdirSync(dirname(this.path), { recursive: true })
-      // 裁剪结果回写内存:只在持久化副本上裁剪会让内存桶无界增长。
-      this.planHourBuckets = pruneHourBuckets(this.planHourBuckets, Date.now())
-      const tmp = `${this.path}.tmp`
-      writeFileSync(tmp, JSON.stringify({
-        version: LEDGER_VERSION,
-        // 密钥脱敏(v1.6.8):内存中 this.config 仍保留明文供运行时解析(凭据库/环境变量
-        // 都取不到时的兜底),但**绝不写盘**——ledger.json 只存空占位字符串。
-        config: stripSecrets(this.config),
-        days: this.days,
-        balanceRef: this.balanceRef ?? null,
-        migrations: this.migrations,
-        planSamples: this.planSamples ?? {},
-        planHourBuckets: this.planHourBuckets,
-        openrouterPriceHashes: this.openrouterPriceHashes,
-      }), 'utf8')
-      renameSync(tmp, this.path)
-      this.pendingWrite = false
+      withLedgerLock(this.path, () => {
+        const raw = readLedger(this.path)
+        if (raw !== null) {
+          for (const migration of CONFIG_MIGRATIONS) {
+            if (!(raw.migrations ?? []).includes(migration.id)) migration.apply(raw.config ?? {})
+          }
+        }
+        const disk = raw === null ? null : {
+          ...raw, config: stripSecrets(sanitizeConfig(raw.config)),
+          days: sanitizeDays(raw.days ?? {}), balanceRef: raw.balanceRef ?? null,
+          migrations: raw.migrations ?? [], planSamples: raw.planSamples ?? {},
+          planHourBuckets: raw.planHourBuckets ?? convertRecentCallsToBuckets(raw.planRecentCalls ?? []),
+          openrouterPriceHashes: raw.openrouterPriceHashes ?? {}, historyReset: raw.historyReset ?? null,
+        }
+        const merged = mergeLedger(this.writeBase, this.snapshot(), disk, this.pendingAccounts)
+        // Keep runtime-only secret fallbacks in memory, never in the file or baseline.
+        const config = sanitizeConfig(mergeRuntimeConfig(this.writeBase.config, this.config, merged.config))
+        writeLedger(this.path, merged)
+        this.config = config
+        for (const key of ['days', 'balanceRef', 'migrations', 'planSamples', 'planHourBuckets', 'openrouterPriceHashes', 'historyReset']) this[key] = merged[key]
+        this.writeBase = this.snapshot()
+        this.pendingAccounts = []
+        this.pendingWrite = false
+      })
     } catch (error) {
       console.warn(`[dsh-cost-meter] 账本写入失败,稍后重试: ${String(error?.message ?? error)}`)
       if (!this.closed) this.scheduleWrite()

package/package.json

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