@jeffreyjyz/opencode-command-code 0.3.12 → 0.3.14

package/dist/index.js

@@ -4063,7 +4063,7 @@ var commandCodeV2 = {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.3.12",
+  version: "0.3.14",
   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",

package/dist/sidebar/usageDb.d.ts

@@ -16,8 +16,14 @@ export declare function periodStart(usage: {
  * 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.
+ *
+ * Given a `sessionID`, the scan is scoped to that conversation and `sinceMs` is
+ * ignored — the panel shows "this model in this session" beside the session's
+ * own total, and two figures measuring different windows than each other read
+ * as a bug (the billing period had just rolled over, so the model row said 129
+ * while the session said 2.7K).
  */
-export declare function loadModelUsage(modelID: string, sinceMs: number, path?: string): ModelUsage | null;
+export declare function loadModelUsage(modelID: string, sinceMs: number, path?: string, sessionID?: string): ModelUsage | null;
 /**
  * Requests and cost for one session, so the panel can show what this
  * conversation has spent rather than only the period-to-date figure. Null when

package/dist/sidebar/windows.d.ts

@@ -9,9 +9,10 @@ export declare const WEEKLY_SECS: number;
  */
 export declare function elapsedPct(resetAtMs: number | undefined, durSecs: number, nowSecs: number): number | undefined;
 /**
- * `elapsedPct` as text: a seven-day window forty minutes in is 0.4%, and "0%"
- * reads as "not started". Non-zero fractions below a percent render "<1%".
- * Exact zero stays "0%".
+ * `elapsedPct` as text, one decimal: a seven-day window forty minutes in is
+ * "0.4%". Only a fraction too small to show at one decimal (<0.05%) reads
+ * "<0.1%", so a just-started window is not mistaken for an unstarted one.
+ * Exact zero stays "0.0%".
  */
 export declare function elapsedLabel(resetAtMs: number | undefined, durSecs: number, nowSecs: number): string | undefined;
 /**

package/dist/tui.js

@@ -458,15 +458,15 @@ function elapsedPct(resetAtMs, durSecs, nowSecs) {
   if (nowSecs < start)
     return;
   const pct = (nowSecs - start) / durSecs * 100;
-  return Math.round(Math.min(100, Math.max(0, pct)));
+  return Math.round(Math.min(100, Math.max(0, pct)) * 10) / 10;
 }
 function elapsedLabel(resetAtMs, durSecs, nowSecs) {
   const pct = elapsedPct(resetAtMs, durSecs, nowSecs);
   if (pct === undefined)
     return;
   if (pct === 0 && nowSecs > Math.floor(resetAtMs / 1000) - durSecs)
-    return "<1%";
-  return `${pct}%`;
+    return "<0.1%";
+  return `${pct.toFixed(1)}%`;
 }
 function paceEtaSecs(resetAtMs, durSecs, used, cap, nowSecs) {
   if (typeof resetAtMs !== "number" || !Number.isFinite(resetAtMs))
@@ -551,14 +551,14 @@ function windowRows(label, w, now, durSecs) {
   if (!w || typeof w.cap !== "number" || w.cap <= 0)
     return [];
   const used = typeof w.used === "number" ? w.used : 0;
-  const pct = Math.round(used / w.cap * 100);
+  const pct = used / w.cap * 100;
   const nowSecs = Math.floor(now / 1000);
   const elapsed = elapsedLabel(w.resetAt, durSecs, nowSecs);
   const eta = paceEtaSecs(w.resetAt, durSecs, used, w.cap, nowSecs);
   const reset = until(w.resetAt, now);
   const lead = w.exceeded ? "LIMIT EXCEEDED" : eta === undefined ? elapsed === undefined ? "" : `${elapsed} elapsed` : `cap in ${until(now + eta * 1000, now)}`;
   const detail = [lead, reset ? `resets ${reset}` : ""].filter(Boolean).join(" \xB7 ");
-  return [[label, `${money(used)}/${money(w.cap)} (${pct}%)`, w.exceeded ? "crit" : pctTone(pct)], ...detail ? [["", detail, "muted"]] : []];
+  return [[label, `${money(used)}/${money(w.cap)} (${pct.toFixed(1)}%)`, w.exceeded ? "crit" : pctTone(pct)], ...detail ? [["", detail, "muted"]] : []];
 }
 function monthlyDetail(usage, now) {
   const {
@@ -585,8 +585,8 @@ function usageRows(usage, now = Date.now()) {
   }
   if (typeof usage.monthlyCap === "number" && typeof usage.monthlyCredits === "number") {
     const used = Math.min(usage.monthlyCap, Math.max(0, usage.monthlyCap - usage.monthlyCredits));
-    const pct = usage.monthlyCap > 0 ? Math.round(used / usage.monthlyCap * 100) : 0;
-    rows.push(["Monthly", `${money(used)} / ${money(usage.monthlyCap)} (${pct}%)`, pctTone(pct)]);
+    const pct = usage.monthlyCap > 0 ? used / usage.monthlyCap * 100 : 0;
+    rows.push(["Monthly", `${money(used)} / ${money(usage.monthlyCap)} (${pct.toFixed(1)}%)`, pctTone(pct)]);
     const detail = monthlyDetail(usage, now);
     if (detail)
       rows.push(["", detail, "muted"]);
@@ -1913,8 +1913,8 @@ function windowRows2(label, spent, limit, share) {
     return [[label, `${money(spent.cost)} \xB7 ${count(spent.requests)} req`, "base"]];
   }
   const cap = limit * share;
-  const pct = cap > 0 ? Math.round(spent.cost / cap * 100) : 0;
-  const rows = [[label, `${money(spent.cost)}/${money(cap)} (${pct}%)`, pctTone(pct)]];
+  const pct = cap > 0 ? spent.cost / cap * 100 : 0;
+  const rows = [[label, `${money(spent.cost)}/${money(cap)} (${pct.toFixed(1)}%)`, pctTone(pct)]];
   if (spent.requests > 0)
     rows.push(["", `${count(spent.requests)} req`, "muted"]);
   return rows;
@@ -2087,20 +2087,14 @@ function usageDbPath() {
   const base = process.env.XDG_DATA_HOME ?? join3(homedir3(), ".local", "share");
   return join3(base, "opencode", "opencode.db");
 }
-function periodStart(usage, now = Date.now()) {
-  if (typeof usage.periodStartAt === "number")
-    return usage.periodStartAt;
-  const end = usage.periodEnd ? Date.parse(`${usage.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()) {
+function hasV2(db) {
+  const row = db.query("SELECT 1 AS found FROM sqlite_master WHERE type = 'table' AND name = 'session_message'").get();
+  return Boolean(row);
+}
+function loadModelUsage(modelID, sinceMs, path = usageDbPath(), sessionID) {
   let db;
   try {
     db = new Database(path, {
@@ -2110,8 +2104,26 @@ function loadModelUsage(modelID, sinceMs, path = usageDbPath()) {
     return null;
   }
   try {
+    if (hasV2(db)) {
+      const rows = db.query(`SELECT json_extract(data, '$.model.id') AS model, count(*) AS c
+					 FROM session_message
+					 WHERE type = 'assistant'
+					   ${sessionID ? "AND session_id = ?" : "AND time_created >= ?"}
+					 GROUP BY model`).all(sessionID ?? sinceMs);
+      const key = modelKey(modelID);
+      let requests = 0;
+      for (const row of rows) {
+        if (row.model && modelKey(row.model) === key)
+          requests += row.c;
+      }
+      return {
+        requests,
+        cost: 0
+      };
+    }
     const rows = db.query(`SELECT data, time_created FROM message
-				 WHERE data LIKE '%"tokens"%' AND time_created >= ?`).all(sinceMs);
+				 WHERE data LIKE '%"tokens"%'
+				   ${sessionID ? "AND session_id = ?" : "AND time_created >= ?"}`).all(sessionID ?? sinceMs);
     const key = modelKey(modelID);
     const seen = new Set;
     let requests = 0;
@@ -2154,6 +2166,14 @@ function loadSessionUsage(sessionID, path = usageDbPath()) {
     return null;
   }
   try {
+    if (hasV2(db)) {
+      const totals = db.query("SELECT cost FROM session_v2 WHERE id = ?").get(sessionID);
+      const counted = db.query("SELECT count(*) AS c FROM session_message WHERE session_id = ? AND type = 'assistant'").get(sessionID);
+      return {
+        requests: counted.c,
+        cost: typeof totals?.cost === "number" ? totals.cost : 0
+      };
+    }
     const rows = db.query(`SELECT id, data FROM message
 				 WHERE session_id = ? AND data LIKE '%"tokens"%'`).all(sessionID);
     const seen = new Set;
@@ -2186,7 +2206,7 @@ function loadSessionUsage(sessionID, path = usageDbPath()) {
 }
 
 // src/sidebar/useRows.ts
-var POLL_MS = 60000;
+var POLL_MS = 20000;
 function sessionKind(providerID) {
   if (!providerID)
     return "unknown";
@@ -2237,10 +2257,10 @@ function useRows(activeModelId, providerID, sessionID) {
   const [sessionUsage, setSessionUsage] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
   loadMeta().then(setMeta).catch(() => {});
-  const refreshModelUsage = (id, sinceMs) => {
+  const refreshModelUsage = (id) => {
     if (!id)
       return;
-    const fresh = loadModelUsage(id, sinceMs);
+    const fresh = loadModelUsage(id, 0, usageDbPath(), sessionID());
     if (fresh)
       rememberModelUsage(id, fresh);
     setModelUsage(lastModelUsage);
@@ -2255,7 +2275,7 @@ function useRows(activeModelId, providerID, sessionID) {
         const snapshot = await loadUsage();
         rememberSnapshot(snapshot);
         setUsage(usageRows(snapshot));
-        refreshModelUsage(activeModelId(), periodStart(snapshot));
+        refreshModelUsage(activeModelId());
       } else if (kind === "go" || kind === "zen") {
         setZen(await loadZen());
       }
@@ -2272,9 +2292,10 @@ function useRows(activeModelId, providerID, sessionID) {
   });
   createEffect(() => {
     const id = activeModelId();
-    if (sessionKind(providerID()) !== "ours" || !id)
+    const session = sessionID();
+    if (sessionKind(providerID()) !== "ours" || !id || !session)
       return;
-    refreshModelUsage(id, periodStart(lastSnapshot ?? {}));
+    refreshModelUsage(id);
   });
   const usageFor = (id) => {
     const seen = modelUsage();

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jeffreyjyz/opencode-command-code",
- "version": "0.3.12",
+ "version": "0.3.14",
  "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",