dsh-cost-meter 1.7.46 → 1.7.47

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.46-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.47-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.46** adds a dedicated Open Platform key for balance queries in DSH account-login mode. See the [release notes](docs/release-notes/v1.7.46.md).
+**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).
 
 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.46`** — 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.47`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.46/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.47/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.46
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.47
 ```
 
 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.46.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.47.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.46-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.7.47-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 
-**v1.7.46**：新增余额专用开放平台 Key，解决账号登录模式下余额凭据被推理令牌覆盖的问题。详见[更新说明](docs/release-notes/v1.7.46.md)。
+**v1.7.47**：修复隔离 web 服务的原生搜索漏记费用，并加入真实 DSH 0.2.0-rc.2 集成验证。详见[更新说明](docs/release-notes/v1.7.47.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.46`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.7.47`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.46/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.7.47/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.46
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.7.47
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.46.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.7.47.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/native-search-billing.js

@@ -252,11 +252,17 @@ export function installNativeSearchBilling(ctx, ledger) {
     uncovered: (event) => coverage.add(event),
   })
   monitors.set(ledger, { coverage })
-  ctx.effect(() => () => { monitor.dispose(); coverage.close(); monitors.delete(ledger) }, 'cost-meter: native search billing')
-  ctx.inject(['web'], (webCtx) => {
-    const web = webCtx.web
+  const observations = new Map()
+  const observe = (service, webCtx = ctx) => {
+    if (!service) return
+    // Cordis returns a different caller-scoped proxy on every service lookup.
+    // Observe the underlying instance once, including isolated web services.
+    const web = service[Symbol.for('cordis.original')] ?? service
+    if (observations.has(web)) return
     const own = Object.getOwnPropertyDescriptor(web, 'search')
-    const original = own?.value ?? Object.getOwnPropertyDescriptor(Object.getPrototypeOf(web), 'search')?.value
+    let descriptor = own, proto = web
+    while (!descriptor && (proto = Object.getPrototypeOf(proto))) descriptor = Object.getOwnPropertyDescriptor(proto, 'search')
+    const original = descriptor?.value
     if (typeof original !== 'function' || own?.configurable === false) return
     const wrapped = function (...args) {
       let session
@@ -264,10 +270,29 @@ export function installNativeSearchBilling(ctx, ledger) {
       return monitor.run(() => Reflect.apply(original, this, args), session)
     }
     Object.defineProperty(web, 'search', { configurable: true, writable: true, value: wrapped })
-    webCtx.effect(() => () => {
+    const restore = () => {
+      observations.delete(web)
       if (Object.getOwnPropertyDescriptor(web, 'search')?.value !== wrapped) return
       if (own) Object.defineProperty(web, 'search', own)
       else delete web.search
-    }, 'cost-meter: web search observation')
+    }
+    observations.set(web, restore)
+    webCtx.effect(() => restore, 'cost-meter: web search observation')
+  }
+  ctx.effect(() => () => {
+    for (const restore of observations.values()) restore()
+    observations.clear()
+    monitor.dispose(); coverage.close(); monitors.delete(ledger)
+  }, 'cost-meter: native search billing')
+  // A root injection only resolves the root's web scope. Tool presets and other
+  // plugins can own separate instances, loaded before or after this observer.
+  ctx.on?.('internal/service', function (name, service) {
+    if (name === 'web') observe(service, this)
+  }, { global: true })
+  for (const runtime of ctx.registry?.values?.() ?? []) {
+    for (const fiber of runtime.fibers ?? []) observe(fiber.store?.web?.value, fiber.ctx)
+  }
+  ctx.inject(['web'], (webCtx) => {
+    observe(webCtx.web, webCtx)
   })
 }

package/package.json

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