@jeffreyjyz/opencode-command-code 0.3.19 → 0.5.0

package/dist/sidebar/rows.d.ts

@@ -21,11 +21,11 @@ export type SidebarRow = [
 export declare function pctTone(pct: number): Tone;
 /**
  * The sidebar is 42 columns wide with 2+2 padding, and our panel keeps one more
- * column clear on the right, so a rendered row must stay within this. Rows that
- * cannot fit are split across an indented continuation (`""` label) rather than
- * wrapping in the host's renderer, which is what made the panel look broken.
+ * column clear on the right, so a rendered row must stay within ROW_WIDTH.
+ * Rows that cannot fit are split across an indented continuation (`""` label)
+ * rather than wrapping in the host's renderer, which is what made the panel
+ * look broken.
  */
-export declare const ROW_WIDTH = 37;
 /** A horizontal rule between blocks. */
 export declare function separator(): SidebarRow;
 /** Truncate to `width`, ellipsis included. */
@@ -43,6 +43,8 @@ export interface ModelMeta {
     /** Cheapest plan that serves the model, from the generated catalog. */
     minPlan?: string | null;
     allowance?: number;
+    /** Unbounded on the CommandCode side: read `free`, not `allowance`, which may still carry a catalog figure. */
+    free?: boolean;
     rates?: {
         input: number;
         output: number;
@@ -67,6 +69,8 @@ export interface ModelMeta {
         provider?: string;
         plan?: string;
         allowance?: number;
+        /** Unbounded on the OpenCode Go side: its allowance is 0 by convention. */
+        free?: boolean;
         rates?: {
             input: number;
             output: number;
@@ -112,6 +116,15 @@ export interface Usage {
 }
 /** Money at credit scale: cents, but "$60" not "$60.00". */
 export declare function money(value: number): string;
+/**
+ * A monthly allowance as it appears on the panel. A free/unbounded model has no
+ * budget to divide — mpc reports `free: true` — so it reads `∞` rather than the
+ * misleading `$0/mo` (0 is not a budget). `free` decides, so this holds whether
+ * the allowance is 0 (OpenCode Go's free rows) or a catalog figure
+ * (CommandCode's). Both sides call this, so a free CommandCode model and a free
+ * OpenCode Go one render alike.
+ */
+export declare function allowanceLabel(limit: number, free?: boolean): string;
 /** Rate scale needs more precision than credit scale ($0.0036). */
 export declare function rate(value: number): string;
 export declare function count(value: number): string;

package/dist/sidebar/windows.d.ts

@@ -1,7 +1,3 @@
-/** 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 —

package/dist/sidebar/zen.d.ts

@@ -1,10 +1,4 @@
 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;

package/dist/tui.d.ts

@@ -33,8 +33,8 @@ interface V1Api {
 export declare const tui: (api: V1Api) => Promise<void>;
 export declare const commandCodeTui: TuiPluginNs.Definition;
 declare const _default: {
-    tui: (api: V1Api) => Promise<void>;
     id: string;
     setup: (context: TuiPluginNs.Context) => Promise<TuiPluginNs.Cleanup | void> | TuiPluginNs.Cleanup | void;
+    tui: typeof tui;
 };
 export default _default;

package/dist/tui.js

@@ -4,13 +4,33 @@ import { createComponent as _$createComponent2 } from "@opentui/solid";
 
 // src/cli.ts
 import { spawn } from "child_process";
+
+// src/constants/binaries.ts
+import { homedir } from "os";
+import { join } from "path";
+var CMDUSE_BIN_CANDIDATES = ["cmduse", "/opt/homebrew/bin/cmduse", "/usr/local/bin/cmduse"];
+var MPC_BIN_CANDIDATES = ["mpc", 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"];
+var SUBCOMMANDS = new Set(["plans", "models", "daily", "hourly", "model", "session", "statusline", "config"]);
+var SPAWN_OPTIONS = {
+  stdio: ["ignore", "pipe", "pipe"],
+  detached: true
+};
+
+// src/cli.ts
 function cmduseCandidates(env = process.env) {
-  const candidates = [env.CMDUSE_BIN, "cmduse", "/opt/homebrew/bin/cmduse", "/usr/local/bin/cmduse"];
+  const candidates = [env.CMDUSE_BIN, ...CMDUSE_BIN_CANDIDATES];
   return candidates.filter((bin) => Boolean(bin));
 }
 var CANDIDATES = cmduseCandidates();
-var DEFAULT_ARGS = ["-1", "--plain"];
-var SUBCOMMANDS = new Set(["plans", "models", "daily", "hourly", "model", "session", "statusline", "config"]);
+function mpcCandidates(env = process.env) {
+  const candidates = [env.MPC_BIN, ...MPC_BIN_CANDIDATES];
+  return candidates.filter((bin) => Boolean(bin));
+}
+var MPC_CANDIDATES = mpcCandidates();
 function splitCliArgs(input) {
   const out = [];
   let cur = "";
@@ -52,7 +72,7 @@ function splitCliArgs(input) {
 function buildCmduseArgs(arg) {
   const tokens = splitCliArgs(arg);
   if (!tokens.length)
-    return DEFAULT_ARGS;
+    return [...DEFAULT_ARGS];
   if (tokens.some((t) => SUBCOMMANDS.has(t)))
     return tokens;
   return [...DEFAULT_ARGS, ...tokens];
@@ -63,7 +83,7 @@ function stderrTail(text) {
   return lines.slice(-3).join(`
 `).slice(-400);
 }
-function runOnce(bin, args, opts) {
+function runOnce(bin, args, opts, name = "cmduse") {
   return new Promise((resolve, reject) => {
     const child = spawn(bin, args, {
       env: {
@@ -88,13 +108,13 @@ function runOnce(bin, args, opts) {
       opts.signal?.removeEventListener("abort", onAbort);
       const stdout = Buffer.concat(out).toString("utf8");
       if (opts.signal?.aborted) {
-        reject(new Error("cmduse invocation aborted"));
+        reject(new Error(`${name} invocation aborted`));
       } else if (code === 0) {
         resolve(stdout);
       } else {
         const why = signal ? `killed by ${signal}` : `exit ${code}`;
         const tail = stderrTail(Buffer.concat(err).toString("utf8"));
-        reject(new Error(`cmduse ${args.join(" ")}: ${why}${tail ? `
+        reject(new Error(`${name} ${args.join(" ")}: ${why}${tail ? `
 ${tail}` : ""}`));
       }
     });
@@ -118,6 +138,13 @@ async function runCmduse(arg, opts = {}) {
   });
 }
 
+// src/constants/providers.ts
+var PROVIDER_ID_PREFIX = "command-code";
+var GO_PROVIDER_ID = "opencode-go";
+var ZEN_PROVIDER_ID = "opencode";
+var ZEN_PROVIDER_PREFIX = "opencode-zen";
+var TUI_ID = "command-code.tui";
+
 // src/sidebar/panel.tsx
 import { createComponent as _$createComponent } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
@@ -451,7 +478,7 @@ var gating_default = {
   }
 };
 
-// src/gating.ts
+// src/constants/gating.ts
 var MODEL_CATEGORIES = gating_default.categories;
 var PLAN_RULES = gating_default.plans;
 var HARD_BLOCKED = gating_default.hardBlocked;
@@ -459,6 +486,28 @@ var KNOWN_MODELS = gating_default.knownModels;
 var MODEL_ALIASES = gating_default.aliases;
 var GATE_EXTRACTED_AT = gating_default.extractedAt;
 var GATE_CLI_VERSION = gating_default.cliVersion;
+
+// src/constants/sidebar.ts
+var ROW_WIDTH = 37;
+var TIER_DISPLAY = {
+  opensource: "open source",
+  premium: "premium"
+};
+var OC_PLANS = ["go", "go-plus"];
+var OC_PLAN_DEFAULT = "go";
+var GO_WINDOW_SHARE = {
+  fiveHour: 0.2,
+  weekly: 0.5,
+  month: 1
+};
+var FIVE_HOUR_SECS = 5 * 3600;
+var WEEKLY_SECS = 7 * 86400;
+var PREF_DEFAULTS = {
+  colors: false,
+  ocPlan: OC_PLAN_DEFAULT
+};
+
+// src/gating.ts
 function findKnown(s) {
   const k = s.toLowerCase();
   return KNOWN_MODELS.find((m) => m.toLowerCase() === k);
@@ -475,8 +524,6 @@ function canonicalizeModelId(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;
@@ -526,7 +573,6 @@ function pctTone(pct) {
     return "warn";
   return "ok";
 }
-var ROW_WIDTH = 37;
 function separator() {
   return ["\u2500".repeat(ROW_WIDTH), "", "muted"];
 }
@@ -541,14 +587,13 @@ function parts(row) {
     return [`  ${row[1]}`, ""];
   return [row[1] ? `${row[0]}: ` : row[0], row[1]];
 }
-var TIER_DISPLAY = {
-  opensource: "open source",
-  premium: "premium"
-};
 function money(value) {
   const rounded = Math.round(value * 100) / 100;
   return `$${Number.isInteger(rounded) ? rounded : rounded.toFixed(2)}`;
 }
+function allowanceLabel(limit, free) {
+  return free === true || limit <= 0 ? "\u221E" : `${money(limit)}/mo`;
+}
 function rate(value) {
   if (value === 0)
     return "$0";
@@ -656,7 +701,7 @@ function modelRows(meta, usage, session, fallbackName) {
   else if (meta.minPlan)
     rows.push(["Min plan", meta.minPlan, "base"]);
   if (typeof meta.allowance === "number")
-    rows.push(["Allowance", `${money(meta.allowance)}/mo`, "base"]);
+    rows.push(["Allowance", allowanceLabel(meta.allowance, meta.free), "base"]);
   if (meta.deal) {
     const ends = meta.deal.ends?.match(/([A-Z][a-z]{2})[a-z]*\s+(\d{1,2})/);
     rows.push(["Deal", ends ? `${meta.deal.badge} \xB7 ends ${ends[1]} ${ends[2]}` : meta.deal.badge, "ok"]);
@@ -790,41 +835,71 @@ function Panel(props) {
 
 // src/sidebar/prefs.ts
 import { readFileSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-var DEFAULTS = {
-  colors: false
-};
-var CACHE_MS = 5000;
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+
+// src/constants/paths.ts
+var CACHE_DIR = "command-code";
+function ccCatalogFile(plan) {
+  return `cc-catalog-${plan}.json`;
+}
+var OPENCODE_DIR = "opencode";
+var OPENCODE_DB_FILE = "opencode.db";
+var PREFS_FILE = "command-code.json";
+
+// src/constants/timing.ts
+var POLL_MS = 5000;
+var CHILD_TIMEOUT_MS = 30000;
+var MODELS_CACHE_TTL_MS = 5 * 60 * 1000;
+var CATALOG_CACHE_TTL_MS = 60 * 60 * 1000;
+var PREFS_CACHE_MS = 5000;
+
+// src/sidebar/prefs.ts
 var cached;
 function prefsPath(env = process.env) {
-  const base = env.XDG_CONFIG_HOME ?? join(homedir(), ".config");
-  return join(base, "opencode", "command-code.json");
+  const base = env.XDG_CONFIG_HOME ?? join2(homedir2(), ".config");
+  return join2(base, OPENCODE_DIR, PREFS_FILE);
+}
+function planFrom(value, source) {
+  if (value === undefined)
+    return;
+  if (typeof value === "string" && OC_PLANS.includes(value)) {
+    return value;
+  }
+  console.warn(`[command-code] ignoring unknown OpenCode plan ${JSON.stringify(value)} (${source}); using "${OC_PLAN_DEFAULT}"`);
+  return;
 }
 function parsePrefs(raw) {
-  const value = raw?.colors;
+  const obj = raw;
   return {
-    colors: value === true
+    colors: obj?.colors === true,
+    ocPlan: planFrom(obj?.ocPlan, "file") ?? OC_PLAN_DEFAULT
   };
 }
 function loadPrefs(env = process.env, now = Date.now()) {
-  if (cached && now - cached.at < CACHE_MS)
+  if (cached && now - cached.at < PREFS_CACHE_MS)
     return cached.prefs;
+  let prefs = PREF_DEFAULTS;
+  try {
+    prefs = parsePrefs(JSON.parse(readFileSync(prefsPath(env), "utf8")));
+  } catch {}
   const flag = env.CMD_COLORS;
-  let prefs = DEFAULTS;
   if (flag === "1" || flag === "true")
     prefs = {
+      ...prefs,
       colors: true
     };
   else if (flag === "0" || flag === "false")
     prefs = {
+      ...prefs,
       colors: false
     };
-  else {
-    try {
-      prefs = parsePrefs(JSON.parse(readFileSync(prefsPath(env), "utf8")));
-    } catch {}
-  }
+  const envPlan = planFrom(env.CMD_OC_PLAN, "CMD_OC_PLAN");
+  if (envPlan !== undefined)
+    prefs = {
+      ...prefs,
+      ocPlan: envPlan
+    };
   cached = {
     at: now,
     prefs
@@ -1950,15 +2025,10 @@ function minPlan(id) {
 // src/sidebar/data.ts
 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";
+import { homedir as homedir3 } from "os";
+import { dirname, join as join3 } 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;
@@ -2035,7 +2105,7 @@ function zenRows(usage, meta, session, fallbackName) {
   if (!meta)
     return rows;
   if (typeof limit === "number") {
-    rows.push(["Allowance", `${money(limit)}/mo`, "base"]);
+    rows.push(["Allowance", allowanceLabel(limit, oc?.free), "base"]);
   }
   if (oc?.rates) {
     const cache = [`cache read ${rate(oc.rates.cacheRead)}`];
@@ -2055,14 +2125,8 @@ function zenRows(usage, meta, session, fallbackName) {
 
 // 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 = 60 * 60 * 1000;
-var SPAWN_OPTIONS = {
-  stdio: ["ignore", "pipe", "pipe"],
-  detached: true
-};
-var CHILD_TIMEOUT_MS = 30000;
+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);
@@ -2147,6 +2211,7 @@ function parseMpcJson(text) {
       key: row.key ?? modelKey(row.name),
       name: row.name,
       allowance: cc?.allowance,
+      free: cc?.free === true ? true : undefined,
       rates: cc?.pricing,
       intelligence: cc?.ability ?? undefined,
       tps: cc?.tps ?? undefined,
@@ -2158,6 +2223,7 @@ function parseMpcJson(text) {
         provider: oc.provider,
         plan: oc.plan,
         allowance: oc.allowance,
+        free: oc.free === true ? true : undefined,
         rates: oc.pricing,
         ability: oc.ability ?? undefined,
         tps: oc.tps ?? undefined
@@ -2168,20 +2234,26 @@ function parseMpcJson(text) {
   }
   return meta;
 }
-function cachePath() {
-  const base = process.env.XDG_CACHE_HOME ?? join2(homedir2(), ".cache");
-  return join2(base, "command-code", "cc-catalog.json");
+function cachePath(plan) {
+  const base = process.env.XDG_CACHE_HOME ?? join3(homedir3(), ".cache");
+  return join3(base, CACHE_DIR, ccCatalogFile(plan));
 }
-async function loadMeta() {
+function metaArgs(plan) {
+  return ["--json", "--shape", "off", "--oc-plan", plan];
+}
+function zenArgs(plan) {
+  return ["-1", "--json", "--plan", plan];
+}
+async function loadMeta(plan = OC_PLAN_DEFAULT) {
   try {
-    const cached = JSON.parse(await readFile(cachePath(), "utf8"));
-    if (cached.fetchedAt && Date.now() - cached.fetchedAt < CACHE_TTL_MS) {
+    const cached = JSON.parse(await readFile(cachePath(plan), "utf8"));
+    if (cached.fetchedAt && Date.now() - cached.fetchedAt < CATALOG_CACHE_TTL_MS) {
       return new Map(cached.rows ?? []);
     }
   } catch {}
-  const meta = parseMpcJson(await runFirst(MPC, ["--json"]));
+  const meta = parseMpcJson(await runFirst(MPC, metaArgs(plan)));
   try {
-    const path = cachePath();
+    const path = cachePath(plan);
     await mkdir(dirname(path), {
       recursive: true
     });
@@ -2195,19 +2267,19 @@ async function loadMeta() {
 async function loadUsage() {
   return requireSnapshot(parseUsageJson(await runFirst(CMDUSE, ["-1", "--json", "--plain"])));
 }
-async function loadZen() {
-  return parseZenJson(await runFirst(OCUSE, ["-1", "--json"]));
+async function loadZen(plan = OC_PLAN_DEFAULT) {
+  return parseZenJson(await runFirst(OCUSE, zenArgs(plan)));
 }
 
 // src/sidebar/usageDb.ts
 import { Database } from "bun:sqlite";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
 function usageDbPath() {
   if (process.env.OPENCODE_DB)
     return process.env.OPENCODE_DB;
-  const base = process.env.XDG_DATA_HOME ?? join3(homedir3(), ".local", "share");
-  return join3(base, "opencode", "opencode.db");
+  const base = process.env.XDG_DATA_HOME ?? join4(homedir4(), ".local", "share");
+  return join4(base, OPENCODE_DIR, OPENCODE_DB_FILE);
 }
 function usage(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -2333,15 +2405,14 @@ function loadSessionUsage(sessionID, path = usageDbPath()) {
 }
 
 // src/sidebar/useRows.ts
-var POLL_MS = 5000;
 function sessionKind(providerID) {
   if (!providerID)
     return "unknown";
-  if (providerID.startsWith("command-code"))
+  if (providerID.startsWith(PROVIDER_ID_PREFIX))
     return "ours";
-  if (providerID.startsWith("opencode-go"))
+  if (providerID.startsWith(GO_PROVIDER_ID))
     return "go";
-  if (providerID === "opencode" || providerID.startsWith("opencode-zen"))
+  if (providerID === ZEN_PROVIDER_ID || providerID.startsWith(ZEN_PROVIDER_PREFIX))
     return "zen";
   return "other";
 }
@@ -2396,7 +2467,7 @@ function useRows(activeModelId, providerID, sessionID) {
   const [sessionUsage, setSessionUsage] = createSignal();
   const [wasOurs, setWasOurs] = createSignal(false);
   const refreshMeta = () => {
-    loadMeta().then((next) => {
+    loadMeta(loadPrefs().ocPlan).then((next) => {
       rememberMeta(next);
       if (next.size > 0)
         setMeta(next);
@@ -2431,7 +2502,7 @@ function useRows(activeModelId, providerID, sessionID) {
         setUsage(usageRows(snapshot));
         refreshModelUsage(activeModelId());
       } else if (kind === "go" || kind === "zen") {
-        setZen(await loadZen());
+        setZen(await loadZen(loadPrefs().ocPlan));
       }
     } catch {} finally {
       inFlight = false;
@@ -2481,7 +2552,6 @@ function useRows(activeModelId, providerID, sessionID) {
 }
 
 // src/tui.tsx
-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;
@@ -2520,7 +2590,7 @@ function PanelV2(props) {
   });
 }
 var commandCodeTui = {
-  id: ID,
+  id: TUI_ID,
   setup(ctx) {
     ctx.ui.slot({
       append: "sidebar.content",

package/dist/v2.d.ts

@@ -1,21 +1,6 @@
 import type { Plugin as PluginNs } from "@opencode/plugin";
+import { type Lane } from "./constants/providers";
 import { type CmdModel } from "./models";
-export declare const PLUGIN_ID = "command-code";
-export declare const PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
-/** Shared integration backing both lanes' credentials (/connect + env). */
-export declare const INTEGRATION_ID = "command-code";
-export declare const INTEGRATION_NAME = "Command Code";
-type Lane = {
-    id: "command-code-anthropic" | "command-code-openai";
-    name: string;
-    /** v2 runtime package (first-party, distinct from the v1 `npm` value). */
-    pkg: string;
-    /** Wire field reasoning must round-trip through on the openai-compatible
-     * lane; v2 spells the old `interleaved: {field}` as `compatibility`. */
-    reasoningField?: string;
-};
-export type { Lane };
-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. */
@@ -51,3 +36,4 @@ export declare function credentialKey(ctx: CredentialContext): Promise<string |
  * own rewrite list (@opentui/*, solid-js).
  */
 export declare const commandCodeV2: PluginNs.Plugin;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jeffreyjyz/opencode-command-code",
-	"version": "0.3.19",
+	"version": "0.5.0",
 	"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",
@@ -24,7 +24,7 @@
 	},
 	"devDependencies": {
 		"@types/bun": "latest",
-		"typescript": "^5",
+		"typescript": "^7",
 		"@opencode-ai/plugin": "*",
 		"@opencode/plugin": "^2.0.11",
 		"@ai-sdk/provider": "3.0.8"