@swarmclawai/swarmclaw 1.2.3 → 1.2.5

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()
@@ -435,7 +447,7 @@ export function AgentSheet() {
         }))
         setOpenclawEnabled(editing.provider === 'openclaw')
         setProjectId(editing.projectId)
-        setAvatarSeed(editing.avatarSeed || crypto.randomUUID().slice(0, 8))
+        setAvatarSeed(editing.avatarSeed || Math.random().toString(36).slice(2, 10))
         setAvatarUrl(editing.avatarUrl || null)
         setThinkingLevel(editing.thinkingLevel || '')
         setMemoryScopeMode(editing.memoryScopeMode || 'auto')
@@ -515,7 +527,7 @@ export function AgentSheet() {
         }))
         setOpenclawEnabled(src.provider === 'openclaw')
         setProjectId(src.projectId)
-        setAvatarSeed(crypto.randomUUID().slice(0, 8))
+        setAvatarSeed(Math.random().toString(36).slice(2, 10))
         setAvatarUrl(null)
         setThinkingLevel(src.thinkingLevel || '')
         setMemoryScopeMode(src.memoryScopeMode || 'auto')
@@ -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(() => {
@@ -713,7 +725,7 @@ export function AgentSheet() {
 
   const addRoutingTargetFromCurrent = () => {
     const nextTarget: AgentRoutingTarget = {
-      id: crypto.randomUUID(),
+      id: Math.random().toString(16).slice(2, 10),
       label: routingTargets.length === 0 ? 'Primary route' : `Route ${routingTargets.length + 1}`,
       role: routingTargets.length === 0 ? 'primary' : 'backup',
       provider,
@@ -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,
@@ -1148,7 +1165,7 @@ export function AgentSheet() {
                   type="button"
                   onClick={() => {
                     setAvatarUrl(null)
-                    if (!avatarSeed) setAvatarSeed(crypto.randomUUID().slice(0, 8))
+                    if (!avatarSeed) setAvatarSeed(Math.random().toString(36).slice(2, 10))
                   }}
                   className="text-[11px] text-text-3 hover:text-red-400 transition-colors self-start cursor-pointer"
                 >
@@ -1169,7 +1186,7 @@ export function AgentSheet() {
             />
             <button
               type="button"
-              onClick={() => { setAvatarSeed(crypto.randomUUID().slice(0, 8)); setAvatarUrl(null) }}
+              onClick={() => { setAvatarSeed(Math.random().toString(36).slice(2, 10)); setAvatarUrl(null) }}
               className="inline-flex items-center gap-1.5 px-3 py-2 rounded-[10px] border border-white/[0.08] bg-transparent text-text-3 text-[12px] font-600 cursor-pointer transition-all hover:bg-white/[0.04] hover:text-text-2 active:scale-95 shrink-0"
               style={{ fontFamily: 'inherit' }}
               title="Shuffle avatar"
@@ -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,
@@ -118,13 +119,14 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     if (!editingProviderId && draftAgents.length === 0) {
       const cp = configured
       setDraftAgents([{
-        id: `auto:${crypto.randomUUID().slice(0, 8)}`,
+        id: `auto:${Math.random().toString(36).slice(2, 10)}`,
         templateId: 'auto',
         name: 'Assistant',
         description: 'A helpful assistant.',
         systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
         soul: '',
         providerConfigId: cp.id,
+        setupProvider: cp.setupProvider,
         provider: cp.provider,
         model: cp.defaultModel,
         credentialId: cp.credentialId,
@@ -138,7 +140,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
         autoDraftSkillSuggestions: true,
         orchestratorEnabled: false,
         orchestratorMission: '',
-        avatarSeed: crypto.randomUUID().slice(0, 8),
+        avatarSeed: Math.random().toString(36).slice(2, 10),
         avatarUrl: null,
         enabled: true,
       }])
@@ -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,
@@ -179,13 +182,14 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
   const addBlankAgent = () => {
     const defaultProvider = configuredProviders[0] || null
     const newAgent: StarterDraftAgent = {
-      id: `custom:${crypto.randomUUID().slice(0, 8)}`,
+      id: `custom:${Math.random().toString(36).slice(2, 10)}`,
       templateId: 'custom',
       name: `Agent ${draftAgents.length + 1}`,
       description: '',
       systemPrompt: '',
       soul: '',
       providerConfigId: defaultProvider?.id || null,
+      setupProvider: defaultProvider?.setupProvider || null,
       provider: defaultProvider?.provider || null,
       model: defaultProvider?.defaultModel || '',
       credentialId: defaultProvider?.credentialId || null,
@@ -199,7 +203,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       autoDraftSkillSuggestions: true,
       orchestratorEnabled: false,
       orchestratorMission: '',
-      avatarSeed: crypto.randomUUID().slice(0, 8),
+      avatarSeed: Math.random().toString(36).slice(2, 10),
       avatarUrl: null,
       enabled: true,
     }
@@ -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}` : ''}

package/src/components/auth/setup-wizard/step-agents.tsx

@@ -36,9 +36,10 @@ function ModelCombobox({
   const fetched = useRef<string | null>(null)
 
   const effectiveEndpoint = endpointOverride || provider?.endpoint || null
+  const supportsModelDiscovery = Boolean(provider && provider.setupProvider !== 'custom')
 
   const fetchModels = useCallback(async (force?: boolean) => {
-    if (!provider) return
+    if (!provider || !supportsModelDiscovery) return
     const cacheKey = `${provider.provider}|${effectiveEndpoint || ''}|${provider.credentialId || ''}`
     if (!force && fetched.current === cacheKey) return
     fetched.current = cacheKey
@@ -63,11 +64,21 @@ function ModelCombobox({
     } finally {
       setLoading(false)
     }
-  }, [provider, effectiveEndpoint])
+  }, [provider, effectiveEndpoint, supportsModelDiscovery])
 
   useEffect(() => {
+    if (!provider) {
+      setModels([])
+      setFetchError('')
+      return
+    }
+    if (!supportsModelDiscovery) {
+      setModels(provider.defaultModel ? [provider.defaultModel] : [])
+      setFetchError('')
+      return
+    }
     fetchModels()
-  }, [fetchModels])
+  }, [fetchModels, provider, supportsModelDiscovery])
 
   // Close dropdown on outside click
   useEffect(() => {
@@ -116,38 +127,40 @@ function ModelCombobox({
             </svg>
           </a>
         )}
-        <button
-          type="button"
-          onClick={() => {
-            if (models.length > 0 && !loading) {
-              setOpen(!open)
-              if (!open) setSearch(value)
-            } else {
-              fetchModels(true)
-            }
-          }}
-          disabled={loading}
-          className="text-text-3 hover:text-accent-bright transition-colors bg-transparent border-none cursor-pointer disabled:opacity-40"
-          title={models.length > 0 ? 'Show models' : 'Fetch available models'}
-        >
-          {loading ? (
-            <svg width="14" height="14" viewBox="0 0 14 14" fill="none" className="animate-spin">
-              <circle cx="7" cy="7" r="5.5" stroke="currentColor" strokeWidth="1.5" opacity="0.25" />
-              <path d="M12.5 7A5.5 5.5 0 0 0 7 1.5" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
-            </svg>
-          ) : models.length > 0 ? (
-            <svg width="12" height="12" viewBox="0 0 12 12" fill="none">
-              <path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-            </svg>
-          ) : (
-            <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-              <path d="M1.5 7A5.5 5.5 0 1 1 7 12.5" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round" />
-              <path d="M1.5 12.5V9.5H4.5" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round" strokeLinejoin="round" />
-            </svg>
-          )}
-        </button>
+        {supportsModelDiscovery && (
+          <button
+            type="button"
+            onClick={() => {
+              if (models.length > 0 && !loading) {
+                setOpen(!open)
+                if (!open) setSearch(value)
+              } else {
+                fetchModels(true)
+              }
+            }}
+            disabled={loading}
+            className="text-text-3 hover:text-accent-bright transition-colors bg-transparent border-none cursor-pointer disabled:opacity-40"
+            title={models.length > 0 ? 'Show models' : 'Fetch available models'}
+          >
+            {loading ? (
+              <svg width="14" height="14" viewBox="0 0 14 14" fill="none" className="animate-spin">
+                <circle cx="7" cy="7" r="5.5" stroke="currentColor" strokeWidth="1.5" opacity="0.25" />
+                <path d="M12.5 7A5.5 5.5 0 0 0 7 1.5" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+              </svg>
+            ) : models.length > 0 ? (
+              <svg width="12" height="12" viewBox="0 0 12 12" fill="none">
+                <path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
+              </svg>
+            ) : (
+              <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
+                <path d="M1.5 7A5.5 5.5 0 1 1 7 12.5" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round" />
+                <path d="M1.5 12.5V9.5H4.5" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round" strokeLinejoin="round" />
+              </svg>
+            )}
+          </button>
+        )}
       </div>
-      {fetchError && models.length === 0 && (
+      {fetchError && models.length === 0 && supportsModelDiscovery && (
         <div className="mt-1 text-[11px] text-amber-300/80">{fetchError}</div>
       )}
       {open && filtered.length > 0 && (
@@ -348,7 +361,7 @@ export function StepAgents({
                     />
                     <button
                       type="button"
-                      onClick={() => onUpdateDraft(draft.id, { avatarSeed: crypto.randomUUID().slice(0, 8), avatarUrl: null })}
+                      onClick={() => onUpdateDraft(draft.id, { avatarSeed: Math.random().toString(36).slice(2, 10), avatarUrl: null })}
                       className="inline-flex items-center gap-1.5 px-3 py-2 rounded-[10px] border border-white/[0.08] bg-transparent text-text-3 text-[12px] font-600 cursor-pointer transition-all hover:bg-white/[0.04] hover:text-text-2 active:scale-95 shrink-0"
                       title="Shuffle avatar"
                     >
@@ -423,7 +436,7 @@ export function StepAgents({
                         focus:border-accent-bright/30 focus:shadow-[0_0_30px_rgba(99,102,241,0.1)]"
                     />
                   </div>
-                  {matchedProvider?.provider === 'openclaw' ? (
+                  {matchedProvider?.setupProvider === 'openclaw' ? (
                     <div className="md:col-span-2">
                       <label className="block text-[12px] text-text-3 font-500 mb-1.5 ml-1">Model</label>
                       <div className="flex items-center gap-3 px-4 py-3 rounded-[12px] border border-white/[0.08] bg-bg">
@@ -448,7 +461,7 @@ export function StepAgents({
                         provider={matchedProvider}
                         endpointOverride={draft.apiEndpoint}
                         onChange={(model) => onUpdateDraft(draft.id, { model })}
-                        modelLibraryUrl={matchedProvider ? SETUP_PROVIDERS.find((sp) => sp.id === matchedProvider.provider)?.modelLibraryUrl : null}
+                        modelLibraryUrl={matchedProvider ? SETUP_PROVIDERS.find((sp) => sp.id === matchedProvider.setupProvider)?.modelLibraryUrl : null}
                       />
                     </div>
                   )}
@@ -457,7 +470,7 @@ export function StepAgents({
                       value={draft.soul}
                       onChange={(soul) => onUpdateDraft(draft.id, { soul })}
                     />
-                    {matchedProvider?.provider === 'openclaw' && (
+                    {matchedProvider?.setupProvider === 'openclaw' && (
                       <p className="mt-1.5 ml-1 text-[11px] text-text-3/70">
                         Synced to the gateway as SOUL.md on save.
                       </p>