dexto 1.4.0 → 1.5.0

package/dist/index.js

@@ -19,10 +19,10 @@ import { resolveAgentPath, loadAgentConfig, globalPreferencesExist, loadGlobalPr
 import { startHonoApiServer } from './api/server-hono.js';
 import { validateCliOptions, handleCliOptionsError } from './cli/utils/options.js';
 import { validateAgentConfig } from './cli/utils/config-validation.js';
-import { applyCLIOverrides } from './config/cli-overrides.js';
+import { applyCLIOverrides, applyUserPreferences, checkAgentCompatibility, } from './config/cli-overrides.js';
 import { enrichAgentConfig } from '@dexto/agent-management';
 import { getPort } from './utils/port-utils.js';
-import { createDextoProject, createTsconfigJson, addDextoScriptsToPackageJson, postCreateDexto, initDexto, postInitDexto, getUserInputToInitDextoApp, } from './cli/commands/index.js';
+import { createDextoProject, createImage, getUserInputToInitDextoApp, initDexto, postInitDexto, } from './cli/commands/index.js';
 import { handleSetupCommand, handleInstallCommand, handleUninstallCommand, handleListAgentsCommand, handleWhichCommand, } from './cli/commands/index.js';
 import { handleSessionListCommand, handleSessionHistoryCommand, handleSessionDeleteCommand, handleSessionSearchCommand, } from './cli/commands/session-commands.js';
 import { requiresSetup } from './cli/utils/setup-utils.js';
@@ -34,6 +34,41 @@ import { initializeMcpToolAggregationServer } from './api/mcp/tool-aggregation-h
 const program = new Command();
 // Initialize analytics early (no-op if disabled)
 await initAnalytics({ appVersion: pkg.version });
+/**
+ * Recursively removes null values from an object.
+ * This handles YAML files that have explicit `apiKey: null` entries
+ * which would otherwise cause "Expected string, received null" validation errors.
+ */
+function cleanNullValues(obj) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj !== 'object')
+        return obj;
+    if (Array.isArray(obj)) {
+        return obj.map((item) => typeof item === 'object' && item !== null
+            ? cleanNullValues(item)
+            : item);
+    }
+    const cleaned = {};
+    for (const [key, value] of Object.entries(obj)) {
+        if (value === null) {
+            // Skip null values - they become undefined (missing)
+            continue;
+        }
+        if (typeof value === 'object' && !Array.isArray(value)) {
+            cleaned[key] = cleanNullValues(value);
+        }
+        else if (Array.isArray(value)) {
+            cleaned[key] = value.map((item) => typeof item === 'object' && item !== null
+                ? cleanNullValues(item)
+                : item);
+        }
+        else {
+            cleaned[key] = value;
+        }
+    }
+    return cleaned;
+}
 // 1) GLOBAL OPTIONS
 program
     .name('dexto')
@@ -52,36 +87,22 @@ program
     .option('--mode <mode>', 'The application in which dexto should talk to you - web | cli | server | mcp', 'web')
     .option('--port <port>', 'port for the server (default: 3000 for web, 3001 for server mode)')
     .option('--no-auto-install', 'Disable automatic installation of missing agents from registry')
+    .option('--image <package>', 'Image package to load (e.g., @dexto/image-local). Overrides config image field.')
     .enablePositionalOptions();
 // 2) `create-app` SUB-COMMAND
 program
