@jeffreyjyz/opencode-command-code 0.3.13 → 0.3.15

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.

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"]);
@@ -608,8 +608,12 @@ function modelRows(meta, usage, session) {
     return [];
   const rows = [["Model", clip(meta.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)}` : "";
@@ -621,6 +625,10 @@ function modelRows(meta, usage, session) {
     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) {
@@ -1913,8 +1921,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;
@@ -1961,7 +1969,7 @@ 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
@@ -2032,6 +2040,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,
@@ -2105,20 +2117,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 +2223,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";
@@ -2256,7 +2273,10 @@ function useRows(activeModelId, providerID, sessionID) {
   const [modelUsage, setModelUsage] = createSignal(lastModelUsage);
   const [sessionUsage, setSessionUsage] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
-  loadMeta().then(setMeta).catch(() => {});
+  const refreshMeta = () => {
+    loadMeta().then(setMeta).catch(() => {});
+  };
+  refreshMeta();
   const refreshModelUsage = (id) => {
     if (!id)
       return;
@@ -2268,6 +2288,7 @@ function useRows(activeModelId, providerID, sessionID) {
   const refresh = async () => {
     const kind = sessionKind(providerID());
     const session = sessionID();
+    refreshMeta();
     if (session)
       setSessionUsage(loadSessionUsage(session) ?? undefined);
     try {

package/package.json

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