Skip to content

Commit aad9974

Browse files
committed
fix(onboard): omit empty provider request settings
1 parent d3ff48c commit aad9974

2 files changed

Lines changed: 34 additions & 1 deletion

File tree

src/commands/onboard-auth.config-shared.test.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,34 @@ describe("onboard auth provider config merges", () => {
101101
expect(next.models?.providers?.other?.timeoutSeconds).toBe(300);
102102
});
103103

104+
it("omits empty provider request settings", () => {
105+
const next = applyOnboardAuthAgentModelsAndProviders(
106+
{
107+
models: {
108+
providers: {
109+
custom: {
110+
api: "openai-completions",
111+
baseUrl: "https://old.example.com/v1",
112+
models: [makeModel("model-a")],
113+
},
114+
},
115+
},
116+
},
117+
{
118+
agentModels,
119+
providers: {
120+
custom: {
121+
api: "openai-completions",
122+
baseUrl: "https://new.example.com/v1",
123+
models: [makeModel("model-b")],
124+
},
125+
},
126+
},
127+
);
128+
129+
expect(next.models?.providers?.custom).not.toHaveProperty("request");
130+
});
131+
104132
it("preserves settings without resurrecting a non-canonical provider key", () => {
105133
const next = applyOnboardAuthAgentModelsAndProviders(
106134
{

src/plugin-sdk/provider-onboard.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,15 @@ function mergeOnboardProviderConfigs(
329329
}
330330
}
331331
if (!("request" in providerConfig) || providerConfig.request) {
332-
nextProvider.request = mergeOnboardProviderRequest(
332+
const mergedRequest = mergeOnboardProviderRequest(
333333
existingProvider.request,
334334
providerConfig.request,
335335
);
336+
if (mergedRequest) {
337+
nextProvider.request = mergedRequest;
338+
} else {
339+
delete nextProvider.request;
340+
}
336341
}
337342
merged[providerId] = nextProvider;
338343
}

0 commit comments

Comments
 (0)