@jeffreyjyz/opencode-command-code 0.3.19 → 0.4.0

package/dist/access.d.ts

@@ -1,4 +1,5 @@
-import { canonicalizeModelId, PLAN_RULES } from "./gating";
+import { PLAN_RULES } from "./constants/gating";
+import { canonicalizeModelId } from "./gating";
 export { canonicalizeModelId, PLAN_RULES };
 export type PlanLike = {
     planId: string;

package/dist/api.d.ts

@@ -1,4 +1,3 @@
-export declare const API_BASE = "https://api.commandcode.ai";
 export declare function authHeaders(key: string): Record<string, string>;
 export declare function getJson(path: string, key: string, timeoutMs?: number): Promise<unknown>;
 export type Whoami = {

package/dist/constants/binaries.d.ts

@@ -0,0 +1,6 @@
+/** Fallback lookup paths for the cmduse CLI (CMDUSE_BIN wins when set). */
+export declare const CMDUSE_BIN_CANDIDATES: readonly string[];
+/** Fallback lookup paths for mpc, the per-model catalog scraper. */
+export declare const MPC_BIN_CANDIDATES: readonly string[];
+/** Fallback lookup paths for ocuse (OCUSE_BIN wins when set). */
+export declare const OCUSE_BIN_CANDIDATES: readonly string[];

package/dist/constants/cli.d.ts

@@ -0,0 +1,12 @@
+import type { spawn } from "node:child_process";
+/** Default invocation: one-shot dashboard, no colors / no live redraw. */
+export declare const DEFAULT_ARGS: readonly string[];
+/** cmduse subcommands — when the arg starts with one, pass it through
+ * untouched; otherwise it is extra flags for the one-shot dashboard. */
+export declare const SUBCOMMANDS: ReadonlySet<string>;
+/** `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
+ * not stop it — which would corrupt the opencode TUI this process inherits its
+ * tty from. Detaching makes that open fail; stdout/stderr stay piped. */
+export declare const SPAWN_OPTIONS: Parameters<typeof spawn>[2];

package/dist/constants/endpoints.d.ts

@@ -0,0 +1,6 @@
+/** Command Code account/billing API. */
+export declare const API_BASE = "https://api.commandcode.ai";
+/** Provider (inference) API root; the lanes append their wire path. */
+export declare const PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
+/** Default provider base URL used when the host passes none. */
+export declare const DEFAULT_BASE_URL = "https://api.commandcode.ai";

package/dist/constants/gating.d.ts

@@ -0,0 +1,22 @@
+import type { Category } from "../gating";
+/** model id -> category (models absent from this table have unknown category) */
+export declare const MODEL_CATEGORIES: Record<string, Category>;
+/** planId -> access rules; plan ids absent from this table get everything */
+export declare const PLAN_RULES: Record<string, {
+    allowedCategories: Category[];
+    blockedModels: string[];
+}>;
+/** Models the API hard-blocks (403 MODEL_NOT_IN_PLAN) per plan, beyond the
+ * category rules. Empirically probed — the CLI bundle misses these because it
+ * tracks category via serving lane, not per-model plan entitlements. */
+export declare const HARD_BLOCKED: Record<string, string[]>;
+/** canonical known model ids (lowercase compare) */
+export declare const KNOWN_MODELS: string[];
+/** deprecated/aliased model id -> canonical id */
+export declare const MODEL_ALIASES: Record<string, string>;
+/** ISO timestamp the snapshot was extracted (absent on pre-metadata files). */
+export declare const GATE_EXTRACTED_AT: string | undefined;
+/** Command Code CLI version the snapshot was scraped from. */
+export declare const GATE_CLI_VERSION: string | undefined;
+/** Warn once a process when gating.json is older than this many days. */
+export declare const GATE_STALE_DAYS = 30;

package/dist/constants/models.d.ts

@@ -0,0 +1,29 @@
+/** Every Command Code model shares these capabilities; hoisted so each record
+ * does not rebuild them. Vision (`attachment` + `input.image`) is applied per
+ * model from the generated catalog in the two model builders. */
+export declare const MODEL_CAPABILITIES: {
+    temperature: boolean;
+    reasoning: boolean;
+    attachment: boolean;
+    toolcall: boolean;
+    input: {
+        text: boolean;
+        audio: boolean;
+        image: boolean;
+        video: boolean;
+        pdf: boolean;
+    };
+    output: {
+        text: boolean;
+        audio: boolean;
+        image: boolean;
+        video: boolean;
+        pdf: boolean;
+    };
+};
+/** Context window advertised when the listing API gives no length. */
+export declare const DEFAULT_CONTEXT_LENGTH = 128000;
+/** Max output tokens advertised per model. */
+export declare const DEFAULT_OUTPUT_TOKENS = 32000;
+/** Provider wire ceiling for a request's max tokens. */
+export declare const DEFAULT_MAX_TOKENS = 64000;

package/dist/constants/paths.d.ts

@@ -0,0 +1,18 @@
+/** Dir segment under an XDG base that holds our caches/diagnostics. */
+export declare const CACHE_DIR = "command-code";
+/** Live model list disk cache file (under CACHE_DIR). */
+export declare const MODELS_CACHE_FILE = "models.json";
+/** Startup timing log file (under CACHE_DIR). */
+export declare const STARTUP_LOG_FILE = "startup.log";
+/**
+ * mpc per-model catalog disk cache file (under CACHE_DIR), one per OpenCode Go
+ * plan: mpc bakes the selected plan's per-model allowance into the rows, so a
+ * cached catalog is only valid for the plan it was fetched under.
+ */
+export declare function ccCatalogFile(plan: string): string;
+/** opencode's own config/data dir segment. */
+export declare const OPENCODE_DIR = "opencode";
+/** opencode's message store file (under OPENCODE_DIR in the data root). */
+export declare const OPENCODE_DB_FILE = "opencode.db";
+/** Sidebar prefs file (under OPENCODE_DIR in the config root). */
+export declare const PREFS_FILE = "command-code.json";

package/dist/constants/providers.d.ts

@@ -0,0 +1,28 @@
+/** Provider-id prefix shared by both Command Code lanes and the plugin id. */
+export declare const PROVIDER_ID_PREFIX = "command-code";
+/** Plugin id (stable contract; the v2 `setup` definition and the TUI share it). */
+export declare const PLUGIN_ID = "command-code";
+/** Integration id backing both lanes' credentials (/connect + env). */
+export declare const INTEGRATION_ID = "command-code";
+/** Display name for the integration and the no-key warning. */
+export declare const INTEGRATION_NAME = "Command Code";
+/** OpenCode Go provider id (ocuse reads its store). */
+export declare const GO_PROVIDER_ID = "opencode-go";
+/** OpenCode Zen provider id and its `opencode-zen` alias prefix. */
+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 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').";
+export 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;
+};
+/** The Anthropic and OpenAI-compatible provider lanes this plugin owns. */
+export declare const LANES: [Lane, Lane];

package/dist/constants/sidebar.d.ts

@@ -0,0 +1,33 @@
+import type { Category } from "../gating";
+import type { Prefs } from "../sidebar/prefs";
+/**
+ * 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 rather than wrapping in
+ * the host's renderer, which is what made the panel look broken.
+ */
+export declare const ROW_WIDTH = 37;
+/** Tier label per gating category. */
+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.
+ */
+export declare const OC_PLANS: readonly ["go", "go-plus"];
+export type OcPlan = (typeof OC_PLANS)[number];
+/** Plan used when the user has not set one: behaviour is unchanged for them. */
+export declare const OC_PLAN_DEFAULT: OcPlan;
+/** 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;
+};
+/** 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;
+/** Colour is OFF unless asked for; the OpenCode Go plan defaults to `go` (see
+ * sidebar/prefs.ts). */
+export declare const PREF_DEFAULTS: Prefs;

package/dist/constants/timing.d.ts

@@ -0,0 +1,13 @@
+/** Sidebar poll cadence: one cmduse/ocuse spawn plus the local store reads. */
+export declare const POLL_MS = 5000;
+/** How long one sidebar CLI spawn may run before it is killed. An outage can
+ * leave a fetch hanging through cmduse's retry ladder, and the poll interval
+ * would otherwise stack spawns on top of each other. */
+export declare const CHILD_TIMEOUT_MS = 30000;
+/** Process-lifetime cache for the live model list (src/models.ts). */
+export declare const MODELS_CACHE_TTL_MS: number;
+/** Disk cache for mpc's per-model catalog (src/sidebar/data.ts). An hour, not
+ * six: a running panel then picks up new models and promotions. */
+export declare const CATALOG_CACHE_TTL_MS: number;
+/** Re-read window for the sidebar colour prefs file (src/sidebar/prefs.ts). */
+export declare const PREFS_CACHE_MS = 5000;

package/dist/gating.d.ts

@@ -1,23 +1,5 @@
 export type Category = "opensource" | "premium";
-/** model id -> category (models absent from this table have unknown category) */
-export declare const MODEL_CATEGORIES: Record<string, Category>;
-/** planId -> access rules; plan ids absent from this table get everything */
-export declare const PLAN_RULES: Record<string, {
-    allowedCategories: Category[];
-    blockedModels: string[];
-}>;
-/** Models the API hard-blocks (403 MODEL_NOT_IN_PLAN) per plan, beyond the
- * category rules. Empirically probed — the CLI bundle misses these because it
- * tracks category via serving lane, not per-model plan entitlements. */
-export declare const HARD_BLOCKED: Record<string, string[]>;
-/** canonical known model ids (lowercase compare) */
-declare const KNOWN_MODELS: string[];
-export { KNOWN_MODELS };
-/** ISO timestamp the snapshot was extracted (absent on pre-metadata files). */
-export declare const GATE_EXTRACTED_AT: string | undefined;
-/** Command Code CLI version the snapshot was scraped from. */
-export declare const GATE_CLI_VERSION: string | undefined;
-/** Warn once per process when gating.json is older than 30 days. */
+/** Warn once per process when gating.json is older than GATE_STALE_DAYS. */
 export declare function warnIfGatingStale(): void;
 export declare function canonicalizeModelId(model: string): string;
 /** Bare model id with any provider qualifier stripped: everything after the

package/dist/index.d.ts

@@ -2,9 +2,9 @@ import type { Plugin as PluginV1 } from "@opencode-ai/plugin";
 export declare const CommandCodePlugin: PluginV1;
 export { createCommandCode } from "./provider";
 declare const _default: {
-    /** v1 entrypoint (opencode >=1.18.29 object entrypoints). */
-    server: PluginV1;
     id: string;
     setup: (context: import("@opencode/plugin/promise/plugin").Context) => Promise<import("@opencode/plugin/promise/plugin").Cleanup | void> | import("@opencode/plugin/promise/plugin").Cleanup | void;
+    /** v1 entrypoint (opencode >=1.18.29 object entrypoints). */
+    server: PluginV1;
 };
 export default _default;

