@jeffreyjyz/opencode-command-code 0.5.0 → 0.5.3

package/dist/index.js

@@ -2414,7 +2414,7 @@ function superRefine(fn) {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.5.0",
+  version: "0.5.3",
   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/rows.d.ts

@@ -130,6 +130,24 @@ export declare function rate(value: number): string;
 export declare function count(value: number): string;
 /** "3h 12m" / "1d 20h" / "<1m" for a reset epoch. */
 export declare function until(epoch: number | undefined, now?: number): string;
+/** A rolling window as two or three rows: the use line, then resets plus whatever
+ * needs flagging, then an optional `extra` continuation. The lead segment follows
+ * cmduse's importance order — over-cap flag, then the cap ETA, then the
+ * informational elapsed share — because the 37-column budget fits exactly one of
+ * them beside the reset countdown.
+ *
+ * Shared by both panels: CommandCode passes four arguments (output unchanged),
+ * the OpenCode Go/Zen side adds the window's request count as `extra`, so
+ * `LIMIT EXCEEDED`, the tone, `cap in …`, `elapsed` and `resets` all have one
+ * implementation. */
+export declare function windowRows(label: string, w: WindowUsage | undefined, now: number, durSecs: number, extra?: string): SidebarRow[];
+/**
+ * The two store-backed rows for the active model — its requests under `Usage
+ * (this model)`, then this conversation's own totals under `Session`. They need
+ * no network, so both panels keep them when the catalog is missing, and both
+ * families build them here rather than in two places.
+ */
+export declare function localUsageRows(usage?: ModelUsage, session?: ModelUsage): SidebarRow[];
 /** 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; its

package/dist/sidebar/usageDb.d.ts

@@ -24,6 +24,21 @@ export declare function periodStart(usage: {
  * while the session said 2.7K).
  */
 export declare function loadModelUsage(modelID: string, sinceMs: number, path?: string, sessionID?: string): ModelUsage | null;
+/**
+ * The oldest in-window assistant turn for one model, as epoch ms — the start of
+ * the rolling window the Go/Zen panel needs. A rolling 5-hour/weekly window has
+ * no service-reported reset (Go has no usage API), but its clock does have a
+ * real start: the oldest request still inside it ages out at `start + window`,
+ * which is that window's honest reset. Null when the model has no turn in the
+ * window, or the store is missing/unreadable, so callers then omit the
+ * continuation exactly as before.
+ *
+ * Account-wide like ocuse's per-model window totals, so it is *not* scoped to a
+ * session: a rolling window counts the model's spend across every conversation.
+ * Matching is on the canonical key, the same normalisation `loadModelUsage` uses
+ * (the session id and the stored `modelID` differ by vendor prefix/punctuation).
+ */
+export declare function loadModelWindowStart(modelID: string, sinceMs: number, path?: string): number | 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/zen.d.ts

@@ -14,7 +14,15 @@ export interface ZenModel {
     month: ZenTotals;
 }
 export interface ZenUsage {
+    /**
+     * Billing period start, epoch ms: `periodStart` on current ocuse, or
+     * `periodStartAt` once it publishes the bounds (the same instants cmduse
+     * 0.7.2+ carries).
+     */
     periodStart?: number;
+    /** Billing period end, epoch ms. Optional: older ocuse does not publish it
+     * and the Monthly row must then degrade to spend alone. */
+    periodEndAt?: number;
     source?: string;
     totals: {
         fiveHour: ZenTotals;
@@ -26,8 +34,26 @@ export interface ZenUsage {
 }
 /** Parse `ocuse -1 --json`. Anything malformed reads as "no usage". */
 export declare function parseZenJson(text: string): ZenUsage;
+/**
+ * The starts of the active model's rolling windows, epoch ms: the oldest request
+ * still inside each one, from opencode's own store. The Go/Zen panel turns each
+ * into a reset via `rollingReset`; absent when no such request exists.
+ */
+export interface ZenWindowStarts {
+    fiveHour?: number;
+    weekly?: number;
+}
+/**
+ * A rolling window's reset, derived from the oldest request still inside it:
+ * that request leaves the window at `oldest + durSecs`, which is an honest reset
+ * epoch — unlike `now + durSecs`, a constant that would be noise in a usage
+ * panel. Undefined when there is no oldest request (an empty window), so the row
+ * keeps the same spend-only degrade it had before.
+ */
+export declare function rollingReset(startMs: number | undefined, durSecs: number): number | undefined;
 /** 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[];
+ * — and the local `Usage (this model)` / `Session` figures, which need no network
+ * — 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, modelUsage?: ModelUsage, session?: ModelUsage, fallbackName?: string, windows?: ZenWindowStarts): SidebarRow[];

package/dist/tui.js

@@ -621,7 +621,7 @@ function until(epoch, now = Date.now()) {
   const days = Math.floor(hours / 24);
   return hours % 24 ? `${days}d ${hours % 24}h` : `${days}d`;
 }
-function windowRows(label, w, now, durSecs) {
+function windowRows(label, w, now, durSecs, extra) {
   if (!w || typeof w.cap !== "number" || w.cap <= 0)
     return [];
   const used = typeof w.used === "number" ? w.used : 0;
@@ -632,7 +632,23 @@ function windowRows(label, w, now, durSecs) {
   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.toFixed(1)}%)`, 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"]] : [], ...extra ? [["", extra, "muted"]] : []];
+}
+function localUsageRows(usage, session) {
+  const rows = [];
+  if (usage) {
+    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.min(100, 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"]);
+  }
+  return rows;
 }
 function monthlyDetail(usage, now) {
   const {
@@ -681,19 +697,7 @@ function modelRows(meta, usage, session, fallbackName) {
   const name = meta?.name ?? fallbackName;
   if (!name)
     return [];
-  const rows = [["Model", clip(name, valueWidth("Model")), "strong", true]];
-  if (usage) {
-    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.min(100, 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"]);
-  }
+  const rows = [["Model", clip(name, valueWidth("Model")), "strong", true], ...localUsageRows(usage, session)];
   if (!meta)
     return rows;
   if (meta.tier)
@@ -2060,7 +2064,8 @@ function parseZenJson(text) {
   }
   const top = body.totals ?? {};
   return {
-    periodStart: typeof body.periodStart === "number" ? body.periodStart : undefined,
+    periodStart: typeof body.periodStartAt === "number" ? body.periodStartAt : typeof body.periodStart === "number" ? body.periodStart : undefined,
+    periodEndAt: typeof body.periodEndAt === "number" ? body.periodEndAt : undefined,
     source: typeof body.source === "string" ? body.source : undefined,
     totals: {
       fiveHour: totals(top.fiveHour),
@@ -2070,43 +2075,63 @@ function parseZenJson(text) {
     models
   };
 }
-function windowRows2(label, spent, limit, share) {
-  if (typeof limit !== "number" || limit <= 0) {
+function monthPeriod(usage) {
+  const {
+    periodStart,
+    periodEndAt
+  } = usage;
+  if (typeof periodStart !== "number" || typeof periodEndAt !== "number")
+    return;
+  const durSecs = Math.round((periodEndAt - periodStart) / 1000);
+  if (durSecs <= 0)
+    return;
+  return {
+    resetAt: periodEndAt,
+    durSecs
+  };
+}
+function rollingReset(startMs, durSecs) {
+  if (typeof startMs !== "number" || !Number.isFinite(startMs))
+    return;
+  return startMs + durSecs * 1000;
+}
+function zenWindow(label, spent, limit, share, now, durSecs, resetAt) {
+  const cap = typeof limit === "number" && limit > 0 ? limit * share : undefined;
+  if (cap === undefined) {
     return [[label, `${money(spent.cost)} \xB7 ${count(spent.requests)} req`, "base"]];
   }
-  const cap = limit * share;
-  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;
-}
-function zenRows(usage, meta, session, fallbackName) {
+  return windowRows(label, {
+    cap,
+    used: spent.cost,
+    resetAt,
+    exceeded: spent.cost >= cap
+  }, now, durSecs, spent.requests > 0 ? `${count(spent.requests)} req` : undefined);
+}
+function zenRows(usage, meta, modelUsage, session, fallbackName, windows) {
   if (!usage)
     return [];
+  const now = Date.now();
   const oc = meta?.oc;
   const rows = [["Plan", `${oc?.plan ?? "Go"} \xB7 limits per model`, "base"]];
-  const mine = meta ? usage.models.get(modelKey(meta.name)) : undefined;
+  const mine = usage.models.get(modelKey(fallbackName ?? "")) ?? (meta ? usage.models.get(modelKey(meta.name)) : undefined);
   const limit = oc?.allowance ?? mine?.limit;
   const cap = mine ? limit : undefined;
-  rows.push(...windowRows2("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, cap, GO_WINDOW_SHARE.fiveHour));
-  rows.push(...windowRows2("Weekly", mine?.weekly ?? usage.totals.weekly, cap, GO_WINDOW_SHARE.weekly));
-  rows.push(...windowRows2("Month", mine?.month ?? usage.totals.month, cap, GO_WINDOW_SHARE.month));
+  rows.push(...zenWindow("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, cap, GO_WINDOW_SHARE.fiveHour, now, FIVE_HOUR_SECS, rollingReset(windows?.fiveHour, FIVE_HOUR_SECS)));
+  rows.push(...zenWindow("Weekly", mine?.weekly ?? usage.totals.weekly, cap, GO_WINDOW_SHARE.weekly, now, WEEKLY_SECS, rollingReset(windows?.weekly, WEEKLY_SECS)));
+  const period = monthPeriod(usage);
+  rows.push(...zenWindow("Monthly", mine?.month ?? usage.totals.month, cap, GO_WINDOW_SHARE.month, now, period?.durSecs ?? 0, period?.resetAt));
   rows.push(["Period", `${count(usage.totals.month.requests)} requests \xB7 ${money(usage.totals.month.cost)}`, "base"]);
   rows.push(separator());
   const name = meta?.name ?? fallbackName;
   if (!name)
     return rows;
   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;
+  rows.push(...localUsageRows(modelUsage, session));
   if (typeof limit === "number") {
     rows.push(["Allowance", allowanceLabel(limit, oc?.free), "base"]);
   }
+  if (!meta)
+    return rows;
   if (oc?.rates) {
     const cache = [`cache read ${rate(oc.rates.cacheRead)}`];
     if (typeof oc.rates.cacheWrite === "number" && oc.rates.cacheWrite > 0) {
@@ -2355,6 +2380,53 @@ function loadModelUsage(modelID, sinceMs, path = usageDbPath(), sessionID) {
     db.close();
   }
 }
+function loadModelWindowStart(modelID, sinceMs, path = usageDbPath()) {
+  let db;
+  try {
+    db = new Database(path, {
+      readonly: true
+    });
+  } catch {
+    return null;
+  }
+  try {
+    const key = modelKey(modelID);
+    if (hasV2(db)) {
+      const rows = db.query(`SELECT json_extract(data, '$.model.id') AS model,
+					        min(time_created) AS start
+					 FROM session_message
+					 WHERE type = 'assistant' AND time_created >= ?
+					 GROUP BY model`).all(sinceMs);
+      for (const row of rows) {
+        if (row.model && modelKey(row.model) === key)
+          return row.start;
+      }
+      return null;
+    }
+    const rows = db.query(`SELECT data, time_created FROM message
+				 WHERE data LIKE '%"tokens"%' AND time_created >= ?`).all(sinceMs);
+    let oldest = null;
+    for (const row of rows) {
+      let data;
+      try {
+        data = JSON.parse(row.data);
+      } catch {
+        continue;
+      }
+      if (data.role !== "assistant" || !data.tokens || !data.modelID)
+        continue;
+      if (modelKey(data.modelID) !== key)
+        continue;
+      if (oldest === null || row.time_created < oldest)
+        oldest = row.time_created;
+    }
+    return oldest;
+  } catch {
+    return null;
+  } finally {
+    db.close();
+  }
+}
 function loadSessionUsage(sessionID, path = usageDbPath()) {
   let db;
   try {
@@ -2465,6 +2537,7 @@ function useRows(activeModelId, providerID, sessionID) {
   const [meta, setMeta] = createSignal(seededMeta());
   const [modelUsage, setModelUsage] = createSignal(lastModelUsage);
   const [sessionUsage, setSessionUsage] = createSignal();
+  const [modelWindows, setModelWindows] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
   const refreshMeta = () => {
     loadMeta(loadPrefs().ocPlan).then((next) => {
@@ -2485,6 +2558,15 @@ function useRows(activeModelId, providerID, sessionID) {
       rememberModelUsage(id, fresh, session);
     setModelUsage(lastModelUsage);
   };
+  const refreshModelWindows = (id) => {
+    if (!id)
+      return;
+    const now = Date.now();
+    setModelWindows({
+      fiveHour: loadModelWindowStart(id, now - FIVE_HOUR_SECS * 1000) ?? undefined,
+      weekly: loadModelWindowStart(id, now - WEEKLY_SECS * 1000) ?? undefined
+    });
+  };
   let inFlight = false;
   const refresh = async () => {
     if (inFlight)
@@ -2503,6 +2585,8 @@ function useRows(activeModelId, providerID, sessionID) {
         refreshModelUsage(activeModelId());
       } else if (kind === "go" || kind === "zen") {
         setZen(await loadZen(loadPrefs().ocPlan));
+        refreshModelUsage(activeModelId());
+        refreshModelWindows(activeModelId());
       }
     } catch {} finally {
       inFlight = false;
@@ -2520,7 +2604,12 @@ function useRows(activeModelId, providerID, sessionID) {
   createEffect(() => {
     const id = activeModelId();
     const session = sessionID();
-    if (sessionKind(providerID()) !== "ours" || !id || !session)
+    const kind = sessionKind(providerID());
+    if (!shows(kind) || !id)
+      return;
+    if (kind === "go" || kind === "zen")
+      refreshModelWindows(id);
+    if (!session)
       return;
     refreshModelUsage(id);
   });
@@ -2540,7 +2629,7 @@ function useRows(activeModelId, providerID, sessionID) {
     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(), fallbackName);
+      return zenRows(zen(), found, usageFor(id), sessionUsage(), fallbackName, modelWindows());
     }
     const model = found ? {
       ...found,

package/package.json

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