@chenlongapps/opencode-token-usage 0.2.4 → 0.2.5

package/README.md

@@ -49,6 +49,7 @@ For remote sessions, add the package name to `plugins` in your local `~/.config/
 | `Cache Rate` | `Cache Read ÷ (Input + Cache Read + Cache Write)` |
 | `Total` | Sum of all five token categories |
 | `Context` | Latest context usage after the most recent completed compaction in the viewed session; not aggregated across the subtree |
+| `Steps` | Assistant message count across the session tree, including subagents; follows OpenCode's own stats definition, so compaction and user messages are not steps |
 | `Cost` | Estimated cost for the entire tree, recalculated using the viewed session's active model; not a provider bill |
 | `TPS` | Generation throughput for `Output + Reasoning` across the tree; live estimates are marked with `~` |
 | `TTFT` | Average time to first token across measurable assistant steps in the tree |
@@ -58,6 +59,7 @@ For remote sessions, add the package name to `plugins` in your local `~/.config/
 - Usage includes server-reported assistant and compaction messages throughout the session tree, including unopened subagents. Token counts are never inferred from text length.
 - A fork is a separate session tree. Inherited message copies are attributed only to their original source to prevent double counting.
 - `Context` only searches messages after the most recent compaction with `status === "completed"` and is hidden when reliable usage or a model context limit is unavailable.
+- `Steps` counts every assistant message in the tree, whether or not it reported usage, and reuses the fork-copy de-duplication so inherited history is never counted twice.
 - `Cost` applies the viewed session's active model to the whole tree. Missing applicable prices fall back to 0, matching OpenCode's behavior.
 - Initial read failures display `Unavailable`. Later failures retain the last complete snapshot, display `Not updated`, and retry automatically.
 

package/README.zh-CN.md

@@ -49,6 +49,7 @@ opencode plugin add @chenlongapps/opencode-token-usage
 | `Cache Rate` | `Cache Read ÷ (Input + Cache Read + Cache Write)` |
 | `Total` | 五类 token 之和 |
 | `Context` | 当前会话最后一次已完成压缩后的最新上下文用量，不随子树累计 |
+| `Steps` | 全树（含子代理）的 assistant 消息数，口径与 OpenCode 自带统计一致，compaction 与用户消息不计为 step |
 | `Cost` | 按当前会话活动模型重新估算的全树费用，不代表提供商账单 |
 | `TPS` | 全树 `Output + Reasoning` 的生成速度；生成中的估算值带 `~` 标记 |
 | `TTFT` | 全树中可测 assistant step 的平均首 token 时间 |
@@ -58,6 +59,7 @@ opencode plugin add @chenlongapps/opencode-token-usage
 - 用量覆盖会话树中服务端上报的 assistant 与 compaction 消息，包括未打开的子代理；不按文本长度估算 token。
 - 分叉会话是独立会话树。继承消息副本只归原始来源，避免重复计费。
 - `Context` 仅搜索最后一次 `status === "completed"` 的 compaction 之后；没有可靠用量或模型上限时隐藏。
+- `Steps` 统计树中全部 assistant 消息，无论是否已上报用量；复用分叉副本去重，继承历史不会重复计数。
 - `Cost` 使用当前查看会话的活动模型重算整棵树；缺失适用价格时按 OpenCode 行为回退为 0。
 - 首次读取失败显示 `Unavailable`；后续失败保留上次完整快照、标注 `Not updated` 并自动重试。
 

package/ROADMAP.md

