@tinkink/oc-tps 1.0.0 → 1.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@tinkink/oc-tps",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Temporary OpenCode 2 fork of Tarquinen/oc-tps: live TPS, average TPS, and average TTFT in the session prompt.",
   "repository": {
     "type": "git",

package/tui.tsx

@@ -1,6 +1,7 @@
 /** @jsxImportSource @opentui/solid */
 import { Plugin } from "@opencode/plugin/tui"
-import { createMemo, createSignal, type Accessor } from "solid-js"
+import { onCleanup } from "solid-js"
+import type { TextRenderable } from "@opentui/core"
 
 type StreamSample = {
   at: number
@@ -63,42 +64,63 @@ function activeDuration(samples: StreamSample[], tailAt?: number) {
   return Math.max(duration, SINGLE_SAMPLE_MS)
 }
 
+function statusText(context: Plugin.Context, sessionID: string, tracker: Tracker) {
+  const totals = tracker.averages[sessionID]
+  const average = totals ? formatRate(totals.totalTokens / (totals.totalDurationMs / 1_000)) : undefined
+  const ttft = totals?.stepCount ? formatTtft(totals.totalTtftMs / totals.stepCount / 1_000) : undefined
+
+  let live: string | undefined
+  if (context.data.session.status(sessionID) === "running") {
+    const now = Date.now()
+    const samples = (tracker.samples[sessionID] ?? []).filter((sample) => now - sample.at <= STREAM_WINDOW_MS)
+    const last = samples[samples.length - 1]
+    if (last && now - last.at <= LIVE_STALE_MS) {
+      const tokens = samples.reduce((sum, sample) => sum + sample.tokens, 0)
+      live = formatRate(tokens / (activeDuration(samples, now) / 1_000))
+    }
+  }
+
+  return `TPS ${live ?? "-"} | AVG ${average ?? "-"} | TTFT ${ttft ?? "-"}`
+}
+
+/**
+ * Renders into `prompt.footer` by writing the text renderable directly.
+ *
+ * A published CLI plugin is installed under `node_modules`, where OpenCode does
+ * not inject its own `solid-js`/`@opentui/solid` runtime. The plugin therefore
+ * runs against its own Solid copy, so signal/memo updates never reach the host
+ * render loop and the footer would stay frozen at its first value. Driving the
+ * renderable and calling `requestRender()` keeps the display live regardless of
+ * which Solid instance the plugin was loaded with.
+ */
 function Status(props: {
   context: Plugin.Context
   sessionID: string
   tracker: Tracker
-  revision: Accessor<number>
+  register: (paint: () => void) => () => void
 }) {
-  const content = createMemo(() => {
-    props.revision()
-    const totals = props.tracker.averages[props.sessionID]
-    const average = totals
-      ? formatRate(totals.totalTokens / (totals.totalDurationMs / 1_000))
-      : undefined
-    const ttft = totals?.stepCount
-      ? formatTtft(totals.totalTtftMs / totals.stepCount / 1_000)
-      : undefined
-
-    let live: string | undefined
-    if (props.context.data.session.status(props.sessionID) === "running") {
-      const now = Date.now()
-      const samples = (props.tracker.samples[props.sessionID] ?? []).filter(
-        (sample) => now - sample.at <= STREAM_WINDOW_MS,
-      )
-      const last = samples[samples.length - 1]
-      if (last && now - last.at <= LIVE_STALE_MS) {
-        const tokens = samples.reduce((sum, sample) => sum + sample.tokens, 0)
-        live = formatRate(tokens / (activeDuration(samples, now) / 1_000))
-      }
-    }
+  let text: TextRenderable | undefined
+
+  const paint = () => {
+    if (!text) return
+    text.content = statusText(props.context, props.sessionID, props.tracker)
+    props.context.renderer.requestRender()
+  }
 
-    return `TPS ${live ?? "-"} | AVG ${average ?? "-"} | TTFT ${ttft ?? "-"}`
-  })
+  const unregister = props.register(paint)
+  onCleanup(unregister)
 
   return (
     <box position="absolute" right={2} bottom={2} height={1} flexDirection="row">
-      <text fg={props.context.theme.text.muted} flexShrink={0}>
-        {content()}
+      <text
+        ref={(element) => {
+          text = element as unknown as TextRenderable
+          paint()
+        }}
+        fg={props.context.theme.text.muted}
+        flexShrink={0}
+      >
+        {statusText(props.context, props.sessionID, props.tracker)}
       </text>
     </box>
   )
@@ -113,8 +135,15 @@ export default Plugin.define({
       timings: {},
       averages: {},
     }
-    const [revision, setRevision] = createSignal(0)
-    const bump = () => setRevision((value) => value + 1)
+
+    let painter: (() => void) | undefined
+    const bump = () => painter?.()
+    const register = (paint: () => void) => {
+      painter = paint
+      return () => {
+        if (painter === paint) painter = undefined
+      }
+    }
 
     const clearLive = (sessionID: string) => {
       if (!tracker.samples[sessionID]) return
@@ -221,7 +250,14 @@ export default Plugin.define({
       append: "prompt.footer",
       render: (props) => {
         if (!props.sessionID || props.mode !== "normal") return null
-        return <Status context={context} sessionID={props.sessionID} tracker={tracker} revision={revision} />
+        return (
+          <Status
+            context={context}
+            sessionID={props.sessionID}
+            tracker={tracker}
+            register={register}
+          />
+        )
       },
     })