@@ -150,7 +150,6 @@ import {
150150 type CodexAuthContext ,
151151} from "../../codex/auth-context" ;
152152import {
153- CodexModelEntitlementDiscoveryUnavailableError ,
154153 entitledCodexAccountIdsForModel ,
155154 invalidateCodexModelEntitlementsForAccount ,
156155 resolveCodexModelEntitlements ,
@@ -919,7 +918,6 @@ type CodexPoolAccountRetryResult =
919918 selectedForwardHeaders : Headers ;
920919 }
921920 | { kind : "no-alternate" }
922- | { kind : "eligibility-unavailable" }
923921 | {
924922 kind : "transport" ;
925923 error : unknown ;
@@ -1020,13 +1018,10 @@ async function retryCodexPoolOnAlternateAccount(
10201018 invalidateCodexModelEntitlementsForAccount ( firstAuthCtx . accountId ) ;
10211019 let refreshed ;
10221020 try {
1023- refreshed = await resolveCodexModelEntitlementsForRequest ( entitlementResolver , config ) ;
1021+ refreshed = await entitlementResolver ( config ) ;
10241022 } catch ( error ) {
10251023 await firstResponse . body ?. cancel ( ) . catch ( ( ) => undefined ) ;
10261024 releaseCodexAuthContextProbeLease ( firstAuthCtx ) ;
1027- if ( error instanceof CodexModelEligibilityUnavailableError ) {
1028- return { kind : "eligibility-unavailable" } ;
1029- }
10301025 throw error ;
10311026 }
10321027 if ( entitledCodexAccountIdsForModel ( refreshed , route . modelId ) ?. has ( firstAuthCtx . accountId ) ) {
@@ -1048,12 +1043,7 @@ async function retryCodexPoolOnAlternateAccount(
10481043 excludeAccountId : firstAuthCtx . accountId ,
10491044 modelId : route . modelId ,
10501045 beginCodexAccountSelection : codexAccountSelectionForTurn ( options . turnAdmissionLease ) ,
1051- resolveCodexModelEntitlements : ( entitlementConfig , resolveOptions ) =>
1052- resolveCodexModelEntitlementsForRequest (
1053- entitlementResolver ,
1054- entitlementConfig ,
1055- resolveOptions ,
1056- ) ,
1046+ resolveCodexModelEntitlements : entitlementResolver ,
10571047 } ,
10581048 ) ;
10591049 } catch ( error ) {
@@ -1065,9 +1055,6 @@ async function retryCodexPoolOnAlternateAccount(
10651055 if ( unexpectedRetryError ) {
10661056 await firstResponse . body ?. cancel ( ) . catch ( ( ) => undefined ) ;
10671057 releaseCodexAuthContextProbeLease ( firstAuthCtx ) ;
1068- if ( error instanceof CodexModelEligibilityUnavailableError ) {
1069- return { kind : "eligibility-unavailable" } ;
1070- }
10711058 throw error ;
10721059 }
10731060 }
@@ -1193,15 +1180,12 @@ async function retryCodexPoolOnAlternateAccount(
11931180 invalidateCodexModelEntitlementsForAccount ( retryAuthCtx . accountId ) ;
11941181 let refreshed : Awaited < ReturnType < typeof resolveCodexModelEntitlements > > ;
11951182 try {
1196- refreshed = await resolveCodexModelEntitlementsForRequest ( entitlementResolver , config ) ;
1183+ refreshed = await entitlementResolver ( config ) ;
11971184 } catch ( error ) {
11981185 await upstreamResponse . body ?. cancel ( ) . catch ( ( ) => undefined ) ;
11991186 await firstResponse . body ?. cancel ( ) . catch ( ( ) => undefined ) ;
12001187 releaseCodexAuthContextProbeLease ( firstAuthCtx ) ;
12011188 releaseCodexAuthContextProbeLease ( retryAuthCtx ) ;
1202- if ( error instanceof CodexModelEligibilityUnavailableError ) {
1203- return { kind : "eligibility-unavailable" } ;
1204- }
12051189 throw error ;
12061190 }
12071191 if ( ! entitledCodexAccountIdsForModel ( refreshed , route . modelId ) ?. has ( retryAuthCtx . accountId ) ) break ;
@@ -1644,12 +1628,7 @@ async function resolveResponsesCodexAuth(
16441628 modelId : route . modelId ,
16451629 substituteMainCredentialForDirect : substituteMainCredential ,
16461630 beginCodexAccountSelection : codexAccountSelectionForTurn ( options . turnAdmissionLease ) ,
1647- resolveCodexModelEntitlements : ( entitlementConfig , resolveOptions ) =>
1648- resolveCodexModelEntitlementsForRequest (
1649- options . resolveCodexModelEntitlements ?? resolveCodexModelEntitlements ,
1650- entitlementConfig ,
1651- resolveOptions ,
1652- ) ,
1631+ resolveCodexModelEntitlements : options . resolveCodexModelEntitlements ,
16531632 } ) ;
16541633 options . onCodexAuthContextResolved ?.( authCtx ) ;
16551634 } else {
@@ -1679,9 +1658,6 @@ async function resolveResponsesCodexAuth(
16791658 if ( err instanceof ForwardAdmissionCredentialError ) {
16801659 return { ok : false , response : formatErrorResponse ( 401 , "authentication_error" , err . message ) } ;
16811660 }
1682- if ( err instanceof CodexModelEligibilityUnavailableError ) {
1683- return { ok : false , response : codexModelEligibilityUnavailableResponse ( ) } ;
1684- }
16851661 const response = mapCodexAuthContextErrorToResponse ( err , {
16861662 accountSelector : route . codexAccountNamespace ,
16871663 now : Date . now ( ) ,
@@ -1691,52 +1667,6 @@ async function resolveResponsesCodexAuth(
16911667 }
16921668}
16931669
1694- const CODEX_MODEL_ELIGIBILITY_UNAVAILABLE_MESSAGE =
1695- "Codex model eligibility is temporarily unavailable; retry this request" ;
1696-
1697- class CodexModelEligibilityUnavailableError extends Error {
1698- constructor ( ) {
1699- super ( CODEX_MODEL_ELIGIBILITY_UNAVAILABLE_MESSAGE ) ;
1700- this . name = "CodexModelEligibilityUnavailableError" ;
1701- }
1702- }
1703-
1704- /** Return a retryable, redacted failure without letting discovery errors escape the request boundary. */
1705- function codexModelEligibilityUnavailableResponse ( ) : Response {
1706- return formatErrorResponse ( 503 , "server_error" , CODEX_MODEL_ELIGIBILITY_UNAVAILABLE_MESSAGE ) ;
1707- }
1708-
1709- /** Wrap account-roster discovery so both preview and final auth share one fail-closed error contract. */
1710- async function resolveCodexModelEntitlementsForRequest (
1711- resolver : typeof resolveCodexModelEntitlements ,
1712- config : Parameters < typeof resolveCodexModelEntitlements > [ 0 ] ,
1713- options ?: Parameters < typeof resolveCodexModelEntitlements > [ 1 ] ,
1714- ) : ReturnType < typeof resolveCodexModelEntitlements > {
1715- try {
1716- return await resolver ( config , options ) ;
1717- } catch ( cause ) {
1718- if ( ! ( cause instanceof CodexModelEntitlementDiscoveryUnavailableError ) ) throw cause ;
1719- const diagnosticCause = cause . cause ?? cause ;
1720- let detail = "unknown error" ;
1721- try {
1722- const rawDetail = diagnosticCause instanceof Error
1723- ? `${ diagnosticCause . name } : ${ diagnosticCause . message } `
1724- : String ( diagnosticCause ) ;
1725- detail = sanitizeLogMetadataString ( rawDetail , 300 ) ?? detail ;
1726- } catch {
1727- // A hostile thrown value must not replace the fixed retryable response.
1728- }
1729- try {
1730- console . warn (
1731- `[codex-entitlements] model eligibility discovery failed; returning a retryable 503: ${ detail } ` ,
1732- ) ;
1733- } catch {
1734- // Logging is diagnostic only; the request boundary remains fail-closed below.
1735- }
1736- throw new CodexModelEligibilityUnavailableError ( ) ;
1737- }
1738- }
1739-
17401670async function resolveSubagentFallbackModelEligibility ( args : {
17411671 config : OcxConfig ;
17421672 fallbackChain : readonly string [ ] | null ;
@@ -1747,11 +1677,7 @@ async function resolveSubagentFallbackModelEligibility(args: {
17471677 const excludeAccountIds = args . nativeMainReadsForbidden
17481678 ? new Set ( [ MAIN_CODEX_ACCOUNT_ID ] )
17491679 : undefined ;
1750- const snapshot = await resolveCodexModelEntitlementsForRequest (
1751- args . resolver ,
1752- args . config ,
1753- { excludeAccountIds } ,
1754- ) ;
1680+ const snapshot = await args . resolver ( args . config , { excludeAccountIds } ) ;
17551681 return ( modelId ) => {
17561682 const entitledAccountIds = entitledCodexAccountIdsForModel ( snapshot , modelId ) ;
17571683 return entitledAccountIds
@@ -2617,19 +2543,12 @@ async function handleResponsesInner(
26172543 // "legacy" affinity bucket and never find a binding made under "shared" or a native
26182544 // model scope, making the preview diverge from the account that actually authenticates.
26192545 const fallbackChain = initialSubagentFallbackChain ;
2620- try {
2621- subagentFallbackModelEligibleAccountIdsForModel = await resolveSubagentFallbackModelEligibility ( {
2622- config,
2623- fallbackChain,
2624- nativeMainReadsForbidden,
2625- resolver : options . resolveCodexModelEntitlements ?? resolveCodexModelEntitlements ,
2626- } ) ;
2627- } catch ( error ) {
2628- if ( error instanceof CodexModelEligibilityUnavailableError ) {
2629- return codexModelEligibilityUnavailableResponse ( ) ;
2630- }
2631- throw error ;
2632- }
2546+ subagentFallbackModelEligibleAccountIdsForModel = await resolveSubagentFallbackModelEligibility ( {
2547+ config,
2548+ fallbackChain,
2549+ nativeMainReadsForbidden,
2550+ resolver : options . resolveCodexModelEntitlements ?? resolveCodexModelEntitlements ,
2551+ } ) ;
26332552 const fallbackNow = Date . now ( ) ;
26342553 subagentFallbackAccountPreview = ( modelId , previewNow , modelEligibleAccountIds ) => previewCodexAccountForRequest (
26352554 poolAffinityKey ,
@@ -3845,9 +3764,6 @@ async function handleResponsesInner(
38453764 captureAffinityResponse ( response , retryAuthCtx , retryRequest , true ) ;
38463765 } ,
38473766 } ) ;
3848- if ( retry . kind === "eligibility-unavailable" ) {
3849- return codexModelEligibilityUnavailableResponse ( ) ;
3850- }
38513767 if ( retry . kind === "transport" ) {
38523768 authCtx = retry . authCtx ;
38533769 return transportFailureResponse ( retry . error ) ;
0 commit comments