refactor(commands): dedupe provider config + default model helpers

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

@@ -6,14 +6,45 @@ import type {
   ModelProviderConfig,
 } from "../config/types.models.js";
 
-export function applyProviderConfigWithDefaultModel(
+function extractAgentDefaultModelFallbacks(model: unknown): string[] | undefined {
+  if (!model || typeof model !== "object") {
+    return undefined;
+  }
+  if (!("fallbacks" in model)) {
+    return undefined;
+  }
+  const fallbacks = (model as { fallbacks?: unknown }).fallbacks;
+  return Array.isArray(fallbacks) ? fallbacks.map((v) => String(v)) : undefined;
+}
+
+export function applyAgentDefaultModelPrimary(
+  cfg: OpenClawConfig,
+  primary: string,
+): OpenClawConfig {
+  const existingFallbacks = extractAgentDefaultModelFallbacks(cfg.agents?.defaults?.model);
+  return {
+    ...cfg,
+    agents: {
+      ...cfg.agents,
+      defaults: {
+        ...cfg.agents?.defaults,
+        model: {
+          ...(existingFallbacks ? { fallbacks: existingFallbacks } : undefined),
+          primary,
+        },
+      },
+    },
+  };
+}
+
+export function applyProviderConfigWithDefaultModels(
   cfg: OpenClawConfig,
   params: {
     agentModels: Record<string, AgentModelEntryConfig>;
     providerId: string;
     api: ModelApi;
     baseUrl: string;
-    defaultModel: ModelDefinitionConfig;
+    defaultModels: ModelDefinitionConfig[];
     defaultModelId?: string;
   },
 ): OpenClawConfig {
@@ -24,9 +55,17 @@ export function applyProviderConfigWithDefaultModel(
     ? existingProvider.models
     : [];
 
-  const defaultModelId = params.defaultModelId ?? params.defaultModel.id;
-  const hasDefaultModel = existingModels.some((model) => model.id === defaultModelId);
-  const mergedModels = hasDefaultModel ? existingModels : [...existingModels, params.defaultModel];
+  const defaultModels = params.defaultModels;
+  const defaultModelId = params.defaultModelId ?? defaultModels[0]?.id;
+  const hasDefaultModel = defaultModelId
+    ? existingModels.some((model) => model.id === defaultModelId)
+    : true;
+  const mergedModels =
+    existingModels.length > 0
+      ? hasDefaultModel || defaultModels.length === 0
+        ? existingModels
+        : [...existingModels, ...defaultModels]
+      : defaultModels;
 
   const { apiKey: existingApiKey, ...existingProviderRest } = (existingProvider ?? {}) as {
     apiKey?: string;
@@ -39,7 +78,7 @@ export function applyProviderConfigWithDefaultModel(
     baseUrl: params.baseUrl,
     api: params.api,
     ...(normalizedApiKey ? { apiKey: normalizedApiKey } : {}),
-    models: mergedModels.length > 0 ? mergedModels : [params.defaultModel],
+    models: mergedModels.length > 0 ? mergedModels : defaultModels,
   };
 
   return {
@@ -57,3 +96,24 @@ export function applyProviderConfigWithDefaultModel(
     },
   };
 }
+
+export function applyProviderConfigWithDefaultModel(
+  cfg: OpenClawConfig,
+  params: {
+    agentModels: Record<string, AgentModelEntryConfig>;
+    providerId: string;
+    api: ModelApi;
+    baseUrl: string;
+    defaultModel: ModelDefinitionConfig;
+    defaultModelId?: string;
+  },
+): OpenClawConfig {
+  return applyProviderConfigWithDefaultModels(cfg, {
+    agentModels: params.agentModels,
+    providerId: params.providerId,
+    api: params.api,
+    baseUrl: params.baseUrl,
+    defaultModels: [params.defaultModel],
+    defaultModelId: params.defaultModelId ?? params.defaultModel.id,
+  });
+}