@jeffreyjyz/opencode-command-code 0.2.7 → 0.2.9

package/dist/sidebar/data.d.ts

@@ -1,4 +1,11 @@
+import { spawn } from "node:child_process";
 import { type ModelMeta, type Usage } from "./rows";
+/** `detached` is load-bearing, not tidiness: it starts the child in its own
+ * session, so it has no controlling terminal. cmduse's snapshot() paints a
+ * "fetching usage…" spinner straight to /dev/tty — piping stdout/stderr does
+ * not stop it — which would corrupt the opencode TUI this process inherits its
+ * tty from. Detaching makes that open fail; stdout/stderr stay piped. */
+export declare const SPAWN_OPTIONS: Parameters<typeof spawn>[2];
 /** Parse `cmduse -1 --json` into the usage snapshot. */
 export declare function parseUsageJson(text: string): Usage;
 /** Parse `mpc --json` into per-model meta, CommandCode side only. */

package/dist/sidebar/rows.d.ts

@@ -19,6 +19,11 @@ export interface WindowUsage {
     used?: number;
     resetAt?: number;
 }
+/** One model's usage for the account's current billing period. */
+export interface ModelUsage {
+    requests: number;
+    cost: number;
+}
 export interface Usage {
     plan?: string;
     monthlyCap?: number;
@@ -38,8 +43,9 @@ export declare function count(value: number): string;
 export declare function until(epoch: number | undefined, now?: number): string;
 /** Plan + rolling windows + period totals, from a cmduse snapshot. */
 export declare function usageRows(usage: Usage | undefined, now?: number): SidebarRow[];
-/** Active model's allowance, rates and benchmarks, from mpc's catalog. */
-export declare function modelRows(meta: ModelMeta | undefined): SidebarRow[];
+/** Active model's allowance, rates and benchmarks, from mpc's catalog; its
+ * period usage (when the store has it) rides directly under the model name. */
+export declare function modelRows(meta: ModelMeta | undefined, usage?: ModelUsage): SidebarRow[];
 /**
  * Canonical key for a model id, mirroring mpc's normalizeKey: lowercase, drop
  * the vendor prefix and any parenthetical, strip punctuation. Used to match the

package/dist/sidebar/usageDb.d.ts

@@ -0,0 +1,16 @@
+import { type ModelUsage } from "./rows";
+/** opencode's message store: `OPENCODE_DB`, else the XDG data dir. */
+export declare function usageDbPath(): string;
+/**
+ * Start of the billing period a cmduse snapshot reports, as epoch ms. cmduse
+ * publishes only `periodEnd` (YYYY-MM-DD), so the start is that date one
+ * calendar month back. Falls back to the last 30 days when it is missing.
+ */
+export declare function periodStart(periodEnd: string | undefined, now?: number): number;
+/**
+ * Requests and cost for one model since `sinceMs`. Null when the store is
+ * missing or unreadable, so callers can fall back to omitting the row.
+ * Matching is on the canonical key: the session id and the stored modelID can
+ * differ by vendor prefix/punctuation.
+ */
+export declare function loadModelUsage(modelID: string, sinceMs: number, path?: string): ModelUsage | null;

package/dist/tui.js

@@ -9,7 +9,7 @@ import { createTextNode as _$createTextNode } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
 import { Plugin } from "@opencode/plugin/tui";
-import { For, Show, createMemo, createSignal, onCleanup } from "solid-js";
+import { For, Show, createEffect, createMemo, createSignal, onCleanup } from "solid-js";
 
 // src/cli.ts
 import { spawn } from "child_process";
@@ -462,10 +462,14 @@ function usageRows(usage, now = Date.now()) {
   }
   return rows;
 }
