@jack-yang/opencode-tps-meter 1.1.2 → 1.2.0

package/README.md

@@ -4,7 +4,7 @@ English | [中文](./README.zh-CN.md)
 
 A TUI plugin for [opencode](https://opencode.ai) that displays real-time LLM output speed metrics next to the session prompt.
 
-[![npm version](https://img.shields.io/npm/v/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![license](https://img.shields.io/npm/l/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![stars](https://img.shields.io/github/stars/yangwudong/opencode-tps-meter)](https://github.com/yangwudong/opencode-tps-meter) ![opencode](https://img.shields.io/badge/opencode-1.17.20-tested-blue)
+[![npm version](https://img.shields.io/npm/v/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![license](https://img.shields.io/npm/l/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![stars](https://img.shields.io/github/stars/yangwudong/opencode-tps-meter)](https://github.com/yangwudong/opencode-tps-meter) ![opencode](https://img.shields.io/badge/opencode-1.x%20%2F%202.x-blue)
 
 ## Display
 
@@ -44,17 +44,24 @@ TPS 42.5 | AVG 38.2 | TTFT 0.8s ⠒⠑⠂
 
 ## Installation
 
-> **Important:** This plugin must be configured in `tui.json`, **not** `opencode.json`.
+One package supports both opencode 1.x and 2.x — pick the section for your version.
+
+> **Important (opencode 1.x):** the plugin must be configured in `tui.json`, **not** `opencode.json`.
+> **opencode 2.x:** terminal-client plugins live in `cli.json` (installed under the `plugins` key). If you upgrade to 2.x, your `tui.json` is migrated automatically.
 
 ### One command (recommended)
 
 ```bash
+# opencode 1.x
 opencode plugin @jack-yang/opencode-tps-meter -g
+
+# opencode 2.x
+opencode plugin add @jack-yang/opencode-tps-meter
 ```
 
 Installs the plugin and updates your config. Restart opencode — done. (Applies default options; to customize, use the tuple form in [Configuration](#configuration).)
 
-### Manual: npm
+### Manual: npm (opencode 1.x)
 
 Add `@jack-yang/opencode-tps-meter` to the `plugin` array in `~/.config/opencode/tui.json`:
 
@@ -66,6 +73,18 @@ Add `@jack-yang/opencode-tps-meter` to the `plugin` array in `~/.config/opencode
 }
 ```
 
+### Manual: npm (opencode 2.x)
+
+Add the package to the `plugins` array in `~/.config/opencode/cli.json`:
+
+```json
+{
+  "plugins": [
+    "@jack-yang/opencode-tps-meter"
+  ]
+}
+```
+
 ### GitHub
 
 ```json
@@ -98,7 +117,9 @@ curl -o ~/.config/opencode/tps-meter.tsx https://raw.githubusercontent.com/yangw
 
 ## Configuration
 
-All options are optional — defaults are sane. Pass them via the tuple form in `tui.json`:
+All options are optional — defaults are sane.
+
+**opencode 1.x** — tuple form in `tui.json`:
 
 ```json
 {
@@ -119,6 +140,22 @@ All options are optional — defaults are sane. Pass them via the tuple form in
 }
 ```
 
+**opencode 2.x** — object form in `cli.json` (same options):
+
+```json
+{
+  "plugins": [
+    {
+      "package": "@jack-yang/opencode-tps-meter",
+      "options": {
+        "spinner": { "theme": "tech", "cells": 6 },
+        "tiers": { "tps": { "slow": 20, "normal": 50, "fast": 100 } }
+      }
+    }
+  ]
+}
+```
+
 | Option | Default | Description |
 |---|---|---|
 | `spinner.theme` | `"tech"` | Color preset: `"tech"` (cyan→blue→purple) or `"red"` (KITT-style red). `"none"` disables the thinking stream. |
@@ -127,6 +164,7 @@ All options are optional — defaults are sane. Pass them via the tuple form in
 | `spinner.cells` | `6` | Number of cells (width) of the thinking stream. |
 | `tiers.tps` | `{20,50,100}` | TPS/AVG thresholds (slow/normal/fast, in TPS); above `fast` is "faster". |
 | `tiers.ttft` | `{10000,20000}` | TTFT thresholds in ms (fast/ok); above `ok` is "slow". |
+| `slot` | `"prompt.footer.status"` | opencode 2.x only: which TUI slot the meter renders into. |
 
 ## How It Works
 
@@ -157,7 +195,7 @@ Pure measurement functions (`measure.ts`) have 29 unit tests. The TUI plugin (`t
 
 ## Requirements
 
-- opencode >= 1.4.3 (tested on 1.17.20)
+- opencode 1.x >= 1.4.3 (tested on 1.17.20 / 1.18.30) or opencode 2.x
 
 ## License
 

package/README.zh-CN.md

@@ -4,7 +4,7 @@
 
 一个 [opencode](https://opencode.ai) 的 TUI 插件，在输入框旁边实时显示 LLM 输出速度指标。
 
-[![npm version](https://img.shields.io/npm/v/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![license](https://img.shields.io/npm/l/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![stars](https://img.shields.io/github/stars/yangwudong/opencode-tps-meter)](https://github.com/yangwudong/opencode-tps-meter) ![opencode](https://img.shields.io/badge/opencode-1.17.20-tested-blue)
+[![npm version](https://img.shields.io/npm/v/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![license](https://img.shields.io/npm/l/@jack-yang/opencode-tps-meter)](https://www.npmjs.com/package/@jack-yang/opencode-tps-meter) [![stars](https://img.shields.io/github/stars/yangwudong/opencode-tps-meter)](https://github.com/yangwudong/opencode-tps-meter) ![opencode](https://img.shields.io/badge/opencode-1.x%20%2F%202.x-blue)
 
 ## 显示效果
 
@@ -44,17 +44,24 @@ TPS 42.5 | AVG 38.2 | TTFT 0.8s ⠒⠑⠂
 
 ## 安装
 
-> **注意：** 本插件必须配置在 `tui.json` 中，**不是** `opencode.json`。
+一个包同时支持 opencode 1.x 和 2.x，按你的版本选择对应方式。
+
+> **注意（opencode 1.x）：** 插件必须配置在 `tui.json` 中，**不是** `opencode.json`。
+> **opencode 2.x：** 终端客户端插件配置在 `cli.json` 的 `plugins` 键下。升级到 2.x 时，`tui.json` 会被自动迁移。
 
 ### 一条命令（推荐）
 
 ```bash
+# opencode 1.x
 opencode plugin @jack-yang/opencode-tps-meter -g
+
+# opencode 2.x
+opencode plugin add @jack-yang/opencode-tps-meter
 ```
 
-安装插件并更新配置。重启 opencode 即可。（使用默认配置；如需自定义，见下方[配置](#配置)的元组形式。）
+安装插件并更新配置。重启 opencode 即可。（使用默认配置；如需自定义，见下方[配置](#配置)。）
 
-### 手动：npm
+### 手动：npm（opencode 1.x）
 
 在 `~/.config/opencode/tui.json` 的 `plugin` 数组中添加 `@jack-yang/opencode-tps-meter`：
 
@@ -66,6 +73,18 @@ opencode plugin @jack-yang/opencode-tps-meter -g
 }
 ```
 
+### 手动：npm（opencode 2.x）
+
+在 `~/.config/opencode/cli.json` 的 `plugins` 数组中添加：
+
+```json
+{
+  "plugins": [
+    "@jack-yang/opencode-tps-meter"
+  ]
+}
+```
+
 ### GitHub
 
 ```json
@@ -98,7 +117,9 @@ curl -o ~/.config/opencode/tps-meter.tsx https://raw.githubusercontent.com/yangw
 
 ## 配置
 
-所有配置项都是可选的——默认值即开即用。通过 `tui.json` 的元组形式传入：
+所有配置项都是可选的——默认值即开即用。
+
+**opencode 1.x** —— `tui.json` 的元组形式：
 
 ```json
 {
@@ -119,6 +140,22 @@ curl -o ~/.config/opencode/tps-meter.tsx https://raw.githubusercontent.com/yangw
 }
 ```
 
+**opencode 2.x** —— `cli.json` 的对象形式（配置项相同）：
+
+```json
+{
+  "plugins": [
+    {
+      "package": "@jack-yang/opencode-tps-meter",
+      "options": {
+        "spinner": { "theme": "tech", "cells": 6 },
+        "tiers": { "tps": { "slow": 20, "normal": 50, "fast": 100 } }
+      }
+    }
+  ]
+}
+```
+
 | 配置项 | 默认值 | 说明 |
 |---|---|---|
 | `spinner.theme` | `"tech"` | 配色预设：`"tech"`（青→蓝→紫）或 `"red"`（KITT 风格红）。`"none"` 关闭思考粒子流。 |
@@ -127,8 +164,9 @@ curl -o ~/.config/opencode/tps-meter.tsx https://raw.githubusercontent.com/yangw
 | `spinner.cells` | `6` | 粒子流格数（宽度）。 |
 | `tiers.tps` | `{20,50,100}` | TPS/AVG 阈值（慢/正常/快，单位 TPS）；超过 fast 为"很快"。 |
 | `tiers.ttft` | `{10000,20000}` | TTFT 阈值（毫秒，快/正常）；超过 ok 为"慢"。 |
+| `slot` | `"prompt.footer.status"` | 仅 opencode 2.x：仪表渲染到的 TUI slot。 |
 
-> 一条命令安装（`opencode plugin ...`）使用默认值；如需自定义，改用上面的元组形式。
+> 一条命令安装（`opencode plugin ...`）使用默认值；如需自定义，改用上面的元组/对象形式。
 
 ## 工作原理
 
@@ -159,7 +197,7 @@ npm test
 
 ## 环境要求
 
-- opencode >= 1.4.3（已在 1.17.20 测试）
+- opencode 1.x >= 1.4.3（已在 1.17.20 / 1.18.30 测试）或 opencode 2.x
 
 ## 许可证
 

package/package.json

@@ -1,10 +1,13 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@jack-yang/opencode-tps-meter",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Live TPS/AVG/TTFT meter plugin for OpenCode TUI with color-coded speed tiers",
   "type": "module",
   "exports": {
+    ".": {
+      "import": "./tui.tsx"
+    },
     "./tui": {
       "import": "./tui.tsx"
     }

package/tui.tsx

@@ -106,22 +106,56 @@ function formatTtft(valueMs: number): string | undefined {
 }
 
 type SpeedTier = "slow" | "normal" | "fast" | "faster"
+type Palette = { muted: RGBA; error: RGBA; warning: RGBA; success: RGBA; accent: RGBA }
+
+type V2Event = { type: string; created: number; data: Record<string, any> }
+type V2Theme = {
+  text: {
+    muted: RGBA
+    feedback: Record<"error" | "warning" | "success" | "info", { base: RGBA; muted: RGBA }>
+  }
+  hue: Record<string, Partial<Record<number, RGBA>>>
+}
+type V2Context = {
+  options: Record<string, unknown> | undefined
+  renderer: { requestRender(): void }
+  theme: V2Theme
+  data: { on(type: string, handler: (event: V2Event) => void): () => void }
+  ui: {
+    slot(claim: { append: string; render: (input: { sessionID?: string }) => unknown }): () => void
+    router: { current(): { type: string; sessionID?: string } }
+  }
+}
+
+function v1Palette(t: TuiThemeCurrent): Palette {
+  return { muted: t.textMuted, error: t.error, warning: t.warning, success: t.success, accent: t.accent }
+}
+function v2Palette(t: V2Theme): Palette {
+  return {
+    muted: t.text.muted,
+    error: t.text.feedback.error.base,
+    warning: t.text.feedback.warning.base,
+    success: t.text.feedback.success.base,
+    accent: t.hue.accent?.[500] ?? t.text.feedback.info.base,
+  }
+}
+
 function speedTier(tps: number, c: TpsTiers): SpeedTier {
   if (tps < c.slow) return "slow"
   if (tps < c.normal) return "normal"
   if (tps < c.fast) return "fast"
   return "faster"
 }
-function tierColor(tier: SpeedTier, theme: TuiThemeCurrent): RGBA {
+function tierColor(tier: SpeedTier, p: Palette): RGBA {
   switch (tier) {
-    case "slow": return theme.error
-    case "normal": return theme.warning
-    case "fast": return theme.success
-    case "faster": return theme.accent
+    case "slow": return p.error
+    case "normal": return p.warning
+    case "fast": return p.success
+    case "faster": return p.accent
   }
 }
-function tpsColor(tps: number, c: TpsTiers, theme: TuiThemeCurrent): RGBA {
-  return tierColor(speedTier(tps, c), theme)
+function tpsColor(tps: number, c: TpsTiers, p: Palette): RGBA {
+  return tierColor(speedTier(tps, c), p)
 }
 
 type TtftTier = "fast" | "ok" | "slow"
@@ -130,11 +164,11 @@ function ttftTier(ms: number, c: TtftTiers): TtftTier {
   if (ms < c.ok) return "ok"
   return "slow"
 }
-function ttftColor(ms: number, c: TtftTiers, theme: TuiThemeCurrent): RGBA {
+function ttftColor(ms: number, c: TtftTiers, p: Palette): RGBA {
   switch (ttftTier(ms, c)) {
-    case "fast": return theme.success
-    case "ok": return theme.warning
-    case "slow": return theme.error
+    case "fast": return p.success
+    case "ok": return p.warning
+    case "slow": return p.error
   }
 }
 
@@ -181,75 +215,17 @@ function recordDelta(tracker: TrackerState, sessionID: string, messageID: string
 
 const DOT_GLYPHS = ["⠁", "⠂", "⠄", "⠈", "⠐", "⠠", "⠒", "⠑", "⠡", "⠢", "⠤", "⠨", "⠰", "⠸", "⠘", "⠔", "⠖", "⠦"]
 
-function MeterDisplay(props: {
-  api: Parameters<TuiPlugin>[0]
-  sessionID: string
+type MeterCore = {
   tracker: TrackerState
-  config: ResolvedConfig
-  muted: RGBA
-  spinnerCells: () => { glyph: string; color: RGBA }[]
+  bump: () => void
   subscribe: (listener: Listener) => () => void
-}) {
-  let particleRef: TextRenderable | undefined
-  let tpsRef: TextRenderable | undefined
-  let avgRef: TextRenderable | undefined
-  let ttftRef: TextRenderable | undefined
-  const theme = props.api.theme.current
-  const muted = props.muted
-
-  const sync = () => {
-    const stats = props.tracker.statsBySession[props.sessionID]
-    const calibration = calibrationFactor(stats?.calibrationRatios ?? [])
-    const samples = props.tracker.samplesBySession[props.sessionID] ?? []
-    const now = Date.now()
-    const live = calculateLiveTps(samples, now, calibration)
-    const avg = stats && stats.totalDurationMs > 0 ? stats.totalOutputTokens / (stats.totalDurationMs / 1000) : undefined
-    const ttft = props.tracker.liveTtftBySession[props.sessionID]
-    const thinkingNow = props.tracker.thinkingBySession[props.sessionID] === true && props.config.spinner.enabled
-    if (particleRef) {
-      if (thinkingNow) {
-        const cells = props.spinnerCells()
-        particleRef.content = " " + cells.map((c) => c.glyph).join("")
-        particleRef.fg = cells[0]?.color ?? muted
-      } else {
-        particleRef.content = ""
-      }
-    }
-    if (tpsRef) {
-      tpsRef.content = live !== undefined ? formatTps(live) ?? "--" : "--"
-      tpsRef.fg = live !== undefined ? tpsColor(live, props.config.tps, theme) : muted
-    }
-    if (avgRef) {
-      avgRef.content = avg !== undefined ? formatTps(avg) ?? "--" : "--"
-      avgRef.fg = avg !== undefined ? tpsColor(avg, props.config.tps, theme) : muted
-    }
-    if (ttftRef) {
-      ttftRef.content = ttft !== undefined ? formatTtft(ttft) ?? "--" : "--"
-      ttftRef.fg = ttft !== undefined ? ttftColor(ttft, props.config.ttft, theme) : muted
-    }
-    props.api.renderer.requestRender()
-  }
-
-  const unsubscribe = props.subscribe(sync)
-  onCleanup(unsubscribe)
-
-  return (
-    <box flexDirection="row" alignItems="center">
-      <text fg={muted}>TPS </text>
-      <text ref={(el: TextRenderable) => { tpsRef = el; sync() }} fg={muted}>--</text>
-      <text fg={muted}> | AVG </text>
-      <text ref={(el: TextRenderable) => { avgRef = el; sync() }} fg={muted}>--</text>
-      <text fg={muted}> | TTFT </text>
-      <text ref={(el: TextRenderable) => { ttftRef = el; sync() }} fg={muted}>--</text>
-      <text ref={(el: TextRenderable) => { particleRef = el; sync() }} fg={muted}></text>
-    </box>
-  )
+  spinnerCells: () => { glyph: string; color: RGBA }[]
+  setThinking: (sessionID: string, value: boolean) => void
+  clearSessionLive: (sessionID: string) => void
+  dispose: () => void
 }
 
-const tui: TuiPlugin = async (api, options) => {
-  const config = resolveConfig(options)
-  const muted = api.theme.current.textMuted
-
+function createMeterCore(config: ResolvedConfig, muted: RGBA): MeterCore {
   const tracker: TrackerState = {
     useV2Events: false,
     samplesBySession: {},
@@ -315,6 +291,130 @@ const tui: TuiPlugin = async (api, options) => {
     if (value) initStream()
     syncSpinnerTimer()
   }
+  const clearSessionLive = (sessionID: string) => {
+    delete tracker.samplesBySession[sessionID]
+    setThinking(sessionID, false)
+  }
+
+  return {
+    tracker,
+    bump,
+    subscribe,
+    spinnerCells,
+    setThinking,
+    clearSessionLive,
+    dispose: () => {
+      if (spinnerTimer) clearInterval(spinnerTimer)
+    },
+  }
+}
+
+function recordMessageCompleted(core: MeterCore, info: {
+  id: string
+  sessionID: string
+  tokens: { output: number; reasoning: number }
+}) {
+  const tracker = core.tracker
+  const sessionID = info.sessionID
+  if (!tracker.statsBySession[sessionID]) {
+    tracker.statsBySession[sessionID] = { totalOutputTokens: 0, totalDurationMs: 0, calibrationRatios: [] }
+  }
+  const stats = tracker.statsBySession[sessionID]!
+
+  const actualTokens = info.tokens.output + info.tokens.reasoning
+  const firstDelta = tracker.firstDeltaByMessage[info.id]
+  const lastDelta = tracker.lastDeltaByMessage[info.id]
+  const generationMs = firstDelta !== undefined && lastDelta !== undefined
+    ? Math.max(lastDelta - firstDelta, MIN_DURATION_MS) : 0
+
+  if (actualTokens > 0 && generationMs > 0) {
+    stats.totalOutputTokens += actualTokens
+    stats.totalDurationMs += generationMs
+
+    const estimated = tracker.estimatedTokensByMessage[info.id] ?? 0
+    if (estimated > 0) {
+      const ratio = Math.min(Math.max(actualTokens / estimated, 0.3), 3.0)
+      stats.calibrationRatios = [...stats.calibrationRatios, ratio].slice(-MAX_CALIBRATION_RATIOS)
+    }
+  }
+
+  delete tracker.estimatedTokensByMessage[info.id]
+  delete tracker.firstDeltaByMessage[info.id]
+  delete tracker.lastDeltaByMessage[info.id]
+  delete tracker.messageCreatedAt[info.id]
+  delete tracker.activeMessageBySession[sessionID]
+  delete tracker.samplesBySession[sessionID]
+  core.setThinking(sessionID, false)
+}
+
+function MeterDisplay(props: {
+  requestRender: () => void
+  sessionID: string | undefined
+  tracker: TrackerState
+  config: ResolvedConfig
+  palette: Palette
+  spinnerCells: () => { glyph: string; color: RGBA }[]
+  subscribe: (listener: Listener) => () => void
+}) {
+  let particleRef: TextRenderable | undefined
+  let tpsRef: TextRenderable | undefined
+  let avgRef: TextRenderable | undefined
+  let ttftRef: TextRenderable | undefined
+  const p = props.palette
+
+  const sync = () => {
+    const stats = props.tracker.statsBySession[props.sessionID]
+    const calibration = calibrationFactor(stats?.calibrationRatios ?? [])
+    const samples = props.tracker.samplesBySession[props.sessionID] ?? []
+    const now = Date.now()
+    const live = calculateLiveTps(samples, now, calibration)
+    const avg = stats && stats.totalDurationMs > 0 ? stats.totalOutputTokens / (stats.totalDurationMs / 1000) : undefined
+    const ttft = props.tracker.liveTtftBySession[props.sessionID]
+    const thinkingNow = props.tracker.thinkingBySession[props.sessionID] === true && props.config.spinner.enabled
+    if (particleRef) {
+      if (thinkingNow) {
+        const cells = props.spinnerCells()
+        particleRef.content = " " + cells.map((c) => c.glyph).join("")
+        particleRef.fg = cells[0]?.color ?? p.muted
+      } else {
+        particleRef.content = ""
+      }
+    }
+    if (tpsRef) {
+      tpsRef.content = live !== undefined ? formatTps(live) ?? "--" : "--"
+      tpsRef.fg = live !== undefined ? tpsColor(live, props.config.tps, p) : p.muted
+    }
+    if (avgRef) {
+      avgRef.content = avg !== undefined ? formatTps(avg) ?? "--" : "--"
+      avgRef.fg = avg !== undefined ? tpsColor(avg, props.config.tps, p) : p.muted
+    }
+    if (ttftRef) {
+      ttftRef.content = ttft !== undefined ? formatTtft(ttft) ?? "--" : "--"
+      ttftRef.fg = ttft !== undefined ? ttftColor(ttft, props.config.ttft, p) : p.muted
+    }
+    props.requestRender()
+  }
+
+  const unsubscribe = props.subscribe(sync)
+  onCleanup(unsubscribe)
+
+  return (
+    <box flexDirection="row" alignItems="center">
+      <text fg={p.muted}>TPS </text>
+      <text ref={(el: TextRenderable) => { tpsRef = el; sync() }} fg={p.muted}>--</text>
+      <text fg={p.muted}> | AVG </text>
+      <text ref={(el: TextRenderable) => { avgRef = el; sync() }} fg={p.muted}>--</text>
+      <text fg={p.muted}> | TTFT </text>
+      <text ref={(el: TextRenderable) => { ttftRef = el; sync() }} fg={p.muted}>--</text>
+      <text ref={(el: TextRenderable) => { particleRef = el; sync() }} fg={p.muted}></text>
+    </box>
+  )
+}
+
+const tui: TuiPlugin = async (api, options) => {
+  const config = resolveConfig(options)
+  const core = createMeterCore(config, api.theme.current.textMuted)
+  const { tracker, bump, subscribe, spinnerCells, setThinking, clearSessionLive } = core
 
   const onTextDelta = api.event.on("session.next.text.delta", (evt) => {
     tracker.useV2Events = true
@@ -354,43 +454,10 @@ const tui: TuiPlugin = async (api, options) => {
     }
 
     const sessionID = info.sessionID ?? evt.properties.sessionID
-    if (!tracker.statsBySession[sessionID]) {
-      tracker.statsBySession[sessionID] = { totalOutputTokens: 0, totalDurationMs: 0, calibrationRatios: [] }
-    }
-    const stats = tracker.statsBySession[sessionID]!
-
-    const actualTokens = info.tokens.output + info.tokens.reasoning
-    const firstDelta = tracker.firstDeltaByMessage[info.id]
-    const lastDelta = tracker.lastDeltaByMessage[info.id]
-    const generationMs = firstDelta !== undefined && lastDelta !== undefined
-      ? Math.max(lastDelta - firstDelta, MIN_DURATION_MS) : 0
-
-    if (actualTokens > 0 && generationMs > 0) {
-      stats.totalOutputTokens += actualTokens
-      stats.totalDurationMs += generationMs
-
-      const estimated = tracker.estimatedTokensByMessage[info.id] ?? 0
-      if (estimated > 0) {
-        const ratio = Math.min(Math.max(actualTokens / estimated, 0.3), 3.0)
-        stats.calibrationRatios = [...stats.calibrationRatios, ratio].slice(-MAX_CALIBRATION_RATIOS)
-      }
-    }
-
-    delete tracker.estimatedTokensByMessage[info.id]
-    delete tracker.firstDeltaByMessage[info.id]
-    delete tracker.lastDeltaByMessage[info.id]
-    delete tracker.messageCreatedAt[info.id]
-    delete tracker.activeMessageBySession[sessionID]
-    delete tracker.samplesBySession[sessionID]
-    setThinking(sessionID, false)
+    recordMessageCompleted(core, { id: info.id, sessionID, tokens: info.tokens })
     bump()
   })
 
-  const clearSessionLive = (sessionID: string) => {
-    delete tracker.samplesBySession[sessionID]
-    setThinking(sessionID, false)
-  }
-
   const onToolInputStarted = api.event.on("session.next.tool.input.started", (evt) => {
     clearSessionLive(evt.properties.sessionID)
     bump()
@@ -419,7 +486,7 @@ const tui: TuiPlugin = async (api, options) => {
     onTextDelta(); onReasoningDelta(); onPartDelta()
     onMessageUpdated(); onToolInputStarted(); onPartUpdated()
     clearInterval(timer)
-    if (spinnerTimer) clearInterval(spinnerTimer)
+    core.dispose()
   })
 
   api.slots.register({
@@ -427,11 +494,11 @@ const tui: TuiPlugin = async (api, options) => {
       session_prompt_right(_ctx, value) {
         return (
           <MeterDisplay
-            api={api}
+            requestRender={() => api.renderer.requestRender()}
             sessionID={value.session_id}
             tracker={tracker}
             config={config}
-            muted={muted}
+            palette={v1Palette(api.theme.current)}
             spinnerCells={spinnerCells}
             subscribe={subscribe}
           />
@@ -441,5 +508,95 @@ const tui: TuiPlugin = async (api, options) => {
   })
 }
 
-const plugin: TuiPluginModule & { id: string } = { id: "opencode-tps-meter", tui }
+const setup = async (ctx: V2Context): Promise<() => void> => {
+  const config = resolveConfig(ctx.options as PluginOptions | undefined)
+  const core = createMeterCore(config, ctx.theme.text.muted)
+  const { tracker, bump, subscribe, spinnerCells, setThinking, clearSessionLive } = core
+
+  const unsubs: (() => void)[] = []
+  const on = (type: string, handler: (event: V2Event) => void) => {
+    unsubs.push(ctx.data.on(type, handler))
+  }
+
+  on("session.step.started", (evt) => {
+    tracker.messageCreatedAt[evt.data.assistantMessageID] = evt.data.started
+  })
+
+  const onDelta = (thinking: boolean) => (evt: V2Event) => {
+    const { sessionID, assistantMessageID, delta } = evt.data
+    recordDelta(tracker, sessionID, assistantMessageID, evt.created, delta)
+    setThinking(sessionID, thinking)
+    bump()
+  }
+  on("session.text.delta", onDelta(false))
+  on("session.reasoning.delta", onDelta(true))
+
+  on("session.step.ended", (evt) => {
+    const { sessionID, assistantMessageID, tokens } = evt.data
+    if (tokens) recordMessageCompleted(core, { id: assistantMessageID, sessionID, tokens })
+    bump()
+  })
+
+  on("session.step.failed", (evt) => {
+    const { sessionID, assistantMessageID } = evt.data
+    delete tracker.messageCreatedAt[assistantMessageID]
+    delete tracker.estimatedTokensByMessage[assistantMessageID]
+    delete tracker.firstDeltaByMessage[assistantMessageID]
+    delete tracker.lastDeltaByMessage[assistantMessageID]
+    clearSessionLive(sessionID)
+    bump()
+  })
+
+  on("session.tool.input.started", (evt) => {
+    clearSessionLive(evt.data.sessionID)
+    bump()
+  })
+
+  const timer = setInterval(() => {
+    const now = Date.now()
+    const cutoff = now - WINDOW_MS
+    for (const [sid, samples] of Object.entries(tracker.samplesBySession)) {
+      const pruned = samples.filter((s) => s.at >= cutoff)
+      if (pruned.length > 0) tracker.samplesBySession[sid] = pruned
+      else delete tracker.samplesBySession[sid]
+    }
+    bump()
+  }, 1000)
+
+  const opts = (ctx.options ?? {}) as { slot?: string }
+  const slotPath = typeof opts.slot === "string" && opts.slot ? opts.slot : "prompt.footer.status"
+
+  ctx.ui.slot({
+    append: slotPath,
+    render(input) {
+      const sessionID = input.sessionID ?? (() => {
+        const r = ctx.ui.router.current()
+        return r.type === "session" ? r.sessionID : undefined
+      })()
+      return (
+        <MeterDisplay
+          requestRender={() => ctx.renderer.requestRender()}
+          sessionID={sessionID}
+          tracker={tracker}
+          config={config}
+          palette={v2Palette(ctx.theme)}
+          spinnerCells={spinnerCells}
+          subscribe={subscribe}
+        />
+      )
+    },
+  })
+
+  return () => {
+    for (const u of unsubs) u()
+    clearInterval(timer)
+    core.dispose()
+  }
+}
+
+const plugin: TuiPluginModule & { id: string; setup: typeof setup } = {
+  id: "opencode-tps-meter",
+  tui,
+  setup,
+}
 export default plugin