opencode-usage-total 0.1.1 → 0.1.2

package/dist/index.js

@@ -4,12 +4,21 @@ import {
 
 // usage-total-tui.tsx
 import { createRoot, createSignal } from "solid-js";
+
+// package.json
+var version = "0.1.2";
+
+// usage-total-tui.tsx
 import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
 var DEFAULT_AGENT = "primary";
 var UNKNOWN_ID = "?";
 function resolveRouteSessionID(api) {
-  var _a;
-  return api.route.current.name === "session" && typeof ((_a = api.route.current.params) == null ? void 0 : _a.sessionID) === "string" ? api.route.current.params.sessionID : void 0;
+  const current = api.route.current;
+  if (current.name === "session") {
+    const sid = current.params?.sessionID;
+    return typeof sid === "string" ? sid : void 0;
+  }
+  return void 0;
 }
 function modelTokens(m) {
   return m.tokensInput + m.tokensOutput + m.tokensReasoning;
@@ -18,6 +27,9 @@ function safeNum(value) {
   const n = typeof value === "number" ? value : Number(value);
   return Number.isFinite(n) ? n : 0;
 }
+function roundCost(n) {
+  return safeNum(Number(n.toFixed(6)));
+}
 function fmtTokens(n) {
   if (!Number.isFinite(n) || n === 0) return "0";
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
@@ -29,209 +41,244 @@ function fmtCost(n) {
   if (n < 0.01) return `$${n.toFixed(4)}`;
   return `$${n.toFixed(2)}`;
 }
+var initialized = false;
 var tui = async (api) => {
-  api.ui.toast({ message: "usage-total TUI loaded", variant: "info" });
-  createRoot((dispose) => {
-    var _a;
-    const [modelState, setModelState] = createSignal({});
-    const EXPANDED_KV_KEY = "usage-total.sidebar.expanded";
-    const [expanded, setExpanded] = createSignal(
-      api.kv.get(EXPANDED_KV_KEY, true) !== false
-    );
-    const TOGGLE_CMD = "usage-total.toggle-section";
-    const keymapDispose = ((_a = api.keymap) == null ? void 0 : _a.registerLayer) ? api.keymap.registerLayer({
-      commands: [
-        {
-          name: TOGGLE_CMD,
-          title: "Usage: Toggle models section",
-          description: "Collapse or expand the models list in the sidebar",
-          run: () => {
-            const next = !expanded();
-            setExpanded(next);
-            api.kv.set(EXPANDED_KV_KEY, next);
-          }
-        }
-      ],
-      bindings: [{ key: "alt+m", cmd: TOGGLE_CMD }]
-    }) : void 0;
-    const loadedSessions = /* @__PURE__ */ new Set();
-    function kvKey(sessionID) {
-      return `usage-total:models:${sessionID}`;
+  if (initialized) {
+    api.ui?.toast?.({
+      message: "usage-total TUI already loaded; skipping re-init",
+      variant: "warning"
+    });
+    return;
+  }
+  initialized = true;
+  api.ui?.toast?.({ message: "usage-total TUI loaded", variant: "info" });
+  let unsub;
+  let keymapDispose;
+  let solidDispose;
+  let flushPending;
+  const cleanup = () => {
+    try {
+      flushPending?.();
+    } catch {
     }
-    function saveSession(sessionID) {
-      const models = modelState()[sessionID];
-      if (models && models.length > 0) {
-        api.kv.set(kvKey(sessionID), models);
-      }
+    try {
+      unsub?.();
+    } catch {
     }
-    function loadSession(sessionID) {
-      if (loadedSessions.has(sessionID)) return;
-      loadedSessions.add(sessionID);
-      const saved = api.kv.get(kvKey(sessionID));
-      if (saved && saved.length > 0) {
-        setModelState((current) => ({ ...current, [sessionID]: saved }));
-      }
+    try {
+      keymapDispose?.();
+    } catch {
+    }
+    try {
+      solidDispose?.();
+    } catch {
     }
-    function upsertModel(sessionID, entry, cost, tokens) {
-      const dedupeKey = `${entry.provider}/${entry.model}/${entry.agent}`;
-      const current = modelState();
-      const sessionModels = [...current[sessionID] ?? []];
-      const existingIdx = sessionModels.findIndex(
-        (m) => `${m.provider}/${m.model}/${m.agent}` === dedupeKey
+    initialized = false;
+  };
+  try {
+    if (api.lifecycle?.onDispose) {
+      api.lifecycle.onDispose(cleanup);
+    }
+    createRoot((dispose) => {
+      solidDispose = dispose;
+      const [modelState, setModelState] = createSignal({});
+      const EXPANDED_KV_KEY = "usage-total.sidebar.expanded";
+      const [expanded, setExpanded] = createSignal(
+        api.kv?.get?.(EXPANDED_KV_KEY, true) !== false
       );
-      const safeCost = safeNum(cost);
-      const safeInput = safeNum(tokens.input);
-      const safeOutput = safeNum(tokens.output);
-      const safeReasoning = safeNum(tokens.reasoning);
-      if (existingIdx >= 0) {
-        const existing = sessionModels[existingIdx];
-        sessionModels[existingIdx] = {
-          ...existing,
-          cost: safeNum(existing.cost + safeCost),
-          tokensInput: safeNum(existing.tokensInput + safeInput),
-          tokensOutput: safeNum(existing.tokensOutput + safeOutput),
-          tokensReasoning: safeNum(existing.tokensReasoning + safeReasoning),
-          messageCount: existing.messageCount + 1
-        };
-      } else {
-        sessionModels.push({
-          ...entry,
-          cost: safeCost,
-          tokensInput: safeInput,
-          tokensOutput: safeOutput,
-          tokensReasoning: safeReasoning,
-          messageCount: 1
-        });
+      const TOGGLE_CMD = "usage-total.toggle-section";
+      keymapDispose = api.keymap?.registerLayer ? api.keymap.registerLayer({
+        commands: [
+          {
+            name: TOGGLE_CMD,
+            title: "Usage: Toggle models section",
+            description: "Collapse or expand the models list in the sidebar",
+            run: () => {
+              const next = !expanded();
+              setExpanded(next);
+              api.kv?.set?.(EXPANDED_KV_KEY, next);
+            }
+          }
+        ],
+        bindings: [{ key: "alt+m", cmd: TOGGLE_CMD }]
+      }) : void 0;
+      const loadedSessions = /* @__PURE__ */ new Set();
+      function kvKey(sessionID) {
+        return `usage-total:models:${sessionID}`;
       }
-      setModelState({
-        ...current,
-        [sessionID]: sessionModels
-      });
-      saveSession(sessionID);
-      return existingIdx < 0;
-    }
-    function trackModel(eventSessionID, entry, cost, tokens) {
-      const isNew = upsertModel(eventSessionID, entry, cost, tokens);
-      if (isNew) {
-        api.ui.toast({
-          message: `${entry.agent}: ${entry.model}`,
-          variant: "success"
-        });
+      const SAVE_DEBOUNCE_MS = 500;
+      const dirtySessions = /* @__PURE__ */ new Set();
+      let saveTimer;
+      function flushDirtySessions() {
+        if (saveTimer) {
+          clearTimeout(saveTimer);
+          saveTimer = void 0;
+        }
+        for (const sid of dirtySessions) {
+          const models = modelState()[sid];
+          if (models && models.length > 0) {
+            api.kv?.set?.(kvKey(sid), models);
+          }
+        }
+        dirtySessions.clear();
       }
-      const session = api.state.session.get(eventSessionID);
-      if ((session == null ? void 0 : session.parentID) && session.parentID !== eventSessionID) {
-        upsertModel(session.parentID, entry, cost, tokens);
+      flushPending = flushDirtySessions;
+      function scheduleSave(sessionID) {
+        dirtySessions.add(sessionID);
+        if (saveTimer) clearTimeout(saveTimer);
+        saveTimer = setTimeout(flushDirtySessions, SAVE_DEBOUNCE_MS);
       }
-    }
-    const unsub = api.event.on("message.updated", (event) => {
-      var _a2, _b, _c, _d;
-      const info = (_a2 = event == null ? void 0 : event.properties) == null ? void 0 : _a2.info;
-      if (!info) return;
-      const eventSessionID = info.sessionID;
-      if (!eventSessionID) return;
-      let provider;
-      let model;
-      let agent;
-      let cost = 0;
-      let tokens = {};
-      if (info.role === "user") {
-        const mdl = info.model;
-        provider = (mdl == null ? void 0 : mdl.providerID) ?? UNKNOWN_ID;
-        model = (mdl == null ? void 0 : mdl.modelID) ?? UNKNOWN_ID;
-        agent = info.agent ?? DEFAULT_AGENT;
-      } else if (info.role === "assistant") {
-        provider = info.providerID ?? UNKNOWN_ID;
-        model = info.modelID ?? UNKNOWN_ID;
-        agent = info.agent ?? info.mode ?? DEFAULT_AGENT;
-        cost = safeNum(info.cost);
-        tokens = {
-          input: safeNum((_b = info.tokens) == null ? void 0 : _b.input),
-          output: safeNum((_c = info.tokens) == null ? void 0 : _c.output),
-          reasoning: safeNum((_d = info.tokens) == null ? void 0 : _d.reasoning)
-        };
-      } else {
-        return;
+      function loadSession(sessionID) {
+        if (loadedSessions.has(sessionID)) return;
+        loadedSessions.add(sessionID);
+        const saved = api.kv?.get?.(kvKey(sessionID));
+        if (saved && saved.length > 0) {
+          setModelState((current) => ({ ...current, [sessionID]: saved }));
+        }
       }
-      trackModel(eventSessionID, { provider, model, agent }, cost, tokens);
-    });
-    api.slots.register({
-      id: "usage-total",
-      order: 200,
-      slots: {
-        sidebar_content(ctx) {
-          const sessionID = ctx.session_id ?? resolveRouteSessionID(api) ?? "";
-          if (sessionID) loadSession(sessionID);
-          const models = sessionID ? modelState()[sessionID] ?? [] : [];
-          if (!sessionID || models.length === 0) {
-            return /* @__PURE__ */ jsxs(
-              "box",
-              {
-                flexDirection: "column",
-                padding: { left: 1, right: 1, top: 1 },
-                children: [
-                  /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, bold: true, children: "\u{1F9E0} Models" }),
-                  /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.textMuted, children: sessionID ? "waiting for messages..." : "open a session to track models" })
-                ]
-              }
+      function upsertModel(sessionID, entry, cost, tokens) {
+        const dedupeKey = `${entry.provider}/${entry.model}/${entry.agent}`;
+        const current = modelState();
+        const sessionModels = [...current[sessionID] ?? []];
+        const existingIdx = sessionModels.findIndex(
+          (m) => `${m.provider}/${m.model}/${m.agent}` === dedupeKey
+        );
+        const safeCost = safeNum(cost);
+        const safeInput = safeNum(tokens.input);
+        const safeOutput = safeNum(tokens.output);
+        const safeReasoning = safeNum(tokens.reasoning);
+        if (existingIdx >= 0) {
+          const existing = sessionModels[existingIdx];
+          sessionModels[existingIdx] = {
+            ...existing,
+            cost: roundCost(existing.cost + safeCost),
+            tokensInput: safeNum(existing.tokensInput + safeInput),
+            tokensOutput: safeNum(existing.tokensOutput + safeOutput),
+            tokensReasoning: safeNum(existing.tokensReasoning + safeReasoning),
+            messageCount: existing.messageCount + 1
+          };
+        } else {
+          sessionModels.push({
+            ...entry,
+            cost: safeCost,
+            tokensInput: safeInput,
+            tokensOutput: safeOutput,
+            tokensReasoning: safeReasoning,
+            messageCount: 1
+          });
+        }
+        setModelState({
+          ...current,
+          [sessionID]: sessionModels
+        });
+        scheduleSave(sessionID);
+        return existingIdx < 0;
+      }
+      function trackModel(eventSessionID, entry, cost, tokens) {
+        const isNew = upsertModel(eventSessionID, entry, cost, tokens);
+        if (isNew) {
+          api.ui?.toast?.({
+            message: `${entry.agent}: ${entry.model}`,
+            variant: "success"
+          });
+        }
+        const session = api.state?.session?.get?.(eventSessionID);
+        if (session?.parentID && session.parentID !== eventSessionID) {
+          upsertModel(session.parentID, entry, cost, tokens);
+        }
+      }
+      unsub = api.event?.on?.("message.updated", (event) => {
+        const info = event?.properties?.info;
+        if (!info) return;
+        const eventSessionID = info.sessionID;
+        if (!eventSessionID) return;
+        let provider;
+        let model;
+        let agent;
+        let cost = 0;
+        let tokens = {};
+        if (info.role === "user") {
+          const mdl = info.model;
+          provider = mdl?.providerID ?? UNKNOWN_ID;
+          model = mdl?.modelID ?? UNKNOWN_ID;
+          agent = info.agent ?? DEFAULT_AGENT;
+        } else if (info.role === "assistant") {
+          provider = info.providerID ?? UNKNOWN_ID;
+          model = info.modelID ?? UNKNOWN_ID;
+          agent = info.agent ?? info.mode ?? DEFAULT_AGENT;
+          cost = safeNum(info.cost);
+          tokens = {
+            input: safeNum(info.tokens?.input),
+            output: safeNum(info.tokens?.output),
+            reasoning: safeNum(info.tokens?.reasoning)
+          };
+        } else {
+          return;
+        }
+        trackModel(eventSessionID, { provider, model, agent }, cost, tokens);
+      });
+      api.slots?.register?.({
+        order: 200,
+        slots: {
+          sidebar_content(ctx, props) {
+            const sessionID = props.session_id ?? resolveRouteSessionID(api) ?? "";
+            if (sessionID) loadSession(sessionID);
+            const models = sessionID ? modelState()[sessionID] ?? [] : [];
+            if (!sessionID || models.length === 0) {
+              return /* @__PURE__ */ jsxs("box", { flexDirection: "column", children: [
+                /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, children: "\u{1F9E0} Models" }),
+                /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.textMuted, children: sessionID ? "waiting for messages..." : "open a session to track models" })
+              ] });
+            }
+            const totalCost = models.reduce((sum, m) => sum + m.cost, 0);
+            const totalTokens = models.reduce(
+              (sum, m) => sum + modelTokens(m),
+              0
             );
-          }
-          const totalCost = models.reduce((sum, m) => sum + m.cost, 0);
-          const totalTokens = models.reduce(
-            (sum, m) => sum + modelTokens(m),
-            0
-          );
-          return /* @__PURE__ */ jsxs(
-            "box",
-            {
-              flexDirection: "column",
-              padding: { left: 1, right: 1, top: 1 },
-              children: [
-                /* @__PURE__ */ jsxs(
-                  "box",
-                  {
-                    flexDirection: "row",
-                    justifyContent: "space-between",
-                    children: [
-                      /* @__PURE__ */ jsxs("box", { flexDirection: "row", children: [
-                        /* @__PURE__ */ jsxs(
-                          "text",
-                          {
-                            fg: ctx.theme.current.text,
-                            bold: true,
-                            children: [
-                              expanded() ? "\u25BC" : "\u25B6",
-                              " \u{1F9E0} Models"
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.textMuted, children: " 0.1.0" })
+            return /* @__PURE__ */ jsxs("box", { flexDirection: "column", children: [
+              /* @__PURE__ */ jsxs(
+                "box",
+                {
+                  flexDirection: "row",
+                  justifyContent: "space-between",
+                  children: [
+                    /* @__PURE__ */ jsxs("box", { flexDirection: "row", children: [
+                      /* @__PURE__ */ jsxs("text", { fg: ctx.theme.current.text, children: [
+                        expanded() ? "\u25BC" : "\u25B6",
+                        " \u{1F9E0} Models"
                       ] }),
-                      /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, children: totalCost > 0 ? `${fmtCost(totalCost)} \xB7 ${fmtTokens(totalTokens)}` : fmtTokens(totalTokens) })
-                    ]
-                  }
-                ),
-                expanded() && models.map((m, i) => /* @__PURE__ */ jsxs("box", { flexDirection: "column", children: [
-                  /* @__PURE__ */ jsxs("text", { fg: ctx.theme.current.text, children: [
-                    m.agent,
-                    ":"
-                  ] }),
-                  /* @__PURE__ */ jsxs("box", { flexDirection: "row", justifyContent: "space-between", children: [
-                    /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, children: "  " + m.model }),
-                    /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.textMuted, children: m.cost > 0 ? `${fmtCost(m.cost)}${modelTokens(m) > 0 ? ` \xB7 ${fmtTokens(modelTokens(m))}` : ""}` : modelTokens(m) > 0 ? fmtTokens(modelTokens(m)) : "-" })
-                  ] })
-                ] }, i))
-              ]
-            }
-          );
+                      /* @__PURE__ */ jsxs("text", { fg: ctx.theme.current.textMuted, children: [
+                        " ",
+                        version
+                      ] })
+                    ] }),
+                    /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, children: totalCost > 0 ? `${fmtCost(totalCost)} \xB7 ${fmtTokens(totalTokens)}` : fmtTokens(totalTokens) })
+                  ]
+                }
+              ),
+              expanded() && models.map((m) => /* @__PURE__ */ jsxs("box", { flexDirection: "column", children: [
+                /* @__PURE__ */ jsxs("text", { fg: ctx.theme.current.text, children: [
+                  m.agent,
+                  ":"
+                ] }),
+                /* @__PURE__ */ jsxs("box", { flexDirection: "row", justifyContent: "space-between", children: [
+                  /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.text, children: "  " + m.model }),
+                  /* @__PURE__ */ jsx("text", { fg: ctx.theme.current.textMuted, children: m.cost > 0 ? `${fmtCost(m.cost)}${modelTokens(m) > 0 ? ` \xB7 ${fmtTokens(modelTokens(m))}` : ""}` : modelTokens(m) > 0 ? fmtTokens(modelTokens(m)) : "-" })
+                ] })
+              ] }))
+            ] });
+          }
         }
-      }
+      });
     });
-    api.lifecycle.onDispose(() => {
-      unsub();
-      keymapDispose == null ? void 0 : keymapDispose();
-      dispose();
+  } catch (err) {
+    cleanup();
+    api.ui?.toast?.({
+      message: "usage-total TUI failed to initialize",
+      variant: "error"
     });
-  });
+    throw err;
+  }
 };
 var usage_total_tui_default = { id: "usage-total", tui };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-usage-total",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Track model usage, tokens, and costs per agent in the OpenCode TUI sidebar",
   "type": "module",
   "main": "dist/index.js",