@goldensheepai/toknxr-cli 0.2.2 → 0.4.0

package/lib/cli.js

@@ -1,10 +1,13 @@
+#!/usr/bin/env node
 import 'dotenv/config';
 import { Command } from 'commander';
 import chalk from 'chalk';
-import readline from 'readline';
+import inquirer from 'inquirer';
 import { startProxyServer } from './proxy.js';
+import { testConnection, generateSampleInteraction } from './utils.js';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import os from 'os';
 import open from 'open';
 import { createStatsOverview, createProviderTable, createQualityBreakdown, createOperationProgress, createInteractiveMenu, createBox, createCostChart, createPaginatedDisplay, createFilterInterface, createSearchInterface, InteractiveDataExplorer, CliStateManager, filterAndSearchInteractions, } from './ui.js';
 // Gracefully handle broken pipe (e.g., piping output to `head`)
@@ -17,29 +20,37 @@ process.stderr.on('error', (err) => {
         process.exit(0);
 });
 const program = new Command();
+// Simple rainbow color function
+function applyRainbow(text) {
+    const colors = [chalk.red, chalk.yellow, chalk.green, chalk.cyan, chalk.blue, chalk.magenta];
+    return text.split('').map((char, i) => colors[i % colors.length](char)).join('');
+}
 // ASCII Art Welcome Screen with gradient colors
-const asciiArt = `
-${chalk.blue('  ████████╗')}${chalk.hex('#6B5BED')('  ██████╗ ')}${chalk.hex('#9B5BED')(' ██╗  ██╗')}${chalk.hex('#CB5BED')(' ███╗   ██╗')}${chalk.hex('#ED5B9B')(' ██╗  ██╗')}${chalk.hex('#ED5B6B')(' ██████╗ ')}
-${chalk.blue('  ╚══██╔══╝')}${chalk.hex('#6B5BED')(' ██╔═══██╗')}${chalk.hex('#9B5BED')(' ██║ ██╔╝')}${chalk.hex('#CB5BED')(' ████╗  ██║')}${chalk.hex('#ED5B9B')(' ╚██╗██╔╝')}${chalk.hex('#ED5B6B')(' ██╔══██╗')}
-${chalk.blue('     ██║   ')}${chalk.hex('#6B5BED')(' ██║   ██║')}${chalk.hex('#9B5BED')(' █████╔╝ ')}${chalk.hex('#CB5BED')(' ██╔██╗ ██║')}${chalk.hex('#ED5B9B')('  ╚███╔╝ ')}${chalk.hex('#ED5B6B')(' ██████╔╝')}
-${chalk.blue('     ██║   ')}${chalk.hex('#6B5BED')(' ██║   ██║')}${chalk.hex('#9B5BED')(' ██╔═██╗ ')}${chalk.hex('#CB5BED')(' ██║╚██╗██║')}${chalk.hex('#ED5B9B')('  ██╔██╗ ')}${chalk.hex('#ED5B6B')(' ██╔══██╗')}
-${chalk.blue('     ██║   ')}${chalk.hex('#6B5BED')(' ╚██████╔╝')}${chalk.hex('#9B5BED')(' ██║  ██╗')}${chalk.hex('#CB5BED')(' ██║ ╚████║')}${chalk.hex('#ED5B9B')(' ██╔╝ ██╗')}${chalk.hex('#ED5B6B')(' ██║  ██║')}
-${chalk.blue('     ╚═╝   ')}${chalk.hex('#6B5BED')('  ╚═════╝ ')}${chalk.hex('#9B5BED')(' ╚═╝  ╚═╝')}${chalk.hex('#CB5BED')(' ╚═╝  ╚═══╝')}${chalk.hex('#ED5B9B')(' ╚═╝  ╚═╝')}${chalk.hex('#ED5B6B')(' ╚═╝  ╚═╝')}
+const welcomeMessage = `
+${chalk.bold.cyan('TokNXR CLI - AI Effectiveness & Code Quality Analysis')}
+
+${chalk.bold.underline('Getting Started Guide:')}
 
-${chalk.cyan('Tips for getting started:')}
-${chalk.white('1. Start tracking:')} ${chalk.yellow('toknxr start')} ${chalk.gray('- Launch the proxy server')}
-${chalk.white('2. View analytics:')} ${chalk.yellow('toknxr stats')} ${chalk.gray('- See token usage and code quality')}
-${chalk.white('3. Deep dive:')} ${chalk.yellow('toknxr code-analysis')} ${chalk.gray('- Detailed quality insights')}
-${chalk.white('4. Interactive menu:')} ${chalk.yellow('toknxr menu')} ${chalk.gray('- Guided command interface')}
-${chalk.white('5. Set limits:')} ${chalk.yellow('toknxr policy:init')} ${chalk.gray('- Configure spending policies')}
-${chalk.white('7. Need help?')} ${chalk.yellow('toknxr --help')} ${chalk.gray('- View all commands')}
+${chalk.bold.white('Chapter 1: Core Functionality')}
+  ${chalk.white('1.1 Launching the Proxy Server:')}
+     ${chalk.yellow('toknxr start')} ${chalk.gray('- Begin tracking your AI interactions.')}
+  ${chalk.white('1.2 Viewing Analytics:')}
+     ${chalk.yellow('toknxr stats')} ${chalk.gray('- Get an overview of token usage and code quality.')}
+  ${chalk.white('1.3 Deep Code Analysis:')}
+     ${chalk.yellow('toknxr code-analysis')} ${chalk.gray('- Dive into detailed quality insights for your AI-generated code.')}
 
