@bitkyc08/opencodex 2.21.0 → 2.22.0

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "4100af2a5b5f0eb057a3701bfa09decb431bfdd6933d2314370ff06abf1f8437"
+      "sha256": "23d58fd93c12138baca76f044899d82aea45768aa38f5f78c86e957e080be06b"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -318,7 +318,7 @@
     },
     {
       "path": "src/claude/agents-inject.ts",
-      "sha256": "fb338b3a3290589ae91f52e6fe60bbec85e71cc4eaea8ace8588519a89c26e4d"
+      "sha256": "46ebe634b087860bd3c107efe17d4c54289c19845c50c729eeaf53d18b4e8247"
     },
     {
       "path": "src/claude/alias.ts",
@@ -432,6 +432,10 @@
       "path": "src/cli/claude.ts",
       "sha256": "7b9b5ea1fbeab889f137a3f889e89350d7205ab77102f6b46357dd825be0e08d"
     },
+    {
+      "path": "src/cli/codex-log-guard-doctor.ts",
+      "sha256": "e6a62a5c9cbf65e900ec3523598a225f5ccd1238abb8da9cae232d60da6fdabf"
+    },
     {
       "path": "src/cli/codex-shim-autorestore.ts",
       "sha256": "9c6787a2a41f696eca1fbd95905a3f7b90718cf044dd21cb5e47f789fea48b44"
@@ -454,7 +458,7 @@
     },
     {
       "path": "src/cli/dispatch.ts",
-      "sha256": "39c48bd5eb2b3d52db34f7698f482210771eb63e5f990829aaaa2fda7fffebfc"
+      "sha256": "3edcfa5957813d525da64ed091f605dc70adda272cf16414d62f42a99ed5ed08"
     },
     {
       "path": "src/cli/doctor.ts",
@@ -466,7 +470,7 @@
     },
     {
       "path": "src/cli/help.ts",
-      "sha256": "55c0ee0ad7f3261bb23dbc7e08d208e94da60343c2f7d73e626110d5bbaf1b26"
+      "sha256": "829453ef2aac53bc15825bc6a47320a3a0a5a9989f616fbb62e76fdfa01891ee"
     },
     {
       "path": "src/cli/index.ts",
@@ -502,11 +506,11 @@
     },
     {
       "path": "src/cli/models.ts",
-      "sha256": "f424705f5abd97977041aeb76713db86a5869529c86d35b9a51295831c58238e"
+      "sha256": "a7ddece988af02fc1ebbf4f97bbed882ab70713048c65b094b62bba42b99036f"
     },
     {
       "path": "src/cli/observe.ts",
-      "sha256": "bacc427239130ab80e94d6450b946d50011035e7d50015f323cc3cb352a0d101"
+      "sha256": "c403189847bbeb114e87f133e6e3612c7e3f483e8c64e579152d54f4fc83f462"
     },
     {
       "path": "src/cli/opencode.ts",
@@ -526,7 +530,7 @@
     },
     {
       "path": "src/cli/registry.ts",
-      "sha256": "a41d54ece43183ef0f2e20cdbbec2866b470d007f4a11d5884e0afa87d52d5a8"
+      "sha256": "160e10cb3a5797cb7918261d804fc09d7eb264a3fbddbc9e8735eabf4bad87e7"
     },
     {
       "path": "src/cli/root.ts",
@@ -566,7 +570,7 @@
     },
     {
       "path": "src/cli/v2.ts",
-      "sha256": "28dc0d12a8edcf49821655e6dc242bbab72afdfec3a67e84143a08fb42363d64"
+      "sha256": "c82727ac194d3e21494b73f3ca4b8c32c86bacea1f39f489477f9cc0ddf8491f"
     },
     {
       "path": "src/clients/config-export.ts",
@@ -618,7 +622,7 @@
     },
     {
       "path": "src/codex/app-server-processes.ts",
-      "sha256": "465d55f46f7fe7e2387712a708f52b20471b86cb1ba7e860d37475d4af3e7a4b"
+      "sha256": "28c7fb91d8fd5c2332738e512b9d87c53ea09843191c145b0801d912e124fe9e"
     },
     {
       "path": "src/codex/app-server-restart-service.ts",
@@ -670,7 +674,7 @@
     },
     {
       "path": "src/codex/catalog/effort.ts",
-      "sha256": "174d3b2d850be0ec3e95d13b53ec50a34d5791ddeee8d9d6fc2d0f30ac69f0b3"
+      "sha256": "ac208a47306bd0081e7be7a73ff483296d28ca0e23427218ce999dc53a6071c9"
     },
     {
       "path": "src/codex/catalog/filesystem-evidence.ts",
@@ -690,15 +694,15 @@
     },
     {
       "path": "src/codex/catalog/parsing.ts",
-      "sha256": "36b9fa4face3877de4495809cae18f3ecd007e7b12e59a1dbfff8e222e884f85"
+      "sha256": "0998690562c0f00554630f2070205f6864d8f573ffcaa809d0def6c67f21be6c"
     },
     {
       "path": "src/codex/catalog/provider-fetch.ts",
-      "sha256": "1fa6525a53b7bed96b8a142eebb78f83b58a5029641e8fd983fb258db1445451"
+      "sha256": "472501e50bc4c82cfc0df13fd534b9ca9b391f3207b8bee74543d6cc999c3d30"
     },
     {
       "path": "src/codex/catalog/sync.ts",
-      "sha256": "8d0b1819dd73650ab99d1c9b07fdc0bd12c9db197e8554888afe4abfa1993ac8"
+      "sha256": "d586a2d468cf4120da088f0bdc3088751c0e7015a9fc5545dd5584804d1e3525"
     },
     {
       "path": "src/codex/codex-write-lock.ts",
@@ -710,7 +714,7 @@
     },
     {
       "path": "src/codex/convergence.ts",
-      "sha256": "9d9e6bb02d7ec2f87de2729708b311f4bf1eb0047e74fd7cd1dc00f41cbf069c"
+      "sha256": "ffe1a891c51b33ace33d99bb11ca36015544189f8c4bb1966c2bb08469a163fb"
     },
     {
       "path": "src/codex/custom-model-catalog-migration.ts",
@@ -770,7 +774,7 @@
     },
     {
       "path": "src/codex/inject.ts",
-      "sha256": "9d83aedcc214dba9c850fc904f38395d47df429a0587a677125a75b07d5f19ef"
+      "sha256": "fd020e956a6b7b50d256c9bdd7d585172cc7662993e4eb21fe2c55b0e2387e37"
     },
     {
       "path": "src/codex/injected-marker.ts",
@@ -792,6 +796,38 @@
       "path": "src/codex/journal.ts",
       "sha256": "f90fcb039ff2ca8ddbdfe8e9101b431e4c8d864cc18923bbbc98c671b1b7adb0"
     },
