@rejacky/opencode-insights 0.1.9 → 0.1.11

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   openDatabase,
   resolveCapturePath
-} from "./chunk-FGTKNB7T.js";
+} from "./chunk-3YLLHABZ.js";
 
 // src/cli.ts
 import { execFile as execFile2 } from "child_process";
@@ -12,6 +12,7 @@ import { dirname, join, resolve } from "path";
 import { homedir } from "os";
 import { pathToFileURL } from "url";
 import { promisify as promisify2 } from "util";
+import { applyEdits, modify, parse } from "jsonc-parser";
 
 // src/inspect.ts
 import { readFile } from "fs/promises";
@@ -1727,8 +1728,10 @@ async function configureOpenCodeDebug(options) {
   if (!existsSync2(localServerEntry) || !existsSync2(localTuiEntry)) {
     throw new Error("Missing dist output. Run npm run build before opencode-insights debug.");
   }
-  const opencodeConfig = await readJsonConfig(opencodePath, { plugin: [] });
-  const tuiConfig = await readJsonConfig(tuiPath, { plugin: [] });
+  const opencodeSource = await readJsonConfigSource(opencodePath);
+  const tuiSource = await readJsonConfigSource(tuiPath);
+  const opencodeConfig = await readJsonConfig(opencodePath, { plugin: [] }, opencodeSource);
+  const tuiConfig = await readJsonConfig(tuiPath, { plugin: [] }, tuiSource);
   setSinglePluginSpec(opencodeConfig, SERVER_PLUGIN_SPEC, [localServerEntry, debugServerOptions(options)], localServerEntry);
   setSinglePluginSpec(tuiConfig, TUI_PLUGIN_SPEC, localTuiEntry);
   removePlugin(tuiConfig, SUBPATH_TUI_PLUGIN_SPEC);
@@ -1745,8 +1748,8 @@ async function configureOpenCodeDebug(options) {
     return lines.join("\n");
   }
   await mkdir(configDir, { recursive: true });
-  await writeJsonConfig(opencodePath, opencodeConfig);
-  await writeJsonConfig(tuiPath, tuiConfig);
+  await writeJsonConfig(opencodePath, opencodeConfig, opencodeSource);
+  await writeJsonConfig(tuiPath, tuiConfig, tuiSource);
   lines.push("Debug configuration written. Restart OpenCode to load the local build.");
   return lines.join("\n");
 }
@@ -1763,18 +1766,23 @@ function resolveOpenCodeConfigPath(configDir) {
   if (existsSync2(jsonPath)) return jsonPath;
   return jsonPath;
 }
