@swarmclawai/swarmclaw 1.7.1 → 1.7.2

package/README.md

@@ -399,6 +399,16 @@ Operational docs: https://swarmclaw.ai/docs/observability
 
 ## Releases
 
+### v1.7.2 Highlights
+
+CLI provider usability follow-up for v1.7.0/v1.7.1. The expanded coding-agent roster is now easier to find, configure, and validate from onboarding and setup diagnostics.
+
+- **Shared CLI provider registry.** Bespoke and generic CLI providers now share one metadata source for display names, binary names, capabilities, setup defaults, and provider-set behavior, reducing drift across onboarding, runtime routing, setup doctor, and capability prompts.
+- **Onboarding exposes the full CLI roster.** The setup wizard groups providers by CLI agents, gateways/local runtimes, API providers, and custom endpoints, with search so the 31 extended CLI providers added in v1.7 are usable without digging through settings.
+- **Connection checks for every CLI provider.** Bespoke CLIs keep auth-aware checks, while generic CLIs verify that the expected binary is on PATH and return actionable install guidance when missing.
+- **Update banner polish.** Source installs now show the target stable tag/version, remember dismissal per release target, and make the required restart after update explicit.
+- **macOS desktop note.** macOS builds remain ad-hoc signed and not notarized in this release, so the existing Gatekeeper/quarantine workaround still applies until Developer ID signing is available.
+
 ### v1.7.1 Highlights
 
 Republish of v1.7.0 from the correct commit. The v1.7.0 tarball on npm was inadvertently published from a pre-rebase tree that did not include the v1.6.1 codex continuity fixes (PR #62) or the v1.6.2 plan doc. v1.7.1 ships the same coding-agent-roster expansion on top of the correct v1.6.1+ history.

package/electron-dist/main.js

@@ -0,0 +1,218 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const electron_1 = require("electron");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const paths_1 = require("./paths");
+const server_lifecycle_1 = require("./server-lifecycle");
+const menu_1 = require("./menu");
+const DEV_URL_DEFAULT = 'http://127.0.0.1:3456';
+const LOG_TAIL_BYTES = 1500;
+let mainWindow = null;
+let serverHandle = null;
+let serverLogFile = null;
+let isQuitting = false;
+const gotLock = electron_1.app.requestSingleInstanceLock();
+if (!gotLock) {
+    electron_1.app.quit();
+}
+else {
+    electron_1.app.on('second-instance', () => {
+        if (mainWindow) {
+            if (mainWindow.isMinimized())
+                mainWindow.restore();
+            mainWindow.focus();
+        }
+    });
+    electron_1.app.on('ready', () => void onReady());
+    electron_1.app.on('window-all-closed', () => {
+        if (process.platform !== 'darwin')
+            electron_1.app.quit();
+    });
+    electron_1.app.on('activate', () => {
+        if (mainWindow !== null)
+            return;
+        if (serverHandle) {
+            createMainWindow(serverHandle.url);
+        }
+        else if (!electron_1.app.isPackaged) {
+            createMainWindow(process.env.SWARMCLAW_DEV_URL || DEV_URL_DEFAULT);
+        }
+    });
+    electron_1.app.on('before-quit', () => {
+        isQuitting = true;
+    });
+    electron_1.app.on('will-quit', async (event) => {
+        if (!serverHandle)
+            return;
+        event.preventDefault();
+        try {
+            await serverHandle.stop();
+        }
+        finally {
+            serverHandle = null;
+            electron_1.app.exit(0);
+        }
+    });
+}
+async function onReady() {
+    const paths = (0, paths_1.resolveRuntimePaths)();
+    (0, menu_1.buildAppMenu)(paths, () => mainWindow);
+    const iconPath = resolveIconPath();
+    if (process.platform === 'darwin' && iconPath && electron_1.app.dock) {
+        const img = electron_1.nativeImage.createFromPath(iconPath);
+        if (!img.isEmpty())
+            electron_1.app.dock.setIcon(img);
+    }
+    if (!electron_1.app.isPackaged) {
+        const devUrl = process.env.SWARMCLAW_DEV_URL || DEV_URL_DEFAULT;
+        console.log(`[swarmclaw] dev mode, loading ${devUrl}`);
+        createMainWindow(devUrl);
+        return;
+    }
+    serverLogFile = node_path_1.default.join(electron_1.app.getPath('userData'), 'logs', 'server.log');
+    node_fs_1.default.mkdirSync(node_path_1.default.dirname(serverLogFile), { recursive: true });
+    try {
+        serverHandle = await (0, server_lifecycle_1.startEmbeddedServer)({
+            paths,
+            logFile: serverLogFile,
+            onStdout: (c) => process.stdout.write(`[swarmclaw] ${c}`),
+            onStderr: (c) => process.stderr.write(`[swarmclaw] ${c}`),
+            onExit: (code, signal) => {
+                if (!isQuitting) {
+                    console.error(`[swarmclaw] server exited unexpectedly (code=${code}, signal=${signal ?? 'none'})`);
+                    void showServerCrashDialog(code, signal);
+                }
+            },
+        });
+    }
+    catch (err) {
+        await showStartupFailureDialog(err, paths);
+        electron_1.app.exit(1);
+        return;
+    }
+    createMainWindow(serverHandle.url);
+    void Promise.resolve().then(() => __importStar(require('./updater'))).then((m) => m.initAutoUpdater());
+}
+function resolveIconPath() {
+    const candidate = electron_1.app.isPackaged
+        ? node_path_1.default.join(process.resourcesPath, 'icon.png')
+        : node_path_1.default.join(__dirname, '..', 'resources', 'icon.png');
+    return node_fs_1.default.existsSync(candidate) ? candidate : undefined;
+}
+function createMainWindow(startUrl) {
+    const iconPath = resolveIconPath();
+    mainWindow = new electron_1.BrowserWindow({
+        width: 1440,
+        height: 900,
+        minWidth: 1024,
+        minHeight: 640,
+        backgroundColor: '#0b0b0f',
+        show: true,
+        ...(iconPath ? { icon: iconPath } : {}),
+        webPreferences: {
+            contextIsolation: true,
+            nodeIntegration: false,
+            sandbox: false,
+        },
+    });
+    const wc = mainWindow.webContents;
+    if (!electron_1.app.isPackaged)
+        wc.openDevTools({ mode: 'detach' });
+    wc.on('did-start-loading', () => console.log('[swarmclaw] did-start-loading'));
+    wc.on('did-finish-load', () => console.log('[swarmclaw] did-finish-load'));
+    wc.on('did-fail-load', (_e, code, desc, url) => console.error(`[swarmclaw] did-fail-load code=${code} desc=${desc} url=${url}`));
+    wc.on('render-process-gone', (_e, details) => console.error(`[swarmclaw] render-process-gone reason=${details.reason}`));
+    wc.on('unresponsive', () => console.error('[swarmclaw] webContents unresponsive'));
+    mainWindow.on('closed', () => {
+        mainWindow = null;
+    });
+    mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+        if (url.startsWith(startUrl))
+            return { action: 'allow' };
+        void electron_1.shell.openExternal(url);
+        return { action: 'deny' };
+    });
+    void mainWindow.loadURL(startUrl).catch((err) => {
+        console.error('[swarmclaw] loadURL rejected:', err);
+    });
+}
+async function showServerCrashDialog(code, signal) {
+    const buttons = serverLogFile ? ['Open Logs Folder', 'Quit'] : ['Quit'];
+    const quitButtonId = buttons.length - 1;
+    const detail = buildLogDetail(`code=${code ?? 'null'} signal=${signal ?? 'none'}`);
+    const res = await electron_1.dialog.showMessageBox({
+        type: 'error',
+        buttons,
+        defaultId: quitButtonId,
+        cancelId: quitButtonId,
+        title: 'SwarmClaw stopped',
+        message: 'The SwarmClaw server exited unexpectedly.',
+        detail,
+    });
+    if (serverLogFile && res.response === 0)
+        electron_1.shell.showItemInFolder(serverLogFile);
+    electron_1.app.exit(1);
+}
+async function showStartupFailureDialog(err, paths) {
+    const message = err instanceof Error ? err.message : String(err);
+    const base = `${message}\n\nStandalone entry: ${paths.standaloneEntry}\nData dir: ${paths.dataDir}`;
+    const detail = buildLogDetail(base);
+    const buttons = serverLogFile ? ['Open Logs Folder', 'Quit'] : ['Quit'];
+    const quitButtonId = buttons.length - 1;
+    const res = await electron_1.dialog.showMessageBox({
+        type: 'error',
+        buttons,
+        defaultId: quitButtonId,
+        cancelId: quitButtonId,
+        title: 'SwarmClaw failed to start',
+        message: 'The embedded server did not start.',
+        detail,
+    });
+    if (serverLogFile && res.response === 0)
+        electron_1.shell.showItemInFolder(serverLogFile);
+}
+function buildLogDetail(base) {
+    if (!serverLogFile)
+        return base;
+    const tail = (0, server_lifecycle_1.tailLogFile)(serverLogFile, LOG_TAIL_BYTES).trim();
+    if (!tail)
+        return `${base}\n\nLog file: ${serverLogFile}\n(no output captured yet)`;
+    return `${base}\n\nLog tail (${serverLogFile}):\n${tail}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Build and run autonomous AI agents with OpenClaw, Hermes, multiple model providers, orchestration, delegation, memory, skills, schedules, and chat connectors.",
   "main": "electron-dist/main.js",
   "license": "MIT",
@@ -87,7 +87,7 @@
     "test:cli": "node --test src/cli/*.test.js bin/*.test.js scripts/postinstall.test.mjs scripts/run-next-build.test.mjs scripts/run-next-typegen.test.mjs",
     "test:setup": "tsx --test src/app/api/setup/check-provider/route.test.ts src/lib/server/provider-model-discovery.test.ts src/components/auth/setup-wizard/utils.test.ts src/components/auth/setup-wizard/types.test.ts src/hooks/setup-done-detection.test.ts src/lib/setup-defaults.test.ts src/lib/server/storage-auth.test.ts src/lib/server/storage-auth-docker.test.ts",
     "test:openclaw": "tsx --test src/lib/openclaw/openclaw-agent-id.test.ts src/lib/openclaw/openclaw-endpoint.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/connectors/swarmdock.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw/agent-resolver.test.ts src/lib/server/openclaw/deploy.test.ts src/lib/server/openclaw/skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/session-tools/swarmdock.test.ts src/lib/server/tasks/task-quality-gate.test.ts src/lib/server/tasks/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts src/lib/providers/openai.test.ts src/lib/providers/openclaw-exports.test.ts src/app/api/openclaw/dashboard-url/route.test.ts",
-    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/strip-internal-metadata.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/tts/route.test.ts",
+    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/strip-internal-metadata.test.ts src/lib/provider-sets.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-provider-metadata.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/cli-provider-readiness.test.ts src/lib/server/provider-health.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/tts/route.test.ts",
     "test:builder": "tsx --test src/features/protocols/builder/utils/nodes-to-template.test.ts src/features/protocols/builder/utils/template-to-nodes.test.ts src/features/protocols/builder/validators/dag-validator.test.ts",
     "test:e2e": "node --import tsx scripts/browser-e2e-smoke.ts",
     "test:mcp:conformance": "node --import tsx ./scripts/mcp-conformance-check.ts",

package/scripts/run-next-build.mjs

@@ -11,7 +11,7 @@ import { ensureBuildBootstrapPaths } from './build-bootstrap-env.mjs'
 
 const require = createRequire(import.meta.url)
 
-export const DEFAULT_MAX_OLD_SPACE_SIZE_MB = '8192'
+export const DEFAULT_MAX_OLD_SPACE_SIZE_MB = '12288'
 export const MIN_MAX_OLD_SPACE_SIZE_MB = 1024
 export const FALLBACK_MIN_MAX_OLD_SPACE_SIZE_MB = 512
 export const RESERVED_BUILD_MEMORY_MB = 768

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

@@ -2,39 +2,12 @@ import { NextResponse } from 'next/server'
 import { loadCredentials, decryptKey, loadProviderConfigs } from '@/lib/server/storage'
 import { listCredentialIdsByProvider } from '@/lib/server/credentials/credential-service'
 import { getDeviceId, wsConnect, rpcOnConnectedGateway } from '@/lib/providers/openclaw'
-import { buildCliEnv, probeCliAuth, resolveCliBinary } from '@/lib/providers/cli-utils'
+import { isCliProviderId } from '@/lib/providers/cli-provider-metadata'
+import { checkCliProviderReady } from '@/lib/server/cli-provider-readiness'
 import { OPENAI_COMPATIBLE_DEFAULTS } from '@/lib/server/provider-health'
 import { resolveOllamaRuntimeConfig } from '@/lib/server/ollama-runtime'
 import { normalizeOllamaSetupEndpoint, normalizeOpenClawUrl, parseErrorMessage } from './helpers'
 
-type SetupProvider =
-  | 'claude-cli'
-  | 'codex-cli'
-  | 'opencode-cli'
-  | 'gemini-cli'
-  | 'copilot-cli'
-  | 'droid-cli'
-  | 'cursor-cli'
-  | 'qwen-code-cli'
-  | 'goose'
-  | 'openai'
-  | 'openrouter'
-  | 'anthropic'
-  | 'google'
-  | 'deepseek'
-  | 'groq'
-  | 'together'
-  | 'mistral'
-  | 'xai'
-  | 'fireworks'
-  | 'nebius'
-  | 'deepinfra'
-  | 'ollama'
-  | 'openclaw'
-  | 'hermes'
-
-type CliSetupProvider = 'claude-cli' | 'codex-cli' | 'opencode-cli' | 'gemini-cli' | 'copilot-cli' | 'droid-cli' | 'cursor-cli' | 'qwen-code-cli' | 'goose'
-
 interface SetupCheckBody {
   provider?: string
   apiKey?: string
@@ -280,43 +253,13 @@ async function checkOpenClaw(apiKey: string, endpointRaw: string): Promise<{ ok:
   return { ok: true, message: 'Connected to OpenClaw gateway.', normalizedEndpoint, deviceId, recommendedModel }
 }
 
-function checkCliProvider(provider: CliSetupProvider): { ok: boolean; message: string } {
-  const env = buildCliEnv()
-  const config = {
-    'claude-cli': { binary: 'claude', backend: 'claude' as const, label: 'Claude Code CLI' },
-    'codex-cli': { binary: 'codex', backend: 'codex' as const, label: 'OpenAI Codex CLI' },
-    'opencode-cli': { binary: 'opencode', backend: 'opencode' as const, label: 'OpenCode CLI' },
-    'gemini-cli': { binary: 'gemini', backend: 'gemini' as const, label: 'Gemini CLI' },
-    'copilot-cli': { binary: 'copilot', backend: 'copilot' as const, label: 'GitHub Copilot CLI' },
-    'droid-cli': { binary: 'droid', backend: 'droid' as const, label: 'Factory Droid CLI' },
-    'cursor-cli': { binary: 'cursor-agent', backend: 'cursor' as const, label: 'Cursor Agent CLI' },
-    'qwen-code-cli': { binary: 'qwen', backend: 'qwen' as const, label: 'Qwen Code CLI' },
-    goose: { binary: 'goose', backend: 'goose' as const, label: 'Goose CLI' },
-  }[provider]
-
-  if (!config) return { ok: false, message: 'Unknown CLI provider.' }
-  const binary = resolveCliBinary(config.binary)
-  if (!binary) {
-    return {
-      ok: false,
-      message: `${config.label} is not installed. Install \`${config.binary}\` and ensure it is on your PATH.`,
-    }
-  }
-  const auth = probeCliAuth(binary, config.backend, env, process.cwd())
-  if (!auth.authenticated) {
-    return { ok: false, message: auth.errorMessage || `${config.label} is not configured.` }
-  }
-  return { ok: true, message: `${config.label} is installed and ready.` }
-}
-
 export async function POST(req: Request) {
   const body = parseBody(await req.json().catch(() => ({})))
-  const provider = clean(body.provider) as SetupProvider
+  const provider = clean(body.provider)
   let apiKey = clean(body.apiKey)
   const credentialId = clean(body.credentialId)
   let endpoint = clean(body.endpoint)
   const model = clean(body.model)
-  const CLI_PROVIDERS = new Set<CliSetupProvider>(['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'copilot-cli', 'droid-cli', 'cursor-cli', 'qwen-code-cli', 'goose'])
 
   // Resolve credentialId to an API key if no raw key was provided
   if (!apiKey && credentialId) {
@@ -355,8 +298,8 @@ export async function POST(req: Request) {
     } catch { /* best effort */ }
   }
 
-  if (CLI_PROVIDERS.has(provider as CliSetupProvider)) {
-    const result = checkCliProvider(provider as CliSetupProvider)
+  if (isCliProviderId(provider)) {
+    const result = checkCliProviderReady(provider)
     return NextResponse.json(result)
   }
 

package/src/app/api/setup/doctor/route.ts

@@ -6,6 +6,7 @@ import { DATA_DIR } from '@/lib/server/data-dir'
 import { loadAgents, loadCredentials, loadSettings, loadCollection } from '@/lib/server/storage'
 import { dedup, errorMessage } from '@/lib/shared-utils'
 import { detectDocker } from '@/lib/server/sandbox/docker-detect'
+import { BESPOKE_CLI_PROVIDER_METADATA, GENERIC_CLI_PROVIDER_METADATA } from '@/lib/providers/cli-provider-metadata'
 
 type CheckStatus = 'pass' | 'warn' | 'fail'
 
@@ -198,15 +199,11 @@ export async function GET(req: Request) {
   } catch { /* best-effort */ }
 
   const optionalBinaries: Array<{ id: string; label: string; command: string }> = [
-    { id: 'claude-cli', label: 'Claude Code CLI', command: 'claude' },
-    { id: 'codex-cli', label: 'OpenAI Codex CLI', command: 'codex' },
-    { id: 'opencode-cli', label: 'OpenCode CLI', command: 'opencode' },
-    { id: 'gemini-cli', label: 'Gemini CLI', command: 'gemini' },
-    { id: 'copilot-cli', label: 'GitHub Copilot CLI', command: 'copilot' },
-    { id: 'droid-cli', label: 'Factory Droid CLI', command: 'droid' },
-    { id: 'cursor-cli', label: 'Cursor Agent CLI', command: 'cursor-agent' },
-    { id: 'qwen-code-cli', label: 'Qwen Code CLI', command: 'qwen' },
-    { id: 'goose', label: 'Goose CLI', command: 'goose' },
+    ...BESPOKE_CLI_PROVIDER_METADATA.map((provider) => ({
+      id: provider.id,
+      label: provider.displayName,
+      command: provider.binaryName,
+    })),
     { id: 'google-workspace-cli', label: 'Google Workspace CLI', command: 'gws' },
   ]
 
@@ -223,6 +220,19 @@ export async function GET(req: Request) {
     )
   }
 
+  const genericCliInstalled = GENERIC_CLI_PROVIDER_METADATA
+    .filter((provider) => commandExists(provider.binaryName))
+    .map((provider) => provider.displayName)
+  pushCheck(
+    checks,
+    'extended-cli-providers',
+    'Extended CLI provider roster',
+    genericCliInstalled.length > 0 ? 'pass' : 'warn',
+    genericCliInstalled.length > 0
+      ? `${genericCliInstalled.length} extended CLI provider(s) detected: ${genericCliInstalled.slice(0, 8).join(', ')}${genericCliInstalled.length > 8 ? ', ...' : ''}.`
+      : `${GENERIC_CLI_PROVIDER_METADATA.length} optional extended CLI provider(s) are available in SwarmClaw; install any matching CLI when you want to use it.`,
+  )
+
   const extensionSettings = (settings?.extensionSettings && typeof settings.extensionSettings === 'object')
     ? settings.extensionSettings as Record<string, Record<string, unknown>>
     : {}

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

@@ -18,6 +18,7 @@ export function StepProviders({
   onContinue,
   onSkip,
 }: StepProvidersProps) {
+  const [providerSearch, setProviderSearch] = useState('')
   const [doctorState, setDoctorState] = useState<'idle' | 'checking' | 'done' | 'error'>('idle')
   const [doctorError, setDoctorError] = useState('')
   const [doctorReport, setDoctorReport] = useState<SetupDoctorResponse | null>(null)
@@ -36,6 +37,23 @@ export function StepProviders({
     }
   }
 
+  const normalizedSearch = providerSearch.trim().toLowerCase()
+  const visibleProviders = SETUP_PROVIDERS.filter((candidate) => {
+    if (!normalizedSearch) return true
+    return [
+      candidate.name,
+      candidate.description,
+      candidate.badge || '',
+      candidate.id,
+    ].some((part) => part.toLowerCase().includes(normalizedSearch))
+  })
+  const providerGroups = [
+    { id: 'cli', label: 'CLI Agents', items: visibleProviders.filter((candidate) => candidate.category === 'cli') },
+    { id: 'gateway', label: 'Gateways and Local Runtimes', items: visibleProviders.filter((candidate) => candidate.category === 'gateway' || candidate.category === 'local') },
+    { id: 'api', label: 'API Providers', items: visibleProviders.filter((candidate) => !candidate.category || candidate.category === 'api') },
+    { id: 'custom', label: 'Custom', items: visibleProviders.filter((candidate) => candidate.category === 'custom') },
+  ].filter((group) => group.items.length > 0)
+
   return (
     <StepShell>
       <h1 className="font-display text-[36px] font-800 leading-[1.05] tracking-[-0.04em] mb-3">
@@ -50,51 +68,72 @@ export function StepProviders({
 
       <ConfiguredProviderChips providers={configuredProviders} onRemove={onRemoveProvider} />
 
+      <input
+        type="search"
+        value={providerSearch}
+        onChange={(e) => setProviderSearch(e.target.value)}
+        placeholder="Search providers, CLIs, or runtimes..."
+        className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface text-text text-[13px]
+          outline-none transition-all duration-200 placeholder:text-text-3/50 focus:border-accent-bright/30 mb-4"
+      />
+
       <div className="flex flex-col gap-3 max-h-[42vh] overflow-y-auto pr-1">
-        {SETUP_PROVIDERS.map((candidate) => {
-          const isConfigured = configuredProviderIds.has(candidate.id)
-          return (
-            <button
-              key={candidate.id}
-              onClick={() => onSelectProvider(candidate.id)}
-              className={`w-full px-5 py-4 rounded-[14px] border bg-surface text-left
-                transition-all duration-200 flex items-start gap-4 cursor-pointer
-                ${isConfigured
-                  ? 'border-emerald-500/25 hover:border-emerald-500/40 hover:bg-surface-hover'
-                  : 'border-white/[0.08] hover:border-accent-bright/30 hover:bg-surface-hover'
-                }`}
-            >
-              <div className={`w-10 h-10 rounded-[10px] border flex items-center justify-center shrink-0 mt-0.5 ${
-                isConfigured ? 'bg-emerald-500/10 border-emerald-500/20' : 'bg-white/[0.04] border-white/[0.06]'
-              }`}>
-                <span className={`text-[16px] font-display font-700 ${isConfigured ? 'text-emerald-400' : 'text-accent-bright'}`}>
-                  {candidate.icon}
-                </span>
-              </div>
-              <div className="flex-1">
-                <div className="text-[15px] font-display font-600 text-text mb-1">
-                  {candidate.name}
-                  {isConfigured ? (
-                    <span className="ml-2 inline-flex items-center gap-1 px-2 py-0.5 rounded-md bg-emerald-500/10 text-emerald-300 text-[10px] uppercase tracking-[0.08em] font-600">
-                      Connected · Edit
-                    </span>
-                  ) : candidate.badge ? (
-                    <span className="ml-2 inline-flex items-center gap-1 px-2 py-0.5 rounded-md bg-accent-bright/15 text-accent-bright text-[10px] uppercase tracking-[0.08em] font-600">
-                      {candidate.badge}
+        {providerGroups.map((group) => (
+          <div key={group.id} className="space-y-2">
+            <div className="px-1 text-[10px] font-700 uppercase tracking-[0.1em] text-text-3/70">
+              {group.label}
+            </div>
+            {group.items.map((candidate) => {
+              const isConfigured = configuredProviderIds.has(candidate.id)
+              return (
+                <button
+                  key={candidate.id}
+                  onClick={() => onSelectProvider(candidate.id)}
+                  className={`w-full px-5 py-4 rounded-[14px] border bg-surface text-left
+                    transition-all duration-200 flex items-start gap-4 cursor-pointer
+                    ${isConfigured
+                      ? 'border-emerald-500/25 hover:border-emerald-500/40 hover:bg-surface-hover'
+                      : 'border-white/[0.08] hover:border-accent-bright/30 hover:bg-surface-hover'
+                    }`}
+                >
+                  <div className={`w-10 h-10 rounded-[10px] border flex items-center justify-center shrink-0 mt-0.5 ${
+                    isConfigured ? 'bg-emerald-500/10 border-emerald-500/20' : 'bg-white/[0.04] border-white/[0.06]'
+                  }`}>
+                    <span className={`text-[16px] font-display font-700 ${isConfigured ? 'text-emerald-400' : 'text-accent-bright'}`}>
+                      {candidate.icon}
                     </span>
-                  ) : null}
-                </div>
-                <div className="text-[13px] text-text-3 leading-relaxed">{candidate.description}</div>
-                {!candidate.requiresKey && !isConfigured && (
-                  <div className="mt-1.5 inline-flex items-center gap-1.5 px-2 py-0.5 rounded-md bg-emerald-500/10 text-emerald-400 text-[11px] font-500">
-                    <span className="w-1.5 h-1.5 rounded-full bg-emerald-400" />
-                    No API key required
                   </div>
-                )}
-              </div>
-            </button>
-          )
-        })}
+                  <div className="flex-1">
+                    <div className="text-[15px] font-display font-600 text-text mb-1">
+                      {candidate.name}
+                      {isConfigured ? (
+                        <span className="ml-2 inline-flex items-center gap-1 px-2 py-0.5 rounded-md bg-emerald-500/10 text-emerald-300 text-[10px] uppercase tracking-[0.08em] font-600">
+                          Connected · Edit
+                        </span>
+                      ) : candidate.badge ? (
+                        <span className="ml-2 inline-flex items-center gap-1 px-2 py-0.5 rounded-md bg-accent-bright/15 text-accent-bright text-[10px] uppercase tracking-[0.08em] font-600">
+                          {candidate.badge}
+                        </span>
+                      ) : null}
+                    </div>
+                    <div className="text-[13px] text-text-3 leading-relaxed">{candidate.description}</div>
+                    {!candidate.requiresKey && !isConfigured && (
+                      <div className="mt-1.5 inline-flex items-center gap-1.5 px-2 py-0.5 rounded-md bg-emerald-500/10 text-emerald-400 text-[11px] font-500">
+                        <span className="w-1.5 h-1.5 rounded-full bg-emerald-400" />
+                        No API key required
+                      </div>
+                    )}
+                  </div>
+                </button>
+              )
+            })}
+          </div>
+        ))}
+        {providerGroups.length === 0 && (
+          <div className="px-5 py-6 rounded-[14px] border border-white/[0.08] bg-surface text-center text-[13px] text-text-3">
+            No providers match that search.
+          </div>
+        )}
       </div>
 
       <div className="mt-4 text-left">