-${chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')}
+${chalk.bold.white('Chapter 2: Advanced Usage')}
+  ${chalk.white('2.1 Interactive Command Menu:')}
+     ${chalk.yellow('toknxr menu')} ${chalk.gray('- Navigate through commands with a guided interface.')}
+  ${chalk.white('2.2 Configuring Spending Policies:')}
+     ${chalk.yellow('toknxr policy:init')} ${chalk.gray('- Set up and manage your AI spending limits.')}
 
-${chalk.hex('#FFD700')('🐑 Powered by Golden Sheep AI')}
+${chalk.bold.white('Chapter 3: Need Assistance?')}
+  ${chalk.white('3.1 Accessing Help:')}
+     ${chalk.yellow('toknxr --help')} ${chalk.gray('- View all available commands and their options.')}
 
+${chalk.gray('------------------------------------------------------------')}
 `;
-console.log(asciiArt);
 /**
  * Generate weekly cost trends for the cost chart visualization
  */
@@ -75,7 +86,7 @@ function generateWeeklyCostTrends(interactions) {
     }
     return dailyCosts;
 }
-program.name('toknxr').description('AI Effectiveness & Code Quality Analysis CLI').version('0.1.0');
+program.name('toknxr').description('AI Effectiveness & Code Quality Analysis CLI').version('0.4.0');
 program
     .command('menu')
     .description('Interactive menu system for TokNXR operations')
@@ -98,38 +109,36 @@ program
                 name: chalk.yellow('🧠 AI Analysis') + chalk.gray(' - Hallucination detection'),
                 value: 'hallucinations',
             },
+            {
+                name: chalk.cyan('🔬 Enhanced Detection') + chalk.gray(' - CodeHalu analysis'),
+                value: 'enhanced_detection',
+            },
             { name: chalk.red('⚙️ Initialize') + chalk.gray(' - Set up configuration'), value: 'init' },
         ]);
-        switch (choice) {
-            case 'start':
-                console.log(chalk.blue.bold('\n🚀 Starting TokNXR Proxy Server'));
-                const spinner = createOperationProgress('Initializing', [
-                    'Loading configuration',
-                    'Setting up providers',
-                    'Starting analytics engine',
-                    'Ready for requests',
-                ]);
-                setTimeout(() => spinner.updateProgress(0), 500);
-                setTimeout(() => spinner.updateProgress(1), 1000);
-                setTimeout(() => spinner.updateProgress(2), 1500);
-                setTimeout(() => {
-                    spinner.updateProgress(3);
-                    spinner.succeed('Proxy server launched successfully!');
-                    startProxyServer();
-                }, 2000);
-                break;
-            case 'stats':
-                // This will auto-trigger the stats command
-                break;
-            case 'analysis':
-                // This will auto-trigger the code-analysis command
-                break;
-            case 'hallucinations':
-                // This will trigger hallucination analytics
-                break;
-            case 'init':
-                // This will trigger init command
-                break;
+        try {
+            switch (choice) {
+                case 'start':
+                    await program.parseAsync(['node', 'toknxr', 'start']);
+                    break;
+                case 'stats':
+                    await program.parseAsync(['node', 'toknxr', 'stats']);
+                    break;
+                case 'analysis':
+                    await program.parseAsync(['node', 'toknxr', 'code-analysis']);
+                    break;
+                case 'hallucinations':
+                    await program.parseAsync(['node', 'toknxr', 'hallucinations']);
+                    break;
+                case 'enhanced_detection':
+                    await program.parseAsync(['node', 'toknxr', 'hallucinations-detailed']);
+                    break;
+                case 'init':
+                    await program.parseAsync(['node', 'toknxr', 'init']);
+                    break;
+            }
+        }
+        catch (e) {
+            // This will catch the exit override
         }
     }
     catch (error) {
@@ -327,10 +336,6 @@ program
     // Interactive navigation and context-aware guidance
     console.log('\n' + chalk.blue.bold('🔍 Interactive Navigation'));
     console.log(chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
     // Analyze current situation for intelligent suggestions
     const currentSituation = {
         needsBudgetAttention: grandTotals.costUSD > 40, // 80% of monthly budget
@@ -383,94 +388,97 @@ program
             recommended: false,
         },
     ];
-    console.log(chalk.gray('Select an option to continue your analysis journey:'));
-    console.log();
-    navigationOptions.forEach(option => {
-        const prefix = option.recommended ? chalk.green('★') : ' ';
-        console.log(`${prefix} ${chalk.bold(option.key)}) ${option.title}`);
-        console.log(`    ${option.description}`);
-    });
-    console.log();
-    rl.question(chalk.cyan('Your choice: '), answer => {
-        const choice = answer.toLowerCase().trim();
-        switch (choice) {
-            case '1':
-                console.log(chalk.blue('\n🔍 Navigating to detailed analysis...'));
-                console.log(chalk.cyan('Use: ') +
-                    chalk.yellow('toknxr code-analysis') +
-                    chalk.gray(' for deep quality insights'));
-                setTimeout(async () => {
-                    try {
-                        const { execSync } = await import('child_process');
-                        execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./code-analysis.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr code-analysis\"", { stdio: 'inherit' });
-                    }
-                    catch {
-                        console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr code-analysis'));
-                    }
-                }, 500);
-                break;
-            case '2':
-                console.log(chalk.magenta('\n🧠 Navigating to AI performance insights...'));
-                console.log(chalk.cyan('Use: ') +
-                    chalk.yellow('toknxr hallucinations') +
-                    chalk.gray(' for hallucination analysis'));
-                setTimeout(async () => {
-                    try {
-                        const { execSync } = await import('child_process');
-                        execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./hallucinations.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr hallucinations\"", { stdio: 'inherit' });
-                    }
-                    catch {
-                        console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr hallucinations'));
-                    }
-                }, 500);
-                break;
-            case '3':
-                console.log(chalk.yellow('\n💰 Navigating to budget optimization...'));
-                console.log(chalk.gray('📋 Budget Optimization Strategies:'));
-                console.log(`  • Monthly budget: $${(50).toFixed(2)} (spent: $${grandTotals.costUSD.toFixed(2)})`);
-                console.log(`  • Daily average: $${(grandTotals.costUSD / Math.max(1, Math.ceil((new Date().getTime() - new Date(interactions[0]?.timestamp || Date.now()).getTime()) / (1000 * 60 * 60 * 24)))).toFixed(2)}`);
-                console.log(`  • ${avgQuality >= 80 ? 'Try cheaper providers with similar quality' : 'Focus on prompt optimization to reduce request volume'}`);
-                break;
-            case '4':
-                console.log(chalk.green('\n📈 Starting real-time monitoring...'));
-                console.log(chalk.cyan('Use: ') +
-                    chalk.yellow('toknxr tail') +
-                    chalk.gray(' to monitor live interactions'));
-                setTimeout(async () => {
-                    try {
-                        const { execSync } = await import('child_process');
-                        execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./tail.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr tail\"", { stdio: 'inherit' });
-                    }
-                    catch {
-                        console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr tail'));
-                    }
-                }, 500);
-                break;
-            case '5':
-                console.log(chalk.blue('\n🚀 Starting AI refinement journey...'));
-                console.log(chalk.gray('📝 Improvement Recommendations:'));
-                if (avgQuality < 75) {
-                    console.log(chalk.yellow('  • 🎯 Switch to higher-quality AI models (91vs88 scores)'));
-                    console.log(chalk.yellow('  • 📝 Use more specific prompt instructions'));
+    console.log(chalk.gray('\nSelect an option to continue your analysis journey:'));
+    const choices = navigationOptions.map(option => ({
+        name: `${option.recommended ? chalk.green('★') : ' '}${chalk.bold(option.key)}) ${option.title}\n    ${option.description}`,
+        value: option.key,
+    }));
+    const { choice } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'Your choice:',
+            choices: choices,
+        },
+    ]);
+    switch (choice) {
+        case '1':
+            console.log(chalk.blue('\n🔍 Navigating to detailed analysis...'));
+            console.log(chalk.cyan('Use: ') +
+                chalk.yellow('toknxr code-analysis') +
+                chalk.gray(' for deep quality insights'));
+            setTimeout(async () => {
+                try {
+                    const { execSync } = await import('child_process');
+                    execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./code-analysis.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr code-analysis\"", { stdio: 'inherit' });
+                }
+                catch {
+                    console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr code-analysis'));
                 }
-                if (grandTotals.costUSD > 25) {
-                    console.log(chalk.red('  • 💰 Consider API usage limits or budget alerts'));
-                    console.log(chalk.red('  • 🔄 Explore cost-efficient AI providers'));
+            }, 500);
+            break;
+        case '2':
+            console.log(chalk.magenta('\n🧠 Navigating to AI performance insights...'));
+            console.log(chalk.cyan('Use: ') +
+                chalk.yellow('toknxr hallucinations') +
+                chalk.gray(' for hallucination analysis'));
+            setTimeout(async () => {
+                try {
+                    const { execSync } = await import('child_process');
+                    execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./hallucinations.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr hallucinations\"", { stdio: 'inherit' });
                 }
-                if (Object.keys(stats).length === 1) {
-                    console.log(chalk.blue('  • 🧪 A/B test multiple AI providers for your use case'));
+                catch {
+                    console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr hallucinations'));
                 }
-                break;
-            case 'm':
-            case 'menu':
-                console.log(chalk.gray('\n📋 Opening interactive menu...'));
-                setTimeout(async () => {
-                    try {
-                        const { spawn } = await import('child_process');
-                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                        const menuCommand = spawn('node', [
-                            '-e',
-                            `
+            }, 500);
+            break;
+        case '3':
+            console.log(chalk.yellow('\n💰 Navigating to budget optimization...'));
+            console.log(chalk.gray('📋 Budget Optimization Strategies:'));
+            console.log(`  • Monthly budget: $${(50).toFixed(2)} (spent: $${grandTotals.costUSD.toFixed(2)})`);
+            console.log(`  • Daily average: $${(grandTotals.costUSD / Math.max(1, Math.ceil((new Date().getTime() - new Date(interactions[0]?.timestamp || Date.now()).getTime()) / (1000 * 60 * 60 * 24)))).toFixed(2)}`);
+            console.log(`  • ${avgQuality >= 80 ? 'Try cheaper providers with similar quality' : 'Focus on prompt optimization to reduce request volume'}`);
+            break;
+        case '4':
+            console.log(chalk.green('\n📈 Starting real-time monitoring...'));
+            console.log(chalk.cyan('Use: ') +
+                chalk.yellow('toknxr tail') +
+                chalk.gray(' to monitor live interactions'));
+            setTimeout(async () => {
+                try {
+                    const { execSync } = await import('child_process');
+                    execSync("node -e \"if(require('fs').existsSync('package.json')) { process.chdir(__dirname); require('tsx/dist/esbuild-register').register(); require('./tail.ts').action(); }\" 2>/dev/null || echo \"Please run: toknxr tail\"", { stdio: 'inherit' });
+                }
+                catch {
+                    console.log(chalk.gray('Please run: ') + chalk.cyan('toknxr tail'));
+                }
+            }, 500);
+            break;
+        case '5':
+            console.log(chalk.blue('\n🚀 Starting AI refinement journey...'));
+            console.log(chalk.gray('📝 Improvement Recommendations:'));
+            if (avgQuality < 75) {
+                console.log(chalk.yellow('  • 🎯 Switch to higher-quality AI models (91vs88 scores)'));
+                console.log(chalk.yellow('  • 📝 Use more specific prompt instructions'));
+            }
+            if (grandTotals.costUSD > 25) {
+                console.log(chalk.red('  • 💰 Consider API usage limits or budget alerts'));
+                console.log(chalk.red('  • 🔄 Explore cost-efficient AI providers'));
+            }
+            if (Object.keys(stats).length === 1) {
+                console.log(chalk.blue('  • 🧪 A/B test multiple AI providers for your use case'));
+            }
+            break;
+        case 'm':
+        case 'menu':
+            console.log(chalk.gray('\n📋 Opening interactive menu...'));
+            setTimeout(async () => {
+                try {
+                    const { spawn } = await import('child_process');
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    const menuCommand = spawn('node', [
+                        '-e',
+                        `
                 try {
                   process.chdir('${process.cwd().replace(/\\/g, '\\\\')}');
                   require('tsx/dist/esbuild-register').register();
@@ -483,29 +491,27 @@ program
                   console.log('Please run: toknxr menu');
                 }
               `,
-                        ], { stdio: 'inherit' });
-                    }
-                    catch (e) {
-                        console.log('Please run: toknxr menu');
-                    }
-                }, 300);
-                break;
-            case 'q':
-            case 'quit':
-            case 'exit':
-                console.log(chalk.gray('\n👋 Thanks for using TokNXR analytics!'));
-                console.log(chalk.gray('Raw data available in: ') + chalk.cyan('interactions.log'));
-                break;
-            default:
-                console.log(chalk.yellow(`Unknown option "${answer}". Showing help...`));
-                console.log(chalk.cyan('\nAvailable commands:'));
-                console.log(`  ${chalk.yellow('toknxr menu')}     - Interactive command menu`);
-                console.log(`  ${chalk.yellow('toknxr stats')}    - Current usage overview`);
-                console.log(`  ${chalk.yellow('toknxr start')}    - Launch proxy server`);
-                console.log(`  ${chalk.yellow('toknxr --help')}   - View all commands`);
-        }
-        rl.close();
-    });
+                    ], { stdio: 'inherit' });
+                }
+                catch (e) {
+                    console.log('Please run: toknxr menu');
+                }
+            }, 300);
+            break;
+        case 'q':
+        case 'quit':
+        case 'exit':
+            console.log(chalk.gray('\n👋 Thanks for using TokNXR analytics!'));
+            console.log(chalk.gray('Raw data available in: ') + chalk.cyan('interactions.log'));
+            break;
+        default:
+            console.log(chalk.yellow(`Unknown option "${choice}". Showing help...`));
+            console.log(chalk.cyan('\nAvailable commands:'));
+            console.log(`  ${chalk.yellow('toknxr menu')}     - Interactive command menu`);
+            console.log(`  ${chalk.yellow('toknxr stats')}    - Current usage overview`);
+            console.log(`  ${chalk.yellow('toknxr start')}    - Launch proxy server`);
+            console.log(`  ${chalk.yellow('toknxr --help')}   - View all commands`);
+    }
 });
 program
     .command('init')