+    {
+      "path": "src/codex/log-guard/inspect.ts",
+      "sha256": "b2b4153ff668d3f3f89322e21bee5af375fa7f92d8f4039e8db88f1f040c8357"
+    },
+    {
+      "path": "src/codex/log-guard/lock.ts",
+      "sha256": "b4ce32198272163541652b9864f892eeff8f681e7807de67c321c6c8901b4384"
+    },
+    {
+      "path": "src/codex/log-guard/maintenance.ts",
+      "sha256": "f11d9c7d774719715a8b3b33e7573ab09eca33fa4f57e853479a4fb5d8617786"
+    },
+    {
+      "path": "src/codex/log-guard/path-safety.ts",
+      "sha256": "8df1c28dafbe16417dcc474fe06c63ec0d6b8367d47971569b4a80a17a614e16"
+    },
+    {
+      "path": "src/codex/log-guard/policy.ts",
+      "sha256": "ba282dba9271822d1778256f28dd4e8087f83dd282ce63dc06539e46db0da58b"
+    },
+    {
+      "path": "src/codex/log-guard/processes.ts",
+      "sha256": "a1388d9adfedc5918d0fdce83ae1f0577ede9a23f07789ba46ced5351a05edb1"
+    },
+    {
+      "path": "src/codex/log-guard/protection.ts",
+      "sha256": "92c1e86ec698bba7953f1e0d389383e76d1c7f05206d6beaa5f1eccc451e9b9b"
+    },
+    {
+      "path": "src/codex/log-guard/sqlite-errors.ts",
+      "sha256": "aa4335d71cf642e9b98b066af9204e6d66fff49a7f95b14c50b4c82abd1cce6f"
+    },
     {
       "path": "src/codex/main-account-cache.ts",
       "sha256": "1fe336e582bce085b1e37d8a1925b60e91ec667706f80d939974d41062673f6e"
@@ -866,7 +902,7 @@
     },
     {
       "path": "src/codex/paths.ts",
-      "sha256": "8137c05a2ef4d15094d0dd53b8ebe2d2324dfd005f4b74ecd390a8454c67f2c2"
+      "sha256": "f14512fec482d38044172cee72532372bb32757f964b4c2c90f1349c4d07c32c"
     },
     {
       "path": "src/codex/plan.ts",
@@ -874,7 +910,7 @@
     },
     {
       "path": "src/codex/plugins-doctor.ts",
-      "sha256": "8e43ea761676d4e93f53461f689995143c4c123e7c83d7948906af0a29cd0540"
+      "sha256": "51344b58e99a143d2c7d397481e5b2a26c86ab0a1c61db5b153068793e4d3cab"
     },
     {
       "path": "src/codex/pool-rotation.ts",
@@ -882,7 +918,7 @@
     },
     {
       "path": "src/codex/project-config-warnings.ts",
-      "sha256": "801d2308cef14ee36ae7740a1a94d54876331b6878d5b2c23a1a1f4bdfd6d93a"
+      "sha256": "b7543a8d5bd7ff439398480360d9f8b5840ade77e1db19155994d298136ef868"
     },
     {
       "path": "src/codex/prompt-journal.ts",
@@ -1962,7 +1998,7 @@
     },
     {
       "path": "src/providers/antigravity-models.ts",
-      "sha256": "005e17707703842d91d9b18aa6f28375bda6b49efff07cb7642c597ee0bcdc8b"
+      "sha256": "1382f985bf4fdf525fb4425d5040e7244460f441f492b22ddc493226e5b778d1"
     },
     {
       "path": "src/providers/api-keys.ts",
@@ -2018,7 +2054,7 @@
     },
     {
       "path": "src/providers/model-discovery.ts",
-      "sha256": "298d6f169883bfd5de3b6059fb3ae71c07328d0cec85cf4e188b80e78a50edc6"
+      "sha256": "bcf2a1b01dc8cdad91bd2b2e3ee935107e203905649985ee57691d33e3fed9c9"
     },
     {
       "path": "src/providers/model-rename-migration.ts",
@@ -2058,11 +2094,11 @@
     },
     {
       "path": "src/providers/quota.ts",
-      "sha256": "fa2d207d569be34fd50fd72b90389e3e4147c5101cce4318629f3f21172a5e9a"
+      "sha256": "828c4304b6b67d2a71d85141f8da0d2a59453f782c3de46a1905e68903750375"
     },
     {
       "path": "src/providers/registry.ts",
-      "sha256": "8e16a0051359debc48b59ade82901c64a0bfecf59edc69bd6536f6dd3fa66f1b"
+      "sha256": "363d273b5dbf67ed5b3491578f18c5d408d10b546a21a4a7cad3697606a47047"
     },
     {
       "path": "src/providers/request-pacing.ts",
@@ -2074,7 +2110,7 @@
     },
     {
       "path": "src/providers/slug-codec.ts",
-      "sha256": "01a82a23ee8046e280d9fdc85769233ccc7bc67d1866fe475f4f2efe33136aca"
+      "sha256": "733bfa8cb48e8e9baa678f5aefbf579f7eaa5eb05b16433779bd26e39b41ffe8"
     },
     {
       "path": "src/providers/static-model-discovery.ts",
@@ -2134,7 +2170,7 @@
     },
     {
       "path": "src/router.ts",
-      "sha256": "7366badf3a6ace0ae2f044bcab0872e6179bb7bc2f5c7d5a5e35d5655a26d39f"
+      "sha256": "574c51a5c95350217d72b6fa82b06806251e6706265866e909fec729882f82fb"
     },
     {
       "path": "src/routing/analytics.ts",
@@ -2142,7 +2178,7 @@
     },
     {
       "path": "src/routing/capability.ts",
-      "sha256": "02349faa5d03510aa8b6a3e2b2eebc6f4afe15ffe424cf5a49a28b643158f4c1"
+      "sha256": "00606e95e636abd8612bb6825c6cb8c2a62ca1eb396ebebba64501f34cd0e060"
     },
     {
       "path": "src/routing/compatibility/assemble.ts",
@@ -2286,7 +2322,7 @@
     },
     {
       "path": "src/server/index.ts",
-      "sha256": "e909c5777cac73894273ab6ce9a0e635dc55a74de726cc6a6f71c4409a695ba2"
+      "sha256": "2745fca63c657742f90c22f2a251a3bf1702aca0c5c5b24cfab9d01dad39cd93"
     },
     {
       "path": "src/server/lifecycle.ts",
@@ -2306,7 +2342,7 @@
     },
     {
       "path": "src/server/management-api.ts",
-      "sha256": "0a513030e2b730393d86c87ad237f1e9f35e64586d8736c91c69fed6aaabb60d"
+      "sha256": "4736d3b1030eff60d06b22e3339bb25f66062d9d3bf0c2becc701f5b10bcc032"
     },
     {
       "path": "src/server/management-auth.ts",
@@ -2314,7 +2350,7 @@
     },
     {
       "path": "src/server/management/agent-settings-routes.ts",
-      "sha256": "2e470534a00bfe47ca3c76688373c72650c60032d7d1ff56d3b57f3cadff3907"
+      "sha256": "d22e53a8f698e29c78905944a8c696522a0fe468bda72da4fb5f6491aa0b0cc6"
     },
     {
       "path": "src/server/management/api-access.ts",
@@ -2338,7 +2374,7 @@
     },
     {
       "path": "src/server/management/context.ts",
-      "sha256": "3c5d032849dbbe1036ceb748c5eb2f8b4bcf63816d5d8878e953ee3202c08f91"
+      "sha256": "85564a590d77fb49f7aab7a0cf4729ca6d704bcef4b3a68b5a437d87809aa212"
     },
     {
       "path": "src/server/management/integration-routes.ts",
@@ -2358,7 +2394,7 @@
     },
     {
       "path": "src/server/management/model-routes.ts",
-      "sha256": "2a4b0b72eec0e4487831e9236c4f911214052bc1b3d195ee46db109b3891e003"
+      "sha256": "de001901177f757c8a611f808e63ae55f64c6d81a9a5db6f29ac6bbb28f5c6f9"
     },
     {
       "path": "src/server/management/model-rows.ts",
@@ -2400,6 +2436,10 @@
       "path": "src/server/management/sidebar-routes.ts",
       "sha256": "0926c61288d6344456516c4208ea788192739d5d4c47c5566baf861313b75301"
     },
