@jeffreyjyz/opencode-command-code 0.3.14 → 0.3.16

package/dist/sidebar/data.d.ts

@@ -9,6 +9,14 @@ import { type ZenUsage } from "./zen";
 export declare const SPAWN_OPTIONS: Parameters<typeof spawn>[2];
 /** Parse `cmduse -1 --json` into the usage snapshot. */
 export declare function parseUsageJson(text: string): Usage;
+/**
+ * A snapshot is only usable when cmduse actually reached the account API.
+ * `-1 --json` exits 0 on failure and then carries the defaults (plan "Free", no
+ * windows) beside an `error`; painting that over a good snapshot is what made
+ * the Monthly row flash during an outage. Throw so the caller keeps the last
+ * snapshot, exactly as it does when the CLI is missing.
+ */
+export declare function requireSnapshot(usage: Usage): Usage;
 /**
  * Parse `mpc --json` into per-model meta: the CommandCode fields at the top
  * level and the OpenCode Go / Zen side under `oc`, so one lookup serves either
@@ -17,7 +25,9 @@ export declare function parseUsageJson(text: string): Usage;
 export declare function parseMpcJson(text: string): Map<string, ModelMeta>;
 /** mpc's catalog, cached on disk: it scrapes live docs over the network. */
 export declare function loadMeta(): Promise<Map<string, ModelMeta>>;
-/** One usage snapshot from cmduse. Throws when cmduse is missing or fails. */
+/** One usage snapshot from cmduse. Throws when cmduse is missing, fails, or
+ * returns the errored defaults its JSON carries when the account API is
+ * unreachable (see `requireSnapshot`). */
 export declare function loadUsage(): Promise<Usage>;
 /**
  * One OpenCode Go / Zen snapshot from ocuse, which reads opencode's own store

package/dist/sidebar/rows.d.ts

@@ -51,6 +51,14 @@ export interface ModelMeta {
     };
     intelligence?: number;
     tps?: number;
+    /**
+     * Promotion CommandCode is running on this model (0.3.13): the badge from
+     * the docs row, with its expiry line when the page publishes one.
+     */
+    deal?: {
+        badge: string;
+        ends?: string;
+    };
     /**
      * The OpenCode Go / Zen side of the same mpc row (0.4.0): the CommandCode
      * fields above are the default, this is what a Go/Zen session reads.
@@ -93,6 +101,14 @@ export interface Usage {
     periodEnd?: string;
     requests?: number;
     cost?: number;
+    /**
+     * cmduse's own fetch error. `cmduse -1 --json` still exits 0 when the account
+     * API is unreachable, and then publishes the *defaults* (plan "Free", no
+     * windows) beside this string — the human renderer hides that fake frame, and
+     * a consumer must too, or it paints "Free" with no Monthly row over a good
+     * snapshot. See `loadUsage`.
+     */
+    error?: string;
 }
 /** Money at credit scale: cents, but "$60" not "$60.00". */
 export declare function money(value: number): string;
@@ -105,8 +121,14 @@ export declare function until(epoch: number | undefined, now?: number): string;
 export declare function usageRows(usage: Usage | undefined, now?: number): 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, and
- * this session's own totals under that (0.4.0). */
-export declare function modelRows(meta: ModelMeta | undefined, usage?: ModelUsage, session?: ModelUsage): SidebarRow[];
+ * this session's own totals under that (0.4.0).
+ *
+ * `fallbackName` keeps the block on screen when the catalog is unavailable: the
+ * `Usage (this model)`/`Session` rows come from the local store and need no
+ * network, so an outage must not hide them behind a failed mpc spawn. The name
+ * is the only thing borrowed, and it is the session's own id when no catalog
+ * row names the model. */
+export declare function modelRows(meta: ModelMeta | undefined, usage?: ModelUsage, session?: ModelUsage, fallbackName?: string): 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/useRows.d.ts

@@ -1,4 +1,4 @@
-import { type ModelUsage, type SidebarRow, type Usage } from "./rows";
+import { type ModelMeta, type ModelUsage, type SidebarRow, type Usage } from "./rows";
 /**
  * Which family a session's provider belongs to, as far as this panel is
  * concerned. `unknown` is the frame during a session switch, before the host has
@@ -24,4 +24,10 @@ export declare function rememberModelUsage(id: string, usage: ModelUsage): void;
  * beats blanking it, the same call `wasOurs` makes for the account block.
  */
 export declare function seededModelUsage(id: string | undefined): ModelUsage | undefined;
