@jeffreyjyz/opencode-command-code 0.3.11 → 0.3.12

package/dist/index.js

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

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { type ModelMeta, type Usage } from "./rows";
+import { type ZenUsage } from "./zen";
 /** `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
@@ -8,9 +9,19 @@ import { type ModelMeta, type Usage } from "./rows";
 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. */
+/**
+ * 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
+ * kind of session. Rows that carry only one side are kept.
+ */
 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. */
 export declare function loadUsage(): Promise<Usage>;
+/**
+ * One OpenCode Go / Zen snapshot from ocuse, which reads opencode's own store
+ * (those providers have no usage API). Throws when ocuse is missing or fails,
+ * and the caller then omits the panel.
+ */
+export declare function loadZen(): Promise<ZenUsage>;

package/dist/sidebar/panel.d.ts

@@ -45,6 +45,7 @@ export declare function legacyColors(theme: {
 export declare function mono(colors: PanelColors): PanelColors;
 /** Bold title, then one line per row. Renders nothing when there are no rows. */
 export declare function Panel(props: {
+    title: () => string;
     rows: () => SidebarRow[];
     colors: () => PanelColors;
 }): import("solid-js").JSX.Element;

package/dist/sidebar/rows.d.ts

@@ -51,11 +51,30 @@ export interface ModelMeta {
     };
     intelligence?: number;
     tps?: number;
+    /**
+     * 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.
+     */
+    oc?: {
+        provider?: string;
+        plan?: string;
+        allowance?: number;
+        rates?: {
+            input: number;
+            output: number;
+            cacheRead: number;
+            cacheWrite?: number | null;
+        };
+        ability?: number;
+        tps?: number;
+    };
 }
 export interface WindowUsage {
     cap?: number;
     used?: number;
     resetAt?: number;
+    /** The account API's own over-cap flag (cmduse passes it through). */
+    exceeded?: boolean;
 }
 /** One model's usage for the account's current billing period. */
 export interface ModelUsage {
@@ -85,8 +104,9 @@ 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; its
- * period usage (when the store has it) rides directly under the model name. */
-export declare function modelRows(meta: ModelMeta | undefined, usage?: ModelUsage): SidebarRow[];
+ * 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[];
 /**
  * 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

@@ -18,3 +18,10 @@ export declare function periodStart(usage: {
  * differ by vendor prefix/punctuation.
  */
 export declare function loadModelUsage(modelID: string, sinceMs: number, path?: 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
+ * the store is missing or unreadable, and callers then omit the row. Rows are
+ * keyed by their primary key: message rows get rewritten in place.
+ */
+export declare function loadSessionUsage(sessionID: string, path?: string): ModelUsage | null;

package/dist/sidebar/useRows.d.ts

@@ -1,12 +1,14 @@
 import { type ModelUsage, type SidebarRow, type Usage } from "./rows";
-/** Which provider a session is on, as far as this panel is concerned. */
-export type SessionKind = "ours" | "other" | "unknown";
 /**
- * `unknown` is the frame during a session switch, before the host has resolved
- * the new session's model. It must not be read as "another provider", or the
- * panel blanks and refetches on every tab change.
+ * 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
+ * resolved the new session's model; it must not be read as someone else's, or
+ * the panel blanks and refetches on every tab change.
  */
+export type SessionKind = "ours" | "go" | "zen" | "other" | "unknown";
 export declare function sessionKind(providerID: string | undefined): SessionKind;
+/** The section's title, per family. */
+export declare function panelTitle(kind: SessionKind): string;
 /** Keep an account snapshot for the next panel that needs it. */
 export declare function rememberSnapshot(snapshot: Usage): void;
 /** Rows to paint before this panel's first fetch of the session completes. */
@@ -22,4 +24,4 @@ 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;
-export declare function useRows(activeModelId: () => string | undefined, providerID: () => string | undefined): import("solid-js").Accessor<SidebarRow[]>;
+export declare function useRows(activeModelId: () => string | undefined, providerID: () => string | undefined, sessionID: () => string | undefined): import("solid-js").Accessor<SidebarRow[]>;

package/dist/sidebar/windows.d.ts

@@ -14,3 +14,14 @@ export declare function elapsedPct(resetAtMs: number | undefined, durSecs: numbe
  * Exact zero stays "0%".
  */
 export declare function elapsedLabel(resetAtMs: number | undefined, durSecs: number, nowSecs: number): string | undefined;
+/**
+ * Seconds until the cap is reached at the window's current burn rate, or
+ * undefined when there is nothing honest to warn about: no reset, a window that
+ * has not started or is already rolling over, under a tenth elapsed (a flat-rate
+ * projection off a few seconds of data is noise), no spend yet, a cap already
+ * reached, or a cap that would land after the reset anyway.
+ *
+ * Mirrors `cmduse_core::pace_eta`; the `paceEta` vectors in the shared
+ * `core/conformance.json` are asserted against this in test/conformance.test.ts.
+ */
+export declare function paceEtaSecs(resetAtMs: number | undefined, durSecs: number, used: number, cap: number, nowSecs: number): number | undefined;

package/dist/sidebar/zen.d.ts

@@ -0,0 +1,36 @@
+import { type ModelMeta, type ModelUsage, type SidebarRow } from "./rows";
+/** Go's documented per-model window shares of the monthly allowance. */
+export declare const GO_WINDOW_SHARE: {
+    readonly fiveHour: 0.2;
+    readonly weekly: 0.5;
+    readonly month: 1;
+};
+export interface ZenTotals {
+    requests: number;
+    cost: number;
+    tokens: number;
+}
+export interface ZenModel {
+    id: string;
+    provider: string;
+    /** Monthly allowance the docs give this model, when they give one. */
+    limit?: number;
+    fiveHour: ZenTotals;
+    weekly: ZenTotals;
+    month: ZenTotals;
+}
+export interface ZenUsage {
+    periodStart?: number;
+    source?: string;
+    totals: {
+        fiveHour: ZenTotals;
+        weekly: ZenTotals;
+        month: ZenTotals;
+    };
+    /** Keyed by canonical model key, the same normalisation the CC side matches on. */
+    models: Map<string, ZenModel>;
+}
+/** 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[];

package/dist/tui.js

@@ -120,7 +120,6 @@ async function runCmduse(arg, opts = {}) {
 
 // src/sidebar/panel.tsx
 import { createComponent as _$createComponent } from "@opentui/solid";
-import { createTextNode as _$createTextNode } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
 import { spread as _$spread } from "@opentui/solid";
 import { mergeProps as _$mergeProps } from "@opentui/solid";
@@ -469,6 +468,26 @@ function elapsedLabel(resetAtMs, durSecs, nowSecs) {
     return "<1%";
   return `${pct}%`;
 }
+function paceEtaSecs(resetAtMs, durSecs, used, cap, nowSecs) {
+  if (typeof resetAtMs !== "number" || !Number.isFinite(resetAtMs))
+    return;
+  const reset = Math.floor(resetAtMs / 1000);
+  if (reset < durSecs)
+    return;
+  const start = reset - durSecs;
+  if (nowSecs <= start || nowSecs >= reset)
+    return;
+  const elapsed = nowSecs - start;
+  if (elapsed / durSecs < 0.1)
+    return;
+  const rate = used / elapsed;
+  if (rate <= 0 || used >= cap)
+    return;
+  const secsToCap = (cap - used) / rate;
+  if (secsToCap >= reset - nowSecs)
+    return;
+  return secsToCap;
+}
 
 // src/sidebar/rows.ts
 function pctTone(pct) {
@@ -533,10 +552,13 @@ function windowRows(label, w, now, durSecs) {
     return [];
   const used = typeof w.used === "number" ? w.used : 0;
   const pct = Math.round(used / w.cap * 100);
-  const elapsed = elapsedLabel(w.resetAt, durSecs, Math.floor(now / 1000));
+  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 detail = [...elapsed === undefined ? [] : [`${elapsed} elapsed`], ...reset ? [`resets ${reset}`] : []].join(" \xB7 ");
-  return [[label, `${money(used)}/${money(w.cap)} (${pct}%)`, pctTone(pct)], ...detail ? [["", detail, "muted"]] : []];
+  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"]] : []];
 }
 function monthlyDetail(usage, now) {
   const {
@@ -581,7 +603,7 @@ function usageRows(usage, now = Date.now()) {
   }
   return rows;
 }
-function modelRows(meta, usage) {
+function modelRows(meta, usage, session) {
   if (!meta)
     return [];
   const rows = [["Model", clip(meta.name, valueWidth("Model")), "strong", true]];
@@ -589,6 +611,10 @@ function modelRows(meta, usage) {
     const spent = usage.cost > 0 ? ` \xB7 ${money(usage.cost)}` : "";
     rows.push(["Usage (this model)", `${count(usage.requests)} req${spent}`, "base"]);
   }
+  if (session) {
+    const spent = session.cost > 0 ? ` \xB7 ${money(session.cost)}` : "";
+    rows.push(["Session", `${count(session.requests)} req${spent}`, "base"]);
+  }
   if (meta.tier)
     rows.push(["Tier", TIER_DISPLAY[meta.tier], "base"]);
   else if (meta.minPlan)
@@ -704,7 +730,7 @@ function Panel(props) {
       var _el$7 = _$createElement("box"), _el$8 = _$createElement("text"), _el$9 = _$createElement("b");
       _$insertNode(_el$7, _el$8);
       _$insertNode(_el$8, _el$9);
-      _$insertNode(_el$9, _$createTextNode(`Command Code`));
+      _$insert(_el$9, () => props.title());
       _$insert(_el$7, _$createComponent(For, {
         get each() {
           return props.rows();
@@ -1834,8 +1860,107 @@ import { spawn as spawn2 } from "child_process";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { homedir as homedir2 } from "os";
 import { dirname, join as join2 } from "path";
+
+// src/sidebar/zen.ts
+var GO_WINDOW_SHARE = {
+  fiveHour: 0.2,
+  weekly: 0.5,
+  month: 1
+};
+function totals(value) {
+  const v = value ?? {};
+  const num = (key) => typeof v[key] === "number" ? v[key] : 0;
+  return {
+    requests: num("requests"),
+    cost: num("cost"),
+    tokens: num("tokens")
+  };
+}
+function parseZenJson(text) {
+  let body;
+  try {
+    body = JSON.parse(text);
+  } catch {
+    body = {};
+  }
+  const models = new Map;
+  for (const raw of body.models ?? []) {
+    if (typeof raw.id !== "string")
+      continue;
+    models.set(modelKey(raw.id), {
+      id: raw.id,
+      provider: typeof raw.provider === "string" ? raw.provider : "",
+      limit: typeof raw.limit === "number" ? raw.limit : undefined,
+      fiveHour: totals(raw.fiveHour),
+      weekly: totals(raw.weekly),
+      month: totals(raw.month)
+    });
+  }
+  const top = body.totals ?? {};
+  return {
+    periodStart: typeof body.periodStart === "number" ? body.periodStart : undefined,
+    source: typeof body.source === "string" ? body.source : undefined,
+    totals: {
+      fiveHour: totals(top.fiveHour),
+      weekly: totals(top.weekly),
+      month: totals(top.month)
+    },
+    models
+  };
+}
+function windowRows2(label, spent, limit, share) {
+  if (typeof limit !== "number" || limit <= 0) {
+    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)]];
+  if (spent.requests > 0)
+    rows.push(["", `${count(spent.requests)} req`, "muted"]);
+  return rows;
+}
+function zenRows(usage, meta, session) {
+  if (!usage)
+    return [];
+  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 limit = oc?.allowance ?? mine?.limit;
+  rows.push(...windowRows2("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, limit, GO_WINDOW_SHARE.fiveHour));
+  rows.push(...windowRows2("Weekly", mine?.weekly ?? usage.totals.weekly, limit, GO_WINDOW_SHARE.weekly));
+  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)
+    return rows;
+  rows.push(["Model", clip(meta.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 (typeof limit === "number") {
+    rows.push(["Allowance", `${money(limit)}/mo`, "base"]);
+  }
+  if (oc?.rates) {
+    const cache = [`cache read ${rate(oc.rates.cacheRead)}`];
+    if (typeof oc.rates.cacheWrite === "number" && oc.rates.cacheWrite > 0) {
+      cache.push(`write ${rate(oc.rates.cacheWrite)}`);
+    }
+    rows.push(["Rates", `${rate(oc.rates.input)}/${rate(oc.rates.output)} in/out`, "base"]);
+    rows.push(["", cache.join(" \xB7 "), "muted"]);
+  }
+  if (typeof oc?.ability === "number") {
+    rows.push(["Intelligence", String(oc.ability), "base"]);
+  }
+  if (typeof oc?.tps === "number")
+    rows.push(["Tok/s", String(oc.tps), "base"]);
+  return rows;
+}
+
+// src/sidebar/data.ts
 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 SPAWN_OPTIONS = {
   stdio: ["ignore", "pipe", "pipe"],
@@ -1874,7 +1999,8 @@ function parseUsageJson(text) {
     return {
       cap: typeof w.cap === "number" ? w.cap : undefined,
       used: typeof w.used === "number" ? w.used : undefined,
-      resetAt: typeof w.resetAt === "number" ? w.resetAt : undefined
+      resetAt: typeof w.resetAt === "number" ? w.resetAt : undefined,
+      exceeded: typeof w.exceeded === "boolean" ? w.exceeded : undefined
     };
   };
   const summary = raw.summary ?? {};
@@ -1895,16 +2021,25 @@ function parseMpcJson(text) {
   const body = JSON.parse(text);
   const meta = new Map;
   for (const row of body.rows ?? []) {
-    const cc = row.cc;
-    if (!cc || !row.name)
+    if (!row.name || !row.cc && !row.oc)
       continue;
+    const cc = row.cc;
+    const oc = row.oc;
     const entry = {
       key: row.key ?? modelKey(row.name),
       name: row.name,
-      allowance: cc.allowance,
-      rates: cc.pricing,
-      intelligence: cc.ability ?? undefined,
-      tps: cc.tps ?? undefined
+      allowance: cc?.allowance,
+      rates: cc?.pricing,
+      intelligence: cc?.ability ?? undefined,
+      tps: cc?.tps ?? undefined,
+      oc: oc ? {
+        provider: oc.provider,
+        plan: oc.plan,
+        allowance: oc.allowance,
+        rates: oc.pricing,
+        ability: oc.ability ?? undefined,
+        tps: oc.tps ?? undefined
+      } : undefined
     };
     meta.set(entry.key, entry);
     meta.set(modelKey(row.name), entry);
@@ -1938,6 +2073,9 @@ async function loadMeta() {
 async function loadUsage() {
   return parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"]));
 }
+async function loadZen() {
+  return parseZenJson(await runFirst(OCUSE, ["-1", "--json"]));
+}
 
 // src/sidebar/usageDb.ts
 import { Database } from "bun:sqlite";
@@ -2006,13 +2144,69 @@ function loadModelUsage(modelID, sinceMs, path = usageDbPath()) {
     db.close();
   }
 }
+function loadSessionUsage(sessionID, path = usageDbPath()) {
+  let db;
+  try {
+    db = new Database(path, {
+      readonly: true
+    });
+  } catch {
+    return null;
+  }
+  try {
+    const rows = db.query(`SELECT id, data FROM message
+				 WHERE session_id = ? AND data LIKE '%"tokens"%'`).all(sessionID);
+    const seen = new Set;
+    let requests = 0;
+    let cost = 0;
+    for (const row of rows) {
+      if (seen.has(row.id))
+        continue;
+      seen.add(row.id);
+      let data;
+      try {
+        data = JSON.parse(row.data);
+      } catch {
+        continue;
+      }
+      if (data.role !== "assistant" || !data.tokens)
+        continue;
+      requests += 1;
+      cost += usage(data.cost);
+    }
+    return {
+      requests,
+      cost
+    };
+  } catch {
+    return null;
+  } finally {
+    db.close();
+  }
+}
 
 // src/sidebar/useRows.ts
 var POLL_MS = 60000;
 function sessionKind(providerID) {
   if (!providerID)
     return "unknown";
-  return providerID.startsWith("command-code") ? "ours" : "other";
+  if (providerID.startsWith("command-code"))
+    return "ours";
+  if (providerID.startsWith("opencode-go"))
+    return "go";
+  if (providerID === "opencode" || providerID.startsWith("opencode-zen"))
+    return "zen";
+  return "other";
+}
+function shows(kind) {
+  return kind === "ours" || kind === "go" || kind === "zen";
+}
+function panelTitle(kind) {
+  if (kind === "ours")
+    return "Command Code";
+  if (kind === "zen")
+    return "OpenCode Zen";
+  return "OpenCode Go";
 }
 var lastSnapshot;
 function rememberSnapshot(snapshot) {
@@ -2035,10 +2229,12 @@ function seededModelUsage(id) {
     return lastModelUsage.usage;
   return lastModelUsage.key === modelKey(id) ? lastModelUsage.usage : undefined;
 }
-function useRows(activeModelId, providerID) {
+function useRows(activeModelId, providerID, sessionID) {
   const [usage, setUsage] = createSignal(seededRows());
+  const [zen, setZen] = createSignal();
   const [meta, setMeta] = createSignal(new Map);
   const [modelUsage, setModelUsage] = createSignal(lastModelUsage);
+  const [sessionUsage, setSessionUsage] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
   loadMeta().then(setMeta).catch(() => {});
   const refreshModelUsage = (id, sinceMs) => {
@@ -2050,16 +2246,24 @@ function useRows(activeModelId, providerID) {
     setModelUsage(lastModelUsage);
   };
   const refresh = async () => {
+    const kind = sessionKind(providerID());
+    const session = sessionID();
+    if (session)
+      setSessionUsage(loadSessionUsage(session) ?? undefined);
     try {
-      const snapshot = await loadUsage();
-      rememberSnapshot(snapshot);
-      setUsage(usageRows(snapshot));
-      refreshModelUsage(activeModelId(), periodStart(snapshot));
+      if (kind === "ours") {
+        const snapshot = await loadUsage();
+        rememberSnapshot(snapshot);
+        setUsage(usageRows(snapshot));
+        refreshModelUsage(activeModelId(), periodStart(snapshot));
+      } else if (kind === "go" || kind === "zen") {
+        setZen(await loadZen());
+      }
     } catch {}
   };
   createEffect(() => {
     const kind = sessionKind(providerID());
-    if (kind !== "ours")
+    if (!shows(kind))
       return;
     setWasOurs(true);
     refresh();
@@ -2081,18 +2285,19 @@ function useRows(activeModelId, providerID) {
   };
   return createMemo(() => {
     const kind = sessionKind(providerID());
-    if (kind === "other")
-      return [];
-    if (kind === "unknown" && !wasOurs())
+    if (!shows(kind) && (kind === "other" || !wasOurs()))
       return [];
     const id = activeModelId();
     const found = id ? meta().get(modelKey(id)) ?? meta().get(id) : undefined;
+    if (kind === "go" || kind === "zen") {
+      return zenRows(zen(), found, sessionUsage());
+    }
     const model = found ? {
       ...found,
       tier: found.tier ?? (id ? tierFor(id) : undefined),
       minPlan: id ? minPlan(id) : undefined
     } : undefined;
-    return [...usage(), separator(), ...modelRows(model, usageFor(id))];
+    return [...usage(), separator(), ...modelRows(model, usageFor(id), sessionUsage())];
   });
 }
 
@@ -2101,8 +2306,9 @@ var ID = "command-code.tui";
 var themed = (colors) => loadPrefs().colors ? colors : mono(colors);
 function PanelV1(props) {
   const current = () => props.api.state.session.get(props.sessionID)?.model;
-  const rows = useRows(() => current()?.id, () => current()?.providerID);
+  const rows = useRows(() => current()?.id, () => current()?.providerID, () => props.sessionID);
   return _$createComponent2(Panel, {
+    title: () => panelTitle(sessionKind(current()?.providerID)),
     rows,
     colors: () => themed(legacyColors(props.api.theme.current))
   });
@@ -2127,8 +2333,9 @@ function PanelV2(props) {
     ctx
   } = props;
   const current = () => ctx.data.session.get(props.sessionID)?.model;
-  const rows = useRows(() => current()?.id, () => current()?.providerID);
+  const rows = useRows(() => current()?.id, () => current()?.providerID, () => props.sessionID);
   return _$createComponent2(Panel, {
+    title: () => panelTitle(sessionKind(current()?.providerID)),
     rows,
     colors: () => themed(hostColors(ctx.theme))
   });

package/package.json

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