@rahul05ranjan/dhruv-cli 1.4.6 → 1.6.0

package/dist/commands/generate.js

@@ -1,27 +1,48 @@
 import fs from 'fs';
+import path from 'path';
 import { runCommand } from '../core/command-runner.js';
 import { getSystemMessage } from '../core/prompts.js';
-import { printError, printSuccess } from '../utils/ux.js';
-function buildPrompt(type, content) {
+import { printError, printSuccess, printInfo } from '../utils/ux.js';
+import { loadConfig } from '../config/config.js';
+function getLanguageForFile(target) {
+    const ext = path.extname(target).toLowerCase();
+    switch (ext) {
+        case '.py':
+            return { name: 'Python', testFramework: 'pytest or unittest' };
+        case '.go':
+            return { name: 'Go', testFramework: 'standard testing package' };
+        case '.rs':
+            return { name: 'Rust', testFramework: 'standard Rust test framework' };
+        case '.ts':
+        case '.tsx':
+            return { name: 'TypeScript', testFramework: 'Jest or Vitest' };
+        case '.java':
+            return { name: 'Java', testFramework: 'JUnit 5' };
+        default:
+            return { name: 'JavaScript', testFramework: 'Jest or Mocha' };
+    }
+}
+function buildPrompt(type, content, target) {
+    const lang = getLanguageForFile(target);
     if (type === 'tests' || type === 'test') {
-        return `Generate comprehensive unit tests for the following JavaScript code. Use Jest or Mocha syntax. Only return the test code without explanations:\n\n${content}`;
+        return `Generate comprehensive unit tests for the following ${lang.name} code. Use ${lang.testFramework} syntax. Only return the test code without explanations:\n\n${content}`;
     }
     if (type === 'documentation' || type === 'docs') {
-        return `Generate JSDoc documentation for the following code:\n\n${content}`;
+        return `Generate ${lang.name === 'Python' ? 'docstrings' : 'JSDoc/documentation'} for the following code:\n\n${content}`;
     }
     return `Generate ${type} for this code:\n\n${content}`;
 }
 /** Extracts test code from the response: a fenced block if present, else the raw response. */
 function extractTestCode(response) {
-    const fenced = response.match(/```(?:javascript|js)?\s*\n([\s\S]*?)```/);
+    const fenced = response.match(/```(?:javascript|js|typescript|ts|python|py|go|rust|rs|java)?\s*\n([\s\S]*?)```/i);
     if (fenced?.[1])
         return fenced[1].trim();
     return response
-        .replace(/^.*?(?=const|describe|test|it\s*\()/s, '')
-        .replace(/```[a-z]*\n?/g, '')
+        .replace(/^.*?(?=const|describe|test|it\s*\(|def test_|func Test|#\[test\])/s, '')
+        .replace(/```[a-z]*\n?/gi, '')
         .trim();
 }
-export async function generate(type, target) {
+export async function generate(type, target, options = {}) {
     if (!fs.existsSync(target)) {
         printError(`Target file "${target}" does not exist.`);
         return;
@@ -32,7 +53,7 @@ export async function generate(type, target) {
         input: { type, target },
         header: `🔨 Generating ${type}: `,
         buildRequest: (input, model) => ({
-            prompt: buildPrompt(input.type, content),
+            prompt: buildPrompt(input.type, content, input.target),
             systemMessage: getSystemMessage('generate'),
             model,
         }),
@@ -44,9 +65,21 @@ export async function generate(type, target) {
                 printError('No valid test code generated.');
                 return;
             }
-            const testFile = target.replace(/\.[^.]+$/, '.test.js');
+            const extension = path.extname(target) || '.js';
+            const testFile = options.output ?? target.replace(/\.[^.]+$/, `.test${extension}`);
+            if (!options.apply && !options.output) {
+                if (loadConfig().responseFormat !== 'json') {
+                    printInfo(`Preview only. Use --apply to write ${testFile}, or --output <path> to choose a destination.`);
+                }
+                return;
+            }
+            if (fs.existsSync(testFile) && !options.overwrite) {
+                printError(`Test file "${testFile}" already exists. Use --overwrite to replace it.`);
+                return;
+            }
             fs.writeFileSync(testFile, codeToSave);
-            printSuccess(`Test file saved: ${testFile}`);
+            if (loadConfig().responseFormat !== 'json')
+                printSuccess(`Test file saved: ${testFile}`);
         },
         footer: `🔍 Want a review? Try: dhruv review ${target}`,
     });

package/dist/commands/health.d.ts

@@ -1 +1,4 @@
-export declare function health(): Promise<void>;
+export interface HealthOptions {
+    details?: boolean;
+}
+export declare function health(options?: HealthOptions): Promise<void>;

package/dist/commands/health.js

@@ -7,18 +7,21 @@ import { securityManager } from '../core/security.js';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-export async function health() {
-    console.log(chalk.blue.bold('🔍 Dhruv CLI Health Check\n'));
+export async function health(options = {}) {
+    const jsonOutput = loadConfig().responseFormat === 'json';
     const results = [];
     const startTime = Date.now();
     try {
         // System Information
         const systemInfo = getSystemInfo();
-        console.log(chalk.cyan('📊 System Information:'));
-        Object.entries(systemInfo).forEach(([key, value]) => {
-            console.log(`  ${key}: ${chalk.yellow(value)}`);
-        });
-        console.log();
+        if (!jsonOutput) {
+            console.log(chalk.blue.bold('🔍 Dhruv CLI Health Check\n'));
+            console.log(chalk.cyan('📊 System Information:'));
+            Object.entries(systemInfo).forEach(([key, value]) => {
+                console.log(`  ${key}: ${chalk.yellow(value)}`);
+            });
+            console.log();
+        }
         // Configuration Check
         results.push(...await checkConfiguration());
         // Dependencies Check
@@ -33,14 +36,40 @@ export async function health() {
         results.push(...await checkFileSystem());
         // Plugin System Check
         results.push(...await checkPlugins());
-        // Display Results
-        displayResults(results);
         const duration = Date.now() - startTime;
+        const summary = summarizeResults(results);
+        if (jsonOutput) {
+            process.exitCode = summary.fail > 0 ? 1 : 0;
+            process.stdout.write(`${JSON.stringify({
+                ok: summary.fail === 0,
+                command: 'health',
+                system: systemInfo,
+                results,
+                summary,
+                durationMs: duration,
+            })}\n`);
+        }
+        else {
+            if (options.details)
+                displayResults(results);
+            else
+                displayConciseResults(results);
+        }
         logger.info('Health check completed', { duration, results: results.length });
     }
     catch (error) {
-        printError('Health check failed');
-        console.error(chalk.red(error.message));
+        process.exitCode = 1;
+        if (jsonOutput) {
+            process.stdout.write(`${JSON.stringify({
+                ok: false,
+                command: 'health',
+                error: error.message,
+            })}\n`);
+        }
+        else {
+            printError('Health check failed');
+            console.error(chalk.red(error.message));
+        }
         logger.error('Health check failed', error);
     }
 }
@@ -360,11 +389,7 @@ function displayResults(results) {
         }
     });
     // Summary
-    const summary = {
-        pass: results.filter(r => r.status === 'pass').length,
-        warn: results.filter(r => r.status === 'warn').length,
-        fail: results.filter(r => r.status === 'fail').length
-    };
+    const summary = summarizeResults(results);
     console.log(chalk.blue.bold('\n📊 Summary:'));
     console.log(`  ✅ Passed: ${chalk.green(summary.pass)}`);
     console.log(`  ⚠️  Warnings: ${chalk.yellow(summary.warn)}`);
@@ -374,3 +399,21 @@ function displayResults(results) {
     const statusColor = overallStatus === 'pass' ? chalk.green : overallStatus === 'warn' ? chalk.yellow : chalk.red;
     console.log(`\n${statusIcon} ${statusColor('Overall Status: ' + overallStatus.toUpperCase())}`);
 }
+function displayConciseResults(results) {
+    const summary = summarizeResults(results);
+    const overallStatus = summary.fail > 0 ? 'fail' : summary.warn > 0 ? 'warn' : 'pass';
+    const icon = overallStatus === 'pass' ? '✅' : overallStatus === 'warn' ? '⚠️' : '❌';
+    console.log(chalk.blue.bold(`\n${icon} Health: ${overallStatus.toUpperCase()}`));
+    console.log(`  ${chalk.green(`${summary.pass} passed`)}, ${chalk.yellow(`${summary.warn} warnings`)}, ${chalk.red(`${summary.fail} failed`)}`);
+    results
+        .filter((result) => result.status !== 'pass')
+        .forEach((result) => console.log(`  ${result.category}: ${result.message}${result.recommendation ? ` — ${result.recommendation}` : ''}`));
+    console.log(chalk.dim('Run `dhruv health --details` for full diagnostics.'));
+}
+function summarizeResults(results) {
+    return {
+        pass: results.filter(r => r.status === 'pass').length,
+        warn: results.filter(r => r.status === 'warn').length,
+        fail: results.filter(r => r.status === 'fail').length,
+    };
+}

package/dist/commands/init.js

@@ -12,18 +12,26 @@ export async function init() {
         }
     }
     catch {
-        console.log(chalk.yellow('Warning: Could not fetch available models from Ollama.'));
-        console.log(chalk.yellow('Using default model choices.'));
+        console.log(chalk.yellow('Warning: Could not connect to Ollama.'));
+        console.log(chalk.yellow('💡 Start Ollama with: ollama serve'));
+        console.log(chalk.yellow(`💡 Install default model with: ollama pull ${current.model}\n`));
     }
     try {
         const answers = await inquirer.prompt([
             {
                 type: 'list',
                 name: 'model',
-                message: 'Which Ollama model do you want to use?',
+                message: `Which Ollama model do you want to use? (default: ${current.model})`,
                 choices: modelChoices,
                 default: current.model,
             },
+            {
+                type: 'list',
+                name: 'scope',
+                message: 'Where should Dhruv save these settings?',
+                choices: ['local', 'global'],
+                default: 'local',
+            },
             {
                 type: 'list',
                 name: 'responseFormat',
@@ -45,15 +53,18 @@ export async function init() {
                 default: current.theme || 'default',
             },
         ]);
-        saveConfig(answers);
-        console.log(chalk.green('Configuration saved!'));
+        const { scope, ...settings } = answers;
+        saveConfig(settings, { scope });
+        console.log(chalk.green(`Configuration saved ${scope === 'global' ? 'for your user account' : 'in this project'}!`));
     }
     catch (error) {
-        if (error?.isTtyError) {
+        const isTty = Boolean(error?.isTtyError);
+        process.exitCode = isTty ? 1 : 130;
+        if (isTty) {
             console.log(chalk.red('This command requires an interactive terminal.'));
         }
         else {
-            console.log(chalk.red('Configuration cancelled or failed.'));
+            console.log(chalk.red('Configuration cancelled.'));
         }
     }
 }

package/dist/commands/menu.js

@@ -8,114 +8,139 @@ import { optimize } from './optimize.js';
 import { securityCheck } from './security-check.js';
 import { generate } from './generate.js';
 import { init } from './init.js';
+import { status } from './status.js';
+import { health } from './health.js';
+import { metrics } from './metrics.js';
 import { detectProjectType } from '../utils/projectType.js';
 import chalk from 'chalk';
+import { commandCatalog } from '../core/command-catalog.js';
 const commands = [
-    { name: 'Explain', value: 'explain' },
-    { name: 'Suggest', value: 'suggest' },
-    { name: 'Fix', value: 'fix' },
-    { name: 'Review', value: 'review' },
-    { name: 'Optimize', value: 'optimize' },
-    { name: 'Security Check', value: 'security-check' },
-    { name: 'Generate', value: 'generate' },
-    { name: 'Init (Setup)', value: 'init' },
-    { name: 'Project Type', value: 'project-type' },
-    { name: 'Exit', value: 'exit' }
+    ...commandCatalog.map(({ menuLabel, name }) => ({ name: menuLabel, value: name })),
+    { name: 'Exit', value: 'exit' },
 ];
 export async function menu() {
-    let running = true;
-    while (running) {
-        const { cmd } = await inquirer.prompt([
-            {
-                type: 'list',
-                name: 'cmd',
-                message: themed('What do you want to do?', 'primary'),
-                choices: commands
-            }
-        ]);
-        if (cmd === 'exit') {
-            running = false;
-            break;
-        }
-        try {
-            switch (cmd) {
-                case 'explain': {
-                    const { query } = await inquirer.prompt([
-                        { type: 'input', name: 'query', message: 'What would you like me to explain?' }
-                    ]);
-                    if (query)
-                        await explain(query);
-                    break;
-                }
-                case 'suggest': {
-                    const { query } = await inquirer.prompt([
-                        { type: 'input', name: 'query', message: 'What would you like suggestions for?' }
-                    ]);
-                    if (query)
-                        await suggest(query);
-                    break;
-                }
-                case 'fix': {
-                    const { query } = await inquirer.prompt([
-                        { type: 'input', name: 'query', message: 'Describe the issue you need help fixing:' }
-                    ]);
-                    if (query)
-                        await fix(query);
-                    break;
-                }
-                case 'review': {
-                    const { fileOrDir } = await inquirer.prompt([
-                        { type: 'input', name: 'fileOrDir', message: 'Enter file or directory path to review:' }
-                    ]);
-                    if (fileOrDir)
-                        await review(fileOrDir);
-                    break;
-                }
-                case 'optimize': {
-                    const { file } = await inquirer.prompt([
-                        { type: 'input', name: 'file', message: 'Enter file path to optimize:' }
-                    ]);
-                    if (file)
-                        await optimize(file);
-                    break;
-                }
-                case 'security-check': {
-                    const { fileOrDir } = await inquirer.prompt([
-                        { type: 'input', name: 'fileOrDir', message: 'Enter file or directory path to check (or press enter for current directory):', default: '.' }
-                    ]);
-                    await securityCheck(fileOrDir);
-                    break;
+    try {
+        while (true) {
+            const { filter = '' } = await inquirer.prompt([
+                {
+                    type: 'input',
+                    name: 'filter',
+                    message: 'Filter commands (press enter to show all):',
+                },
+            ]);
+            const normalizedFilter = String(filter).trim().toLowerCase();
+            const filteredCommands = normalizedFilter
+                ? commands.filter((command) => command.name.toLowerCase().includes(normalizedFilter) || command.value.includes(normalizedFilter))
+                : commands;
+            const { cmd } = await inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'cmd',
+                    message: themed('What do you want to do?', 'primary'),
+                    choices: filteredCommands.length > 0 ? filteredCommands : [{ name: 'No matching commands — Exit', value: 'exit' }],
                 }
-                case 'generate': {
-                    const answers = await inquirer.prompt([
-                        {
-                            type: 'list',
-                            name: 'type',
-                            message: 'What would you like to generate?',
-                            choices: ['tests', 'documentation', 'docs', 'component']
-                        },
-                        { type: 'input', name: 'target', message: 'Enter target file path:' }
-                    ]);
-                    if (answers.target)
-                        await generate(answers.type, answers.target);
-                    break;
-                }
-                case 'init': {
-                    await init();
-                    break;
-                }
-                case 'project-type': {
-                    const type = detectProjectType();
-                    console.log(chalk.blue(`Detected project type: ${type}`));
-                    break;
+            ]);
+            if (cmd === 'exit') {
+                break;
+            }
+            try {
+                switch (cmd) {
+                    case 'explain': {
+                        const { query } = await inquirer.prompt([
+                            { type: 'input', name: 'query', message: 'What would you like me to explain?' }
+                        ]);
+                        if (query)
+                            await explain(query);
+                        break;
+                    }
+                    case 'suggest': {
+                        const { query } = await inquirer.prompt([
+                            { type: 'input', name: 'query', message: 'What would you like suggestions for?' }
+                        ]);
+                        if (query)
+                            await suggest(query);
+                        break;
+                    }
+                    case 'fix': {
+                        const { query } = await inquirer.prompt([
+                            { type: 'input', name: 'query', message: 'Describe the issue you need help fixing:' }
+                        ]);
+                        if (query)
+                            await fix(query);
+                        break;
+                    }
+                    case 'review': {
+                        const { fileOrDir } = await inquirer.prompt([
+                            { type: 'input', name: 'fileOrDir', message: 'Enter file or directory path to review:' }
+                        ]);
+                        if (fileOrDir)
+                            await review(fileOrDir);
+                        break;
+                    }
+                    case 'optimize': {
+                        const { file } = await inquirer.prompt([
+                            { type: 'input', name: 'file', message: 'Enter file path to optimize:' }
+                        ]);
+                        if (file)
+                            await optimize(file);
+                        break;
+                    }
+                    case 'security-check': {
+                        const { fileOrDir } = await inquirer.prompt([
+                            { type: 'input', name: 'fileOrDir', message: 'Enter file or directory path to check (or press enter for current directory):', default: '.' }
+                        ]);
+                        await securityCheck(fileOrDir);
+                        break;
+                    }
+                    case 'generate': {
+                        const answers = await inquirer.prompt([
+                            {
+                                type: 'list',
+                                name: 'type',
+                                message: 'What would you like to generate?',
+                                choices: ['tests', 'documentation', 'docs', 'component']
+                            },
+                            { type: 'input', name: 'target', message: 'Enter target file path:' }
+                        ]);
+                        if (answers.target)
+                            await generate(answers.type, answers.target);
+                        break;
+                    }
+                    case 'init': {
+                        await init();
+                        break;
+                    }
+                    case 'project-type': {
+                        const type = detectProjectType();
+                        console.log(chalk.blue(`Detected project type: ${type}`));
+                        break;
+                    }
+                    case 'status':
+                        await status();
+                        break;
+                    case 'health':
+                        await health();
+                        break;
+                    case 'metrics':
+                        await metrics();
+                        break;
+                    case 'completion':
+                        console.log(themed('Run `dhruv completion <bash|zsh|fish>` to install shell completion.', 'accent'));
+                        break;
+                    default:
+                        console.log(themed(`You selected: ${cmd}`, 'accent'));
                 }
-                default:
-                    console.log(themed(`You selected: ${cmd}`, 'accent'));
             }
+            catch (error) {
+                console.error(chalk.red(`Error executing ${cmd}: ${error.message}`));
+            }
+            console.log(''); // Add spacing between commands
         }
-        catch (error) {
-            console.error(chalk.red(`Error executing ${cmd}: ${error.message}`));
-        }
-        console.log(''); // Add spacing between commands
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const cancelled = /cancel|force closed|exitprompt/i.test(message);
+        process.exitCode = cancelled ? 130 : 1;
+        console.error(chalk.red(cancelled ? 'Interactive menu cancelled.' : `Interactive menu failed: ${message}`));
     }
 }

package/dist/commands/metrics.d.ts

@@ -1 +1,5 @@
-export declare function metrics(): Promise<void>;
+export interface MetricsOptions {
+    raw?: boolean;
+    reset?: boolean;
+}
+export declare function metrics(options?: MetricsOptions): Promise<void>;

package/dist/commands/metrics.js

@@ -1,12 +1,42 @@
 import chalk from 'chalk';
-import { printError, printInfo } from '../utils/ux.js';
+import { printSuccess, printError, printInfo } from '../utils/ux.js';
 import { metricsCollector } from '../core/metrics.js';
 import { logger } from '../core/logger.js';
-export async function metrics() {
-    console.log(chalk.blue.bold('📊 Dhruv CLI Metrics\n'));
+import { loadConfig } from '../config/config.js';
+export async function metrics(options = {}) {
     try {
+        if (options.reset) {
+            metricsCollector.resetPersistent();
+            if (loadConfig().responseFormat === 'json') {
+                process.stdout.write(`${JSON.stringify({ ok: true, command: 'metrics', reset: true, summary: metricsCollector.getSummary() })}\n`);
+            }
+            else {
+                printSuccess('Local metrics reset.');
+            }
+            return;
+        }
         // Get metrics data
         const metricsData = await metricsCollector.getMetricsJSON();
+        const summary = metricsCollector.getSummary();
+        if (loadConfig().responseFormat === 'json') {
+            process.stdout.write(`${JSON.stringify({
+                ok: true,
+                command: 'metrics',
+                summary,
+                metrics: metricsData,
+            })}\n`);
+            return;
+        }
+        console.log(chalk.blue.bold('📊 Dhruv CLI Metrics\n'));
+        console.log(chalk.cyan('📌 Local summary:'));
+        console.log(`  Sessions: ${chalk.green(summary.sessions)}`);
+        Object.entries(summary.commands).forEach(([command, data]) => {
+            console.log(`  ${chalk.yellow(command)}: ${data.runs} runs, ${data.successes} succeeded, ${data.failures} failed, ${data.durationMs}ms`);
+        });
+        Object.entries(summary.models).forEach(([model, data]) => {
+            console.log(`  ${chalk.yellow(model)}: ${data.requests} requests, ${data.successes} succeeded, ${data.failures} failed, ${data.durationMs}ms`);
+        });
+        console.log(`  Cache: ${chalk.green(summary.cache.hits)} hits, ${chalk.yellow(summary.cache.misses)} misses`);
         if (metricsData.length === 0) {
             printInfo('No metrics data available yet. Metrics are collected during CLI usage.');
             return;
@@ -36,16 +66,25 @@ export async function metrics() {
                 });
             }
         });
-        // Display raw Prometheus metrics
-        console.log(chalk.cyan('\n📋 Raw Prometheus Metrics:'));
-        console.log(chalk.gray('─'.repeat(50)));
-        const rawMetrics = await metricsCollector.getMetrics();
-        console.log(rawMetrics);
+        if (options.raw) {
+            const rawMetrics = await metricsCollector.getMetrics();
+            process.stdout.write(rawMetrics);
+        }
         logger.info('Metrics displayed successfully', { metricsCount: metricsData.length });
     }
     catch (error) {
-        printError('Failed to retrieve metrics');
-        console.error(chalk.red(error.message));
+        process.exitCode = 1;
+        if (loadConfig().responseFormat === 'json') {
+            process.stdout.write(`${JSON.stringify({
+                ok: false,
+                command: 'metrics',
+                error: error.message,
+            })}\n`);
+        }
+        else {
+            printError('Failed to retrieve metrics');
+            console.error(chalk.red(error.message));
+        }
         logger.error('Metrics command failed', error);
     }
 }

package/dist/commands/optimize.js

@@ -41,7 +41,7 @@ export async function optimize(file) {
         input: { file },
         header: `⚡ Optimization suggestions for ${type}: `,
         buildRequest: (input, model) => ({
-            prompt: `Please analyze and provide optimization suggestions for this ${type}:\n\n${content}\n\nPlease provide:\n1. Specific optimization recommendations\n2. Performance improvements\n3. Best practices to implement\n4. Code examples of improvements\n5. Potential issues to fix\n\nFocus on actionable, practical improvements.`,
+            prompt: `Please analyze and provide optimization suggestions for this ${type}. For every recommendation, explain the expected impact, how to measure it, and the trade-offs or risks before applying it.\n\n${content}\n\nPlease provide:\n1. Specific optimization recommendations\n2. Performance improvements\n3. Best practices to implement\n4. Code examples of improvements\n5. Potential issues to fix\n\nFocus on actionable, practical improvements.`,
             systemMessage: getSystemMessage('optimize'),
             model,
         }),

package/dist/commands/review.d.ts

@@ -1 +1,4 @@
-export declare function review(fileOrDir: string): Promise<void>;
+export interface ReviewOptions {
+    diff?: boolean;
+}
+export declare function review(fileOrDir: string, options?: ReviewOptions): Promise<void>;