@bitkyc08/opencodex 2.36.0 → 2.38.0

package/src/codex/convergence.ts

@@ -73,6 +73,7 @@ import { codexAccountNamespaceEntries, isMainCodexAccountTarget } from "./accoun
 import { MAIN_CODEX_ACCOUNT_ID } from "./main-account";
 import {
   availableAccountGatedNativeModels,
+  codexModelEntitlementStateForAccount,
   isCodexModelEntitlementSnapshotCurrent,
   resolveCodexModelEntitlements,
   type CodexModelEntitlementSnapshot,
@@ -277,10 +278,10 @@ function prepareCatalog(
     ? new Map([...accountBoundNativeOpenAiSlugsBySelector(config, observedAccountNativeEntries)].map(([selector, slugs]) => {
       const target = accountTargets.get(selector);
       const accountId = target && isMainCodexAccountTarget(target) ? MAIN_CODEX_ACCOUNT_ID : target;
-      const entitled = accountId ? modelEntitlements.modelsByAccount.get(accountId) : undefined;
-      const confirmed = accountId ? modelEntitlements.confirmedAccountIds.has(accountId) : false;
       return [selector, slugs.filter(slug => (
-        !ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(slug) || (confirmed && entitled?.has(slug) === true)
+        !ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(slug)
+        || (accountId !== undefined
+          && codexModelEntitlementStateForAccount(modelEntitlements, accountId, slug) === "granted")
       ))] as const;
     }))
     : new Map<string, readonly string[]>();

package/src/codex/credential-mutation-epoch.ts

@@ -0,0 +1,11 @@
+let credentialMutationEpoch = 0;
+
+/** Process-local fence advanced after every OpenCodex-owned credential publication. */
+export function codexCredentialMutationEpoch(): number {
+  return credentialMutationEpoch;
+}
+
+export function advanceCodexCredentialMutationEpoch(): number {
+  credentialMutationEpoch += 1;
+  return credentialMutationEpoch;
+}

package/src/codex/main-account.ts

@@ -18,6 +18,7 @@ import { atomicWriteFile, resolveWriteTarget } from "../config/atomic-write";
 import { resolveCodexHomeDir } from "./home";
 import { assertNotRealCodexHomeUnderTest } from "../lib/test-home-guard";
 import { clearAccountNeedsReauth } from "./account-runtime-state";
+import { advanceCodexCredentialMutationEpoch } from "./credential-mutation-epoch";
 
 export { MAIN_CODEX_ACCOUNT_ID } from "./account-id";
 
@@ -160,6 +161,7 @@ function persistRefreshedMainAuthJson(
       validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
     },
   );
+  advanceCodexCredentialMutationEpoch();
   return { accessToken, chatgptAccountId };
 }