@@ -612,7 +618,7 @@ program
 program
     .command('code-analysis')
     .description('Show detailed code quality analysis from coding interactions')
-    .action(() => {
+    .action(async () => {
     const logFilePath = path.resolve(process.cwd(), 'interactions.log');
     if (!fs.existsSync(logFilePath)) {
         console.log(chalk.yellow('No interactions logged yet. Use the `start` command to begin tracking.'));
@@ -721,12 +727,112 @@ program
         console.log('  • Consider establishing code review processes for edge cases');
     }
     console.log(`\n${chalk.gray('Total coding interactions analyzed: ' + interactions.length)}`);
+    // Interactive navigation
+    console.log('\n' + chalk.blue.bold('🔍 Interactive Navigation'));
+    console.log(chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    const navigationOptions = [
+        {
+            key: '1',
+            title: chalk.cyan('📊 View Detailed Metrics'),
+            description: 'Drill down into specific quality metrics',
+            available: interactions.length > 0,
+        },
+        {
+            key: '2',
+            title: chalk.magenta('🧠 Hallucination Analysis'),
+            description: 'Analyze potential hallucinations in code',
+            available: interactions.length > 0,
+        },
+        {
+            key: '3',
+            title: chalk.yellow('🔄 Provider Comparison'),
+            description: 'Compare code quality across AI providers',
+            available: interactions.length > 0,
+        },
+        {
+            key: '4',
+            title: chalk.green('📈 View All Analytics'),
+            description: 'Go to comprehensive statistics view',
+            available: true,
+        },
+        {
+            key: '5',
+            title: chalk.blue('🔍 Browse Interactions'),
+            description: 'Browse through individual interactions',
+            available: interactions.length > 0,
+        },
+        {
+            key: 'm',
+            title: chalk.gray('📋 Main Menu'),
+            description: 'Return to main menu',
+            available: true,
+        },
+        {
+            key: 'q',
+            title: chalk.gray('❌ Exit'),
+            description: 'Exit code analysis',
+            available: true,
+        },
+    ];
+    const availableChoices = navigationOptions
+        .filter(option => option.available)
+        .map(option => ({
+        name: `${chalk.bold(option.key)}) ${option.title}\n    ${option.description}`,
+        value: option.key,
+    }));
+    const { choice } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'What would you like to explore?',
+            choices: availableChoices,
+        },
+    ]);
+    switch (choice) {
+        case '1':
+            console.log(chalk.cyan('\n📊 Showing detailed quality metrics...'));
+            console.log(chalk.gray('Detailed breakdown by language and complexity:'));
+            Object.entries(langStats).forEach(([lang, count]) => {
+                const langInteractions = interactions.filter(i => (i.codeQualityMetrics?.language || 'unknown') === lang);
+                const avgQuality = langInteractions.reduce((sum, i) => sum + (i.codeQualityScore || 0), 0) / langInteractions.length;
+                console.log(`  • ${lang}: ${count} requests, avg quality: ${avgQuality.toFixed(1)}/100`);
+            });
+            break;
+        case '2':
+            console.log(chalk.magenta('\n🧠 Opening hallucination analysis...'));
+            await program.parseAsync(['node', 'toknxr', 'hallucinations']);
+            break;
+        case '3':
+            console.log(chalk.yellow('\n🔄 Opening provider comparison...'));
+            await program.parseAsync(['node', 'toknxr', 'providers']);
+            break;
+        case '4':
+            console.log(chalk.green('\n📈 Opening comprehensive analytics...'));
+            await program.parseAsync(['node', 'toknxr', 'stats']);
+            break;
+        case '5':
+            console.log(chalk.blue('\n🔍 Opening interaction browser...'));
+            await program.parseAsync(['node', 'toknxr', 'browse']);
+            break;
+        case 'm':
+            console.log(chalk.gray('\n📋 Opening main menu...'));
+            await program.parseAsync(['node', 'toknxr', 'menu']);
+            break;
+        case 'q':
+            console.log(chalk.gray('\n👋 Exiting code analysis...'));
+            break;
+        default:
+            console.log(chalk.yellow(`Unknown option "${choice}".`));
+    }
 });
 // Import required modules for new AI analysis commands
 import { hallucinationDetector } from './hallucination-detector.js';
 import { analyzeCodeQuality, scoreEffectiveness, extractCodeFromResponse, } from './code-analysis.js';
 import { aiAnalytics } from './ai-analytics.js';
 import { auditLogger, AuditEventType, initializeAuditLogging } from './audit-logger.js';