-    .command('create-app')
-    .description('Scaffold a new Dexto Typescript app')
-    .action(withAnalytics('create-app', async () => {
+    .command('create-app [name]')
+    .description('Create a Dexto application (CLI, web, bot, etc.)')
+    .option('--from-image <package>', 'Use existing image (e.g., @dexto/image-local)')
+    .option('--extend-image <package>', 'Extend image with custom providers')
+    .option('--from-core', 'Build from @dexto/core (advanced)')
+    .option('--type <type>', 'App type: script, webapp (default: script)')
+    .action(withAnalytics('create-app', async (name, options) => {
     try {
-        p.intro(chalk.inverse('Dexto Create App'));
-        // first setup the initial files in the project and get the project path
-        const appPath = await createDextoProject();
-        // then get user inputs for directory, llm etc.
-        const userInput = await getUserInputToInitDextoApp();
-        try {
-            capture('dexto_create', {
-                provider: userInput.llmProvider,
-                providedKey: Boolean(userInput.llmApiKey),
-            });
-        }
-        catch {
-            // Analytics failures should not block CLI execution.
-        }
-        // move to project directory, then add the dexto scripts to the package.json and create the tsconfig.json
-        process.chdir(appPath);
-        await addDextoScriptsToPackageJson(userInput.directory, appPath);
-        await createTsconfigJson(appPath, userInput.directory);
-        // then initialize the other parts of the project
-        await initDexto(userInput.directory, userInput.createExampleFile, userInput.llmProvider, userInput.llmApiKey);
-        p.outro(chalk.greenBright('Dexto app created and initialized successfully!'));
-        // add notes for users to get started with their newly created Dexto project
-        await postCreateDexto(appPath, userInput.directory);
+        p.intro(chalk.inverse('Create Dexto App'));
+        // Create the app project structure (fully self-contained)
+        await createDextoProject(name, options);
+        p.outro(chalk.greenBright('Dexto app created successfully!'));
         safeExit('create-app', 0);
     }
     catch (err) {
@@ -91,7 +112,26 @@ program
         safeExit('create-app', 1, 'error');
     }
 }));
-// 3) `init-app` SUB-COMMAND
+// 3) `create-image` SUB-COMMAND
+program
+    .command('create-image [name]')
+    .description('Create a Dexto image - a distributable agent harness package')
+    .action(withAnalytics('create-image', async (name) => {
+    try {
+        p.intro(chalk.inverse('Create Dexto Image'));
+        // Create the image project structure
+        const projectPath = await createImage(name);
+        p.outro(chalk.greenBright(`Dexto image created successfully at ${projectPath}!`));
+        safeExit('create-image', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto create-image command failed: ${err}`);
+        safeExit('create-image', 1, 'error');
+    }
+}));
+// 4) `init-app` SUB-COMMAND
 program
     .command('init-app')
     .description('Initialize an existing Typescript app with Dexto')
@@ -130,13 +170,13 @@ program
         safeExit('init-app', 1, 'error');
     }
 }));
-// 4) `setup` SUB-COMMAND
+// 5) `setup` SUB-COMMAND
 program
     .command('setup')
     .description('Configure global Dexto preferences')
     .option('--provider <provider>', 'LLM provider (openai, anthropic, google, groq)')
     .option('--model <model>', 'Model name (uses provider default if not specified)')
-    .option('--default-agent <agent>', 'Default agent name (default: default-agent)')
+    .option('--default-agent <agent>', 'Default agent name (default: coding-agent)')
     .option('--no-interactive', 'Skip interactive prompts and API key setup')
     .option('--force', 'Overwrite existing setup without confirmation')
     .action(withAnalytics('setup', async (options) => {
@@ -151,7 +191,7 @@ program
         safeExit('setup', 1, 'error');
     }
 }));
-// 5) `install` SUB-COMMAND
+// 6) `install` SUB-COMMAND
 program
     .command('install [agents...]')
     .description('Install agents from registry or custom YAML files/directories')
@@ -160,7 +200,7 @@ program
     .option('--force', 'Force reinstall even if agent is already installed')
     .addHelpText('after', `
 Examples:
-  $ dexto install default-agent              Install agent from registry
+  $ dexto install coding-agent               Install agent from registry
   $ dexto install agent1 agent2              Install multiple registry agents
   $ dexto install --all                      Install all available registry agents
   $ dexto install ./my-agent.yml             Install custom agent from YAML file
@@ -177,12 +217,12 @@ Examples:
         safeExit('install', 1, 'error');
     }
 }));
-// 6) `uninstall` SUB-COMMAND
+// 7) `uninstall` SUB-COMMAND
 program
     .command('uninstall [agents...]')
     .description('Uninstall agents from the local installation')
     .option('--all', 'Uninstall all installed agents')
-    .option('--force', 'Force uninstall even if agent is protected (e.g., default-agent)')
+    .option('--force', 'Force uninstall even if agent is protected (e.g., coding-agent)')
     .action(withAnalytics('uninstall', async (agents, options) => {
     try {
         await handleUninstallCommand(agents, options);
@@ -195,7 +235,7 @@ program
         safeExit('uninstall', 1, 'error');
     }
 }));
-// 7) `list-agents` SUB-COMMAND
+// 8) `list-agents` SUB-COMMAND
 program
     .command('list-agents')
     .description('List available and installed agents')
@@ -214,7 +254,7 @@ program
         safeExit('list-agents', 1, 'error');
     }
 }));
