@jeffreyjyz/opencode-command-code 0.2.8 → 0.2.11

package/dist/sidebar/rows.d.ts

@@ -19,6 +19,11 @@ export interface WindowUsage {
     used?: number;
     resetAt?: number;
 }
+/** One model's usage for the account's current billing period. */
+export interface ModelUsage {
+    requests: number;
+    cost: number;
+}
 export interface Usage {
     plan?: string;
     monthlyCap?: number;
@@ -38,8 +43,9 @@ export declare function count(value: number): string;
 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. */
-export declare function modelRows(meta: ModelMeta | undefined): 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[];
 /**
  * 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

@@ -0,0 +1,16 @@
+import { type ModelUsage } from "./rows";
+/** opencode's message store: `OPENCODE_DB`, else the XDG data dir. */
+export declare function usageDbPath(): string;
+/**
+ * Start of the billing period a cmduse snapshot reports, as epoch ms. cmduse
+ * publishes only `periodEnd` (YYYY-MM-DD), so the start is that date one
+ * calendar month back. Falls back to the last 30 days when it is missing.
+ */
+export declare function periodStart(periodEnd: string | undefined, now?: number): number;
+/**
+ * Requests and cost for one model since `sinceMs`. Null when the store is
+ * 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.
+ */
+export declare function loadModelUsage(modelID: string, sinceMs: number, path?: string): ModelUsage | null;

package/dist/sidebar/windows.d.ts

@@ -0,0 +1,10 @@
+/** 5-hour window length in seconds. Mirrors cmduse_core::FIVE_HOUR_SECS. */
+export declare const FIVE_HOUR_SECS: number;
+/** Weekly window length in seconds. Mirrors cmduse_core::WEEKLY_SECS. */
+export declare const WEEKLY_SECS: number;
+/**
+ * Percentage of a rolling window that has elapsed, or undefined when the
+ * window has not started (or has no reset time). `nowSecs` is whole seconds —
+ * the same unit cmduse-core's vectors pin.
+ */
+export declare function elapsedPct(resetAtMs: number | undefined, durSecs: number, nowSecs: number): number | undefined;

package/dist/tui.d.ts

@@ -1,6 +1,6 @@
 /** @jsxImportSource @opentui/solid */
 import type { RGBA } from "@opentui/core";
-import { Plugin } from "@opencode/plugin/tui";
+import type { Plugin as TuiPluginNs } from "@opencode/plugin/tui";
 interface V1Api {
     slots: {
         register: (config: {
@@ -31,10 +31,10 @@ interface V1Api {
 }
 /** v1 half — snake_case slot map registered through `api.slots`. */
 export declare const tui: (api: V1Api) => Promise<void>;
-export declare const commandCodeTui: Plugin.Definition;
+export declare const commandCodeTui: TuiPluginNs.Definition;
 declare const _default: {
     tui: (api: V1Api) => Promise<void>;
     id: string;
-    setup: (context: Plugin.Context) => Promise<Plugin.Cleanup | void> | Plugin.Cleanup | void;
+    setup: (context: TuiPluginNs.Context) => Promise<TuiPluginNs.Cleanup | void> | TuiPluginNs.Cleanup | void;
 };
 export default _default;

package/dist/tui.js

@@ -8,7 +8,6 @@ import { createComponent as _$createComponent } from "@opentui/solid";
 import { createTextNode as _$createTextNode } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
-import { Plugin } from "@opencode/plugin/tui";
 import { For, Show, createEffect, createMemo, createSignal, onCleanup } from "solid-js";
 
 // src/cli.ts
@@ -389,6 +388,22 @@ function canonicalizeModelId(model) {
   return findKnown(stripDate(model)) ?? model;
 }
 
+// src/sidebar/windows.ts
+var FIVE_HOUR_SECS = 5 * 3600;
+var WEEKLY_SECS = 7 * 86400;
+function elapsedPct(resetAtMs, durSecs, nowSecs) {
+  if (typeof resetAtMs !== "number" || !Number.isFinite(resetAtMs))
+    return;
+  const resetSecs = Math.floor(resetAtMs / 1000);
+  if (resetSecs < durSecs)
+    return;
+  const start = resetSecs - durSecs;
+  if (nowSecs < start)
+    return;
+  const pct = (nowSecs - start) / durSecs * 100;
+  return Math.round(Math.min(100, Math.max(0, pct)));
+}
+
 // src/sidebar/rows.ts
 var TIER_DISPLAY = {
   opensource: "open source",
@@ -425,13 +440,15 @@ function until(epoch, now = Date.now()) {
   const days = Math.floor(hours / 24);
   return hours % 24 ? `${days}d ${hours % 24}h` : `${days}d`;
 }
-function windowRow(label, w, now) {
+function windowRow(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 elapsed = elapsedPct(w.resetAt, durSecs, Math.floor(now / 1000));
   const reset = until(w.resetAt, now);
-  return [label, `${money(used)} / ${money(w.cap)} (${pct}%)${reset ? ` \xB7 resets ${reset}` : ""}`];
+  const parts = [`${money(used)} / ${money(w.cap)} (${pct}%)`, ...elapsed === undefined ? [] : [`${elapsed}% elapsed`], ...reset ? [`resets ${reset}`] : []];
+  return [label, parts.join(" \xB7 ")];
 }
 function usageRows(usage, now = Date.now()) {
   if (!usage)
@@ -446,10 +463,10 @@ function usageRows(usage, now = Date.now()) {
     const pct = usage.monthlyCap > 0 ? Math.round(used / usage.monthlyCap * 100) : 0;
     rows.push(["Monthly", `${money(used)} / ${money(usage.monthlyCap)} (${pct}%)`]);
   }
-  const five = windowRow("5-hour", usage.fiveHour, now);
+  const five = windowRow("5-hour", usage.fiveHour, now, FIVE_HOUR_SECS);
   if (five)
     rows.push(five);
-  const week = windowRow("Weekly", usage.weekly, now);
+  const week = windowRow("Weekly", usage.weekly, now, WEEKLY_SECS);
   if (week)
     rows.push(week);
   if (typeof usage.requests === "number" || typeof usage.cost === "number") {
@@ -462,10 +479,14 @@ function usageRows(usage, now = Date.now()) {
   }
   return rows;
 }
-function modelRows(meta) {
+function modelRows(meta, usage) {
   if (!meta)
     return [];
   const rows = [["Model", meta.name]];
+  if (usage) {
+    const spent = usage.cost > 0 ? ` \xB7 ${money(usage.cost)}` : "";
+    rows.push(["Usage (this model)", `${count(usage.requests)} req${spent}`]);
+  }
   if (meta.tier)
     rows.push(["Tier", TIER_DISPLAY[meta.tier]]);
   if (typeof meta.allowance === "number")
@@ -593,6 +614,72 @@ async function loadUsage() {
   return parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"]));
 }
 
+// src/sidebar/usageDb.ts
+import { Database } from "bun:sqlite";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+function usageDbPath() {
+  if (process.env.OPENCODE_DB)
+    return process.env.OPENCODE_DB;
+  const base = process.env.XDG_DATA_HOME ?? join2(homedir2(), ".local", "share");
+  return join2(base, "opencode", "opencode.db");
+}
+function periodStart(periodEnd, now = Date.now()) {
+  const end = periodEnd ? Date.parse(`${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()) {
+  let db;
+  try {
+    db = new Database(path, {
+      readonly: true
+    });
+  } catch {
+    return null;
+  }
+  try {
+    const rows = db.query(`SELECT data, time_created FROM message
+				 WHERE data LIKE '%"tokens"%' AND time_created >= ?`).all(sinceMs);
+    const key = modelKey(modelID);
+    const seen = new Set;
+    let requests = 0;
+    let cost = 0;
+    for (const row of rows) {
+      let data;
+      try {
+        data = JSON.parse(row.data);
+      } catch {
+        continue;
+      }
+      if (data.role !== "assistant" || !data.modelID || !data.tokens)
+        continue;
+      if (modelKey(data.modelID) !== key)
+        continue;
+      const id = `${data.modelID}@${row.time_created}`;
+      if (seen.has(id))
+        continue;
+      seen.add(id);
+      requests += 1;
+      cost += usage(data.cost);
+    }
+    return {
+      requests,
+      cost
+    };
+  } catch {
+    return null;
+  } finally {
+    db.close();
+  }
+}
+
 // src/tui.tsx
 var ID = "command-code.tui";
 var POLL_MS = 30000;
@@ -628,10 +715,14 @@ function Panel(props) {
 function useRows(activeModelId, active) {
   const [usage, setUsage] = createSignal([]);
   const [meta, setMeta] = createSignal(new Map);
+  const [modelUsage, setModelUsage] = createSignal();
   loadMeta().then(setMeta).catch(() => {});
   const refresh = async () => {
     try {
-      setUsage(usageRows(await loadUsage()));
+      const snapshot = await loadUsage();
+      setUsage(usageRows(snapshot));
+      const id = activeModelId();
+      setModelUsage(id ? loadModelUsage(id, periodStart(snapshot.periodEnd)) ?? undefined : undefined);
     } catch {}
   };
   createEffect(() => {
@@ -650,7 +741,7 @@ function useRows(activeModelId, active) {
       ...found,
       tier: found.tier ?? (id ? tierFor(id) : undefined)
     } : undefined;
-    return [...usage(), ...modelRows(model)];
+    return [...usage(), ...modelRows(model, modelUsage())];
   });
 }
 var isOurs = (providerID) => Boolean(providerID?.startsWith("command-code"));
@@ -690,7 +781,7 @@ function PanelV2(props) {
     muted: () => ctx.theme.text.subdued
   });
 }
-var commandCodeTui = Plugin.define({
+var commandCodeTui = {
   id: ID,
   setup(ctx) {
     ctx.ui.slot({
@@ -741,7 +832,7 @@ var commandCodeTui = Plugin.define({
       }
     });
   }
-});
+};
 var tui_default = {
   ...commandCodeTui,
   tui

package/dist/v2.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "@opencode/plugin";
+import type { Plugin as PluginNs } from "@opencode/plugin";
 import { type CmdModel } from "./models";
 export declare const PLUGIN_ID = "command-code";
 export declare const PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
@@ -15,9 +15,10 @@ type Lane = {
     reasoningField?: string;
 };
 export type { Lane };
-/** API/known model → v2 Model.Info. Every Command Code model shares
- * capabilities and pricing (subscription credits, not per-token); only the
- * open lane needs the reasoning round-trip field. */
+export declare const TOOL_DESCRIPTION = "Fetch live Command Code plan/usage: plan name, monthly credits, 5-hour & weekly windows, billing-period summary. Pass arg='plans' for the plan comparison table only, or extra cmduse flags (e.g. '--tz +05:30 daily').";
+/** API/known model → v2 Model.Info. Capabilities, variants and $/1M cost all
+ * come from the generated catalog (the listing API publishes none of them);
+ * only the open lane needs the reasoning round-trip field. */
 export declare function toV2Model(m: CmdModel, lane: Lane): unknown;
 /** Instant static seed from gating.json's known model ids, split by wire lane.
  * Replaced by the gated live list once the background fetch lands; also the
@@ -37,4 +38,10 @@ type CredentialContext = {
  * back to CMD_API_KEY / ~/.commandcode/auth.json. Resolved per call — a
  * /connect mid-session must be picked up. */
 export declare function credentialKey(ctx: CredentialContext): Promise<string | undefined>;
-export declare const commandCodeV2: Plugin.Plugin;
+/**
+ * opencode validates the plugin *by decoding* the default export against its
+ * own `Plugin` interface (identity `define` on both sides), so the package is
+ * only needed for types. Keeps the runtime dependency surface to opencode's
+ * own rewrite list (@opentui/*, solid-js).
+ */
+export declare const commandCodeV2: PluginNs.Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jeffreyjyz/opencode-command-code",
- "version": "0.2.8",
+ "version": "0.2.11",
  "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",
@@ -13,18 +13,20 @@
   "build": "rm -rf dist && bun build src/index.ts --outdir dist --target bun --external @opencode-ai/plugin --external @opencode/plugin --external @opencode/plugin/tui && bun scripts/build-tui.ts && tsc -p tsconfig.build.json",
   "test": "bun test",
   "typecheck": "tsc --noEmit",
-  "build:tui": "bun scripts/build-tui.ts"
+  "build:tui": "bun scripts/build-tui.ts",
+  "extract:catalog": "bun scripts/extract-catalog.ts"
  },
  "dependencies": {
-  "@opencode-ai/plugin": "*",
-  "@opencode/plugin": "^2.0.11",
   "@opentui/core": "^0.5.4",
   "@opentui/solid": "^0.5.4",
-  "solid-js": "1.9.12"
+  "solid-js": "1.9.12",
+  "zod": "4.1.8"
  },
  "devDependencies": {
   "@types/bun": "latest",
-  "typescript": "^5"
+  "typescript": "^5",
+  "@opencode-ai/plugin": "*",
+  "@opencode/plugin": "^2.0.11"
  },
  "files": [
   "dist",