+// Import enhanced hallucination detection commands
+import { hallucinationsDetailedCommand, codeQualityReportCommand } from './commands/hallucination-commands.js';
+import { detectCodeHallucinations } from './enhanced-hallucination-detector.js';
 program
     .command('analyze')
     .description('Analyze an AI response for hallucinations and quality issues')
@@ -831,12 +937,71 @@ program
         console.log(chalk.red('  ❌ Poor quality - significant issues detected'));
     }
 });
+// Enhanced hallucination detection commands
+program
+    .command('hallucinations-detailed')
+    .description('Detailed hallucination analysis with CodeHalu categories')
+    .option('-c, --category <category>', 'Filter by hallucination category')
+    .option('-p, --provider <provider>', 'Filter by AI provider')
+    .option('-f, --file <file>', 'Analyze code from file')
+    .option('--code <code>', 'Analyze code directly')
+    .option('-l, --language <language>', 'Programming language (default: python)')
+    .option('--no-execution', 'Disable execution analysis')
+    .option('-o, --output <file>', 'Export results to file')
+    .action(hallucinationsDetailedCommand);
+program
+    .command('code-quality-report')
+    .description('Generate comprehensive code quality report')
+    .option('-o, --output <file>', 'Output file path')
+    .option('--format <format>', 'Output format (json|html)', 'json')
+    .option('--include-execution', 'Include execution analysis in report')
+    .action(codeQualityReportCommand);
+program
+    .command('detect-hallucinations')
+    .description('Quick hallucination detection for code snippet')
+    .argument('<code>', 'Code to analyze')
+    .option('-l, --language <language>', 'Programming language (default: python)', 'python')
+    .option('--no-execution', 'Disable execution analysis')
+    .option('--confidence <threshold>', 'Confidence threshold (0.0-1.0)', '0.6')
+    .action(async (code, options) => {
+    console.log(chalk.bold.blue('🔍 Quick Hallucination Detection'));
+    console.log(chalk.gray('━'.repeat(50)));
+    try {
+        const result = await detectCodeHallucinations(code, options.language, {
+            enableExecution: !options.noExecution,
+            confidenceThreshold: parseFloat(options.confidence),
+        });
+        const rateColor = result.overallHallucinationRate > 0.7 ? chalk.red :
+            result.overallHallucinationRate > 0.4 ? chalk.yellow : chalk.green;
+        console.log(`\n🎯 Hallucination Rate: ${rateColor(`${(result.overallHallucinationRate * 100).toFixed(1)}%`)}`);
+        console.log(`📊 Issues Found: ${result.categories.length}`);
+        console.log(`⏱️  Analysis Time: ${result.analysisMetadata.detectionTimeMs}ms`);
+        if (result.categories.length > 0) {
+            console.log(chalk.yellow('\n⚠️  Top Issues:'));
+            result.categories.slice(0, 3).forEach((category, index) => {
+                console.log(`  ${index + 1}. ${category.type}/${category.subtype} - ${category.description}`);
+            });
+        }
+        else {
+            console.log(chalk.green('\n✅ No significant hallucinations detected!'));
+        }
+        if (result.recommendations.length > 0) {
+            console.log(chalk.blue('\n💡 Quick Recommendations:'));
+            result.recommendations.slice(0, 2).forEach(rec => {
+                console.log(`  • ${rec.title}`);
+            });
+        }
+    }
+    catch (error) {
+        console.error(chalk.red('❌ Detection failed:'), error);
+    }
+});
 program
     .command('hallucinations')
     .description('Show hallucination statistics and trends')
     .option('-p, --provider <provider>', 'Filter by AI provider')
     .option('-l, --last <hours>', 'Show last N hours (default: 24)', '24')