-async function readJsonConfig(path, fallback) {
-  if (!existsSync2(path)) return { ...fallback };
-  const content = await readFile2(path, "utf8");
+async function readJsonConfig(path, fallback, source) {
+  const content = source ?? (existsSync2(path) ? await readFile2(path, "utf8") : void 0);
+  if (content === void 0) return { ...fallback };
   const trimmed = content.trim();
   if (!trimmed) return { ...fallback };
   try {
-    const parsed = JSON.parse(stripJsonCommentsAndTrailingCommas(trimmed));
+    const parseErrors = [];
+    const parsed = parse(trimmed, parseErrors, { allowTrailingComma: true });
+    if (parseErrors.length > 0) throw new Error("invalid JSONC syntax");
     return isJsonObject(parsed) ? parsed : { ...fallback };
   } catch (error) {
     throw new Error(`Could not parse ${path}: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
+async function readJsonConfigSource(path) {
+  return existsSync2(path) ? readFile2(path, "utf8") : void 0;
+}
 function stripJsonCommentsAndTrailingCommas(input) {
   let output = "";
   let inString = false;
@@ -1888,11 +1896,12 @@ async function uninstallOpenCode(options) {
 }
 async function removePluginFromConfig(path, plugin, options) {
   if (!existsSync2(path)) return "config not found";
-  const config = await readJsonConfig(path, { plugin: [] });
+  const source = await readJsonConfigSource(path);
+  const config = await readJsonConfig(path, { plugin: [] }, source);
   const changed = removePlugin(config, plugin);
   if (!changed) return `not present (${plugin})`;
   if (options.dryRun) return `would remove (${plugin})`;
-  await writeJsonConfig(path, config);
+  await writeJsonConfig(path, config, source);
   return `removed (${plugin})`;
 }
 async function removeDataFiles(paths, options) {
@@ -1904,8 +1913,15 @@ async function removeDataFiles(paths, options) {
   }
   return existing;
 }
-async function writeJsonConfig(path, config) {
+async function writeJsonConfig(path, config, source) {
   await mkdir(dirname(path), { recursive: true });
+  if (source !== void 0) {
+    const edits = modify(source, ["plugin"], config.plugin, {
+      formattingOptions: { insertSpaces: true, tabSize: 2, eol: "\n" }
+    });
+    await writeFile(path, applyEdits(source, edits), "utf8");
+    return;
+  }
   await writeFile(path, `${JSON.stringify(config, null, 2)}
 `, "utf8");
 }

package/dist/index.d.ts

@@ -1,52 +1,6 @@
 import { Plugin } from '@opencode-ai/plugin';
 import { TuiPlugin } from '@opencode-ai/plugin/tui';
-export { a as CaptureKind, C as CaptureRecord, b as CaptureStore, I as InsightsOptions, J as JsonlCaptureStore, S as SqliteCaptureStore, c as SqliteDb, d as createCaptureStore, e as defaultDataDir, f as extractEventType, n as normalizeChatHeadersCapture, g as normalizeChatMessageCapture, h as normalizeChatParamsCapture, i as normalizeEventCapture, j as normalizeExperimentalChatMessagesTransformCapture, k as normalizeExperimentalChatSystemTransformCapture, l as normalizeToolCapture, o as openDatabase, r as resolveCapturePath, m as resolveRetentionDays } from './capture-BMWWI5GR.js';
-
-type StreamSample = {
-    at: number;
-    tokens: number;
-};
-type MessageTiming = {
-    sessionID: string;
-    requestStartAt: number;
-    firstResponseAt?: number | undefined;
-    firstTokenAt?: number | undefined;
-    lastTokenAt?: number | undefined;
-    lastToolCallAt?: number | undefined;
-};
-type SessionAverage = {
-    totalTokens: number;
-    totalDurationMs: number;
-    totalTtftMs: number;
-    messageCount: number;
-};
-type MetricsState = {
-    streamSamplesBySession: Record<string, StreamSample[]>;
-    messageTimingByID: Record<string, MessageTiming>;
-    sessionAverageByID: Record<string, SessionAverage>;
-};
-declare function createMetricsState(): MetricsState;
-declare function estimateStreamTokens(delta: string): number;
-declare function recordAssistantMessage(state: MetricsState, input: {
-    sessionID: string;
-    messageID: string;
-    createdAt: number;
-    completedAt?: number;
-    outputTokens?: number;
-    reasoningTokens?: number;
-    finish?: string;
-}): void;
-declare function recordAssistantDelta(state: MetricsState, input: {
-    sessionID: string;
-    messageID: string;
-    delta: string;
-    at: number;
-}): void;
-declare function recordToolActivity(state: MetricsState, sessionID: string, messageID: string, at?: number): void;
-declare function renderMetricsText(state: MetricsState, sessionID: string, options?: {
-    now?: number;
-    idle?: boolean;
-}): string;
+export { A as AssistantResponseUsage, a as CaptureKind, C as CaptureRecord, b as CaptureStore, D as DEFAULT_PROMPT_RIGHT_METRICS, I as InsightsConfig, c as InsightsOptions, J as JsonlCaptureStore, M as MessageTiming, d as MetricsState, P as PromptRightMetric, S as SessionAverage, e as SessionTokenUsage, f as SqliteCaptureStore, g as SqliteDb, h as StreamSample, i as createCaptureStore, j as createMetricsState, k as defaultDataDir, l as estimateStreamTokens, m as extractEventType, n as getSessionTokenUsage, o as normalizeChatHeadersCapture, p as normalizeChatMessageCapture, q as normalizeChatParamsCapture, r as normalizeEventCapture, s as normalizeExperimentalChatMessagesTransformCapture, t as normalizeExperimentalChatSystemTransformCapture, u as normalizeToolCapture, v as openDatabase, w as readInsightsConfig, x as recordAssistantDelta, y as recordAssistantMessage, z as recordToolActivity, B as renderMetricsText, E as renderPromptRightMetricsText, F as renderResponseMetricsText, G as renderSessionTokenUsage, H as resolveCapturePath, K as resolveInsightsConfigPath, L as resolveRetentionDays } from './capture-BIiGg2nW.js';
 
 type SubagentStatus = "running" | "done" | "error";
 type SubagentInfo = {
@@ -112,4 +66,4 @@ declare const _default: {
     server: Plugin;
 };
 
-export { type MessageTiming, type MetricsState, OpenCodeInsights, type SessionAverage, type StreamSample, type SubagentInfo, type SubagentSidebarModel, type SubagentSidebarRow, type SubagentState, type SubagentStatus, applySubagentEvent, createMetricsState, createSubagentState, _default as default, estimateStreamTokens, getSubagentItems, getSubagentSidebarModel, getSubagentSidebarRowAtLine, id, pruneStaleSubagents, recordAssistantDelta, recordAssistantMessage, recordToolActivity, renderMetricsText, renderSubagentFooter, renderSubagentSidebar, renderSubagentStatus, server, rootTui as tui };
+export { OpenCodeInsights, type SubagentInfo, type SubagentSidebarModel, type SubagentSidebarRow, type SubagentState, type SubagentStatus, applySubagentEvent, createSubagentState, _default as default, getSubagentItems, getSubagentSidebarModel, getSubagentSidebarRowAtLine, id, pruneStaleSubagents, renderSubagentFooter, renderSubagentSidebar, renderSubagentStatus, server, rootTui as tui };

package/dist/index.js

@@ -1,26 +1,24 @@
 import {
   applySubagentEvent,
-  createMetricsState,
   createSubagentState,
-  estimateStreamTokens,
   getSubagentItems,
   getSubagentSidebarModel,
   getSubagentSidebarRowAtLine,
   pruneStaleSubagents,
-  recordAssistantDelta,
-  recordAssistantMessage,
-  recordToolActivity,
-  renderMetricsText,
   renderSubagentFooter,
   renderSubagentSidebar,
   renderSubagentStatus
-} from "./chunk-7M32TU5P.js";
+} from "./chunk-O5FFLPEQ.js";
 import {
+  DEFAULT_PROMPT_RIGHT_METRICS,
   JsonlCaptureStore,
   SqliteCaptureStore,
   createCaptureStore,
+  createMetricsState,
   defaultDataDir,
+  estimateStreamTokens,
   extractEventType,
+  getSessionTokenUsage,
   normalizeChatHeadersCapture,
   normalizeChatMessageCapture,
   normalizeChatParamsCapture,
@@ -29,9 +27,18 @@ import {
   normalizeExperimentalChatSystemTransformCapture,
   normalizeToolCapture,
   openDatabase,
+  readInsightsConfig,
+  recordAssistantDelta,
+  recordAssistantMessage,
+  recordToolActivity,
+  renderMetricsText,
+  renderPromptRightMetricsText,
+  renderResponseMetricsText,
+  renderSessionTokenUsage,
   resolveCapturePath,
+  resolveInsightsConfigPath,
   resolveRetentionDays
-} from "./chunk-FGTKNB7T.js";
+} from "./chunk-3YLLHABZ.js";
 
 // src/cli-shim.ts
 import { existsSync } from "fs";
@@ -133,6 +140,7 @@ var rootTui = async (...args) => {
 var id = "opencode-insights";
 var src_default = { id, server };
 export {
+  DEFAULT_PROMPT_RIGHT_METRICS,
   JsonlCaptureStore,
   OpenCodeInsights,
   SqliteCaptureStore,
@@ -144,6 +152,7 @@ export {
   defaultDataDir,
   estimateStreamTokens,
   extractEventType,
+  getSessionTokenUsage,
   getSubagentItems,
   getSubagentSidebarModel,
   getSubagentSidebarRowAtLine,
@@ -157,14 +166,19 @@ export {
   normalizeToolCapture,
   openDatabase,
   pruneStaleSubagents,
+  readInsightsConfig,
   recordAssistantDelta,
   recordAssistantMessage,
   recordToolActivity,
   renderMetricsText,
+  renderPromptRightMetricsText,
+  renderResponseMetricsText,
+  renderSessionTokenUsage,
   renderSubagentFooter,
   renderSubagentSidebar,
   renderSubagentStatus,
   resolveCapturePath,
+  resolveInsightsConfigPath,
   resolveRetentionDays,
   server,
   rootTui as tui

package/dist/tui.js

@@ -1,34 +1,67 @@
 import {
   applySubagentEvent,
-  createMetricsState,
   createSubagentState,
   getSubagentSidebarModel,
-  getSubagentSidebarRowAtLine,
+  getSubagentSidebarRowAtLine
+} from "./chunk-O5FFLPEQ.js";
+import {
+  createMetricsState,
+  readInsightsConfig,
   recordAssistantDelta,
   recordAssistantMessage,
   recordToolActivity,
-  renderMetricsText
-} from "./chunk-7M32TU5P.js";
+  renderPromptRightMetricsText,
+  renderSessionTokenUsage
+} from "./chunk-3YLLHABZ.js";
 
 // src/tui.tsx
 import { createTextAttributes, StyledText } from "@opentui/core";
 import { createSignal, onCleanup } from "solid-js";
-import { jsx } from "@opentui/solid/jsx-runtime";
+
+// src/listeners.ts
+function createListenerRegistry() {
+  const listeners = /* @__PURE__ */ new Set();
+  return {
+    notify() {
+      for (const listener of listeners) listener();
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    }
+  };
+}
+
+// src/render-state.ts
+function hasRenderStateChanged(previous, next) {
+  return !previous || previous.content !== next.content || previous.visible !== next.visible || previous.height !== next.height;
+}
+
+// src/tui.tsx
+import { Fragment, jsx, jsxs } from "@opentui/solid/jsx-runtime";
 function isSessionID(value) {
   return typeof value === "string" && value.startsWith("ses");
 }
-function PromptRight(props) {
+function PromptRightMetrics(props) {
   let text;
+  let previous;
   const sync = () => {
     if (!text) return;
     const content = props.text();
-    text.content = content;
-    text.visible = content.length > 0;
-    text.height = content.length > 0 ? "auto" : 0;
+    const next = { content, visible: content.length > 0, height: content.length > 0 ? 1 : 0 };
+    if (!hasRenderStateChanged(previous, next)) return;
+    previous = next;
+    text.content = next.content;
+    text.visible = next.visible;
+    text.height = next.height;
     props.api.renderer.requestRender();
   };
   const unsubscribe = props.subscribe(sync);
-  onCleanup(unsubscribe);
+  const timer = setInterval(sync, 1e3);
+  onCleanup(() => {
+    unsubscribe();
+    clearInterval(timer);
+  });
   return /* @__PURE__ */ jsx(
     "text",
     {
@@ -37,19 +70,65 @@ function PromptRight(props) {
         sync();
       },
       fg: props.api.theme.current.textMuted,
+      height: 1,
+      wrapMode: "none",
+      truncate: true,
+      overflow: "hidden",
       children: props.text()
     }
   );
 }
+function TokenUsageSidebar(props) {
+  let text;
+  let previous;
+  const [collapsed, setCollapsed] = createSignal(false);
+  const titleAttributes = createTextAttributes({ bold: true });
+  const toggleTokenUsage = (event) => {
+    if (!text || event.y !== text.y) return;
+    setCollapsed((prev) => !prev);
+    sync();
+  };
+  const sync = () => {
+    if (!text) return;
+    const content = renderSessionTokenUsage(props.state, props.sessionID);
+    const next = {
+      content: `${collapsed()}|${content}`,
+      visible: content.length > 0,
+      height: content.length > 0 ? "auto" : 0
+    };
+    if (!hasRenderStateChanged(previous, next)) return;
+    previous = next;
+    text.visible = next.visible;
+    text.height = next.height;
+    text.content = content ? renderTokenUsageSidebar(content, props.api, titleAttributes, collapsed()) : "";
+    props.api.renderer.requestRender();
+  };
+  const unsubscribe = props.subscribe(sync);
+  onCleanup(unsubscribe);
+  props.hydrate();
+  return /* @__PURE__ */ jsx(
+    "text",
+    {
+      ref: (ref) => {
+        text = ref;
+        sync();
+      },
+      onMouseDown: toggleTokenUsage,
+      fg: props.api.theme.current.textMuted,
+      children: ""
+    }
+  );
+}
 function SubagentSidebar(props) {
   let text;
   const [collapsed, setCollapsed] = createSignal(false);
   const [hoveredRowID, setHoveredRowID] = createSignal();
   const titleAttributes = createTextAttributes({ bold: true });
+  let previous;
   const toggle = (event) => {
     if (!text || event.y !== text.y) return;
     setCollapsed((prev) => !prev);
-    props.api.renderer.requestRender();
+    sync();
   };
   const openSubagent = (event) => {
     if (!text || collapsed()) return;
@@ -76,9 +155,17 @@ function SubagentSidebar(props) {
   const sync = () => {
     if (!text) return;
     const model = getSubagentSidebarModel(props.state, props.sessionID);
-    text.visible = !!model;
-    text.height = model ? "auto" : 0;
-    text.content = model ? renderSubagentStyledSidebar(props.state, props.sessionID, props.api, titleAttributes, collapsed(), hoveredRowID()) : "";
+    const content = model ? renderSubagentStyledSidebar(model, props.api, titleAttributes, collapsed(), hoveredRowID()) : "";
+    const next = {
+      content: model ? contentSignature(model, collapsed(), hoveredRowID()) : "",
+      visible: !!model,
+      height: model ? "auto" : 0
+    };
+    if (!hasRenderStateChanged(previous, next)) return;
+    previous = next;
+    text.visible = next.visible;
+    text.height = next.height;
+    text.content = model ? content : "";
     props.api.renderer.requestRender();
   };
   const unsubscribe = props.subscribe(sync);
@@ -103,9 +190,7 @@ function SubagentSidebar(props) {
     }
   );
 }
-function renderSubagentStyledSidebar(state, sessionID, api, titleAttributes, collapsed, hoveredRowID) {
-  const model = getSubagentSidebarModel(state, sessionID);
-  if (!model) return "";
+function renderSubagentStyledSidebar(model, api, titleAttributes, collapsed, hoveredRowID) {
   const indicator = collapsed ? "\u25B6 " : "\u25BC ";
   const chunks = [
     textChunk(`${indicator}${model.title}
@@ -126,6 +211,18 @@ function renderSubagentStyledSidebar(state, sessionID, api, titleAttributes, col
   }
   return new StyledText(chunks);
 }
+function renderTokenUsageSidebar(content, api, titleAttributes, collapsed) {
+  const [title, ...details] = content.split("\n");
+  const visibleDetails = collapsed ? details.slice(0, 1) : details;
+  return new StyledText([
+    textChunk(`${collapsed ? "\u25B6" : "\u25BC"} ${title}
+`, api.theme.current.text, titleAttributes),
+    textChunk(visibleDetails.join("\n"), api.theme.current.textMuted)
+  ]);
+}
+function contentSignature(model, collapsed, hoveredRowID) {
+  return JSON.stringify({ collapsed, hoveredRowID, title: model.title, summary: model.summary, rows: model.rows });
+}
 function textChunk(text, fg, attributes, bg) {
   return {
     __isChunk: true,
@@ -135,16 +232,39 @@ function textChunk(text, fg, attributes, bg) {
     ...bg === void 0 ? {} : { bg }
   };
 }
-var tui = async (api) => {
+var tui = async (api, options) => {
+  const config = await readInsightsConfig(options ?? {});
   const metrics = createMetricsState();
   const subagents = createSubagentState();
-  const listeners = /* @__PURE__ */ new Set();
-  const bump = () => {
-    for (const listener of listeners) listener();
-  };
-  const subscribe = (listener) => {
-    listeners.add(listener);
-    return () => listeners.delete(listener);
+  const metricListeners = createListenerRegistry();
+  const subagentListeners = createListenerRegistry();
+  const hydratedSessions = /* @__PURE__ */ new Set();
+  const hydrateSessionMetrics = async (sessionID) => {
+    if (!isSessionID(sessionID) || hydratedSessions.has(sessionID)) return;
+    hydratedSessions.add(sessionID);
+    try {
+      const response = await api.client.session.messages({ sessionID });
+      const messages = response.data ?? [];
+      for (const message of messages) {
+        const info = message.info;
+        if (info.role !== "assistant" || typeof info.time.completed !== "number") continue;
+        const input = {
+          sessionID: info.sessionID,
+          messageID: info.id,
+          createdAt: info.time.created,
+          completedAt: info.time.completed,
+          inputTokens: info.tokens.input,
+          outputTokens: info.tokens.output,
+          reasoningTokens: info.tokens.reasoning,
+          cacheReadTokens: info.tokens.cache.read,
+          cacheWriteTokens: info.tokens.cache.write
+        };
+        recordAssistantMessage(metrics, typeof info.finish === "string" ? { ...input, finish: info.finish } : input);
+      }
+      metricListeners.notify();
+    } catch {
+      hydratedSessions.delete(sessionID);
+    }
   };
   const offDelta = api.event.on("message.part.delta", (evt) => {
     if (evt.properties.field !== "text") return;
@@ -154,71 +274,89 @@ var tui = async (api) => {
       delta: evt.properties.delta,
       at: Date.now()
     });
-    bump();
+    metricListeners.notify();
   });
   const offMessage = api.event.on("message.updated", (evt) => {
     const info = evt.properties.info;
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
     if (info.role !== "assistant") return;
     const messageInput = {
       sessionID: info.sessionID ?? evt.properties.sessionID,
       messageID: info.id,
       createdAt: info.time.created,
+      inputTokens: info.tokens.input,
       outputTokens: info.tokens.output,
-      reasoningTokens: info.tokens.reasoning
+      reasoningTokens: info.tokens.reasoning,
+      cacheReadTokens: info.tokens.cache?.read,
+      cacheWriteTokens: info.tokens.cache?.write
     };
     if (typeof info.time.completed === "number") messageInput.completedAt = info.time.completed;
     if (typeof info.finish === "string") messageInput.finish = info.finish;
     recordAssistantMessage(metrics, messageInput);
-    bump();
+    metricListeners.notify();
   });
   const offPart = api.event.on("message.part.updated", (evt) => {
     const part = evt.properties.part;
     if (part.type === "tool") {
       recordToolActivity(metrics, part.sessionID ?? evt.properties.sessionID, part.messageID, Date.now());
     }
-    applySubagentEvent(subagents, evt);
-    bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
+    metricListeners.notify();
   });
   const offSessionCreated = api.event.on("session.created", (evt) => {
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
   });
   const offSessionUpdated = api.event.on("session.updated", (evt) => {
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
   });
   const offSessionStatus = api.event.on("session.status", (evt) => {
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
   });
   const offSessionIdle = api.event.on("session.idle", (evt) => {
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
   });
   const offSessionError = api.event.on("session.error", (evt) => {
-    if (applySubagentEvent(subagents, evt)) bump();
+    if (applySubagentEvent(subagents, evt)) subagentListeners.notify();
   });
   const offSlots = api.slots.register({
     slots: {
       session_prompt_right: (_ctx, props) => /* @__PURE__ */ jsx(
-        PromptRight,
+        PromptRightMetrics,
         {
           api,
           sessionID: props.session_id,
-          subscribe,
+          subscribe: metricListeners.subscribe,
           text: () => {
             if (!isSessionID(props.session_id)) return "";
             const status = api.state.session.status(props.session_id);
-            return renderMetricsText(metrics, props.session_id, { idle: status?.type === "idle" });
+            return renderPromptRightMetricsText(metrics, props.session_id, {
+              idle: status?.type === "idle",
+              metrics: config.promptRightMetrics
+            });
           }
         }
       ),
-      sidebar_content: (_ctx, props) => /* @__PURE__ */ jsx(
-        SubagentSidebar,
-        {
-          api,
-          sessionID: props.session_id,
-          state: subagents,
-          subscribe
-        }
-      )
+      sidebar_content: (_ctx, props) => /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(
+          TokenUsageSidebar,
+          {
+            api,
+            sessionID: props.session_id,
+            state: metrics,
+            subscribe: metricListeners.subscribe,
+            hydrate: () => void hydrateSessionMetrics(props.session_id)
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          SubagentSidebar,
+          {
+            api,
+            sessionID: props.session_id,
+            state: subagents,
+            subscribe: subagentListeners.subscribe
+          }
+        )
+      ] })
     }
   });
   api.lifecycle.onDispose(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@rejacky/opencode-insights",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "OpenCode plugin for local request capture, TPS metrics, and subagent status visibility.",
   "type": "module",
   "author": "opencode-insights contributors",
@@ -86,6 +86,7 @@
   },
   "dependencies": {
     "better-sqlite3": "^12.11.1",
+    "jsonc-parser": "^3.3.1",
     "sql.js": "^1.14.1"
   }
 }

package/dist/capture-BMWWI5GR.d.ts

@@ -1,61 +0,0 @@
-type CaptureKind = "chat.message" | "chat.params" | "chat.headers" | "experimental.chat.messages.transform" | "experimental.chat.system.transform" | "event" | "tool.execute.before" | "tool.execute.after";
-type CaptureRecord = {
-    id: string;
-    kind: CaptureKind;
-    timestamp: number;
-    sessionID?: string | undefined;
-    messageID?: string | undefined;
-    providerID?: string | undefined;
-    modelID?: string | undefined;
-    payload: Record<string, unknown>;
-};
-type CaptureStore = {
-    initialize?(): Promise<void>;
-    append(record: CaptureRecord): Promise<void>;
-    close?(): Promise<void>;
-};
-type InsightsOptions = {
-    dataDir?: unknown;
-    dbPath?: unknown;
-    retentionDays?: unknown;
-};
-declare function defaultDataDir(): string;
-declare function resolveCapturePath(options?: InsightsOptions): string;
-declare function normalizeChatMessageCapture(input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeChatParamsCapture(input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeChatHeadersCapture(input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeExperimentalChatMessagesTransformCapture(input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeExperimentalChatSystemTransformCapture(input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeEventCapture(event: unknown, timestamp?: number): CaptureRecord;
-declare function normalizeToolCapture(kind: "tool.execute.before" | "tool.execute.after", input: unknown, output: unknown, timestamp?: number): CaptureRecord;
-declare class JsonlCaptureStore implements CaptureStore {
-    private readonly path;
-    private readonly retentionMs;
-    constructor(path: string, retentionMs?: number | undefined);
-    initialize(): Promise<void>;
-    append(record: CaptureRecord): Promise<void>;
-    private pruneExpired;
-}
-interface SqliteDb {
-    all(sql: string, ...params: unknown[]): Record<string, unknown>[];
-    run(sql: string, ...params: unknown[]): void;
-    sync(): void;
-    close(): void;
-}
-declare function openDatabase(path: string, readonly?: boolean): Promise<SqliteDb | undefined>;
-declare function extractEventType(payload: Record<string, unknown>): string | null;
-declare class SqliteCaptureStore implements CaptureStore {
-    private readonly path;
-    private readonly retentionMs;
-    private db;
-    private fallbackStore;
-    constructor(path: string, retentionMs?: number | undefined);
-    initialize(): Promise<void>;
-    append(record: CaptureRecord): Promise<void>;
-    close(): Promise<void>;
-    private pruneExpired;
-}
-declare function createCaptureStore(options?: InsightsOptions): CaptureStore;
-declare function resolveRetentionDays(value: unknown): number;
-
-export { type CaptureRecord as C, type InsightsOptions as I, JsonlCaptureStore as J, SqliteCaptureStore as S, type CaptureKind as a, type CaptureStore as b, type SqliteDb as c, createCaptureStore as d, defaultDataDir as e, extractEventType as f, normalizeChatMessageCapture as g, normalizeChatParamsCapture as h, normalizeEventCapture as i, normalizeExperimentalChatMessagesTransformCapture as j, normalizeExperimentalChatSystemTransformCapture as k, normalizeToolCapture as l, resolveRetentionDays as m, normalizeChatHeadersCapture as n, openDatabase as o, resolveCapturePath as r };