@swarmclawai/swarmclaw 1.9.19 → 1.9.21

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

@@ -10,7 +10,7 @@ import { sleep } from '@/lib/shared-utils'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { toast } from 'sonner'
 import { ModelCombobox } from '@/components/shared/model-combobox'
-import type { ProviderType, ClaudeSkill, AgentPackManifest, AgentRoutingStrategy, AgentRoutingTarget } from '@/types'
+import type { ProviderType, ProviderDiagnosticStep, ClaudeSkill, AgentPackManifest, AgentRoutingStrategy, AgentRoutingTarget } from '@/types'
 import { AVAILABLE_TOOLS, PLATFORM_TOOLS } from '@/lib/tool-definitions'
 import { MCP_INJECTION_PROVIDER_IDS, NATIVE_CAPABILITY_PROVIDER_IDS, NON_LANGGRAPH_PROVIDER_IDS, WORKER_ONLY_PROVIDER_IDS } from '@/lib/provider-sets'
 import { isOrchestratorProviderEligible } from '@/lib/orchestrator-config'
@@ -33,6 +33,7 @@ import { buildAgentSelectableProviders, resolveAgentSelectableProviderCredential
 import { AgentSocialSettings } from '@/features/swarmfeed/agent-social-settings'
 import { AgentMarketplaceSettings } from '@/features/swarmdock/agent-marketplace-settings'
 import type { ConfigVersion } from '@/types/config-version'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
 
 const HB_PRESETS = [1800, 3600, 7200, 21600, 43200] as const
 const FALLBACK_ELEVENLABS_VOICE_ID = 'JBFqnCBsd6RMkjVDRZzb'
@@ -50,6 +51,7 @@ const AUTO_SYNC_MODEL_PROVIDER_IDS = new Set<ProviderType>([
   'nebius',
   'deepinfra',
   'hermes',
+  'lmstudio',
   'ollama',
 ])
 const CONNECTION_TEST_TIMEOUT_MS = 40_000
@@ -283,6 +285,7 @@ export function AgentSheet() {
   const [testStatus, setTestStatus] = useState<'idle' | 'testing' | 'pass' | 'fail'>('idle')
   const [testMessage, setTestMessage] = useState('')
   const [testErrorCode, setTestErrorCode] = useState<string | null>(null)
+  const [testDiagnostics, setTestDiagnostics] = useState<ProviderDiagnosticStep[]>([])
   const [testDeviceId, setTestDeviceId] = useState<string | null>(null)
   const [openclawDeviceId, setOpenclawDeviceId] = useState<string | null>(null)
   const [configCopied, setConfigCopied] = useState(false)
@@ -425,6 +428,7 @@ export function AgentSheet() {
         .catch(() => {})
       setTestStatus('idle')
       setTestMessage('')
+      setTestDiagnostics([])
       setShowAdvancedSettings(false)
       if (editing) {
         setName(editing.name)
@@ -689,6 +693,7 @@ export function AgentSheet() {
   useEffect(() => {
     setTestStatus('idle')
     setTestMessage('')
+    setTestDiagnostics([])
   }, [provider, credentialId, apiEndpoint])
 
   // Fetch MCP tools when selected servers change
@@ -745,6 +750,24 @@ export function AgentSheet() {
     if (!model) setModel('default')
   }
 
+  const applyDirectProviderSelection = (nextProviderId: string) => {
+    const nextProvider = agentSelectableProviders.find((item) => item.id === nextProviderId)
+    const nextCredentials = resolveAgentSelectableProviderCredentials(nextProviderId, credentials, providerConfigs)
+    setProvider(nextProviderId)
+    setModel(nextProvider?.models[0] || '')
+    setCredentialId(nextCredentials[0]?.id || null)
+    setFallbackCredentialIds([])
+    setGatewayProfileId(null)
+    setApiEndpoint(nextProvider?.requiresEndpoint ? nextProvider.defaultEndpoint || null : null)
+    setTestStatus('idle')
+    setTestMessage('')
+    setTestErrorCode(null)
+    setTestDiagnostics([])
+    setAddingKey(false)
+    setNewKeyName('')
+    setNewKeyValue('')
+  }
+
   const updateRoutingTarget = (targetId: string, patch: Partial<AgentRoutingTarget>) => {
     setRoutingTargets((current) => current.map((target) => (
       target.id === targetId
@@ -778,7 +801,8 @@ export function AgentSheet() {
 
   const handleSave = async () => {
     // For any endpoint, just ensure bare host:port gets a protocol prepended
-    let normalizedEndpoint = apiEndpoint
+    const providerAllowsAgentEndpoint = Boolean(openclawEnabled || currentProvider?.requiresEndpoint || currentProvider?.optionalEndpoint)
+    let normalizedEndpoint = providerAllowsAgentEndpoint ? apiEndpoint : null
     if (normalizedEndpoint) {
       const url = normalizedEndpoint.trim().replace(/\/+$/, '')
       normalizedEndpoint = /^(https?|wss?):\/\//i.test(url) ? url : `http://${url}`
@@ -1028,8 +1052,9 @@ export function AgentSheet() {
     setTestStatus('testing')
     setTestMessage('')
     setTestErrorCode(null)
+    setTestDiagnostics([])
     try {
-      const result = await api<{ ok: boolean; message: string; errorCode?: string; deviceId?: string }>('POST', '/setup/check-provider', {
+      const result = await api<{ ok: boolean; message: string; errorCode?: string; deviceId?: string; diagnostics?: ProviderDiagnosticStep[] }>('POST', '/setup/check-provider', {
         provider,
         credentialId,
         endpoint: apiEndpoint,
@@ -1038,6 +1063,7 @@ export function AgentSheet() {
       }, {
         timeoutMs: CONNECTION_TEST_TIMEOUT_MS,
       })
+      setTestDiagnostics(result.diagnostics ?? [])
       if (result.deviceId) setTestDeviceId(result.deviceId)
       if (result.ok) {
         let syncedModels: string[] = []
@@ -1065,6 +1091,7 @@ export function AgentSheet() {
       const msg = err instanceof Error ? err.message : 'Connection test failed'
       setTestStatus('fail')
       setTestMessage(msg)
+      setTestDiagnostics([])
       toast.error(msg)
       return false
     }
@@ -1298,6 +1325,10 @@ export function AgentSheet() {
             <button
               type="button"
               onClick={() => {
+                setTestStatus('idle')
+                setTestMessage('')
+                setTestErrorCode(null)
+                setTestDiagnostics([])
                 if (!openclawEnabled) {
                   setOpenclawEnabled(true)
                   setProvider('openclaw')
@@ -1311,9 +1342,6 @@ export function AgentSheet() {
                   setApiEndpoint(null)
                   setCredentialId(null)
                   setGatewayProfileId(null)
-                  setTestStatus('idle')
-                  setTestMessage('')
-                  setTestErrorCode(null)
                 }
               }}
               className={`relative h-6 w-11 rounded-full border-none transition-colors duration-200 ${openclawEnabled ? 'bg-accent-bright' : 'bg-white/[0.12]'}`}
@@ -1454,6 +1482,7 @@ export function AgentSheet() {
                 <p className="text-[14px] text-emerald-400 font-600">Connected</p>
               </div>
               <p className="text-[13px] text-text-2/80 leading-[1.6]">Gateway is reachable and this device is paired. Tools and models are managed by the OpenClaw instance.</p>
+              <ProviderDiagnosticsList diagnostics={testDiagnostics} />
             </div>
           )}
           {testStatus === 'fail' && (
@@ -1529,6 +1558,7 @@ export function AgentSheet() {
                   </p>
                 </div>
               )}
+              <ProviderDiagnosticsList diagnostics={testDiagnostics} />
             </div>
           )}
         </div>
@@ -1543,13 +1573,7 @@ export function AgentSheet() {
             return (
               <button
                 key={p.id}
-                onClick={() => {
-                  setProvider(p.id)
-                  if (!nextCredentials.some((item) => item.id === credentialId)) {
-                    setCredentialId(nextCredentials[0]?.id || null)
-                  }
-                  setGatewayProfileId(null)
-                }}
+                onClick={() => applyDirectProviderSelection(p.id)}
                 className={`relative py-3.5 px-4 rounded-[14px] text-center cursor-pointer transition-all duration-200
                   active:scale-[0.97] text-[14px] font-600 border
                   ${provider === p.id
@@ -1731,7 +1755,7 @@ export function AgentSheet() {
 
       {(currentProvider?.requiresEndpoint || currentProvider?.optionalEndpoint) && (provider !== 'ollama' || ollamaMode === 'local') && (
         <div className="mb-8">
-          <SectionLabel>{provider === 'openclaw' ? 'OpenClaw Endpoint' : provider === 'hermes' ? 'Hermes API Endpoint' : 'Endpoint'}</SectionLabel>
+          <SectionLabel>{provider === 'openclaw' ? 'OpenClaw Endpoint' : provider === 'hermes' ? 'Hermes API Endpoint' : provider === 'lmstudio' ? 'LM Studio Endpoint' : 'Endpoint'}</SectionLabel>
           <input type="text" value={apiEndpoint || ''} onChange={(e) => setApiEndpoint(e.target.value || null)} placeholder={currentProvider.defaultEndpoint || 'http://localhost:11434'} className={`${inputClass} font-mono text-[14px]`} />
           {provider === 'openclaw' && (
             <p className="text-[13px] text-text-3/70 mt-2">The URL of your OpenClaw gateway</p>
@@ -1739,6 +1763,9 @@ export function AgentSheet() {
           {provider === 'hermes' && (
             <p className="text-[13px] text-text-3/70 mt-2">Point this at the Hermes API server, usually <code className="text-text-2">http://127.0.0.1:8642/v1</code>.</p>
           )}
+          {provider === 'lmstudio' && (
+            <p className="text-[13px] text-text-3/70 mt-2">Point this at the LM Studio local server. A bare host is normalized to <code className="text-text-2">/v1</code>.</p>
+          )}
         </div>
       )}
 
@@ -2949,11 +2976,13 @@ export function AgentSheet() {
       {!openclawEnabled && testStatus === 'fail' && (
         <div className="mb-4 p-3 rounded-[12px] bg-red-500/[0.08] border border-red-500/20">
           <p className="text-[13px] text-red-400">{testMessage || 'Connection test failed'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
       {!openclawEnabled && testStatus === 'pass' && (
         <div className="mb-4 p-3 rounded-[12px] bg-emerald-500/[0.08] border border-emerald-500/20">
           <p className="text-[13px] text-emerald-400">{testMessage || 'Connected successfully'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
 

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

@@ -28,6 +28,7 @@ const SETUP_PROVIDERS_WITH_MODEL_DISCOVERY = new Set([
   'ollama',
   'openclaw',
   'hermes',
+  'lmstudio',
 ])
 
 /* ── Model combobox: search discovered models or type a custom one ── */

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

@@ -5,7 +5,8 @@ import { api } from '@/lib/app/api-client'
 import { dedup, errorMessage } from '@/lib/shared-utils'
 import { getDefaultModelForProvider } from '@/lib/setup-defaults'
 import { OpenClawDeployPanel } from '@/components/openclaw/openclaw-deploy-panel'
-import type { Credential, Credentials, GatewayProfile, ProviderId, ProviderConfig } from '@/types'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
+import type { Credential, Credentials, GatewayProfile, ProviderDiagnosticStep, ProviderId, ProviderConfig } from '@/types'
 import type { StepConnectProps, CheckState, ProviderCheckResponse, ConfiguredProvider } from './types'
 import {
   formatEndpointHost,
@@ -34,6 +35,7 @@ export function StepConnect({
   const [checkState, setCheckState] = useState<CheckState>(editingProvider?.verified ? 'ok' : 'idle')
   const [checkMessage, setCheckMessage] = useState('')
   const [checkErrorCode, setCheckErrorCode] = useState<string | null>(null)
+  const [checkDiagnostics, setCheckDiagnostics] = useState<ProviderDiagnosticStep[]>([])
   const [openclawDeviceId, setOpenclawDeviceId] = useState<string | null>(null)
   const [providerSuggestedModel, setProviderSuggestedModel] = useState(
     editingProvider?.defaultModel || (provider === 'custom' ? '' : getDefaultModelForProvider(provider)),
@@ -111,6 +113,7 @@ export function StepConnect({
     setCheckState('idle')
     setCheckMessage('')
     setCheckErrorCode(null)
+    setCheckDiagnostics([])
     setError('')
   }
 
@@ -118,12 +121,14 @@ export function StepConnect({
     if (requiresKey && !hasKeyOrCredential) {
       setCheckState('error')
       setCheckMessage('Please paste your API key or select a saved key first.')
+      setCheckDiagnostics([])
       return false
     }
 
     setCheckState('checking')
     setCheckMessage('')
     setCheckErrorCode(null)
+    setCheckDiagnostics([])
     setError('')
     try {
       const result = await api<ProviderCheckResponse>('POST', '/setup/check-provider', {
@@ -140,6 +145,7 @@ export function StepConnect({
         setProviderSuggestedModel(result.recommendedModel)
       }
       setCheckErrorCode(result.errorCode || null)
+      setCheckDiagnostics(result.diagnostics ?? [])
       setOpenclawDeviceId(result.deviceId || null)
       setCheckState(result.ok ? 'ok' : 'error')
       setCheckMessage(result.message || (result.ok ? 'Connected successfully.' : 'Connection failed.'))
@@ -148,6 +154,7 @@ export function StepConnect({
       setCheckState('error')
       setCheckMessage(errorMessage(err))
       setCheckErrorCode(null)
+      setCheckDiagnostics([])
       return false
     }
   }
@@ -280,7 +287,7 @@ export function StepConnect({
             <input
               type="text"
               value={endpoint}
-              onChange={(e) => { setEndpoint(e.target.value); setCheckState('idle'); setCheckMessage('') }}
+              onChange={(e) => { setEndpoint(e.target.value); setCheckState('idle'); setCheckMessage(''); setCheckDiagnostics([]) }}
               placeholder={selectedProvider.defaultEndpoint || ''}
               className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
                 text-text text-[14px] font-mono outline-none transition-all duration-200
@@ -295,6 +302,7 @@ export function StepConnect({
                     setEndpoint(isCloud ? (selectedProvider.defaultEndpoint || '') : selectedProvider.cloudEndpoint!)
                     setCheckState('idle')
                     setCheckMessage('')
+                    setCheckDiagnostics([])
                   }}
                   className="inline-flex items-center gap-1.5 px-3 py-1.5 rounded-[10px] border text-[12px] font-500 cursor-pointer transition-all duration-200 bg-transparent
                     border-white/[0.08] text-text-2 hover:bg-white/[0.04]"
@@ -335,6 +343,12 @@ export function StepConnect({
                 <p className="text-[12px] text-text-3">Use any reachable local or remote API-server endpoint exposed by Hermes.</p>
               </div>
             )}
+            {provider === 'lmstudio' && (
+              <div className="mt-2 space-y-0.5">
+                <p className="text-[12px] text-text-3">LM Studio&apos;s local server defaults to <code className="text-text-2">http://127.0.0.1:1234/v1</code>.</p>
+                <p className="text-[12px] text-text-3">If you paste a host without <code className="text-text-2">/v1</code>, SwarmClaw normalizes it before testing and chat.</p>
+              </div>
+            )}
           </div>
         )}
 
@@ -434,6 +448,7 @@ export function StepConnect({
                       setApiKey('')
                       setCheckState('idle')
                       setCheckMessage('')
+                      setCheckDiagnostics([])
                     }
                   }}
                   className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
@@ -460,7 +475,7 @@ export function StepConnect({
                 <input
                   type="password"
                   value={apiKey}
-                  onChange={(e) => { setApiKey(e.target.value); setCredentialId(null); setCheckState('idle'); setCheckMessage(''); setError('') }}
+                  onChange={(e) => { setApiKey(e.target.value); setCredentialId(null); setCheckState('idle'); setCheckMessage(''); setCheckDiagnostics([]); setError('') }}
                   placeholder={selectedProvider.keyPlaceholder || (provider === 'openclaw' ? 'Paste OpenClaw bearer token' : 'sk-...')}
                   className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
                     text-text text-[14px] font-mono outline-none transition-all duration-200
@@ -524,6 +539,7 @@ export function StepConnect({
               Device paired as <code className="text-text-2">{openclawDeviceId.slice(0, 12)}...</code>.
             </p>
           )}
+          <ProviderDiagnosticsList diagnostics={checkDiagnostics} />
         </div>
       )}
 

package/src/components/auth/setup-wizard/types.ts

@@ -1,17 +1,10 @@
-import type { GatewayProfile, ProviderId } from '@/types'
+import type { GatewayProfile, ProviderCheckResult, ProviderId } from '@/types'
 import type { SetupProvider } from '@/lib/setup-defaults'
 
 export type SetupStep = 'profile' | 'path' | 'providers' | 'connect' | 'agents' | 'next' | 'done'
 export type CheckState = 'idle' | 'checking' | 'ok' | 'error'
 
-export interface ProviderCheckResponse {
-  ok: boolean
-  message: string
-  normalizedEndpoint?: string
-  recommendedModel?: string
-  errorCode?: string
-  deviceId?: string
-}
+export type ProviderCheckResponse = ProviderCheckResult
 
 export interface SetupDoctorCheck {
   id: string

package/src/components/providers/provider-diagnostics-list.tsx

@@ -0,0 +1,58 @@
+'use client'
+
+import type { ProviderDiagnosticStep } from '@/types'
+
+const STATUS_CLASSES: Record<ProviderDiagnosticStep['status'], string> = {
+  pass: 'border-emerald-500/25 bg-emerald-500/10 text-emerald-300',
+  warn: 'border-amber-500/25 bg-amber-500/10 text-amber-300',
+  fail: 'border-red-500/25 bg-red-500/10 text-red-300',
+}
+
+const STATUS_LABELS: Record<ProviderDiagnosticStep['status'], string> = {
+  pass: 'Pass',
+  warn: 'Warn',
+  fail: 'Fail',
+}
+
+export function ProviderDiagnosticsList({
+  diagnostics,
+  className = '',
+}: {
+  diagnostics?: ProviderDiagnosticStep[] | null
+  className?: string
+}) {
+  if (!diagnostics?.length) return null
+
+  return (
+    <div className={`mt-3 border-t border-white/[0.06] pt-3 ${className}`}>
+      <div className="mb-2 text-[11px] font-700 uppercase tracking-[0.1em] text-text-3/70">
+        Diagnostics
+      </div>
+      <ol className="space-y-2">
+        {diagnostics.map((step) => (
+          <li key={step.id} className="grid gap-1 text-left sm:grid-cols-[64px_minmax(0,1fr)] sm:gap-3">
+            <div>
+              <span className={`inline-flex min-w-[54px] items-center justify-center rounded-[999px] border px-2 py-0.5 text-[10px] font-700 uppercase tracking-[0.08em] ${STATUS_CLASSES[step.status]}`}>
+                {STATUS_LABELS[step.status]}
+              </span>
+            </div>
+            <div className="min-w-0">
+              <div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">
+                <span className="text-[12px] font-650 text-text-2">{step.label}</span>
+                {typeof step.durationMs === 'number' && (
+                  <span className="text-[11px] text-text-3">{step.durationMs} ms</span>
+                )}
+              </div>
+              {step.target && (
+                <div className="mt-0.5 break-all font-mono text-[11px] text-text-3">{step.target}</div>
+              )}
+              {step.detail && (
+                <div className="mt-0.5 text-[11px] leading-relaxed text-text-3">{step.detail}</div>
+              )}
+            </div>
+          </li>
+        ))}
+      </ol>
+    </div>
+  )
+}

package/src/components/providers/provider-sheet.tsx

@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
 import { toast } from 'sonner'
 import { errorMessage } from '@/lib/shared-utils'
 import {
@@ -17,6 +18,7 @@ import {
   useSaveCustomProviderMutation,
 } from '@/features/providers/queries'
 import { useCreateCredentialMutation, useCredentialsQuery } from '@/features/credentials/queries'
+import type { ProviderDiagnosticStep } from '@/types'
 
 export function ProviderSheet() {
   const open = useAppStore((s) => s.providerSheetOpen)
@@ -54,6 +56,7 @@ export function ProviderSheet() {
   const [testStatus, setTestStatus] = useState<'idle' | 'testing' | 'pass' | 'fail'>('idle')
   const [testMessage, setTestMessage] = useState('')
   const [testModel, setTestModel] = useState('')
+  const [testDiagnostics, setTestDiagnostics] = useState<ProviderDiagnosticStep[]>([])
 
   const [liveModels, setLiveModels] = useState<string[]>([])
   const [liveLoading, setLiveLoading] = useState(false)
@@ -77,6 +80,7 @@ export function ProviderSheet() {
       setLiveCached(false)
       setTestStatus('idle')
       setTestMessage('')
+      setTestDiagnostics([])
       if (editingCustom) {
         setName(editingCustom.name)
         setBaseUrl(editingCustom.baseUrl || '')
@@ -108,6 +112,7 @@ export function ProviderSheet() {
   useEffect(() => {
     setTestStatus('idle')
     setTestMessage('')
+    setTestDiagnostics([])
   }, [credentialId, baseUrl])
 
   useEffect(() => {
@@ -121,6 +126,7 @@ export function ProviderSheet() {
     if (!isBuiltin) return
     setTestStatus('testing')
     setTestMessage('')
+    setTestDiagnostics([])
     try {
       const result = await checkProviderConnectionMutation.mutateAsync({
         provider: editingId || 'custom',
@@ -128,6 +134,7 @@ export function ProviderSheet() {
         endpoint: baseUrl,
         model: testModel || undefined,
       })
+      setTestDiagnostics(result.diagnostics ?? [])
       if (result.ok) {
         setTestStatus('pass')
         setTestMessage(result.message)
@@ -141,6 +148,7 @@ export function ProviderSheet() {
       const msg = err instanceof Error ? err.message : 'Connection test failed'
       setTestStatus('fail')
       setTestMessage(msg)
+      setTestDiagnostics([])
       toast.error(msg)
     }
   }
@@ -271,7 +279,10 @@ export function ProviderSheet() {
   const modelList = models.split(',').map((m) => m.trim()).filter(Boolean)
   const showApiKey = isBuiltin ? editingBuiltin?.requiresApiKey || editingBuiltin?.optionalApiKey : requiresApiKey
   const canDiscoverModels = Boolean(isBuiltin && editingBuiltin?.supportsModelDiscovery)
-  const showTestButton = Boolean(isBuiltin && showApiKey && credentialId)
+  const showTestButton = Boolean(
+    isBuiltin
+    && (editingBuiltin?.requiresApiKey ? credentialId : (showApiKey || editingBuiltin?.requiresEndpoint || editingBuiltin?.optionalEndpoint)),
+  )
 
   const inputClass = "w-full px-4 py-3.5 rounded-[14px] border border-white/[0.08] bg-surface text-text text-[15px] outline-none transition-all duration-200 placeholder:text-text-3/50 focus-glow"
 
@@ -527,7 +538,7 @@ export function ProviderSheet() {
           </label>
           <select
             value={testModel}
-            onChange={(e) => { setTestModel(e.target.value); setTestStatus('idle'); setTestMessage('') }}
+            onChange={(e) => { setTestModel(e.target.value); setTestStatus('idle'); setTestMessage(''); setTestDiagnostics([]) }}
             className={`${inputClass} appearance-none cursor-pointer`}
             style={{ fontFamily: 'inherit' }}
           >
@@ -543,11 +554,13 @@ export function ProviderSheet() {
       {isBuiltin && testStatus === 'fail' && (
         <div className="mb-4 p-3 rounded-[12px] bg-red-500/[0.08] border border-red-500/20">
           <p className="text-[13px] text-red-400">{testMessage || 'Connection test failed'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
       {isBuiltin && testStatus === 'pass' && (
         <div className="mb-4 p-3 rounded-[12px] bg-emerald-500/[0.08] border border-emerald-500/20">
           <p className="text-[13px] text-emerald-400">{testMessage || 'Connected successfully'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
 

package/src/features/providers/queries.ts

@@ -13,6 +13,7 @@ import {
 import { fetchProviders } from '@/lib/chat/chats'
 import type {
   ProviderConfig,
+  ProviderCheckResult,
   ProviderInfo,
   ProviderModelDiscoveryResult,
 } from '@/types'
@@ -86,7 +87,7 @@ export function useSaveBuiltinProviderMutation() {
       await api('PUT', `/providers/${id}/models`, { models })
       return api('PUT', `/providers/${id}`, {
         isEnabled,
-        ...(baseUrl ? { baseUrl } : {}),
+        ...(typeof baseUrl === 'string' ? { baseUrl } : {}),
       })
     },
     onSuccess: async () => {
@@ -129,7 +130,7 @@ export function useResetProviderModelsMutation() {
 export function useCheckProviderConnectionMutation() {
   return useMutation({
     mutationFn: ({ provider, credentialId, endpoint, model }: CheckProviderConnectionInput) =>
-      api<{ ok: boolean; message: string }>('POST', '/setup/check-provider', {
+      api<ProviderCheckResult>('POST', '/setup/check-provider', {
         provider,
         credentialId,
         endpoint,

package/src/lib/providers/index.test.ts

@@ -77,6 +77,34 @@ test('builtin provider override records do not surface as custom providers', ()
   assert.equal(output.openAiCount, 1)
 })
 
+test('LM Studio is available as a first-class local OpenAI-compatible provider', () => {
+  const output = runWithTempDataDir<{
+    providerName: string | null
+    defaultEndpoint: string | null
+    requiresApiKey: boolean | null
+    optionalApiKey: boolean | null
+    supportsModelDiscovery: boolean | null
+  }>(`
+    const providersModule = await import('@/lib/providers/index')
+    const providers = providersModule.default || providersModule
+    const provider = providers.getProviderList().find((entry) => entry.id === 'lmstudio')
+
+    console.log(JSON.stringify({
+      providerName: provider?.name ?? null,
+      defaultEndpoint: provider?.defaultEndpoint ?? null,
+      requiresApiKey: provider?.requiresApiKey ?? null,
+      optionalApiKey: provider?.optionalApiKey ?? null,
+      supportsModelDiscovery: provider?.supportsModelDiscovery ?? null,
+    }))
+  `)
+
+  assert.equal(output.providerName, 'LM Studio')
+  assert.equal(output.defaultEndpoint, 'http://127.0.0.1:1234/v1')
+  assert.equal(output.requiresApiKey, false)
+  assert.equal(output.optionalApiKey, true)
+  assert.equal(output.supportsModelDiscovery, true)
+})
+
 test('custom provider resolution includes defaultEndpoint and optionalApiKey', () => {
   const output = runWithTempDataDir<{
     defaultEndpoint: string | null

package/src/lib/providers/index.ts

@@ -14,6 +14,7 @@ import { streamOpenAiChat } from './openai'
 import { streamOllamaChat } from './ollama'
 import { streamAnthropicChat } from './anthropic'
 import { streamOpenClawChat } from './openclaw'
+import { normalizeLmStudioEndpoint, normalizeOpenAiCompatibleV1Endpoint } from './openai-compatible-endpoint'
 import { errorMessage, sleep, jitteredBackoff } from '@/lib/shared-utils'
 import { classifyProviderError } from './error-classification'
 import { log } from '@/lib/server/logger'
@@ -173,6 +174,24 @@ export const PROVIDERS: Record<string, BuiltinProviderConfig> = {
       },
     },
   },
+  lmstudio: {
+    id: 'lmstudio',
+    name: 'LM Studio',
+    models: ['local-model', 'google/gemma-4-e4b'],
+    requiresApiKey: false,
+    optionalApiKey: true,
+    requiresEndpoint: true,
+    defaultEndpoint: 'http://127.0.0.1:1234/v1',
+    handler: {
+      streamChat: (opts) => {
+        const patchedSession = {
+          ...opts.session,
+          apiEndpoint: normalizeLmStudioEndpoint(opts.session.apiEndpoint),
+        }
+        return streamOpenAiChat({ ...opts, session: patchedSession })
+      },
+    },
+  },
   'opencode-cli': {
     id: 'opencode-cli',
     name: 'OpenCode CLI',
@@ -560,22 +579,29 @@ export function getProvider(id: string): BuiltinProviderConfig | null {
   if (builtin) {
     const pConfigs = loadProviderConfigs()
     const pConfig = pConfigs[id]
-    if (pConfig?.baseUrl && pConfig.baseUrl !== builtin.defaultEndpoint) {
-      const originalHandler = builtin.handler
-      return {
-        ...builtin,
-        handler: {
-          streamChat: (opts) => {
-            const patchedSession = {
-              ...opts.session,
-              apiEndpoint: opts.session.apiEndpoint || pConfig.baseUrl,
-            }
-            return originalHandler.streamChat({ ...opts, session: patchedSession })
-          },
+    const originalHandler = builtin.handler
+    return {
+      ...builtin,
+      handler: {
+        streamChat: (opts) => {
+          const configuredEndpoint = typeof pConfig?.baseUrl === 'string' && pConfig.baseUrl.trim()
+            ? normalizeProviderRuntimeEndpoint(id, pConfig.baseUrl)
+            : null
+          const sessionEndpoint = typeof opts.session.apiEndpoint === 'string' && opts.session.apiEndpoint.trim()
+            ? normalizeProviderRuntimeEndpoint(id, opts.session.apiEndpoint)
+            : null
+          const honorsAgentEndpoint = Boolean(builtin.requiresEndpoint || builtin.optionalEndpoint)
+          const apiEndpoint = honorsAgentEndpoint
+            ? sessionEndpoint || configuredEndpoint
+            : configuredEndpoint
+          const patchedSession = {
+            ...opts.session,
+            apiEndpoint: apiEndpoint || undefined,
+          }
+          return originalHandler.streamChat({ ...opts, session: patchedSession })
         },
-      }
+      },
     }
-    return builtin
   }
 
   // Check custom providers
@@ -619,6 +645,12 @@ export function getProvider(id: string): BuiltinProviderConfig | null {
   return null
 }
 
+function normalizeProviderRuntimeEndpoint(providerId: string, endpoint: string): string {
+  if (providerId === 'lmstudio') return normalizeLmStudioEndpoint(endpoint)
+  if (providerId === 'openai') return normalizeOpenAiCompatibleV1Endpoint(endpoint, 'https://api.openai.com/v1')
+  return endpoint.replace(/\/+$/, '')
+}
+
 /**
  * Stream chat with automatic failover to fallback credentials on retryable errors.
  * Falls back through fallbackCredentialIds on 401/429/500/502/503 errors.