-    .action(options => {
+    .action(async (options) => {
     const analytics = aiAnalytics.generateAnalytics();
     console.log(chalk.bold.blue('🧠 Hallucination Analytics'));
     console.log(chalk.gray('━'.repeat(50)));
@@ -867,11 +1032,98 @@ program
             console.log(`  • ${rec}`);
         });
     }
+    // Interactive navigation
+    console.log('\n' + chalk.blue.bold('🔍 Interactive Navigation'));
+    console.log(chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    const navigationOptions = [
+        {
+            key: '1',
+            title: chalk.cyan('📊 View Detailed Analysis'),
+            description: 'Deep dive into specific hallucination patterns',
+            available: analytics.totalInteractions > 0,
+        },
+        {
+            key: '2',
+            title: chalk.magenta('🔄 Compare Providers'),
+            description: 'Detailed provider comparison for hallucinations',
+            available: Object.keys(analytics.providerComparison).length > 1,
+        },
+        {
+            key: '3',
+            title: chalk.yellow('💰 Business Impact Analysis'),
+            description: 'Analyze cost and time impact of hallucinations',
+            available: analytics.hallucinationMetrics.businessImpact.estimatedDevTimeWasted > 0,
+        },
+        {
+            key: '4',
+            title: chalk.green('📈 View All Analytics'),
+            description: 'Go to comprehensive statistics view',
+            available: true,
+        },
+        {
+            key: 'm',
+            title: chalk.gray('📋 Main Menu'),
+            description: 'Return to main menu',
+            available: true,
+        },
+        {
+            key: 'q',
+            title: chalk.gray('❌ Exit'),
+            description: 'Exit hallucination analysis',
+            available: true,
+        },
+    ];
+    const availableChoices = navigationOptions
+        .filter(option => option.available)
+        .map(option => ({
+        name: `${chalk.bold(option.key)}) ${option.title}\n    ${option.description}`,
+        value: option.key,
+    }));
+    const { choice } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'What would you like to explore?',
+            choices: availableChoices,
+        },
+    ]);
+    switch (choice) {
+        case '1':
+            console.log(chalk.cyan('\n📊 Opening detailed hallucination analysis...'));
+            await program.parseAsync(['node', 'toknxr', 'code-analysis']);
+            break;
+        case '2':
+            console.log(chalk.magenta('\n🔄 Opening provider comparison...'));
+            await program.parseAsync(['node', 'toknxr', 'providers']);
+            break;
+        case '3':
+            console.log(chalk.yellow('\n💰 Analyzing business impact...'));
+            console.log(chalk.gray('Business impact details:'));
+            const impact = analytics.hallucinationMetrics.businessImpact;
+            console.log(`  • Estimated dev time wasted: ${impact.estimatedDevTimeWasted}h`);
+            console.log(`  • Quality degradation score: ${impact.qualityDegradationScore}/100`);
+            console.log(`  • ROI impact: ${impact.roiImpact}% reduction`);
+            console.log(`  • Extra cost from hallucinations: ${impact.costOfHallucinations.toFixed(2)}`);
+            break;
+        case '4':
+            console.log(chalk.green('\n📈 Opening comprehensive analytics...'));
+            await program.parseAsync(['node', 'toknxr', 'stats']);
+            break;
+        case 'm':
+            console.log(chalk.gray('\n📋 Opening main menu...'));
+            await program.parseAsync(['node', 'toknxr', 'menu']);
+            break;
+        case 'q':
+            console.log(chalk.gray('\n👋 Exiting hallucination analysis...'));
+            break;
+        default:
+            console.log(chalk.yellow(`Unknown option "${choice}".`));
+    }
 });
 program
     .command('providers')
     .description('Compare AI provider performance')
-    .action(() => {
+    .action(async () => {
     const analytics = aiAnalytics.generateAnalytics();
     console.log(chalk.bold.blue('🔄 AI Provider Comparison'));
     console.log(chalk.gray('━'.repeat(50)));
@@ -918,18 +1170,172 @@ program
         console.log(`  Best Provider: ${chalk.green(bestProvider[0])} (${bestProvider[1].avgQualityScore}/100 quality)`);
         console.log(`  Needs Attention: ${chalk.red(worstProvider[0])} (${worstProvider[1].avgQualityScore}/100 quality)`);
     }
+    // Interactive navigation
+    console.log('\n' + chalk.blue.bold('🔍 Interactive Navigation'));
+    console.log(chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    const providerList = Object.keys(analytics.providerComparison);
+    const navigationOptions = [
+        {
+            key: '1',
+            title: chalk.cyan('📊 Detailed Provider Analysis'),
+            description: 'Deep dive into individual provider metrics',
+            available: providerList.length > 0,
+        },
+        {
+            key: '2',
+            title: chalk.magenta('🧠 Hallucination Comparison'),
+            description: 'Compare hallucination rates across providers',
+            available: providerList.length > 1,
+        },
+        {
+            key: '3',
+            title: chalk.yellow('💰 Cost Optimization'),
+            description: 'Analyze cost-effectiveness by provider',
+            available: true,
+        },
+        {
+            key: '4',
+            title: chalk.green('📈 View All Analytics'),
+            description: 'Go to comprehensive statistics view',
+            available: true,
+        },
+        {
+            key: 'm',
+            title: chalk.gray('📋 Main Menu'),
+            description: 'Return to main menu',
+            available: true,
+        },
+        {
+            key: 'q',
+            title: chalk.gray('❌ Exit'),
+            description: 'Exit provider comparison',
+            available: true,
+        },
+    ];
+    const availableChoices = navigationOptions
+        .filter(option => option.available)
+        .map(option => ({
+        name: `${chalk.bold(option.key)}) ${option.title}\n    ${option.description}`,
+        value: option.key,
+    }));
+    const { choice } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'What would you like to explore?',
+            choices: availableChoices,
+        },
+    ]);
+    switch (choice) {
+        case '1':
+            console.log(chalk.cyan('\n📊 Opening detailed provider analysis...'));
+            if (providerList.length > 1) {
+                const { selectedProvider } = await inquirer.prompt([
+                    {
+                        type: 'list',
+                        name: 'selectedProvider',
+                        message: 'Select a provider to analyze:',
+                        choices: providerList.map(provider => ({
+                            name: `${provider} (${analytics.providerComparison[provider].avgQualityScore}/100 quality)`,
+                            value: provider,
+                        })),
+                    },
+                ]);
+                const providerStats = analytics.providerComparison[selectedProvider];
+                console.log(chalk.cyan(`\n📊 Detailed Analysis for ${selectedProvider}:`));
+                console.log(`  Total Interactions: ${providerStats.totalInteractions}`);
+                console.log(`  Avg Quality Score: ${providerStats.avgQualityScore}/100`);
+                console.log(`  Avg Effectiveness: ${providerStats.avgEffectivenessScore}/100`);
+                console.log(`  Hallucination Rate: ${providerStats.hallucinationRate}%`);
+                console.log(`  Dev Time Wasted: ${providerStats.businessImpact.estimatedDevTimeWasted}h`);
+            }
+            else {
+                console.log(chalk.gray('Only one provider available. Run: ') + chalk.yellow('toknxr code-analysis'));
+            }
+            break;
+        case '2':
+            console.log(chalk.magenta('\n🧠 Opening hallucination comparison...'));
+            await program.parseAsync(['node', 'toknxr', 'hallucinations']);
+            break;
+        case '3':
+            console.log(chalk.yellow('\n💰 Analyzing cost optimization...'));
+            console.log(chalk.gray('Cost optimization recommendations:'));
+            providerList.forEach(provider => {
+                const stats = analytics.providerComparison[provider];
+                const efficiency = stats.avgQualityScore / (stats.businessImpact.costOfHallucinations || 1);
+                console.log(`  • ${provider}: Quality/Cost ratio = ${efficiency.toFixed(2)}`);
+            });
+            break;
+        case '4':
+            console.log(chalk.green('\n📈 Opening comprehensive analytics...'));
+            await program.parseAsync(['node', 'toknxr', 'stats']);
+            break;
+        case 'm':
+            console.log(chalk.gray('\n📋 Opening main menu...'));
+            await program.parseAsync(['node', 'toknxr', 'menu']);
+            break;
+        case 'q':
+            console.log(chalk.gray('\n👋 Exiting provider comparison...'));
+            break;
+        default:
+            console.log(chalk.yellow(`Unknown option "${choice}".`));
+    }
 });
 program
     .command('export')
     .description('Export analytics data to JSON file')
