profclaw 0.0.1-beta.3 → 2.0.0

package/dist/cli/commands/onboard.js

@@ -16,6 +16,14 @@ import { existsSync, writeFileSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { execSync } from 'node:child_process';
 import { success, error, info, warn, spinner } from '../utils/output.js';
+import { PROVIDER_CATALOG, PROVIDER_ENV_KEYS } from '../providers.js';
+/** Render a step header with progress bar. */
+function stepHeader(step, total, title) {
+    const barLen = 20;
+    const filled = Math.round((step / total) * barLen);
+    const bar = chalk.cyan('━'.repeat(filled)) + chalk.dim('━'.repeat(barLen - filled));
+    console.log(`\n  ${bar}  ${chalk.dim(`${step}/${total}`)}  ${chalk.bold.white(title)}\n`);
+}
 const DETECT_TIMEOUT_MS = 5000;
 /** Wrap a detection check with a timeout so a hung service doesn't block onboarding. */
 async function withTimeout(promise, fallback, timeoutMs = DETECT_TIMEOUT_MS) {
@@ -146,7 +154,7 @@ async function runInteractive() {
     console.log(chalk.cyan(banner));
     console.log(chalk.dim('  Onboarding Wizard\n'));
     // Step 1: Detect environment
-    console.log(chalk.bold.white('  Step 1: Environment Detection\n'));
+    stepHeader(1, 6, 'Environment Detection');
     const spin = spinner('Scanning environment...');
     spin.start();
     const env = await detectEnvironment();
@@ -220,8 +228,8 @@ async function runInteractive() {
     const recommended = recommendMode(env);
     console.log('');
     console.log(`  ${chalk.cyan('Recommended mode:')} ${chalk.bold(recommended)}`);
-    // Step 2: Choose mode (arrow keys)
-    console.log(chalk.bold.white('\n  Step 2: Deployment Mode\n'));
+    // Step 2: Choose mode
+    stepHeader(2, 6, 'Deployment Mode');
     let mode;
     try {
         mode = await select({
@@ -252,47 +260,25 @@ async function runInteractive() {
         process.exit(0);
     }
     success(`Mode: ${mode}`);
-    // Step 3: AI Provider (searchable list)
-    console.log(chalk.bold.white('\n  Step 3: AI Provider\n'));
+    // Step 3: AI Provider
+    stepHeader(3, 6, 'AI Provider');
     let anthropicKey;
     let openaiKey;
     let ollamaUrl;
-    const hasExistingProvider = !!process.env.ANTHROPIC_API_KEY || !!process.env.OPENAI_API_KEY;
-    if (hasExistingProvider) {
-        const which = process.env.ANTHROPIC_API_KEY ? 'Anthropic' : 'OpenAI';
-        info(`AI provider already configured from environment (${which}).`);
+    // Check all provider env vars (not just Anthropic/OpenAI)
+    let detectedProviderName = null;
+    for (const p of PROVIDER_CATALOG) {
+        const val = process.env[p.envVar];
+        if (val && val !== '' && !val.startsWith('sk-ant-xxxx') && !val.startsWith('sk-xxxx')) {
+            detectedProviderName = p.name;
+            break;
+        }
+    }
+    if (detectedProviderName) {
+        info(`AI provider already configured from environment (${detectedProviderName}).`);
     }
     else {
-        // Provider catalog
-        const providers = [
-            { key: 'anthropic', name: 'Anthropic', models: 'Claude 4.x, 3.5 Sonnet', envVar: 'ANTHROPIC_API_KEY', category: 'Popular', tag: 'recommended' },
-            { key: 'openai', name: 'OpenAI', models: 'GPT-4o, o1, o3', envVar: 'OPENAI_API_KEY', category: 'Popular', tag: '' },
-            { key: 'google', name: 'Google AI', models: 'Gemini 2.x, Flash', envVar: 'GOOGLE_GENERATIVE_AI_API_KEY', category: 'Popular', tag: '' },
-            { key: 'ollama', name: 'Ollama', models: 'Llama, Mistral, Qwen', envVar: 'OLLAMA_BASE_URL', category: 'Popular', tag: env.hasOllama ? 'detected' : 'free, local' },
-            { key: 'groq', name: 'Groq', models: 'Llama, Mixtral', envVar: 'GROQ_API_KEY', category: 'Fast Inference', tag: 'fast' },
-            { key: 'cerebras', name: 'Cerebras', models: 'Llama 3.3 70B', envVar: 'CEREBRAS_API_KEY', category: 'Fast Inference', tag: 'fast' },
-            { key: 'fireworks', name: 'Fireworks', models: 'Llama, Mixtral', envVar: 'FIREWORKS_API_KEY', category: 'Fast Inference', tag: '' },
-            { key: 'together', name: 'Together', models: 'Open models', envVar: 'TOGETHER_API_KEY', category: 'Fast Inference', tag: '' },
-            { key: 'azure', name: 'Azure OpenAI', models: 'GPT-4o', envVar: 'AZURE_OPENAI_API_KEY', category: 'Enterprise', tag: 'enterprise' },
-            { key: 'bedrock', name: 'AWS Bedrock', models: 'Claude, Titan, Llama', envVar: 'AWS_ACCESS_KEY_ID', category: 'Enterprise', tag: 'enterprise' },
-            { key: 'watsonx', name: 'IBM Watsonx', models: 'Granite, Llama', envVar: 'WATSONX_API_KEY', category: 'Enterprise', tag: 'enterprise' },
-            { key: 'deepseek', name: 'DeepSeek', models: 'V3, R1 (reasoning)', envVar: 'DEEPSEEK_API_KEY', category: 'More Providers', tag: '' },
-            { key: 'mistral', name: 'Mistral', models: 'Large, Codestral', envVar: 'MISTRAL_API_KEY', category: 'More Providers', tag: '' },
-            { key: 'xai', name: 'xAI', models: 'Grok', envVar: 'XAI_API_KEY', category: 'More Providers', tag: '' },
-            { key: 'perplexity', name: 'Perplexity', models: 'Sonar (search)', envVar: 'PERPLEXITY_API_KEY', category: 'More Providers', tag: 'search' },
-            { key: 'cohere', name: 'Cohere', models: 'Command R+', envVar: 'COHERE_API_KEY', category: 'More Providers', tag: '' },
-            { key: 'openrouter', name: 'OpenRouter', models: 'Any model (proxy)', envVar: 'OPENROUTER_API_KEY', category: 'Aggregators', tag: 'multi-model' },
-            { key: 'replicate', name: 'Replicate', models: 'Open-source models', envVar: 'REPLICATE_API_TOKEN', category: 'Aggregators', tag: '' },
-            { key: 'github-models', name: 'GitHub Models', models: 'Azure-backed', envVar: 'GITHUB_TOKEN', category: 'Aggregators', tag: '' },
-            { key: 'huggingface', name: 'HuggingFace', models: 'Inference API', envVar: 'HF_TOKEN', category: 'Aggregators', tag: '' },
-            { key: 'nvidia-nim', name: 'NVIDIA NIM', models: 'Llama, Nemotron', envVar: 'NVIDIA_NIM_API_KEY', category: 'Aggregators', tag: '' },
-            { key: 'zhipu', name: 'Zhipu AI', models: 'GLM-4, GLM-5', envVar: 'ZHIPU_API_KEY', category: 'Asia', tag: '' },
-            { key: 'moonshot', name: 'Moonshot', models: 'Kimi (128K context)', envVar: 'MOONSHOT_API_KEY', category: 'Asia', tag: '' },
-            { key: 'qwen', name: 'Qwen', models: 'Qwen Max, Plus', envVar: 'QWEN_API_KEY', category: 'Asia', tag: '' },
-            { key: 'minimax', name: 'MiniMax', models: 'abab series', envVar: 'MINIMAX_API_KEY', category: 'Asia', tag: '' },
-            { key: 'volcengine', name: 'Volcengine', models: 'Doubao (Bytedance)', envVar: 'VOLCENGINE_API_KEY', category: 'Asia', tag: '' },
-            { key: 'qianfan', name: 'Qianfan', models: 'ERNIE (Baidu)', envVar: 'QIANFAN_API_KEY', category: 'Asia', tag: '' },
-        ];
+        const providers = PROVIDER_CATALOG;
         // Check which providers have keys in env
         const detected = new Set();
         for (const p of providers) {
@@ -306,6 +292,7 @@ async function runInteractive() {
         try {
             chosenProvider = await search({
                 message: 'Select AI provider (type to filter, arrows to navigate)',
+                pageSize: 15,
                 source: (term) => {
                     const results = [];
                     const filter = (term || '').toLowerCase();
@@ -405,16 +392,25 @@ async function runInteractive() {
             info('AI provider skipped. Configure later: profclaw provider');
         }
     }
+    // Collect extra env vars that were set during provider selection
+    const extraEnvVars = {};
+    if (!anthropicKey && !openaiKey && !ollamaUrl) {
+        for (const key of PROVIDER_ENV_KEYS) {
+            if (process.env[key])
+                extraEnvVars[key] = process.env[key];
+        }
+    }
     // Step 4: Generate .env
-    console.log(chalk.bold.white('\n  Step 4: Configuration\n'));
+    stepHeader(4, 6, 'Configuration');
+    const envPath = join(process.cwd(), '.env');
     if (!env.existingEnv) {
         const envContent = generateEnvFile({
             mode,
             anthropicKey,
             openaiKey,
             ollamaUrl,
+            extraEnvVars,
         });
-        const envPath = join(process.cwd(), '.env');
         try {
             writeFileSync(envPath, envContent, { mode: 0o600 });
             success('.env file created.');
@@ -425,60 +421,49 @@ async function runInteractive() {
         }
     }
     else {
-        info('.env file already exists. Updating PROFCLAW_MODE...');
-        const envPath = join(process.cwd(), '.env');
         let content = readFileSync(envPath, 'utf-8');
+        // Update mode
         if (content.includes('PROFCLAW_MODE=')) {
             content = content.replace(/PROFCLAW_MODE=\w+/, `PROFCLAW_MODE=${mode}`);
         }
         else {
             content += `\nPROFCLAW_MODE=${mode}\n`;
         }
+        // Add provider keys to existing .env
+        const keysToWrite = { ...extraEnvVars };
+        if (anthropicKey)
+            keysToWrite['ANTHROPIC_API_KEY'] = anthropicKey;
+        if (openaiKey)
+            keysToWrite['OPENAI_API_KEY'] = openaiKey;
+        if (ollamaUrl)
+            keysToWrite['OLLAMA_BASE_URL'] = ollamaUrl;
+        for (const [key, value] of Object.entries(keysToWrite)) {
+            if (content.includes(`${key}=`)) {
+                content = content.replace(new RegExp(`${key}=.*`), `${key}=${value}`);
+            }
+            else {
+                content += `${key}=${value}\n`;
+            }
+        }
         writeFileSync(envPath, content);
-        success(`PROFCLAW_MODE=${mode} set in .env`);
+        const keyCount = Object.keys(keysToWrite).length;
+        if (keyCount > 0) {
+            success(`PROFCLAW_MODE=${mode} + ${keyCount} provider key(s) saved to .env`);
+        }
+        else {
+            success(`PROFCLAW_MODE=${mode} set in .env`);
+        }
     }
-    // Step 5: Run setup wizard
-    console.log(chalk.bold.white('\n  Step 5: Setup\n'));
-    info('Launching setup wizard for admin account and provider configuration...\n');
+    // Steps 5-6: Delegate to setup wizard for admin account + registration
+    // Setup continues the step numbering (5/6, 6/6) and shows summary + server start
     try {
         const { setupCommand } = await import('./setup.js');
         const setupCmd = setupCommand();
-        await setupCmd.parseAsync(['node', 'setup']);
+        await setupCmd.parseAsync(['node', 'setup', '--from-onboard']);
     }
     catch (err) {
         error(`Setup wizard failed: ${err instanceof Error ? err.message : 'Unknown error'}`);
         info('You can run it again later: profclaw setup');
-        return;
-    }
-    // Step 6: Post-setup validation
-    console.log(chalk.bold.white('\n  Step 6: Validation\n'));
-    const postSpin = spinner('Validating installation...');
-    postSpin.start();
-    const checks = [];
-    // Check .env exists
-    const envExists = existsSync(join(process.cwd(), '.env'));
-    checks.push({ label: '.env file', ok: envExists });
-    // Check config exists
-    const configExists = existsSync(join(process.cwd(), 'config', 'settings.yml'));
-    checks.push({ label: 'config/settings.yml', ok: configExists });
-    // Check database was created
-    const dbExists = existsSync(join(process.cwd(), 'data', 'profclaw.db'));
-    checks.push({ label: 'Database', ok: dbExists });
-    postSpin.stop();
-    for (const check of checks) {
-        const icon = check.ok ? chalk.green('  +') : chalk.red('  -');
-        console.log(`${icon} ${check.label}: ${check.ok ? 'OK' : 'missing'}`);
-    }
-    const allPassed = checks.every((c) => c.ok);
-    if (allPassed) {
-        console.log('');
-        success('Onboarding complete! Start the server:');
-        console.log(`\n  ${chalk.cyan.bold('profclaw serve')}\n`);
-    }
-    else {
-        console.log('');
-        warn('Some checks did not pass. You may need to run setup again:');
-        console.log(`\n  ${chalk.cyan('profclaw setup')}\n`);
     }
 }
 // Non-Interactive Onboarding