oc-metricboard 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-metricboard",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "OpenCode TUI sidebar plugin showing real-time LLM metrics (TPS, TTFT, tokens) with sub-agent × model breakdown",
   "keywords": [
     "opencode",

package/src/collector.ts

@@ -1,6 +1,6 @@
 import type { TuiPluginApi } from "@opencode-ai/plugin/tui"
 import type { BarConfig, CacheReadCompleteness, MetricsAggregate, MetricsScope, ModelMetrics, RequestMetrics } from "./types"
-import { getDisplayInputTokens, getDisplayOutputTokens, gateTtft, getTtft } from "./metrics"
+import { getDisplayInputTokens, getDisplayOutputTokens, getTtft } from "./metrics"
 import { registerEventHandlers } from "./event-handlers"
 import type { CollectorState } from "./collector-state"
 import type { MetricsEventApi } from "./event-bus"
@@ -352,7 +352,15 @@ export function createCollector(
 
       const cacheReadCompleteness: CacheReadCompleteness =
         exactCacheCount === 0 ? "unknown" : exactCacheCount === metrics.length ? "exact" : "partial"
-      const ttft = firstTokenTime === null ? null : gateTtft(firstTokenTime - requestStartTime)
+      // Model rows use the same turn-level TTFT as the main aggregate: the
+      // earliest gated turn TTFT across the group's sessions, falling back to
+      // per-request TTFT when no turn timing exists (e.g. sub-agent sessions
+      // whose turn start coincides with their first request).
+      let ttft: number | null = null
+      for (const m of metrics) {
+        const candidate = getTurnTtft(state.turns.get(m.sessionID), getTtft(m))
+        if (candidate !== null && (ttft === null || candidate < ttft)) ttft = candidate
+      }
 
       // Live TPS for this model group
       let liveTps = 0
@@ -551,10 +559,7 @@ export function createCollector(
       // collapse to ~0). Anchor TTFT to the turn's user message instead —
       // stable across all steps within a turn, refreshed on each new turn.
       // Falls back to the per-request measurement when no turn timing exists.
-      const turnTtft = foregroundTurn?.firstTokenTime != null
-        ? gateTtft(foregroundTurn.firstTokenTime - foregroundTurn.turnStartTime)
-        : null
-      const ttft = turnTtft ?? (foregroundRequest ? getTtft(foregroundRequest) : null)
+      const ttft = getTurnTtft(foregroundTurn, foregroundRequest ? getTtft(foregroundRequest) : null)
 
       const result: MetricsAggregate = {
         sessionIDs: contributingSessionIDs.length > 0 ? contributingSessionIDs : [rootID],

package/src/turn-state.ts

@@ -1,4 +1,4 @@
-import { getDisplayInputTokens, getDisplayOutputTokens } from "./metrics"
+import { gateTtft, getDisplayInputTokens, getDisplayOutputTokens } from "./metrics"
 import type { RequestMetrics, TurnMetrics } from "./types"
 
 export function createTurnMetrics(sessionID: string, now: number): TurnMetrics {
@@ -94,3 +94,17 @@ export function completeTurn(turn: TurnMetrics, now: number): void {
 export function recordTurnFirstToken(turn: TurnMetrics, now: number): void {
   if (turn.firstTokenTime === null) turn.firstTokenTime = now
 }
+
+/**
+ * Turn-level TTFT (user message → first token), gated. Falls back to the
+ * supplied per-request TTFT when the turn has no first-token timing. This is
+ * the ONLY meaningful TTFT observable from opencode's event stream for
+ * intra-turn steps, so every TTFT display path should prefer it.
+ */
+export function getTurnTtft(turn: TurnMetrics | undefined, fallback: number | null = null): number | null {
+  if (turn?.firstTokenTime != null) {
+    const gated = gateTtft(turn.firstTokenTime - turn.turnStartTime)
+    if (gated !== null) return gated
+  }
+  return fallback
+}