opencode-cache-hit 0.2.0 → 0.2.2

package/src/timeline/collector.ts

@@ -1,6 +1,6 @@
 import type { TimelineConfig } from "../plugin-config.ts"
 import type { AssistantMessage } from "../types.ts"
-import { buildCallRecords, mergeAndSortRecords } from "./records.ts"
+import { assistantMessageToRecord } from "./records.ts"
 import {
   appendTimelineRecord,
   localDateKey,
@@ -10,10 +10,9 @@ import {
 } from "./writer.ts"
 import type { LlmCallRecord } from "./types.ts"
 
-export const TIMELINE_DEBOUNCE_MS = 500
-
 export type TimelineCollector = {
-  schedule: () => void
+  /** Process a single message from a message.updated event. */
+  handleMessage: (sessionID: string, msg: AssistantMessage) => void
   resetForRootChange: () => void
   dispose: () => void
   memoryRecords: () => readonly LlmCallRecord[]
@@ -23,13 +22,12 @@ export function createTimelineCollector(opts: {
   config: TimelineConfig
   getRootSessionId: () => string
   getChildIds: () => readonly string[]
-  getMessages: (sessionId: string) => readonly AssistantMessage[]
   /** Test hook: replace disk append */
   append?: (logPath: string, record: LlmCallRecord) => Promise<void>
 }): TimelineCollector {
   if (!opts.config.enabled) {
     return {
-      schedule: () => {},
+      handleMessage: () => {},
       resetForRootChange: () => {},
       dispose: () => {},
       memoryRecords: () => [],
@@ -51,106 +49,61 @@ export function createTimelineCollector(opts: {
       maxLogFiles: opts.config.maxLogFiles,
     })
   }
-  const flushedKeys = new Set<string>()
+
   let activeDateKey = localDateKey()
-  let debounceTimer: ReturnType<typeof setTimeout> | undefined
   let memory: LlmCallRecord[] = []
-  let collectGen = 0
+  let disposed = false
 
   const ensureDateKey = () => {
     const today = localDateKey()
     if (today !== activeDateKey) {
-      flushedKeys.clear()
       activeDateKey = today
     }
     return today
   }
 
-  const clearDebounce = () => {
-    if (debounceTimer !== undefined) clearTimeout(debounceTimer)
-    debounceTimer = undefined
-  }
-
-  const shouldFlushToDisk = (rec: LlmCallRecord): boolean => {
-    if (flushedKeys.has(rec.messageKey)) return false
-    if (rec.isComplete) return true
-    return opts.config.flushIncomplete
-  }
-
-  const flushRecords = async (records: LlmCallRecord[], rootId: string, gen: number) => {
-    const logPath = timelineDailyLogPath(logsDir, ensureDateKey())
-    for (const rec of records) {
-      if (gen !== collectGen || opts.getRootSessionId() !== rootId) return
-      if (!shouldFlushToDisk(rec)) continue
-      flushedKeys.add(rec.messageKey)
-      try {
-        await append(logPath, rec)
-      } catch {
-        flushedKeys.delete(rec.messageKey)
-      }
-    }
-  }
-
-  const collectNow = () => {
-    clearDebounce()
+  const handleMessage = (sessionID: string, msg: AssistantMessage) => {
+    if (disposed) return
     const rootId = opts.getRootSessionId()
-    if (!rootId) {
-      memory = []
+    if (!rootId) return
+
+    let scope: "main" | "child"
+    if (sessionID === rootId) {
+      scope = "main"
+    } else if (opts.getChildIds().includes(sessionID)) {
+      scope = "child"
+    } else {
       return
     }
-    const gen = collectGen
-    const chunks: LlmCallRecord[][] = []
-    const mainMsgs = opts.getMessages(rootId)
-    if (mainMsgs.length) {
-      chunks.push(
-        buildCallRecords(rootId, rootId, "main", mainMsgs, {
-          logSummaryMessages: opts.config.logSummaryMessages,
-        }),
-      )
-    }
-    for (const cid of opts.getChildIds()) {
-      const msgs = opts.getMessages(cid)
-      if (msgs.length) {
-        chunks.push(
-          buildCallRecords(cid, rootId, "child", msgs, {
-            logSummaryMessages: opts.config.logSummaryMessages,
-          }),
-        )
-      }
-    }
-    if (gen !== collectGen || opts.getRootSessionId() !== rootId) return
-    memory = mergeAndSortRecords(chunks)
-    const toFlush = memory.filter(shouldFlushToDisk)
-    if (toFlush.length > 0) {
-      queueMicrotask(() => flushRecords(toFlush, rootId, gen))
-    }
-  }
 
-  const schedule = () => {
-    clearDebounce()
-    if (!opts.getRootSessionId()) return
-    debounceTimer = setTimeout(() => {
-      debounceTimer = undefined
-      collectNow()
-    }, TIMELINE_DEBOUNCE_MS)
-  }
+    if (msg.role !== "assistant") return
+    if (!opts.config.logSummaryMessages && msg.summary === true) return
 
-  const resetForRootChange = () => {
-    collectGen++
-    clearDebounce()
-    memory = []
-  }
+    const rec = assistantMessageToRecord(msg, sessionID, rootId, scope, Date.now())
+    if (!rec) return
+    if (!opts.config.flushIncomplete && !rec.isComplete) return
 
-  const dispose = () => {
-    collectGen++
-    clearDebounce()
-  }
+    const logPath = timelineDailyLogPath(logsDir, ensureDateKey())
+    void append(logPath, rec).catch(() => {})
 
-  const memoryRecords = () => {
+    memory.push(rec)
     const max = opts.config.maxMemoryRows
-    if (memory.length <= max) return memory
-    return memory.slice(-max)
+    while (memory.length > max) memory.shift()
   }
 
-  return { schedule, resetForRootChange, dispose, memoryRecords }
+  return {
+    handleMessage,
+    resetForRootChange: () => {
+      memory = []
+    },
+    dispose: () => {
+      disposed = true
+      memory = []
+    },
+    memoryRecords: () => {
+      const max = opts.config.maxMemoryRows
+      if (memory.length <= max) return memory
+      return memory.slice(-max)
+    },
+  }
 }

package/src/timeline/records.ts

@@ -25,18 +25,6 @@ export function messageKeyFor(msg: AssistantMessage, sessionId: string): string
   return `${sessionId}:${created}:${msg.modelID ?? ""}`
 }
 
-export function sortKeyForRecord(r: LlmCallRecord): number {
-  const ts = r.completedAt ?? r.created
-  return new Date(ts).getTime()
-}
-
-export function mergeAndSortRecords(chunks: readonly LlmCallRecord[][]): LlmCallRecord[] {
-  const all = chunks.flat()
-  const keyed = all.map(r => ({ r, k: sortKeyForRecord(r) }))
-  keyed.sort((a, b) => a.k - b.k)
-  return keyed.map(x => x.r)
-}
-
 export function assistantMessageToRecord(
   msg: AssistantMessage,
   sessionId: string,
@@ -72,21 +60,3 @@ export function assistantMessageToRecord(
   }
 }
 
-export function buildCallRecords(
-  sessionId: string,
-  rootSessionId: string,
-  scope: "main" | "child",
-  messages: readonly AssistantMessage[],
-  opts?: { logSummaryMessages?: boolean; recordedAt?: number },
-): LlmCallRecord[] {
-  const now = opts?.recordedAt ?? Date.now()
-  const logSummary = opts?.logSummaryMessages !== false
-  const out: LlmCallRecord[] = []
-  for (const msg of messages) {
-    if (!logSummary && msg.summary === true) continue
-    const rec = assistantMessageToRecord(msg, sessionId, rootSessionId, scope, now)
-    if (rec) out.push(rec)
-  }
-  return out
-}
-

package/src/tui-panel/README.md

@@ -36,7 +36,7 @@ export function MySidebar(props: { theme: Record<string, unknown> }) {
         open={open()}
         onToggle={() => setOpen((o) => !o)}
         title="My Panel"
-        version="0.1.0"
+        version="0.2.0"
       />
       <Show when={open()}>
         <Show
@@ -69,7 +69,7 @@ export function MySidebar(props: { theme: Record<string, unknown> }) {
 | `TuiPanel` | Outer border + padding |
 | `TuiPanelTitle` | Foldable title; optional `collapsed` summary |
 | `TuiSection` | `▼` section header + separator fill |
-| `TuiMetricRow` | Label left, value (+ unit) right |
+| `TuiMetricRow` | Label left, value (+ unit) right; optional `labelFg` / `valueFg` for split colors |
 | `TuiHitRow` | Hit bar + % + trend |
 | `computeHitBarWidth` | Dynamic bar width |
 

package/src/tui-panel/README.zh-CN.md

@@ -36,7 +36,7 @@ export function MySidebar(props: { theme: Record<string, unknown> }) {
         open={open()}
         onToggle={() => setOpen((o) => !o)}
         title="My Panel"
-        version="0.1.0"
+        version="0.2.0"
       />
       <Show when={open()}>
         <Show
@@ -69,7 +69,7 @@ export function MySidebar(props: { theme: Record<string, unknown> }) {
 | `TuiPanel` | 外框 + padding |
 | `TuiPanelTitle` | 可折叠标题；可选 `collapsed` 摘要 |
 | `TuiSection` | `▼` 区块标题 + 分隔线填充 |
-| `TuiMetricRow` | 左标签右数值（可选 unit） |
+| `TuiMetricRow` | 左标签右数值（可选 unit）；可选 `labelFg` / `valueFg` 分段上色 |
 | `TuiHitRow` | Hit 条 + % + 趋势 |
 | `computeHitBarWidth` | 动态进度条宽度 |
 

package/src/tui-panel/components.tsx

@@ -1,6 +1,6 @@
 /** @jsxImportSource @opentui/solid */
 import { Show, type JSX } from "solid-js"
-import { padBeforeTitleSummary, sepAfterPrefix, visualWidth } from "./layout.ts"
+import { padBeforeTitleSummary, sepAfterPrefix, UNIT_GAP, visualWidth } from "./layout.ts"
 import type { PanelLayout } from "./use-panel-layout.ts"
 import type { PanelPalette } from "./palette.ts"
 
@@ -126,18 +126,45 @@ export function TuiSection(props: {
   )
 }
 
+function metricRowGap(label: string, value: string, unit: string, gauge: number): number {
+  const used =
+    visualWidth(label) + visualWidth(value) + (unit ? visualWidth(unit) + UNIT_GAP : 0)
+  return Math.max(1, gauge - used)
+}
+
 export function TuiMetricRow(props: {
   pal: PanelPalette
   layout: PanelLayout
   label: string
   value: string
   unit?: string
+  /** Whole line (label + value + unit). Ignored when `labelFg` / `valueFg` set. */
   fg?: string
+  /** Label-only color (e.g. sub-agent model); value stays `valueFg` or muted. */
+  labelFg?: string
+  valueFg?: string
 }) {
-  const fg = props.fg ?? props.pal.muted
+  const unit = props.unit ?? ""
+  const unitSuffix = unit ? " " + unit : ""
+  const split = props.labelFg !== undefined || props.valueFg !== undefined
+  if (split) {
+    const gap = metricRowGap(props.label, props.value, unit, props.layout.gauge())
+    const labelColor = props.labelFg ?? props.fg ?? props.pal.muted
+    const valueColor = props.valueFg ?? props.fg ?? props.pal.muted
+    return (
+      <text>
+        <span style={{ fg: labelColor }}>{props.label}</span>
+        {" ".repeat(gap)}
+        <span style={{ fg: valueColor }}>
+          {props.value}
+          {unitSuffix}
+        </span>
+      </text>
+    )
+  }
   return (
-    <text fg={fg}>
-      {props.layout.row(props.label, props.value, props.unit ?? "")}
+    <text fg={props.fg ?? props.pal.muted}>
+      {props.layout.row(props.label, props.value, unit)}
     </text>
   )
 }

package/src/tui-panel/index.ts

@@ -19,7 +19,12 @@ export {
   padBeforeTitleSummary,
 } from "./layout.ts"
 
-export { buildPanelPalette, themeColorToHex, type PanelPalette } from "./palette.ts"
+export {
+  buildPanelPalette,
+  themeColorToHex,
+  toneBrandHex,
+  type PanelPalette,
+} from "./palette.ts"
 
 export {
   createPanelLayout,

package/src/tui-panel/palette.ts

@@ -79,6 +79,11 @@ export function themeColorToHex(raw: unknown, fallback: string): string {
   return "#" + [c.r, c.g, c.b].map((v) => v.toString(16).padStart(2, "0")).join("")
 }
 
+/** Tone a vendor brand hex for dark TUI panels (same max saturation as theme colors). */
+export function toneBrandHex(hex: string, fallback: string): string {
+  return desaturateTo(hex, MAX_SAT, fallback)
+}
+
 export function buildPanelPalette(theme: Record<string, unknown>): PanelPalette {
   const sat = (k: string, fb: string) => desaturateTo(theme[k], MAX_SAT, fb)
   return {

package/src/types.ts

@@ -53,13 +53,26 @@ export type ProviderInfo = {
   models: { [key: string]: { cost: ModelCost } }
 }
 
+/** Session aggregate from `api.state.session.get()` — DB-level totals, not capped by message limit. */
+export type SessionObject = {
+  model?: { id: string; providerID: string }
+  cost?: number
+  tokens?: {
+    input?: number
+    output?: number
+    reasoning?: number
+    cache?: { read?: number; write?: number }
+  }
+  parentID?: string
+}
+
 export type OpenCodeTuiApi = {
   state: {
     path: { directory: string }
     provider: ReadonlyArray<ProviderInfo>
     session: {
       messages: (id: string) => unknown[] | undefined
-      get: (id: string) => { parentID?: string } | undefined
+      get: (id: string) => SessionObject | undefined
     }
   }
   client: {

package/src/version.ts

@@ -1 +1,4 @@
-export const PLUGIN_VERSION = "0.1.0"
+import packageJson from "../package.json" with { type: "json" }
+
+/** Sidebar label; kept in sync with package.json "version". */
+export const PLUGIN_VERSION = packageJson.version