@jeffreyjyz/opencode-command-code 0.3.18 → 0.4.0

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";
@@ -131,9 +153,10 @@ import { RGBA } from "@opentui/core";
 import { For, Show } from "solid-js";
 // ../core/gating.json
 var gating_default = {
-  extractedAt: "2026-09-27T06:27:06.878Z",
-  cliVersion: "1.66.0",
+  extractedAt: "2026-10-03T05:21:43.847Z",
+  cliVersion: "1.74.1",
   categories: {
+    "claude-sonnet-5-5": "opensource",
     "claude-sonnet-5": "premium",
     "claude-sonnet-4-6": "premium",
     "claude-fable-5-1": "premium",
@@ -147,6 +170,7 @@ var gating_default = {
     "gpt-5.6-terra": "premium",
     "gpt-5.6-luna": "opensource",
     "gpt-6-astra": "premium",
+    "gpt-6.1-sol": "premium",
     "gpt-6-sol": "premium",
     "gpt-6-luna": "opensource",
     "gpt-5.5": "premium",
@@ -180,6 +204,7 @@ var gating_default = {
     "deepseek/deepseek-v4-pro": "opensource",
     "deepseek/deepseek-v4-flash": "opensource",
     "deepseek/deepseek-v4.1-flash": "opensource",
+    "deepseek/deepseek-v4.1-flash-fast": "opensource",
     "moonshotai/Kimi-K3": "opensource",
     "moonshotai/Kimi-K2.7-Code": "opensource",
     "moonshotai/Kimi-K2.7-Code-Highspeed": "opensource",
@@ -208,6 +233,7 @@ var gating_default = {
     "meituan/LongCat-2.0": "opensource",
     "meituan/LongCat-2.0:free": "opensource",
     "inclusionai/ling-3.0-flash-sante:free": "opensource",
+    "inclusionai/ling-3.1-flash:free": "opensource",
     "stepfun/Step-5-Preview": "opensource",
     "stepfun/Step-3.7-Flash": "opensource",
     "stepfun/Step-3.5-Flash": "opensource",
@@ -229,7 +255,24 @@ var gating_default = {
         "vercel-ai-gateway:xiaomi/mimo-v2.6-pro-ultraspeed",
         "openrouter:google/gemini-3.7-flash",
         "vercel-ai-gateway:google/gemini-3.8-flash",
-        "vercel-ai-gateway:gpt-5.6-sol"
+        "vercel-ai-gateway:gpt-5.6-sol",
+        "anthropic:claude-sonnet-5-5"
+      ]
+    },
+    "individual-go-v1": {
+      allowedCategories: [
+        "opensource"
+      ],
+      blockedModels: [
+        "vercel-ai-gateway:meta/muse-spark-1.2",
+        "vercel-ai-gateway:meta/muse-spark-1.3",
+        "vercel-ai-gateway:xai/grok-4.6",
+        "vercel-ai-gateway:xai/grok-4.7",
+        "vercel-ai-gateway:xiaomi/mimo-v2.6-pro-ultraspeed",
+        "openrouter:google/gemini-3.7-flash",
+        "vercel-ai-gateway:google/gemini-3.8-flash",
+        "vercel-ai-gateway:gpt-5.6-sol",
+        "anthropic:claude-sonnet-5-5"
       ]
     },
     "individual-goat": {
@@ -253,6 +296,7 @@ var gating_default = {
         "anthropic:claude-opus-4-6",
         "anthropic:claude-opus-4-5-20251101",
         "openai:gpt-6-astra",
+        "openai:gpt-6.1-sol",
         "vercel-ai-gateway:sakana/fugu-ultra"
       ]
     },
@@ -271,6 +315,7 @@ var gating_default = {
         "anthropic:claude-opus-4-6",
         "anthropic:claude-opus-4-5-20251101",
         "openai:gpt-6-astra",
+        "openai:gpt-6.1-sol",
         "vercel-ai-gateway:sakana/fugu-ultra"
       ]
     },
@@ -279,7 +324,9 @@ var gating_default = {
         "premium",
         "opensource"
       ],
-      blockedModels: []
+      blockedModels: [
+        "openai:gpt-6.1-sol"
+      ]
     },
     "individual-max": {
       allowedCategories: [
@@ -304,6 +351,7 @@ var gating_default = {
     }
   },
   knownModels: [
+    "claude-sonnet-5",
     "claude-sonnet-4-6",
     "claude-fable-5-1",
     "claude-fable-5",
@@ -313,6 +361,7 @@ var gating_default = {
     "claude-opus-4-7",
     "claude-haiku-4-5-20251001",
     "gpt-6-astra",
+    "gpt-6.1-sol",
     "gpt-6-sol",
     "gpt-6-luna",
     "gpt-5.6-sol",
@@ -330,6 +379,7 @@ var gating_default = {
     "deepseek/deepseek-v4-flash-vision-exp",
     "deepseek/deepseek-v4-flash-fast",
     "deepseek/deepseek-v4.1-flash",
+    "deepseek/deepseek-v4.1-flash-fast",
     "moonshotai/Kimi-K2.7-Code",
     "moonshotai/Kimi-K2.7-Code-Highspeed",
     "moonshotai/Kimi-K2.6",
@@ -375,9 +425,10 @@ var gating_default = {
     "poolside/laguna-s-2.1-free",
     "inclusionai/ling-3.0-flash-free",
     "inclusionai/ling-3.0-flash-sante:free",
+    "inclusionai/ling-3.1-flash:free",
     "stealth/space-bunny-alpha",
     "stealth/pixel-canary",
-    "claude-sonnet-5",
+    "claude-sonnet-5-5",
     "MiniMaxAI/MiniMax-M3-Free",
     "MiniMaxAI/MiniMax-M3",
     "MiniMaxAI/MiniMax-M2.7",
@@ -422,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;
@@ -430,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);
@@ -446,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;
@@ -497,7 +568,6 @@ function pctTone(pct) {
     return "warn";
   return "ok";
 }
-var ROW_WIDTH = 37;
 function separator() {
   return ["\u2500".repeat(ROW_WIDTH), "", "muted"];
 }
@@ -512,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";
@@ -611,7 +680,7 @@ function modelRows(meta, usage, session, fallbackName) {
   if (usage) {
     rows.push(["Usage (this model)", `${count(usage.requests)} req`, "base"]);
     const spend = usage.cost > 0 ? money(usage.cost) : "";
-    const share = usage.cost > 0 && session && session.cost > 0 ? `${Math.round(usage.cost / session.cost * 100)}% of session` : "";
+    const share = usage.cost > 0 && session && session.cost > 0 ? `${Math.min(100, Math.round(usage.cost / session.cost * 100))}% of session` : "";
     const detail = [spend, share].filter(Boolean).join(" \xB7 ");
     if (detail)
       rows.push(["", detail, "muted"]);
@@ -627,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"]);
@@ -761,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
@@ -925,10 +1024,23 @@ var MODEL_CATALOG = {
     modalities: ["text", "image"],
     minPlan: "Pro"
   },
+  "claude-sonnet-5-5": {
+    name: "Claude Sonnet 5.5",
+    context: 1e6,
+    efforts: ["low", "medium", "high", "xhigh", "max"],
+    cost: {
+      input: 2,
+      output: 10,
+      cacheRead: 0.2,
+      cacheWrite: 2.5
+    },
+    modalities: ["text", "image"],
+    minPlan: "GOAT"
+  },
   "deepseek/deepseek-v4-flash": {
     name: "DeepSeek V4 Flash (latest)",
     context: 1e6,
-    efforts: ["high", "max"],
+    efforts: ["off", "high", "max"],
     cost: {
       input: 0.15,
       output: 0.6,
@@ -954,7 +1066,7 @@ var MODEL_CATALOG = {
   "deepseek/deepseek-v4-flash-vision-exp": {
     name: "DeepSeek V4 Flash Vision (exp)",
     context: 1e6,
-    efforts: ["high", "max"],
+    efforts: ["off", "high", "max"],
     cost: {
       input: 0.15,
       output: 0.6,
@@ -967,7 +1079,7 @@ var MODEL_CATALOG = {
   "deepseek/deepseek-v4-pro": {
     name: "DeepSeek V4 Pro (latest)",
     context: 1e6,
-    efforts: ["high", "max"],
+    efforts: ["off", "high", "max"],
     cost: {
       input: 0.66,
       output: 1.98,
@@ -980,7 +1092,7 @@ var MODEL_CATALOG = {
   "deepseek/deepseek-v4.1-flash": {
     name: "DeepSeek V4.1 Flash",
     context: 1e6,
-    efforts: ["low", "high", "max"],
+    efforts: ["off", "low", "high", "max"],
     cost: {
       input: 0.15,
       output: 0.6,
@@ -990,6 +1102,19 @@ var MODEL_CATALOG = {
     modalities: ["text", "image"],
     minPlan: "Go"
   },
+  "deepseek/deepseek-v4.1-flash-fast": {
+    name: "DeepSeek V4.1 Flash Fast",
+    context: 1e6,
+    efforts: ["off", "low", "high", "max"],
+    cost: {
+      input: 0.16,
+      output: 0.58,
+      cacheRead: 0.016,
+      cacheWrite: 0
+    },
+    modalities: ["text", "image"],
+    minPlan: "Go"
+  },
   "google/gemini-3.1-flash-lite": {
     name: "Gemini 3.1 Flash Lite",
     context: 1e6,
@@ -1198,6 +1323,19 @@ var MODEL_CATALOG = {
     modalities: ["text", "image"],
     minPlan: "Pro"
   },
+  "gpt-6.1-sol": {
+    name: "GPT-6.1 Sol",
+    context: 1050000,
+    efforts: ["low", "medium", "high", "xhigh", "max"],
+    cost: {
+      input: 2,
+      output: 10,
+      cacheRead: 0.1,
+      cacheWrite: 2.5
+    },
+    modalities: ["text", "image"],
+    minPlan: "Max"
+  },
   "inclusionai/ling-3.0-flash-sante:free": {
     name: "Ling 3.0 Flash Sante",
     context: 262000,
@@ -1211,6 +1349,19 @@ var MODEL_CATALOG = {
     modalities: ["text"],
     minPlan: "Go"
   },
+  "inclusionai/ling-3.1-flash:free": {
+    name: "Ling 3.1 Flash",
+    context: 262000,
+    efforts: ["low", "medium", "high"],
+    cost: {
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0
+    },
+    modalities: ["text"],
+    minPlan: "Go"
+  },
   "meituan/LongCat-2.0": {
     name: "LongCat 2.0",
     context: 1050000,
@@ -1565,7 +1716,7 @@ var MODEL_CATALOG = {
   "stealth/space-bunny-alpha": {
     name: "Space Bunny Alpha",
     context: 1e6,
-    efforts: ["low", "medium", "high"],
+    efforts: ["low", "medium", "high", "max"],
     cost: {
       input: 0,
       output: 0,
@@ -1697,9 +1848,9 @@ var MODEL_CATALOG = {
     context: 500000,
     efforts: ["low", "medium", "high", "xhigh"],
     cost: {
-      input: 1.2,
-      output: 3.6,
-      cacheRead: 0.3,
+      input: 2,
+      output: 6,
+      cacheRead: 0.5,
       cacheWrite: 0
     },
     modalities: ["text", "image"],
@@ -1869,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;
@@ -1937,9 +2083,10 @@ function zenRows(usage, meta, session, fallbackName) {
   const rows = [["Plan", `${oc?.plan ?? "Go"} \xB7 limits per model`, "base"]];
   const mine = meta ? usage.models.get(modelKey(meta.name)) : undefined;
   const limit = oc?.allowance ?? mine?.limit;
-  rows.push(...windowRows2("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, limit, GO_WINDOW_SHARE.fiveHour));
-  rows.push(...windowRows2("Weekly", mine?.weekly ?? usage.totals.weekly, limit, GO_WINDOW_SHARE.weekly));
-  rows.push(...windowRows2("Month", mine?.month ?? usage.totals.month, limit, GO_WINDOW_SHARE.month));
+  const cap = mine ? limit : undefined;
+  rows.push(...windowRows2("5-hour", mine?.fiveHour ?? usage.totals.fiveHour, cap, GO_WINDOW_SHARE.fiveHour));
+  rows.push(...windowRows2("Weekly", mine?.weekly ?? usage.totals.weekly, cap, GO_WINDOW_SHARE.weekly));
+  rows.push(...windowRows2("Month", mine?.month ?? usage.totals.month, cap, GO_WINDOW_SHARE.month));
   rows.push(["Period", `${count(usage.totals.month.requests)} requests \xB7 ${money(usage.totals.month.cost)}`, "base"]);
   rows.push(separator());
   const name = meta?.name ?? fallbackName;
@@ -1953,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)}`];
@@ -1973,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);
@@ -2065,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,
@@ -2076,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
@@ -2086,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
     });
@@ -2113,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;
@@ -2251,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";
 }
@@ -2281,15 +2429,19 @@ function seededRows() {
   return lastSnapshot ? usageRows(lastSnapshot) : [];
 }
 var lastModelUsage;
-function rememberModelUsage(id, usage) {
+function rememberModelUsage(id, usage, session) {
   lastModelUsage = {
     key: modelKey(id),
+    session,
     usage
   };
 }
-function seededModelUsage(id) {
+function seededModelUsage(id, session) {
   if (!lastModelUsage)
     return;
+  if (session !== undefined && lastModelUsage.session !== undefined && lastModelUsage.session !== session) {
+    return;
+  }
   if (id === undefined)
     return lastModelUsage.usage;
   return lastModelUsage.key === modelKey(id) ? lastModelUsage.usage : undefined;
@@ -2310,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);
@@ -2320,9 +2472,12 @@ function useRows(activeModelId, providerID, sessionID) {
   const refreshModelUsage = (id) => {
     if (!id)
       return;
-    const fresh = loadModelUsage(id, 0, usageDbPath(), sessionID());
+    const session = sessionID();
+    if (!session)
+      return;
+    const fresh = loadModelUsage(id, 0, usageDbPath(), session);
     if (fresh)
-      rememberModelUsage(id, fresh);
+      rememberModelUsage(id, fresh, session);
     setModelUsage(lastModelUsage);
   };
   let inFlight = false;
@@ -2342,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;
@@ -2365,11 +2520,12 @@ function useRows(activeModelId, providerID, sessionID) {
     refreshModelUsage(id);
   });
   const usageFor = (id) => {
+    const session = sessionID();
     const seen = modelUsage();
-    if (seen && (id === undefined || seen.key === modelKey(id))) {
+    if (seen && (id === undefined || seen.key === modelKey(id)) && (seen.session === undefined || session === undefined || seen.session === session)) {
       return seen.usage;
     }
-    return seededModelUsage(id);
+    return seededModelUsage(id, session);
   };
   return createMemo(() => {
     const kind = sessionKind(providerID());
@@ -2391,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;
@@ -2430,7 +2585,7 @@ function PanelV2(props) {
   });
 }
 var commandCodeTui = {
-  id: ID,
+  id: TUI_ID,
   setup(ctx) {
     ctx.ui.slot({
       append: "sidebar.content",