dsh-cost-meter 1.8.12 → 1.8.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -7
- package/README.zh-CN.md +9 -7
- package/docs/billing-statistics.md +3 -1
- package/docs/ledger-lock-recovery.md +45 -0
- package/lib/client.js +5 -5
- package/lib/ledger-lock-owner.js +79 -0
- package/lib/ledger-persistence.js +12 -5
- package/lib/store.js +4 -0
- package/lib/typert.host.js +1 -0
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -8,12 +8,14 @@
|
|
|
8
8
|
|
|
9
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 170+ model-ID 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)
|
|
10
10
|
|
|
11
|
-
[](https://github.com/Han-1413141/dsh-cost-meter)
|
|
12
12
|
|
|
13
|
-
**v1.8.
|
|
13
|
+
**v1.8.14** fixes stale ledger locks after PID reuse, restoring plugin startup without changing recorded costs. Update and restart the affected host once; see the [recovery guide](docs/ledger-lock-recovery.md#english). See the [release notes](docs/release-notes/v1.8.14.md).
|
|
14
14
|
|
|
15
15
|
Desktop users: follow the [Desktop installation instructions](docs/install-troubleshooting.md#desktop-安装与更新) for the application's own CLI and `desktop` Profile.
|
|
16
16
|
|
|
17
|
+
If startup reports **Ledger is busy** and the cost widgets are missing, see [ledger lock recovery](docs/ledger-lock-recovery.md#english).
|
|
18
|
+
|
|
17
19
|
[](https://www.npmjs.com/package/dsh-cost-meter)
|
|
18
20
|
[](LICENSE)
|
|
19
21
|
[](https://github.com/deepseek-ai/deepseek-harness)
|
|
@@ -32,7 +34,7 @@ Desktop users: follow the [Desktop installation instructions](docs/install-troub
|
|
|
32
34
|
|---|---|---|
|
|
33
35
|
| Cost statistics | Below the conversation input / title bar / Settings → Cost → Cost statistics | Day, week, month, all retained and custom periods; API/Plan split, trends, model/conversation rankings and per-call costs. [Guide](docs/billing-statistics.md#english); statistics requires DSH’s asynchronous module loader |
|
|
34
36
|
| Per-model cost card | Sidebar / composer dock (optional) | Disabled by default; inline Top-N, Other totals, shares and optional tokens, Today / Last 90 days, remembered expansion and a Top-1 chip. See the [guide](docs/model-cost-card.md#english) |
|
|
35
|
-
| Per-conversation cost | Below the composer / session title bar | Live accumulated cost + input/cache/output tokens; the composer footer shows cache hit rate before Input (cache reads / all input, including cache writes); position configurable |
|
|
37
|
+
| Per-conversation cost | Below the composer / session title bar | Live accumulated cost + input/cache/output tokens; the composer footer shows cache hit rate before Input (cache reads / all input, including cache writes); position configurable; Display settings can show only amounts below the composer, with the full line retained on hover |
|
|
36
38
|
| Official balance | Sidebar top / Settings page (configurable) | Total / granted / topped-up balance, auto-refresh + manual refresh; optional three-segment progress bar (blue/orange/gray), whose today segment only counts official-channel spend (coding plans / custom providers excluded) |
|
|
37
39
|
| Custom provider balance | Sidebar / Settings page (configurable) | Configurable HTTP balance lookup (e.g. LiteLLM); bilingual labels, currency, extract rules (dot path / number / add / subtract / divide — use divide for NewApi-style quota endpoints, see [example](#custom-provider-balance-example-newapi-template)); collapsible panel alongside Coding Plan quotas |
|
|
38
40
|
| OpenCode Go quota | Sidebar / Settings / bottom-right dock (configurable) | Rolling-5h / weekly / monthly usage percent and reset times, each window toggleable independently, budget used % can show alongside; key auto-discovered (dedicated ref / official Go route apiKeyEnv / env / opencode login) or entered manually |
|
|
@@ -320,22 +322,22 @@ On Node.js 20, use `npm install -g pnpm@10` instead. See [pnpm installation and
|
|
|
320
322
|
dsh plugin --profile web add dsh-cost-meter
|
|
321
323
|
```
|
|
322
324
|
|
|
323
|
-
**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.8.
|
|
325
|
+
**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.8.14`** — review the script before running):
|
|
324
326
|
|
|
325
327
|
```powershell
|
|
326
|
-
irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.8.
|
|
328
|
+
irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.8.14/install.ps1 | iex
|
|
327
329
|
```
|
|
328
330
|
|
|
329
331
|
**Or a plain command line** (the machine must already have pnpm and git; also pinned to the tag):
|
|
330
332
|
|
|
331
333
|
```sh
|
|
332
|
-
dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.8.
|
|
334
|
+
dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.8.14
|
|
333
335
|
```
|
|
334
336
|
|
|
335
337
|
Without git, use the GitHub tag archive:
|
|
336
338
|
|
|
337
339
|
```sh
|
|
338
|
-
dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.8.
|
|
340
|
+
dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.8.14.tar.gz
|
|
339
341
|
```
|
|
340
342
|
|
|
341
343
|
After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):
|
package/README.zh-CN.md
CHANGED
|
@@ -8,12 +8,14 @@
|
|
|
8
8
|
|
|
9
9
|
本会话费用 · 当日费用 · OpenCode Go 订阅额度显示 · 预算与已用百分比 · 官方账户余额 · 自定义 Provider 余额查询(可配任意 HTTP 端点) · 余额三段进度条 · 历史记录 · 峰谷计价时段显示(UTC 01:00–04:00、06:00–10:00 为峰时段;周末与中国法定假日全天按谷价,分别标注) · 峰/谷切换前弹窗与系统通知提醒(位置/提前量/提醒类型可配) · 官方价格一键同步 · 类 Codex Token 用量热图 · 多厂商多模型价格计费(内置 170+ 模型 ID 价格目录与自动匹配) · 主流 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 用量一条横排显示,可开关)
|
|
10
10
|
|
|
11
|
-
[](https://github.com/Han-1413141/dsh-cost-meter)
|
|
12
12
|
|
|
13
|
-
**v1.8.
|
|
13
|
+
**v1.8.14** 修复 PID 复用导致旧账本锁长期占用、插件启动失败的问题,保留已有计费记录。更新后重启受影响宿主一次,见[恢复说明](docs/ledger-lock-recovery.md#简体中文)。详见[更新说明](docs/release-notes/v1.8.14.md)。
|
|
14
14
|
|
|
15
15
|
桌面端用户请按 [Desktop 安装说明](docs/install-troubleshooting.md#desktop-安装与更新),使用应用自带的 CLI 和 `desktop` Profile。
|
|
16
16
|
|
|
17
|
+
启动报 **Ledger is busy** 且费用卡片消失时,参见[账本锁恢复说明](docs/ledger-lock-recovery.md#简体中文)。
|
|
18
|
+
|
|
17
19
|
[](https://www.npmjs.com/package/dsh-cost-meter)
|
|
18
20
|
[](LICENSE)
|
|
19
21
|
[](https://github.com/deepseek-ai/deepseek-harness)
|
|
@@ -32,7 +34,7 @@
|
|
|
32
34
|
|---|---|---|
|
|
33
35
|
| 计费统计与明细 | 会话输入框下方 / 标题栏 / 设置 → 费用 → 计费统计 | 输入、输出、缓存、推理费用;按轮次、模型、搜索和压缩统计;日、周、月及全部记录。[说明](docs/billing-statistics.md#简体中文) |
|
|
34
36
|
| 按模型花费卡片 | 侧栏 / 右下角 dock(可配) | 默认关闭;就地展开 Top-N、其它汇总、占比和可选 Token;支持今日 / 近 90 天、展开记忆及 Top-1 角标,见[使用说明](docs/model-cost-card.md) |
|
|
35
|
-
| 本会话费用 | 输入区下方 / 会话标题栏 | 实时累计费用 + 输入/缓存/输出 token;输入区下方在“输入”前显示缓存命中率(缓存读取 /
|
|
37
|
+
| 本会话费用 | 输入区下方 / 会话标题栏 | 实时累计费用 + 输入/缓存/输出 token;输入区下方在“输入”前显示缓存命中率(缓存读取 / 含缓存写入的全部输入),位置可配;显示页可开启输入区下方只显示金额,完整费用行保留在悬停提示中 |
|
|
36
38
|
| 官方余额 | 侧边栏顶部 / 设置页(可配) | 总余额 / 赠送 / 充值,自动刷新 + 手动刷新;可选三段进度条(蓝/橙/灰),当日段只统计官方渠道费用(不含 Coding Plan / 自定义 Provider) |
|
|
37
39
|
| 自定义 Provider 余额 | 侧边栏 / 设置页(可配) | 可配置 HTTP 查询任意 Provider 余额(LiteLLM 等);中/英名称、币种、extract 规则(点路径 / 数字常量 / add / subtract / divide,divide 适配 NewApi 等 quota 端点,见下方[示例](#自定义-provider-余额配置示例newapi-模板));与 Coding Plan 同区可折叠配置 |
|
|
38
40
|
| OpenCode Go 额度 | 侧边栏 / 设置页 / 右下角(dock,可配) | 滚动 5 小时 / 本周 / 本月用量百分比与重置时间,三档可分别开关,可同时显示预算已用%;Key 自动发现(专用引用 / 官方 Go 路由 apiKeyEnv / 环境变量 / opencode 登录态)或手动填写 |
|
|
@@ -320,22 +322,22 @@ Node.js 20 请改用 `npm install -g pnpm@10`。版本要求见 [pnpm 官方安
|
|
|
320
322
|
dsh plugin --profile web add dsh-cost-meter
|
|
321
323
|
```
|
|
322
324
|
|
|
323
|
-
**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.8.
|
|
325
|
+
**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.8.14`**,建议先下载审阅再运行):
|
|
324
326
|
|
|
325
327
|
```powershell
|
|
326
|
-
irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.8.
|
|
328
|
+
irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.8.14/install.ps1 | iex
|
|
327
329
|
```
|
|
328
330
|
|
|
329
331
|
**或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
|
|
330
332
|
|
|
331
333
|
```sh
|
|
332
|
-
dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.8.
|
|
334
|
+
dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.8.14
|
|
333
335
|
```
|
|
334
336
|
|
|
335
337
|
没有 git 时可用 GitHub tag 打包直链:
|
|
336
338
|
|
|
337
339
|
```sh
|
|
338
|
-
dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.8.
|
|
340
|
+
dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.8.14.tar.gz
|
|
339
341
|
```
|
|
340
342
|
|
|
341
343
|
安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
## English
|
|
4
4
|
|
|
5
|
-
Open a conversation and click **Cost details** in the same row as turns, speed, tokens and cache-hit statistics below its input box. **Settings → Cost → Display** has separate switches to hide the header entry, composer entry and turn cost summaries; all remain visible by default. The header entry automatically hides at viewport widths of 640px or less. The composer entry follows its own switch. Both buttons use compact 12px text. Budget chips take only their content width and no longer create an extra row. Cost badge visibility remains independent. The conversation entry opens its entire retained history, shows API and Plan equivalents separately, uses the sidebar cost basis by default, and puts component details before overview charts. Switching conversations closes the previous dialog. For all conversations, open **Settings → Cost → Cost statistics**; this entry starts with the last seven calendar days, including today.
|
|
5
|
+
Open a conversation and click **Cost details** in the same row as turns, speed, tokens and cache-hit statistics below its input box. **Settings → Cost → Display** has separate switches to hide the header entry, composer entry and turn cost summaries; all remain visible by default. The header entry automatically hides at viewport widths of 640px or less. The composer entry follows its own switch. Both buttons use compact 12px text. Budget chips take only their content width and no longer create an extra row. Cost badge visibility remains independent. From 1.8.13, **Amount only below the composer (full split on hover)** in the same Display tab condenses the conversation cost line to its amounts. Hover retains cache hit rate, input/cache/output tokens and model amounts; header badges and Cost details stay available. The conversation entry opens its entire retained history, shows API and Plan equivalents separately, uses the sidebar cost basis by default, and puts component details before overview charts. Switching conversations closes the previous dialog. For all conversations, open **Settings → Cost → Cost statistics**; this entry starts with the last seven calendar days, including today.
|
|
6
6
|
|
|
7
7
|
- **Periods:** Today, Last 7 days, Last 30 days, All retained, and custom inclusive dates. Dates follow the host timezone shown on the page.
|
|
8
8
|
- **Filters:** Provider and model. Choose API cost, Plan equivalent, or their combined equivalent for chart amounts and rankings.
|
|
@@ -32,6 +32,8 @@ The statistics screen uses DSH's package-local asynchronous module loader. Since
|
|
|
32
32
|
|
|
33
33
|
## 简体中文
|
|
34
34
|
|
|
35
|
+
从 1.8.13 起,可在**设置 → 费用 → 显示**开启“**输入区下方只显示金额(悬停可见完整分项)**”。费用行只显示金额,悬停保留命中率、输入/缓存/输出 Token 与模型金额。API 和 Plan 等值继续使用当前展示口径,标题栏徽章及“费用明细”入口保持原有行为;默认关闭。
|
|
36
|
+
|
|
35
37
|
打开一个会话,点击**输入框下方与轮数、速度、Token 和缓存命中率同一行的「费用明细」**。在 **设置 → 费用 → 显示设置** 中,可分别隐藏标题栏入口、输入框下方入口和每轮回复后的费用行;默认均保留。视口不超过 640px 时,标题栏入口自动隐藏,输入框下方入口继续遵守自己的开关。两个明细按钮使用 12px 字号和紧凑间距;预算标签仅占内容所需宽度,不再独占整行。关闭费用徽章不影响明细入口。对话入口默认显示该对话保留的全部历史,API 与 Plan 等值分别列出,默认金额口径跟随侧栏的“含 Plan 总额”设置,费用构成放在趋势图之前。切换会话会关闭旧明细。全部会话统计的入口为 **设置 → 费用 → 计费统计**,默认显示包含今天的近 7 个自然日。
|
|
36
38
|
|
|
37
39
|
- **时间范围:**今天、近 7 天、近 30 天、全部保留记录,以及包含起止日期的自定义区间。日期按页面标明的宿主时区划分。
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
# Ledger lock recovery / 账本锁恢复
|
|
2
|
+
|
|
3
|
+
## English
|
|
4
|
+
|
|
5
|
+
Issue [#237](https://github.com/Han-1413141/dsh-cost-meter/issues/237) reports a startup failure with **Ledger is busy; preserving pending changes for retry**. The sidebar balance and quota widgets disappear because the cost-meter loader entry did not activate. An old lock can name a PID that now belongs to a different process; checking only whether that PID exists cannot identify the original owner.
|
|
6
|
+
|
|
7
|
+
### Update and recover
|
|
8
|
+
|
|
9
|
+
1. Update `dsh-cost-meter` in the affected Profile. Web users can run `dsh plugin --profile web add dsh-cost-meter`. Desktop users must use the application's own CLI and the `desktop` Profile; see the [Desktop guide](install-troubleshooting.md#desktop-安装与更新).
|
|
10
|
+
2. Restart that DSH host. For Desktop, fully exit the application including its tray process, then reopen it. The upgraded plugin recovers a proven stale lock before loading its ledger.
|
|
11
|
+
3. Confirm that the host logs contain `[dsh-cost-meter] 已加载` and that the Cost page and sidebar widgets return. Existing ledger amounts and history remain intact; this recovery does not reprice usage.
|
|
12
|
+
|
|
13
|
+
A previously failed loader entry is not necessarily retried when an unrelated configuration file changes. Restarting the affected host applies the installed fix; adding a dummy `balance.refreshMinutes` override is unnecessary. This plugin does not change DSH's loader/HMR retry policy.
|
|
14
|
+
|
|
15
|
+
### What changes
|
|
16
|
+
|
|
17
|
+
- Owner filenames retain their original `PID-UUID` format. The owner file now records process identity: Linux uses the boot ID, PID namespace and process start ticks; Windows uses the native process creation time.
|
|
18
|
+
- A lock is recovered when its process has exited, or when a comparable native identity confirms PID reuse. Linux locks with identity records from another host or PID namespace are not treated as local owners.
|
|
19
|
+
- Earlier versions wrote empty owner files. These are recovered only when the file predates the identified process's start, with a two-second margin for timestamp precision. The current process also has an uptime-based fallback. A lock is not expired just because it is old.
|
|
20
|
+
- Unknown ownership, inaccessible process information and incomplete owner writes remain locked. A genuine competing writer retains its lock. Only the identified owner file and empty lock directory are removed; the ledger is preserved.
|
|
21
|
+
|
|
22
|
+
If a genuine writer still holds the lock, let its operation finish and restart the failed host entry. For persistent failures, attach the plugin and DSH versions, other installed plugins, the sanitized startup error, and lock directory filenames/timestamps. Do not include the ledger contents or credentials. Do not delete `ledger.json` to restore the widgets.
|
|
23
|
+
|
|
24
|
+
Implementation references: [Linux process start ticks](https://man7.org/linux/man-pages/man5/proc_pid_stat.5.html), [Windows process StartTime](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.starttime).
|
|
25
|
+
|
|
26
|
+
## 简体中文
|
|
27
|
+
|
|
28
|
+
Issue [#237](https://github.com/Han-1413141/dsh-cost-meter/issues/237) 报告启动时出现 **Ledger is busy; preserving pending changes for retry**。费用插件未成功挂载,侧栏余额和额度卡片随之消失。旧锁中的 PID 可能已经被系统分配给另一个进程,仅检查 PID 是否存在不能确认原锁持有者。
|
|
29
|
+
|
|
30
|
+
### 升级与恢复
|
|
31
|
+
|
|
32
|
+
1. 更新受影响 Profile 中的 `dsh-cost-meter`。Web 用户可执行 `dsh plugin --profile web add dsh-cost-meter`。桌面端使用应用自带 CLI 和 `desktop` Profile,见 [Desktop 安装说明](install-troubleshooting.md#desktop-安装与更新)。
|
|
33
|
+
2. 重启该 DSH 宿主。桌面端完全退出应用(包括托盘)后重新打开。新版插件会在读取账本前回收已确认失效的锁。
|
|
34
|
+
3. 确认日志出现 `[dsh-cost-meter] 已加载`,费用页和侧栏卡片恢复。已有金额和历史记录保留,此过程不重新定价。
|
|
35
|
+
|
|
36
|
+
已经失败的加载器条目不一定会因无关配置文件变化而重试。重启受影响宿主即可加载已安装修复,无需添加临时 `balance.refreshMinutes` 配置。本插件不修改 DSH 加载器的热重载重试策略。
|
|
37
|
+
|
|
38
|
+
### 修复规则
|
|
39
|
+
|
|
40
|
+
- 锁文件名继续使用原有 `PID-UUID` 格式,文件内容增加进程身份。Linux 保存系统启动 ID、PID 命名空间和进程启动计数;Windows 保存操作系统提供的进程创建时间。
|
|
41
|
+
- 进程已经退出,或原生启动身份能确认 PID 被复用时,回收旧锁。对于有身份记录的 Linux 锁,不会把其他主机或 PID 命名空间中的持有者误当成本机进程。
|
|
42
|
+
- 兼容旧版空锁文件。只有文件早于对应进程启动时间,并留出两秒精度余量时,才认定失效;当前进程还可用运行时长推算启动时间。锁的存放时间长短不是独立回收依据。
|
|
43
|
+
- 身份不明、进程信息不可读取或文件未写完整时,保留锁。真实并发写入者继续持锁。恢复只删除已确认的锁持有者文件和空锁目录,保留账本。
|
|
44
|
+
|
|
45
|
+
如果是真实写入进程占锁,等待其操作结束后重启加载失败的宿主。持续失败时,请附插件和 DSH 版本、其他已安装插件、脱敏启动错误,以及锁目录中文件的名称和时间。不要附账本内容或凭据,也不要通过删除 `ledger.json` 恢复卡片。
|