-    .option('-o, --output <file>', 'Output file path', 'ai-analytics-export.json')
-    .action(options => {
+    .option('-o, --output <file>', 'Output file path')
+    .action(async (options) => {
     try {
-        aiAnalytics.exportAnalytics(options.output);
-        console.log(chalk.green(`✅ Analytics exported to ${options.output}`));
+        let outputPath = options.output;
+        if (!outputPath) { // If -o option is not provided, use interactive mode
+            const { locationType } = await inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'locationType',
+                    message: 'Where would you like to save the export file?',
+                    choices: [
+                        { name: 'Current Directory', value: 'current' },
+                        { name: 'Desktop', value: 'desktop' },
+                        { name: 'Custom Path', value: 'custom' },
+                    ],
+                },
+            ]);
+            let chosenDirectory = process.cwd();
+            if (locationType === 'desktop') {
+                chosenDirectory = path.join(os.homedir(), 'Desktop');
+            }
+            else if (locationType === 'custom') {
+                const { customPath } = await inquirer.prompt([
+                    {
+                        type: 'input',
+                        name: 'customPath',
+                        message: 'Enter the custom directory path:',
+                        default: process.cwd(),
+                    },
+                ]);
+                chosenDirectory = customPath;
+            }
+            const { filename } = await inquirer.prompt([
+                {
+                    type: 'input',
+                    name: 'filename',
+                    message: 'Enter the filename for the export:',
+                    default: 'ai-analytics-export.json',
+                },
+            ]);
+            // Ensure the chosen directory exists
+            if (!fs.existsSync(chosenDirectory)) {
+                fs.mkdirSync(chosenDirectory, { recursive: true });
+                console.log(chalk.green(`Created directory: ${chosenDirectory}`));
+            }
+            outputPath = path.join(chosenDirectory, filename);
+        }
+        aiAnalytics.exportAnalytics(outputPath);
+        console.log(chalk.green(`✅ Analytics exported to ${outputPath}`));
     }
-    catch {
-        console.error(chalk.red('❌ Export failed'));
+    catch (error) {
+        console.error(chalk.red('❌ Export failed'), error);
     }
 });
 // Enhanced Interactive Commands - Phase 3+
@@ -998,15 +1404,169 @@ program
     console.log(createPaginatedDisplay(explorer.getCurrentPageData(), pageSize, currentPage, renderInteraction, `🐙 AI Interactions Browser (${explorer.getPaginationInfo().totalItems} total)`));
     // Interactive navigation
     const pagination = explorer.getPaginationInfo();
