opencode2-tps 0.2.1-rc.1 → 0.3.0-rc.1

package/README.md

@@ -12,9 +12,15 @@ When OpenCode reports terminal usage, the token count becomes exact while TPS re
 
 ## Install
 
-Built against the OpenCode 2 preview. The earliest known compatible beta is `0.0.0-beta-17595`; the latest tested beta is `0.0.0-beta-17639`. The TUI plugin API is still moving, so a much newer or older build may drop the indicator without an error. If the figure never appears, check your version first.
+Built against the OpenCode 2 preview. The earliest known compatible beta is `0.0.0-beta-17595`; the latest tested beta is `0.0.0-beta-19381`. The TUI plugin API is still moving, so a much newer or older build may drop the indicator without an error. If the figure never appears, check your version first.
 
-Add the package to `~/.config/opencode/cli.json`:
+Install it with the CLI's plugin command, which adds the entry to `~/.config/opencode/cli.json` for you:
+
+```sh
+opencode2 plugin add opencode2-tps
+```
+
+Or add the package to `~/.config/opencode/cli.json` yourself:
 
 ```json
 {
@@ -35,12 +41,12 @@ To set options, use the object form:
 }
 ```
 
-A running TUI picks up `cli.json` changes immediately. On first use it installs the package into its own cache, `~/.cache/opencode/packages/opencode2-tps/` on Linux.
+A running TUI picks up `cli.json` changes immediately. On first use it installs the package into its own cache under `~/.cache/opencode/npm/` on Linux — one millisecond-timestamped generation per spec, for example `opencode2-tps@latest/<generation>/`, with the newest generation winning.
 
-That cache is keyed on the entry text and is never refreshed once it exists, so a restart alone will not pick up a new release. To upgrade, delete the directory and restart:
+The host reuses the newest installed generation without contacting the registry, so a restart alone may not pick up a new release. To upgrade, delete the spec's cache directory and restart:
 
 ```sh
-rm -rf ~/.cache/opencode/packages/opencode2-tps
+rm -rf ~/.cache/opencode/npm/opencode2-tps@latest
 ```
 
 To pin a version instead, put the range in the entry — `"opencode2-tps@0.1.0"`. Every distinct entry gets its own cache directory.
@@ -67,7 +73,9 @@ The defaults are usable as they are. For the full option list, the ranges and mo
 
 While output streams, the plugin estimates tokens from observable UTF-8 bytes at a default of 4.75 bytes per token and calculates a bounded rolling delivery rate. Complete text, reasoning, and tool-input events reconcile buffered or missed deltas without creating artificial live-rate spikes.
 
-At the end of each model step, OpenCode's reported output and reasoning usage replaces the byte estimate. Settled TPS divides those exact tokens by observed step spans ending at the final model-content boundary, which excludes later local tool execution and time between model calls.
+At the end of each model step, OpenCode's reported output and reasoning usage replaces the byte estimate. Settled TPS divides those exact tokens by observed step spans ending at `session.step.streamed`, the host's authoritative end of the model stream, published before local tools join. Hosts that do not publish the event fall back to the final model-content boundary. Either way, local tool execution and time between model calls are excluded.
+
+OpenCode's built-in assistant-footer t/s divides visible output tokens by the same step spans, leaving hidden reasoning out of its numerator. This plugin counts output plus reasoning, so on reasoning models its settled figure reads higher than the built-in one — those tokens were generated too.
 
 TPS is always approximate (`~`) because OpenCode does not expose token-level timestamps. Proprietary reasoning may be encrypted or represented only by a short summary, and some providers buffer tool arguments until completion. During those opaque intervals the live rate holds or becomes unavailable instead of continuously falling. Opaque provider state is never counted by byte length.
 

package/dist/tui.js

