fix(openai): route spark through codex runtime · openclaw/openclaw@501f634

Recent Commits to openclaw:main

obviyus · 2026-06-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -849,6 +849,20 @@ describe("buildOpenAIProvider", () => {`
`849`	`849`	`auth: "api-key",`
`850`	`850`	`},`
`851`	`851`	`} as never);`
	`852`	`+const runtimeModel = provider.resolveDynamicModel?.({`
	`853`	`+provider: "openai",`
	`854`	`+modelId: "gpt-5.3-codex-spark",`
	`855`	`+modelRegistry: { find: () => null },`
	`856`	`+agentRuntimeId: "codex",`
	`857`	`+} as never);`
	`858`	`+const apiKeyRuntimeModel = provider.resolveDynamicModel?.({`
	`859`	`+provider: "openai",`
	`860`	`+modelId: "gpt-5.3-codex-spark",`
	`861`	`+modelRegistry: { find: () => null },`
	`862`	`+agentRuntimeId: "codex",`
	`863`	`+authProfileId: "openai:api-key",`
	`864`	`+authProfileMode: "api_key",`
	`865`	`+} as never);`
`852`	`866`	`const unknownModelHint = provider.buildUnknownModelHint?.({`
`853`	`867`	`provider: "openai",`
`854`	`868`	`modelId: "gpt-5.3-codex-spark",`
`@@ -864,7 +878,18 @@ describe("buildOpenAIProvider", () => {`
`864`	`878`	`contextTokens: 128_000,`
`865`	`879`	`maxTokens: 128_000,`
`866`	`880`	`});`
	`881`	`+expectFields(runtimeModel, {`
	`882`	`+provider: "openai",`
	`883`	`+id: "gpt-5.3-codex-spark",`
	`884`	`+api: "openai-chatgpt-responses",`
	`885`	`+baseUrl: "https://chatgpt.com/backend-api/codex",`
	`886`	`+input: ["text"],`
	`887`	`+contextWindow: 128_000,`
	`888`	`+contextTokens: 128_000,`
	`889`	`+maxTokens: 128_000,`
	`890`	`+});`
`867`	`891`	`expect(apiKeyModel).toBeUndefined();`
	`892`	`+expect(apiKeyRuntimeModel).toBeUndefined();`
`868`	`893`	`expect(unknownModelHint).toContain("ChatGPT/Codex OAuth");`
`869`	`894`	`expect(unknownModelHint).toContain("OpenAI API-key auth cannot use this model");`
`870`	`895`	`});`

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,11 @@ function shouldResolveDynamicModelThroughCodex(ctx: ProviderResolveDynamicModelC`
`515`	`515`	`if (ctx.providerConfig?.baseUrl && !isOpenAIApiBaseUrl(ctx.providerConfig.baseUrl)) {`
`516`	`516`	`return false;`
`517`	`517`	`}`
`518`		`-return resolveConfiguredAuthTransport(ctx) === "codex";`
	`518`	`+const authTransport = resolveConfiguredAuthTransport(ctx);`
	`519`	`+if (authTransport) {`
	`520`	`+return authTransport === "codex";`
	`521`	`+}`
	`522`	`+return ctx.agentRuntimeId === "codex";`
