dsh-cost-meter 1.7.20 → 1.7.22

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.20-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.22-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+
+**v1.7.22** fixes session reload failures after native search and missed history in versioned session logs. Search usage is persisted separately. See the [recovery guide](docs/session-history-recovery.md#english) for existing affected sessions and historical imports.
+
 [![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.20`** — 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.22`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.20/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.22/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.20
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.22
 ```
 
 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.20.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.22.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.20-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.22-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+
+**v1.7.22**：修复原生搜索后会话重启无法加载，以及带版本号日志的历史导入遗漏。搜索明细改为独立存储；已受影响的会话可按 [恢复说明](docs/session-history-recovery.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.20`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.22`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.20/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.22/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.20
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.22
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.20.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.22.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

@@ -1,7 +1,7 @@
 /**
  * 历史账本按模型回填:按模型统计(byProviderModel)上线之前的账本只有
  * 每日/会话合计,没有 provider:model 拆分。本模块回放宿主会话日志
- * ($DSH_HOME/sessions/<项目>/<会话>/session.jsonl[.zstd]),按与 costUsage
+ * ($DSH_HOME/sessions/<项目>/<会话>/session[.vN].jsonl[.zstd]),按与 costUsage
  * 投影一致的逻辑逐次重建用量,并按事件时刻的档位(峰谷时代前按
  * legacyBase 历史价)计算费用,回填到账本中 byProviderModel 为空的
  * 日期与会话条目。
@@ -10,14 +10,15 @@
  * 避免与实时计费重复计数。会话日志是宿主的只读数据,本模块从不写入。
  */
 
-import { readdirSync, statSync } from 'node:fs'
 import { open } from 'node:fs/promises'
-import { join } from 'node:path'
 import * as zlib from 'node:zlib'
 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'
+import { isNativeSearchUsageEvent } from './native-search-events.js'
+import { listSessionLogFiles } from './session-log-files.js'
+import { listNativeSearchHistory, readNativeSearchHistory, nativeSearchRecordsFor } from './native-search-history.js'
 
 const ZSTD_MAGIC = 4247762216
 /** 打包行(文本/推理/工具调用增量游程)不含 header 与 usage,回放时跳过。 */
@@ -244,45 +245,38 @@ export async function readSessionRecordsAsync(path, options = {}) {
 }
 
 /**
- * 枚举会话根目录下全部会话日志路径(<root>/<项目>/<会话>/session.jsonl[.zstd])。
+ * 枚举每个会话最高数字代际的日志路径(session[.vN].jsonl[.zstd])。
  * @param root - 会话根目录。
  * @param onlySessionIds - 可选:仅枚举这些会话目录(Set<会话 id>)。纯标题/时间戳
  *   补齐时按缺失会话定向,避免为补齐一两个标题全量读取全部会话日志(其中可能
  *   含解压后数百 MB 的大文件)。null = 全部。
  */
 export function listSessionLogs(root, onlySessionIds = null) {
-  const paths = []
-  let projects
-  try {
-    projects = readdirSync(root, { withFileTypes: true })
-  } catch {
-    return paths
-  }
-  for (const project of projects) {
-    if (!project.isDirectory()) continue
-    let sessions
-    try {
-      sessions = readdirSync(join(root, project.name), { withFileTypes: true })
-    } catch {
-      continue
-    }
-    for (const session of sessions) {
-      if (!session.isDirectory()) continue
-      if (onlySessionIds !== null && !onlySessionIds.has(session.name)) continue
-      for (const name of ['session.jsonl.zstd', 'session.jsonl']) {
-        const path = join(root, project.name, session.name, name)
-        try {
-          if (statSync(path).isFile()) {
-            paths.push(path)
-            break // 同一会话两种编码互斥,取先命中者
-          }
-        } catch {
-          // 不存在:继续尝试另一后缀。
-        }
-      }
+  return listSessionLogFiles(root, onlySessionIds)
+}
+
+/** Merge the plugin journal before replay, so UUID dedup also covers repaired v1.7.21 logs. */
+async function* sessionBillingRecords(ledger, sessionsRoot, onlySessionIds = null) {
+  const seen = new Set()
+  for (const path of listSessionLogs(sessionsRoot, onlySessionIds)) {
+    let records
+    try { records = await readSessionRecordsAsync(path) } catch { yield null; continue }
+    const id = records.find(record => record.type === 'session')?.id
+    if (typeof id === 'string') {
+      seen.add(id)
+      try { for (const record of await nativeSearchRecordsFor(ledger.path, id)) records.push(record) } catch { /* Keep the readable host prefix. */ }
     }
+    yield records
+  }
+  // A deleted/missing host log must not discard the plugin's surviving search history.
+  for (const path of listNativeSearchHistory(ledger.path, seen, onlySessionIds)) {
+    let history
+    try { history = await readNativeSearchHistory(path) } catch { continue }
+    const id = history.sessionId
+    if (!id || seen.has(id) || (onlySessionIds !== null && !onlySessionIds.has(id))) continue
+    seen.add(id)
+    yield [{ type: 'session', id, createdAt: 0 }, ...history.records]
   }
-  return paths
 }
 
 /**
@@ -371,6 +365,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 +402,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 +413,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 +437,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 +454,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 +463,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 +501,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 }
 }
@@ -563,14 +563,15 @@ export async function backfillLegacyLedger(ledger, sessionsRoot) {
       }
     }
   }
-  for (const path of listSessionLogs(sessionsRoot, onlySessionIds)) {
+  for await (const records of sessionBillingRecords(ledger, sessionsRoot, onlySessionIds)) {
     // 会话日志多时逐份解压会长时间占住事件循环:每 8 份让出一次,不卡宿主 UI;
     // 单文件内部亦为流式读取(v1.7.7,issue #88:解压期间周期性让出,大日志不再卡死宿主)。
     if ((scannedCount += 1) % 8 === 0) await new Promise(resolve => setImmediate(resolve))
     result.scanned += 1
     let replayed
     try {
-      replayed = replaySessionRecords(await readSessionRecordsAsync(path), ledger.config, needDates.size > 0 ? needDates : new Set(['-']))
+      if (records === null) continue
+      replayed = replaySessionRecords(records, ledger.config, needDates.size > 0 ? needDates : new Set(['-']))
     } catch {
       continue // 单文件损坏(含解压预算超限)不阻断整体回填。
     }
@@ -804,12 +805,13 @@ export async function importLegacyHistory(ledger, sessionsRoot) {
   const result = { days: 0, sessions: 0, scanned: 0 }
   const bySession = new Map()
   let scannedCount = 0
-  for (const path of listSessionLogs(sessionsRoot)) {
+  for await (const records of sessionBillingRecords(ledger, sessionsRoot)) {
     if ((scannedCount += 1) % 8 === 0) await new Promise(resolve => setImmediate(resolve))
     result.scanned += 1
     let replayed
     try {
-      replayed = replaySessionRecords(await readSessionRecordsAsync(path), ledger.config, null)
+      if (records === null) continue
+      replayed = replaySessionRecords(records, ledger.config, null)
     } catch {
       continue // 单文件损坏(含解压预算超限)不阻断整体导入。
     }
@@ -899,11 +901,12 @@ export async function importLegacyHistory(ledger, sessionsRoot) {
 export async function recomputeLedgerPricingBasis(ledger, sessionsRoot, includeBucket) {
   const result = { scanned: 0, recostedSessions: 0, skippedSessions: 0, recostedDays: 0 }
   const bySession = new Map()
-  for (const path of listSessionLogs(sessionsRoot)) {
+  for await (const records of sessionBillingRecords(ledger, sessionsRoot)) {
     if ((result.scanned += 1) % 8 === 0) await new Promise(resolve => setImmediate(resolve))
     let replayed
     try {
-      replayed = replaySessionRecords(await readSessionRecordsAsync(path), ledger.config, null)
+      if (records === null) continue
+      replayed = replaySessionRecords(records, ledger.config, null)
     } catch {
       continue // 单文件损坏(含解压预算超限)不阻断整体重算。
     }