dsh-cost-meter 1.7.19 → 1.7.21

package/README.en.md

@@ -6,7 +6,10 @@
 
 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.7.19-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.21-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+
+**v1.7.21** fixes session costs lost after restart. Settings → Cost → Display adds optional subagent cost aggregation and Codex quota display (both off by default). Gateway cards support account switching. See [native DeepSeek search accounting](docs/native-search-billing.md) and [GPT-6 Astra pricing](docs/gpt-astra-pricing.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)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -258,22 +261,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.7.19`** — 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.21`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.19/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.21/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.19
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.21
 ```
 
 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.19.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.21.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,10 @@
 
 本会话费用 · 当日费用 · 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.7.19-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.21-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+
+**v1.7.21**：修复重启后会话费用少算；「设置 → 费用 → 显示」可开启子代理费用合并及 Codex 额度（均默认关闭）。网关额度支持多账号切换。新增 [DeepSeek 原生搜索计量](docs/native-search-billing.md) 与 [GPT-6 Astra 完整计价](docs/gpt-astra-pricing.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)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -260,22 +263,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.19`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.21`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.19/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.21/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.19
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.21
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.19.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.21.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/docs/provider-pricing.json

@@ -1,9 +1,26 @@
 {
-  "generatedAt": "2026-09-01",
+  "generatedAt": "2026-09-11",
   "note": "Auto-generated from lib/pricing.js DEFAULT_PROVIDER_PRICE_TABLE. USD per 1M tokens; unpriced entries have no verified official price.",
   "providers": {
     "openai": {
       "models": {
+        "gpt-6-astra": {
+          "input": 10,
+          "cachedInput": 1,
+          "cacheWrite": 12.5,
+          "output": 50,
+          "longContext": {
+            "aboveInputTokens": 272000,
+            "cacheMiss": 20,
+            "cacheHit": 2,
+            "cacheWrite": 25,
+            "output": 75
+          },
+          "billingMode": "flat",
+          "sourceUrl": "https://developers.openai.com/api/docs/models/gpt-6-astra",
+          "checkedAt": "2026-09-11",
+          "notes": "标准 API 价，OpenCode Zen 同价；完整输入（含缓存读写）超过 272K 时整次请求按长上下文档计费；不含 Batch/Flex/Fast 服务档折扣或倍率"
+        },
         "gpt-5.6-sol": {
           "input": 2,
           "cachedInput": 0.2,

package/lib/backfill.js

@@ -18,6 +18,7 @@ import { costOf, providerPriceEntryFor, usdFromCost, isWrapperProviderId, wrappe
 import { localDayKey, zeroDay, splitLedgerApiCost } from './store.js'
 import { billingClassOf, enabledPlanSetOf } from './plan-billing.js'
 import { USAGE_DEDUP_WINDOW_MS, usageFingerprint } from './usage-dedup.js'
+import { isNativeSearchUsageEvent } from './native-search-billing.js'
 
 const ZSTD_MAGIC = 4247762216
 /** 打包行(文本/推理/工具调用增量游程)不含 header 与 usage,回放时跳过。 */
@@ -371,6 +372,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
   }
   // 本回放已计入的改挂样本(fp + 时刻):包装层重复分发(窗口内同指纹两次)只计一次。
   let remappedAdmitted = []
+  const nativeSearchIds = new Set()
   for (const event of records) {
     if (event === null || typeof event !== 'object') continue
     if (event.type === 'session' && typeof event.id === 'string') {
@@ -407,6 +409,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     // model,两代宿主形态 data.message.source.{provider,model} 与
     // data.{provider,model} 都兼容),仅作用于本样本;去重键独立于循环步。
     let isCompaction = false
+    const isNativeSearch = isNativeSearchUsageEvent(event)
     // 判空与去重键缺省值与 index.js 投影完全同构(usage null 不入账;turn/step
     // 缺省 0,保证实时投影与回放对同一事件产生同一 (turn,step) 去重键)。
     if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'usage' && event.data.chunk.usage != null) {
@@ -417,13 +420,17 @@ export function replaySessionRecords(records, config, wantDates = null) {
       usage = event.data.usage
       turn = event.data.turn ?? 0
       step = event.data.step ?? 0
+    } else if (isNativeSearch && event.data?.usage != null && typeof event.data.requestId === 'string') {
+      if (nativeSearchIds.has(event.data.requestId)) continue
+      nativeSearchIds.add(event.data.requestId)
+      usage = event.data.usage
     } else if (event.type === 'compaction/summary' && event.data?.usage != null) {
       usage = event.data.usage
       isCompaction = true
     } else {
       continue
     }
-    const atMs = eventMs
+    const atMs = isNativeSearch ? Number(event.data.startedAtMs) : eventMs
     if (!Number.isFinite(atMs) || atMs <= 0) continue
     const date = localDayKey(atMs)
     if (wantDates !== null && !wantDates.has(date)) continue
@@ -437,7 +444,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     // 摘要样本的事件自带路由(header 状态不受影响,后续循环步仍按其 header 计费)。
     let sampleProvider = provider
     let sampleModel = model
-    if (isCompaction) {
+    if (isCompaction || isNativeSearch) {
       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
@@ -454,7 +461,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     let effectiveProvider = sampleProvider
     if (isWrapperProviderId(sampleProvider)) {
       effectiveProvider = wrapperUpstreamProvider(sampleProvider) ?? sampleProvider
-      if (!isCompaction) {
+      if (!isCompaction && !isNativeSearch) {
         const fp = usageFingerprint(sampleModel, buckets)
         remappedAdmitted = remappedAdmitted.filter(entry => atMs - entry.at <= USAGE_DEDUP_WINDOW_MS)
         const plainTimes = plainFingerprints.get(fp)
@@ -463,7 +470,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
         remappedAdmitted.push({ fp, at: atMs })
       }
     }
-    const key = isCompaction
+    const key = isNativeSearch ? `search:${event.data.requestId}` : isCompaction
       ? `compaction:${Number.isFinite(Number(event.seq)) && Number(event.seq) >= 0 ? Number(event.seq) : 't' + String(event.time ?? '')}`
       : `${turn}:${step}`
     // 去重与旧版完全一致:单一 (turn,step) 状态机跨种子/own 段连续生效;
@@ -501,7 +508,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     if (prev !== null) shift(prev, -1, prev.seed ? seedDays : days)
     const sample = { key, date, providerKey, buckets, cost, apiCost, seed: isSeed }
     shift(sample, 1, isSeed ? seedDays : days)
-    last = sample
+    if (!isNativeSearch) last = sample
   }
   return { sessionId, title, createdAt, days, seedDays }
 }