@jeffreyjyz/opencode-command-code 0.5.1 → 0.5.4

package/dist/api.d.ts

@@ -1,5 +1,3 @@
-export declare function authHeaders(key: string): Record<string, string>;
-export declare function getJson(path: string, key: string, timeoutMs?: number): Promise<unknown>;
 export type Whoami = {
     success: boolean;
     user?: {
@@ -30,13 +28,6 @@ export type Credits = {
         weekly?: Window;
     };
 };
-export type Summary = {
-    totalCount?: number;
-    totalCost?: number;
-    successRate?: number;
-    totalTokensIn?: number;
-    totalTokensOut?: number;
-};
 export type ProviderModelsResp = {
     data: Array<{
         id: string;
@@ -48,5 +39,4 @@ export type ProviderModelsResp = {
 export declare function whoami(key: string): Promise<Whoami>;
 export declare function subscriptions(key: string): Promise<SubData>;
 export declare function credits(key: string): Promise<Credits>;
-export declare function usageSummary(key: string): Promise<Summary>;
 export declare function providerModels(key: string): Promise<ProviderModelsResp>;

package/dist/cli.d.ts

@@ -1,3 +1,4 @@
+import { spawn } from "node:child_process";
 /** Fallback lookup paths: the opencode background service's PATH often lacks
  * the homebrew prefix, so the bare name alone is not enough. `CMDUSE_BIN` wins
  * when set — the dev-build hook the sibling cmduse consumers (mpc) honour too. */
@@ -6,6 +7,9 @@ export declare function cmduseCandidates(env?: Record<string, string | undefined
  * wins when set (the `bun link` dev hook oc-cmd-compare installs),
  * then the bun/homebrew fallbacks. */
 export declare function mpcCandidates(env?: Record<string, string | undefined>): string[];
+/** Same lookup for ocuse, the OpenCode Go/Zen reader shipped in the cmd-usage
+ * crate: `OCUSE_BIN` wins when set, then the homebrew fallbacks. */
+export declare function ocuseCandidates(env?: Record<string, string | undefined>): string[];
 /** Shell-words split: whitespace-separated, with single/double quoting and
  * backslash escapes ("--tz +05:30", arg='a b'). Unterminated quotes close at
  * end of input. */
@@ -24,14 +28,27 @@ export type RunOptions = {
     env?: Record<string, string>;
     /** Overridable for tests. */
     candidates?: readonly string[];
+    /** Extra spawn options. Excludes `stdio`: the callbacks below assume stdout
+     * and stderr are piped (the default here), so callers may only add fields
+     * that leave that contract intact — the sidebar passes `detached` (see
+     * constants/cli.ts; its own stdio equals the default). */
+    spawnOptions?: Omit<NonNullable<Parameters<typeof spawn>[2]>, "stdio">;
+    /** Kill the child after this many ms. The sidebar bounds each poll; the
+     * tool spawns leave it unset. */
+    timeoutMs?: number;
 };
 /** Run cmduse and return its plain-text stdout. Tries PATH, then common
  * homebrew locations; every candidate failing with ENOENT yields a single
  * install-hint error. */
-export declare function runCmduse(arg: string, opts?: RunOptions): Promise<string>;
+export declare function runCmduse(arg: string | readonly string[], opts?: RunOptions): Promise<string>;
 /** Run mpc and return its plain-text stdout (the per-model price
  * comparison). Same contract as runCmduse: `MPC_BIN` wins, then the
  * fallback paths; every candidate failing with ENOENT yields a
  * single install-hint error, and any other failure (a non-zero exit
  * included) surfaces immediately with mpc's last stderr lines. */
-export declare function runMpc(arg: string, opts?: RunOptions): Promise<string>;
+export declare function runMpc(arg: string | readonly string[], opts?: RunOptions): Promise<string>;
+/** Run ocuse and return its plain-text stdout (OpenCode Go/Zen usage). Same
+ * contract as runCmduse; ocuse ships in the cmd-usage crate, so its install
+ * hint is the same brew formula. A string arg is shell-split, an array used
+ * as-is. */
+export declare function runOcuse(arg: string | readonly string[], opts?: RunOptions): Promise<string>;

package/dist/constants/providers.d.ts

@@ -13,6 +13,8 @@ export declare const ZEN_PROVIDER_ID = "opencode";
 export declare const ZEN_PROVIDER_PREFIX = "opencode-zen";
 /** TUI plugin id (stable contract; test/tui.test.ts pins it). */
 export declare const TUI_ID = "command-code.tui";
+/** The v2 /cmd-usage slash command id (registered and bound in tui.tsx). */
+export declare const CMD_USAGE_COMMAND_ID = "command-code.cmd-usage";
 /** The cmd_usage tool description, shared by the v1 and v2 halves. */
 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').";
 /** The mpc_prices tool description, shared by the v1 and v2 halves. */

package/dist/constants/sidebar.d.ts

@@ -11,8 +11,9 @@ export declare const ROW_WIDTH = 37;
 export declare const TIER_DISPLAY: Readonly<Record<Category, string>>;
 /**
  * OpenCode Go plans the panel can render: the same token rates, different
- * per-model monthly limits. Which one a user is on is not discoverable (Go has
- * no usage API and the store records no subscription), so it is a setting.
+ * per-model monthly limits. Which one a user is on is not discoverable even with
+ * the usage endpoint in hand — it answers percentages, not a plan id, and the
+ * store records no subscription — so it is a setting.
  */
 export declare const OC_PLANS: readonly ["go", "go-plus"];
 export type OcPlan = (typeof OC_PLANS)[number];

package/dist/index.js

@@ -2414,7 +2414,7 @@ function superRefine(fn) {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.5.1",
+  version: "0.5.4",
   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",
@@ -3230,6 +3230,11 @@ var MPC_BIN_CANDIDATES = [
   join(homedir(), ".bun/bin/mpc"),
   "/opt/homebrew/bin/mpc"
 ];
+var OCUSE_BIN_CANDIDATES = [
+  "ocuse",
+  "/opt/homebrew/bin/ocuse",
+  "/usr/local/bin/ocuse"
+];
 
 // src/constants/cli.ts
 var DEFAULT_ARGS = ["-1", "--plain"];
@@ -3256,6 +3261,11 @@ function mpcCandidates(env = process.env) {
   return candidates.filter((bin) => Boolean(bin));
 }
 var MPC_CANDIDATES = mpcCandidates();
+function ocuseCandidates(env = process.env) {
+  const candidates = [env.OCUSE_BIN, ...OCUSE_BIN_CANDIDATES];
+  return candidates.filter((bin) => Boolean(bin));
+}
+var OCUSE_CANDIDATES = ocuseCandidates();
 function splitCliArgs(input) {
   const out = [];
   let cur = "";
@@ -3318,36 +3328,53 @@ function runOnce(bin, args, opts, name = "cmduse") {
   return new Promise((resolve, reject) => {
     const child = spawn(bin, args, {
       env: { ...process.env, ...opts.env ?? {} },
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      ...opts.spawnOptions
     });
     const out = [];
     const err = [];
+    let settled = false;
+    const timer = opts.timeoutMs === undefined ? undefined : setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      child.kill();
+      reject(new Error(`${name} ${args.join(" ")}: timed out after ${opts.timeoutMs}ms`));
+    }, opts.timeoutMs);
     const onAbort = () => child.kill("SIGTERM");
     opts.signal?.addEventListener("abort", onAbort, { once: true });
+    const settle = (fn) => {
+      if (settled)
+        return;
+      settled = true;
+      if (timer)
+        clearTimeout(timer);
+      opts.signal?.removeEventListener("abort", onAbort);
+      fn();
+    };
     child.stdout.on("data", (d) => out.push(d));
     child.stderr.on("data", (d) => err.push(d));
-    child.on("error", (e) => {
-      opts.signal?.removeEventListener("abort", onAbort);
-      reject(e);
-    });
+    child.on("error", (e) => settle(() => reject(e)));
     child.on("close", (code, signal) => {
-      opts.signal?.removeEventListener("abort", onAbort);
       const stdout = Buffer.concat(out).toString("utf8");
       if (opts.signal?.aborted) {
-        reject(new Error(`${name} invocation aborted`));
+        settle(() => reject(new Error(`${name} invocation aborted`)));
       } else if (code === 0) {
-        resolve(stdout);
+        settle(() => resolve(stdout));
       } else {
         const why = signal ? `killed by ${signal}` : `exit ${code}`;
         const tail = stderrTail(Buffer.concat(err).toString("utf8"));
-        reject(new Error(`${name} ${args.join(" ")}: ${why}${tail ? `
-${tail}` : ""}`));
+        settle(() => reject(new Error(`${name} ${args.join(" ")}: ${why}${tail ? `
+${tail}` : ""}`)));
       }
     });
   });
 }
+function resolveArgs(arg, build) {
+  return typeof arg === "string" ? build(arg) : [...arg];
+}
 async function runCmduse(arg, opts = {}) {
-  const args = buildCmduseArgs(arg);
+  const args = resolveArgs(arg, buildCmduseArgs);
   const candidates = opts.candidates ?? CANDIDATES;
   let last;
   for (const bin of candidates) {
@@ -3362,7 +3389,7 @@ async function runCmduse(arg, opts = {}) {
   throw new Error(`cmduse binary not found (install: brew install JeffreyJYZ/tap/cmduse)${last instanceof Error && last.message !== last.name ? ` \u2014 ${last.message}` : ""}`, { cause: last });
 }
 async function runMpc(arg, opts = {}) {
-  const args = buildMpcArgs(arg);
+  const args = resolveArgs(arg, buildMpcArgs);
   const candidates = opts.candidates ?? MPC_CANDIDATES;
   let last;
   for (const bin of candidates) {
@@ -5025,6 +5052,7 @@ var commandCodeV2 = {
 
 // src/index.ts
 var PROVIDER_NPM = `${package_default.name}@${package_default.version}`;
+var [ANTHROPIC, OPENAI] = LANES;
 function tool(input) {
   return input;
 }
@@ -5071,7 +5099,7 @@ function toModelDefs(models, providerID, npm, interleaved = false) {
 var CommandCodePlugin = async (_input) => {
   return {
     auth: {
-      provider: "command-code-anthropic",
+      provider: ANTHROPIC.id,
       loader: async (getAuth) => {
         const auth = await getAuth();
         if (auth?.type !== "api") {
@@ -5101,7 +5129,7 @@ var CommandCodePlugin = async (_input) => {
               return {
                 type: "success",
                 key,
-                provider: "command-code-anthropic"
+                provider: ANTHROPIC.id
               };
             } catch {
               return { type: "failed" };
@@ -5125,19 +5153,19 @@ var CommandCodePlugin = async (_input) => {
           console.warn("[command-code] model list unavailable:", e);
         }
       }
-      const claudeDefs = split ? toModelDefs(split.claude, "command-code-anthropic", PROVIDER_NPM) : {};
-      const openDefs = split ? toModelDefs(split.open, "command-code-openai", PROVIDER_NPM, {
+      const claudeDefs = split ? toModelDefs(split.claude, ANTHROPIC.id, PROVIDER_NPM) : {};
+      const openDefs = split ? toModelDefs(split.open, OPENAI.id, PROVIDER_NPM, {
         field: "reasoning_content"
       }) : {};
-      const userAnthropic = existing("command-code-anthropic");
-      cfg.provider["command-code-anthropic"] = {
+      const userAnthropic = existing(ANTHROPIC.id);
+      cfg.provider[ANTHROPIC.id] = {
         npm: userAnthropic.npm ?? PROVIDER_NPM,
         name: userAnthropic.name ?? "Command Code (Anthropic)",
         options: { baseURL: PROVIDER_BASE, ...userAnthropic.options },
         models: { ...claudeDefs, ...userAnthropic.models }
       };
-      const userOpenai = existing("command-code-openai");
-      cfg.provider["command-code-openai"] = {
+      const userOpenai = existing(OPENAI.id);
+      cfg.provider[OPENAI.id] = {
         npm: userOpenai.npm ?? PROVIDER_NPM,
         name: userOpenai.name ?? "Command Code (OpenAI)",
         options: {
@@ -5154,14 +5182,14 @@ var CommandCodePlugin = async (_input) => {
       };
     },
     provider: {
-      id: "command-code-anthropic",
+      id: ANTHROPIC.id,
       models: async (_provider, ctx) => {
         const key = await resolveKey(async () => {
           const a = ctx.auth;
           return a?.type === "api" && a.key ? { key: a.key } : undefined;
         });
         const split = await loadModels(key);
-        return toModelDefs(split.claude, "command-code-anthropic", PROVIDER_NPM);
+        return toModelDefs(split.claude, ANTHROPIC.id, PROVIDER_NPM);
       }
     },
     tool: {

package/dist/sidebar/data.d.ts

@@ -33,8 +33,9 @@ export declare function loadMeta(plan?: OcPlan): Promise<Map<string, ModelMeta>>
  * unreachable (see `requireSnapshot`). */
 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.
+ * One OpenCode Go / Zen snapshot from ocuse: opencode's own store for the
+ * per-model totals, plus OpenCode Go's usage endpoint for the account meters
+ * when the account has a Go key. Throws when ocuse is missing or fails, and the
+ * caller then omits the panel.
  */
 export declare function loadZen(plan?: OcPlan): Promise<ZenUsage>;

package/dist/sidebar/rows.d.ts

@@ -140,7 +140,12 @@ export declare function until(epoch: number | undefined, now?: number): string;
  * 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[];
+export declare function windowRows(label: string, w: WindowUsage | undefined, now: number, durSecs: number, extra?: string, 
+/** How the use line reads. The default is money (`$0.55/$14 (3.9%)`); the
+ *  account's own meters publish shares rather than dollars and pass a percent
+ *  formatter, so the tone, `LIMIT EXCEEDED`, `cap in …`, `elapsed` and
+ *  `resets` stay this one implementation for both. */
+use?: (used: number, cap: number, pct: number) => 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

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 reset recorded locally (the store carries none for these providers), 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

@@ -13,6 +13,25 @@ export interface ZenModel {
     weekly: ZenTotals;
     month: ZenTotals;
 }
+/** One of the account's own meters (`ocuse`'s `account` block). */
+export interface ZenMeter {
+    /** The server's own word; anything but "ok" reads as over the limit. */
+    status: string;
+    /** Percent of the window's limit already used — the console's number. */
+    percent: number;
+    /** Reset instant, epoch ms. */
+    resetsAt?: number;
+}
+/** The account's three meters, under the endpoint's own names: `rolling` is the
+ *  5-hour window. Only present when ocuse reached OpenCode Go's usage endpoint,
+ *  and then these — not the per-model figures — are what opencode.ai/console
+ *  shows, because only the server knows its own window anchors and price
+ *  basis. */
+export interface ZenAccount {
+    rolling: ZenMeter;
+    weekly: ZenMeter;
+    monthly: ZenMeter;
+}
 export interface ZenUsage {
     /**
      * Billing period start, epoch ms: `periodStart` on current ocuse, or
@@ -29,14 +48,33 @@ export interface ZenUsage {
         weekly: ZenTotals;
         month: ZenTotals;
     };
+    /** The account's own meters, when ocuse could ask for them. */
+    account?: ZenAccount;
     /** 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 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 `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): SidebarRow[];
+export declare function zenRows(usage: ZenUsage | undefined, meta: ModelMeta | undefined, modelUsage?: ModelUsage, session?: ModelUsage, fallbackName?: string, windows?: ZenWindowStarts): SidebarRow[];

package/dist/tui.js

@@ -14,6 +14,7 @@ var OCUSE_BIN_CANDIDATES = ["ocuse", "/opt/homebrew/bin/ocuse", "/usr/local/bin/
 
 // src/constants/cli.ts
 var DEFAULT_ARGS = ["-1", "--plain"];
+var MPC_DEFAULT_ARGS = ["--minimal"];
 var SUBCOMMANDS = new Set(["plans", "models", "daily", "hourly", "model", "session", "statusline", "config"]);
 var SPAWN_OPTIONS = {
   stdio: ["ignore", "pipe", "pipe"],
@@ -31,6 +32,11 @@ function mpcCandidates(env = process.env) {
   return candidates.filter((bin) => Boolean(bin));
 }
 var MPC_CANDIDATES = mpcCandidates();
+function ocuseCandidates(env = process.env) {
+  const candidates = [env.OCUSE_BIN, ...OCUSE_BIN_CANDIDATES];
+  return candidates.filter((bin) => Boolean(bin));
+}
+var OCUSE_CANDIDATES = ocuseCandidates();
 function splitCliArgs(input) {
   const out = [];
   let cur = "";
@@ -77,6 +83,12 @@ function buildCmduseArgs(arg) {
     return tokens;
   return [...DEFAULT_ARGS, ...tokens];
 }
+function buildMpcArgs(arg) {
+  const tokens = splitCliArgs(arg);
+  if (!tokens.length)
+    return [...MPC_DEFAULT_ARGS];
+  return tokens;
+}
 function stderrTail(text) {
   const lines = text.trimEnd().split(`
 `);
@@ -90,38 +102,55 @@ function runOnce(bin, args, opts, name = "cmduse") {
         ...process.env,
         ...opts.env ?? {}
       },
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      ...opts.spawnOptions
     });
     const out = [];
     const err = [];
+    let settled = false;
+    const timer = opts.timeoutMs === undefined ? undefined : setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      child.kill();
+      reject(new Error(`${name} ${args.join(" ")}: timed out after ${opts.timeoutMs}ms`));
+    }, opts.timeoutMs);
     const onAbort = () => child.kill("SIGTERM");
     opts.signal?.addEventListener("abort", onAbort, {
       once: true
     });
+    const settle = (fn) => {
+      if (settled)
+        return;
+      settled = true;
+      if (timer)
+        clearTimeout(timer);
+      opts.signal?.removeEventListener("abort", onAbort);
+      fn();
+    };
     child.stdout.on("data", (d) => out.push(d));
     child.stderr.on("data", (d) => err.push(d));
-    child.on("error", (e) => {
-      opts.signal?.removeEventListener("abort", onAbort);
-      reject(e);
-    });
+    child.on("error", (e) => settle(() => reject(e)));
     child.on("close", (code, signal) => {
-      opts.signal?.removeEventListener("abort", onAbort);
       const stdout = Buffer.concat(out).toString("utf8");
       if (opts.signal?.aborted) {
-        reject(new Error(`${name} invocation aborted`));
+        settle(() => reject(new Error(`${name} invocation aborted`)));
       } else if (code === 0) {
-        resolve(stdout);
+        settle(() => resolve(stdout));
       } else {
         const why = signal ? `killed by ${signal}` : `exit ${code}`;
         const tail = stderrTail(Buffer.concat(err).toString("utf8"));
-        reject(new Error(`${name} ${args.join(" ")}: ${why}${tail ? `
-${tail}` : ""}`));
+        settle(() => reject(new Error(`${name} ${args.join(" ")}: ${why}${tail ? `
+${tail}` : ""}`)));
       }
     });
   });
 }
+function resolveArgs(arg, build) {
+  return typeof arg === "string" ? build(arg) : [...arg];
+}
 async function runCmduse(arg, opts = {}) {
-  const args = buildCmduseArgs(arg);
+  const args = resolveArgs(arg, buildCmduseArgs);
   const candidates = opts.candidates ?? CANDIDATES;
   let last;
   for (const bin of candidates) {
@@ -137,6 +166,40 @@ async function runCmduse(arg, opts = {}) {
     cause: last
   });
 }
+async function runMpc(arg, opts = {}) {
+  const args = resolveArgs(arg, buildMpcArgs);
+  const candidates = opts.candidates ?? MPC_CANDIDATES;
+  let last;
+  for (const bin of candidates) {
+    try {
+      return await runOnce(bin, args, opts, "mpc");
+    } catch (e) {
+      last = e;
+      if (e?.code !== "ENOENT")
+        throw e;
+    }
+  }
+  throw new Error(`mpc binary not found (install: bun add -g @jeffreyjyz/mpc)${last instanceof Error && last.message !== last.name ? ` \u2014 ${last.message}` : ""}`, {
+    cause: last
+  });
+}
+async function runOcuse(arg, opts = {}) {
+  const args = resolveArgs(arg, splitCliArgs);
+  const candidates = opts.candidates ?? OCUSE_CANDIDATES;
+  let last;
+  for (const bin of candidates) {
+    try {
+      return await runOnce(bin, args, opts, "ocuse");
+    } catch (e) {
+      last = e;
+      if (e?.code !== "ENOENT")
+        throw e;
+    }
+  }
+  throw new Error(`ocuse binary not found (install: brew install JeffreyJYZ/tap/cmduse)${last instanceof Error && last.message !== last.name ? ` \u2014 ${last.message}` : ""}`, {
+    cause: last
+  });
+}
 
 // src/constants/providers.ts
 var PROVIDER_ID_PREFIX = "command-code";
@@ -144,6 +207,7 @@ var GO_PROVIDER_ID = "opencode-go";
 var ZEN_PROVIDER_ID = "opencode";
 var ZEN_PROVIDER_PREFIX = "opencode-zen";
 var TUI_ID = "command-code.tui";
+var CMD_USAGE_COMMAND_ID = "command-code.cmd-usage";
 
 // src/sidebar/panel.tsx
 import { createComponent as _$createComponent } from "@opentui/solid";
@@ -621,7 +685,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, extra) {
+function windowRows(label, w, now, durSecs, extra, use) {
   if (!w || typeof w.cap !== "number" || w.cap <= 0)
     return [];
   const used = typeof w.used === "number" ? w.used : 0;
@@ -632,7 +696,7 @@ function windowRows(label, w, now, durSecs, extra) {
   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"]] : [], ...extra ? [["", extra, "muted"]] : []];
+  return [[label, use ? use(used, w.cap, pct) : `${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 = [];
@@ -2027,7 +2091,6 @@ function minPlan(id) {
 }
 
 // src/sidebar/data.ts
-import { spawn as spawn2 } from "child_process";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { homedir as homedir3 } from "os";
 import { dirname, join as join3 } from "path";
@@ -2042,6 +2105,14 @@ function totals(value) {
     tokens: num("tokens")
   };
 }
+function meter(value) {
+  const v = value ?? {};
+  return {
+    status: typeof v.status === "string" ? v.status : "ok",
+    percent: typeof v.percent === "number" ? v.percent : 0,
+    resetsAt: typeof v.resetsAt === "number" ? v.resetsAt : undefined
+  };
+}
 function parseZenJson(text) {
   let body;
   try {
@@ -2067,6 +2138,11 @@ function parseZenJson(text) {
     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,
+    account: body.account ? {
+      rolling: meter(body.account.rolling),
+      weekly: meter(body.account.weekly),
+      monthly: meter(body.account.monthly)
+    } : undefined,
     totals: {
       fiveHour: totals(top.fiveHour),
       weekly: totals(top.weekly),
@@ -2090,6 +2166,11 @@ function monthPeriod(usage) {
     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) {
@@ -2102,19 +2183,33 @@ function zenWindow(label, spent, limit, share, now, durSecs, resetAt) {
     exceeded: spent.cost >= cap
   }, now, durSecs, spent.requests > 0 ? `${count(spent.requests)} req` : undefined);
 }
-function zenRows(usage, meta, modelUsage, session, fallbackName) {
+function zenMeterRows(label, meter, now, durSecs) {
+  return windowRows(label, {
+    cap: 100,
+    used: meter.percent,
+    resetAt: meter.resetsAt,
+    exceeded: meter.percent >= 100 || meter.status !== "ok"
+  }, now, durSecs, undefined, (_used, _cap, pct) => `${pct.toFixed(1)}% of limit`);
+}
+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(...zenWindow("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, cap, GO_WINDOW_SHARE.fiveHour, now, FIVE_HOUR_SECS));
-  rows.push(...zenWindow("Weekly", mine?.weekly ?? usage.totals.weekly, cap, GO_WINDOW_SHARE.weekly, now, 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));
+  if (usage.account) {
+    rows.push(...zenMeterRows("5-hour", usage.account.rolling, now, FIVE_HOUR_SECS));
+    rows.push(...zenMeterRows("Weekly", usage.account.weekly, now, WEEKLY_SECS));
+    rows.push(...zenMeterRows("Monthly", usage.account.monthly, now, period?.durSecs ?? 0));
+  } else {
+    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)));
+    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;
@@ -2122,11 +2217,11 @@ function zenRows(usage, meta, modelUsage, session, fallbackName) {
     return rows;
   rows.push(["Model", clip(name, valueWidth("Model")), "strong", true]);
   rows.push(...localUsageRows(modelUsage, session));
-  if (!meta)
-    return rows;
   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) {
@@ -2144,48 +2239,10 @@ function zenRows(usage, meta, modelUsage, session, fallbackName) {
 }
 
 // src/sidebar/data.ts
-var CMDUSE = cmduseCandidates();
-var MPC = MPC_BIN_CANDIDATES;
-var OCUSE = [process.env.OCUSE_BIN, ...OCUSE_BIN_CANDIDATES].filter((bin) => Boolean(bin));
-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", (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) {
-  let last;
-  for (const bin of candidates) {
-    try {
-      return await run(bin, args);
-    } catch (e) {
-      last = e;
-      if (e?.code !== "ENOENT")
-        throw e;
-    }
-  }
-  throw last instanceof Error ? last : new Error(`${candidates[0]} not found`);
-}
+var SIDEBAR_OPTS = {
+  spawnOptions: SPAWN_OPTIONS,
+  timeoutMs: CHILD_TIMEOUT_MS
+};
 function parseUsageJson(text) {
   const raw = JSON.parse(text);
   const win = (v) => {
@@ -2271,7 +2328,7 @@ async function loadMeta(plan = OC_PLAN_DEFAULT) {
       return new Map(cached.rows ?? []);
     }
   } catch {}
-  const meta = parseMpcJson(await runFirst(MPC, metaArgs(plan)));
+  const meta = parseMpcJson(await runMpc(metaArgs(plan), SIDEBAR_OPTS));
   try {
     const path = cachePath(plan);
     await mkdir(dirname(path), {
@@ -2285,10 +2342,10 @@ async function loadMeta(plan = OC_PLAN_DEFAULT) {
   return meta;
 }
 async function loadUsage() {
-  return requireSnapshot(parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"])));
+  return requireSnapshot(parseUsageJson(await runCmduse(["-1", "--json", "--plain"], SIDEBAR_OPTS)));
 }
 async function loadZen(plan = OC_PLAN_DEFAULT) {
-  return parseZenJson(await runFirst(OCUSE, zenArgs(plan)));
+  return parseZenJson(await runOcuse(zenArgs(plan), SIDEBAR_OPTS));
 }
 
 // src/sidebar/usageDb.ts
@@ -2375,6 +2432,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 {
@@ -2485,6 +2589,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) => {
@@ -2505,6 +2610,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)
@@ -2524,6 +2638,7 @@ function useRows(activeModelId, providerID, sessionID) {
       } else if (kind === "go" || kind === "zen") {
         setZen(await loadZen(loadPrefs().ocPlan));
         refreshModelUsage(activeModelId());
+        refreshModelWindows(activeModelId());
       }
     } catch {} finally {
       inFlight = false;
@@ -2541,7 +2656,12 @@ function useRows(activeModelId, providerID, sessionID) {
   createEffect(() => {
     const id = activeModelId();
     const session = sessionID();
-    if (!shows(sessionKind(providerID())) || !id || !session)
+    const kind = sessionKind(providerID());
+    if (!shows(kind) || !id)
+      return;
+    if (kind === "go" || kind === "zen")
+      refreshModelWindows(id);
+    if (!session)
       return;
     refreshModelUsage(id);
   });
@@ -2561,7 +2681,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, usageFor(id), sessionUsage(), fallbackName);
+      return zenRows(zen(), found, usageFor(id), sessionUsage(), fallbackName, modelWindows());
     }
     const model = found ? {
       ...found,
@@ -2629,7 +2749,7 @@ var commandCodeTui = {
           mode: "global",
           priority: 10,
           commands: [{
-            id: "command-code.cmd-usage",
+            id: CMD_USAGE_COMMAND_ID,
             title: "Command Code usage",
             group: "Command Code",
             slash: {
@@ -2656,7 +2776,7 @@ var commandCodeTui = {
               });
             }
           }],
-          bindings: ["command-code.cmd-usage"]
+          bindings: [CMD_USAGE_COMMAND_ID]
         }));
       }
     });

package/package.json

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