-// 8) `which` SUB-COMMAND
+// 9) `which` SUB-COMMAND
 program
     .command('which <agent>')
     .description('Show the path to an agent')
@@ -233,12 +273,27 @@ program
 // Helper to bootstrap a minimal agent for non-interactive session/search ops
 async function bootstrapAgentFromGlobalOpts() {
     const globalOpts = program.opts();
-    const resolvedPath = await resolveAgentPath(globalOpts.agent, globalOpts.autoInstall !== false, true);
+    const resolvedPath = await resolveAgentPath(globalOpts.agent, globalOpts.autoInstall !== false);
     const rawConfig = await loadAgentConfig(resolvedPath);
     const mergedConfig = applyCLIOverrides(rawConfig, globalOpts);
     const enrichedConfig = enrichAgentConfig(mergedConfig, resolvedPath, {
         logLevel: 'info', // CLI uses info-level logging for visibility
     });
+    // Load image dynamically if specified (same priority as main command)
+    // Priority: CLI flag > Agent config > Environment variable > Default
+    // Images are optional, but default to image-local for convenience
+    const imageName = globalOpts.image || // --image flag
+        enrichedConfig.image || // image field in agent config
+        process.env.DEXTO_IMAGE || // DEXTO_IMAGE env var
+        '@dexto/image-local'; // Default for convenience
+    try {
+        await import(imageName);
+    }
+    catch (_err) {
+        console.error(`❌ Failed to load image '${imageName}'`);
+        console.error(`💡 Install it with: ${existsSync('package.json') ? 'npm install' : 'npm install -g'} ${imageName}`);
+        safeExit('bootstrap', 1, 'image-load-failed');
+    }
     // Override approval config for read-only commands (never run conversations)
     // This avoids needing to set up unused approval handlers
     enrichedConfig.toolConfirmation = {
@@ -253,7 +308,8 @@ async function bootstrapAgentFromGlobalOpts() {
             timeout: enrichedConfig.elicitation.timeout,
         }),
     };
-    const agent = new DextoAgent(enrichedConfig, resolvedPath);
+    // Use relaxed validation for session commands - they don't need LLM calls
+    const agent = new DextoAgent(enrichedConfig, resolvedPath, { strict: false });
     await agent.start();
     // Register graceful shutdown
     const shutdown = async () => {
@@ -292,7 +348,7 @@ async function getMostRecentSessionId(agent, includeHeadless = false) {
     }
     return mostRecentId;
 }
-// 9) `session` SUB-COMMAND
+// 10) `session` SUB-COMMAND
 const sessionCommand = program.command('session').description('Manage chat sessions');
 sessionCommand
     .command('list')
@@ -347,7 +403,7 @@ sessionCommand
         safeExit('session delete', 1, 'error');
     }
 }));
-// 10) `search` SUB-COMMAND
+// 11) `search` SUB-COMMAND
 program
     .command('search')
     .description('Search session history')
@@ -389,7 +445,7 @@ program
         safeExit('search', 1, 'error');
     }
 }));
-// 11) `mcp` SUB-COMMAND
+// 12) `mcp` SUB-COMMAND
 // For now, this mode simply aggregates and re-expose tools from configured MCP servers (no agent)
 // dexto --mode mcp will be moved to this sub-command in the future
 program
@@ -412,7 +468,7 @@ program
         // Get the global agent option from the main program
         const globalOpts = program.opts();
         const nameOrPath = globalOpts.agent;
-        const configPath = await resolveAgentPath(nameOrPath, globalOpts.autoInstall !== false, true);
+        const configPath = await resolveAgentPath(nameOrPath, globalOpts.autoInstall !== false);
         console.log(`📄 Loading Dexto config from: ${configPath}`);
         const config = await loadAgentConfig(configPath);
         logger.info(`Validating MCP servers...`);
@@ -442,7 +498,7 @@ program
         safeExit('mcp', 1, 'mcp-agg-failed');
     }
 }, { timeoutMs: 0 }));
-// 10) Main dexto CLI - Interactive/One shot (CLI/HEADLESS) or run in other modes (--mode web/server/mcp)
+// 13) Main dexto CLI - Interactive/One shot (CLI/HEADLESS) or run in other modes (--mode web/server/mcp)
 program
     .argument('[prompt...]', 'Natural-language prompt to run once. If not passed, dexto will start as an interactive CLI')
     // Main customer facing description
@@ -565,10 +621,14 @@ program
     // ——— ENHANCED PREFERENCE-AWARE CONFIG LOADING ———
     let validatedConfig;
     let resolvedPath;