package/dist/index.js

@@ -2414,7 +2414,7 @@ function superRefine(fn) {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.3.19",
+  version: "0.4.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",
@@ -2438,7 +2438,7 @@ var package_default = {
   },
   devDependencies: {
     "@types/bun": "latest",
-    typescript: "^5",
+    typescript: "^7",
     "@opencode-ai/plugin": "*",
     "@opencode/plugin": "^2.0.11",
     "@ai-sdk/provider": "3.0.8"
@@ -2461,8 +2461,12 @@ var package_default = {
   }
 };
 
-// src/api.ts
+// src/constants/endpoints.ts
 var API_BASE = "https://api.commandcode.ai";
+var PROVIDER_BASE = `${API_BASE}/provider/v1`;
+var DEFAULT_BASE_URL = API_BASE;
+
+// src/api.ts
 function authHeaders(key) {
   return { Authorization: `Bearer ${key}`, Accept: "application/json" };
 }
@@ -2935,7 +2939,12 @@ var MODEL_CATALOG = {
     name: "Qwen 3.7 Flash",
     context: 1e6,
     efforts: null,
-    cost: { input: 0.03, output: 0.13, cacheRead: 0.006, cacheWrite: 0.038 },
+    cost: {
+      input: 0.03,
+      output: 0.13,
+      cacheRead: 0.006,
+      cacheWrite: 0.038
+    },
     modalities: ["text", "image"],
     minPlan: "Go"
   },
@@ -3207,16 +3216,22 @@ function reasoningVariants(id) {
 
 // src/cli.ts
 import { spawn } from "child_process";
-function cmduseCandidates(env = process.env) {
-  const candidates = [
-    env.CMDUSE_BIN,
-    "cmduse",
-    "/opt/homebrew/bin/cmduse",
-    "/usr/local/bin/cmduse"
-  ];
-  return candidates.filter((bin) => Boolean(bin));
-}
-var CANDIDATES = cmduseCandidates();
+
+// 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"
+];
+
+// src/constants/cli.ts
 var DEFAULT_ARGS = ["-1", "--plain"];
 var SUBCOMMANDS = new Set([
   "plans",
@@ -3228,6 +3243,13 @@ var SUBCOMMANDS = new Set([
   "statusline",
   "config"
 ]);
+
+// src/cli.ts
+function cmduseCandidates(env = process.env) {
+  const candidates = [env.CMDUSE_BIN, ...CMDUSE_BIN_CANDIDATES];
+  return candidates.filter((bin) => Boolean(bin));
+}
+var CANDIDATES = cmduseCandidates();
 function splitCliArgs(input) {
   const out = [];
   let cur = "";
@@ -3269,7 +3291,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];
@@ -3328,9 +3350,48 @@ 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 });
 }
 
