@swarmclawai/swarmclaw 1.7.1 → 1.7.2

package/src/lib/server/cli-provider-readiness.ts

@@ -0,0 +1,84 @@
+import {
+  CLI_PROVIDER_METADATA_BY_ID,
+  isCliProviderId,
+  type CliAuthBackend,
+  type CliProviderMetadata,
+} from '@/lib/providers/cli-provider-metadata'
+import { buildCliEnv, probeCliAuth, resolveCliBinary, type AuthProbeResult } from '@/lib/providers/cli-utils'
+
+export interface CliProviderReadyResult {
+  ok: boolean
+  message: string
+  providerId?: string
+  displayName?: string
+  binaryName?: string
+  binaryPath?: string
+  generic?: boolean
+}
+
+interface CheckCliProviderReadyOptions {
+  cwd?: string
+  env?: NodeJS.ProcessEnv
+  resolveBinary?: (name: string) => string | null
+  probeAuth?: (
+    binary: string,
+    backend: CliAuthBackend,
+    env: NodeJS.ProcessEnv,
+    cwd?: string,
+  ) => AuthProbeResult
+}
+
+function missingBinaryMessage(meta: CliProviderMetadata): string {
+  return `${meta.displayName} is not installed. Install \`${meta.binaryName}\` and ensure it is on your PATH.`
+}
+
+export function checkCliProviderReady(
+  providerId: string,
+  options: CheckCliProviderReadyOptions = {},
+): CliProviderReadyResult {
+  if (!isCliProviderId(providerId)) {
+    return { ok: false, message: 'Unknown CLI provider.', providerId }
+  }
+
+  const meta = CLI_PROVIDER_METADATA_BY_ID[providerId]
+  const resolveBinary = options.resolveBinary || resolveCliBinary
+  const binaryPath = resolveBinary(meta.binaryName)
+  if (!binaryPath) {
+    return {
+      ok: false,
+      message: missingBinaryMessage(meta),
+      providerId,
+      displayName: meta.displayName,
+      binaryName: meta.binaryName,
+      generic: meta.generic,
+    }
+  }
+
+  if (meta.authBackend) {
+    const env = options.env || buildCliEnv()
+    const auth = (options.probeAuth || probeCliAuth)(binaryPath, meta.authBackend, env, options.cwd || process.cwd())
+    if (!auth.authenticated) {
+      return {
+        ok: false,
+        message: auth.errorMessage || `${meta.displayName} is not configured.`,
+        providerId,
+        displayName: meta.displayName,
+        binaryName: meta.binaryName,
+        binaryPath,
+        generic: meta.generic,
+      }
+    }
+  }
+
+  return {
+    ok: true,
+    message: meta.authBackend
+      ? `${meta.displayName} is installed and ready.`
+      : `${meta.displayName} binary is available. If it requires account setup, complete that in \`${meta.binaryName}\` before running agent turns.`,
+    providerId,
+    displayName: meta.displayName,
+    binaryName: meta.binaryName,
+    binaryPath,
+    generic: meta.generic,
+  }
+}

package/src/lib/server/provider-health.test.ts

@@ -179,4 +179,10 @@ describe('provider-health', () => {
       globalThis.fetch = originalFetch
     }
   })
+
+  it('skips extended CLI providers instead of treating them as HTTP providers', async () => {
+    const result = await providerHealth.pingProvider('aider-cli', undefined, undefined)
+    assert.equal(result.ok, true)
+    assert.equal(result.message, 'CLI provider - skipped.')
+  })
 })

package/src/lib/server/provider-health.ts

@@ -2,6 +2,7 @@ import { spawnSync } from 'child_process'
 import { errorMessage, hmrSingleton, jitteredBackoff } from '@/lib/shared-utils'
 import { upsertStoredItem, loadCollection } from './storage'
 import { log } from './logger'
+import { isCliProviderId } from '@/lib/providers/cli-provider-metadata'
 
 const TAG = 'provider-health'
 
