@swarmclawai/swarmclaw 1.2.3 → 1.2.4

package/README.md

@@ -190,6 +190,12 @@ The building blocks are the same: **agents, tools, memory, delegation, schedules
 
 ## Release Notes
 
+### v1.2.4 Highlights
+
+- **Custom providers in agent config**: agent setup and inline model switching now merge saved custom provider configs into the selectable provider list, so custom providers show up reliably even when the built-in provider feed is stale or incomplete.
+- **Custom provider save-only flow**: the Providers screen no longer forces connection tests or live model discovery for custom providers; operators can save the endpoint, linked key, and manual model list directly.
+- **Custom provider runtime routing**: saved custom-provider model lists and linked credentials now flow through the agent UI and runtime resolution paths consistently, including legacy `provider_configs` records normalized on load.
+
 ### v1.2.3 Highlights
 
 - **Standalone asset staging repair**: `swarmclaw server` now copies `.next/static` and `public/` into the Next.js standalone runtime after the first build, preventing blank UI loads and 503s for CSS, JS, and image assets.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Self-hosted AI runtime for OpenClaw, delegation, autonomy, runtime skills, crypto wallets, and chat platform connectors.",
   "license": "MIT",
   "publishConfig": {

package/src/app/api/providers/[id]/models/route.test.ts

@@ -0,0 +1,60 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { runWithTempDataDir } from '@/lib/server/test-utils/run-with-temp-data-dir'
+
+test('provider models route updates custom provider configs without creating model overrides', () => {
+  const output = runWithTempDataDir<{
+    customModels: string[]
+    overrideKeys: string[]
+    getPayload: { models: string[]; hasOverride: boolean }
+  }>(`
+    const storageMod = await import('./src/lib/server/storage')
+    const routeMod = await import('./src/app/api/providers/[id]/models/route')
+    const storage = storageMod.default || storageMod
+    const route = routeMod.default || routeMod
+
+    const now = Date.now()
+    storage.saveProviderConfigs({
+      'custom-llama': {
+        id: 'custom-llama',
+        name: 'Llama.cpp',
+        type: 'custom',
+        baseUrl: 'http://localhost:8080/v1',
+        models: ['old-model'],
+        requiresApiKey: false,
+        credentialId: null,
+        isEnabled: true,
+        createdAt: now,
+        updatedAt: now,
+      },
+    })
+
+    await route.PUT(
+      new Request('http://local/api/providers/custom-llama/models', {
+        method: 'PUT',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ models: ['llama-3.1-8b', 'llama-3.1-70b'] }),
+      }),
+      { params: Promise.resolve({ id: 'custom-llama' }) },
+    )
+
+    const getResponse = await route.GET(
+      new Request('http://local/api/providers/custom-llama/models'),
+      { params: Promise.resolve({ id: 'custom-llama' }) },
+    )
+
+    console.log(JSON.stringify({
+      customModels: storage.loadProviderConfigs()['custom-llama'].models,
+      overrideKeys: Object.keys(storage.loadModelOverrides()),
+      getPayload: await getResponse.json(),
+    }))
+  `, { prefix: 'swarmclaw-provider-model-route-test-' })
+
+  assert.deepEqual(output.customModels, ['llama-3.1-8b', 'llama-3.1-70b'])
+  assert.deepEqual(output.overrideKeys, [])
+  assert.deepEqual(output.getPayload, {
+    models: ['llama-3.1-8b', 'llama-3.1-70b'],
+    hasOverride: false,
+  })
+})

package/src/app/api/providers/[id]/models/route.ts

@@ -1,11 +1,17 @@
 import { NextResponse } from 'next/server'
-import { loadModelOverrides, saveModelOverrides } from '@/lib/server/storage'
+import { loadModelOverrides, loadProviderConfigs, saveModelOverrides, saveProviderConfigs } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { getProviderList } from '@/lib/providers'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 
 export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
+  const providerConfigs = loadProviderConfigs()
+  const customProvider = providerConfigs[id]
+  if (customProvider?.type === 'custom') {
+    return NextResponse.json({ models: customProvider.models || [], hasOverride: false })
+  }
+
   const overrides = loadModelOverrides()
   const providers = getProviderList()
   const provider = providers.find((p) => p.id === id)
@@ -17,6 +23,19 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   const { id } = await params
   const { data: body, error } = await safeParseBody<{ models?: string[] }>(req)
   if (error) return error
+
+  const providerConfigs = loadProviderConfigs()
+  const customProvider = providerConfigs[id]
+  if (customProvider?.type === 'custom') {
+    providerConfigs[id] = {
+      ...customProvider,
+      models: body.models || [],
+      updatedAt: Date.now(),
+    }
+    saveProviderConfigs(providerConfigs)
+    return NextResponse.json({ models: providerConfigs[id].models })
+  }
+
   const overrides = loadModelOverrides()
   overrides[id] = body.models || []
   saveModelOverrides(overrides)
@@ -25,6 +44,19 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
+
+  const providerConfigs = loadProviderConfigs()
+  const customProvider = providerConfigs[id]
+  if (customProvider?.type === 'custom') {
+    providerConfigs[id] = {
+      ...customProvider,
+      models: [],
+      updatedAt: Date.now(),
+    }
+    saveProviderConfigs(providerConfigs)
+    return NextResponse.json({ ok: true })
+  }
+
   const overrides = loadModelOverrides()
   delete overrides[id]
   saveModelOverrides(overrides)

package/src/app/api/providers/[id]/route.ts

@@ -1,7 +1,9 @@
 import { NextResponse } from 'next/server'
+import { PROVIDERS } from '@/lib/providers'
 import { loadProviderConfigs, saveProviderConfigs } from '@/lib/server/storage'
 import { mutateItem, deleteItem, notFound, badRequest, type CollectionOps } from '@/lib/server/collection-helpers'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
+import { notify } from '@/lib/server/ws-hub'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ops: CollectionOps<any> = { load: loadProviderConfigs, save: saveProviderConfigs, topic: 'providers' }
@@ -18,8 +20,35 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   const { id } = await params
   const { data: body, error } = await safeParseBody<Record<string, unknown>>(req)
   if (error) return error
+  if (!ops.load()[id]) {
+    const builtin = PROVIDERS[id]
+    if (!builtin) return notFound()
+
+    const now = Date.now()
+    const configs = loadProviderConfigs()
+    configs[id] = {
+      ...body,
+      id,
+      name: builtin.name,
+      type: 'builtin',
+      baseUrl: builtin.defaultEndpoint || '',
+      models: [...builtin.models],
+      requiresApiKey: builtin.requiresApiKey,
+      credentialId: null,
+      isEnabled: body.isEnabled !== false,
+      createdAt: now,
+      updatedAt: now,
+    }
+    saveProviderConfigs(configs)
+    notify('providers')
+    return NextResponse.json(configs[id])
+  }
   const result = mutateItem(ops, id, (existing) => ({
-    ...existing, ...body, id, updatedAt: Date.now(),
+    ...existing,
+    ...body,
+    id,
+    type: existing.type === 'builtin' ? 'builtin' : 'custom',
+    updatedAt: Date.now(),
   }))
   if (!result) return notFound()
   return NextResponse.json(result)

package/src/components/agents/agent-sheet.tsx

@@ -28,6 +28,7 @@ import { resolveStoredOllamaMode } from '@/lib/ollama-mode'
 import { errorMessage } from '@/lib/shared-utils'
 import { getDefaultAgentToolIds } from '@/lib/agent-default-tools'
 import { getEnabledExtensionIds, getEnabledToolIds } from '@/lib/capability-selection'
+import { buildAgentSelectableProviders, resolveAgentSelectableProviderCredentials } from '@/lib/agent-provider-options'
 
 const HB_PRESETS = [1800, 3600, 7200, 21600, 43200] as const
 const FALLBACK_ELEVENLABS_VOICE_ID = 'JBFqnCBsd6RMkjVDRZzb'
@@ -46,6 +47,7 @@ const AUTO_SYNC_MODEL_PROVIDER_IDS = new Set<ProviderType>([
   'ollama',
 ])
 const CONNECTION_TEST_TIMEOUT_MS = 40_000
+type AgentProviderId = string
 
 type SafeAgentWallet = Omit<AgentWallet, 'encryptedPrivateKey'> & {
   balanceAtomic?: string
@@ -171,6 +173,8 @@ export function AgentSheet() {
   const loadProjects = useAppStore((s) => s.loadProjects)
   const providers = useAppStore((s) => s.providers)
   const loadProviders = useAppStore((s) => s.loadProviders)
+  const providerConfigs = useAppStore((s) => s.providerConfigs)
+  const loadProviderConfigs = useAppStore((s) => s.loadProviderConfigs)
   const gatewayProfiles = useAppStore((s) => s.gatewayProfiles)
   const loadGatewayProfiles = useAppStore((s) => s.loadGatewayProfiles)
   const credentials = useAppStore((s) => s.credentials)
@@ -197,7 +201,7 @@ export function AgentSheet() {
   const [soulInitial, setSoulInitial] = useState('')
   const [soulSaveState, setSoulSaveState] = useState<'idle' | 'saved'>('idle')
   const [systemPrompt, setSystemPrompt] = useState('')
-  const [provider, setProvider] = useState<ProviderType>('claude-cli')
+  const [provider, setProvider] = useState<AgentProviderId>('claude-cli')
   const [model, setModel] = useState('')
   const [credentialId, setCredentialId] = useState<string | null>(null)
   const [apiEndpoint, setApiEndpoint] = useState<string | null>(null)
@@ -308,8 +312,15 @@ export function AgentSheet() {
     }
   }, [])
 
-  const currentProvider = providers.find((p) => p.id === provider)
-  const providerCredentials = Object.values(credentials).filter((c) => c.provider === provider)
+  const agentSelectableProviders = useMemo(
+    () => buildAgentSelectableProviders(providers, providerConfigs),
+    [providers, providerConfigs],
+  )
+  const currentProvider = agentSelectableProviders.find((p) => p.id === provider)
+  const providerCredentials = useMemo(
+    () => resolveAgentSelectableProviderCredentials(provider, credentials, providerConfigs),
+    [credentials, provider, providerConfigs],
+  )
   const openclawCredentials = Object.values(credentials).filter((c) => c.provider === 'openclaw')
   const openclawGatewayProfiles = gatewayProfiles.filter((item) => item.provider === 'openclaw')
   const setAgentPrefill = useAppStore((s) => s.setAgentPrefill)
@@ -327,15 +338,15 @@ export function AgentSheet() {
       ? 'Global default'
       : 'Built-in fallback'
   const syncLiveProviderModels = useCallback(async (
-    providerId: ProviderType,
+    providerId: string,
     nextCredentialId: string | null,
     nextEndpoint: string | null,
     nextOllamaMode: 'local' | 'cloud',
     force = false,
   ): Promise<{ synced: boolean; models: string[] } | null> => {
     if (openclawEnabled) return null
-    if (!AUTO_SYNC_MODEL_PROVIDER_IDS.has(providerId)) return null
-    const providerInfo = providers.find((item) => item.id === providerId)
+    if (!AUTO_SYNC_MODEL_PROVIDER_IDS.has(providerId as ProviderType)) return null
+    const providerInfo = agentSelectableProviders.find((item) => item.id === providerId)
     if (!providerInfo?.supportsModelDiscovery) return null
 
     const result = await fetchProviderModelDiscovery({
@@ -358,7 +369,7 @@ export function AgentSheet() {
 
     setModel((currentModel) => currentModel.trim() || result.models[0] || '')
     return { synced: !sameModels, models: result.models }
-  }, [loadProviders, openclawEnabled, providers])
+  }, [agentSelectableProviders, loadProviders, openclawEnabled])
 
   const providerNeedsKey = !editing && (
     (currentProvider?.requiresApiKey && providerCredentials.length === 0 && !addingKey) ||
@@ -371,7 +382,7 @@ export function AgentSheet() {
       return
     }
     if (openclawEnabled) return
-    if (!AUTO_SYNC_MODEL_PROVIDER_IDS.has(provider)) return
+    if (!AUTO_SYNC_MODEL_PROVIDER_IDS.has(provider as ProviderType)) return
     if (!currentProvider?.supportsModelDiscovery) return
 
     const requiresCredential = currentProvider.requiresApiKey || (provider === 'ollama' && ollamaMode === 'cloud')
@@ -388,6 +399,7 @@ export function AgentSheet() {
     if (open) {
       loadSettings()
       loadProviders()
+      loadProviderConfigs()
       loadGatewayProfiles()
       loadCredentials()
       loadSkills()
@@ -637,7 +649,7 @@ export function AgentSheet() {
       setModel(currentProvider.models[0])
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [provider, providers])
+  }, [provider, agentSelectableProviders])
 
   // Reset test status when connection params change
   useEffect(() => {
@@ -873,13 +885,18 @@ export function AgentSheet() {
 
   const handleExport = () => {
     if (!editing) return
+    const recommendedProviders = agentSelectableProviders.some((providerOption) => (
+      providerOption.id === editing.provider && providerOption.type === 'builtin'
+    ))
+      ? [editing.provider as ProviderType]
+      : undefined
     const pack: AgentPackManifest = {
       schemaVersion: 1,
       kind: 'swarmclaw-agent-pack',
       name: `${editing.name} Pack`,
       description: editing.description || undefined,
       exportedAt: Date.now(),
-      recommendedProviders: [editing.provider],
+      recommendedProviders,
       agents: [{
         id: editing.name.replace(/\s+/g, '-').toLowerCase(),
         name: editing.name,
@@ -1213,7 +1230,7 @@ export function AgentSheet() {
                   if (!apiEndpoint) setApiEndpoint('http://localhost:18789')
                 } else {
                   setOpenclawEnabled(false)
-                  const first = providers[0]?.id || 'claude-cli'
+                  const first = agentSelectableProviders[0]?.id || 'claude-cli'
                   setProvider(first)
                   setModel('')
                   setApiEndpoint(null)
@@ -1445,13 +1462,17 @@ export function AgentSheet() {
       {!openclawEnabled && <div className="mb-8">
         <SectionLabel>Provider</SectionLabel>
         <div className="grid grid-cols-3 gap-3">
-          {providers.map((p) => {
-            const isConnected = !p.requiresApiKey || Object.values(credentials).some((c) => c.provider === p.id)
+          {agentSelectableProviders.map((p) => {
+            const nextCredentials = resolveAgentSelectableProviderCredentials(p.id, credentials, providerConfigs)
+            const isConnected = !p.requiresApiKey || nextCredentials.length > 0
             return (
               <button
                 key={p.id}
                 onClick={() => {
                   setProvider(p.id)
+                  if (!nextCredentials.some((item) => item.id === credentialId)) {
+                    setCredentialId(nextCredentials[0]?.id || null)
+                  }
                   setGatewayProfileId(null)
                 }}
                 className={`relative py-3.5 px-4 rounded-[14px] text-center cursor-pointer transition-all duration-200
@@ -2161,7 +2182,7 @@ export function AgentSheet() {
         </div>
         <div className="space-y-3">
           {routingTargets.map((target, index) => {
-            const targetCredentials = Object.values(credentials).filter((item) => item.provider === target.provider)
+            const targetCredentials = resolveAgentSelectableProviderCredentials(target.provider, credentials, providerConfigs)
             return (
               <div key={target.id} className="p-4 rounded-[12px] border border-white/[0.08] bg-white/[0.02] space-y-3">
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
@@ -2182,19 +2203,24 @@ export function AgentSheet() {
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
                   <select
                     value={target.provider}
-                    onChange={(e) => updateRoutingTarget(target.id, {
-                      provider: e.target.value as ProviderType,
-                      gatewayProfileId: e.target.value === 'openclaw' ? target.gatewayProfileId : null,
-                      ollamaMode: e.target.value === 'ollama'
+                    onChange={(e) => {
+                      const nextProviderId = e.target.value
+                      const nextCredentials = resolveAgentSelectableProviderCredentials(nextProviderId, credentials, providerConfigs)
+                      updateRoutingTarget(target.id, {
+                        provider: nextProviderId,
+                        credentialId: nextCredentials[0]?.id || null,
+                        gatewayProfileId: nextProviderId === 'openclaw' ? target.gatewayProfileId : null,
+                        ollamaMode: nextProviderId === 'ollama'
                         ? resolveStoredOllamaMode({
                           ollamaMode: target.ollamaMode ?? null,
                           apiEndpoint: target.apiEndpoint ?? null,
                         })
                         : null,
-                    })}
+                      })
+                    }}
                     className={inputClass}
                   >
-                    {providers.map((item) => (
+                    {agentSelectableProviders.map((item) => (
                       <option key={item.id} value={item.id}>{item.name}</option>
                     ))}
                   </select>

package/src/components/agents/inspector-panel.tsx

@@ -26,6 +26,7 @@ import { ModelCombobox } from '@/components/shared/model-combobox'
 import { buildOpenClawMainSessionKey } from '@/lib/openclaw/openclaw-agent-id'
 import { StructuredSessionLauncher } from '@/components/protocols/structured-session-launcher'
 import { useWs } from '@/hooks/use-ws'
+import { buildAgentSelectableProviders } from '@/lib/agent-provider-options'
 
 interface Props {
   agent: Agent
@@ -61,17 +62,27 @@ const PROVIDER_LABELS: Record<string, string> = {
 function ModelSwitcherInline({ session, agent }: { session: Session; agent: Agent }) {
   const providers = useAppStore((s) => s.providers)
   const loadProviders = useAppStore((s) => s.loadProviders)
+  const providerConfigs = useAppStore((s) => s.providerConfigs)
+  const loadProviderConfigs = useAppStore((s) => s.loadProviderConfigs)
   const refreshSession = useAppStore((s) => s.refreshSession)
   const streaming = useChatStore((s) => s.streaming)
   const [expanded, setExpanded] = useState(false)
   const [selectedProvider, setSelectedProvider] = useState(agent.provider)
   const [saving, setSaving] = useState(false)
 
-  useEffect(() => { if (!providers.length) void loadProviders() }, [providers.length, loadProviders])
+  useEffect(() => {
+    void loadProviders()
+    void loadProviderConfigs()
+  }, [loadProviderConfigs, loadProviders])
   useEffect(() => { setSelectedProvider(agent.provider) }, [agent.provider])
 
-  const currentProviderInfo = providers.find((p) => p.id === selectedProvider)
-  const providerLabel = PROVIDER_LABELS[agent.provider] || agent.provider.replace(/-/g, ' ')
+  const agentSelectableProviders = useMemo(
+    () => buildAgentSelectableProviders(providers, providerConfigs),
+    [providerConfigs, providers],
+  )
+  const currentProviderInfo = agentSelectableProviders.find((p) => p.id === selectedProvider)
+  const activeAgentProvider = agentSelectableProviders.find((p) => p.id === agent.provider)
+  const providerLabel = PROVIDER_LABELS[agent.provider] || activeAgentProvider?.name || agent.provider.replace(/-/g, ' ')
 
   const handleModelChange = async (model: string) => {
     if (saving) return
@@ -122,7 +133,7 @@ function ModelSwitcherInline({ session, agent }: { session: Session; agent: Agen
         </button>
       </div>
       <div className="flex flex-wrap gap-1 mb-2">
-        {providers.filter((p) => p.models.length > 0).map((p) => (
+        {agentSelectableProviders.filter((p) => p.models.length > 0).map((p) => (
           <button
             key={p.id}
             type="button"

package/src/components/auth/setup-wizard/index.tsx

@@ -4,7 +4,7 @@ import { useMemo, useState } from 'react'
 import { api } from '@/lib/app/api-client'
 import { useAppStore } from '@/stores/use-app-store'
 import { dedup, errorMessage } from '@/lib/shared-utils'
-import type { ProviderType, GatewayProfile } from '@/types'
+import type { ProviderId, GatewayProfile } from '@/types'
 import {
   SETUP_PROVIDERS,
   SWARMCLAW_ASSISTANT_PROMPT,
@@ -21,7 +21,7 @@ import type {
   ProviderCheckResponse,
 } from './types'
 import { STEP_ORDER } from './types'
-import { stepIndex } from './utils'
+import { requiresSetupProviderVerification, stepIndex } from './utils'
 import { SparkleIcon } from './shared'
 import { StepProgress } from './step-progress'
 import { StepProviders } from './step-providers'
@@ -53,7 +53,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     [editingProviderId, configuredProviders],
   )
   const totalSteps = STEP_ORDER.length
-  const configuredProviderIds = new Set(configuredProviders.map((cp) => cp.provider))
+  const configuredProviderIds = new Set(configuredProviders.map((cp) => cp.setupProvider))
   const canContinueFromProviders = configuredProviders.length > 0
 
   const skip = async () => {
@@ -76,7 +76,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
 
   const selectProvider = (nextProvider: SetupProvider) => {
     const meta = SETUP_PROVIDERS.find((candidate) => candidate.id === nextProvider)
-    const existing = configuredProviders.find((cp) => cp.provider === nextProvider)
+    const existing = configuredProviders.find((cp) => cp.setupProvider === nextProvider)
     setActiveProvider(nextProvider)
     setEditingProviderId(existing?.id || null)
     setActiveProviderLabel(existing?.name || meta?.name || '')
@@ -94,6 +94,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       return {
         ...draft,
         providerConfigId: fallback?.id || null,
+        setupProvider: fallback?.setupProvider || null,
         provider: fallback?.provider || null,
         credentialId: fallback?.credentialId || null,
         apiEndpoint: fallback?.endpoint || null,
@@ -125,6 +126,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
         systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
         soul: '',
         providerConfigId: cp.id,
+        setupProvider: cp.setupProvider,
         provider: cp.provider,
         model: cp.defaultModel,
         credentialId: cp.credentialId,
@@ -149,6 +151,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
           if (draft.providerConfigId !== editingProviderId) return draft
           return {
             ...draft,
+            setupProvider: configured.setupProvider,
             provider: configured.provider,
             credentialId: configured.credentialId,
             apiEndpoint: configured.endpoint,
@@ -186,6 +189,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       systemPrompt: '',
       soul: '',
       providerConfigId: defaultProvider?.id || null,
+      setupProvider: defaultProvider?.setupProvider || null,
       provider: defaultProvider?.provider || null,
       model: defaultProvider?.defaultModel || '',
       credentialId: defaultProvider?.credentialId || null,
@@ -224,13 +228,14 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
 
     setDraftAgents((current) => current.map((draft) => {
       if (draft.id !== id) return draft
-      const previousDefault = draft.provider ? getDefaultModelForProvider(draft.provider) : ''
+      const previousDefault = draft.setupProvider ? getDefaultModelForProvider(draft.setupProvider) : ''
       const nextModel = !draft.model || draft.model === previousDefault
         ? configuredProvider.defaultModel
         : draft.model
       return {
         ...draft,
         providerConfigId: configuredProvider.id,
+        setupProvider: configuredProvider.setupProvider,
         provider: configuredProvider.provider,
         credentialId: configuredProvider.credentialId,
         apiEndpoint: configuredProvider.endpoint,
@@ -246,6 +251,10 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       setError('Every enabled agent needs a provider assignment before you continue.')
       return
     }
+    if (enabledDrafts.some((draft) => draft.setupProvider === 'custom' && !draft.model.trim())) {
+      setError('Every custom-provider agent needs a model before you continue.')
+      return
+    }
 
     setSaving(true)
     setError('')
@@ -254,12 +263,12 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       const checkedCombos = new Map<string, ProviderCheckResponse>()
       for (const draft of enabledDrafts) {
         const cp = configuredProviders.find((c) => c.id === draft.providerConfigId)
-        if (!cp || cp.provider === 'openclaw') continue
-        const comboKey = `${cp.provider}|${draft.apiEndpoint || cp.endpoint || ''}|${draft.model}`
+        if (!cp || !requiresSetupProviderVerification(cp.setupProvider)) continue
+        const comboKey = `${cp.setupProvider}|${draft.apiEndpoint || cp.endpoint || ''}|${draft.model}`
         if (checkedCombos.has(comboKey)) continue
         try {
           const result = await api<ProviderCheckResponse>('POST', '/setup/check-provider', {
-            provider: cp.provider,
+            provider: cp.setupProvider,
             credentialId: cp.credentialId || undefined,
             endpoint: draft.apiEndpoint || cp.endpoint || undefined,
             model: draft.model || undefined,
@@ -276,7 +285,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       }
 
       const gatewayProfileIdsByProviderConfig = new Map<string, string>()
-      const openClawProviders = configuredProviders.filter((candidate) => candidate.provider === 'openclaw')
+      const openClawProviders = configuredProviders.filter((candidate) => candidate.setupProvider === 'openclaw')
       if (openClawProviders.length > 0) {
         const existingGateways = await api<GatewayProfile[]>('GET', '/gateways')
         let shouldCreateDefault = existingGateways.length === 0
@@ -322,8 +331,8 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
           description: draft.description.trim(),
           systemPrompt: draft.systemPrompt.trim(),
           soul: draft.soul.trim() || undefined,
-          provider: draft.provider as ProviderType,
-          model: draft.model.trim() || getDefaultModelForProvider(draft.provider as SetupProvider),
+          provider: draft.provider,
+          model: draft.model.trim() || (draft.setupProvider ? getDefaultModelForProvider(draft.setupProvider) : ''),
           credentialId: draft.credentialId || null,
           tools: draft.tools,
           capabilities: draft.capabilities,
@@ -355,7 +364,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
         }
 
         // Push soul and identity files to the OpenClaw gateway (non-fatal)
-        if (draft.provider === 'openclaw') {
+        if (draft.setupProvider === 'openclaw') {
           try {
             if (draft.soul.trim()) {
               await api('PUT', '/openclaw/agent-files', { agentId, filename: 'SOUL.md', content: draft.soul.trim() })
@@ -373,8 +382,8 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
         created.push({
           id: agentId,
           name: draft.name.trim(),
-          provider: draft.provider as SetupProvider,
-          providerName: configuredProviders.find((candidate) => candidate.id === draft.providerConfigId)?.name || draft.provider as SetupProvider,
+          provider: draft.provider as ProviderId,
+          providerName: configuredProviders.find((candidate) => candidate.id === draft.providerConfigId)?.name || String(draft.provider || ''),
         })
       }
 

package/src/components/auth/setup-wizard/shared.tsx

@@ -69,10 +69,10 @@ export function ConfiguredProviderChips({
             {formatEndpointHost(cp.endpoint)
               ? `· ${formatEndpointHost(cp.endpoint)}`
               : ''}
-            {cp.provider === 'openclaw' && cp.deployment?.useCase
+            {cp.setupProvider === 'openclaw' && cp.deployment?.useCase
               ? ` · ${OPENCLAW_USE_CASE_LABELS[cp.deployment.useCase]}`
               : ''}
-            {cp.provider === 'openclaw' && cp.deployment?.exposure
+            {cp.setupProvider === 'openclaw' && cp.deployment?.exposure
               ? ` · ${OPENCLAW_EXPOSURE_LABELS[cp.deployment.exposure]}`
               : ''}
             {cp.defaultModel ? ` · ${cp.defaultModel}` : ''}