-function modelRows(meta) {
+function modelRows(meta, usage) {
   if (!meta)
     return [];
   const rows = [["Model", meta.name]];
+  if (usage) {
+    const spent = usage.cost > 0 ? ` \xB7 ${money(usage.cost)}` : "";
+    rows.push(["Usage", `${count(usage.requests)} req${spent}`]);
+  }
   if (meta.tier)
     rows.push(["Tier", TIER_DISPLAY[meta.tier]]);
   if (typeof meta.allowance === "number")
@@ -493,15 +497,17 @@ function tierFor(modelId) {
 var CMDUSE = ["cmduse", "/opt/homebrew/bin/cmduse", "/usr/local/bin/cmduse"];
 var MPC = ["mpc", join(homedir(), ".bun/bin/mpc"), "/opt/homebrew/bin/mpc"];
 var CACHE_TTL_MS = 6 * 60 * 60 * 1000;
+var SPAWN_OPTIONS = {
+  stdio: ["ignore", "pipe", "pipe"],
+  detached: true
+};
 function run(bin, args) {
   return new Promise((resolve, reject) => {
-    const child = spawn2(bin, args, {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
+    const child = spawn2(bin, args, SPAWN_OPTIONS);
     const out = [];
     const err = [];
-    child.stdout.on("data", (d) => out.push(d));
-    child.stderr.on("data", (d) => err.push(d));
+    child.stdout?.on("data", (d) => out.push(d));
+    child.stderr?.on("data", (d) => err.push(d));
     child.on("error", reject);
     child.on("close", (code) => code === 0 ? resolve(Buffer.concat(out).toString("utf8")) : reject(new Error(`${bin} ${args.join(" ")}: exit ${code} ${Buffer.concat(err).toString("utf8").slice(-200)}`)));
   });
@@ -591,6 +597,72 @@ async function loadUsage() {
   return parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"]));
 }
 
+// src/sidebar/usageDb.ts
+import { Database } from "bun:sqlite";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+function usageDbPath() {
+  if (process.env.OPENCODE_DB)
+    return process.env.OPENCODE_DB;
+  const base = process.env.XDG_DATA_HOME ?? join2(homedir2(), ".local", "share");
+  return join2(base, "opencode", "opencode.db");
+}
+function periodStart(periodEnd, now = Date.now()) {
+  const end = periodEnd ? Date.parse(`${periodEnd}T23:59:59`) : Number.NaN;
+  if (!Number.isFinite(end))
+    return now - 30 * 24 * 60 * 60 * 1000;
+  const start = new Date(end);
+  start.setMonth(start.getMonth() - 1);
+  return start.getTime();
+}
+function usage(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function loadModelUsage(modelID, sinceMs, path = usageDbPath()) {
+  let db;
+  try {
+    db = new Database(path, {
+      readonly: true
+    });
+  } catch {
+    return null;
+  }
+  try {
+    const rows = db.query(`SELECT data, time_created FROM message
+				 WHERE data LIKE '%"tokens"%' AND time_created >= ?`).all(sinceMs);
+    const key = modelKey(modelID);
+    const seen = new Set;
+    let requests = 0;
+    let cost = 0;
+    for (const row of rows) {
+      let data;
+      try {
+        data = JSON.parse(row.data);
+      } catch {
+        continue;
+      }
+      if (data.role !== "assistant" || !data.modelID || !data.tokens)
+        continue;
+      if (modelKey(data.modelID) !== key)
+        continue;
+      const id = `${data.modelID}@${row.time_created}`;
+      if (seen.has(id))
+        continue;
+      seen.add(id);
+      requests += 1;
+      cost += usage(data.cost);
+    }
+    return {
+      requests,
+      cost
+    };
+  } catch {
+    return null;
+  } finally {
+    db.close();
+  }
+}
+
 // src/tui.tsx
 var ID = "command-code.tui";
 var POLL_MS = 30000;
@@ -626,15 +698,23 @@ function Panel(props) {
 function useRows(activeModelId, active) {
   const [usage, setUsage] = createSignal([]);
   const [meta, setMeta] = createSignal(new Map);
+  const [modelUsage, setModelUsage] = createSignal();
   loadMeta().then(setMeta).catch(() => {});
   const refresh = async () => {
     try {
-      setUsage(usageRows(await loadUsage()));
+      const snapshot = await loadUsage();
+      setUsage(usageRows(snapshot));
+      const id = activeModelId();
+      setModelUsage(id ? loadModelUsage(id, periodStart(snapshot.periodEnd)) ?? undefined : undefined);
     } catch {}
   };
-  refresh();
-  const timer = setInterval(() => void refresh(), POLL_MS);
-  onCleanup(() => clearInterval(timer));
+  createEffect(() => {
+    if (!active())
+      return;
+    refresh();
+    const timer = setInterval(() => void refresh(), POLL_MS);
+    onCleanup(() => clearInterval(timer));
+  });
   return createMemo(() => {
     if (!active())
       return [];
@@ -644,7 +724,7 @@ function useRows(activeModelId, active) {
       ...found,
       tier: found.tier ?? (id ? tierFor(id) : undefined)
     } : undefined;
-    return [...usage(), ...modelRows(model)];
+    return [...usage(), ...modelRows(model, modelUsage())];
   });
 }
 var isOurs = (providerID) => Boolean(providerID?.startsWith("command-code"));

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jeffreyjyz/opencode-command-code",
- "version": "0.2.7",
+ "version": "0.2.9",
  "description": "Command Code provider + usage dashboard for opencode: two providers (Anthropic wire for Claude, OpenAI wire for everything else) against api.commandcode.ai, live model list, plan gating, /cmd-usage. Requires the cmduse CLI for usage rendering.",
  "type": "module",
  "main": "dist/index.js",