@bitkyc08/opencodex 2.72.0 → 2.73.0

package/src/codex/model-entitlements.ts

@@ -150,7 +150,7 @@ function composeGatedClientVersionFloor(
 
 // Reads every pinned row (codex-rs snapshot plus roster-captured rows), so a gated slug whose row
 // arrives through roster-pinned-models.json still contributes its floor. None does today:
-// gpt-6-sol/luna are ungated, and gpt-6-astra-minor has no row and no measured minimum.
+// gpt-6-sol/luna and gpt-6.1-sol are ungated, and gpt-6-astra-minor has no row and no measured minimum.
 export const GATED_MODEL_CLIENT_VERSION_FLOOR: string = composeGatedClientVersionFloor(
   pinnedNativeModelRows(),
 );

package/src/codex/native-profile-store.ts

@@ -20,6 +20,7 @@ import {
 } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { getConfigDir } from "../config";
+import { loadKeyringBinding } from "../lib/keyring-native";
 import { extractAccountId } from "../oauth/chatgpt";
 import { getCodexHome, readRootTomlString } from "./paths";
 import {
@@ -120,7 +121,7 @@ export class OsNativeProfileKeyProvider implements NativeProfileKeyProvider {
 
   private async entry(homeId: string): Promise<NativeKeyringEntry> {
     try {
-      const { AsyncEntry } = await import("@napi-rs/keyring");
+      const { AsyncEntry } = loadKeyringBinding();
       return new AsyncEntry(KEYRING_SERVICE, homeId) as unknown as NativeKeyringEntry;
     } catch {
       throw new NativeProfileError(

package/src/combos/resolve.ts

@@ -380,13 +380,28 @@ export function advanceComboAfterFailure(
     status?: number;
     code?: string | null;
     message?: string;
+    /** Account-qualified provider label of the account this failure came from, when a pool resolved one. */
+    failedAccount?: string;
   } = {},
 ): ComboPick | null {
   noteComboFailure(pick.comboId, pick.target, pick.writerGeneration);
   const combo = getCombo(config, pick.comboId);
+  // A 429 from a pooled provider names the ACCOUNT that is spent, not the target. The pool
+  // records that account's own cooldown and rotates past it, so cooling the target here blacks
+  // out the accounts that still answer: on 2026-09-28 one Anthropic account replied
+  // `Retry-After: 318747` (88.5h) and anthropic/claude-opus-5-5 left selection for four hours
+  // while four of five accounts still returned 200.
+  //
+  // Only a pool-resolved account qualifies, and an unidentified account still cools the target --
+  // including the pool's OWN "all accounts are cooled" 429, which refuses locally before it picks
+  // one. That is what keeps this from trading a blackhole for a hammer: when nothing else is
+  // holding the target back, the target cooldown still does.
+  const accountScoped = options.cooldownScope === "target"
+    && options.status === 429
+    && options.failedAccount !== undefined;
   // "none" records no cooldown at all: the failure described the request, not the target, so
   // the target must stay immediately selectable for the next (differently shaped) request.
-  if (options.cooldownScope !== "none") {
+  if (options.cooldownScope !== "none" && !accountScoped) {
     const cooldownTargets = options.cooldownScope === "provider" && combo
       ? combo.targets.filter(target => target.provider === pick.target.provider)
       : [pick.target];

package/src/config/subagent-models.ts

@@ -1,10 +1,18 @@
 import type { OcxConfig } from "../types";
-import { NATIVE_GPT6_ASTRA_MODEL, NATIVE_GPT6_LUNA_MODEL, NATIVE_GPT6_SOL_MODEL } from "../codex/catalog/native-models";
+import {
+  NATIVE_GPT6_ASTRA_MODEL,
+  NATIVE_GPT6_LUNA_MODEL,
+  NATIVE_GPT6_SOL_MODEL,
+  NATIVE_GPT61_SOL_MODEL,
+} from "../codex/catalog/native-models";
 
-export const SUBAGENT_MODELS_VERSION = 2;
+export const SUBAGENT_MODELS_VERSION = 3;
 
-/** Native featured defaults: the GPT-6 trio. Codex advertises at most five picker-visible rows. */
-export const DEFAULT_SUBAGENT_MODELS = [NATIVE_GPT6_ASTRA_MODEL, NATIVE_GPT6_SOL_MODEL, NATIVE_GPT6_LUNA_MODEL];
+/**
+ * Native featured defaults: Astra, the current Sol (GPT-6.1) and Luna. Codex advertises at most
+ * five picker-visible rows. Only Sol received a 6.1 release, so Astra and Luna stay on GPT-6.
+ */
+export const DEFAULT_SUBAGENT_MODELS = [NATIVE_GPT6_ASTRA_MODEL, NATIVE_GPT61_SOL_MODEL, NATIVE_GPT6_LUNA_MODEL];
 
 /** Bare native families the version-2 upgrade removes from a roster. */
 const RETIRED_ROSTER_FAMILY = /^gpt-5\.[56](?:-|$)/;
@@ -32,6 +40,20 @@ function upgradeRetiredRosterRows(models: readonly string[]): string[] {
   return upgraded.length === 0 && models.length > 0 ? [...DEFAULT_SUBAGENT_MODELS] : upgraded;
 }
 
+/**
+ * Version 3: GPT-6 Sol gives its roster slot to GPT-6.1 Sol, in place, once. Only the bare id
+ * moves; a routed or account-qualified id keeps its exact spelling. GPT-6 Sol stays a supported
+ * model, so a user who adds it back afterwards keeps it.
+ */
+function upgradeSolTo61(models: readonly string[]): string[] {
+  const upgraded: string[] = [];
+  for (const model of models) {
+    const next = model === NATIVE_GPT6_SOL_MODEL ? NATIVE_GPT61_SOL_MODEL : model;
+    if (!upgraded.includes(next)) upgraded.push(next);
+  }
+  return upgraded;
+}
+
 /** One-time upgrades; later user edits (including removing Astra) remain authoritative. */
 export function migrateSubagentModels(config: OcxConfig): boolean {
   const version = config.subagentModelsVersion ?? 0;
@@ -46,7 +68,10 @@ export function migrateSubagentModels(config: OcxConfig): boolean {
       if (retained.includes("gpt-5.5")) config.subagentModels.push("gpt-5.5");
     }
   }
-  if (config.subagentModels !== undefined) config.subagentModels = upgradeRetiredRosterRows(config.subagentModels);
+  if (version < 2 && config.subagentModels !== undefined) {
+    config.subagentModels = upgradeRetiredRosterRows(config.subagentModels);
+  }
+  if (config.subagentModels !== undefined) config.subagentModels = upgradeSolTo61(config.subagentModels);
   config.subagentModelsVersion = SUBAGENT_MODELS_VERSION;
   return true;
 }