@@ -176,6 +176,7 @@ export class TpsTracker {
     const step = {
       assistantMessageID,
       startedAt: now,
+      streamedAt: null,
       lastBoundaryAt: null,
       observableBytes: 0,
       blocks: new Map(),
@@ -242,6 +243,19 @@ export class TpsTracker {
     step.observableBytes += block.finalBytes - block.streamedBytes;
     step.lastBoundaryAt = Math.max(step.lastBoundaryAt ?? now, now);
   }
+
+  /**
+   * The host's authoritative end of the model stream, published after the
+   * provider stream exits and before local tools join. Assigned rather than
+   * maxed so a retried attempt reusing the message ID moves the boundary to its
+   * own completion.
+   */
+  markStreamed(sessionID, assistantMessageID, now) {
+    const st = this.runs.get(sessionID);
+    const step = st?.activeStep;
+    if (!step || step.assistantMessageID !== assistantMessageID) return;
+    step.streamedAt = now;
+  }
   settleActiveStep(st, generatedTokens) {
     const step = st.activeStep;
     if (!step) return;
@@ -251,7 +265,10 @@ export class TpsTracker {
       st.tokensEstimated = true;
       st.partial = true;
     }
-    if (step.lastBoundaryAt !== null) st.settledDurationMs += Math.max(0, step.lastBoundaryAt - step.startedAt);
+    // `session.step.streamed` is the exact stream end; the last content boundary
+    // remains the fallback for hosts that do not publish it.
+    const end = step.streamedAt ?? step.lastBoundaryAt;
+    if (end !== null) st.settledDurationMs += Math.max(0, end - step.startedAt);
     st.settledSteps.add(step.assistantMessageID);
     st.activeStep = null;
   }
@@ -478,6 +495,11 @@ const definition = {
       tracker.beginStep(e.data.sessionID, e.data.assistantMessageID, e.created);
       touch();
     };
+    const onStepStreamed = e => {
+      if (!isActive() || !isNewEvent(e)) return;
+      tracker.markStreamed(e.data.sessionID, e.data.assistantMessageID, e.created);
+      touch();
+    };
     const onStepFinished = e => {
       if (!isActive() || !isNewEvent(e)) return;
       const tokens = e.data.tokens;
@@ -489,7 +511,7 @@ const definition = {
       if (!isActive() || !isNewEvent(e)) return;
       tracker.beginRun(e.data.sessionID);
       touch();
-    }), ctx.data.on("session.text.delta", onDelta), ctx.data.on("session.reasoning.delta", onDelta), ctx.data.on("session.tool.input.delta", onDelta), ctx.data.on("session.text.started", onBlockStarted), ctx.data.on("session.reasoning.started", onBlockStarted), ctx.data.on("session.tool.input.started", onBlockStarted), ctx.data.on("session.text.ended", onBlockEnded), ctx.data.on("session.reasoning.ended", onBlockEnded), ctx.data.on("session.tool.input.ended", onBlockEnded), ctx.data.on("session.step.started", onStepStarted), ctx.data.on("session.step.ended", onStepFinished), ctx.data.on("session.step.failed", onStepFinished), ctx.data.on("session.execution.succeeded", onFinish), ctx.data.on("session.execution.failed", onFinish), ctx.data.on("session.execution.interrupted", onFinish), ctx.data.on("session.idle", onFinish), ctx.data.on("session.deleted", e => {
+    }), ctx.data.on("session.text.delta", onDelta), ctx.data.on("session.reasoning.delta", onDelta), ctx.data.on("session.tool.input.delta", onDelta), ctx.data.on("session.text.started", onBlockStarted), ctx.data.on("session.reasoning.started", onBlockStarted), ctx.data.on("session.tool.input.started", onBlockStarted), ctx.data.on("session.text.ended", onBlockEnded), ctx.data.on("session.reasoning.ended", onBlockEnded), ctx.data.on("session.tool.input.ended", onBlockEnded), ctx.data.on("session.step.started", onStepStarted), ctx.data.on("session.step.streamed", onStepStreamed), ctx.data.on("session.step.ended", onStepFinished), ctx.data.on("session.step.failed", onStepFinished), ctx.data.on("session.execution.succeeded", onFinish), ctx.data.on("session.execution.failed", onFinish), ctx.data.on("session.execution.interrupted", onFinish), ctx.data.on("session.idle", onFinish), ctx.data.on("session.deleted", e => {
       if (!isActive() || !isNewEvent(e)) return;
       tracker.evict(e.data.sessionID);
       touch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode2-tps",
-  "version": "0.2.1-rc.1",
+  "version": "0.3.0-rc.1",
   "description": "Live token-throughput indicator for the OpenCode 2 TUI prompt composer",
   "license": "MIT",
   "author": "P-Theo",
@@ -21,7 +21,6 @@
     "throughput"
   ],
   "exports": {
-    ".": "./dist/tui.js",
     "./tui": "./dist/tui.js"
   },
   "files": [
@@ -47,11 +46,11 @@
   "devDependencies": {
     "@babel/core": "^7.29.7",
     "@babel/preset-typescript": "^7.29.7",
-    "@opencode-ai/cli": "0.0.0-beta-17639",
-    "@opencode-ai/plugin": "0.0.0-beta-17639",
-    "@opencode-ai/theme": "0.0.0-beta-17639",
-    "@opentui/core": "^0.5.4",
-    "@opentui/solid": "^0.5.4",
+    "@opencode/cli": "0.0.0-beta-19381",
+    "@opencode/plugin": "0.0.0-beta-19381",
+    "@opencode/theme": "0.0.0-beta-19381",
+    "@opentui/core": "^0.5.10",
+    "@opentui/solid": "^0.5.10",
     "@oxlint/plugins": "^1.78.0",
     "@types/bun": "^1.3.14",
     "@types/node": "^24.0.0",