opencode-tui-stats 0.3.0 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-tui-stats",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "OpenCode 1 TUI plugin that shows live TPS, average TPS, and average time to first token in the session prompt.",
   "type": "module",
   "exports": {

package/tracker.ts

@@ -41,6 +41,8 @@ export type ModelAggregate = {
   totalDurationMs: number
   totalTtftMs: number
   stepCount: number
+  /** Last time this model was observed in this session (merged with `max` across a subtree). */
+  lastAt: number
 }
 
 export type SessionModels = {
@@ -60,6 +62,8 @@ export type Tracker = {
   stats: Record<string, SessionStats>
   dedup: Record<string, Set<string>>
   models: Record<string, SessionModels>
+  /** `sessionID -> parentID`; a key that is present with an `undefined` value is a confirmed root. */
+  parentOf: Record<string, string | undefined>
 }
 
 const STREAM_WINDOW_MS = 5_000
@@ -72,6 +76,8 @@ const DEDUP_WINDOW_LIMIT = 64
 /** Cap on `messageID -> model` entries retained per session (FIFO). */
 const MESSAGE_MODEL_LIMIT = 256
 const SESSION_LIMIT = 64
+/** Maximum number of descendant sessions folded into one panel (cycle-safe traversal bound). */
+const SUBTREE_LIMIT = 64
 /** Maximum number of model rows rendered in the sidebar panel. */
 export const MODEL_ROW_LIMIT = 4
 
@@ -89,6 +95,7 @@ function emptyAggregate(): ModelAggregate {
     totalDurationMs: 0,
     totalTtftMs: 0,
     stepCount: 0,
+    lastAt: 0,
   }
 }
 
@@ -145,7 +152,8 @@ export function cacheText(stats: { cacheRead: number; cachePrompt: number } | un
 
 export function costText(stats: { cost: number; steps: number } | undefined) {
   if (!stats || stats.steps <= 0) return undefined
-  return `$${stats.cost >= 1 ? stats.cost.toFixed(2) : stats.cost.toFixed(4)}`
+  // Always four decimals so the cost column keeps a stable width as spend grows.
+  return `$${stats.cost.toFixed(4)}`
 }
 
 /** FIFO-bound a Set so it never grows past `limit`. */
@@ -172,6 +180,8 @@ export type ModelRow = {
   key: string
   label: string
   active: boolean
+  /** True when any descendant (subagent) session contributed data to this row. */
+  subagent?: boolean
   tps?: string
   avg?: string
   ttft?: string
@@ -221,7 +231,15 @@ export function getLastInternals(): TrackerInternals | undefined {
 }
 
 export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerHandle {
-  const tracker: Tracker = { samples: {}, timings: {}, averages: {}, stats: {}, dedup: {}, models: {} }
+  const tracker: Tracker = {
+    samples: {},
+    timings: {},
+    averages: {},
+    stats: {},
+    dedup: {},
+    models: {},
+    parentOf: {},
+  }
   const partDecisions = new Map<string, boolean>()
   const mounted = new Set<string>()
   const order: string[] = []
@@ -251,6 +269,7 @@ export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerH
     delete tracker.samples[sessionID]
     delete tracker.dedup[sessionID]
     delete tracker.models[sessionID]
+    delete tracker.parentOf[sessionID]
     clearTimings(sessionID)
   }
 
@@ -305,7 +324,7 @@ export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerH
   }
 
   /** Live rate restricted to samples attributed to `key` via the `messageID -> model` mapping. */
-  const liveRateFor = (sessionID: string, key: string) => {
+  const sessionLiveRate = (sessionID: string, key: string) => {
     const status = api.state.session.status(sessionID)
     if (!status || status.type === "idle") return undefined
 
@@ -321,34 +340,158 @@ export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerH
     return formatRate(tokens / (activeDuration(samples, now) / 1_000))
   }
 
-  const modelRows = (sessionID: string): ModelPanel => {
+  /** Fold a session's parent from `session.created`/`session.updated`, or lazily from state.
+   * A successful lookup is cached; an unknown session is retried on the next render. */
+  const resolveParent = (sessionID: string) => {
+    if (sessionID in tracker.parentOf) return
+    const info = api.state.session.get(sessionID)
+    if (!info) return
+    tracker.parentOf[sessionID] = info.parentID
+  }
+
+  const rememberParent = (sessionID: string, parentID: string | undefined) => {
+    if (sessionID in tracker.parentOf && tracker.parentOf[sessionID] === parentID) return
+    tracker.parentOf[sessionID] = parentID
+    bump()
+  }
+
+  const knownSessions = () => {
+    const ids = new Set<string>(Object.keys(tracker.models))
+    for (const id of Object.keys(tracker.stats)) ids.add(id)
+    for (const id of Object.keys(tracker.averages)) ids.add(id)
+    return ids
+  }
+
+  /** Breadth-first descendants of `sessionID` (excluding itself), cycle-safe and capped. */
+  const descendants = (sessionID: string) => {
+    const children = new Map<string, string[]>()
+    for (const [child, parent] of Object.entries(tracker.parentOf)) {
+      if (!parent) continue
+      const siblings = children.get(parent)
+      if (siblings) siblings.push(child)
+      else children.set(parent, [child])
+    }
+
+    const seen = new Set<string>([sessionID])
+    const found: string[] = []
+    const queue = [sessionID]
+    while (queue.length > 0 && found.length < SUBTREE_LIMIT) {
+      const current = queue.shift()!
+      for (const child of children.get(current) ?? []) {
+        if (seen.has(child)) continue
+        seen.add(child)
+        found.push(child)
+        queue.push(child)
+        if (found.length >= SUBTREE_LIMIT) break
+      }
+    }
+    return found
+  }
+
+  const mergeAggregate = (target: ModelAggregate, source: ModelAggregate) => {
+    target.cacheRead += source.cacheRead
+    target.cachePrompt += source.cachePrompt
+    target.cost += source.cost
+    target.steps += source.steps
+    target.totalTokens += source.totalTokens
+    target.totalDurationMs += source.totalDurationMs
+    target.totalTtftMs += source.totalTtftMs
+    target.stepCount += source.stepCount
+    target.lastAt = Math.max(target.lastAt, source.lastAt)
+  }
+
+  const sessionModelAt = (sessionID: string) => {
     const models = tracker.models[sessionID]
+    if (!models) return 0
+    let at = 0
+    for (const key of models.order) {
+      const aggregate = models.aggregates[key]
+      if (aggregate && aggregate.lastAt > at) at = aggregate.lastAt
+    }
+    return at
+  }
+
+  /** Live rate for a merged row: the parent and its subagents share one row, so only the
+   * session/model pair that most recently saw activity contributes. Concurrent streams in a
+   * parent and a child are therefore approximated by the newer one instead of being summed. */
+  const liveRateFor = (sessions: string[], key: string) => {
+    let latest: { sessionID: string; at: number } | undefined
+    for (const sessionID of sessions) {
+      const aggregate = tracker.models[sessionID]?.aggregates[key]
+      if (!aggregate) continue
+      if (!latest || aggregate.lastAt >= latest.at) latest = { sessionID, at: aggregate.lastAt }
+    }
+    if (!latest) return undefined
+    return sessionLiveRate(latest.sessionID, key)
+  }
+
+  const modelRows = (sessionID: string): ModelPanel => {
+    // Link sessions that only announced themselves through message events (a child can stream
+    // before its `session.created` event is delivered).
+    for (const id of knownSessions()) resolveParent(id)
+
+    const subtree = [sessionID, ...descendants(sessionID)]
     const retries = tracker.stats[sessionID]?.retries ?? 0
-    const cache = cacheText(tracker.stats[sessionID])
-    if (!models) return { rows: [], overflow: 0, retries, cache }
 
-    const active = models.active
+    // Session CACHE uses the same subtree scope as the model rows.
+    let cacheRead = 0
+    let cachePrompt = 0
+    for (const id of subtree) {
+      const stats = tracker.stats[id]
+      if (!stats) continue
+      cacheRead += stats.cacheRead
+      cachePrompt += stats.cachePrompt
+    }
+    const cache = cacheText({ cacheRead, cachePrompt })
+
+    // Fold the subtree oldest→newest so `order` keeps its "oldest first" meaning across sessions.
+    const sessions = subtree
+      .filter((id) => tracker.models[id])
+      .sort((left, right) => sessionModelAt(left) - sessionModelAt(right))
+    if (sessions.length === 0) return { rows: [], overflow: 0, retries, cache }
+
+    const order: string[] = []
+    const aggregates: Record<string, ModelAggregate> = {}
+    const subagentModels = new Set<string>()
+    for (const id of sessions) {
+      const models = tracker.models[id]
+      for (const key of models.order) {
+        const aggregate = models.aggregates[key]
+        if (!aggregate) continue
+        let merged = aggregates[key]
+        if (!merged) {
+          merged = emptyAggregate()
+          aggregates[key] = merged
+          order.push(key)
+        }
+        mergeAggregate(merged, aggregate)
+        if (id !== sessionID) subagentModels.add(key)
+      }
+    }
+
+    let active: string | undefined
+    for (const id of sessions) active = tracker.models[id].active ?? active
+
     // `order` is oldest→newest; reverse for most-recent-first ordering of the non-active rows.
-    const recency = [...models.order].reverse().filter((key) => key in models.aggregates)
-    const ordered =
-      active && active in models.aggregates ? [active, ...recency.filter((key) => key !== active)] : recency
+    const recency = [...order].reverse()
+    const ordered = active && active in aggregates ? [active, ...recency.filter((key) => key !== active)] : recency
 
     const visible = ordered.slice(0, MODEL_ROW_LIMIT)
     const overflow = Math.max(0, ordered.length - visible.length)
 
     const rows = visible.map<ModelRow>((key) => {
-      const aggregate = models.aggregates[key]
+      const aggregate = aggregates[key]
       const isActive = key === active
-      const cost = costText(aggregate)
       return {
         key,
         label: key,
         active: isActive,
-        tps: isActive ? liveRateFor(sessionID, key) : undefined,
+        subagent: subagentModels.has(key),
+        tps: isActive ? liveRateFor(subtree, key) : undefined,
         avg: averageRate(aggregate),
         ttft: averageTtft(aggregate),
         cache: cacheText(aggregate),
-        cost: cost === undefined ? undefined : cost,
+        cost: costText(aggregate),
       }
     })
 
@@ -393,6 +536,7 @@ export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerH
         tracker.models[sessionID] ?? (tracker.models[sessionID] = { order: [], aggregates: {}, messageModels: new Map() })
       touchModel(models, key)
       models.active = key
+      models.aggregates[key] = { ...models.aggregates[key], lastAt: Date.now() }
       boundedSet(models.messageModels, info.id, key, MESSAGE_MODEL_LIMIT)
 
       if (!info.time.completed) {
@@ -527,6 +671,19 @@ export function createTracker(api: TuiPluginApi, onChange: () => void): TrackerH
     }),
   )
 
+  // Subagent sessions announce their parent here; the tree is also backfilled lazily from state.
+  listeners.push(
+    api.event.on("session.created", (event) => {
+      rememberParent(event.properties.info.id, event.properties.info.parentID)
+    }),
+  )
+
+  listeners.push(
+    api.event.on("session.updated", (event) => {
+      rememberParent(event.properties.info.id, event.properties.info.parentID)
+    }),
+  )
+
   // The 1s tick re-evaluates live TPS staleness and prunes stale stream samples.
   const timer = setInterval(() => {
     prune()

package/tui.tsx

@@ -9,7 +9,40 @@ import {
   type TrackerHandle,
 } from "./tracker"
 
-/** A single model row: fold marker + summary line, plus a detail line when expanded. */
+/** Detail lines sit three cells in from the fold marker, visually owned by the row above. */
+const DETAIL_INDENT = "   "
+/** Fixed cells keep every label on the same column across rows without measuring the panel. */
+const RATE_CELL = 4
+const TTFT_CELL = 6
+const CACHE_CELL = 4
+
+/** Split `provider/model` so the provider can be muted. Model ids may contain slashes, so only the
+ * first slash separates the provider. When the model already starts with the provider name
+ * (`deepseek/deepseek-flash`) the redundant prefix is dropped. */
+function splitLabel(label: string) {
+  const slash = label.indexOf("/")
+  if (slash <= 0) return { provider: "", model: label }
+  const provider = label.slice(0, slash)
+  const model = label.slice(slash + 1)
+  if (model.toLowerCase().startsWith(provider.toLowerCase())) return { provider: "", model }
+  return { provider: `${provider}/`, model }
+}
+
+function rateCell(value: string | undefined) {
+  return value === undefined ? "—" : `${value.padStart(RATE_CELL)}t/s`
+}
+
+function ttftCell(value: string | undefined) {
+  return (value ?? "—").padEnd(TTFT_CELL)
+}
+
+function cacheCell(value: string | undefined) {
+  if (value === undefined) return "—".padStart(CACHE_CELL)
+  const percent = value.endsWith("%") ? value.slice(0, -1) : value
+  return `${percent.padStart(3)}%`
+}
+
+/** A single model row: fold marker + summary line, plus its detail lines when expanded. */
 function ModelRowView(props: { api: TuiPluginApi; row: ModelRow; expanded: boolean; onToggle: () => void }) {
   // Guard against a drag-select being read as a click: only toggle when the press and the
   // release land on the same cell.
@@ -27,29 +60,37 @@ function ModelRowView(props: { api: TuiPluginApi; row: ModelRow; expanded: boole
   }
 
   const theme = () => props.api.theme.current
+  const parts = () => splitLabel(props.row.label)
 
   return (
     <box flexDirection="column" onMouseDown={handleMouseDown} onMouseUp={handleMouseUp}>
       <text wrapMode="none" truncate>
         <span style={{ fg: theme().textMuted } as Record<string, unknown>}>{`${props.expanded ? "▼" : "▶"} `}</span>
-        <span style={{ fg: theme().text } as Record<string, unknown>}>{props.row.label}</span>
-        <Show when={props.row.active}>
-          <span style={{ fg: theme().success } as Record<string, unknown>}>{"   active"}</span>
+        <Show when={props.row.subagent}>
+          <span style={{ fg: theme().textMuted } as Record<string, unknown>}>{"↳ "}</span>
+        </Show>
+        <Show when={parts().provider}>
+          <span style={{ fg: theme().textMuted } as Record<string, unknown>}>{parts().provider}</span>
         </Show>
+        <span style={{ fg: theme().text } as Record<string, unknown>}>{parts().model}</span>
       </text>
       <Show when={props.expanded}>
-        <text fg={theme().text} wrapMode="none" truncate>
-          {`TPS ${props.row.tps ?? "—"} · AVG ${props.row.avg ?? "—"}`}
+        <text fg={theme().textMuted} wrapMode="none" truncate>
+          {`${DETAIL_INDENT}AVG ${rateCell(props.row.avg)}${
+            props.row.tps === undefined ? "" : ` · TPS ${rateCell(props.row.tps)}`
+          }`}
         </text>
-        <text fg={theme().text} wrapMode="none" truncate>
-          {`TTFT ${props.row.ttft ?? "—"} · CACHE ${props.row.cache ?? "—"} · ${props.row.cost ?? "—"}`}
+        <text fg={theme().textMuted} wrapMode="none" truncate>
+          {`${DETAIL_INDENT}TTFT ${ttftCell(props.row.ttft)} · CACHE ${cacheCell(props.row.cache)} · ${
+            props.row.cost ?? "—"
+          }`}
         </text>
       </Show>
     </box>
   )
 }
 
-/** Per-session model panel, mounted at `sidebar_content`. */
+/** Per-session model panel, mounted at `sidebar_footer`. */
 function ModelPanelView(props: {
   api: TuiPluginApi
   sessionID: string
@@ -112,9 +153,13 @@ function ModelPanelView(props: {
 
   return (
     <box flexDirection="column">
-      <text fg={props.api.theme.current.textMuted}>Performance · observed</text>
+      <text fg={props.api.theme.current.text} wrapMode="none" truncate>
+        <b>Performance · observed</b>
+      </text>
       <Show when={panel().rows.length === 0}>
-        <text fg={props.api.theme.current.textMuted}>—</text>
+        <text fg={props.api.theme.current.textMuted} wrapMode="none" truncate>
+          —
+        </text>
       </Show>
       <For each={panel().rows}>
         {(row) => (
@@ -122,9 +167,11 @@ function ModelPanelView(props: {
         )}
       </For>
       <Show when={panel().overflow > 0}>
-        <text fg={props.api.theme.current.textMuted}>{`+${panel().overflow} more models`}</text>
+        <text fg={props.api.theme.current.textMuted} wrapMode="none" truncate>
+          {`+${panel().overflow} more models`}
+        </text>
       </Show>
-      <text fg={props.api.theme.current.text}>
+      <text fg={props.api.theme.current.textMuted} wrapMode="none" truncate>
         {`Session CACHE ${panel().cache ?? "—"}${panel().retries > 0 ? ` · retries ${panel().retries}` : ""}`}
       </text>
     </box>
@@ -139,7 +186,7 @@ const tui: TuiPlugin = async (api) => {
 
   api.slots.register({
     slots: {
-      sidebar_content(_context, props) {
+      sidebar_footer(_context, props) {
         return <ModelPanelView api={api} sessionID={props.session_id} tracker={tracker} revision={revision} />
       },
     },