+// src/constants/models.ts
+var MODEL_CAPABILITIES = {
+  temperature: true,
+  reasoning: true,
+  attachment: false,
+  toolcall: true,
+  input: { text: true, audio: false, image: false, video: false, pdf: false },
+  output: {
+    text: true,
+    audio: false,
+    image: false,
+    video: false,
+    pdf: false
+  }
+};
+var DEFAULT_CONTEXT_LENGTH = 128000;
+var DEFAULT_OUTPUT_TOKENS = 32000;
+var DEFAULT_MAX_TOKENS = 64000;
+
+// src/constants/providers.ts
+var PROVIDER_ID_PREFIX = "command-code";
+var PLUGIN_ID = PROVIDER_ID_PREFIX;
+var INTEGRATION_ID = PROVIDER_ID_PREFIX;
+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 LANES = [
+  {
+    id: "command-code-anthropic",
+    name: "Command Code (Anthropic)",
+    pkg: "@opencode/ai/providers/anthropic"
+  },
+  {
+    id: "command-code-openai",
+    name: "Command Code (OpenAI)",
+    pkg: "@opencode/ai/providers/openai-compatible",
+    reasoningField: "reasoning_content"
+  }
+];
+
 // src/key.ts
 import { readFile } from "fs/promises";
-import { homedir } from "os";
+import { homedir as homedir2 } from "os";
 async function resolveKey(getAuth) {
   const env = process.env.CMD_API_KEY;
   if (env)
@@ -3341,7 +3402,7 @@ async function resolveKey(getAuth) {
       return auth.key;
   } catch {}
   try {
-    const text = await readFile(`${homedir()}/.commandcode/auth.json`, "utf8");
+    const text = await readFile(`${homedir2()}/.commandcode/auth.json`, "utf8");
     const v = JSON.parse(text);
     if (typeof v.apiKey === "string" && v.apiKey)
       return v.apiKey;
@@ -3670,7 +3731,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;
@@ -3679,6 +3740,8 @@ var MODEL_ALIASES = gating_default.aliases;
 var GATE_EXTRACTED_AT = gating_default.extractedAt;
 var GATE_CLI_VERSION = gating_default.cliVersion;
 var GATE_STALE_DAYS = 30;
+
+// src/gating.ts
 var staleWarned = false;
 function warnIfGatingStale() {
   if (staleWarned || !GATE_EXTRACTED_AT)
@@ -3745,8 +3808,11 @@ function siblingCategory(model) {
   return best ? MODEL_CATEGORIES[best] : undefined;
 }
 
+// src/constants/timing.ts
+var MODELS_CACHE_TTL_MS = 5 * 60 * 1000;
+var CATALOG_CACHE_TTL_MS = 60 * 60 * 1000;
+
 // src/models.ts
-var CACHE_TTL_MS = 5 * 60 * 1000;
 var cache = null;
 function isClaude(id) {
   const bare = id.includes("/") ? id.slice(id.lastIndexOf("/") + 1) : id;
@@ -3762,8 +3828,8 @@ function splitModels(models) {
 async function loadModels(key) {
   warnIfGatingStale();
   let models;
-  const fresh = cache && cache.key === key && Date.now() - cache.at < CACHE_TTL_MS;
-  if (fresh) {
+  const fresh = cache && cache.key === key && Date.now() - cache.at < MODELS_CACHE_TTL_MS;
+  if (fresh && cache) {
     models = cache.models;
   } else {
     try {
@@ -3801,11 +3867,18 @@ async function loadModels(key) {
 
 // src/modelsCache.ts
 import { mkdir, readFile as readFile2, writeFile } from "fs/promises";
-import { homedir as homedir2 } from "os";
-import { join } from "path";
+import { homedir as homedir3 } from "os";
+import { join as join2 } from "path";
+
+// src/constants/paths.ts
+var CACHE_DIR = "command-code";
+var MODELS_CACHE_FILE = "models.json";
+var STARTUP_LOG_FILE = "startup.log";
+
+// src/modelsCache.ts
 function cachePath() {
-  const base = process.env.XDG_CACHE_HOME ?? join(homedir2(), ".cache");
-  return join(base, "command-code", "models.json");
+  const base = process.env.XDG_CACHE_HOME ?? join2(homedir3(), ".cache");
+  return join2(base, CACHE_DIR, MODELS_CACHE_FILE);
 }
 async function readModelsCache() {
   try {
@@ -3820,7 +3893,7 @@ async function readModelsCache() {
 async function writeModelsCache(cache) {
   try {
     const path = cachePath();
-    await mkdir(join(path, ".."), { recursive: true });
+    await mkdir(join2(path, ".."), { recursive: true });
     await writeFile(path, JSON.stringify(cache));
   } catch {}
 }
@@ -3914,7 +3987,9 @@ function anthropicReducer() {
   const open = (index, kind) => {
     const id = `${kind === "text" ? "text" : "reasoning"}-${index}`;
     blocks.set(index, { type: kind, id });
-    return [{ type: kind === "text" ? "text-start" : "reasoning-start", id }];
+    return [
+      { type: kind === "text" ? "text-start" : "reasoning-start", id }
+    ];
   };
   return {
     feed(event) {
@@ -3936,7 +4011,13 @@ function anthropicReducer() {
         if (blockType === "tool_use") {
           const id = text(block.id) || `tool-${index}`;
           blocks.set(index, { type: "tool_use", id });
-          return [{ type: "tool-input-start", id, toolName: text(block.name) }];
+          return [
+            {
+              type: "tool-input-start",
+              id,
+              toolName: text(block.name)
+            }
+          ];
         }
         blocks.set(index, { type: "other", id: `block-${index}` });
         return [];
@@ -3949,17 +4030,29 @@ function anthropicReducer() {
         if (textDelta) {
           const parts = block?.type === "text" ? [] : open(index, "text");
           const id = blocks.get(index)?.id ?? `text-${index}`;
-          return [...parts, { type: "text-delta", id, delta: textDelta }];
+          return [
+            ...parts,
+            { type: "text-delta", id, delta: textDelta }
+          ];
         }
         const thinking = text(delta.thinking);
         if (thinking) {
           const parts = block?.type === "thinking" ? [] : open(index, "thinking");
           const id = blocks.get(index)?.id ?? `reasoning-${index}`;
-          return [...parts, { type: "reasoning-delta", id, delta: thinking }];
+          return [
+            ...parts,
+            { type: "reasoning-delta", id, delta: thinking }
+          ];
         }
         const partial = text(delta.partial_json);
         if (partial && block?.type === "tool_use") {
-          return [{ type: "tool-input-delta", id: block.id, delta: partial }];
+          return [
+            {
+              type: "tool-input-delta",
+              id: block.id,
+              delta: partial
+            }
+          ];
         }
         return [];
       }
@@ -4176,7 +4269,11 @@ function openaiReducer() {
       return parts;
     },
     close() {
-      const parts = [...closeReasoning(), ...closeText(), ...flushTools()];
+      const parts = [
+        ...closeReasoning(),
+        ...closeText(),
+        ...flushTools()
+      ];
       if (pending && !finished) {
         finished = true;
         parts.push({
@@ -4191,7 +4288,6 @@ function openaiReducer() {
 }
 
 // src/provider/wire.ts
-var DEFAULT_MAX_TOKENS = 64000;
 function capTokens(value) {
   const n = typeof value === "number" && Number.isFinite(value) ? value : DEFAULT_MAX_TOKENS;
   return Math.min(n, DEFAULT_MAX_TOKENS);
@@ -4345,7 +4441,11 @@ function anthropicBody(model, prompt, options) {
   };
   if (system)
     body.system = [
-      { type: "text", text: system, cache_control: { type: "ephemeral" } }
+      {
+        type: "text",
+        text: system,
+        cache_control: { type: "ephemeral" }
+      }
     ];
   if (options.tools?.length) {
     body.tools = options.tools.map((t) => ({
@@ -4443,7 +4543,6 @@ function requestBody(lane, model, prompt, options) {
 }
 
 // src/provider/index.ts
-var DEFAULT_BASE_URL = "https://api.commandcode.ai";
 function laneOf(modelId) {
   const bare = modelId.includes("/") ? modelId.slice(modelId.lastIndexOf("/") + 1) : modelId;
   return bare.toLowerCase().startsWith("claude") ? "anthropic" : "openai";
@@ -4507,10 +4606,11 @@ function createCommandCode(options = {}, images = () => false) {
           const detail = await response.text().catch(() => "");
           throw new Error(`command-code ${lane} ${response.status}: ${detail.slice(0, 300)}`);
         }
+        const responseBody = response.body;
         const reducer = lane === "anthropic" ? anthropicReducer() : openaiReducer();
         const stream = new ReadableStream({
           async start(controller) {
-            const reader = response.body.getReader();
+            const reader = responseBody.getReader();
             const decoder = new TextDecoder;
             const emit = (parts) => {
               for (const part of parts)
@@ -4546,7 +4646,12 @@ function createCommandCode(options = {}, images = () => false) {
           raw: "unknown"
         };
         let usage = {
-          inputTokens: { total: 0, noCache: 0, cacheRead: 0, cacheWrite: 0 },
+          inputTokens: {
+            total: 0,
+            noCache: 0,
+            cacheRead: 0,
+            cacheWrite: 0
+          },
           outputTokens: { total: 0, text: 0, reasoning: 0 }
         };
         const textOf = {};
@@ -4559,7 +4664,10 @@ function createCommandCode(options = {}, images = () => false) {
           if (part.type === "text-delta")
             textOf[String(part.id)] = (textOf[String(part.id)] ?? "") + String(part.delta);
           else if (part.type === "reasoning-delta") {
-            content.push({ type: "reasoning", text: String(part.delta) });
+            content.push({
+              type: "reasoning",
+              text: String(part.delta)
+            });
           } else if (part.type === "tool-input-start") {
             toolsById.set(String(part.id), {
               name: String(part.toolName),
@@ -4597,43 +4705,25 @@ function createCommandCode(options = {}, images = () => false) {
 
 // src/startupLog.ts
 import { appendFile, mkdir as mkdir2 } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { join as join2 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join3 } from "path";
 function setupTimingLine(t) {
   return `setup: key=${t.key}ms register=${t.register}ms connection=${t.connection}ms refresh=${t.refresh}ms models=${t.models}`;
 }
 function startupLogPath() {
-  const base = process.env.XDG_CACHE_HOME ?? join2(homedir3(), ".cache");
-  return join2(base, "command-code", "startup.log");
+  const base = process.env.XDG_CACHE_HOME ?? join3(homedir4(), ".cache");
+  return join3(base, CACHE_DIR, STARTUP_LOG_FILE);
 }
 async function writeStartupLine(line) {
   try {
     const path = startupLogPath();
-    await mkdir2(join2(path, ".."), { recursive: true });
+    await mkdir2(join3(path, ".."), { recursive: true });
     await appendFile(path, `[${new Date().toISOString()}] ${line}
 `);
   } catch {}
 }
 
 // src/v2.ts
-var PLUGIN_ID = "command-code";
-var PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
-var INTEGRATION_ID = "command-code";
-var INTEGRATION_NAME = "Command Code";
-var LANES = [
-  {
-    id: "command-code-anthropic",
-    name: "Command Code (Anthropic)",
-    pkg: "@opencode/ai/providers/anthropic"
-  },
-  {
-    id: "command-code-openai",
-    name: "Command Code (OpenAI)",
-    pkg: "@opencode/ai/providers/openai-compatible",
-    reasoningField: "reasoning_content"
-  }
-];
-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').";
 function costEntry(id) {
   const cost = modelCost(id);
   return cost ? [
@@ -4662,7 +4752,10 @@ function toV2Model(m, lane) {
     cost: costEntry(m.id),
     status: "active",
     enabled: true,
-    limit: { context: m.contextLength || 128000, output: 32000 },
+    limit: {
+      context: m.contextLength || DEFAULT_CONTEXT_LENGTH,
+      output: DEFAULT_OUTPUT_TOKENS
+    },
     ...lane.reasoningField ? { compatibility: { reasoningField: lane.reasoningField } } : {}
   };
   return info;
@@ -4759,7 +4852,10 @@ var commandCodeV2 = {
           if (provider.package === "")
             provider.package = lane.pkg;
           provider.activation = localKey ? "enabled" : "auto";
-          provider.settings = { ...provider.settings, baseURL: PROVIDER_BASE };
+          provider.settings = {
+            ...provider.settings,
+            baseURL: PROVIDER_BASE
+          };
           if (localKey && provider.settings.apiKey === undefined) {
             provider.settings.apiKey = localKey;
           }
@@ -4880,14 +4976,6 @@ var PROVIDER_NPM = `${package_default.name}@${package_default.version}`;
 function tool(input) {
   return input;
 }
-var MODEL_CAPABILITIES = {
-  temperature: true,
-  reasoning: true,
-  attachment: false,
-  toolcall: true,
-  input: { text: true, audio: false, image: false, video: false, pdf: false },
-  output: { text: true, audio: false, image: false, video: false, pdf: false }
-};
 function costFor(id) {
   const cost = modelCost(id);
   return {
@@ -4909,11 +4997,17 @@ function toModelDefs(models, providerID, npm, interleaved = false) {
         interleaved,
         ...supportsImage(m.id) ? {
           attachment: true,
-          input: { ...MODEL_CAPABILITIES.input, image: true }
+          input: {
+            ...MODEL_CAPABILITIES.input,
+            image: true
+          }
         } : {}
       },
       cost: costFor(m.id),
-      limit: { context: m.contextLength || 128000, output: 32000 },
+      limit: {
+        context: m.contextLength || DEFAULT_CONTEXT_LENGTH,
+        output: DEFAULT_OUTPUT_TOKENS
+      },
       status: "active",
       options: {},
       headers: {},
@@ -5026,7 +5120,9 @@ var CommandCodePlugin = async (_input) => {
         },
         async execute(args) {
           const key = await resolveKey();
-          return runCmduse(args.arg ?? "", { env: { CMD_API_KEY: key } });
+          return runCmduse(args.arg ?? "", {
+            env: { CMD_API_KEY: key }
+          });
         }
       })
     }

package/dist/provider/index.d.ts

@@ -1,6 +1,5 @@
 import type { LanguageModelV3 } from "@ai-sdk/provider";
 import { type WireLane } from "./wire";
-export declare const DEFAULT_BASE_URL = "https://api.commandcode.ai";
 export interface CommandCodeProviderOptions {
     /** Bearer key; the v2 host passes the resolved connection credential here. */
     apiKey?: string;

package/dist/sidebar/data.d.ts

@@ -1,12 +1,6 @@
-import { spawn } from "node:child_process";
+import { type OcPlan } from "../constants/sidebar";
 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
- * not stop it — which would corrupt the opencode TUI this process inherits its
- * tty from. Detaching makes that open fail; stdout/stderr stay piped. */
-export declare const SPAWN_OPTIONS: Parameters<typeof spawn>[2];
 /** Parse `cmduse -1 --json` into the usage snapshot. */
 export declare function parseUsageJson(text: string): Usage;
 /**
@@ -23,8 +17,17 @@ export declare function requireSnapshot(usage: Usage): Usage;
  * 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>>;
+/**
+ * mpc's args for the per-model catalog. `--shape off` is the recursion break
+ * (mpc's default `--shape auto` spawns reqshape, which spawns mpc back), never
+ * dropped; `--oc-plan` selects which Go plan's per-model allowance is baked in.
+ */
+export declare function metaArgs(plan: OcPlan): string[];
+/** ocuse's args: `--plan` selects the Go plan's per-model limits. */
+export declare function zenArgs(plan: OcPlan): string[];
+/** mpc's catalog, cached on disk: it scrapes live docs over the network. The
+ * cache is per plan, since mpc bakes that plan's per-model allowance into it. */
+export declare function loadMeta(plan?: OcPlan): Promise<Map<string, ModelMeta>>;
 /** One usage snapshot from cmduse. Throws when cmduse is missing, fails, or
  * returns the errored defaults its JSON carries when the account API is
  * unreachable (see `requireSnapshot`). */
@@ -34,4 +37,4 @@ export declare function loadUsage(): Promise<Usage>;
  * (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>;
+export declare function loadZen(plan?: OcPlan): Promise<ZenUsage>;

package/dist/sidebar/prefs.d.ts

@@ -1,10 +1,12 @@
+import { type OcPlan } from "../constants/sidebar";
 export interface Prefs {
     colors: boolean;
+    /** OpenCode Go plan the sidebar renders per-model limits for. */
+    ocPlan: OcPlan;
 }
-export declare const DEFAULTS: Prefs;
 /** Preferences live beside opencode's own config, XDG layout honoured. */
 export declare function prefsPath(env?: NodeJS.ProcessEnv): string;
-/** Only a literal `true` enables colour, so a typo cannot turn the panel on. */
+/** Only a literal `true` enables colour; an unknown plan falls back to `go`. */
 export declare function parsePrefs(raw: unknown): Prefs;
-/** Env override, then the file, then the default. Cached for `CACHE_MS`. */
+/** Env override, then the file, then the default. Cached for `PREFS_CACHE_MS`. */
 export declare function loadPrefs(env?: NodeJS.ProcessEnv, now?: number): Prefs;

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: `allowance` is 0 by convention. */
+    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,13 @@ 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` and allowance 0 — so it reads `∞`
+ * rather than the misleading `$0/mo` (0 is not a budget). 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,28 @@ 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 splitCliArgs(input) {
   const out = [];
   let cur = "";
@@ -52,7 +67,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];
@@ -118,6 +133,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 +473,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 +481,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 +519,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 +568,6 @@ function pctTone(pct) {
     return "warn";
   return "ok";
 }
-var ROW_WIDTH = 37;
 function separator() {
   return ["\u2500".repeat(ROW_WIDTH), "", "muted"];
 }
@@ -541,14 +582,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 +696,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 +830,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 +2020,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 +2100,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 +2120,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 +2206,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 +2218,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 +2229,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 +2262,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 +2400,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 +2462,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 +2497,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 +2547,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 +2585,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.4.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"