From a5b87338e5b4c2949d10fde402deaf7975ce37e1 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 15 Feb 2026 18:34:55 +0000 Subject: [PATCH] refactor(onboard): reuse applyAgentDefaultModelPrimary --- src/commands/onboard-auth.config-core.ts | 191 +------------------ src/commands/onboard-auth.config-gateways.ts | 43 +---- 2 files changed, 16 insertions(+), 218 deletions(-) diff --git a/src/commands/onboard-auth.config-core.ts b/src/commands/onboard-auth.config-core.ts index 037c28e3721..4db007191b4 100644 --- a/src/commands/onboard-auth.config-core.ts +++ b/src/commands/onboard-auth.config-core.ts @@ -135,25 +135,7 @@ export function applyZaiConfig( const modelId = params?.modelId?.trim() || ZAI_DEFAULT_MODEL_ID; const modelRef = modelId === ZAI_DEFAULT_MODEL_ID ? ZAI_DEFAULT_MODEL_REF : `zai/${modelId}`; const next = applyZaiProviderConfig(cfg, params); - - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: modelRef, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, modelRef); } export function applyOpenrouterProviderConfig(cfg: OpenClawConfig): OpenClawConfig { @@ -177,24 +159,7 @@ export function applyOpenrouterProviderConfig(cfg: OpenClawConfig): OpenClawConf export function applyOpenrouterConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyOpenrouterProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: OPENROUTER_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, OPENROUTER_DEFAULT_MODEL_REF); } export function applyMoonshotProviderConfig(cfg: OpenClawConfig): OpenClawConfig { @@ -258,24 +223,7 @@ export function applyKimiCodeProviderConfig(cfg: OpenClawConfig): OpenClawConfig export function applyKimiCodeConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyKimiCodeProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: KIMI_CODING_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, KIMI_CODING_MODEL_REF); } export function applySyntheticProviderConfig(cfg: OpenClawConfig): OpenClawConfig { @@ -314,24 +262,7 @@ export function applySyntheticProviderConfig(cfg: OpenClawConfig): OpenClawConfi export function applySyntheticConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applySyntheticProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: SYNTHETIC_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, SYNTHETIC_DEFAULT_MODEL_REF); } export function applyXiaomiProviderConfig(cfg: OpenClawConfig): OpenClawConfig { @@ -354,24 +285,7 @@ export function applyXiaomiProviderConfig(cfg: OpenClawConfig): OpenClawConfig { export function applyXiaomiConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyXiaomiProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: XIAOMI_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, XIAOMI_DEFAULT_MODEL_REF); } /** @@ -401,24 +315,7 @@ export function applyVeniceProviderConfig(cfg: OpenClawConfig): OpenClawConfig { */ export function applyVeniceConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyVeniceProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: VENICE_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, VENICE_DEFAULT_MODEL_REF); } /** @@ -448,24 +345,7 @@ export function applyTogetherProviderConfig(cfg: OpenClawConfig): OpenClawConfig */ export function applyTogetherConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyTogetherProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: TOGETHER_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, TOGETHER_DEFAULT_MODEL_REF); } /** @@ -493,24 +373,7 @@ export function applyHuggingfaceProviderConfig(cfg: OpenClawConfig): OpenClawCon */ export function applyHuggingfaceConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyHuggingfaceProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: HUGGINGFACE_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, HUGGINGFACE_DEFAULT_MODEL_REF); } export function applyXaiProviderConfig(cfg: OpenClawConfig): OpenClawConfig { @@ -534,24 +397,7 @@ export function applyXaiProviderConfig(cfg: OpenClawConfig): OpenClawConfig { export function applyXaiConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyXaiProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: XAI_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, XAI_DEFAULT_MODEL_REF); } export function applyAuthProfileConfig( @@ -636,22 +482,5 @@ export function applyQianfanProviderConfig(cfg: OpenClawConfig): OpenClawConfig export function applyQianfanConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyQianfanProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: QIANFAN_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, QIANFAN_DEFAULT_MODEL_REF); } diff --git a/src/commands/onboard-auth.config-gateways.ts b/src/commands/onboard-auth.config-gateways.ts index 1e4ffc62cfa..b89acca00f0 100644 --- a/src/commands/onboard-auth.config-gateways.ts +++ b/src/commands/onboard-auth.config-gateways.ts @@ -3,7 +3,10 @@ import { buildCloudflareAiGatewayModelDefinition, resolveCloudflareAiGatewayBaseUrl, } from "../agents/cloudflare-ai-gateway.js"; -import { applyProviderConfigWithDefaultModel } from "./onboard-auth.config-shared.js"; +import { + applyAgentDefaultModelPrimary, + applyProviderConfigWithDefaultModel, +} from "./onboard-auth.config-shared.js"; import { CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF, VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF, @@ -76,24 +79,7 @@ export function applyCloudflareAiGatewayProviderConfig( export function applyVercelAiGatewayConfig(cfg: OpenClawConfig): OpenClawConfig { const next = applyVercelAiGatewayProviderConfig(cfg); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF); } export function applyCloudflareAiGatewayConfig( @@ -101,22 +87,5 @@ export function applyCloudflareAiGatewayConfig( params?: { accountId?: string; gatewayId?: string }, ): OpenClawConfig { const next = applyCloudflareAiGatewayProviderConfig(cfg, params); - const existingModel = next.agents?.defaults?.model; - return { - ...next, - agents: { - ...next.agents, - defaults: { - ...next.agents?.defaults, - model: { - ...(existingModel && "fallbacks" in (existingModel as Record) - ? { - fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks, - } - : undefined), - primary: CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF, - }, - }, - }, - }; + return applyAgentDefaultModelPrimary(next, CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF); }