-    if (pagination.totalPages > 1) {
-        console.log(chalk.cyan('\nNavigation:'));
-        console.log(chalk.gray('• Use ') +
-            chalk.yellow('toknxr browse --page 2') +
-            chalk.gray(' to go to page 2'));
-        console.log(chalk.gray('• Use ') +
-            chalk.yellow('toknxr browse --size 25') +
-            chalk.gray(' for more items per page'));
-        console.log(chalk.gray('• Use ') + chalk.yellow('toknxr filter') + chalk.gray(' to filter results'));
+    console.log('\n' + chalk.blue.bold('🔍 Interactive Navigation'));
+    console.log(chalk.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    const navigationOptions = [
+        {
+            key: 'n',
+            title: chalk.cyan('📄 Next Page'),
+            description: `Go to page ${currentPage + 1}`,
+            available: currentPage < pagination.totalPages,
+        },
+        {
+            key: 'p',
+            title: chalk.cyan('📄 Previous Page'),
+            description: `Go to page ${currentPage - 1}`,
+            available: currentPage > 1,
+        },
+        {
+            key: 'f',
+            title: chalk.magenta('🔍 Filter Results'),
+            description: 'Apply filters to narrow down interactions',
+            available: true,
+        },
+        {
+            key: 's',
+            title: chalk.yellow('🔍 Search Interactions'),
+            description: 'Search through all interactions',
+            available: true,
+        },
+        {
+            key: 'a',
+            title: chalk.green('📊 View Analytics'),
+            description: 'Go to detailed statistics view',
+            available: true,
+        },
+        {
+            key: 'm',
+            title: chalk.gray('📋 Main Menu'),
+            description: 'Return to main menu',
+            available: true,
+        },
+        {
+            key: 'q',
+            title: chalk.gray('❌ Exit'),
+            description: 'Exit browser',
+            available: true,
+        },
+    ];
+    const availableChoices = navigationOptions
+        .filter(option => option.available)
+        .map(option => ({
+        name: `${chalk.bold(option.key)}) ${option.title}\n    ${option.description}`,
+        value: option.key,
+    }));
+    const { choice } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'What would you like to do?',
+            choices: availableChoices,
+        },
+    ]);
+    switch (choice) {
+        case 'n':
+            console.log(chalk.cyan(`\n📄 Going to page ${currentPage + 1}...`));
+            console.log(chalk.gray('Run: ') + chalk.yellow(`toknxr browse --page ${currentPage + 1}`));
+            break;
+        case 'p':
+            console.log(chalk.cyan(`\n📄 Going to page ${currentPage - 1}...`));
+            console.log(chalk.gray('Run: ') + chalk.yellow(`toknxr browse --page ${currentPage - 1}`));
+            break;
+        case 'f':
+            console.log(chalk.magenta('\n🔍 Opening filter interface...'));
+            await program.parseAsync(['node', 'toknxr', 'filter']);
+            break;
+        case 's':
+            console.log(chalk.yellow('\n🔍 Opening search interface...'));
+            // Load interactions to generate relevant search suggestions
+            const logFilePath = path.resolve(process.cwd(), 'interactions.log');
+            let searchSuggestions = [];
+            if (fs.existsSync(logFilePath)) {
+                const fileContent = fs.readFileSync(logFilePath, 'utf8');
+                const lines = fileContent.trim().split('\n');
+                const interactions = lines
+                    .map(line => {
+                    try {
+                        return JSON.parse(line);
+                    }
+                    catch {
+                        return null;
+                    }
+                })
+                    .filter((interaction) => interaction !== null);
+                // Extract unique search suggestions from actual data
+                const suggestions = new Set();
+                interactions.forEach(interaction => {
+                    // Add providers
+                    if (interaction.provider)
+                        suggestions.add(interaction.provider);
+                    // Add models
+                    if (interaction.model && interaction.model !== 'unknown')
+                        suggestions.add(interaction.model);
+                    // Add task types
+                    if (interaction.taskType)
+                        suggestions.add(interaction.taskType);
+                    // Add key words from prompts
+                    if (interaction.userPrompt) {
+                        const words = interaction.userPrompt.toLowerCase().split(/\s+/);
+                        words.forEach(word => {
+                            if (word.length >= 3 && !['the', 'and', 'for', 'with', 'this', 'that', 'from', 'they', 'have', 'been', 'will', 'are', 'was', 'were'].includes(word)) {
+                                suggestions.add(word);
+                            }
+                        });
+                    }
+                });
+                searchSuggestions = Array.from(suggestions).slice(0, 15); // Limit to 15 suggestions
+            }
+            // Show search options
+            const searchChoices = [
+                { name: chalk.cyan('🔍 Custom Search') + chalk.gray(' - Enter your own search terms'), value: 'custom' },
+                ...searchSuggestions.map(suggestion => ({
+                    name: `🔎 "${suggestion}"`,
+                    value: suggestion
+                }))
+            ];
+            const { searchChoice } = await inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'searchChoice',
+                    message: 'What would you like to search for?',
+                    choices: searchChoices,
+                    pageSize: 10
+                }
+            ]);
+            let searchQuery;
+            if (searchChoice === 'custom') {
+                const { customQuery } = await inquirer.prompt([
+                    {
+                        type: 'input',
+                        name: 'customQuery',
+                        message: 'Enter your search terms:',
+                        validate: (input) => input.trim().length >= 2 || 'Please enter at least 2 characters'
+                    }
+                ]);
+                searchQuery = customQuery;
+            }
+            else {
+                searchQuery = searchChoice;
+            }
+            // Execute search command
+            await program.parseAsync(['node', 'toknxr', 'search', '--query', searchQuery]);
+            break;
+        case 'a':
+            console.log(chalk.green('\n📊 Opening analytics view...'));
+            await program.parseAsync(['node', 'toknxr', 'stats']);
+            break;
+        case 'm':
+            console.log(chalk.gray('\n📋 Opening main menu...'));
+            console.log(chalk.gray('Run: ') + chalk.yellow('toknxr menu'));
+            break;
+        case 'q':
+            console.log(chalk.gray('\n👋 Exiting browser...'));
+            break;
+        default:
+            console.log(chalk.yellow(`Unknown option "${choice}".`));
     }
 });
 program
@@ -1043,6 +1603,8 @@ program
         console.log(chalk.blue.bold(`\n🔍 Searching for: "${query}"`));
         const availableFields = ['provider', 'model', 'userPrompt', 'taskType', 'requestId'];
         const searchOptions = await createSearchInterface(availableFields);
