github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-18 05:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(onboard): reuse applyAgentDefaultModelPrimary

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 18:34:55 +00:00
parent 8678b10aef
commit a5b87338e5
2 changed files with 16 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/commands/onboard-auth.config-core.ts
View File

@@ -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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
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<string, unknown>)
? {
fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks,
}
: undefined),
primary: QIANFAN_DEFAULT_MODEL_REF,
},
},
},
};
return applyAgentDefaultModelPrimary(next, QIANFAN_DEFAULT_MODEL_REF);
}

43
src/commands/onboard-auth.config-gateways.ts
View File

@@ -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<string, unknown>)
? {
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<string, unknown>)
? {
fallbacks: (existingModel as { fallbacks?: string[] }).fallbacks,
}
: undefined),
primary: CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF,
},
},
},
};
return applyAgentDefaultModelPrimary(next, CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF);
}