+    // Determine validation mode early - used throughout config loading and agent creation
+    // Use relaxed validation for interactive modes (web/cli) where users can configure later
+    // Use strict validation for headless modes (server/mcp) that need full config upfront
+    const isInteractiveMode = opts.mode === 'web' || opts.mode === 'cli';
     try {
         // Case 1: File path - skip all validation and setup
         if (opts.agent && isPath(opts.agent)) {
-            resolvedPath = await resolveAgentPath(opts.agent, opts.autoInstall !== false, true);
+            resolvedPath = await resolveAgentPath(opts.agent, opts.autoInstall !== false);
         }
         // Cases 2 & 3: Default agent or registry agent
         else {
@@ -608,23 +668,190 @@ program
                     safeExit('main', 1, 'setup-required-non-interactive');
                 }
                 await handleSetupCommand({ interactive: true });
+                // Reload preferences after setup to get the newly selected default mode
+                // (setup may have just saved a different mode than the default 'web')
+                try {
+                    const newPreferences = await loadGlobalPreferences();
+                    if (newPreferences.defaults?.defaultMode) {
+                        opts.mode = newPreferences.defaults.defaultMode;
+                        logger.debug(`Updated mode from setup preferences: ${opts.mode}`);
+                    }
+                }
+                catch {
+                    // Ignore errors - will use default mode
+                }
             }
-            // Now resolve agent (will auto-install with preferences since setup is complete)
-            resolvedPath = await resolveAgentPath(opts.agent, opts.autoInstall !== false, true);
+            // Now resolve agent (will auto-install since setup is complete)
+            resolvedPath = await resolveAgentPath(opts.agent, opts.autoInstall !== false);
         }
         // Load raw config and apply CLI overrides
         const rawConfig = await loadAgentConfig(resolvedPath);
