@jeffreyjyz/opencode-command-code 0.5.4 → 0.5.7

package/dist/cli.d.ts

@@ -22,6 +22,12 @@ export declare function buildCmduseArgs(arg: string): string[];
  * string is split and passed straight through; an empty arg means
  * the fewest-columns view (see MPC_DEFAULT_ARGS). */
 export declare function buildMpcArgs(arg: string): string[];
+/**
+ * The arg the ocuse_usage tool and the /ocuse-usage dialog pass on: the
+ * agent's (or slash) args when given, else `-1`. A bare ocuse is the live
+ * watch loop and would never return, so empty input never passes through.
+ */
+export declare function ocuseArgs(arg: string | undefined): string;
 export type RunOptions = {
     signal?: AbortSignal;
     /** Extra env for the child (CMD_API_KEY when the plugin resolved one). */

package/dist/constants/providers.d.ts

@@ -15,12 +15,18 @@ export declare const ZEN_PROVIDER_PREFIX = "opencode-zen";
 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 v2 /ocuse-usage slash command id (registered and bound in tui.tsx). */
+export declare const OCUSE_USAGE_COMMAND_ID = "command-code.ocuse-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. */
 export declare const MPC_TOOL_DESCRIPTION = "Per-model price comparison: what a model costs per request ($/1M input, output and cache rates) and per month (request allowance) on each Command Code (cc) and OpenCode Go (oc) plan side, plus ability, Tok/s, the cheaper-side verdict and running deals. Pass '--model <regex>' to filter rows, '--minimal' | '--medium' | '--detail' for table width, '--json' for the full structured rows, '--cc-plan' / '--oc-plan' to pick a plan, or '--usage' to project real usage.";
 /** The mpc_prices `arg` description, shared by the v1 and v2 halves. */
 export declare const MPC_TOOL_ARG_DESCRIPTION = "Optional mpc flags: '--model <regex>' filters rows, '--minimal' | '--medium' | '--detail' set table width, '--json' for full structured rows, '--cc-plan'/'--oc-plan' pick a plan, '--usage' projects real usage";
+/** The ocuse_usage tool description, shared by the v1 and v2 halves. */
+export declare const OCUSE_TOOL_DESCRIPTION = "Fetch live OpenCode Go/Zen usage: the account's window meters, per-model spend against limits, 5-hour & weekly windows, billing-period summary. Defaults to the one-shot dashboard; pass extra ocuse flags for more (e.g. '--plan go-plus', 'daily', '--json').";
+/** The ocuse_usage `arg` description, shared by the v1 and v2 halves. */
+export declare const OCUSE_TOOL_ARG_DESCRIPTION = "Optional: extra ocuse flags (e.g. '--plan go-plus', 'daily', '--json'); empty means the one-shot dashboard";
 export type Lane = {
     id: "command-code-anthropic" | "command-code-openai";
     name: string;

package/dist/index.js

@@ -2414,7 +2414,7 @@ function superRefine(fn) {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.5.4",
+  version: "0.5.7",
   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",
@@ -3318,6 +3318,9 @@ function buildMpcArgs(arg) {
     return [...MPC_DEFAULT_ARGS];
   return tokens;
 }
+function ocuseArgs(arg) {
+  return arg !== undefined && arg.trim() !== "" ? arg : "-1";
+}
 function stderrTail(text) {
   const lines = text.trimEnd().split(`
 `);
@@ -3403,6 +3406,21 @@ async function runMpc(arg, opts = {}) {
   }
   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/models.ts
 var MODEL_CAPABILITIES = {
@@ -3431,6 +3449,8 @@ var INTEGRATION_NAME = "Command Code";
 var 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').";
 var MPC_TOOL_DESCRIPTION = "Per-model price comparison: what a model costs per request ($/1M input, output and cache rates) and per month (request allowance) on each Command Code (cc) and OpenCode Go (oc) plan side, plus ability, Tok/s, the cheaper-side verdict and running deals. Pass '--model <regex>' to filter rows, '--minimal' | '--medium' | '--detail' for table width, '--json' for the full structured rows, '--cc-plan' / '--oc-plan' to pick a plan, or '--usage' to project real usage.";
 var MPC_TOOL_ARG_DESCRIPTION = "Optional mpc flags: '--model <regex>' filters rows, '--minimal' | '--medium' | '--detail' set table width, '--json' for full structured rows, '--cc-plan'/'--oc-plan' pick a plan, '--usage' projects real usage";
+var OCUSE_TOOL_DESCRIPTION = "Fetch live OpenCode Go/Zen usage: the account's window meters, per-model spend against limits, 5-hour & weekly windows, billing-period summary. Defaults to the one-shot dashboard; pass extra ocuse flags for more (e.g. '--plan go-plus', 'daily', '--json').";
+var OCUSE_TOOL_ARG_DESCRIPTION = "Optional: extra ocuse flags (e.g. '--plan go-plus', 'daily', '--json'); empty means the one-shot dashboard";
 var LANES = [
   {
     id: "command-code-anthropic",
@@ -4968,6 +4988,26 @@ var commandCodeV2 = {
           };
         }
       });
+      editor.add({
+        name: "ocuse_usage",
+        description: OCUSE_TOOL_DESCRIPTION,
+        input: {
+          type: "object",
+          properties: {
+            arg: {
+              type: "string",
+              description: OCUSE_TOOL_ARG_DESCRIPTION
+            }
+          },
+          additionalProperties: false
+        },
+        async execute(input) {
+          const arg = typeof input?.arg === "string" ? input.arg : undefined;
+          return {
+            content: await runOcuse(ocuseArgs(arg))
+          };
+        }
+      });
     });
     let hasConnection = false;
     let connectionMs = 0;
@@ -5180,6 +5220,10 @@ var CommandCodePlugin = async (_input) => {
         description: "Show Command Code plan, credits, and usage windows",
         template: "Call the cmd_usage tool and present its markdown output verbatim to the user. If the tool errors, tell the user to run /connect (Command Code (Anthropic)) and retry. $ARGUMENTS"
       };
+      cfg.command["ocuse-usage"] = {
+        description: "Show OpenCode Go/Zen usage: account meters and per-model spend",
+        template: "Call the ocuse_usage tool and present its markdown output verbatim to the user. If the tool errors, the Go key is missing or has no subscription \u2014 usage still shows where the store has it. $ARGUMENTS"
+      };
     },
     provider: {
       id: ANTHROPIC.id,
@@ -5216,6 +5260,15 @@ var CommandCodePlugin = async (_input) => {
             env: { CMD_API_KEY: key }
           });
         }
