fix(openai): align Codex fallback with GPT-5.5 · openclaw/openclaw@058e6f5

Recent Commits to openclaw:main

steipete · 2026-04-24 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ const DEFAULT_MAX_TOKENS = 128_000;`
`13`	`13`
`14`	`14`	`export const FALLBACK_CODEX_MODELS = [`
`15`	`15`	`{`
`16`		`-id: "gpt-5.4",`
`17`		`-model: "gpt-5.4",`
`18`		`-displayName: "gpt-5.4",`
	`16`	`+id: "gpt-5.5",`
	`17`	`+model: "gpt-5.5",`
	`18`	`+displayName: "gpt-5.5",`
`19`	`19`	`description: "Latest frontier agentic coding model.",`
`20`	`20`	`isDefault: true,`
`21`	`21`	`inputModalities: ["text", "image"],`

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function expectStaticFallbackCatalog(`
`17`	`17`	`result: Awaited<ReturnType<typeof buildCodexProviderCatalog>>,`
`18`	`18`	`) {`
`19`	`19`	`expect(result.provider.models.map((model) => model.id)).toEqual([`
`20`		`-"gpt-5.4",`
	`20`	`+"gpt-5.5",`
`21`	`21`	`"gpt-5.4-mini",`
`22`	`22`	`"gpt-5.2",`
`23`	`23`	`]);`
`@@ -241,7 +241,7 @@ describe("codex provider", () => {`
`241`	`241`
`242`	`242`	`expect(`
`243`	`243`	`result && "provider" in result ? result.provider.models.map((model) => model.id) : [],`
`244`		`-).toEqual(["gpt-5.4", "gpt-5.4-mini", "gpt-5.2"]);`
	`244`	`+).toEqual(["gpt-5.5", "gpt-5.4-mini", "gpt-5.2"]);`
`245`	`245`	`});`
`246`	`246`
`247`	`247`	`it("adds the GPT-5 prompt overlay to Codex provider runs", () => {`

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export async function buildCodexProviderCatalog(`
`110`	`110`	`};`
`111`	`111`	`}`
`112`	`112`
`113`		`-function resolveCodexDynamicModel(modelId: string): ProviderRuntimeModel \| undefined {`
	`113`	`+function resolveCodexDynamicModel(modelId: string) {`
`114`	`114`	`const id = modelId.trim();`
`115`	`115`	`if (!id) {`
`116`	`116`	`return undefined;`
`@@ -191,5 +191,7 @@ function isKnownXHighCodexModel(modelId: string): boolean {`
`191`	`191`
`192`	`192`	`function isModernCodexModel(modelId: string): boolean {`
`193`	`193`	`const lower = modelId.trim().toLowerCase();`
`194`		`-return lower === "gpt-5.4" \|\| lower === "gpt-5.4-mini" \|\| lower === "gpt-5.2";`
	`194`	`+return (`
	`195`	`+lower === "gpt-5.5" \|\| lower === "gpt-5.4" \|\| lower === "gpt-5.4-mini" \|\| lower === "gpt-5.2"`
	`196`	`+);`
`195`	`197`	`}`

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,7 @@ function normalizeOpenAITransport(model: ProviderRuntimeModel): ProviderRuntimeM`
`114`	`114`	`};`
`115`	`115`	`}`
`116`	`116`
`117`		`-function resolveOpenAIGptForwardCompatModel(`
`118`		`-ctx: ProviderResolveDynamicModelContext,`
`119`		`-): ProviderRuntimeModel \| undefined {`
	`117`	`+function resolveOpenAIGptForwardCompatModel(ctx: ProviderResolveDynamicModelContext) {`
`120`	`118`	`const trimmedModelId = ctx.modelId.trim();`
`121`	`119`	`const lower = normalizeLowercaseStringOrEmpty(trimmedModelId);`
`122`	`120`	`let templateIds: readonly string[];`
`@@ -286,7 +284,7 @@ export function buildOpenAIProvider(): ProviderPlugin {`
`286`	`284`	`}`
`287`	`285`	`return {`
`288`	`286`	`suppress: true,`
`289`		-errorMessage: `Unknown model: ${ctx.provider}/${OPENAI_DIRECT_SPARK_MODEL_ID}. ${OPENAI_DIRECT_SPARK_MODEL_ID} is only supported via openai-codex OAuth. Use openai-codex/${OPENAI_DIRECT_SPARK_MODEL_ID}.`,
	`287`	+errorMessage: `Unknown model: ${ctx.provider}/${OPENAI_DIRECT_SPARK_MODEL_ID}. ${OPENAI_DIRECT_SPARK_MODEL_ID} is only supported through Codex OAuth. Use openai/${OPENAI_DIRECT_SPARK_MODEL_ID} with the Codex OAuth profile.`,
`290`	`288`	`};`
`291`	`289`	`},`
`292`	`290`	`augmentModelCatalog: (ctx) => {`

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ vi.mock("../model-suppression.js", () => ({`
`31`	`31`	`) {`
`32`	`32`	`return undefined;`
`33`	`33`	`}`
`34`		-return `Unknown model: ${provider}/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.`;
	`34`	+return `Unknown model: ${provider}/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.`;
`35`	`35`	`},`
`36`	`36`	`}));`
`37`	`37`
`@@ -140,7 +140,7 @@ describe("resolveModel forward-compat errors and overrides", () => {`
`140`	`140`
`141`	`141`	`expect(result.model).toBeUndefined();`
`142`	`142`	`expect(result.error).toBe(`
`143`		`-"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.",`
	`143`	`+"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.",`
`144`	`144`	`);`
`145`	`145`	`});`
`146`	`146`
`@@ -161,7 +161,7 @@ describe("resolveModel forward-compat errors and overrides", () => {`
`161`	`161`
`162`	`162`	`expect(result.model).toBeUndefined();`
`163`	`163`	`expect(result.error).toBe(`
`164`		`-"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.",`
	`164`	`+"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.",`
`165`	`165`	`);`
`166`	`166`	`});`
`167`	`167`
`@@ -174,7 +174,7 @@ describe("resolveModel forward-compat errors and overrides", () => {`
`174`	`174`
`175`	`175`	`expect(result.model).toBeUndefined();`
`176`	`176`	`expect(result.error).toBe(`
`177`		`-"Unknown model: azure-openai-responses/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.",`
	`177`	`+"Unknown model: azure-openai-responses/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.",`
`178`	`178`	`);`
`179`	`179`	`});`
`180`	`180`

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ vi.mock("../model-suppression.js", () => ({`
`13`	`13`	`) {`
`14`	`14`	`return undefined;`
`15`	`15`	`}`
`16`		-return `Unknown model: ${provider}/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.`;
	`16`	+return `Unknown model: ${provider}/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.`;
`17`	`17`	`},`
`18`	`18`	`}));`
`19`	`19`
`@@ -1260,7 +1260,7 @@ describe("resolveModel", () => {`
`1260`	`1260`
`1261`	`1261`	`expect(result.model).toBeUndefined();`
`1262`	`1262`	`expect(result.error).toBe(`
`1263`		`-"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported via openai-codex OAuth. Use openai-codex/gpt-5.3-codex-spark.",`
	`1263`	`+"Unknown model: openai/gpt-5.3-codex-spark. gpt-5.3-codex-spark is only supported through Codex OAuth. Use openai/gpt-5.3-codex-spark with the Codex OAuth profile.",`
`1264`	`1264`	`);`
`1265`	`1265`	`});`
`1266`	`1266`

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ export function expectCodexBuiltInSuppression(`
`77`	`77`	`}),`
`78`	`78`	`).toMatchObject({`
`79`	`79`	`suppress: true,`
`80`		`-errorMessage: expect.stringContaining("openai-codex/gpt-5.3-codex-spark"),`
	`80`	`+errorMessage: expect.stringContaining(`
	`81`	`+"openai/gpt-5.3-codex-spark with the Codex OAuth profile",`
	`82`	`+),`
`81`	`83`	`});`
`82`	`84`	`}`
`83`	`85`

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,10 @@ function createOpenAiCatalogProviderPlugin(`
`134`	`134`	`suppressBuiltInModel: ({ provider, modelId }) =>`
`135`	`135`	`(provider === "openai" \|\| provider === "azure-openai-responses") &&`
`136`	`136`	`modelId === "gpt-5.3-codex-spark"`
`137`		`- ? { suppress: true, errorMessage: "openai-codex/gpt-5.3-codex-spark" }`
	`137`	`+ ? {`
	`138`	`+suppress: true,`
	`139`	`+errorMessage: "openai/gpt-5.3-codex-spark with the Codex OAuth profile",`
	`140`	`+}`
`138`	`141`	`: undefined,`
`139`	`142`	`augmentModelCatalog: () => [`
`140`	`143`	`{ provider: "openai", id: "gpt-5.4", name: "gpt-5.4" },`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main