+        // Set the query from the command line option
+        searchOptions.query = query;
         if (!searchOptions) {
             console.log(chalk.gray('Search cancelled.'));
             return;
@@ -1090,20 +1652,33 @@ program
             let highlightColor;
             if (score >= 0.8)
                 highlightColor = 'green';
-            else if (score >= 0.6)
+            else if (score >= 0.5)
                 highlightColor = 'yellow';
             else
                 highlightColor = 'red';
+            // Show which fields matched
+            const matchedFields = [];
+            searchOptions.fields.forEach(field => {
+                const value = interaction[field];
+                if (typeof value === 'string' && value.toLowerCase().includes(searchOptions.query.toLowerCase())) {
+                    matchedFields.push(field);
+                }
+            });
             const highlightedPrompt = highlightMatch(interaction.userPrompt || '', searchOptions.query);
+            const highlightedModel = highlightMatch(interaction.model || '', searchOptions.query);
+            const highlightedProvider = highlightMatch(interaction.provider || '', searchOptions.query);
             const colorFn = highlightColor === 'green'
                 ? chalk.green
                 : highlightColor === 'yellow'
                     ? chalk.yellow
                     : chalk.red;
-            return createBox(`#${num} ${interaction.provider} (${colorFn('★'.repeat(Math.ceil(score * 5)))})`, [
+            const starCount = Math.max(1, Math.ceil(score * 5));
+            const stars = colorFn('★'.repeat(starCount) + '☆'.repeat(5 - starCount));
+            return createBox(`#${num} ${highlightedProvider} • ${highlightedModel} (${stars})`, [
                 `📅 ${chalk.gray(new Date(interaction.timestamp || Date.now()).toLocaleDateString())}`,
                 `🎯 ${highlightedPrompt || 'No prompt available'}`,
-                `💰 $${interaction.costUSD?.toFixed(4) || '0.0000'} • ⭐ ${interaction.codeQualityScore || 'N/A'}/100`,
+                `💰 ${interaction.costUSD?.toFixed(4) || '0.0000'} • ⭐ ${interaction.codeQualityScore || 'N/A'}/100`,
+                `🔍 Matched: ${chalk.cyan(matchedFields.join(', '))}`,
             ], {
                 borderColor: highlightColor,
                 titleColor: 'cyan',
@@ -1427,10 +2002,10 @@ program
         console.log(chalk.gray('━'.repeat(50)));
         console.log(chalk.bold('\n🗂️  Log File Information:'));
         try {
-            const logPath = path.resolve(process.cwd(), 'audit.log');
-            if (fs.existsSync(logPath)) {
-                const stats = fs.statSync(logPath);
-                console.log(`  Location: ${logPath}`);
+            const auditLogPath = path.resolve(process.cwd(), 'audit.log');
+            if (fs.existsSync(auditLogPath)) {
+                const stats = fs.statSync(auditLogPath);
+                console.log(`  Location: ${auditLogPath}`);
                 console.log(`  Size: ${stats.size} bytes (${(stats.size / 1024).toFixed(1)} KB)`);
                 console.log(`  Modified: ${stats.mtime.toLocaleString()}`);
                 console.log(`  Encrypted: ${auditLogger['config'].encryptionEnabled ? 'Yes' : 'No'}`);
@@ -1481,22 +2056,60 @@ program
     .description('Validate environment, config, and runtime readiness')
     .action(async () => {
     const results = [];
-    // Environment checks
-    const geminiKey = process.env.GEMINI_API_KEY;
-    const openaiKey = process.env.OPENAI_API_KEY;
-    const anthropicKey = process.env.ANTHROPIC_API_KEY;
-    results.push({
-        label: 'AI Provider API key',
-        ok: !!(geminiKey || openaiKey || anthropicKey),
-        hint: 'Set GEMINI_API_KEY, OPENAI_API_KEY, or ANTHROPIC_API_KEY in your environment',
-    });
     // Filesystem checks
     const configPath = path.resolve(process.cwd(), 'toknxr.config.json');
-    results.push({
-        label: `Provider config at ${configPath}`,
-        ok: fs.existsSync(configPath),
-        hint: 'Run: toknxr init',
-    });
+    let providerConfig;
+    if (fs.existsSync(configPath)) {
+        results.push({
+            label: `Provider config at ${configPath}`,
+            ok: true,
+        });
+        try {
+            const configFile = fs.readFileSync(configPath, 'utf8');
+            providerConfig = JSON.parse(configFile);
+        }
+        catch (error) {
+            results.push({
+                label: `Parse toknxr.config.json`,
+                ok: false,
+                hint: `Error parsing config file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            });
+        }
+    }
+    else {
+        results.push({
+            label: `Provider config at ${configPath}`,
+            ok: false,
+            hint: 'Run: toknxr init',
+        });
+    }
+    // Environment variable checks for each configured provider
+    if (providerConfig && providerConfig.providers) {
+        for (const provider of providerConfig.providers) {
+            if (provider.apiKeyEnvVar) {
+                const apiKey = process.env[provider.apiKeyEnvVar];
+                results.push({
+                    label: `${provider.name} API Key (${provider.apiKeyEnvVar})`,
+                    ok: !!apiKey,
+                    hint: `Set ${provider.apiKeyEnvVar} in your environment or .env file`,
+                });
+            }
+            else {
+                results.push({
+                    label: `${provider.name} API Key`,
+                    ok: true,
+                    hint: 'No API key required for this provider',
+                });
+            }
+        }
+    }
+    else if (providerConfig) {
+        results.push({
+            label: 'No providers configured in toknxr.config.json',
+            ok: false,
+            hint: 'Edit toknxr.config.json to add AI providers',
+        });
+    }
     const logPath = path.resolve(process.cwd(), 'interactions.log');
     try {
         // Touch file if missing (no-op if exists)
@@ -1508,30 +2121,94 @@ program
         results.push({ label: `interactions.log at ${logPath}`, ok: false, hint: 'Check write permissions' });
     }
     // Runtime checks (proxy health if running)
-    let healthOk = false;
+    let proxyHealthOk = false;
     try {
         const res = await fetch('http://localhost:8788/health');
-        healthOk = res.ok;
+        proxyHealthOk = res.ok;
     }
     catch {
-        healthOk = false;
+        proxyHealthOk = false;
     }
     results.push({
-        label: 'Proxy reachable at http://localhost:8788/health',
-        ok: healthOk,
+        label: 'Proxy server running (http://localhost:8788/health)',
+        ok: proxyHealthOk,
         hint: 'Run: toknxr start (then retry doctor)'
     });
-    // Optional: add one fixture interaction if none exists and provider key missing
-    try {
-        const file = path.resolve(process.cwd(), 'interactions.log');
-        const hasKey = !!(process.env.GEMINI_API_KEY || process.env.OPENAI_API_KEY);
-        const size = fs.existsSync(file) ? fs.statSync(file).size : 0;
-        if (!hasKey && size === 0) {
-            const { appendFixtureInteraction } = await import('./fixtures/canary-interaction.js');
-            appendFixtureInteraction();
+    // AI Provider Connectivity Tests (only if proxy is running and config is loaded)
+    let anyProviderConnected = false;
+    if (proxyHealthOk && providerConfig && providerConfig.providers) {
+        for (const provider of providerConfig.providers) {
+            const apiKey = provider.apiKeyEnvVar ? process.env[provider.apiKeyEnvVar] : undefined;
+            if (provider.apiKeyEnvVar && !apiKey) {
+                results.push({
+                    label: `${provider.name} connection test`,
+                    ok: false,
+                    hint: `Skipped: API key (${provider.apiKeyEnvVar}) not set.`,
+                });
+                continue;
+            }
+            const { ok, message } = await testConnection(provider, apiKey);
+            if (ok) {
+                anyProviderConnected = true;
+            }
+            results.push({
+                label: `${provider.name} connection test`,
+                ok: ok,
+                hint: ok ? undefined : message,
+            });
+        }
+    }
+    else if (proxyHealthOk && !providerConfig) {
+        results.push({
+            label: 'AI Provider connection tests',
+            ok: false,
+            hint: 'Skipped: toknxr.config.json not loaded or invalid.',
+        });
+    }
+    else if (!proxyHealthOk) {
+        results.push({
+            label: 'AI Provider connection tests',
+            ok: false,
+            hint: 'Skipped: Proxy server is not running.',
+        });
+    }
+    // Conditional: add one sample interaction if none exists and at least one provider connected
+    const logFileExists = fs.existsSync(logPath);
+    let logFileSize = 0;
+    if (logFileExists) {
+        try {
+            logFileSize = fs.statSync(logPath).size;
+        }
+        catch { }
+    }
+    if (anyProviderConnected && logFileSize === 0) {
+        const firstConnectedProvider = providerConfig?.providers.find((p) => {
+            const apiKey = p.apiKeyEnvVar ? process.env[p.apiKeyEnvVar] : undefined;
+            return p.apiKeyEnvVar ? !!apiKey : true; // Check if key is set for providers that need it
+        });
+        if (firstConnectedProvider) {
+            const { ok, message } = generateSampleInteraction(firstConnectedProvider.name, logPath);
+            results.push({
+                label: 'Generate sample interaction',
+                ok: ok,
+                hint: ok ? 'Run: toknxr stats or toknxr code-analysis' : message,
+            });
         }
     }
-    catch { }
+    else if (logFileSize > 0) {
+        results.push({
+            label: 'Generate sample interaction',
+            ok: true,
+            hint: 'interactions.log already contains data.',
+        });
+    }
+    else {
+        results.push({
+            label: 'Generate sample interaction',
+            ok: false,
+            hint: 'No connected providers or interactions.log already has data.',
+        });
+    }
     // Print report
     console.log(chalk.blue.bold('\nTokNXR Doctor Report'));
     console.log(chalk.gray('━'.repeat(60)));
@@ -1544,7 +2221,7 @@ program
     }
     console.log(chalk.gray('━'.repeat(60)));
     if (allOk) {
-        console.log(chalk.green('All checks passed. You are ready to use TokNXR.'));
+        console.log(chalk.green('All essential checks passed. You are ready to use TokNXR.'));
     }
     else {
         console.log(chalk.yellow('Some checks failed. Fix the hints above and re-run: toknxr doctor'));
@@ -1576,4 +2253,10 @@ function highlightMatch(text, query) {
     });
     return highlighted;
 }
-program.parse(process.argv);
+program.exitOverride();
+try {
+    program.parse(process.argv);
+}
+catch (e) {
+    // This will catch the exit override and prevent the process from exiting
+}