+      }),
+      ocuse_usage: tool({
+        description: OCUSE_TOOL_DESCRIPTION,
+        args: {
+          arg: string2().optional().describe(OCUSE_TOOL_ARG_DESCRIPTION)
+        },
+        async execute(args) {
+          return runOcuse(ocuseArgs(args.arg));
+        }
       })
     }
   };

package/dist/sidebar/rows.d.ts

@@ -87,6 +87,15 @@ export interface WindowUsage {
     resetAt?: number;
     /** The account API's own over-cap flag (cmduse passes it through). */
     exceeded?: boolean;
+    /**
+     * The account's own share of the limit, when its endpoint answered. That
+     * figure is the one the server gates on and prints on its console, so it —
+     * not `used / cap`, which this machine computes and which sits below the
+     * server's meter — sets the row's tone and reads as the share. The money
+     * pair stays this store's own, which is why the two need not divide to each
+     * other.
+     */
+    sharePct?: number;
 }
 /** One model's usage for the account's current billing period. */
 export interface ModelUsage {
@@ -142,10 +151,11 @@ export declare function until(epoch: number | undefined, now?: number): string;
  * implementation. */
 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[];
+ *  account's own meters publish their own share of the limit, which the
+ *  formatter receives as `share` — the money pair beside it stays local, so
+ *  the tone, `LIMIT EXCEEDED`, `cap in …`, `elapsed` and `resets` stay this
+ *  one implementation for both panels. */
+use?: (used: number, cap: number, share: 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/zen.d.ts

@@ -50,6 +50,13 @@ export interface ZenUsage {
     };
     /** The account's own meters, when ocuse could ask for them. */
     account?: ZenAccount;
+    /**
+     * Why `account` is absent, when ocuse could name it: `HTTP 401
+     * api_key_expired`, `no Go key`, a transport fault (`ocuse` 0.7.14+). The
+     * panel shows it, because "estimated locally" alone cannot tell a missing key
+     * from an expired one — and only the expired one is something to act on.
+     */
+    accountError?: string;
     /** Keyed by canonical model key, the same normalisation the CC side matches on. */
     models: Map<string, ZenModel>;
 }

package/dist/tui.js

@@ -89,6 +89,9 @@ function buildMpcArgs(arg) {
     return [...MPC_DEFAULT_ARGS];
   return tokens;
 }
+function ocuseArgs(arg) {
+  return arg !== undefined && arg.trim() !== "" ? arg : "-1";
+}
 function stderrTail(text) {
   const lines = text.trimEnd().split(`
 `);
@@ -208,6 +211,7 @@ 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";
+var OCUSE_USAGE_COMMAND_ID = "command-code.ocuse-usage";
 
 // src/sidebar/panel.tsx
 import { createComponent as _$createComponent } from "@opentui/solid";
@@ -690,13 +694,14 @@ function windowRows(label, w, now, durSecs, extra, use) {
     return [];
   const used = typeof w.used === "number" ? w.used : 0;
   const pct = used / w.cap * 100;
+  const share = typeof w.sharePct === "number" ? w.sharePct : pct;
   const nowSecs = Math.floor(now / 1000);
   const elapsed = elapsedLabel(w.resetAt, durSecs, nowSecs);
   const eta = paceEtaSecs(w.resetAt, durSecs, used, w.cap, nowSecs);
   const reset = until(w.resetAt, now);
   const lead = w.exceeded ? "LIMIT EXCEEDED" : eta === undefined ? elapsed === undefined ? "" : `${elapsed} elapsed` : `cap in ${until(now + eta * 1000, now)}`;
   const detail = [lead, reset ? `resets ${reset}` : ""].filter(Boolean).join(" \xB7 ");
-  return [[label, 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"]] : []];
+  return [[label, use ? use(used, w.cap, share) : `${money(used)}/${money(w.cap)} (${pct.toFixed(1)}%)`, w.exceeded ? "crit" : pctTone(share)], ...detail ? [["", detail, "muted"]] : [], ...extra ? [["", extra, "muted"]] : []];
 }
 function localUsageRows(usage, session) {
   const rows = [];
@@ -2143,6 +2148,7 @@ function parseZenJson(text) {
       weekly: meter(body.account.weekly),
       monthly: meter(body.account.monthly)
     } : undefined,
+    accountError: typeof body.accountError === "string" && body.accountError ? body.accountError : undefined,
     totals: {
       fiveHour: totals(top.fiveHour),
       weekly: totals(top.weekly),
@@ -2183,13 +2189,14 @@ function zenWindow(label, spent, limit, share, now, durSecs, resetAt) {
     exceeded: spent.cost >= cap
   }, now, durSecs, spent.requests > 0 ? `${count(spent.requests)} req` : undefined);
 }
-function zenMeterRows(label, meter, now, durSecs) {
+function zenMeterRows(label, meter, now, durSecs, local) {
   return windowRows(label, {
-    cap: 100,
-    used: meter.percent,
+    cap: local?.cap ?? 100,
+    used: local?.spent ?? meter.percent,
     resetAt: meter.resetsAt,
+    sharePct: meter.percent,
     exceeded: meter.percent >= 100 || meter.status !== "ok"
-  }, now, durSecs, undefined, (_used, _cap, pct) => `${pct.toFixed(1)}% of limit`);
+  }, now, durSecs, undefined, (used, cap, share) => local ? `${money(used)}/${money(cap)} (${share.toFixed(1)}% of limit)` : `${share.toFixed(1)}% of limit`);
 }
 function zenRows(usage, meta, modelUsage, session, fallbackName, windows) {
   if (!usage)
@@ -2197,14 +2204,21 @@ function zenRows(usage, meta, modelUsage, session, fallbackName, windows) {
   const now = Date.now();
   const oc = meta?.oc;
   const rows = [["Plan", `${oc?.plan ?? "Go"} \xB7 limits per model`, "base"]];
+  if (usage.accountError) {
+    rows.push(["", clip(`usage API: ${usage.accountError}`, valueWidth("")), "warn"]);
+  }
   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;
+  const windowMoney = (spent, share) => mine && typeof limit === "number" && limit > 0 ? {
+    spent: spent.cost,
+    cap: limit * share
+  } : undefined;
   const period = monthPeriod(usage);
   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));
+    rows.push(...zenMeterRows("5-hour", usage.account.rolling, now, FIVE_HOUR_SECS, mine ? windowMoney(mine.fiveHour, GO_WINDOW_SHARE.fiveHour) : undefined));
+    rows.push(...zenMeterRows("Weekly", usage.account.weekly, now, WEEKLY_SECS, mine ? windowMoney(mine.weekly, GO_WINDOW_SHARE.weekly) : undefined));
+    rows.push(...zenMeterRows("Monthly", usage.account.monthly, now, period?.durSecs ?? 0, mine ? windowMoney(mine.month, GO_WINDOW_SHARE.month) : undefined));
   } 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)));
@@ -2775,8 +2789,35 @@ var commandCodeTui = {
                 message: text.trimEnd()
               });
             }
+          }, {
+            id: OCUSE_USAGE_COMMAND_ID,
+            title: "OpenCode Go/Zen usage",
+            group: "Command Code",
+            slash: {
+              name: "ocuse-usage",
+              arguments: true
+            },
+            enabled: () => true,
+            suggested: true,
+            run: async (input) => {
+              let text;
+              try {
+                text = await runOcuse(ocuseArgs(input));
+              } catch (error) {
+                ctx.ui.toast.show({
+                  title: "ocuse-usage failed",
+                  message: error instanceof Error ? error.message : String(error),
+                  variant: "error"
+                });
+                return;
+              }
+              await ctx.ui.dialog.alert({
+                title: "OpenCode Go/Zen usage",
+                message: text.trimEnd()
+              });
+            }
           }],
-          bindings: [CMD_USAGE_COMMAND_ID]
+          bindings: [CMD_USAGE_COMMAND_ID, OCUSE_USAGE_COMMAND_ID]
         }));
       }
     });

package/package.json

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