diff --git a/extensions/cohere/onboard.test.ts b/extensions/cohere/onboard.test.ts index a35fe3b5a317..65b693840526 100644 --- a/extensions/cohere/onboard.test.ts +++ b/extensions/cohere/onboard.test.ts @@ -4,14 +4,13 @@ import { describe, expect, it } from "vitest"; import { buildCohereCatalogModels, COHERE_BASE_URL, COHERE_MODEL_CATALOG } from "./models.js"; import { applyCohereConfig, - applyCohereProviderConfig, COHERE_DEFAULT_MODEL_ID, COHERE_DEFAULT_MODEL_REF, } from "./onboard.js"; describe("Cohere onboarding", () => { - it("registers the manifest catalog through the compatibility endpoint", () => { - const result = applyCohereProviderConfig({}); + it("registers the manifest catalog through the onboarding preset", () => { + const result = applyCohereConfig({}); const provider = result.models?.providers?.cohere; expect(provider).toMatchObject({ diff --git a/extensions/cohere/onboard.ts b/extensions/cohere/onboard.ts index 243cb35eee1a..77e48d545f95 100644 --- a/extensions/cohere/onboard.ts +++ b/extensions/cohere/onboard.ts @@ -18,10 +18,6 @@ const coherePresetAppliers = createModelCatalogPresetAppliers({ }), }); -export function applyCohereProviderConfig(cfg: OpenClawConfig): OpenClawConfig { - return coherePresetAppliers.applyProviderConfig(cfg); -} - export function applyCohereConfig(cfg: OpenClawConfig): OpenClawConfig { return coherePresetAppliers.applyConfig(cfg); } diff --git a/extensions/kilocode/onboard.test.ts b/extensions/kilocode/onboard.test.ts index 90de1c7d472c..ea11281c8e3e 100644 --- a/extensions/kilocode/onboard.test.ts +++ b/extensions/kilocode/onboard.test.ts @@ -11,7 +11,6 @@ import { KILOCODE_DEFAULT_MODEL_ID, } from "./api.js"; import { - applyKilocodeProviderConfig, applyKilocodeConfig, KILOCODE_BASE_URL, KILOCODE_DEFAULT_MODEL_REF, @@ -56,16 +55,16 @@ describe("Kilo Gateway provider config", () => { }); }); - describe("applyKilocodeProviderConfig", () => { + describe("applyKilocodeConfig", () => { it("registers kilocode provider with correct baseUrl and api", () => { - const result = applyKilocodeProviderConfig(emptyCfg); + const result = applyKilocodeConfig(emptyCfg); const provider = requireKilocodeProvider(result); expect(provider.baseUrl).toBe(KILOCODE_BASE_URL); expect(provider.api).toBe("openai-completions"); }); it("includes the default model in the provider model list", () => { - const result = applyKilocodeProviderConfig(emptyCfg); + const result = applyKilocodeConfig(emptyCfg); const provider = result.models?.providers?.kilocode; const models = provider?.models; expect(Array.isArray(models)).toBe(true); @@ -74,7 +73,7 @@ describe("Kilo Gateway provider config", () => { }); it("surfaces the full Kilo model catalog", () => { - const result = applyKilocodeProviderConfig(emptyCfg); + const result = applyKilocodeConfig(emptyCfg); const provider = result.models?.providers?.kilocode; const modelIds = provider?.models?.map((m) => m.id) ?? []; for (const modelId of KILOCODE_MODEL_IDS) { @@ -83,7 +82,7 @@ describe("Kilo Gateway provider config", () => { }); it("appends missing catalog models to existing Kilo provider config", () => { - const result = applyKilocodeProviderConfig({ + const result = applyKilocodeConfig({ models: { providers: { kilocode: { @@ -101,7 +100,7 @@ describe("Kilo Gateway provider config", () => { }); it("sets Kilo Gateway alias in agent default models", () => { - const result = applyKilocodeProviderConfig(emptyCfg); + const result = applyKilocodeConfig(emptyCfg); const agentModel = result.agents?.defaults?.models?.[KILOCODE_DEFAULT_MODEL_REF]; expect(agentModel).toEqual({ alias: "Kilo Gateway" }); }); @@ -116,7 +115,7 @@ describe("Kilo Gateway provider config", () => { }, }, }; - const result = applyKilocodeProviderConfig(cfg); + const result = applyKilocodeConfig(cfg); const agentModel = result.agents?.defaults?.models?.[KILOCODE_DEFAULT_MODEL_REF]; expect(agentModel?.alias).toBe("My Custom Alias"); }); @@ -129,20 +128,18 @@ describe("Kilo Gateway provider config", () => { }, }, }; - const result = applyKilocodeProviderConfig(cfg); + const result = applyKilocodeConfig(cfg); expect(resolveAgentModelPrimaryValue(result.agents?.defaults?.model)).toBe("openai/gpt-5"); }); }); - describe("applyKilocodeConfig", () => { - it("sets kilocode as the default model", () => { - const result = applyKilocodeConfig(emptyCfg); - expect(resolveAgentModelPrimaryValue(result.agents?.defaults?.model)).toBe( - KILOCODE_DEFAULT_MODEL_REF, - ); - const provider = requireKilocodeProvider(result); - expect(provider.baseUrl).toBe(KILOCODE_BASE_URL); - }); + it("sets kilocode as the default model", () => { + const result = applyKilocodeConfig(emptyCfg); + expect(resolveAgentModelPrimaryValue(result.agents?.defaults?.model)).toBe( + KILOCODE_DEFAULT_MODEL_REF, + ); + const provider = requireKilocodeProvider(result); + expect(provider.baseUrl).toBe(KILOCODE_BASE_URL); }); describe("env var resolution", () => { diff --git a/extensions/kilocode/onboard.ts b/extensions/kilocode/onboard.ts index 581eb300a94e..fdfa03eafd78 100644 --- a/extensions/kilocode/onboard.ts +++ b/extensions/kilocode/onboard.ts @@ -19,10 +19,6 @@ const kilocodePresetAppliers = createModelCatalogPresetAppliers({ }), }); -export function applyKilocodeProviderConfig(cfg: OpenClawConfig): OpenClawConfig { - return kilocodePresetAppliers.applyProviderConfig(cfg); -} - export function applyKilocodeConfig(cfg: OpenClawConfig): OpenClawConfig { return kilocodePresetAppliers.applyConfig(cfg); } diff --git a/extensions/kimi-coding/onboard.test.ts b/extensions/kimi-coding/onboard.test.ts index 20e9ac86d524..04a4792f01fb 100644 --- a/extensions/kimi-coding/onboard.test.ts +++ b/extensions/kimi-coding/onboard.test.ts @@ -3,7 +3,6 @@ import { resolveAgentModelPrimaryValue } from "openclaw/plugin-sdk/provider-onbo import { describe, expect, it } from "vitest"; import { applyKimiCodeConfig, - applyKimiCodeProviderConfig, KIMI_CODING_MODEL_REF, KIMI_MODEL_REF, } from "./onboard.js"; @@ -15,7 +14,7 @@ describe("kimi coding onboard", () => { }); it("adds the Kimi coding provider defaults", () => { - const cfg = applyKimiCodeProviderConfig({}); + const cfg = applyKimiCodeConfig({}); const provider = cfg.models?.providers?.kimi; expect(provider).toEqual({ diff --git a/extensions/kimi-coding/onboard.ts b/extensions/kimi-coding/onboard.ts index 2fe7d51eafe6..d5f3afc8ae5e 100644 --- a/extensions/kimi-coding/onboard.ts +++ b/extensions/kimi-coding/onboard.ts @@ -34,10 +34,6 @@ const kimiCodingPresetAppliers = createDefaultModelPresetAppliers({ }, }); -export function applyKimiCodeProviderConfig(cfg: OpenClawConfig): OpenClawConfig { - return kimiCodingPresetAppliers.applyProviderConfig(cfg); -} - export function applyKimiCodeConfig(cfg: OpenClawConfig): OpenClawConfig { return kimiCodingPresetAppliers.applyConfig(cfg); }