+    {
+      "path": "src/server/management/storage-log-guard-routes.ts",
+      "sha256": "76491da8b595410593405d8ae7fbfa0b870653277f801b75c01086fa69ca3445"
+    },
     {
       "path": "src/server/management/sync-response.ts",
       "sha256": "580cd5b67c1b1c7ac2a25262da00dc4dd31c7959e506622fc13a2f240d800786"
@@ -2514,7 +2554,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "d60f902c7c496690e701e2bd0217adb1df8b7f2fcb4c43cc9ec9afc74d8a80b8"
+      "sha256": "8a4539f6e9fd8a7016bc7562316525f7ce0f236481ec51c63d14a6ca253d1786"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -2674,7 +2714,7 @@
     },
     {
       "path": "src/types.ts",
-      "sha256": "59e811fabf37cd8b40621c6fcf7992c595ad645ddda3a6e6583ed6634fec6b84"
+      "sha256": "a1aa12232d1424a93598402de73b7455bf5d33892c67ef0772b8c60a44f64560"
     },
     {
       "path": "src/update/badge.ts",

package/src/providers/antigravity-models.ts

@@ -331,7 +331,17 @@ export function parseAntigravityAvailableModels(
     out.push({
       id,
       ...(antigravityPositiveInteger(info.maxTokens) ? { contextWindow: antigravityPositiveInteger(info.maxTokens) } : {}),
-      inputModalities: info.supportsImages === true ? ["text", "image"] : ["text"],
+      // Tri-state, deliberately not a ternary: `true` asserts image support,
+      // `false` asserts against it, and ABSENT is unknown. Collapsing absent into
+      // `["text"]` let routing read it as a confident `image: false` (#1796). The
+      // strict catalog still receives its `["text"]` compatibility default
+      // downstream via ensureStrictCatalogFields; only the routing-evidence
+      // channel stays honest about what was never asserted.
+      ...(info.supportsImages === true
+        ? { inputModalities: ["text", "image"] as string[] }
+        : info.supportsImages === false
+          ? { inputModalities: ["text"] as string[] }
+          : {}),
     });
   }
   return out;

package/src/providers/model-discovery.ts

@@ -99,7 +99,12 @@ export function providerModelDiscoverySpecError(spec: ProviderModelDiscoverySpec
       return "discovery path must be a query-free relative/origin path";
     }
     if (path.includes("\\")) return "discovery path must use forward slashes";
-    if (path.split("/").some(segment => segment.replace(/%2e/gi, ".") === "..")) {
+    const segments = path.split("/");
+    if (segments.some((segment, index) => {
+      const decoded = segment.replace(/%2e/gi, ".");
+      if (decoded !== "..") return false;
+      return index !== 0 || segments.filter(s => s.replace(/%2e/gi, ".") === "..").length !== 1;
+    })) {
       return "discovery path must not contain parent-directory segments";
     }
   }
@@ -326,12 +331,83 @@ export function extractModelEnvelopeRows(
 }
 
 /** Validate, bound, deduplicate, and declaratively filter OpenAI `{data:[...]}` or top-level arrays (Together `#617`). */
+/**
+ * Metadata a sibling `models[]` array may contribute to an ALREADY-ADMITTED
+ * `data[]` row (#1797).
+ *
+ * llama.cpp serves a dual-envelope body: an Ollama-style `models[]` array
+ * carrying `capabilities` alongside the OpenAI-style `data[]` array carrying
+ * `meta`, so the two halves of one model's metadata never meet and a server
+ * that truthfully advertises "multimodal" produced an image-blind row.
+ *
+ * Two boundaries make this safe, and both were added after review found the
+ * first attempt unsound:
+ *
+ * 1. It runs AFTER admission filtering. Enriching first let a sibling supply
+ *    the exact field a provider filter requires — reproduced against the real
+ *    Chutes policy, where a row lacking `supported_features: ["tools"]` was
+ *    admitted once a same-id sibling provided it. Enrichment may change what is
+ *    KNOWN about a model, never WHICH models are published.
+ * 2. Only the capability keys #1797 needs are copied. A blanket "fill every
+ *    absent key" made the untrusted `models[]` array a way into any field the
+ *    pipeline consumes.
+ *
+ *    The list deliberately EXCLUDES `supported_features` and `features`, even
+ *    though both are capability-shaped: they are the two keys real provider
+ *    filters test (`registry.ts:1591` requires `supported_features` to contain
+ *    "tools"; `registry.ts:1883` tests `features.tool_use`). Ordering already
+ *    prevents a sibling from flipping an admission verdict, but a key that is
+ *    both enrichable and filter-relevant is one refactor away from becoming a
+ *    bypass again. #1797 does not need them.
+ */
+const SIBLING_ENRICHABLE_KEYS = new Set(["capabilities", "modalities", "input_modalities"]);
+
+type SiblingIndex = Map<string, Record<string, unknown> | null>;
+
+function buildSiblingIndex(value: unknown, limit: number): SiblingIndex | null {
+  const record = plainObject(value);
+  const sibling = record?.models;
+  if (!Array.isArray(sibling) || sibling.length === 0 || sibling.length > limit) return null;
+
+  const byId: SiblingIndex = new Map();
+  for (const raw of sibling) {
+    const entry = plainObject(raw);
+    if (!entry) continue;
+    for (const key of ["id", "model", "name"]) {
+      const id = entry[key];
+      if (typeof id !== "string" || id.length === 0) continue;
+      // `null` marks an ambiguous id: two sibling entries claim it, so neither
+      // can be attributed with confidence and both are ignored.
+      byId.set(id, byId.has(id) && byId.get(id) !== entry ? null : entry);
+    }
+  }
+  return byId.size > 0 ? byId : null;
+}
+
+function enrichAdmittedModel(item: ProviderModelsApiItem, siblings: SiblingIndex): ProviderModelsApiItem {
+  const extra = siblings.get(item.id);
+  if (!extra) return item;
+  let merged: Record<string, unknown> | null = null;
+  for (const key of SIBLING_ENRICHABLE_KEYS) {
+    if (!(key in extra) || key in item) continue;
+    merged ??= { ...(item as Record<string, unknown>) };
+    merged[key] = extra[key];
+  }
+  return (merged ?? item) as ProviderModelsApiItem;
+}
+
+function plainObject(value: unknown): Record<string, unknown> | null {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? value as Record<string, unknown>
+    : null;
+}
 export function extractProviderModelItems(
   value: unknown,
   discovery: ResolvedProviderModelDiscovery,
 ): ProviderModelItemsResult {
   const limit = positiveIntegerAtMost(discovery.maxModels, MODEL_DISCOVERY_MAX_MODELS);
   let data: unknown[];
+  let siblings: SiblingIndex | null = null;
   if (Array.isArray(value)) {
     // Together-style top-level /models arrays. Catalog discovery must not treat a stray
     // `models` key on openai-chat responses as valid — only `data` envelopes or top-level arrays.
@@ -341,6 +417,7 @@ export function extractProviderModelItems(
     const envelope = extractModelEnvelopeRows(value, discovery.maxModels, ["data"]);
     if (!envelope.ok) return envelope;
     data = envelope.rows;
+    siblings = buildSiblingIndex(value, limit);
   }
 
   const items: ProviderModelsApiItem[] = [];
@@ -351,11 +428,22 @@ export function extractProviderModelItems(
     }
     const id = (raw as { id?: unknown }).id;
     if (!isValidModelDiscoveryModelId(id)) return { ok: false, reason: "invalid_shape" };
-    const normalizedId = id;
-    const item = raw as ProviderModelsApiItem;
-    if (!providerModelMatchesDiscoveryFilter(item, discovery.spec?.filter) || seen.has(normalizedId)) continue;
-    seen.add(normalizedId);
-    items.push(item);
+    const prefix = discovery.spec?.stripIdPrefix;
+    let finalId = id;
+    if (prefix && finalId.startsWith(prefix)) {
+      finalId = finalId.slice(prefix.length);
+      if (!isValidModelDiscoveryModelId(finalId)) continue;
+    }
+    const item = finalId === id ? raw as ProviderModelsApiItem : { ...(raw as ProviderModelsApiItem), id: finalId };
+    // Admission is decided on the ORIGINAL `data[]` row, before any sibling
+    // enrichment. Merging first let a `models[]` entry supply the very field a
+    // provider filter requires — reproduced against the real Chutes policy,
+    // where a row lacking `supported_features: ["tools"]` was admitted once a
+    // same-id sibling provided it. Enrichment must never change WHICH models
+    // are published, only what is known about an already-admitted one.
+    if (!providerModelMatchesDiscoveryFilter(item, discovery.spec?.filter) || seen.has(finalId)) continue;
+    seen.add(finalId);
+    items.push(siblings ? enrichAdmittedModel(item, siblings) : item);
   }
   return { ok: true, items, rawCount: data.length };
 }

package/src/providers/quota.ts

@@ -38,6 +38,11 @@ const REQUEST_TIMEOUT_MS = 8_000;
 export const QUOTA_RESPONSE_MAX_BYTES = 512 * 1024;
 const KIMI_CODE_BASE_URL = "https://api.kimi.com/coding/v1";
 const KIMI_CODE_USAGE_URL = `${KIMI_CODE_BASE_URL}/usages`;
+const COMMAND_CODE_BASE_URL = "https://api.commandcode.ai";
+const COMMAND_CODE_WHOAMI_URL = `${COMMAND_CODE_BASE_URL}/alpha/whoami`;
+const COMMAND_CODE_CREDITS_URL = `${COMMAND_CODE_BASE_URL}/alpha/billing/credits`;
+const COMMAND_CODE_SUBSCRIPTIONS_URL = `${COMMAND_CODE_BASE_URL}/alpha/billing/subscriptions`;
+const COMMAND_CODE_USAGE_URL = `${COMMAND_CODE_BASE_URL}/alpha/usage/summary`;
 const A6API_BASE_URL = "https://api.a6api.com";
 const OPENCODE_GO_BASE_URL = "https://opencode.ai/zen/go/v1";
 const OPENCODE_GO_USAGE_URL = `${OPENCODE_GO_BASE_URL}/usage`;
@@ -1510,6 +1515,12 @@ function isCanonicalKimiCodeBaseUrl(baseUrl: string): boolean {
   return normalizedBaseUrl(baseUrl) === KIMI_CODE_BASE_URL;
 }
 
+function isCanonicalCommandCodeBaseUrl(baseUrl: string): boolean {
+  const normalized = normalizedBaseUrl(baseUrl);
+  // OAuth preset points at the API root; the Provider-API preset at /provider/v1.
+  return normalized === COMMAND_CODE_BASE_URL || normalized === `${COMMAND_CODE_BASE_URL}/provider/v1`;
+}
+
 /** Prefer the nested `data` shell when the outer object is only an envelope. */
 function unwrapKimiQuotaPayload(value: unknown): Record<string, unknown> | null {
   const body = asRecord(value);
@@ -1631,6 +1642,145 @@ async function fetchKimiQuota(provider: string, config: OcxProviderConfig): Prom
   return quota ? report(provider, "kimi:usages", quota) : null;
 }
 
+/**
+ * Command Code rolling window: `{ cap, used, resetAt }` off /alpha/billing/credits,
+ * normalized to a percent with an optional reset timestamp.
+ */
+function parseCommandCodeWindow(value: unknown): { percent: number; resetAt?: number } | null {
+  const row = asRecord(value);
+  if (!row) return null;
+  const cap = toFiniteNumber(row.cap);
+  const used = toFiniteNumber(row.used);
+  if (cap === undefined || used === undefined || cap <= 0 || used < 0) return null;
+  const percent = normalizePercent((used / cap) * 100);
+  if (percent === undefined) return null;
+  const resetAt = quotaResetAt(row);
+  return { percent, ...(resetAt !== undefined ? { resetAt } : {}) };
+}
+
+/** Soft-fail GET returning a parsed record, or null when unavailable. */
+async function fetchCommandCodeJson(url: string, bearer: string): Promise<Record<string, unknown> | null> {
+  try {
+    const response = await fetch(url, {
+      headers: { Accept: "application/json", Authorization: `Bearer ${bearer}` },
+      redirect: "error",
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    });
+    if (!response.ok) return null;
+    return asRecord(await readQuotaJson(response));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Soft-fail period spend (used) against the remaining credit pools → creditsUsd.
+ * Period scoping: `since=<currentPeriodStart>` keeps spend aligned with the
+ * pools' billing cycle, and `currentPeriodEnd` becomes expiresAt.
+ */
+async function fetchCommandCodeSpend(
+  bearer: string,
+  credits: Record<string, unknown> | null,
+  orgQuery: string,
+): Promise<ProviderQuotaCreditsUsd | undefined> {
+  if (!credits) return undefined;
+  const subscriptionBody = await fetchCommandCodeJson(`${COMMAND_CODE_SUBSCRIPTIONS_URL}${orgQuery}`, bearer);
+  const subscription = asRecord(subscriptionBody?.data) ?? subscriptionBody;
+  const periodStart = typeof subscription?.currentPeriodStart === "string" ? subscription.currentPeriodStart.trim() : "";
+  // Unscoped /usage/summary is lifetime spend; mixing it with current-cycle
+  // remaining pools produces a wrong percent. Omit creditsUsd until a period exists.
+  if (!periodStart) return undefined;
+  const sinceQuery = `${orgQuery ? "&" : "?"}since=${encodeURIComponent(periodStart)}`;
+  const expiresAt = normalizeResetAt(subscription?.currentPeriodEnd);
+  const summaryBody = await fetchCommandCodeJson(`${COMMAND_CODE_USAGE_URL}${orgQuery}${sinceQuery}`, bearer);
+  const summary = asRecord(summaryBody?.data) ?? summaryBody;
+  const used = toFiniteNumber(summary?.totalCost) ?? toFiniteNumber(summary?.totalMonthlyCredits);
+  if (used === undefined || used < 0) return undefined;
+  const pools = [credits.monthlyCredits, credits.purchasedCredits, credits.freeCredits]
+    .map(value => toFiniteNumber(value))
+    .filter((value): value is number => value !== undefined);
+  // Field presence is what separates a real balance from absent data: an exhausted
+  // all-zero account still reports remaining=0, while no remaining-credit field at
+  // all means there is nothing to meter.
+  if (pools.length === 0) return undefined;
+  const remaining = pools.reduce((sum, value) => sum + Math.max(0, value ?? 0), 0);
+  const limit = used + remaining;
+  const percent = normalizePercent(limit > 0 ? (used / limit) * 100 : 0);
+  // Purchased credits roll over past the subscription period end, so an expiry is
+  // only truthful when the aggregate contains no non-expiring purchased pool.
+  const purchased = toFiniteNumber(credits.purchasedCredits) ?? 0;
+  return percent === undefined
+    ? undefined
+    : {
+        used,
+        limit,
+        remaining,
+        percent,
+        ...(expiresAt !== undefined && purchased <= 0 ? { expiresAt } : {}),
+      };
+}
+
+/** OAuth access token or ACTIVE Provider-API key for the Command Code quota probe. */
+async function resolveCommandCodeQuotaBearer(config: OcxProviderConfig): Promise<string | null> {
+  if (config.authMode === "oauth") {
+    try {
+      return await getValidAccessToken("command-code");
+    } catch {
+      return null;
+    }
+  }
+  // ACTIVE key only: a quota bar for a different account than the one routing
+  // requests is a wrong meter, not a helpful one.
+  return resolveEnvValue(config.apiKey)?.trim() || null;
+}
+
+/**
+ * Command Code `GET /alpha/billing/credits` — the same Bearer surface the CLI's
+ * usage view uses (windowLimits.fiveHour / windowLimits.weekly), plus soft
+ * whoami (team orgId scoping) and subscription-scoped spend for creditsUsd.
+ */
+async function fetchCommandCodeQuota(provider: string, config: OcxProviderConfig): Promise<ProviderQuotaProbeResult> {
+  // Never release credentials to a user-edited or lookalike provider host.
+  if (!isCanonicalCommandCodeBaseUrl(config.baseUrl)) return null;
+  const bearer = await resolveCommandCodeQuotaBearer(config);
+  if (!bearer) return null;
+  const whoamiBody = await fetchCommandCodeJson(COMMAND_CODE_WHOAMI_URL, bearer);
+  const whoami = asRecord(whoamiBody?.data) ?? whoamiBody;
+  const org = asRecord(whoami?.org);
+  const orgId = typeof org?.id === "string" && org.id.trim() ? org.id.trim() : null;
+  const orgQuery = orgId ? `?orgId=${encodeURIComponent(orgId)}` : "";
+  const response = await fetch(`${COMMAND_CODE_CREDITS_URL}${orgQuery}`, {
+    headers: { Accept: "application/json", Authorization: `Bearer ${bearer}` },
+    redirect: "error",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+  });
+  if (!response.ok) {
+    return response.status >= 400 && response.status < 500 && response.status !== 408 && response.status !== 429
+      ? TERMINAL_QUOTA_FAILURE
+      : null;
+  }
+  const raw = asRecord(await readQuotaJson(response));
+  const body = asRecord(raw?.data) ?? raw;
+  const credits = asRecord(body?.credits);
+  const limits = asRecord(body?.windowLimits);
+  if (!credits && !limits) return null;
+  const fiveHour = parseCommandCodeWindow(limits?.fiveHour);
+  const weekly = parseCommandCodeWindow(limits?.weekly);
+  const creditsUsd = await fetchCommandCodeSpend(bearer, credits, orgQuery);
+  return report(provider, "command-code:credits", {
+    ...(fiveHour ? {
+      fiveHourPercent: fiveHour.percent,
+      ...(fiveHour.resetAt !== undefined ? { fiveHourResetAt: fiveHour.resetAt } : {}),
+    } : {}),
+    ...(weekly ? {
+      weeklyPercent: weekly.percent,
+      ...(weekly.resetAt !== undefined ? { weeklyResetAt: weekly.resetAt } : {}),
+    } : {}),
+    ...(creditsUsd ? { creditsUsd } : {}),
+    updatedAt: Date.now(),
+  });
+}
+
 /** Cursor included usage via api2.cursor.sh (Bearer from OAuth) — unofficial, may change. */
 async function fetchCursorQuota(provider: string): Promise<ProviderQuotaReport | null> {
   let accessToken: string;
@@ -1919,6 +2069,15 @@ async function maybeFetchProviderQuota(
     if (provider.authMode === "key" && isCanonicalKimiCodeBaseUrl(provider.baseUrl)) {
       return fetchKimiQuota(name, provider);
     }
+    // OAuth account login or Provider-API key only; forward/local modes carry no
+    // credential of ours on the canonical host.
+    if (provider.authMode === "oauth" && name === "command-code") {
+      return fetchCommandCodeQuota(name, provider);
+    }
+    if ((provider.authMode ?? "key") === "key" && name === "commandcode"
+      && isCanonicalCommandCodeBaseUrl(provider.baseUrl)) {
+      return fetchCommandCodeQuota(name, provider);
+    }
     if ((provider.authMode ?? "key") === "key" && name === "opencode-go") {
       return fetchOpenCodeGoQuota(name, provider);
     }