@@ -352,9 +353,8 @@ export async function pingProvider(
   apiKey: string | undefined,
   endpoint: string | undefined,
 ): Promise<{ ok: boolean; message: string }> {
-  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose']
   const OPTIONAL_OPENAI_COMPATIBLE_KEY_PROVIDERS = new Set(['hermes'])
-  if (CLI_PROVIDERS.includes(provider)) return { ok: true, message: 'CLI provider — skipped.' }
+  if (isCliProviderId(provider)) return { ok: true, message: 'CLI provider - skipped.' }
 
   try {
     if (provider === 'anthropic') {

package/src/lib/setup-defaults.test.ts

@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict'
 import { test } from 'node:test'
+import { CLI_PROVIDER_METADATA } from './providers/cli-provider-metadata'
 import { DEFAULT_AGENTS, getDefaultModelForProvider } from './setup-defaults'
 
 // ---------------------------------------------------------------------------
@@ -48,6 +49,13 @@ test('getDefaultModelForProvider returns expected defaults for cursor, qwen, and
   assert.equal(getDefaultModelForProvider('goose'), 'default')
 })
 
+test('every CLI provider has setup default agent coverage', () => {
+  for (const provider of CLI_PROVIDER_METADATA) {
+    assert.equal(getDefaultModelForProvider(provider.id), provider.defaultModel)
+    assert.ok(DEFAULT_AGENTS[provider.id].description.includes(provider.displayName))
+  }
+})
+
 test('getDefaultModelForProvider returns non-empty for ollama', () => {
   const model = getDefaultModelForProvider('ollama')
   assert.ok(model, 'ollama model should be truthy')

package/src/lib/setup-defaults.ts

@@ -3,33 +3,10 @@
  * Isomorphic — no 'use client', no server imports.
  */
 
-export type SetupProvider =
-  | 'claude-cli'
-  | 'codex-cli'
-  | 'opencode-cli'
-  | 'opencode-web'
-  | 'gemini-cli'
-  | 'copilot-cli'
-  | 'droid-cli'
-  | 'cursor-cli'
-  | 'qwen-code-cli'
-  | 'goose'
-  | 'anthropic'
-  | 'openai'
-  | 'openrouter'
-  | 'google'
-  | 'deepseek'
-  | 'groq'
-  | 'together'
-  | 'mistral'
-  | 'xai'
-  | 'fireworks'
-  | 'nebius'
-  | 'deepinfra'
-  | 'ollama'
-  | 'openclaw'
-  | 'hermes'
-  | 'custom'
+import { CLI_PROVIDER_METADATA, type CliProviderId, type CliProviderMetadata } from './providers/cli-provider-metadata.ts'
+import type { ProviderType } from '../types/provider.ts'
+
+export type SetupProvider = ProviderType | 'custom'
 
 export interface SetupProviderOption {
   id: SetupProvider
@@ -48,38 +25,27 @@ export interface SetupProviderOption {
   icon: string
   modelLibraryUrl?: string
   cloudEndpoint?: string
+  category?: 'cli' | 'api' | 'gateway' | 'local' | 'custom'
 }
 
+const CLI_SETUP_PROVIDERS: SetupProviderOption[] = (CLI_PROVIDER_METADATA as readonly CliProviderMetadata[]).map((provider) => ({
+  id: provider.id,
+  name: provider.displayName,
+  description: provider.description,
+  requiresKey: false,
+  supportsEndpoint: false,
+  optionalKey: provider.optionalApiKey,
+  keyUrl: provider.keyUrl,
+  keyLabel: provider.keyLabel,
+  keyPlaceholder: provider.keyPlaceholder,
+  badge: provider.setupBadge,
+  icon: provider.icon,
+  modelLibraryUrl: provider.modelLibraryUrl,
+  category: 'cli',
+}))
+
 export const SETUP_PROVIDERS: SetupProviderOption[] = [
-  {
-    id: 'claude-cli',
-    name: 'Claude Code CLI',
-    description: 'Anthropic’s coding agent with native tools, strong edits, and first-class CLI workflows.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'C',
-    modelLibraryUrl: 'https://docs.anthropic.com/en/docs/about-claude/models',
-  },
-  {
-    id: 'codex-cli',
-    name: 'OpenAI Codex CLI',
-    description: 'OpenAI’s terminal coding agent with resume support and structured headless output.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'O',
-    modelLibraryUrl: 'https://platform.openai.com/docs/models',
-  },
-  {
-    id: 'opencode-cli',
-    name: 'OpenCode CLI',
-    description: 'A flexible coding CLI that can route across multiple model backends.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'O',
-  },
+  ...CLI_SETUP_PROVIDERS,
   {
     id: 'opencode-web',
     name: 'OpenCode Web',
@@ -92,66 +58,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     keyPlaceholder: 'opencode:••••••• (or just the password)',
     badge: 'HTTP',
     icon: 'O',
-  },
-  {
-    id: 'gemini-cli',
-    name: 'Gemini CLI',
-    description: 'Google’s terminal coding agent with project-aware headless mode and resume support.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'G',
-    modelLibraryUrl: 'https://ai.google.dev/gemini-api/docs/models',
-  },
-  {
-    id: 'copilot-cli',
-    name: 'GitHub Copilot CLI',
-    description: 'GitHub’s multi-model terminal agent for coding and automation.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'P',
-  },
-  {
-    id: 'droid-cli',
-    name: 'Factory Droid CLI',
-    description: 'Factory.ai’s terminal coding agent with headless exec mode, session resume, and autonomy controls.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    optionalKey: true,
-    keyUrl: 'https://app.factory.ai/settings/api-keys',
-    keyLabel: 'app.factory.ai',
-    keyPlaceholder: 'FACTORY_API_KEY (optional if signed in via `droid`)',
-    badge: 'CLI',
-    icon: 'F',
-  },
-  {
-    id: 'cursor-cli',
-    name: 'Cursor Agent CLI',
-    description: 'Cursor’s terminal agent with resume support, JSON output, and Cursor-native coding workflows.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'U',
-  },
-  {
-    id: 'qwen-code-cli',
-    name: 'Qwen Code CLI',
-    description: 'Qwen’s terminal coding agent with structured headless mode and multi-provider model config.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    badge: 'CLI',
-    icon: 'Q',
-  },
-  {
-    id: 'goose',
-    name: 'Goose',
-    description: 'A runtime-managed terminal agent with extensions, session history, and ACP support.',
-    requiresKey: false,
-    supportsEndpoint: false,
-    optionalKey: true,
-    badge: 'Runtime',
-    icon: 'G',
+    category: 'cli',
   },
   {
     id: 'openai',
@@ -190,6 +97,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     optionalKey: true,
     badge: 'First-Tier',
     icon: 'C',
+    category: 'gateway',
   },
   {
     id: 'hermes',
@@ -202,6 +110,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     optionalKey: true,
     badge: 'API Server',
     icon: 'H',
+    category: 'gateway',
   },
   {
     id: 'anthropic',
@@ -327,6 +236,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     icon: 'L',
     modelLibraryUrl: 'https://ollama.com/library',
     cloudEndpoint: 'https://api.ollama.com',
+    category: 'local',
   },
   {
     id: 'custom',
@@ -337,6 +247,7 @@ export const SETUP_PROVIDERS: SetupProviderOption[] = [
     allowMultiple: true,
     optionalKey: true,
     icon: '+',
+    category: 'custom',
   },
 ]
 
@@ -815,28 +726,19 @@ export interface DefaultAgentConfig {
   tools: string[]
 }
 
-export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
-  'claude-cli': {
-    name: 'Claude CLI',
-    description: 'A helpful assistant powered by Claude Code CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'codex-cli': {
-    name: 'Codex CLI',
-    description: 'A helpful assistant powered by OpenAI Codex CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'gpt-5.3-codex',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'opencode-cli': {
-    name: 'OpenCode',
-    description: 'A helpful assistant powered by OpenCode CLI.',
+const CLI_DEFAULT_AGENTS = Object.fromEntries(CLI_PROVIDER_METADATA.map((provider) => [
+  provider.id,
+  {
+    name: provider.displayName.endsWith(' CLI') ? provider.displayName.slice(0, -4) : provider.displayName,
+    description: `A helpful assistant powered by ${provider.displayName}.`,
     systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
+    model: provider.defaultModel,
     tools: STARTER_AGENT_TOOLS,
   },
+])) as Record<CliProviderId, DefaultAgentConfig>
+
+export const DEFAULT_AGENTS = {
+  ...CLI_DEFAULT_AGENTS,
   'opencode-web': {
     name: 'OpenCode Web',
     description: 'A helpful assistant powered by a remote OpenCode HTTP server.',
@@ -844,48 +746,6 @@ export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
     model: 'anthropic/claude-sonnet-4-6',
     tools: STARTER_AGENT_TOOLS,
   },
-  'gemini-cli': {
-    name: 'Gemini CLI',
-    description: 'A helpful assistant powered by Gemini CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'gemini-3.1-pro',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'copilot-cli': {
-    name: 'Copilot CLI',
-    description: 'A helpful assistant powered by GitHub Copilot CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'claude-sonnet-4-6',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'droid-cli': {
-    name: 'Factory Droid',
-    description: 'A helpful assistant powered by Factory Droid CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'cursor-cli': {
-    name: 'Cursor CLI',
-    description: 'A helpful assistant powered by Cursor Agent CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'auto',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  'qwen-code-cli': {
-    name: 'Qwen Code',
-    description: 'A helpful assistant powered by Qwen Code CLI.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
-  goose: {
-    name: 'Goose',
-    description: 'A helpful assistant powered by Goose.',
-    systemPrompt: SWARMCLAW_ASSISTANT_PROMPT,
-    model: 'default',
-    tools: STARTER_AGENT_TOOLS,
-  },
   anthropic: {
     name: 'Claude',
     description: 'A helpful Claude-powered assistant.',
@@ -998,7 +858,7 @@ export const DEFAULT_AGENTS: Record<SetupProvider, DefaultAgentConfig> = {
     model: '',
     tools: STARTER_AGENT_TOOLS,
   },
-}
+} satisfies Record<SetupProvider, DefaultAgentConfig>
 
 export function getDefaultModelForProvider(provider: SetupProvider): string {
   return DEFAULT_AGENTS[provider].model

package/tsconfig.json

@@ -13,6 +13,7 @@
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",