diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts index f1b1a151681..9c4466fae5f 100644 --- a/packages/core/src/plugin/provider/openai.ts +++ b/packages/core/src/plugin/provider/openai.ts @@ -23,9 +23,8 @@ const pollingSafetyMargin = 3000 const codexBaseURL = "https://chatgpt.com/backend-api/codex" const browserMethodID = Integration.MethodID.make("chatgpt-browser") const headlessMethodID = Integration.MethodID.make("chatgpt-headless") -// ChatGPT accounts lost gpt-5.4 and gpt-5.4-mini in Codex on 2026-08-31 (replacements: gpt-5.6-terra, gpt-5.6-luna). -const codexAllowed = new Set(["gpt-5.5", "gpt-5.3-codex-spark"]) -const codexDisallowed = new Set(["gpt-5.5-pro", "gpt-5.6"]) +// Codex rejects gpt-5.5 and older models, including gpt-5.3-codex-spark, for ChatGPT accounts. +const codexDisallowed = new Set(["gpt-5.6"]) type Pkce = { verifier: string @@ -289,10 +288,7 @@ export const OpenAIPlugin = define({ const match = apiID.match(/^gpt-(\d+)(?:\.(\d+))?/) const major = Number(match?.[1]) const minor = Number(match?.[2] ?? 0) - if ( - !codexAllowed.has(apiID) && - (codexDisallowed.has(apiID) || !match || !(major > 5 || (major === 5 && minor > 4))) - ) { + if (codexDisallowed.has(apiID) || !match || !(major > 5 || (major === 5 && minor > 5))) { draft.enabled = false return } diff --git a/packages/core/test/plugin/provider-openai.test.ts b/packages/core/test/plugin/provider-openai.test.ts index c85c42cc73b..57218643f99 100644 --- a/packages/core/test/plugin/provider-openai.test.ts +++ b/packages/core/test/plugin/provider-openai.test.ts @@ -93,7 +93,9 @@ describe("OpenAIPlugin", () => { catalog.update(Provider.ID.openai, (draft) => { draft.package = "@opencode/ai/providers/openai" }) - catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.5"), (model) => { + catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.5"), () => {}) + catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.3-codex-spark"), () => {}) + catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.6-sol"), (model) => { model.limit = { context: 1_050_000, input: 922_000, output: 128_000 } model.cost = [ { @@ -115,9 +117,6 @@ describe("OpenAIPlugin", () => { model.body = { reasoning: { mode: "pro" } } }) catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.6"), () => {}) - catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-5.6-sol"), (model) => { - model.limit = { context: 1_050_000, input: 922_000, output: 128_000 } - }) catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-4.1"), () => {}) catalog.models.update(Provider.ID.openai, Model.ID.make("gpt-6-astra"), (model) => { model.limit = { context: 1_050_000, input: 922_000, output: 128_000 } @@ -174,19 +173,18 @@ describe("OpenAIPlugin", () => { const child = yield* sessions.create({ parentID: parent.id }) const childRequest = yield* request(Provider.ID.openai, "https://api.openai.com/v1", child.id) expect(childRequest.headers).toMatchObject({ "session-id": parent.id }) - const eligible = required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.5"))) + const eligible = required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.6-sol"))) expect(eligible.package).toBe("@opencode/ai/providers/openai") expect(eligible.headers).toMatchObject({ originator: "opencode", "chatgpt-account-id": "acct_123" }) expect(eligible.cost).toEqual([]) expect(eligible.limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 }) expect(eligible.enabled).toBe(true) + expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.5"))).enabled).toBe(false) + expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.3-codex-spark"))).enabled).toBe(false) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.5-pro"))).enabled).toBe(false) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.4-pro"))).enabled).toBe(false) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.4"))).enabled).toBe(false) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.6"))).enabled).toBe(false) - const gpt56 = required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.6-sol"))) - expect(gpt56.enabled).toBe(true) - expect(gpt56.limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 }) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-4.1"))).enabled).toBe(false) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-6-astra"))).enabled).toBe(true) expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-6.1-sol"))).limit).toEqual({