fix(codex): re-derive pool plan from JWT chatgpt_plan_type (#1989) #1998
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| import { | ||
| ConfigMutationLockError, | ||
| loadConfig, | ||
| mutatePersistedConfig, | ||
| } from "../config"; | ||
| import type { CodexAccount, OcxConfig } from "../types"; | ||
| import { isSelectableCodexPoolAccount, isValidCodexAccountId } from "./account-id"; | ||
| import { | ||
| getCodexAccountCredential, | ||
| isCodexAccountGenerationLive, | ||
| readCodexAccountRecord, | ||
| } from "./account-store"; | ||
| import { extractChatgptPlanType, codexPlanValue } from "./plan"; | ||
|
|
||
| interface FreshPoolPlanUpdate { | ||
| accountId: string; | ||
| plan: string; | ||
| credentialGeneration: number; | ||
| } | ||
|
|
||
| function configuredPoolAccount(config: OcxConfig, accountId: string): CodexAccount | null { | ||
| if (!isValidCodexAccountId(accountId)) return null; | ||
| return (config.codexAccounts ?? []) | ||
| .find(account => account.id === accountId && isSelectableCodexPoolAccount(account)) ?? null; | ||
| } | ||
|
|
||
| function jwtPlanFromPoolCredential(accountId: string): string | undefined { | ||
| const cred = getCodexAccountCredential(accountId); | ||
| return cred ? extractChatgptPlanType(undefined, cred.accessToken) : undefined; | ||
| } | ||
|
|
||
| function collectJwtPoolPlanUpdates(runtimeConfig: OcxConfig): FreshPoolPlanUpdate[] { | ||
| const updates: FreshPoolPlanUpdate[] = []; | ||
| for (const account of (runtimeConfig.codexAccounts ?? []).filter(isSelectableCodexPoolAccount)) { | ||
| const jwtPlan = jwtPlanFromPoolCredential(account.id); | ||
| if (!jwtPlan || codexPlanValue(account.plan) === jwtPlan) continue; | ||
| const generation = readCodexAccountRecord(account.id)?.generation; | ||
|
Comment on lines
+35
to
+37
There was a problem hiding this comment.
When another OpenCodex process replaces this credential between the two file reads, Useful? React with 👍 / 👎. |
||
| if (generation === undefined) continue; | ||
| updates.push({ accountId: account.id, plan: jwtPlan, credentialGeneration: generation }); | ||
| } | ||
| return updates; | ||
| } | ||
|
|
||
| const appliedJwtPlans = new Map<string, string>(); | ||
|
|
||
| function persistJwtPlanUpdates(runtimeConfig: OcxConfig, updates: FreshPoolPlanUpdate[]): void { | ||
| if (updates.length === 0) return; | ||
| let outcome: ReturnType<typeof mutatePersistedConfig<FreshPoolPlanUpdate[]>>; | ||
| try { | ||
| outcome = mutatePersistedConfig(persistedConfig => { | ||
| const accepted: FreshPoolPlanUpdate[] = []; | ||
| let changed = false; | ||
| for (const update of updates) { | ||
| if (!isCodexAccountGenerationLive(update.accountId, update.credentialGeneration)) continue; | ||
| const liveAccount = configuredPoolAccount(runtimeConfig, update.accountId); | ||
| const persistedAccount = configuredPoolAccount(persistedConfig, update.accountId); | ||
| if (!liveAccount || !persistedAccount) continue; | ||
| accepted.push(update); | ||
| if (persistedAccount.plan !== update.plan) { | ||
| persistedAccount.plan = update.plan; | ||
| changed = true; | ||
|
Comment on lines
+53
to
+61
Contributor
There was a problem hiding this comment. 🗄️ Data Integrity & Integration | 🟠 Major | 🏗️ Heavy lift Preserve a fresh WHAM plan before writing a JWT fallback. Line 59 overwrites every differing Track plan provenance or fresh-WHAM state. Apply the JWT value only when WHAM has not supplied a current 🤖 Prompt for AI Agents |
||
| } | ||
| } | ||
| return { changed, value: accepted }; | ||
| }); | ||
| } catch (error) { | ||
| if (error instanceof ConfigMutationLockError) return; | ||
| throw error; | ||
| } | ||
| if (outcome.status === "unavailable") return; | ||
| for (const update of outcome.value) { | ||
| if (!isCodexAccountGenerationLive(update.accountId, update.credentialGeneration)) continue; | ||
| const liveAccount = configuredPoolAccount(runtimeConfig, update.accountId); | ||
| if (liveAccount) { | ||
| liveAccount.plan = update.plan; | ||
| appliedJwtPlans.set(update.accountId, update.plan); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Persist JWT `chatgpt_plan_type` onto `codexAccounts[].plan` when it contradicts the stored | ||
| * label. Generation-gated, same fail-closed lock policy as the WHAM plan patch. Does not | ||
| * overwrite a plan that already matches the token. | ||
| */ | ||
| export function reconcileCodexPlansFromTokens(runtimeConfig: OcxConfig = loadConfig()): void { | ||
| persistJwtPlanUpdates(runtimeConfig, collectJwtPoolPlanUpdates(runtimeConfig)); | ||
| } | ||
|
|
||
| export function resetJwtPlanNotesForTests(): void { | ||
| appliedJwtPlans.clear(); | ||
| } | ||
|
|
||
| /** Apply one account's live token claim without blocking the credential read path. */ | ||
| export function noteCodexAccountAccessToken( | ||
| accountId: string, | ||
| accessToken: string, | ||
| credentialGeneration: number, | ||
| ): void { | ||
| const jwtPlan = extractChatgptPlanType(undefined, accessToken); | ||
| if (!jwtPlan) return; | ||
| if (appliedJwtPlans.get(accountId) === jwtPlan) return; | ||
|
Comment on lines
+100
to
+102
There was a problem hiding this comment.
If startup records plan Useful? React with 👍 / 👎. |
||
| try { | ||
| const runtimeConfig = loadConfig(); | ||
| const live = configuredPoolAccount(runtimeConfig, accountId); | ||
| if (!live || codexPlanValue(live.plan) === jwtPlan) { | ||
| appliedJwtPlans.set(accountId, jwtPlan); | ||
| return; | ||
| } | ||
| persistJwtPlanUpdates(runtimeConfig, [{ accountId, plan: jwtPlan, credentialGeneration }]); | ||
| if (codexPlanValue(live.plan) === jwtPlan) appliedJwtPlans.set(accountId, jwtPlan); | ||
| } catch { | ||
| appliedJwtPlans.delete(accountId); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After the first lookup, replacing
auth.jsonwith a refreshed token for the same ChatGPT account does not reset eithermainAccountPlanorjwtPlanAttempted, because the identity reconciliation only purges state when the account ID changes. Consequently an upgrade or downgrade reflected in a new access token keeps returning the old plan until WHAM supplies an explicit plan or some unrelated reset occurs. Bind this cache to the observed token/account snapshot or invalidate it when the token file changes.Useful? React with 👍 / 👎.