-        const mergedConfig = applyCLIOverrides(rawConfig, opts);
+        let mergedConfig = applyCLIOverrides(rawConfig, opts);
+        // ——— PREFERENCE-AWARE CONFIG HANDLING ———
+        // For coding-agent (no explicit agent specified): Apply user preferences
+        // For specific agents: Check compatibility and warn if needed
+        const isDefaultAgent = !opts.agent;
+        let preferences = null;
+        if (globalPreferencesExist()) {
+            try {
+                preferences = await loadGlobalPreferences();
+            }
+            catch {
+                // Preferences exist but couldn't load - continue without them
+                logger.debug('Could not load preferences, continuing without them');
+            }
+        }
+        // Check for pending API key setup (user skipped during initial setup)
+        if (isDefaultAgent &&
+            preferences?.setup?.apiKeyPending &&
+            opts.interactive !== false) {
+            // Check if API key is still missing (user may have set it manually)
+            const configuredApiKey = resolveApiKeyForProvider(preferences.llm.provider);
+            if (!configuredApiKey) {
+                const { promptForPendingApiKey } = await import('./cli/utils/api-key-setup.js');
+                const { updateGlobalPreferences } = await import('@dexto/agent-management');
+                const result = await promptForPendingApiKey(preferences.llm.provider, preferences.llm.model);
+                if (result.action === 'cancel') {
+                    safeExit('main', 0, 'pending-api-key-cancelled');
+                }
+                if (result.action === 'setup' && result.apiKey) {
+                    // API key was configured - update preferences to clear pending flag
+                    await updateGlobalPreferences({
+                        setup: { apiKeyPending: false },
+                    });
+                    // Update the merged config with the new API key
+                    mergedConfig.llm.apiKey = result.apiKey;
+                    logger.debug('API key configured, pending flag cleared');
+                }
+                // If 'skip', continue without API key (user chose to proceed)
+            }
+            else {
+                // API key exists (user set it manually) - clear the pending flag
+                const { updateGlobalPreferences } = await import('@dexto/agent-management');
+                await updateGlobalPreferences({
+                    setup: { apiKeyPending: false },
+                });
+                logger.debug('API key found in environment, cleared pending flag');
+            }
+        }
+        if (isDefaultAgent && preferences) {
+            // Default-agent: Apply user's LLM preferences at runtime
+            // This ensures the base agent always uses user's preferred model/provider
+            mergedConfig = applyUserPreferences(mergedConfig, preferences);
+            logger.debug('Applied user preferences to coding-agent', {
+                provider: preferences.llm.provider,
+                model: preferences.llm.model,
+            });
+        }
+        else if (!isDefaultAgent && mergedConfig.llm) {
+            // Specific agent: Check if user has the required provider configured
+            const agentProvider = mergedConfig.llm.provider;
+            const resolvedApiKey = resolveApiKeyForProvider(agentProvider);
+            const compatibility = checkAgentCompatibility(mergedConfig, preferences, resolvedApiKey);
+            if (!compatibility.compatible && opts.interactive !== false) {
+                // User is missing API key for the agent's provider
+                if (!compatibility.userHasApiKey &&
+                    preferences?.llm?.provider &&
+                    preferences?.llm?.model) {
+                    // User has a default LLM configured - offer choice
+                    const { promptForMissingAgentApiKey } = await import('./cli/utils/api-key-setup.js');
+                    const result = await promptForMissingAgentApiKey(compatibility.agentProvider, compatibility.agentModel, preferences.llm.provider, preferences.llm.model);
+                    if (result.action === 'cancel') {
+                        safeExit('main', 0, 'agent-api-key-cancelled');
+                    }
+                    if (result.action === 'use-default') {
+                        // Apply user's default LLM to the agent config
+                        mergedConfig = applyUserPreferences(mergedConfig, preferences);
+                        // Also resolve the actual API key from environment
+                        // (preferences store env var reference like $GOOGLE_API_KEY, not the actual key)
+                        const userApiKey = resolveApiKeyForProvider(preferences.llm.provider);
+                        if (userApiKey) {
+                            mergedConfig.llm.apiKey = userApiKey;
+                        }
+                        logger.debug('Applied user preferences to agent (user chose default)', {
+                            provider: preferences.llm.provider,
+                            model: preferences.llm.model,
+                        });
+                    }
+                    if (result.action === 'add-key' && result.apiKey) {
+                        // User added the API key - update the config
+                        mergedConfig.llm.apiKey = result.apiKey;
+                        logger.debug('Applied new API key to agent config');
+                    }
+                }
+                else {
+                    // No default LLM to fall back to - show warnings only
+                    console.log(chalk.yellow('\n⚠️  Agent Compatibility Notice:'));
+                    for (const warning of compatibility.warnings) {
+                        console.log(chalk.yellow(`   ${warning}`));
+                    }
+                    if (compatibility.instructions.length > 0) {
+                        console.log(chalk.dim('\n   To fix:'));
+                        for (const instruction of compatibility.instructions) {
+                            console.log(chalk.dim(`   ${instruction}`));
+                        }
+                    }
+                    console.log(''); // Empty line for spacing
+                }
+            }
+        }
+        // Clean up null values from config (can happen from YAML files with explicit nulls)
+        // This prevents "Expected string, received null" errors for optional fields
+        const cleanedConfig = cleanNullValues(mergedConfig);
         // Enrich config with per-agent paths BEFORE validation
         // Enrichment adds filesystem paths to storage (schema has in-memory defaults)
         // Interactive CLI mode: only log to file (console would interfere with chat UI)
         const isInteractiveCli = opts.mode === 'cli' && !headlessInput;