+/** Keep a catalog for the next panel that needs it. An empty map is never
+ * remembered: it cannot be distinguished from "mpc returned nothing" and would
+ * wipe a good catalog. */
+export declare function rememberMeta(meta: Map<string, ModelMeta>): void;
+/** Rows to paint before mpc's catalog is read again. */
+export declare function seededMeta(): Map<string, ModelMeta>;
 export declare function useRows(activeModelId: () => string | undefined, providerID: () => string | undefined, sessionID: () => string | undefined): import("solid-js").Accessor<SidebarRow[]>;

package/dist/sidebar/zen.d.ts

@@ -32,5 +32,8 @@ export interface ZenUsage {
 }
 /** Parse `ocuse -1 --json`. Anything malformed reads as "no usage". */
 export declare function parseZenJson(text: string): ZenUsage;
-/** The OpenCode Go / Zen panel: period windows, a rule, then the active model. */
-export declare function zenRows(usage: ZenUsage | undefined, meta: ModelMeta | undefined, session?: ModelUsage): SidebarRow[];
+/** The OpenCode Go / Zen panel: period windows, a rule, then the active model.
+ * Like `modelRows`, `fallbackName` (the session's own id) keeps the model block
+ * — and the local `Session` figure — on screen when mpc's catalog is
+ * unreachable; only the catalog-derived rows then drop out. */
+export declare function zenRows(usage: ZenUsage | undefined, meta: ModelMeta | undefined, session?: ModelUsage, fallbackName?: string): SidebarRow[];

package/dist/tui.js

@@ -603,24 +603,35 @@ function usageRows(usage, now = Date.now()) {
   }
   return rows;
 }
