From a687c047afc78771fbe96bb4dca99a60fea42a2c Mon Sep 17 00:00:00 2001 From: Dan Smolsky <78942835+Tarquinen@users.noreply.github.com> Date: Sun, 8 Nov 2026 13:04:14 -0500 Subject: [PATCH] fix(core): keep a v1 provider's baseURL when api is also set (#62570) --- packages/core/src/v1/config/migrate.ts | 6 +++++- packages/core/test/config/provider.test.ts | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index fd78c9986d3..a5ccf2e365e 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -125,7 +125,11 @@ function migrateStandardProvider(info: ConfigProviderV1.Info) { env: info.env, package: info.npm ? packageSpecifier(info.npm) : undefined, compatibility: setCacheKey === undefined ? undefined : { supportsPromptCacheKey: setCacheKey }, - settings: info.api ? { ...options.settings, baseURL: info.api } : info.options ? options.settings : undefined, + settings: info.api + ? { ...options.settings, baseURL: options.settings.baseURL || info.api } + : info.options + ? options.settings + : undefined, headers: info.options && options.headers, body: info.options && options.body, models: diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 4fbe22f070c..8c2a2ce12ee 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -641,6 +641,16 @@ describe("ConfigProviderPlugin.Plugin", () => { models: { chat: {} }, }, }, + { + name: "provider baseURL alongside api", + legacy: { api: "openai", options: { baseURL: "http://127.0.0.1:4000/v1" }, models: { chat: {} } }, + native: { settings: { baseURL: "http://127.0.0.1:4000/v1" }, models: { chat: {} } }, + }, + { + name: "empty provider baseURL falls back to api", + legacy: { api: "http://127.0.0.1:4000/v1", options: { baseURL: "" }, models: { chat: {} } }, + native: { settings: { baseURL: "http://127.0.0.1:4000/v1" }, models: { chat: {} } }, + }, { name: "model package, limits, costs, and variant overrides", legacy: {