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

package/lib/backfill.js

@@ -286,6 +286,11 @@ export function replaySessionRecords(records, config, wantDates = null) {
     let usage = null
     let turn = 0
     let step = 0
+    // compaction/summary(issue #77):压缩摘要调用是真实的一次 provider 计费,
+    // 但事件为 log-only、不是循环步——不占 (turn, step),自带路由(provider/
+    // model,两代宿主形态 data.message.source.{provider,model} 与
+    // data.{provider,model} 都兼容),仅作用于本样本;去重键独立于循环步。
+    let isCompaction = false
     // 判空与去重键缺省值与 index.js 投影完全同构(usage null 不入账;turn/step
     // 缺省 0,保证实时投影与回放对同一事件产生同一 (turn,step) 去重键)。
     if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'usage' && event.data.chunk.usage != null) {
@@ -296,6 +301,9 @@ export function replaySessionRecords(records, config, wantDates = null) {
       usage = event.data.usage
       turn = event.data.turn ?? 0
       step = event.data.step ?? 0
+    } else if (event.type === 'compaction/summary' && event.data?.usage != null) {
+      usage = event.data.usage
+      isCompaction = true
     } else {
       continue
     }
@@ -310,25 +318,42 @@ export function replaySessionRecords(records, config, wantDates = null) {
       cacheWrite: num(usage.cacheWriteTokens),
       reasoning: num(usage.reasoningTokens),
     }
+    // 摘要样本的事件自带路由(header 状态不受影响,后续循环步仍按其 header 计费)。
+    let sampleProvider = provider
+    let sampleModel = model
+    if (isCompaction) {
+      const source = event.data?.message?.source ?? {}
+      if (typeof source.provider === 'string' && source.provider.length > 0) sampleProvider = source.provider
+      else if (typeof event.data.provider === 'string' && event.data.provider.length > 0) sampleProvider = event.data.provider
+      if (typeof source.model === 'string' && source.model.length > 0) sampleModel = source.model
+      else if (typeof event.data.model === 'string' && event.data.model.length > 0) sampleModel = event.data.model
+    }
     // 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 段连续生效。
+    // compaction/summary 豁免窗口去重:它是单源事件(摘要结果只写一条日志,
+    // 没有包装转发对),与实时投影同口径(既不查窗也不入窗)。
+    let effectiveProvider = sampleProvider
+    if (isWrapperProviderId(sampleProvider)) {
+      effectiveProvider = wrapperUpstreamProvider(sampleProvider) ?? sampleProvider
+      if (!isCompaction) {
+        const fp = usageFingerprint(sampleModel, 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 = isCompaction
+      ? `compaction:${Number.isFinite(Number(event.seq)) && Number(event.seq) >= 0 ? Number(event.seq) : 't' + String(event.time ?? '')}`
+      : `${turn}:${step}`
+    // 去重与旧版完全一致:单一 (turn,step) 状态机跨种子/own 段连续生效;
+    // 摘要键独立,永不与循环步的样本替换相互干扰。
     const prev = last !== null && last.key === key ? last : null
-    if (prev !== null && prev.providerKey === `${effectiveProvider}:${model}`
+    if (prev !== null && prev.providerKey === `${effectiveProvider}:${sampleModel}`
       && 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) {
@@ -336,7 +361,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     }
     // 按事件时刻计费(历史正确):峰谷时代前用 legacyBase,之后按峰谷两档。
     // 计价/归类/归因一律用改挂后的 effectiveProvider(包装层转发对挂语义上游)。
-    const resolved = providerPriceEntryFor(effectiveProvider, model, config?.prices, {
+    const resolved = providerPriceEntryFor(effectiveProvider, sampleModel, config?.prices, {
       mode: config?.priceMatch === 'exact' ? 'exact' : 'auto',
       overrides: config?.priceOverrides,
     })
@@ -353,8 +378,8 @@ export function replaySessionRecords(records, config, wantDates = null) {
       config?.exchangeRate)
     // Plan/API 双轨分类(issue #64):与 store.account() 同一分类器,回放条目
     // 的 apiCost 只含真金白银部分(plan 类金额仅记等值);传 prices 供路由判定。
-    const apiCost = billingClassOf(effectiveProvider, model, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'api' ? cost : 0
-    const providerKey = `${effectiveProvider}:${model}`
+    const apiCost = billingClassOf(effectiveProvider, sampleModel, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'api' ? cost : 0
+    const providerKey = `${effectiveProvider}:${sampleModel}`
     // 聚合目标按事件分段路由;被替换的旧样本从它当时所在的段扣回(与旧版
     // 单流先减后加的净效果一致,仅种子段的量落到 seedDays 而非 days)。
     if (prev !== null) shift(prev, -1, prev.seed ? seedDays : days)

package/lib/index.js

@@ -346,7 +346,9 @@ function makeCostUsageProjection(ledger) {
     // v5→v6(issue #61):seedLength/seedDeducted 延迟扣除,修复“种子段含父会话自己的 end-seed”
     // 导致的首个边界过小、中间种子漏扣的问题;取种子段内最大 end-seed,延迟至首个 own 事件再整段扣回。
     // v6→v7(issue #63):seedLength 仅显式取值,普通会话的 length 不再误作种子边界,避免非 fork 会话代币漏计。
-    stateVersion: 7,
+    // v7→v8(issue #77):折叠计入 compaction/summary(压缩摘要调用,此前漏计);
+    // 升版本触发宿主对旧 checkpoint 全量重放,历史摘要调用量随之补齐。
+    stateVersion: 8,
     init: () => ({ provider: 'deepseek', model: 'default', totals: zeroBuckets(), byModel: {}, byProviderModel: {}, last: null, createdAt: 0, seedEndSeq: -1, shadow: emptyShadow(), seedLength: -1, seedDeducted: false, recent: [] }),
     apply(state, event) {
       // 兼容旧 checkpoint 的缺字段(版本升级前持久化的 v5 状态):缺省回落。
@@ -439,6 +441,14 @@ function makeCostUsageProjection(ledger) {
       let usage = null
       let turn = 0
       let step = 0
+      // compaction/summary(issue #77):压缩摘要调用是真实的一次 provider 计费
+      // (走 ctx.llm.stream,实时账本钩子本就覆盖),但事件为 log-only、不是循环步
+      // ——不占 (turn, step),自带路由(provider/model,两代宿主形态:
+      // data.message.source.{provider,model} 与 data.{provider,model} 都兼容)。
+      // 折叠按事件自带路由归因,缺省回落 header 状态;去重键独立于循环步。
+      let eventProvider = null
+      let eventModel = null
+      let keyOverride = null
       // 判空用 != null:usage === null 时 !== undefined 会放行,随后读
       // usage.inputTokens 直接抛 TypeError 打断投影;billing-stream 侧同处
       // 还会让 null 覆盖先前捕获的有效 usage 快照导致整次调用漏计。
@@ -450,6 +460,15 @@ function makeCostUsageProjection(ledger) {
         usage = event.data.usage
         turn = event.data.turn ?? 0
         step = event.data.step ?? 0
+      } else if (event.type === 'compaction/summary' && event.data?.usage != null) {
+        usage = event.data.usage
+        const source = event.data.message?.source ?? {}
+        eventProvider = typeof source.provider === 'string' && source.provider.length > 0 ? source.provider
+          : (typeof event.data.provider === 'string' && event.data.provider.length > 0 ? event.data.provider : null)
+        eventModel = typeof source.model === 'string' && source.model.length > 0 ? source.model
+          : (typeof event.data.model === 'string' && event.data.model.length > 0 ? event.data.model : null)
+        const seqNum = Number(event.seq)
+        keyOverride = `compaction:${Number.isFinite(seqNum) && seqNum >= 0 ? seqNum : 't' + String(event.time ?? '')}`
       } else {
         return state
       }
@@ -460,9 +479,10 @@ function makeCostUsageProjection(ledger) {
       // (issue #76)。v1.6.11 起与账本入账钩子同语义:包装层样本先改挂上游 id,
       // 再按 (model, 五桶指纹) 10s 窗与已计入样本互斥——上游真实流先到或后到
       // 都只计一次;包装层单链照常计入,不再整单漏计。
-      const rawProvider = typeof state.provider === 'string' ? state.provider : ''
+      const rawProvider = typeof (eventProvider ?? state.provider) === 'string' ? (eventProvider ?? state.provider) : ''
       const wrapped = isWrapperProviderId(rawProvider)
       const effectiveProvider = wrapped ? (wrapperUpstreamProvider(rawProvider) ?? rawProvider) : rawProvider
+      const model = typeof eventModel === 'string' && eventModel.length > 0 ? eventModel : state.model
       const buckets = {
         input: usage.inputTokens ?? 0,
         output: usage.outputTokens ?? 0,
@@ -470,9 +490,9 @@ function makeCostUsageProjection(ledger) {
         cacheWrite: usage.cacheWriteTokens ?? 0,
         reasoning: usage.reasoningTokens ?? 0,
       }
-      const key = `${turn}:${step}`
+      const key = keyOverride ?? `${turn}:${step}`
       const prev = state.last !== null && state.last.key === key ? state.last : null
-      if (prev !== null && prev.provider === effectiveProvider && prev.model === state.model
+      if (prev !== null && prev.provider === effectiveProvider && prev.model === 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) {
@@ -482,18 +502,20 @@ function makeCostUsageProjection(ledger) {
       const atMs = Number.isFinite(Number(event.time)) && Number(event.time) > 0 ? Number(event.time) : Date.now()
       // 指纹窗口去重(与 lib/usage-dedup.js 同语义的序列化形态):先按窗口清扫
       // 滚动列表,重复转发跳过(清扫结果仍落回 state,保持窗口推进)。有界:
-      // 超过 24 条先截断再判定,checkpoint 体积恒定。
-      const fp = usageFingerprint(state.model, buckets)
+      // 超过 24 条先截断再判定,checkpoint 体积恒定。compaction/summary 不参与:
+      // 它是单源事件(摘要结果只写一条日志,没有包装转发对),豁免既消除与
+      // 邻近循环步同指纹的极小误杀面,也避免它影响其它样本的窗口判定。
+      const fp = usageFingerprint(model, buckets)
       let recent = (Array.isArray(state.recent) ? state.recent : [])
         .filter(entry => entry !== null && typeof entry === 'object' && atMs - entry.at <= USAGE_DEDUP_WINDOW_MS)
       if (recent.length > 24) recent = recent.slice(-24)
       const hitPlain = recent.some(entry => entry.w !== 1 && entry.fp === fp)
       const hitRemapped = recent.some(entry => entry.w === 1 && entry.fp === fp)
-      if (wrapped ? (hitPlain || hitRemapped) : hitRemapped) {
+      if (keyOverride === null && (wrapped ? (hitPlain || hitRemapped) : hitRemapped)) {
         return { ...state, recent }
       }
-      recent.push({ fp, at: atMs, ...(wrapped ? { w: 1 } : {}) })
-      const resolved = providerPriceEntryFor(effectiveProvider, state.model, ledger.config?.prices, {
+      if (keyOverride === null) recent.push({ fp, at: atMs, ...(wrapped ? { w: 1 } : {}) })
+      const resolved = providerPriceEntryFor(effectiveProvider, model, ledger.config?.prices, {
         mode: ledger.config?.priceMatch === 'exact' ? 'exact' : 'auto',
         overrides: ledger.config?.priceOverrides,
       })
@@ -545,14 +567,14 @@ function makeCostUsageProjection(ledger) {
         }
       }
       if (prev !== null) shiftInto(mainAgg, prev.provider, prev.model, prev.buckets, prev.cost, -1)
-      shiftInto(mainAgg, effectiveProvider, state.model, buckets, billed, 1)
+      shiftInto(mainAgg, effectiveProvider, model, buckets, billed, 1)
       if (mirrorSeed) {
         if (prev !== null) shiftInto(shadowAgg, prev.provider, prev.model, prev.buckets, prev.cost, -1)
-        shiftInto(shadowAgg, effectiveProvider, state.model, buckets, billed, 1)
+        shiftInto(shadowAgg, effectiveProvider, model, buckets, billed, 1)
       }
       // createdAt/seedLength/seedDeducted 必须随状态携带:usage 样本更新不能丢掉 fork 过滤基准。
       // recent 随行:包装层转发对去重的滚动窗口状态(有界 ≤25 条)。
-      return { provider: state.provider, model: state.model, totals, byModel, byProviderModel, createdAt: state.createdAt, seedEndSeq: state.seedEndSeq, seedLength: state.seedLength, seedDeducted: state.seedDeducted, shadow: shadowAgg, recent, last: { key, provider: effectiveProvider, model: state.model, buckets, cost: billed } }
+      return { provider: state.provider, model: state.model, totals, byModel, byProviderModel, createdAt: state.createdAt, seedEndSeq: state.seedEndSeq, seedLength: state.seedLength, seedDeducted: state.seedDeducted, shadow: shadowAgg, recent, last: { key, provider: effectiveProvider, model, buckets, cost: billed } }
     },
     view: projectionView,
     // DSH 0.1.1-rc.1 起会话投影需声明 wire 才会向客户端推送(PR #39 by

package/package.json

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