dsh-cost-meter 1.7.47 → 1.7.48

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; weekends and Chinese public holidays are off-peak all day, with separate labels) · 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.47-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.48-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.47** fixes missing native-search usage in isolated DSH web services and adds real DSH 0.2.0-rc.2 integration coverage. See the [release notes](docs/release-notes/v1.7.47.md).
+**v1.7.48** adds expandable costs for each turn and individual call: model responses, context compaction and native search, with token × price details, eight-decimal precision and separate API/Plan amounts. Search billing also captures saved methods that bypass its wrapper. See the [release notes](docs/release-notes/v1.7.48.md).
 
 Desktop users: follow the [Desktop installation instructions](docs/install-troubleshooting.md#desktop-安装与更新) for the application's own CLI and `desktop` Profile.
 
@@ -319,22 +319,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.47`** — 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.48`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.47/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.48/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.47
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.48
 ```
 
 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.47.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.48.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 为峰时段;周末与中国法定假日全天按谷价,分别标注) · 峰/谷切换前弹窗与系统通知提醒(位置/提前量/提醒类型可配) · 官方价格一键同步 · 类 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.47-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.48-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.47**：修复隔离 web 服务的原生搜索漏记费用，并加入真实 DSH 0.2.0-rc.2 集成验证。详见[更新说明](docs/release-notes/v1.7.47.md)。
+**v1.7.48**：费用细化到每轮及单次调用，区分模型回复、上下文压缩、原生搜索，列出各类 Token × 单价，金额最多显示八位小数，并分开显示 API 与 Plan 等值费用。搜索计费也覆盖已保存方法绕过包装器的路径。详见[更新说明](docs/release-notes/v1.7.48.md)。
 
 桌面端用户请按 [Desktop 安装说明](docs/install-troubleshooting.md#desktop-安装与更新)，使用应用自带的 CLI 和 `desktop` Profile。
 
@@ -319,22 +319,22 @@ Node.js 20 请改用 `npm install -g pnpm@10`。版本要求见 [pnpm 官方安
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.47`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.48`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.47/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.48/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.47
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.48
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.47.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.48.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/backfill.js

@@ -301,7 +301,8 @@ async function* sessionBillingRecords(ledger, sessionsRoot, onlySessionIds = nul
  * @param wantDates - 只统计这些日期键(YYYY-MM-DD)内的调用;null = 全部。
  * @returns { sessionId, title, createdAt, days, seedDays }。
  */
-export function replaySessionRecords(records, config, wantDates = null) {
+export function replaySessionRecords(records, config, wantDates = null, collectSamples = false) {
+  const samples = collectSamples ? new Map() : null
   const zeroBuckets = () => ({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, calls: 0, cost: 0, apiCost: 0 })
   const num = value => {
     const n = Number(value)
@@ -501,16 +502,21 @@ export function replaySessionRecords(records, config, wantDates = null) {
     const cost = usdFromCost(priced, resolved.currency, config?.exchangeRate)
     // Plan/API 双轨分类(issue #64):与 store.account() 同一分类器,回放条目
     // 的 apiCost 只含真金白银部分(plan 类金额仅记等值);传 prices 供路由判定。
-    const apiCost = billingClassOf(effectiveProvider, sampleModel, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'api' ? cost : 0
+    const plan = billingClassOf(effectiveProvider, sampleModel, config?.planBilling, enabledPlanSetOf(config), config?.prices) === 'plan'
+    const apiCost = plan ? 0 : cost
     const providerKey = `${effectiveProvider}:${sampleModel}`
     // 聚合目标按事件分段路由;被替换的旧样本从它当时所在的段扣回(与旧版
     // 单流先减后加的净效果一致,仅种子段的量落到 seedDays 而非 days)。
     if (prev !== null) shift(prev, -1, prev.seed ? seedDays : days)
     const sample = { key, date, providerKey, buckets, cost, apiCost, seed: isSeed }
+    if (samples) {
+      if (prev) samples.delete(prev)
+      samples.set(sample, { ...sample, atMs, provider: effectiveProvider, model: sampleModel, resolved, peak, plan, kind: isCompaction ? 'compaction' : isNativeSearch ? 'search' : 'model' })
+    }
     shift(sample, 1, isSeed ? seedDays : days)
     if (!isNativeSearch) last = sample
   }
-  return { sessionId, title, createdAt, days, seedDays }
+  return { sessionId, title, createdAt, days, seedDays, ...(samples ? { samples: [...samples.values()] } : {}) }
 }
 
 /**