opencode-usage-total 0.1.2 → 0.1.4

package/dist/{chunk-XNCJ32GU.js → chunk-2K4AVHCL.js}

@@ -1,31 +1,36 @@
 // usage-total.ts
 var UsageTotalPlugin = async ({ client }) => {
-  await client.app.log({
-    body: {
-      service: "usage-total",
-      level: "info",
-      message: "usage-total plugin loaded"
-    }
-  });
+  try {
+    await client.app.log({
+      body: {
+        service: "usage-total",
+        level: "info",
+        message: "usage-total plugin loaded"
+      }
+    });
+  } catch {
+  }
   return {
     event: async ({ event }) => {
       if (event.type === "session.created") {
-        void client.app.log({
+        client.app.log({
           body: {
             service: "usage-total",
-            level: "info",
+            level: "debug",
             message: `session.created [${event.properties.info.id}]`
           }
+        }).catch(() => {
         });
       }
       if (event.type === "message.updated") {
         const msg = event.properties.info;
-        void client.app.log({
+        client.app.log({
           body: {
             service: "usage-total",
-            level: "info",
+            level: "debug",
             message: `message.updated [${msg.id}] role=${msg.role}`
           }
+        }).catch(() => {
         });
       }
     }

package/dist/index.d.ts

@@ -0,0 +1,12 @@
+import { TuiPlugin } from '@opencode-ai/plugin/tui';
+export { UsageTotalPlugin } from './usage-total.js';
+import '@opencode-ai/plugin';
+
+/** @jsxImportSource @opentui/solid */
+
+declare const _default: {
+    id: string;
+    tui: TuiPlugin;
+};
+
+export { _default as default };

package/dist/index.js

@@ -1,28 +1,14 @@
 import {
   UsageTotalPlugin
-} from "./chunk-XNCJ32GU.js";
+} from "./chunk-2K4AVHCL.js";
 
 // usage-total-tui.tsx
 import { createRoot, createSignal } from "solid-js";
 
 // package.json
-var version = "0.1.2";
+var version = "0.1.4";
 
-// usage-total-tui.tsx
-import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
-var DEFAULT_AGENT = "primary";
-var UNKNOWN_ID = "?";
-function resolveRouteSessionID(api) {
-  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;
-}
+// helpers.ts
 function safeNum(value) {
   const n = typeof value === "number" ? value : Number(value);
   return Number.isFinite(n) ? n : 0;
@@ -31,17 +17,38 @@ 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`;
-  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
-  return String(Math.round(n));
+  if (!Number.isFinite(n) || n < 0) return "0";
+  const r = Math.round(n);
+  if (r < 1e3) return String(r);
+  if (r >= 1e6 || Math.round(r / 100) >= 1e4) {
+    return `${(r / 1e6).toFixed(1)}M`;
+  }
+  return `${(r / 1e3).toFixed(1)}k`;
 }
 function fmtCost(n) {
+  if (n < 0) return "";
   if (!Number.isFinite(n) || n === 0) return "";
   if (n < 0.01) return `$${n.toFixed(4)}`;
   return `$${n.toFixed(2)}`;
 }
+function modelTokens(m) {
+  return m.tokensInput + m.tokensOutput + m.tokensReasoning + m.tokensCacheRead + m.tokensCacheWrite;
+}
+
+// usage-total-tui.tsx
+import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
+var DEFAULT_AGENT = "primary";
+var UNKNOWN_ID = "?";
+function resolveRouteSessionID(api) {
+  const current = api.route.current;
+  if (current.name === "session") {
+    const sid = current.params?.sessionID;
+    return typeof sid === "string" ? sid : void 0;
+  }
+  return void 0;
+}
 var initialized = false;
+var lastToastTime = 0;
 var tui = async (api) => {
   if (initialized) {
     api.ui?.toast?.({
@@ -133,6 +140,15 @@ var tui = async (api) => {
         loadedSessions.add(sessionID);
         const saved = api.kv?.get?.(kvKey(sessionID));
         if (saved && saved.length > 0) {
+          const valid = Array.isArray(saved) && typeof saved[0].provider === "string" && typeof saved[0].model === "string" && typeof saved[0].agent === "string";
+          if (!valid) {
+            api.ui?.toast?.({
+              message: "usage-total: discarded corrupt saved model data",
+              variant: "warning"
+            });
+            api.kv?.set?.(kvKey(sessionID), void 0);
+            return;
+          }
           setModelState((current) => ({ ...current, [sessionID]: saved }));
         }
       }
@@ -147,6 +163,8 @@ var tui = async (api) => {
         const safeInput = safeNum(tokens.input);
         const safeOutput = safeNum(tokens.output);
         const safeReasoning = safeNum(tokens.reasoning);
+        const safeCacheRead = safeNum(tokens.cacheRead);
+        const safeCacheWrite = safeNum(tokens.cacheWrite);
         if (existingIdx >= 0) {
           const existing = sessionModels[existingIdx];
           sessionModels[existingIdx] = {
@@ -155,7 +173,10 @@ var tui = async (api) => {
             tokensInput: safeNum(existing.tokensInput + safeInput),
             tokensOutput: safeNum(existing.tokensOutput + safeOutput),
             tokensReasoning: safeNum(existing.tokensReasoning + safeReasoning),
-            messageCount: existing.messageCount + 1
+            tokensCacheRead: safeNum(existing.tokensCacheRead + safeCacheRead),
+            tokensCacheWrite: safeNum(
+              existing.tokensCacheWrite + safeCacheWrite
+            )
           };
         } else {
           sessionModels.push({
@@ -164,7 +185,8 @@ var tui = async (api) => {
             tokensInput: safeInput,
             tokensOutput: safeOutput,
             tokensReasoning: safeReasoning,
-            messageCount: 1
+            tokensCacheRead: safeCacheRead,
+            tokensCacheWrite: safeCacheWrite
           });
         }
         setModelState({
@@ -176,15 +198,24 @@ var tui = async (api) => {
       }
       function trackModel(eventSessionID, entry, cost, tokens) {
         const isNew = upsertModel(eventSessionID, entry, cost, tokens);
-        if (isNew) {
+        if (isNew && Date.now() - lastToastTime > 2e3) {
+          lastToastTime = Date.now();
           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);
+        let cursor = eventSessionID;
+        const visited = /* @__PURE__ */ new Set();
+        while (true) {
+          visited.add(cursor);
+          const sess = api.state?.session?.get?.(cursor);
+          if (!sess?.parentID || sess.parentID === cursor || visited.has(sess.parentID))
+            break;
+          cursor = sess.parentID;
+        }
+        if (cursor !== eventSessionID) {
+          upsertModel(cursor, entry, cost, tokens);
         }
       }
       unsub = api.event?.on?.("message.updated", (event) => {
@@ -210,7 +241,9 @@ var tui = async (api) => {
           tokens = {
             input: safeNum(info.tokens?.input),
             output: safeNum(info.tokens?.output),
-            reasoning: safeNum(info.tokens?.reasoning)
+            reasoning: safeNum(info.tokens?.reasoning),
+            cacheRead: safeNum(info.tokens?.cache?.read),
+            cacheWrite: safeNum(info.tokens?.cache?.write)
           };
         } else {
           return;

package/dist/usage-total.d.ts

@@ -0,0 +1,5 @@
+import { Plugin } from '@opencode-ai/plugin';
+
+declare const UsageTotalPlugin: Plugin;
+
+export { UsageTotalPlugin };

package/dist/usage-total.js

@@ -1,6 +1,6 @@
 import {
   UsageTotalPlugin
-} from "./chunk-XNCJ32GU.js";
+} from "./chunk-2K4AVHCL.js";
 export {
   UsageTotalPlugin
 };

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "opencode-usage-total",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Track model usage, tokens, and costs per agent in the OpenCode TUI sidebar",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
-    ".": "./dist/index.js",
-    "./runtime": "./dist/usage-total.js"
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./runtime": {
+      "types": "./dist/usage-total.d.ts",
+      "import": "./dist/usage-total.js"
+    }
   },
   "files": [
     "dist",
@@ -30,6 +36,8 @@
   },
   "scripts": {
     "build": "tsup",
+    "test": "vitest",
+    "test:run": "vitest run",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
@@ -38,6 +46,7 @@
     "@opentui/keymap": "^0.4.1",
     "@opentui/solid": "^0.4.1",
     "solid-js": "^1.9.12",
-    "tsup": "^8.5.1"
+    "tsup": "^8.5.1",
+    "vitest": "^4.1.9"
   }
 }