@swarmclawai/swarmclaw 1.2.5 → 1.2.6

package/package.json

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

package/src/app/api/setup/check-provider/route.ts

@@ -327,8 +327,16 @@ export async function POST(req: Request) {
         return NextResponse.json(result)
       }
       default: {
-        const { loadProviderConfigs } = await import('@/lib/server/storage')
-        const configs = loadProviderConfigs() as Record<string, { name?: string; baseUrl?: string; isEnabled?: boolean }>
+        let configs: Record<string, { name?: string; baseUrl?: string; isEnabled?: boolean }>
+        try {
+          const storage = await import('@/lib/server/storage')
+          configs = storage.loadProviderConfigs() as Record<string, { name?: string; baseUrl?: string; isEnabled?: boolean }>
+        } catch {
+          return NextResponse.json(
+            { ok: false, message: `Failed to load provider configurations while checking ${provider}.` },
+            { status: 500 },
+          )
+        }
         const custom = configs[provider]
         if (custom?.baseUrl) {
           const result = await checkOpenAiCompatible(

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

@@ -76,3 +76,111 @@ test('builtin provider override records do not surface as custom providers', ()
 
   assert.equal(output.openAiCount, 1)
 })
+
+test('custom provider resolution includes defaultEndpoint and optionalApiKey', () => {
+  const output = runWithTempDataDir<{
+    defaultEndpoint: string | null
+    optionalApiKey: boolean | null
+    requiresApiKey: boolean | null
+  }>(`
+    const storageModule = await import('@/lib/server/storage')
+    const storage = storageModule.default || storageModule
+    storage.saveProviderConfigs({
+      'custom-llama-server': {
+        id: 'custom-llama-server',
+        name: 'llama-server',
+        type: 'custom',
+        baseUrl: 'http://127.0.0.1:8080/v1',
+        models: ['my-model'],
+        requiresApiKey: false,
+        credentialId: null,
+        isEnabled: true,
+        createdAt: 1,
+        updatedAt: 1,
+      },
+    })
+
+    const providersModule = await import('@/lib/providers/index')
+    const providers = providersModule.default || providersModule
+    const resolved = providers.getProvider('custom-llama-server')
+
+    console.log(JSON.stringify({
+      defaultEndpoint: resolved?.defaultEndpoint ?? null,
+      optionalApiKey: resolved?.optionalApiKey ?? null,
+      requiresApiKey: resolved?.requiresApiKey ?? null,
+    }))
+  `)
+
+  assert.equal(output.defaultEndpoint, 'http://127.0.0.1:8080/v1')
+  assert.equal(output.optionalApiKey, true)
+  assert.equal(output.requiresApiKey, false)
+})
+
+test('custom provider with uuid-style ID resolves correctly', () => {
+  const output = runWithTempDataDir<{
+    resolvedName: string | null
+    hasHandler: boolean
+  }>(`
+    const storageModule = await import('@/lib/server/storage')
+    const storage = storageModule.default || storageModule
+    storage.saveProviderConfigs({
+      'custom-d20b934e': {
+        id: 'custom-d20b934e',
+        name: 'My llama-server',
+        type: 'custom',
+        baseUrl: 'http://127.0.0.1:8080/v1',
+        models: ['llama-3.1-8b'],
+        requiresApiKey: false,
+        credentialId: null,
+        isEnabled: true,
+        createdAt: 1,
+        updatedAt: 1,
+      },
+    })
+
+    const providersModule = await import('@/lib/providers/index')
+    const providers = providersModule.default || providersModule
+    const resolved = providers.getProvider('custom-d20b934e')
+
+    console.log(JSON.stringify({
+      resolvedName: resolved?.name ?? null,
+      hasHandler: typeof resolved?.handler?.streamChat === 'function',
+    }))
+  `)
+
+  assert.equal(output.resolvedName, 'My llama-server')
+  assert.equal(output.hasHandler, true)
+})
+
+test('disabled custom providers are not resolved by getProvider', () => {
+  const output = runWithTempDataDir<{
+    resolved: boolean
+  }>(`
+    const storageModule = await import('@/lib/server/storage')
+    const storage = storageModule.default || storageModule
+    storage.saveProviderConfigs({
+      'custom-disabled': {
+        id: 'custom-disabled',
+        name: 'Disabled Provider',
+        type: 'custom',
+        baseUrl: 'http://127.0.0.1:8080/v1',
+        models: ['test'],
+        requiresApiKey: false,
+        credentialId: null,
+        isEnabled: false,
+        createdAt: 1,
+        updatedAt: 1,
+      },
+    })
+
+    const providersModule = await import('@/lib/providers/index')
+    const providers = providersModule.default || providersModule
+    const resolved = providers.getProvider('custom-disabled')
+
+    console.log(JSON.stringify({
+      resolved: resolved !== null,
+    }))
+  `)
+
+  assert.equal(output.resolved, false)
+})

package/src/lib/providers/index.ts

@@ -286,7 +286,8 @@ function getCustomProviders(): Record<string, CustomProviderConfig> {
     return Object.fromEntries(
       Object.entries(configs).filter(([, config]) => config?.type === 'custom'),
     )
-  } catch {
+  } catch (err) {
+    log.warn(TAG, 'Failed to load custom providers from storage', errorMessage(err))
     return {}
   }
 }
@@ -325,6 +326,7 @@ export function getProviderList(): ProviderInfo[] {
       defaultModels: c.models,
       supportsModelDiscovery: false,
       requiresApiKey: c.requiresApiKey,
+      optionalApiKey: !c.requiresApiKey,
       requiresEndpoint: false as boolean,
       defaultEndpoint: c.baseUrl,
     }))
