@defai.digital/ax-cli 3.15.26 → 4.0.1

package/dist/commands/init.js

@@ -1,14 +1,23 @@
 /**
- * Init command - DEPRECATED: Use 'ax-cli setup' instead
+ * Init command for project setup and analysis
  *
- * This command is kept for backwards compatibility and redirects to setup.
- * The project initialization functionality has been integrated into the setup command.
+ * This command initializes project-level configuration (.ax-cli/CUSTOM.md).
+ * For API configuration, use 'ax-cli setup'.
  */
 import { Command } from 'commander';
+import { existsSync, mkdirSync, writeFileSync, renameSync, unlinkSync } from 'fs';
+import { join, resolve } from 'path';
+import * as prompts from '@clack/prompts';
 import chalk from 'chalk';
+import { ProjectAnalyzer } from '../utils/project-analyzer.js';
+import { LLMOptimizedInstructionGenerator } from '../utils/llm-optimized-instruction-generator.js';
+import { InitValidator } from '../utils/init-validator.js';
+import { InitWizard } from './init/wizard.js';
+import { extractErrorMessage } from '../utils/error-handler.js';
+import { CONFIG_DIR_NAME, FILE_NAMES } from '../constants.js';
 export function createInitCommand() {
     const initCommand = new Command('init')
-        .description('Initialize project (deprecated: use "ax-cli setup" instead)')
+        .description('Initialize AX CLI for your project with intelligent analysis')
         .option('-f, --force', 'Force regeneration even if files exist', false)
         .option('-v, --verbose', 'Verbose output showing analysis details', false)
         .option('-d, --directory <dir>', 'Project directory to analyze')
@@ -19,28 +28,167 @@ export function createInitCommand() {
         .option('--dry-run', 'Show what would be done without making changes', false)
         .option('--validate', 'Run validation checks only', false)
         .action(async (options) => {
-        // Show deprecation notice
-        console.log(chalk.yellow('\n⚠️  Deprecation Notice:'));
-        console.log(chalk.yellow('   "ax-cli init" has been merged into "ax-cli setup"'));
-        console.log(chalk.yellow('   Please use "ax-cli setup" for full configuration.\n'));
-        // Build equivalent setup command
-        const args = ['setup'];
-        if (options.force)
-            args.push('--force');
-        if (options.verbose)
-            args.push('--verbose');
-        if (options.directory)
-            args.push('-d', options.directory);
-        // Note: Some init-specific options (template, preview, dry-run, validate)
-        // are not directly supported in setup. Show guidance.
-        if (options.template || options.preview || options.dryRun || options.validate) {
-            console.log(chalk.dim('Note: Some options (--template, --preview, --dry-run, --validate)'));
-            console.log(chalk.dim('are not available in the new setup command.\n'));
+        try {
+            prompts.intro(chalk.cyan('AX CLI Project Initialization'));
+            const projectRoot = options.directory ? resolve(options.directory) : process.cwd();
+            if (options.verbose) {
+                prompts.log.info(`Working directory: ${projectRoot}`);
+            }
+            // Check if in a git repo or has package.json (reasonable project indicator)
+            const hasGit = existsSync(join(projectRoot, '.git'));
+            const hasPackageJson = existsSync(join(projectRoot, 'package.json'));
+            const isProject = hasGit || hasPackageJson;
+            if (!isProject && !options.validate) {
+                prompts.log.warn('No project detected in current directory (no .git or package.json)');
+                prompts.log.info('Run from a project directory to initialize it.');
+                prompts.outro(chalk.yellow('Initialization skipped'));
+                return;
+            }
+            // Run validation (single instance, reused for --validate flag or normal flow)
+            const validator = new InitValidator(projectRoot);
+            const validationResult = validator.validate();
+            if (options.validate) {
+                console.log('\n' + InitValidator.formatValidationResult(validationResult));
+                process.exit(validationResult.valid ? 0 : 1);
+            }
+            if (!validationResult.valid) {
+                prompts.log.error('Project validation failed:');
+                console.log(InitValidator.formatValidationResult(validationResult));
+                process.exit(1);
+            }
+            if (options.verbose && (validationResult.warnings.length > 0 || validationResult.suggestions.length > 0)) {
+                console.log(InitValidator.formatValidationResult(validationResult));
+            }
+            // Check if already initialized
+            const axCliDir = join(projectRoot, CONFIG_DIR_NAME);
+            const customMdPath = join(axCliDir, FILE_NAMES.CUSTOM_MD);
+            const indexPath = join(axCliDir, FILE_NAMES.INDEX_JSON);
+            if (!options.force && existsSync(customMdPath)) {
+                prompts.log.success('Project already initialized!');
+                prompts.log.info(`Custom instructions: ${customMdPath}`);
+                prompts.log.info(`Project index: ${indexPath}`);
+                prompts.log.info('Use --force to regenerate');
+                prompts.outro(chalk.green('Already configured'));
+                return;
+            }
+            // Run interactive wizard for template selection (unless --yes or --no-interaction)
+            let selectedTemplate = undefined;
+            if (!options.noInteraction && !options.yes) {
+                const wizard = new InitWizard({
+                    nonInteractive: options.noInteraction,
+                    yes: options.yes,
+                    template: options.template,
+                });
+                const wizardResult = await wizard.run();
+                selectedTemplate = wizardResult.selectedTemplate;
+            }
+            // Create config directory
+            if (!existsSync(axCliDir)) {
+                mkdirSync(axCliDir, { recursive: true });
+                if (options.verbose) {
+                    prompts.log.info(`Created ${CONFIG_DIR_NAME} directory`);
+                }
+            }
+            // Analyze project
+            const spinner = prompts.spinner();
+            spinner.start('Analyzing project...');
+            const analyzer = new ProjectAnalyzer(projectRoot);
+            const result = await analyzer.analyze();
+            if (!result.success || !result.projectInfo) {
+                spinner.stop('Analysis failed');
+                prompts.log.error(`Project analysis failed: ${result.error || 'Unknown error'}`);
+                process.exit(1);
+            }
+            const projectInfo = result.projectInfo;
+            spinner.stop('Analysis complete');
+            // Display analysis results
+            if (options.verbose) {
+                prompts.log.info(`Project: ${projectInfo.name} (${projectInfo.projectType})`);
+                prompts.log.info(`Language: ${projectInfo.primaryLanguage}`);
+                if (projectInfo.techStack.length > 0) {
+                    prompts.log.info(`Stack: ${projectInfo.techStack.join(', ')}`);
+                }
+            }
+            // Generate content (either from template or project analysis)
+            let instructions;
+            let index;
+            if (selectedTemplate) {
+                instructions = selectedTemplate.instructions;
+                const indexData = {
+                    projectName: selectedTemplate.name,
+                    version: selectedTemplate.version,
+                    projectType: selectedTemplate.projectType,
+                    ...selectedTemplate.metadata,
+                    templateId: selectedTemplate.id,
+                    templateAppliedAt: new Date().toISOString(),
+                };
+                index = JSON.stringify(indexData, null, 2);
+            }
+            else {
+                // Generate LLM-optimized instructions
+                const generator = new LLMOptimizedInstructionGenerator({
+                    compressionLevel: 'moderate',
+                    hierarchyEnabled: true,
+                    criticalRulesCount: 5,
+                    includeDODONT: true,
+                    includeTroubleshooting: true,
+                });
+                instructions = generator.generateInstructions(projectInfo);
+                index = generator.generateIndex(projectInfo);
+            }
+            // Preview or dry-run mode
+            if (options.dryRun) {
+                prompts.log.info('Dry-run mode - no changes made');
+                prompts.log.info(`Would create: ${customMdPath}`);
+                prompts.log.info(`Would create: ${indexPath}`);
+                prompts.outro(chalk.green('Dry-run complete'));
+                return;
+            }
+            // Write files using atomic operations
+            const tmpCustomPath = `${customMdPath}.tmp`;
+            const tmpIndexPath = `${indexPath}.tmp`;
+            try {
+                writeFileSync(tmpCustomPath, instructions, 'utf-8');
+                writeFileSync(tmpIndexPath, index, 'utf-8');
+                // Atomic rename
+                renameSync(tmpCustomPath, customMdPath);
+                renameSync(tmpIndexPath, indexPath);
+                prompts.log.success(`Generated custom instructions: ${customMdPath}`);
+                prompts.log.success(`Generated project index: ${indexPath}`);
+            }
+            catch (writeError) {
+                // Cleanup temp files on error
+                try {
+                    if (existsSync(tmpCustomPath))
+                        unlinkSync(tmpCustomPath);
+                    if (existsSync(tmpIndexPath))
+                        unlinkSync(tmpIndexPath);
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+                throw writeError;
+            }
+            // Show completion summary
+            await prompts.note(`Project: ${projectInfo.name} (${projectInfo.projectType})\n` +
+                `Language: ${projectInfo.primaryLanguage}\n` +
+                (projectInfo.techStack.length > 0 ? `Stack: ${projectInfo.techStack.join(', ')}\n` : '') +
+                `\nFiles created:\n` +
+                `  ${customMdPath}\n` +
+                `  ${indexPath}`, 'Project Summary');
+            await prompts.note('1. Review .ax-cli/CUSTOM.md and customize if needed\n' +
+                '2. Start chatting: ax-cli\n' +
+                '3. Use --force to regenerate after project changes', 'Next Steps');
+            prompts.outro(chalk.green('Project initialized successfully!'));
+        }
+        catch (error) {
+            prompts.log.error(`Error during initialization: ${extractErrorMessage(error)}`);
+            if (options.verbose && error instanceof Error && error.stack) {
+                console.error('\nStack trace:');
+                console.error(error.stack);
+            }
+            process.exit(1);
         }
-        console.log(chalk.cyan('Equivalent command:'));
-        console.log(chalk.cyan(`  ax-cli ${args.join(' ')}\n`));
-        // Instead of running, just inform the user
-        console.log('Run the setup command to configure your project.\n');
     });
     return initCommand;
 }

package/dist/commands/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,iBAAiB;IAC/B,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;SACpC,WAAW,CAAC,6DAA6D,CAAC;SAC1E,MAAM,CAAC,aAAa,EAAE,wCAAwC,EAAE,KAAK,CAAC;SACtE,MAAM,CAAC,eAAe,EAAE,yCAAyC,EAAE,KAAK,CAAC;SACzE,MAAM,CAAC,uBAAuB,EAAE,8BAA8B,CAAC;SAC/D,MAAM,CAAC,WAAW,EAAE,2CAA2C,EAAE,KAAK,CAAC;SACvE,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,KAAK,CAAC;SAChE,MAAM,CAAC,8BAA8B,EAAE,yBAAyB,CAAC;SACjE,MAAM,CAAC,WAAW,EAAE,iCAAiC,EAAE,KAAK,CAAC;SAC7D,MAAM,CAAC,WAAW,EAAE,gDAAgD,EAAE,KAAK,CAAC;SAC5E,MAAM,CAAC,YAAY,EAAE,4BAA4B,EAAE,KAAK,CAAC;SACzD,MAAM,CAAC,KAAK,EAAE,OAUd,EAAE,EAAE;QACH,0BAA0B;QAC1B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,sDAAsD,CAAC,CAAC,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,wDAAwD,CAAC,CAAC,CAAC;QAEpF,iCAAiC;QACjC,MAAM,IAAI,GAAa,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,OAAO,CAAC,KAAK;YAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,OAAO,CAAC,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,OAAO,CAAC,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAE1D,0EAA0E;QAC1E,sDAAsD;QACtD,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC9E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC,CAAC;YAC5F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAExD,2CAA2C;QAC3C,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEL,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}

package/dist/commands/mcp.js

@@ -4,6 +4,7 @@ import { getTemplateNames, getTemplatesByCategory } from '../mcp/templates.js';
 import { getMCPManager } from '../llm/tools.js';
 import { MCPServerIdSchema } from '@ax-cli/schemas';
 import chalk from 'chalk';
+import * as prompts from '@clack/prompts';
 import { ConsoleMessenger } from '../utils/console-messenger.js';
 import { extractErrorMessage } from '../utils/error-handler.js';
 import { validateServerConfig, formatValidationResult } from '../mcp/validation.js';
@@ -35,6 +36,18 @@ export function createMCPCommand() {
         .option('-e, --env [env...]', 'Environment variables (key=value format)', [])
         .action(async (name, options) => {
         try {
+            // BUG FIX: Parse command-line --env options first to supplement process.env
+            // This handles the case where environment variables were set in a way
+            // that the current process doesn't see (e.g., exported in a subshell)
+            const cliEnvVars = {};
+            for (const envVar of options.env || []) {
+                const eqIndex = envVar.indexOf('=');
+                if (eqIndex > 0) {
+                    const key = envVar.slice(0, eqIndex);
+                    const value = envVar.slice(eqIndex + 1);
+                    cliEnvVars[key] = value;
+                }
+            }
             // Check if using template
             if (options.template) {
                 const template = getTemplate(name);
@@ -54,27 +67,49 @@ export function createMCPCommand() {
                 console.log(chalk.gray(template.description));
                 console.log();
                 // Check required environment variables
+                // BUG FIX: Check both process.env AND command-line --env options
                 const envVars = {};
-                let missingEnvVars = false;
+                const missingEnvVarsList = [];
                 for (const envVar of template.requiredEnv) {
-                    const value = process.env[envVar.name];
+                    // Priority: CLI --env flag > process.env
+                    const value = cliEnvVars[envVar.name] || process.env[envVar.name];
                     if (!value) {
-                        console.log(chalk.yellow(`⚠️  Missing environment variable: ${chalk.bold(envVar.name)}`));
-                        console.log(chalk.gray(`   ${envVar.description}`));
-                        if (envVar.url) {
-                            console.log(chalk.gray(`   More info: ${envVar.url}`));
-                        }
-                        console.log();
-                        missingEnvVars = true;
+                        missingEnvVarsList.push(envVar);
                     }
                     else {
                         envVars[envVar.name] = value;
                     }
                 }
-                if (missingEnvVars) {
-                    console.log(chalk.red('❌ Setup cannot continue without required environment variables.'));
-                    console.log();
-                    console.log(chalk.blue('Setup instructions:'));
+                if (missingEnvVarsList.length > 0) {
+                    console.log(chalk.yellow('⚠️  Missing required environment variables:\n'));
+                    for (const envVar of missingEnvVarsList) {
+                        console.log(chalk.yellow(`   • ${chalk.bold(envVar.name)}`));
+                        console.log(chalk.gray(`     ${envVar.description}`));
+                        if (envVar.url) {
+                            console.log(chalk.gray(`     Documentation: ${envVar.url}`));
+                        }
+                        console.log();
+                    }
+                    console.log(chalk.red('❌ Setup cannot continue without required environment variables.\n'));
+                    // BUG FIX: Provide multiple options for setting environment variables
+                    console.log(chalk.blue('Options to provide the missing variables:\n'));
+                    // Option 1: Pass directly via --env flag
+                    const envFlags = missingEnvVarsList.map(e => `--env ${e.name}=YOUR_VALUE`).join(' ');
+                    console.log(chalk.white('  Option 1: Pass directly with --env flag (recommended):'));
+                    console.log(chalk.cyan(`    ax-cli mcp add ${name} --template ${envFlags}\n`));
+                    // Option 2: Export in current shell
+                    console.log(chalk.white('  Option 2: Export in current shell:'));
+                    for (const envVar of missingEnvVarsList) {
+                        console.log(chalk.cyan(`    export ${envVar.name}="your_value"`));
+                    }
+                    console.log(chalk.cyan(`    ax-cli mcp add ${name} --template\n`));
+                    // Option 3: Add to shell profile
+                    console.log(chalk.white('  Option 3: Add to shell profile (~/.bashrc or ~/.zshrc):'));
+                    for (const envVar of missingEnvVarsList) {
+                        console.log(chalk.cyan(`    export ${envVar.name}="your_value"`));
+                    }
+                    console.log(chalk.gray('    Then restart your terminal or run: source ~/.zshrc\n'));
+                    console.log(chalk.blue('Full setup instructions:'));
                     console.log(template.setupInstructions);
                     process.exit(1);
                 }
@@ -554,50 +589,59 @@ export function createMCPCommand() {
             const { MCPHealthMonitor } = await import('../mcp/health.js');
             const manager = getMCPManager();
             const healthMonitor = new MCPHealthMonitor(manager);
+            // JSON mode - plain output
+            if (options.json) {
+                const health = serverName
+                    ? filterValidHealth([await healthMonitor.getServerStatus(serverName)])
+                    : await healthMonitor.getHealthReport();
+                console.log(JSON.stringify(health, null, 2));
+                return;
+            }
             if (options.watch) {
                 // Continuous monitoring mode
-                console.log(chalk.blue.bold('\n📊 MCP Server Health Monitoring\n'));
-                console.log(chalk.gray('Press Ctrl+C to stop\n'));
+                prompts.intro(chalk.cyan('MCP Server Health Monitoring'));
+                prompts.log.info('Press Ctrl+C to stop');
                 // Start monitoring (uses configured health check interval)
                 healthMonitor.start(MCP_CONFIG.HEALTH_CHECK_INTERVAL);
                 // Display initial report
                 const displayHealth = async () => {
                     console.clear();
-                    console.log(chalk.blue.bold('📊 MCP Server Health Report\n'));
-                    console.log(chalk.gray(`Last updated: ${new Date().toLocaleTimeString()}\n`));
+                    prompts.intro(chalk.cyan('MCP Server Health Report'));
+                    prompts.log.message(`Last updated: ${new Date().toLocaleTimeString()}`);
                     const health = serverName
                         ? filterValidHealth([await healthMonitor.getServerStatus(serverName)])
                         : await healthMonitor.getHealthReport();
                     if (health.length === 0) {
-                        console.log(chalk.yellow('No servers connected'));
+                        prompts.log.warn('No servers connected');
                         return;
                     }
                     for (const server of health) {
                         const statusIcon = server.connected ? '✓' : '✗';
-                        const statusColor = server.connected ? chalk.green : chalk.red;
                         const statusText = server.connected ? 'Connected' : 'Disconnected';
-                        console.log(statusColor(`${statusIcon} ${chalk.bold(server.serverName)} (${statusText})`));
-                        console.log(chalk.gray(`  Transport: MCP`));
+                        // Build server info
+                        const serverInfo = [];
+                        serverInfo.push(`Transport: MCP`);
                         if (server.uptime) {
-                            console.log(chalk.gray(`  Uptime: ${MCPHealthMonitor.formatUptime(server.uptime)}`));
+                            serverInfo.push(`Uptime: ${MCPHealthMonitor.formatUptime(server.uptime)}`);
                         }
-                        console.log(chalk.gray(`  Tools: ${server.toolCount} available`));
+                        serverInfo.push(`Tools: ${server.toolCount} available`);
                         if (server.avgLatency) {
-                            console.log(chalk.gray(`  Latency: avg ${MCPHealthMonitor.formatLatency(server.avgLatency)}, p95 ${MCPHealthMonitor.formatLatency(server.p95Latency || 0)}`));
+                            serverInfo.push(`Latency: avg ${MCPHealthMonitor.formatLatency(server.avgLatency)}, p95 ${MCPHealthMonitor.formatLatency(server.p95Latency || 0)}`);
                         }
                         const successRateColor = server.successRate >= 95 ? chalk.green :
                             server.successRate >= 80 ? chalk.yellow : chalk.red;
-                        console.log(chalk.gray(`  Success Rate: ${successRateColor(`${server.successRate.toFixed(1)}%`)} (${server.successCount}/${server.successCount + server.failureCount} calls)`));
+                        serverInfo.push(`Success Rate: ${successRateColor(`${server.successRate.toFixed(1)}%`)} (${server.successCount}/${server.successCount + server.failureCount} calls)`);
                         if (server.lastError) {
-                            console.log(chalk.red(`  Last Error: ${server.lastError}`));
+                            serverInfo.push(chalk.red(`Last Error: ${server.lastError}`));
                             if (server.lastErrorAt) {
                                 const timeSinceError = Date.now() - server.lastErrorAt;
-                                console.log(chalk.gray(`    ${MCPHealthMonitor.formatUptime(timeSinceError)} ago`));
+                                serverInfo.push(`  ${MCPHealthMonitor.formatUptime(timeSinceError)} ago`);
                             }
                         }
-                        console.log();
+                        const titleColor = server.connected ? chalk.green : chalk.red;
+                        prompts.note(serverInfo.join('\n'), titleColor(`${statusIcon} ${server.serverName} (${statusText})`));
                     }
-                    console.log(chalk.gray('Next update in 60 seconds...'));
+                    prompts.log.message(chalk.dim('Next update in 60 seconds...'));
                 };
                 // Display immediately
                 await displayHealth();
@@ -607,67 +651,74 @@ export function createMCPCommand() {
                 process.once('SIGINT', () => {
                     clearInterval(watchInterval);
                     healthMonitor.stop();
-                    console.log(chalk.yellow('\n\n👋 Stopped health monitoring\n'));
+                    prompts.outro(chalk.yellow('Stopped health monitoring'));
                     process.exit(0);
                 });
             }
             else {
-                // One-time health check
+                // One-time health check with @clack/prompts
+                prompts.intro(chalk.cyan('MCP Server Health'));
+                const spinner = prompts.spinner();
+                spinner.start('Checking server health...');
                 const health = serverName
                     ? filterValidHealth([await healthMonitor.getServerStatus(serverName)])
                     : await healthMonitor.getHealthReport();
-                if (options.json) {
-                    console.log(JSON.stringify(health, null, 2));
-                    return;
-                }
+                spinner.stop('Health check complete');
                 if (health.length === 0) {
                     if (serverName) {
-                        console.log(chalk.yellow(`\n⚠️  Server "${serverName}" not found\n`));
+                        prompts.log.warn(`Server "${serverName}" not found`);
                     }
                     else {
-                        console.log(chalk.yellow('\n⚠️  No MCP servers connected\n'));
-                        console.log(chalk.blue('To add a server:'));
-                        console.log(chalk.cyan('  ax-cli mcp add figma --template'));
-                        console.log();
+                        prompts.log.warn('No MCP servers connected');
+                        prompts.log.info('To add a server: ax-cli mcp add figma --template');
                     }
+                    prompts.outro('');
                     return;
                 }
-                console.log(chalk.blue.bold('\n📊 MCP Server Health Report\n'));
+                // Display each server's health
                 for (const server of health) {
                     const statusIcon = server.connected ? '✓' : '✗';
-                    const statusColor = server.connected ? chalk.green : chalk.red;
                     const statusText = server.connected ? 'Connected' : 'Disconnected';
-                    console.log(statusColor(`${statusIcon} ${chalk.bold(server.serverName)} (${statusText})`));
-                    console.log(chalk.gray(`  Transport: MCP`));
+                    // Build server info
+                    const serverInfo = [];
+                    serverInfo.push(`Transport: MCP`);
                     if (server.uptime) {
-                        console.log(chalk.gray(`  Uptime: ${MCPHealthMonitor.formatUptime(server.uptime)}`));
+                        serverInfo.push(`Uptime: ${MCPHealthMonitor.formatUptime(server.uptime)}`);
                     }
-                    console.log(chalk.gray(`  Tools: ${server.toolCount} available`));
+                    serverInfo.push(`Tools: ${server.toolCount} available`);
                     if (server.avgLatency) {
-                        console.log(chalk.gray(`  Latency: avg ${MCPHealthMonitor.formatLatency(server.avgLatency)}, p95 ${MCPHealthMonitor.formatLatency(server.p95Latency || 0)}`));
+                        serverInfo.push(`Latency: avg ${MCPHealthMonitor.formatLatency(server.avgLatency)}, p95 ${MCPHealthMonitor.formatLatency(server.p95Latency || 0)}`);
                     }
                     const successRateColor = server.successRate >= 95 ? chalk.green :
                         server.successRate >= 80 ? chalk.yellow : chalk.red;
-                    console.log(chalk.gray(`  Success Rate: ${successRateColor(`${server.successRate.toFixed(1)}%`)} (${server.successCount}/${server.successCount + server.failureCount} calls)`));
+                    serverInfo.push(`Success Rate: ${successRateColor(`${server.successRate.toFixed(1)}%`)} (${server.successCount}/${server.successCount + server.failureCount} calls)`);
                     if (server.lastError) {
-                        console.log(chalk.red(`  Last Error: ${server.lastError}`));
+                        serverInfo.push(chalk.red(`Last Error: ${server.lastError}`));
                         if (server.lastErrorAt) {
                             const timeSinceError = Date.now() - server.lastErrorAt;
-                            console.log(chalk.gray(`    ${MCPHealthMonitor.formatUptime(timeSinceError)} ago`));
+                            serverInfo.push(`  ${MCPHealthMonitor.formatUptime(timeSinceError)} ago`);
                         }
                     }
                     if (server.lastSuccess) {
                         const timeSinceSuccess = Date.now() - server.lastSuccess;
-                        console.log(chalk.gray(`  Last Successful Call: ${MCPHealthMonitor.formatUptime(timeSinceSuccess)} ago`));
+                        serverInfo.push(`Last Successful Call: ${MCPHealthMonitor.formatUptime(timeSinceSuccess)} ago`);
                     }
-                    console.log();
+                    const titleColor = server.connected ? chalk.green : chalk.red;
+                    prompts.note(serverInfo.join('\n'), titleColor(`${statusIcon} ${server.serverName} (${statusText})`));
+                }
+                // Summary
+                const connectedCount = health.filter(s => s.connected).length;
+                const totalCount = health.length;
+                if (connectedCount === totalCount) {
+                    prompts.outro(chalk.green(`All ${totalCount} server(s) healthy. Use --watch to monitor.`));
+                }
+                else {
+                    prompts.outro(chalk.yellow(`${connectedCount}/${totalCount} server(s) connected. Use --watch to monitor.`));
                 }
-                console.log(chalk.gray('💡 Tip: Use --watch to continuously monitor server health'));
-                console.log();
             }
         }
         catch (error) {
-            console.error(chalk.red(`\n❌ Error: ${extractErrorMessage(error)}\n`));
+            prompts.log.error(`Error: ${extractErrorMessage(error)}`);
             process.exit(1);
         }
     });