@rahul05ranjan/dhruv-cli 1.4.6 → 1.5.0

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,11 +66,10 @@ 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) {

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>;

package/dist/commands/review.js

@@ -1,9 +1,13 @@
 import fs from 'fs';
 import path from 'path';
+import { execFileSync } from 'child_process';
 import { runCommand } from '../core/command-runner.js';
 import { getSystemMessage } from '../core/prompts.js';
 import { printError } from '../utils/ux.js';
-/** Reads a file or the code files of a directory (up to 10), concatenated. */
+import { detectProjectType } from '../utils/projectType.js';
+const CODE_FILE = /\.(js|ts|jsx|tsx|py|java|cpp|c|go|rs|rb|php)$/;
+const IGNORED_DIRECTORIES = new Set(['.git', 'node_modules', 'dist', 'build', 'coverage', '.dhruv-cache', 'logs']);
+/** Reads a file or up to 10 code files from a directory tree. */
 function readCode(fileOrDir) {
     // Read first, branch on the error: no separate existence check to race against.
     let content;
@@ -21,10 +25,24 @@ function readCode(fileOrDir) {
     return content;
 }
 function readDirectory(dir) {
-    const files = fs
-        .readdirSync(dir)
-        .filter((f) => f.match(/\.(js|ts|jsx|tsx|py|java|cpp|c|go|rs|rb|php)$/))
-        .slice(0, 10);
+    const files = [];
+    function collect(current) {
+        if (files.length >= 10)
+            return;
+        for (const entry of fs.readdirSync(current, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+            if (files.length >= 10)
+                return;
+            const absolute = path.join(current, entry.name);
+            if (entry.isDirectory()) {
+                if (!IGNORED_DIRECTORIES.has(entry.name))
+                    collect(absolute);
+            }
+            else if (entry.isFile() && CODE_FILE.test(entry.name)) {
+                files.push(path.relative(dir, absolute).split(path.sep).join('/'));
+            }
+        }
+    }
+    collect(dir);
     if (files.length === 0) {
         printError(`No code files found in directory "${dir}".`);
         return undefined;
@@ -40,16 +58,38 @@ function readDirectory(dir) {
     }
     return code;
 }
-export async function review(fileOrDir) {
-    const code = readCode(fileOrDir);
+function readGitDiff(fileOrDir) {
+    const root = fs.existsSync(fileOrDir) && fs.statSync(fileOrDir).isDirectory() ? fileOrDir : path.dirname(fileOrDir);
+    try {
+        const diff = execFileSync('git', ['diff', '--no-ext-diff', '--unified=80', '--'], {
+            cwd: root,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        if (!diff.trim()) {
+            printError(`No uncommitted changes found in "${fileOrDir}".`);
+            return undefined;
+        }
+        return diff;
+    }
+    catch {
+        printError(`Could not read a git diff for "${fileOrDir}".`);
+        return undefined;
+    }
+}
+export async function review(fileOrDir, options = {}) {
+    const code = options.diff ? readGitDiff(fileOrDir) : readCode(fileOrDir);
     if (code === undefined)
         return;
+    const projectRoot = fs.existsSync(fileOrDir) && fs.statSync(fileOrDir).isDirectory() ? fileOrDir : path.dirname(fileOrDir);
+    const projectType = detectProjectType(projectRoot);
+    const scope = options.diff ? 'the current uncommitted git diff' : 'the supplied source files';
     await runCommand({
         name: 'review',
         input: { fileOrDir },
         header: '🔍 Code Review: ',
         buildRequest: (input, model) => ({
-            prompt: `Please review this code and provide feedback on code quality, best practices, potential issues, and suggestions for improvement. Here is the code to review:\n\nCODE_START\n${code}\nCODE_END\n\nPlease provide your review in a structured format with clear categories and actionable feedback.`,
+            prompt: `Please review ${scope} for a ${projectType} project. Provide feedback on code quality, best practices, potential issues, and suggestions for improvement. For every finding, include the file, line or region, severity, explanation, and an actionable recommendation. Here is the code to review:\n\nCODE_START\n${code}\nCODE_END`,
             systemMessage: getSystemMessage('review'),
             model,
         }),

package/dist/commands/security-check.d.ts

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

package/dist/commands/security-check.js

@@ -3,6 +3,45 @@ import path from 'path';
 import { runCommand } from '../core/command-runner.js';
 import { getSystemMessage } from '../core/prompts.js';
 import { printError } from '../utils/ux.js';
+const CODE_FILE = /\.(js|ts|jsx|tsx|py|java|cpp|c|go|rs|rb|php)$/;
+const IGNORED_DIRECTORIES = new Set(['.git', 'node_modules', 'dist', 'build', 'coverage', '.dhruv-cache', 'logs']);
+function redactSensitiveContent(content) {
+    return content
+        .replace(/(\b(?:api[_-]?key|secret|token|password|authorization)\s*[:=]\s*["'`])[^"'`\r\n]+(["'`])/gi, '$1[REDACTED]$2')
+        .replace(/\b(?:sk|pk)-[a-z0-9_-]{8,}\b/gi, '[REDACTED]')
+        .replace(/\bBearer\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [REDACTED]');
+}
+function findHighConfidenceFindings(content) {
+    const findings = [];
+    const lines = content.split(/\r?\n/);
+    lines.forEach((line, index) => {
+        if (/\b(?:api[_-]?key|secret|token|password|authorization)\s*[:=]\s*["'`][^"'`\r\n]+["'`]/i.test(line)) {
+            findings.push({
+                line: index + 1,
+                severity: 'high',
+                description: 'credential-like value assigned in source',
+                remediation: 'rotate the credential and load it from a secret manager or environment variable',
+            });
+        }
+        else if (/\b(?:sk|pk)-[a-z0-9_-]{8,}\b/i.test(line)) {
+            findings.push({
+                line: index + 1,
+                severity: 'high',
+                description: 'credential-like API key detected',
+                remediation: 'rotate the credential and remove it from source control',
+            });
+        }
+        else if (/\bBearer\s+[A-Za-z0-9._~+/=-]+/i.test(line)) {
+            findings.push({
+                line: index + 1,
+                severity: 'high',
+                description: 'bearer token detected',
+                remediation: 'revoke the token and use a secure runtime secret store',
+            });
+        }
+    });
+    return findings;
+}
 /** Reads a file or the code files of a directory (up to 10), concatenated. */
 function readCode(fileOrDir) {
     // Read first, branch on the error: no separate existence check to race against.
@@ -21,10 +60,24 @@ function readCode(fileOrDir) {
     return content;
 }
 function readDirectory(dir) {
-    const files = fs
-        .readdirSync(dir)
-        .filter((f) => f.match(/\.(js|ts|jsx|tsx|py|java|cpp|c|go|rs|rb|php)$/))
-        .slice(0, 10);
+    const files = [];
+    function collect(current) {
+        if (files.length >= 10)
+            return;
+        for (const entry of fs.readdirSync(current, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+            if (files.length >= 10)
+                return;
+            const absolute = path.join(current, entry.name);
+            if (entry.isDirectory()) {
+                if (!IGNORED_DIRECTORIES.has(entry.name))
+                    collect(absolute);
+            }
+            else if (entry.isFile() && CODE_FILE.test(entry.name)) {
+                files.push(path.relative(dir, absolute).split(path.sep).join('/'));
+            }
+        }
+    }
+    collect(dir);
     if (files.length === 0) {
         printError(`No code files found in directory "${dir}".`);
         return undefined;
@@ -40,16 +93,24 @@ function readDirectory(dir) {
     }
     return code;
 }
-export async function securityCheck(fileOrDir = '.') {
+export async function securityCheck(fileOrDir = '.', options = {}) {
     const code = readCode(fileOrDir);
     if (code === undefined)
         return;
+    const findings = findHighConfidenceFindings(code);
+    const safeCode = redactSensitiveContent(code);
+    const findingSummary = findings.length === 0
+        ? 'none'
+        : findings.map((finding) => `- ${finding.severity} at line ${finding.line}: ${finding.description}; remediation: ${finding.remediation}`).join('\n');
+    if (options.strict && findings.length > 0) {
+        process.exitCode = 1;
+    }
     await runCommand({
         name: 'security-check',
         input: { fileOrDir },
         header: '🛡️  Security Analysis: ',
         buildRequest: (input, model) => ({
-            prompt: `Perform a security analysis on this code. Look for common security vulnerabilities, unsafe practices, potential injection attacks, and provide recommendations for improvement:\n\n${code}`,
+            prompt: `Perform a security analysis on this code. Look for common security vulnerabilities, unsafe practices, potential injection attacks, and provide recommendations for improvement. High-confidence pre-scan findings:\n${findingSummary}\n\n${safeCode}`,
             systemMessage: getSystemMessage('security'),
             model,
         }),

package/dist/commands/status.js

@@ -1,10 +1,47 @@
 import chalk from 'chalk';
 import { loadConfig } from '../config/config.js';
 import { printSuccess, printError, printInfo } from '../utils/ux.js';
-import { listModels } from '../core/ai.js';
+import { getOllamaStatus, listModels } from '../core/ai.js';
 export async function status() {
-    console.log(chalk.blue('🔍 Dhruv CLI Status Check\n'));
     const config = loadConfig();
+    if (config.responseFormat === 'json') {
+        try {
+            const models = await listModels();
+            const server = await getOllamaStatus();
+            const configuredModelAvailable = models.includes(config.model);
+            process.stdout.write(`${JSON.stringify({
+                ok: configuredModelAvailable,
+                command: 'status',
+                model: config.model,
+                responseFormat: config.responseFormat,
+                verbose: config.verbose,
+                theme: config.theme,
+                availableModels: models,
+                configuredModelAvailable,
+                endpoint: server.endpoint,
+                version: server.version ?? null,
+                ollama: 'connected',
+                nextSteps: configuredModelAvailable ? [] : [`ollama pull ${config.model}`],
+            })}\n`);
+            if (!configuredModelAvailable)
+                process.exitCode = 1;
+        }
+        catch (error) {
+            process.exitCode = 1;
+            process.stdout.write(`${JSON.stringify({
+                ok: false,
+                command: 'status',
+                model: config.model,
+                ollama: 'unavailable',
+                error: error.message,
+            })}\n`);
+        }
+        return;
+    }
+    console.log(chalk.blue('🔍 Dhruv CLI Status Check\n'));
+    const server = await getOllamaStatus();
+    printInfo(`Ollama endpoint: ${server.endpoint}`);
+    printInfo(`Ollama version: ${server.version ?? 'unavailable'}\n`);
     printInfo(`Current configuration:`);
     console.log(`  Model: ${config.model}`);
     console.log(`  Response Format: ${config.responseFormat}`);
@@ -30,6 +67,7 @@ export async function status() {
             printSuccess(`✓ Configured model '${config.model}' is available`);
         }
         else {
+            process.exitCode = 1;
             printError(`✗ Configured model '${config.model}' is not available`);
             if (models.length > 0) {
                 console.log(chalk.yellow(`Available models: ${models.join(', ')}`));

package/dist/config/config.d.ts

@@ -1,8 +1,12 @@
+export type ConfigScope = 'local' | 'global';
 export interface DhruvConfig {
     model: string;
     verbose: boolean;
     responseFormat: 'text' | 'json' | 'markdown';
+    timeoutMs: number;
     theme?: 'default' | 'dark' | 'light' | 'mono';
 }
 export declare function loadConfig(): DhruvConfig;
-export declare function saveConfig(config: Partial<DhruvConfig>): void;
+export declare function saveConfig(config: Partial<DhruvConfig>, options?: {
+    scope?: ConfigScope;
+}): void;