@bman654/clodex 2.18.4 → 2.18.6

package/dist/cli.js

@@ -74,7 +74,7 @@ import {
   withRegistryWriteLockSync,
   writeParentNoticeLines,
   writeParentNoticeLinesSync
-} from "./chunk-YGEPQOPA.js";
+} from "./chunk-VFYRDLDD.js";
 
 // src/cli.ts
 import pc13 from "picocolors";
@@ -346,7 +346,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.18.4",
+  version: "2.18.6",
   publishConfig: {
     access: "public"
   },
@@ -433,7 +433,7 @@ var package_default = {
 
 // src/constants.ts
 var CODEX_RESPONSES_LITE_WS_URL = "wss://chatgpt.com/backend-api/codex/responses";
-var CODEX_RESPONSES_LITE_VERSION = "0.156.0";
+var CODEX_RESPONSES_LITE_VERSION = "0.159.0";
 var CODEX_RESPONSES_WEBSOCKETS_BETA = "responses_websockets=2026-02-06";
 var TEST_TIMEOUT_MS = 1e4;
 var CONFLICTING_ENV_VARS = [
@@ -630,6 +630,7 @@ var HEURISTIC_RULES = [
   [/claude/i, 2e5],
   [/deepseek-v4|deepseek-r1|deepseek-reasoner/i, 1e6],
   [/deepseek/i, 64e3],
+  [/gpt-6\.1-sol/i, 105e4],
   [/gpt-6-(?:astra|sol|luna)/i, 105e4],
   [/gpt-5|gpt-4\.1|o3-|o4-/i, 1e6],
   [/gpt-4o|gpt-4-turbo|gpt-4/i, 128e3],
@@ -4916,31 +4917,6 @@ var opencode_go_models_default = [
     upstreamModelId: "deepseek-v4.1-flash",
     family: "deepseek"
   },
-  {
-    id: "glm-5.1",
-    name: "GLM-5.1",
-    contextWindow: 202752,
-    cost: {
-      input: 1.4,
-      output: 4.4,
-      cache_read: 0.26
-    },
-    modelFormat: "openai",
-    npm: "@ai-sdk/openai-compatible",
-    apiUrl: "https://opencode.ai/zen/go/v1",
-    reasoning: true,
-    modalities: [
-      "text"
-    ],
-    compatibility: {
-      supportsReasoningEffort: false,
-      supportsStore: false,
-      supportsDeveloperRole: false,
-      maxTokensField: "max_tokens"
-    },
-    upstreamModelId: "glm-5.1",
-    family: "glm"
-  },
   {
     id: "glm-5.2",
     name: "GLM-5.2",
@@ -5009,6 +4985,39 @@ var opencode_go_models_default = [
     upstreamModelId: "gpt-5.6-luna",
     family: "gpt"
   },
+  {
+    id: "gpt-6-luna",
+    name: "GPT-6 Luna",
+    contextWindow: 105e4,
+    pricingBoundary: 272e3,
+    pricingBoundaryNote: "Above it, OpenCode Go lists $0.20 input and $0.75 output per million tokens.",
+    cost: {
+      input: 0.1,
+      output: 0.5,
+      cache_read: 0.01,
+      cache_write: 0.125
+    },
+    modelFormat: "openai",
+    npm: "@ai-sdk/openai",
+    apiUrl: "https://opencode.ai/zen/go/v1",
+    reasoning: true,
+    modalities: [
+      "text",
+      "image"
+    ],
+    compatibility: {
+      reasoningEffortMap: {
+        none: "none",
+        low: "low",
+        medium: "medium",
+        high: "high",
+        xhigh: "xhigh",
+        max: "max"
+      }
+    },
+    upstreamModelId: "gpt-6-luna",
+    family: "gpt"
+  },
   {
     id: "hy3",
     name: "Hy3",
@@ -5193,7 +5202,8 @@ var opencode_go_models_default = [
     cost: {
       input: 0.3,
       output: 1.2,
-      cache_read: 0.06
+      cache_read: 0.06,
+      cache_write: 0.375
     },
     modelFormat: "openai",
     npm: "@ai-sdk/openai-compatible",
@@ -6052,16 +6062,33 @@ function compareCodexClientVersions(a, b) {
   }
   return 0;
 }
-function requiresNewerCodexClient(model) {
-  if (!model.useResponsesLite) return false;
+function atLeast(version, floor) {
+  const order = compareCodexClientVersions(version, floor);
+  return order === 0 || order === 1;
+}
+function codexClientRequirement(model) {
+  if (!model.useResponsesLite) return void 0;
   const minimum = readCodexClientVersion(model.minimalClientVersion);
-  return minimum !== void 0 && compareCodexClientVersions(minimum, CODEX_RESPONSES_LITE_VERSION) === 1;
+  const withheldAt = readCodexClientVersion(model.withheldAtClientVersion);
+  const blockingMinimum = minimum !== void 0 && compareCodexClientVersions(minimum, CODEX_RESPONSES_LITE_VERSION) === 1 ? minimum : void 0;
+  const blockingWithheld = withheldAt !== void 0 && atLeast(withheldAt, CODEX_RESPONSES_LITE_VERSION) ? withheldAt : void 0;
+  if (blockingMinimum !== void 0 && (blockingWithheld === void 0 || compareCodexClientVersions(blockingMinimum, blockingWithheld) === 1)) {
+    return { kind: "minimum", version: blockingMinimum };
+  }
+  return blockingWithheld === void 0 ? void 0 : { kind: "withheld", version: blockingWithheld };
+}
+function requiresNewerCodexClient(model) {
+  return codexClientRequirement(model) !== void 0;
 }
 function codexClientVersionWarning(models) {
-  const unavailable = models.filter(requiresNewerCodexClient);
+  const unavailable = models.flatMap((model) => {
+    const requirement = codexClientRequirement(model);
+    return requirement ? [{ id: model.id, requirement }] : [];
+  });
   if (unavailable.length === 0) return void 0;
-  const details = unavailable.map((model) => `${printableServerText(model.id)} (requires ${model.minimalClientVersion})`).join(", ");
-  return `Hidden ChatGPT-plan models: ${details}. clodex sends Codex client version ${CODEX_RESPONSES_LITE_VERSION} for Responses-Lite; their catalog minimum exceeds this version. Update clodex to a release supporting their required version to use them.`;
+  const details = unavailable.map(({ id, requirement }) => `${printableServerText(id)} (requires ${requirement.kind === "minimum" ? requirement.version : `a version newer than ${requirement.version}`})`).join(", ");
+  const reason = unavailable.every(({ requirement }) => requirement.kind === "minimum") ? "their catalog minimum exceeds this version" : "the ChatGPT catalog does not offer them to this version";
+  return `Hidden ChatGPT-plan models: ${details}. clodex sends Codex client version ${CODEX_RESPONSES_LITE_VERSION} for Responses-Lite; ${reason}. Update clodex to a release supporting their required version to use them.`;
 }
 
 // src/data/openai-oauth-models.ts
@@ -6072,6 +6099,13 @@ var CHATGPT_CODEX_UNSUPPORTED_MODELS = /* @__PURE__ */ new Set([
   // confirmed: rejected by chatgpt.com/backend-api/codex
 ]);
 var OPENAI_OAUTH_MODEL_SEEDS = [
+  // GPT-6.1 Sol: the 272K window and 872K ceiling are what the live Codex catalog
+  // returned on 2026-09-29; a request near 872K has not been tried. The output limit
+  // is the model card's. The catalog reports minimal_client_version 0.153.0, but on a
+  // Plus account versions through 0.158.0 were refused and 0.159.0 worked (#298), so
+  // this seed records that observed gate. A live refresh stores the catalog's value
+  // instead. CODEX_RESPONSES_LITE_VERSION must stay at or above this.
+  { id: "gpt-6.1-sol", name: "GPT-6.1 Sol", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: true, preferWebSockets: true, minimalClientVersion: "0.159.0" },
   // GPT-6 family. The window, ceiling and Responses-Lite flags are what the live
   // Codex catalog returned (Astra on 2026-09-04, Sol and Luna on 2026-09-22) and are
   // deliberately NOT the published API numbers: the model cards list a 1,050,000
@@ -16612,12 +16646,7 @@ async function resolveRefreshCredentialWithSource(provider, resolveKey, selected
   return resolved;
 }
 
-// src/registry/refresh-models.ts
-async function refreshOAuthProvider(provider, accessToken) {
-  const tpl = provider.templateId ?? provider.id;
-  if (tpl === "openai" || tpl === "openai-oauth") return refreshOpenAiOAuthModels(accessToken);
-  throw new Error(`refreshOAuthProvider: unsupported template "${tpl}"`);
-}
+// src/registry/openai-oauth-catalog.ts
 function positiveInteger2(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : void 0;
 }
@@ -16737,7 +16766,41 @@ async function fetchJsonWithAuth(url, accessToken, timeoutMs) {
     }
   }
 }
-async function refreshOpenAiOAuthModels(accessToken) {
+async function markModelsWithheldAtRequestVersion(models, accessToken, timeoutMs, previous) {
+  const pinned = await fetchJsonWithAuth(
+    `https://chatgpt.com/backend-api/codex/models?client_version=${CODEX_RESPONSES_LITE_VERSION}`,
+    accessToken,
+    timeoutMs
+  );
+  const offered = readOfferedIds(pinned.body);
+  if (!offered) return carryWithheldMarkers(models, previous);
+  return models.map((model) => offered.has(model.id) ? model : { ...model, withheldAtClientVersion: CODEX_RESPONSES_LITE_VERSION });
+}
+function readOfferedIds(body) {
+  if (!body || typeof body !== "object") return void 0;
+  const record = body;
+  const shape = Array.isArray(record.models) ? { rows: record.models, key: "slug" } : Array.isArray(record.data) ? { rows: record.data, key: "id" } : void 0;
+  if (!shape || shape.rows.length === 0) return void 0;
+  const ids = /* @__PURE__ */ new Set();
+  for (const row of shape.rows) {
+    const id = row !== null && typeof row === "object" ? row[shape.key] : void 0;
+    if (typeof id !== "string" || id === "" || id !== id.trim()) return void 0;
+    ids.add(id);
+  }
+  return ids;
+}
+function carryWithheldMarkers(models, previous) {
+  const withheld = new Map(previous.flatMap((model) => {
+    const version = readCodexClientVersion(model.withheldAtClientVersion);
+    return version ? [[model.id, version]] : [];
+  }));
+  if (withheld.size === 0) return models;
+  return models.map((model) => {
+    const version = withheld.get(model.id);
+    return version ? { ...model, withheldAtClientVersion: version } : model;
+  });
+}
+async function refreshOpenAiOAuthModels(accessToken, previous = []) {
   const TIMEOUT_MS = 1e4;
   const seedById = new Map(buildOpenAiOAuthModels().map((m) => [m.id, m]));
   const toModels = (entries, codexCatalog) => entries.map((entry) => buildDynamicOAuthModel(entry, seedById, codexCatalog));
@@ -16749,7 +16812,11 @@ async function refreshOpenAiOAuthModels(accessToken) {
   );
   const codexEntries = parseOpenAiModelEntries(codexResult.body);
   if (codexEntries.length > 0) {
-    return { models: toModels(codexEntries, true), source: "live" };
+    const models = toModels(codexEntries, true);
+    return {
+      models: await markModelsWithheldAtRequestVersion(models, accessToken, TIMEOUT_MS, previous),
+      source: "live"
+    };
   }
   const chatGptResult = await fetchJsonWithAuth(
     "https://chatgpt.com/backend-api/models",
@@ -16758,7 +16825,10 @@ async function refreshOpenAiOAuthModels(accessToken) {
   );
   const chatGptEntries = parseOpenAiModelEntries(chatGptResult.body).filter(({ id }) => !CHATGPT_CODEX_UNSUPPORTED_MODELS.has(id));
   if (chatGptEntries.length > 0) {
-    return { models: toModels(chatGptEntries, false), source: "live" };
+    return {
+      models: carryWithheldMarkers(toModels(chatGptEntries, false), previous),
+      source: "live"
+    };
   }
   const failures = [codexResult.error, chatGptResult.error].filter((error) => error !== void 0);
   const credentialFailure = failures.find((error) => /(?:\brejected\b|\b401\b|\b403\b)/i.test(error));
@@ -16769,6 +16839,15 @@ async function refreshOpenAiOAuthModels(accessToken) {
     credentialRejected: credentialFailure !== void 0
   };
 }
+
+// src/registry/refresh-models.ts
+async function refreshOAuthProvider(provider, accessToken) {
+  const tpl = provider.templateId ?? provider.id;
+  if (tpl === "openai" || tpl === "openai-oauth") {
+    return refreshOpenAiOAuthModels(accessToken, provider.modelsCache?.models);
+  }
+  throw new Error(`refreshOAuthProvider: unsupported template "${tpl}"`);
+}
 function warningSuffix(models) {
   const warning = codexClientVersionWarning(applyOAuthSeedContextMetadata(models));
   return warning ? ` ${warning}` : "";