@@ -348,26 +350,47 @@ export function getProviderList(): ProviderInfo[] {
   return [...builtins, ...customs, ...extensionProviders]
 }
 
+function buildCustomProviderConfig(custom: CustomProviderConfig): BuiltinProviderConfig {
+  return {
+    id: custom.id as ProviderId,
+    name: custom.name,
+    models: custom.models,
+    requiresApiKey: custom.requiresApiKey,
+    optionalApiKey: !custom.requiresApiKey,
+    requiresEndpoint: false,
+    defaultEndpoint: custom.baseUrl,
+    handler: {
+      streamChat: async (opts) => {
+        const patchedSession = { ...opts.session, apiEndpoint: custom.baseUrl }
+        const { streamOpenAiChat } = await import('./openai')
+        return streamOpenAiChat({ ...opts, session: patchedSession })
+      },
+    },
+  }
+}
+
 export function getProvider(id: string): BuiltinProviderConfig | null {
   if (PROVIDERS[id]) return PROVIDERS[id]
-  
+
   // Check custom providers
   const customs = getCustomProviders()
   const custom = customs[id]
   if (custom?.isEnabled) {
-    return {
-      id: custom.id as ProviderId,
-      name: custom.name,
-      models: custom.models,
-      requiresApiKey: custom.requiresApiKey,
-      requiresEndpoint: false,
-      handler: {
-        streamChat: async (opts) => {
-          const patchedSession = { ...opts.session, apiEndpoint: custom.baseUrl }
-          const { streamOpenAiChat } = await import('./openai')
-          return streamOpenAiChat({ ...opts, session: patchedSession })
-        },
-      },
+    return buildCustomProviderConfig(custom)
+  }
+
+  // Fallback: direct single-item DB lookup for custom-* providers
+  if (id.startsWith('custom-') && !custom) {
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const { loadStoredItem } = require('@/lib/server/storage') as typeof import('@/lib/server/storage')
+      const directConfig = loadStoredItem('provider_configs', id) as CustomProviderConfig | null
+      if (directConfig?.type === 'custom' && directConfig.isEnabled) {
+        log.info(TAG, `Resolved custom provider '${id}' via direct DB lookup (batch load missed it)`)
+        return buildCustomProviderConfig(directConfig)
+      }
+    } catch (err) {
+      log.warn(TAG, `Direct DB lookup failed for provider '${id}'`, errorMessage(err))
     }
   }