-function modelRows(meta, usage, session) {
-  if (!meta)
+function modelRows(meta, usage, session, fallbackName) {
+  const name = meta?.name ?? fallbackName;
+  if (!name)
     return [];
-  const rows = [["Model", clip(meta.name, valueWidth("Model")), "strong", true]];
+  const rows = [["Model", clip(name, valueWidth("Model")), "strong", true]];
   if (usage) {
-    const spent = usage.cost > 0 ? ` \xB7 ${money(usage.cost)}` : "";
-    rows.push(["Usage (this model)", `${count(usage.requests)} req${spent}`, "base"]);
+    rows.push(["Usage (this model)", `${count(usage.requests)} req`, "base"]);
+    const spend = usage.cost > 0 ? money(usage.cost) : "";
+    const share = usage.cost > 0 && session && session.cost > 0 ? `${Math.round(usage.cost / session.cost * 100)}% of session` : "";
+    const detail = [spend, share].filter(Boolean).join(" \xB7 ");
+    if (detail)
+      rows.push(["", detail, "muted"]);
   }
   if (session) {
     const spent = session.cost > 0 ? ` \xB7 ${money(session.cost)}` : "";
     rows.push(["Session", `${count(session.requests)} req${spent}`, "base"]);
   }
+  if (!meta)
+    return rows;
   if (meta.tier)
     rows.push(["Tier", TIER_DISPLAY[meta.tier], "base"]);
   else if (meta.minPlan)
     rows.push(["Min plan", meta.minPlan, "base"]);
   if (typeof meta.allowance === "number")
     rows.push(["Allowance", `${money(meta.allowance)}/mo`, "base"]);
+  if (meta.deal) {
+    const ends = meta.deal.ends?.match(/([A-Z][a-z]{2})[a-z]*\s+(\d{1,2})/);
+    rows.push(["Deal", ends ? `${meta.deal.badge} \xB7 ends ${ends[1]} ${ends[2]}` : meta.deal.badge, "ok"]);
+  }
   if (meta.rates) {
     const cache = [`cache read ${rate(meta.rates.cacheRead)}`];
     if (typeof meta.rates.cacheWrite === "number" && meta.rates.cacheWrite > 0) {
@@ -1919,7 +1930,7 @@ function windowRows2(label, spent, limit, share) {
     rows.push(["", `${count(spent.requests)} req`, "muted"]);
   return rows;
 }
-function zenRows(usage, meta, session) {
+function zenRows(usage, meta, session, fallbackName) {
   if (!usage)
     return [];
   const oc = meta?.oc;
@@ -1931,13 +1942,16 @@ function zenRows(usage, meta, session) {
   rows.push(...windowRows2("Month", mine?.month ?? usage.totals.month, limit, GO_WINDOW_SHARE.month));
   rows.push(["Period", `${count(usage.totals.month.requests)} requests \xB7 ${money(usage.totals.month.cost)}`, "base"]);
   rows.push(separator());
-  if (!meta)
+  const name = meta?.name ?? fallbackName;
+  if (!name)
     return rows;
-  rows.push(["Model", clip(meta.name, valueWidth("Model")), "strong", true]);
+  rows.push(["Model", clip(name, valueWidth("Model")), "strong", true]);
   if (session) {
     const spent = session.cost > 0 ? ` \xB7 ${money(session.cost)}` : "";
     rows.push(["Session", `${count(session.requests)} req${spent}`, "base"]);
   }
+  if (!meta)
+    return rows;
   if (typeof limit === "number") {
     rows.push(["Allowance", `${money(limit)}/mo`, "base"]);
   }
@@ -1961,20 +1975,36 @@ function zenRows(usage, meta, session) {
 var CMDUSE = cmduseCandidates();
 var MPC = ["mpc", join2(homedir2(), ".bun/bin/mpc"), "/opt/homebrew/bin/mpc"];
 var OCUSE = [process.env.OCUSE_BIN, "ocuse", "/opt/homebrew/bin/ocuse", "/usr/local/bin/ocuse"].filter((bin) => Boolean(bin));
-var CACHE_TTL_MS = 6 * 60 * 60 * 1000;
+var CACHE_TTL_MS = 60 * 60 * 1000;
 var SPAWN_OPTIONS = {
   stdio: ["ignore", "pipe", "pipe"],
   detached: true
 };
+var CHILD_TIMEOUT_MS = 30000;
 function run(bin, args) {
   return new Promise((resolve, reject) => {
     const child = spawn2(bin, args, SPAWN_OPTIONS);
     const out = [];
     const err = [];
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      child.kill();
+      reject(new Error(`${bin} ${args.join(" ")}: timed out after ${CHILD_TIMEOUT_MS}ms`));
+    }, CHILD_TIMEOUT_MS);
+    const done = (fn) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      fn();
+    };
     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)}`)));
+    child.on("error", (e) => done(() => reject(e)));
+    child.on("close", (code) => done(() => code === 0 ? resolve(Buffer.concat(out).toString("utf8")) : reject(new Error(`${bin} ${args.join(" ")}: exit ${code} ${Buffer.concat(err).toString("utf8").slice(-200)}`))));
   });
 }
 async function runFirst(candidates, args) {
@@ -2014,9 +2044,15 @@ function parseUsageJson(text) {
     periodStartAt: typeof raw.periodStartAt === "number" ? raw.periodStartAt : undefined,
     periodEndAt: typeof raw.periodEndAt === "number" ? raw.periodEndAt : undefined,
     requests: typeof summary.requests === "number" ? summary.requests : undefined,
-    cost: typeof summary.cost === "number" ? summary.cost : undefined
+    cost: typeof summary.cost === "number" ? summary.cost : undefined,
+    error: typeof raw.error === "string" && raw.error ? raw.error : undefined
   };
 }
+function requireSnapshot(usage) {
+  if (usage.error)
+    throw new Error(usage.error);
+  return usage;
+}
 function parseMpcJson(text) {
   const body = JSON.parse(text);
   const meta = new Map;
@@ -2032,6 +2068,10 @@ function parseMpcJson(text) {
       rates: cc?.pricing,
       intelligence: cc?.ability ?? undefined,
       tps: cc?.tps ?? undefined,
+      deal: cc?.deal?.badge !== undefined ? {
+        badge: cc.deal.badge,
+        ends: cc.deal.ends
+      } : undefined,
       oc: oc ? {
         provider: oc.provider,
         plan: oc.plan,
@@ -2071,7 +2111,7 @@ async function loadMeta() {
   return meta;
 }
 async function loadUsage() {
-  return parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"]));
+  return requireSnapshot(parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"])));
 }
 async function loadZen() {
   return parseZenJson(await runFirst(OCUSE, ["-1", "--json"]));
@@ -2105,20 +2145,25 @@ function loadModelUsage(modelID, sinceMs, path = usageDbPath(), sessionID) {
   }
   try {
     if (hasV2(db)) {
-      const rows = db.query(`SELECT json_extract(data, '$.model.id') AS model, count(*) AS c
+      const rows = db.query(`SELECT json_extract(data, '$.model.id') AS model,
+					        count(*) AS c,
+					        coalesce(sum(json_extract(data, '$.cost')), 0) AS cost
 					 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;
+      let cost = 0;
       for (const row of rows) {
-        if (row.model && modelKey(row.model) === key)
+        if (row.model && modelKey(row.model) === key) {
           requests += row.c;
+          cost += row.cost;
+        }
       }
       return {
         requests,
-        cost: 0
+        cost
       };
     }
     const rows = db.query(`SELECT data, time_created FROM message
@@ -2206,7 +2251,7 @@ function loadSessionUsage(sessionID, path = usageDbPath()) {
 }
 
 // src/sidebar/useRows.ts
-var POLL_MS = 20000;
+var POLL_MS = 5000;
 function sessionKind(providerID) {
   if (!providerID)
     return "unknown";
@@ -2249,14 +2294,29 @@ function seededModelUsage(id) {
     return lastModelUsage.usage;
   return lastModelUsage.key === modelKey(id) ? lastModelUsage.usage : undefined;
 }
+var lastMeta;
+function rememberMeta(meta) {
+  if (meta.size > 0)
+    lastMeta = meta;
+}
+function seededMeta() {
+  return lastMeta ?? new Map;
+}
 function useRows(activeModelId, providerID, sessionID) {
   const [usage, setUsage] = createSignal(seededRows());
   const [zen, setZen] = createSignal();
-  const [meta, setMeta] = createSignal(new Map);
+  const [meta, setMeta] = createSignal(seededMeta());
   const [modelUsage, setModelUsage] = createSignal(lastModelUsage);
   const [sessionUsage, setSessionUsage] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
-  loadMeta().then(setMeta).catch(() => {});
+  const refreshMeta = () => {
+    loadMeta().then((next) => {
+      rememberMeta(next);
+      if (next.size > 0)
+        setMeta(next);
+    }).catch(() => {});
+  };
+  refreshMeta();
   const refreshModelUsage = (id) => {
     if (!id)
       return;
@@ -2265,12 +2325,17 @@ function useRows(activeModelId, providerID, sessionID) {
       rememberModelUsage(id, fresh);
     setModelUsage(lastModelUsage);
   };
+  let inFlight = false;
   const refresh = async () => {
-    const kind = sessionKind(providerID());
-    const session = sessionID();
-    if (session)
-      setSessionUsage(loadSessionUsage(session) ?? undefined);
+    if (inFlight)
+      return;
+    inFlight = true;
     try {
+      const kind = sessionKind(providerID());
+      const session = sessionID();
+      refreshMeta();
+      if (session)
+        setSessionUsage(loadSessionUsage(session) ?? undefined);
       if (kind === "ours") {
         const snapshot = await loadUsage();
         rememberSnapshot(snapshot);
@@ -2279,7 +2344,9 @@ function useRows(activeModelId, providerID, sessionID) {
       } else if (kind === "go" || kind === "zen") {
         setZen(await loadZen());
       }
-    } catch {}
+    } catch {} finally {
+      inFlight = false;
+    }
   };
   createEffect(() => {
     const kind = sessionKind(providerID());
@@ -2310,15 +2377,16 @@ function useRows(activeModelId, providerID, sessionID) {
       return [];
     const id = activeModelId();
     const found = id ? meta().get(modelKey(id)) ?? meta().get(id) : undefined;
+    const fallbackName = id ? id.split("/").pop() ?? id : undefined;
     if (kind === "go" || kind === "zen") {
-      return zenRows(zen(), found, sessionUsage());
+      return zenRows(zen(), found, sessionUsage(), fallbackName);
     }
     const model = found ? {
       ...found,
       tier: found.tier ?? (id ? tierFor(id) : undefined),
       minPlan: id ? minPlan(id) : undefined
     } : undefined;
-    return [...usage(), separator(), ...modelRows(model, usageFor(id), sessionUsage())];
+    return [...usage(), separator(), ...modelRows(model, usageFor(id), sessionUsage(), fallbackName)];
   });
 }
 

package/package.json

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