@@ -54,6 +54,20 @@ TPS  48.7 tok/s
 TTFT  2.7s
 ```
 
+## v0.2.5 — Steps 计数
+
+目标：让整棵树的模型调用次数可见。
+
+* [x] 显示全树（含子代理）的 `Steps` 计数
+* [x] 口径与 OpenCode 官方统计一致：每条 assistant 消息为一个 step，compaction 与用户消息不计
+* [x] 分叉继承副本不重复计数
+* [x] 行位置为 Context 之后、Input 之前；无 Context 时位于面板第一行
+* [x] 实际打包产物在 OpenCode 2.0.11 中验证显示与刷新
+
+```text
+Steps  1,234
+```
+
 ## v0.3.0 — 公开价格目录
 
 目标：提供可查询的价格目录，便于用户了解不同模型的计费档位。

package/dist/usage.d.ts

@@ -77,6 +77,7 @@ export declare function summarize(messages: Iterable<UsageMessage>, prices?: rea
     tokens: Tokens;
     total: number;
     cacheRate: number;
+    steps: number;
     cost: number;
     defaultPrice: boolean;
 };

package/dist/usage.js

@@ -22,8 +22,13 @@ export function estimate(tokens, prices = []) {
 export function summarize(messages, prices = []) {
     const tokens = normalize();
     let cost = 0;
+    let steps = 0;
     let defaultPrice = prices.length === 0;
     for (const message of messages) {
+        // Matches OpenCode SessionStats: every assistant message is one step,
+        // with or without reported usage; compaction and user messages are not.
+        if (message.type === "assistant")
+            steps++;
         if ((message.type !== "assistant" && message.type !== "compaction") || !message.tokens)
             continue;
         const t = normalize(message.tokens);
@@ -36,7 +41,10 @@ export function summarize(messages, prices = []) {
         cost += value.cost;
         defaultPrice ||= value.defaultPrice;
     }
-    return { tokens, total: total(tokens), cacheRate: incoming(tokens) ? tokens.cache.read / incoming(tokens) : 0, cost, defaultPrice };
+    return {
+        tokens, total: total(tokens), cacheRate: incoming(tokens) ? tokens.cache.read / incoming(tokens) : 0,
+        steps, cost, defaultPrice,
+    };
 }
 const usableLimit = (value) => value !== undefined && Number.isFinite(value) && value > 0;
 // Matches the OpenCode 2.0.10 sidebar: the last assistant message with tokens that follows
@@ -73,7 +81,7 @@ export function usageRows(summary, context, performance) {
     const rows = [];
     if (context)
         rows.push(["Context", `${formatTokens(context.used)} / ${formatTokens(context.limit)} (${context.percent.toFixed(1)}%)`]);
-    rows.push(["Input", number(t?.input)], ["Output", number(t?.output)], ["Reasoning", number(t?.reasoning)], ["Cache Read", number(t?.cache.read)]);
+    rows.push(["Steps", number(summary?.steps)], ["Input", number(t?.input)], ["Output", number(t?.output)], ["Reasoning", number(t?.reasoning)], ["Cache Read", number(t?.cache.read)]);
     if (t && t.cache.write > 0)
         rows.push(["Cache Write", number(t.cache.write)]);
     rows.push(["Cache Rate", summary ? `${(summary.cacheRate * 100).toFixed(1)}%` : "—"], ["Total", number(summary?.total)]);

package/docs/verification.md

@@ -9,7 +9,7 @@
 | 检查 | 结果 |
 | --- | --- |
 | `npm run typecheck` | 通过 |
-| `npm test` | 31 项通过 |
+| `npm test` | 32 项通过 |
 | `npm run build` | 通过，输出 ESM 与类型声明 |
 | `npm run test:smoke` | 通过，使用实际 `.tgz` 安装产物和真实 OpenCode 2.0.11 |
 
@@ -17,9 +17,11 @@ SDK 从 2.0.9 升级到 2.0.11 后，四个顶层 OpenCode 包及锁文件中的
 
 新增共享性能监视器测试覆盖：查看会话 A 时捕获独立会话 B 的流，切换到 B 后立即恢复实时 TPS/TTFT；生成中切走、继续接收 delta 再切回；控制器销毁重建后恢复共享流；不同会话树隔离、新子代理即时纳入，以及删除会话清理运行期状态。既有重复事件去重与完成后收敛为精确 TPS 的断言继续通过。
 
+新增 Steps 计数覆盖：`summarize` 对带与不带 `tokens` 的 assistant 消息各计一个 step、compaction 与 user 消息不计、无 summary 时显示 `—`；`uniqueMessages` 链路上分叉继承副本不重复计数（快照 2 个 step、独立分叉树 1 个 step）、compaction 不产生 step、孙会话视图与根视图同为 6 个 step；行序断言锁定 Context → Steps → Input，无 Context 时 Steps 位于面板第一行。基准行数由 6 行调整为 7 行。
+
 ### 真实 OpenCode 集成
 
-隔离 smoke 测试确认打包插件可加载；空会话隐藏无数据行；在独立会话已经开始慢速流后，同一 TUI 切换过去会立即显示 `TPS ~…` 与 TTFT，完成后变为无 `~` 的精确 TPS；既有 token、上下文与费用刷新、真实子代理全树累计、会话局部上下文及模型切换验证均继续通过。测试产物保存在 `/var/folders/rw/bmx6c8hd737brl55m0_ff_b80000gn/T/token-usage-smoke-cgsCK2`。
+隔离 smoke 测试确认打包插件可加载；空会话隐藏无数据行并显示 `Steps 0`；在独立会话已经开始慢速流后，同一 TUI 切换过去会立即显示 `TPS ~…` 与 TTFT，完成后变为无 `~` 的精确 TPS；既有 token、上下文与费用刷新、真实子代理全树累计、会话局部上下文及模型切换验证均继续通过。Steps 在真实集成中断言为：首条 assistant 完成后 `Steps 1` 且行序位于 Context 与 Input 之间；真实子代理场景下根视图与子代理视图均为 `Steps 4`（父 3 条 + 子 1 条），而被查看会话自身仍为 1，确认 Steps 随整棵树累计、上下文保持会话局部。测试产物保存在 `/var/folders/rw/bmx6c8hd737brl55m0_ff_b80000gn/T/token-usage-smoke-423PQP`。
 
 ### 验证边界
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenlongapps/opencode-token-usage",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Session-tree token usage, live performance, context window and estimated cost for OpenCode 2",
   "keywords": [
     "opencode",