-        const enrichedConfig = enrichAgentConfig(mergedConfig, resolvedPath, {
+        const enrichedConfig = enrichAgentConfig(cleanedConfig, resolvedPath, {
             isInteractiveCli,
             logLevel: 'info', // CLI uses info-level logging for visibility
         });
         // Validate enriched config with interactive setup if needed (for API key issues)
-        validatedConfig = await validateAgentConfig(enrichedConfig, opts.interactive !== false);
+        // isInteractiveMode is defined above the try block
+        const validationResult = await validateAgentConfig(enrichedConfig, opts.interactive !== false, { strict: !isInteractiveMode });
+        if (validationResult.success && validationResult.config) {
+            validatedConfig = validationResult.config;
+        }
+        else if (validationResult.skipped) {
+            // User chose to continue despite validation errors
+            // SAFETY: This cast is intentionally unsafe - it's an escape hatch for users
+            // when validation is overly strict or incorrect. Runtime errors will surface
+            // if the config truly doesn't work. Future: explicit `allowUnvalidated` mode.
+            logger.warn('Starting with validation warnings - some features may not work');
+            validatedConfig = enrichedConfig;
+        }
+        else {
+            // Validation failed and user didn't skip - show next steps and exit
+            safeExit('main', 1, 'config-validation-failed');
+        }
+        // ——— LOAD IMAGE DYNAMICALLY (if specified) ———
+        // Priority: CLI flag > Agent config > Environment variable > Default
+        // Images are optional, but default to image-local for convenience
+        const imageName = opts.image || // --image flag
+            validatedConfig.image || // image field in agent config
+            process.env.DEXTO_IMAGE || // DEXTO_IMAGE env var
+            '@dexto/image-local'; // Default for convenience
+        try {
+            await import(imageName);
+            logger.debug(`Loaded image: ${imageName}`);
+        }
+        catch (err) {
+            console.error(`❌ Failed to load image '${imageName}'`);
+            console.error(`💡 Install it with: ${existsSync('package.json') ? 'npm install' : 'npm install -g'} ${imageName}`);
+            if (err instanceof Error) {
+                logger.debug(`Image load error: ${err.message}`);
+            }
+            safeExit('main', 1, 'image-load-failed');
+        }
+        // Validate that if config specifies an image, it matches what was loaded
+        // Skip this check if user explicitly provided --image flag (intentional override)
+        if (!opts.image &&
+            validatedConfig.image &&
+            validatedConfig.image !== imageName) {
+            console.error(`❌ Config specifies image '${validatedConfig.image}' but '${imageName}' was loaded instead`);
+            console.error(`💡 Either remove 'image' from config or ensure it matches the loaded image`);
+            safeExit('main', 1, 'image-mismatch');
+        }
     }
     catch (err) {
         if (err instanceof ExitSignal)
@@ -677,7 +904,10 @@ program
         }
         // Config is already enriched and validated - ready for agent creation
         // DextoAgent will parse/validate again (parse-twice pattern)
-        agent = new DextoAgent(validatedConfig, resolvedPath);
+        // isInteractiveMode is already defined above for validateAgentConfig
+        agent = new DextoAgent(validatedConfig, resolvedPath, {
+            strict: !isInteractiveMode,
+        });
         // Start the agent (initialize async services)
         // - web/server modes: initializeHonoApi will set approval handler and start the agent
         // - cli mode: handles its own approval setup in the case block
@@ -822,6 +1052,38 @@ program
             else {
                 // Interactive mode - session management handled via /resume command
                 // Note: -c and -r flags are validated to require a prompt (headless mode only)
+                // Check if API key is configured before trying to create session
+                // Session creation triggers LLM service init which requires API key
+                const llmConfig = agent.getCurrentLLMConfig();
+                const { requiresApiKey } = await import('@dexto/core');
+                if (requiresApiKey(llmConfig.provider) && !llmConfig.apiKey?.trim()) {
+                    // Offer interactive API key setup instead of just exiting
+                    const { interactiveApiKeySetup } = await import('./cli/utils/api-key-setup.js');
+                    console.log(chalk.yellow(`\n⚠️  API key required for provider '${llmConfig.provider}'\n`));
+                    const setupResult = await interactiveApiKeySetup(llmConfig.provider, {
+                        exitOnCancel: false,
+                        model: llmConfig.model,
+                    });
+                    if (setupResult.cancelled) {
+                        await agent.stop().catch(() => { });
+                        safeExit('main', 0, 'api-key-setup-cancelled');
+                    }
+                    if (setupResult.skipped) {
+                        // User chose to skip - exit with instructions
+                        await agent.stop().catch(() => { });
+                        safeExit('main', 0, 'api-key-pending');
+                    }
+                    if (setupResult.success && setupResult.apiKey) {
+                        // API key was entered and saved - reload config and continue
+                        // Update the agent's LLM config with the new API key
+                        await agent.switchLLM({
+                            provider: llmConfig.provider,
+                            model: llmConfig.model,
+                            apiKey: setupResult.apiKey,
+                        });
+                        logger.info('API key configured successfully, continuing...');
+                    }
+                }
                 // Create session eagerly so slash commands work immediately
                 const session = await agent.createSession();
                 const cliSessionId = session.id;
@@ -873,8 +1135,8 @@ program
                 }
                 safeExit('main', 0);
             }
-            break;
         }
+        // falls through - safeExit returns never, but eslint doesn't know that
         case 'web': {
             // Default to 3000 for web mode
             const defaultPort = opts.port ? parseInt(opts.port, 10) : 3000;
@@ -975,5 +1237,5 @@ program
             safeExit('main', 1, 'unknown-mode');
     }
 }, { timeoutMs: 0 }));
-// 11) PARSE & EXECUTE
+// 14) PARSE & EXECUTE
 program.parseAsync(process.argv);