`519`	`523`	`}`
`520`	`524`
`521`	`525`	`function buildOpenAIUnknownModelHint(modelId: string): string \| undefined {`

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,58 @@ describe("resolveModel forward-compat errors and overrides", () => {`
`213`	`213`	`);`
`214`	`214`	`});`
`215`	`215`
	`216`	`+it("resolves suppressed openai gpt-5.3-codex-spark through model-scoped Codex runtime", () => {`
	`217`	`+mockOpenAICodexTemplateModel(discoverModels);`
	`218`	`+`
	`219`	`+const cfg: OpenClawConfig = {`
	`220`	`+agents: {`
	`221`	`+defaults: {`
	`222`	`+models: {`
	`223`	`+"openai/gpt-5.3-codex-spark": {`
	`224`	`+agentRuntime: { id: "codex" },`
	`225`	`+},`
	`226`	`+},`
	`227`	`+},`
	`228`	`+},`
	`229`	`+};`
	`230`	`+const result = resolveModelForTest("openai", "gpt-5.3-codex-spark", "/tmp/agent", cfg);`
	`231`	`+`
	`232`	`+expect(result.error).toBeUndefined();`
	`233`	`+expect(result.model).toMatchObject(`
	`234`	`+buildOpenAICodexForwardCompatExpectation("gpt-5.3-codex-spark"),`
	`235`	`+);`
	`236`	`+});`
	`237`	`+`
	`238`	`+it("keeps model-scoped Codex runtime blocked for explicit OpenAI API-key provider config", () => {`
	`239`	`+mockOpenAICodexTemplateModel(discoverModels);`
	`240`	`+`
	`241`	`+const cfg: OpenClawConfig = {`
	`242`	`+agents: {`
	`243`	`+defaults: {`
	`244`	`+models: {`
	`245`	`+"openai/gpt-5.3-codex-spark": {`
	`246`	`+agentRuntime: { id: "codex" },`
	`247`	`+},`
	`248`	`+},`
	`249`	`+},`
	`250`	`+},`
	`251`	`+models: {`
	`252`	`+providers: {`
	`253`	`+openai: {`
	`254`	`+auth: "api-key",`
	`255`	`+api: "openai-responses",`
	`256`	`+baseUrl: "https://api.openai.com/v1",`
	`257`	`+models: [],`
	`258`	`+},`
	`259`	`+},`
	`260`	`+},`
	`261`	`+};`
	`262`	`+const result = resolveModelForTest("openai", "gpt-5.3-codex-spark", "/tmp/agent", cfg);`
	`263`	`+`
	`264`	`+expect(result.model).toBeUndefined();`
	`265`	`+expect(result.error).toContain("OpenAI API-key auth cannot use this model");`
	`266`	`+});`
	`267`	`+`
`216`	`268`	`it("keeps suppressed stale direct openai gpt-5.3-codex-spark catalog rows blocked", () => {`
`217`	`269`	`mockDiscoveredModel(discoverModels, {`
`218`	`270`	`provider: "openai",`

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,13 @@ type DynamicModelContext = {`
`39`	`39`	`provider: string;`
`40`	`40`	`modelId: string;`
`41`	`41`	`modelRegistry: ModelRegistryLike;`
`42`		`-providerConfig?: { api?: string \| null; baseUrl?: string };`
	`42`	`+agentRuntimeId?: string;`
	`43`	`+authProfileMode?: "api_key" \| "aws-sdk" \| "oauth" \| "token";`
	`44`	`+providerConfig?: {`
	`45`	`+api?: string \| null;`
	`46`	`+auth?: "api-key" \| "aws-sdk" \| "oauth" \| "token";`
	`47`	`+baseUrl?: string;`
	`48`	`+};`
`43`	`49`	`};`
`44`	`50`
`45`	`51`	`type ResolvedModelLike = Record<string, unknown>;`
`@@ -296,9 +302,22 @@ function buildDynamicModel(`
`296`	`302`	`const isLegacyGpt54Alias = lower === "gpt-5.4-codex";`
`297`	`303`	`const isSparkModel = lower === "gpt-5.3-codex-spark";`
`298`	`304`	`const exactModel = params.modelRegistry.find("openai", modelId) as ResolvedModelLike \| null;`
	`305`	`+const explicitResponsesAuth =`
	`306`	`+params.authProfileMode === "api_key" \|\|`
	`307`	`+params.authProfileMode === "aws-sdk" \|\|`
	`308`	`+params.providerConfig?.auth === "api-key" \|\|`
	`309`	`+params.providerConfig?.auth === "aws-sdk";`
	`310`	`+const explicitCodexAuth =`
	`311`	`+params.authProfileMode === "oauth" \|\|`
	`312`	`+params.authProfileMode === "token" \|\|`
	`313`	`+params.providerConfig?.auth === "oauth" \|\|`
	`314`	`+params.providerConfig?.auth === "token";`
`299`	`315`	`const providerConfigSelectsChatGpt =`
`300`		`-params.providerConfig?.api === "openai-chatgpt-responses" \|\|`
`301`		`-isNativeOpenAICodexBaseUrl(params.providerConfig?.baseUrl);`
	`316`	`+!explicitResponsesAuth &&`
	`317`	`+(explicitCodexAuth \|\|`
	`318`	`+params.providerConfig?.api === "openai-chatgpt-responses" \|\|`
	`319`	`+isNativeOpenAICodexBaseUrl(params.providerConfig?.baseUrl) \|\|`
	`320`	`+params.agentRuntimeId === "codex");`
`302`	`321`	`if (`
`303`	`322`	`lower === "gpt-5.5" &&`
`304`	`323`	`(providerConfigSelectsChatGpt \|\| isOpenAIChatGptModelTemplate(exactModel))`
`@@ -695,7 +714,13 @@ export function createProviderRuntimeTestMock(options: ProviderRuntimeTestMockOp`
`695`	`714`	`context: {`
`696`	`715`	`modelId: string;`
`697`	`716`	`modelRegistry: ModelRegistryLike;`
`698`		`-providerConfig?: { api?: string \| null; baseUrl?: string };`
	`717`	`+agentRuntimeId?: string;`
	`718`	`+authProfileMode?: "api_key" \| "aws-sdk" \| "oauth" \| "token";`
	`719`	`+providerConfig?: {`
	`720`	`+api?: string \| null;`
	`721`	`+auth?: "api-key" \| "aws-sdk" \| "oauth" \| "token";`
	`722`	`+baseUrl?: string;`
	`723`	`+};`
`699`	`724`	`};`
`700`	`725`	`}) =>`
`701`	`726`	`handledDynamicProviders.has(params.provider)`
`@@ -704,6 +729,8 @@ export function createProviderRuntimeTestMock(options: ProviderRuntimeTestMockOp`
`704`	`729`	`provider: params.provider,`
`705`	`730`	`modelId: params.context.modelId,`
`706`	`731`	`modelRegistry: params.context.modelRegistry,`
	`732`	`+agentRuntimeId: params.context.agentRuntimeId,`
	`733`	`+authProfileMode: params.context.authProfileMode,`
`707`	`734`	`providerConfig: params.context.providerConfig,`
`708`	`735`	`},`
`709`	`736`	`{`

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import { resolveDefaultAgentDir } from "../agent-scope.js";`
`22`	`22`	`import { ensureAuthProfileStore, resolveAuthProfileOrder } from "../auth-profiles.js";`
`23`	`23`	`import type { AuthProfileCredential } from "../auth-profiles/types.js";`
`24`	`24`	`import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";`
	`25`	`+import { resolveAgentHarnessPolicy } from "../harness/policy.js";`
`25`	`26`	`import { buildModelAliasLines } from "../model-alias-lines.js";`
`26`	`27`	`import { resolveModelWorkspaceDir } from "../model-discovery-context.js";`
`27`	`28`	`import { modelKey, normalizeStaticProviderModelId } from "../model-ref-shared.js";`
`@@ -1134,6 +1135,12 @@ function resolvePluginDynamicModelWithRegistry(params: {`
`1134`	`1135`	`const { provider, modelId, modelRegistry, cfg, agentDir, workspaceDir } = params;`
`1135`	`1136`	`const runtimeHooks = params.runtimeHooks ?? DEFAULT_PROVIDER_RUNTIME_HOOKS;`
`1136`	`1137`	`const providerConfig = resolveConfiguredProviderConfig(cfg, provider);`
	`1138`	`+const agentHarnessPolicy = resolveAgentHarnessPolicy({ provider, modelId, config: cfg });`
	`1139`	`+const agentRuntimeId =`
	`1140`	`+agentHarnessPolicy.runtimeSource !== "implicit" \|\|`
	`1141`	`+cfg?.plugins?.entries?.codex?.enabled === true`
	`1142`	`+ ? agentHarnessPolicy.runtime`
	`1143`	`+ : undefined;`
`1137`	`1144`	`const authProfile = resolveDynamicModelAuthProfile({`
`1138`	`1145`	`provider,`
`1139`	`1146`	`cfg,`
`@@ -1157,6 +1164,7 @@ function resolvePluginDynamicModelWithRegistry(params: {`
`1157`	`1164`	`config: cfg,`
`1158`	`1165`	`agentDir,`
`1159`	`1166`	`workspaceDir,`
	`1167`	`+ ...(agentRuntimeId ? { agentRuntimeId } : {}),`
`1160`	`1168`	`provider,`
`1161`	`1169`	`modelId,`
`1162`	`1170`	`modelRegistry,`

Original file line number	Diff line number	Diff line change
`@@ -510,6 +510,7 @@ export type ProviderResolveDynamicModelContext = {`
`510`	`510`	`config?: OpenClawConfig;`
`511`	`511`	`agentDir?: string;`
`512`	`512`	`workspaceDir?: string;`
	`513`	`+agentRuntimeId?: string;`
`513`	`514`	`provider: string;`
`514`	`515`	`modelId: string;`
`515`	`516`	`modelRegistry: ModelRegistry;`

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

推荐订阅源

Recent Commits to openclaw:main