@rahul05ranjan/dhruv-cli 1.5.0 → 1.6.0

package/dist/index.js

@@ -46,7 +46,7 @@ program
     .command('review <fileOrDir>')
     .description(commandDescription('review'))
     .option('--diff', 'Review the current uncommitted git diff')
-    .action((fileOrDir, command) => review(fileOrDir, command.opts()));
+    .action((fileOrDir, options) => review(fileOrDir, options));
 program
     .command('optimize <file>')
     .description(commandDescription('optimize'))
@@ -55,14 +55,14 @@ program
     .command('security-check [fileOrDir]')
     .description(commandDescription('security-check'))
     .option('--strict', 'Exit with failure when high-confidence findings are detected')
-    .action((fileOrDir, command) => securityCheck(fileOrDir, command.opts()));
+    .action((fileOrDir, options) => securityCheck(fileOrDir, options));
 program
     .command('generate <type> <target>')
     .description(commandDescription('generate'))
     .option('--apply', 'Write generated tests to disk (preview is the default)')
     .option('--output <path>', 'Write generated tests to this path')
     .option('--overwrite', 'Allow replacing an existing output file')
-    .action((type, target, command) => generate(type, target, command.opts()));
+    .action((type, target, options) => generate(type, target, options));
 program
     .command('init')
     .description(commandDescription('init'))
@@ -75,13 +75,13 @@ program
     .command('health')
     .description(commandDescription('health'))
     .option('--details', 'Show every health check and diagnostic detail')
-    .action((command) => health(command.opts()));
+    .action((options) => health(options));
 program
     .command('metrics')
     .description(commandDescription('metrics'))
     .option('--raw', 'Export raw Prometheus metrics')
     .option('--reset', 'Clear persisted local metrics')
-    .action((command) => metrics(command.opts()));
+    .action((options) => metrics(options));
 program
     .command('project-type')
     .description(commandDescription('project-type'))
@@ -168,18 +168,70 @@ program
     let script = '';
     switch (shell) {
         case 'zsh':
-            script = `#compdef dhruv\n_dhruv_completion() {\n  _arguments '1:command:(${commands})' '*:option:(${options})'\n}\ncompdef _dhruv_completion dhruv`;
+            script = `#compdef dhruv
+_dhruv_completion() {
+  local -a commands
+  commands=(${commands})
+  _arguments -C \\
+    '1:command:->cmds' \\
+    '*::options:->args'
+  case "$state" in
+    cmds)
+      _describe -t commands 'dhruv command' commands
+      ;;
+    args)
+      case $words[1] in
+        generate)
+          _arguments '1:type:(tests documentation docs component)' '*:file:_files'
+          ;;
+        review|optimize|security-check)
+          _arguments '*:file:_files'
+          ;;
+        completion)
+          _arguments '1:shell:(bash zsh fish)'
+          ;;
+        *)
+          _arguments '*:options:(${options})'
+          ;;
+      esac
+      ;;
+  esac
+}
+compdef _dhruv_completion dhruv`;
             break;
         case 'fish':
-            script = `complete -c dhruv -f -n '__fish_use_subcommand' -a '${commands}'\ncomplete -c dhruv -f -n 'not __fish_use_subcommand' -a '${options}'`;
+            script = `complete -c dhruv -f -n '__fish_use_subcommand' -a '${commands}'\ncomplete -c dhruv -f -n '__fish_seen_subcommand_from generate' -a 'tests documentation docs component'\ncomplete -c dhruv -f -n '__fish_seen_subcommand_from completion' -a 'bash zsh fish'\ncomplete -c dhruv -f -n 'not __fish_use_subcommand' -a '${options}'`;
             break;
         case 'bash':
             script = String.raw `#!/bin/bash
 _dhruv_completion() {
-  local commands="${commands}"
-  local options="${options}"
-  local choices="$commands $options"
-  COMPREPLY=( $(compgen -W "$choices" -- "\${COMP_WORDS[COMP_CWORD]}") )
+  local cur prev commands options
+  COMPREPLY=()
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  commands="${commands}"
+  options="${options}"
+
+  if [[ "$prev" == "generate" ]]; then
+    COMPREPLY=( $(compgen -W "tests documentation docs component" -- "$cur") )
+    return 0
+  fi
+  if [[ "$prev" == "completion" ]]; then
+    COMPREPLY=( $(compgen -W "bash zsh fish" -- "$cur") )
+    return 0
+  fi
+  if [[ "$prev" == "review" || "$prev" == "optimize" || "$prev" == "security-check" ]]; then
+    COMPREPLY=( $(compgen -f -- "$cur") )
+    return 0
+  fi
+
+  if [[ "$cur" == -* ]]; then
+    COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+  elif [[ $COMP_CWORD -eq 1 ]]; then
+    COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+  else
+    COMPREPLY=( $(compgen -W "$commands $options" -- "$cur") )
+  fi
 }
 complete -F _dhruv_completion dhruv`;
             break;

package/dist/utils/projectType.d.ts

@@ -1 +1,7 @@
+export interface ProjectContext {
+    type: string;
+    framework?: string;
+    diagnostic?: string;
+}
+export declare function detectProjectDetails(directory?: string): ProjectContext;
 export declare function detectProjectType(directory?: string): string;

package/dist/utils/projectType.js

@@ -1,36 +1,95 @@
 // Use .js extension for ESM compatibility
 import fs from 'fs';
 import path from 'path';
-export function detectProjectType(directory = process.cwd()) {
+import { logger } from '../core/logger.js';
+export function detectProjectDetails(directory = process.cwd()) {
     const file = (name) => path.join(directory, name);
     if (fs.existsSync(file('package.json'))) {
         let pkg;
         try {
             pkg = JSON.parse(fs.readFileSync(file('package.json'), 'utf-8'));
         }
-        catch {
-            return 'unknown';
+        catch (err) {
+            const diagnostic = `Malformed package.json in ${directory}: ${err.message}`;
+            logger.warn(diagnostic);
+            return { type: 'unknown', diagnostic };
         }
         const dependencies = { ...pkg.dependencies, ...pkg.devDependencies };
         if (dependencies.react)
-            return 'react';
+            return { type: 'node', framework: 'react' };
         if (dependencies.next)
-            return 'nextjs';
+            return { type: 'node', framework: 'nextjs' };
+        if (dependencies.vue)
+            return { type: 'node', framework: 'vue' };
+        if (dependencies['@angular/core'])
+            return { type: 'node', framework: 'angular' };
+        if (dependencies.svelte)
+            return { type: 'node', framework: 'svelte' };
+        if (dependencies['@nestjs/core'])
+            return { type: 'node', framework: 'nestjs' };
         if (dependencies.express)
-            return 'node-express';
+            return { type: 'node', framework: 'node-express' };
         if (dependencies.typescript || fs.existsSync(file('tsconfig.json')))
-            return 'node-typescript';
-        return 'node';
+            return { type: 'node-typescript' };
+        return { type: 'node' };
+    }
+    if (fs.existsSync(file('tsconfig.json'))) {
+        return { type: 'node-typescript' };
+    }
+    if (fs.existsSync(file('requirements.txt')) || fs.existsSync(file('pyproject.toml')) || fs.existsSync(file('Pipfile')) || fs.existsSync(file('setup.py'))) {
+        let framework;
+        if (fs.existsSync(file('manage.py'))) {
+            framework = 'django';
+        }
+        else if (fs.existsSync(file('requirements.txt'))) {
+            try {
+                const reqs = fs.readFileSync(file('requirements.txt'), 'utf-8');
+                if (/fastapi/i.test(reqs))
+                    framework = 'fastapi';
+                else if (/flask/i.test(reqs))
+                    framework = 'flask';
+                else if (/django/i.test(reqs))
+                    framework = 'django';
+            }
+            catch (err) {
+                const diagnostic = `Error reading requirements.txt: ${err.message}`;
+                logger.warn(diagnostic);
+                return { type: 'python', diagnostic };
+            }
+        }
+        return { type: 'python', framework };
     }
-    if (fs.existsSync(file('requirements.txt')))
-        return 'python';
-    if (fs.existsSync(file('pyproject.toml')))
-        return 'python';
     if (fs.existsSync(file('go.mod')))
-        return 'go';
+        return { type: 'go' };
     if (fs.existsSync(file('Cargo.toml')))
-        return 'rust';
-    if (fs.existsSync(file('pom.xml')) || fs.existsSync(file('build.gradle')))
-        return 'java';
-    return 'unknown';
+        return { type: 'rust' };
+    if (fs.existsSync(file('pom.xml')) || fs.existsSync(file('build.gradle')) || fs.existsSync(file('build.gradle.kts'))) {
+        let framework;
+        try {
+            const pomPath = file('pom.xml');
+            const gradlePath = file('build.gradle');
+            const content = fs.existsSync(pomPath)
+                ? fs.readFileSync(pomPath, 'utf-8')
+                : (fs.existsSync(gradlePath) ? fs.readFileSync(gradlePath, 'utf-8') : '');
+            if (/spring-boot/i.test(content))
+                framework = 'spring-boot';
+        }
+        catch {
+            // safe fallback
+        }
+        return { type: 'java', framework };
+    }
+    return { type: 'unknown' };
+}
+export function detectProjectType(directory = process.cwd()) {
+    const details = detectProjectDetails(directory);
+    if (details.type === 'unknown')
+        return 'unknown';
+    if (details.framework) {
+        if (details.framework === 'react' || details.framework === 'nextjs' || details.framework === 'node-express') {
+            return details.framework;
+        }
+        return `${details.type}-${details.framework}`;
+    }
+    return details.type;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rahul05ranjan/dhruv-cli",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "AI-powered CLI assistant for developers using Ollama",
   "keywords": [
     "ai",

package/src/commands/generate.ts

@@ -5,23 +5,43 @@ import { getSystemMessage } from '../core/prompts.js';
 import { printError, printSuccess, printInfo } from '../utils/ux.js';
 import { loadConfig } from '../config/config.js';
 
-function buildPrompt(type: string, content: string): string {
+function getLanguageForFile(target: string): { name: string; testFramework: string } {
+  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: string, content: string, target: string): string {
+  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: string): string {
-  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();
 }
 
@@ -44,7 +64,7 @@ export async function generate(type: string, target: string, options: GenerateOp
     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,
     }),

package/src/commands/init.ts

@@ -13,8 +13,9 @@ export async function init() {
       modelChoices = models;
     }
   } 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 {
@@ -22,7 +23,7 @@ export async function init() {
       {
         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,
       },
@@ -59,11 +60,12 @@ export async function init() {
     saveConfig(settings, { scope });
     console.log(chalk.green(`Configuration saved ${scope === 'global' ? 'for your user account' : 'in this project'}!`));
   } catch (error) {
-    process.exitCode = 130;
-    if ((error as { isTtyError?: boolean })?.isTtyError) {
+    const isTty = Boolean((error as { isTtyError?: boolean })?.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/src/commands/metrics.ts

@@ -93,8 +93,17 @@ export async function metrics(options: MetricsOptions = {}): Promise<void> {
     logger.info('Metrics displayed successfully', { metricsCount: metricsData.length });
 
   } catch (error) {
-    printError('Failed to retrieve metrics');
-    console.error(chalk.red((error as Error).message));
+    process.exitCode = 1;
+    if (loadConfig().responseFormat === 'json') {
+      process.stdout.write(`${JSON.stringify({
+        ok: false,
+        command: 'metrics',
+        error: (error as Error).message,
+      })}\n`);
+    } else {
+      printError('Failed to retrieve metrics');
+      console.error(chalk.red((error as Error).message));
+    }
     logger.error('Metrics command failed', error as Error);
   }
 }

package/src/commands/review.ts

@@ -3,11 +3,25 @@ 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';
+import { printError, printInfo } from '../utils/ux.js';
 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']);
+const IGNORED_DIRECTORIES = new Set([
+  '.git',
+  'node_modules',
+  'dist',
+  'build',
+  'coverage',
+  '.dhruv-cache',
+  'logs',
+  '.next',
+  '.turbo',
+  '__pycache__',
+  '.pytest_cache',
+  'target',
+  'vendor',
+]);
 
 /** Reads a file or up to 10 code files from a directory tree. */
 function readCode(fileOrDir: string): string | undefined {
@@ -51,6 +65,10 @@ function readDirectory(dir: string): string | undefined {
     return undefined;
   }
 
+  if (files.length >= 10) {
+    printInfo('Note: Directory review is capped at the first 10 source files.');
+  }
+
   let code = '';
   for (const f of files) {
     try {

package/src/commands/security-check.ts

@@ -5,13 +5,30 @@ 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']);
+const IGNORED_DIRECTORIES = new Set([
+  '.git',
+  'node_modules',
+  'dist',
+  'build',
+  'coverage',
+  '.dhruv-cache',
+  'logs',
+  '.next',
+  '.turbo',
+  '__pycache__',
+  '.pytest_cache',
+  'target',
+  'vendor',
+]);
 
 function redactSensitiveContent(content: string): string {
   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]');
+    .replace(/\bBearer\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [REDACTED]')
+    .replace(/\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9_]{36,255}\b/g, '[REDACTED]')
+    .replace(/\bAKIA[0-9A-Z]{16}\b/g, '[REDACTED]')
+    .replace(/-----BEGIN (?:RSA|OPENSSH|EC|PGP|DSA)? PRIVATE KEY-----[\s\S]*?-----END (?:RSA|OPENSSH|EC|PGP|DSA)? PRIVATE KEY-----/g, '[REDACTED PRIVATE KEY]');
 }
 
 interface SecurityFinding {
@@ -47,6 +64,20 @@ function findHighConfidenceFindings(content: string): SecurityFinding[] {
         description: 'bearer token detected',
         remediation: 'revoke the token and use a secure runtime secret store',
       });
+    } else if (/\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9_]{36,255}\b/.test(line)) {
+      findings.push({
+        line: index + 1,
+        severity: 'high',
+        description: 'GitHub token detected',
+        remediation: 'revoke the GitHub token and store it in GitHub Secrets or environment variables',
+      });
+    } else if (/\bAKIA[0-9A-Z]{16}\b/.test(line)) {
+      findings.push({
+        line: index + 1,
+        severity: 'high',
+        description: 'AWS access key ID detected',
+        remediation: 'rotate the AWS access key and use IAM roles or AWS Secrets Manager',
+      });
     }
   });
 

package/src/commands/status.ts

@@ -70,14 +70,16 @@ export async function status() {
     } else {
       process.exitCode = 1;
       printError(`✗ Configured model '${config.model}' is not available`);
+      console.log(chalk.yellow(`💡 Install the model: ollama pull ${config.model}`));
       if (models.length > 0) {
         console.log(chalk.yellow(`Available models: ${models.join(', ')}`));
       }
     }
   } catch (error) {
+    process.exitCode = 1;
     printError('✗ Ollama connection failed');
     console.log(chalk.red((error as Error).message));
-    console.log(chalk.yellow('\nTo start Ollama, run: ollama serve'));
-    console.log(chalk.yellow('To install a model, run: ollama pull llama2'));
+    console.log(chalk.yellow('\n💡 To start Ollama, run: ollama serve'));
+    console.log(chalk.yellow(`💡 To install the configured model, run: ollama pull ${config.model}`));
   }
 }

package/src/core/command-runner.ts

@@ -43,7 +43,14 @@ export interface CommandSpec {
 /** Maps typed AI errors to user-facing hints — once, not per command. */
 function describeAIError(error: unknown, model: string): string {
   if (!error || typeof error !== 'object' || !('kind' in error)) {
-    return error instanceof Error ? error.message : String(error);
+    const msg = error instanceof Error ? error.message : String(error);
+    if (/econnrefused|failed to connect|fetch failed/i.test(msg)) {
+      return `💡 Make sure Ollama is running: ollama serve`;
+    }
+    if (/model.*not found/i.test(msg)) {
+      return `💡 Install the model: ollama pull ${model}`;
+    }
+    return msg;
   }
 
   const typedError = error as AIError;
@@ -149,7 +156,6 @@ export async function runCommand(spec: CommandSpec): Promise<void> {
     } else {
       if (!streamed) process.stdout.write(response);
       process.stdout.write('\n');
-      console.log('\n');
       if (spec.footer) console.log(chalk.dim(spec.footer));
     }
 

package/src/core/metrics.ts

@@ -286,7 +286,9 @@ export class MetricsCollector {
     try {
       fs.unlinkSync(this.persistentPath());
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
+      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+        logger.debug('Failed to unlink persistent metrics', { error: (error as Error).message });
+      }
     }
   }
 

package/src/index.ts

@@ -53,7 +53,7 @@ program
   .command('review <fileOrDir>')
   .description(commandDescription('review'))
   .option('--diff', 'Review the current uncommitted git diff')
-  .action((fileOrDir: string, command: Command) => review(fileOrDir, command.opts()));
+  .action((fileOrDir: string, options: Record<string, any>) => review(fileOrDir, options));
 
 program
   .command('optimize <file>')
@@ -64,7 +64,7 @@ program
   .command('security-check [fileOrDir]')
   .description(commandDescription('security-check'))
   .option('--strict', 'Exit with failure when high-confidence findings are detected')
-  .action((fileOrDir: string | undefined, command: Command) => securityCheck(fileOrDir, command.opts()));
+  .action((fileOrDir: string | undefined, options: Record<string, any>) => securityCheck(fileOrDir, options));
 
 program
   .command('generate <type> <target>')
@@ -72,7 +72,7 @@ program
   .option('--apply', 'Write generated tests to disk (preview is the default)')
   .option('--output <path>', 'Write generated tests to this path')
   .option('--overwrite', 'Allow replacing an existing output file')
-  .action((type: string, target: string, command: Command) => generate(type, target, command.opts()));
+  .action((type: string, target: string, options: Record<string, any>) => generate(type, target, options));
 
 program
   .command('init')
@@ -88,14 +88,14 @@ program
   .command('health')
   .description(commandDescription('health'))
   .option('--details', 'Show every health check and diagnostic detail')
-  .action((command: Command) => health(command.opts()));
+  .action((options: Record<string, any>) => health(options));
 
 program
   .command('metrics')
   .description(commandDescription('metrics'))
   .option('--raw', 'Export raw Prometheus metrics')
   .option('--reset', 'Clear persisted local metrics')
-  .action((command: Command) => metrics(command.opts()));
+  .action((options: Record<string, any>) => metrics(options));
 
 program
   .command('project-type')
@@ -184,18 +184,70 @@ program
     let script = '';
     switch (shell) {
       case 'zsh':
-        script = `#compdef dhruv\n_dhruv_completion() {\n  _arguments '1:command:(${commands})' '*:option:(${options})'\n}\ncompdef _dhruv_completion dhruv`;
+        script = `#compdef dhruv
+_dhruv_completion() {
+  local -a commands
+  commands=(${commands})
+  _arguments -C \\
+    '1:command:->cmds' \\
+    '*::options:->args'
+  case "$state" in
+    cmds)
+      _describe -t commands 'dhruv command' commands
+      ;;
+    args)
+      case $words[1] in
+        generate)
+          _arguments '1:type:(tests documentation docs component)' '*:file:_files'
+          ;;
+        review|optimize|security-check)
+          _arguments '*:file:_files'
+          ;;
+        completion)
+          _arguments '1:shell:(bash zsh fish)'
+          ;;
+        *)
+          _arguments '*:options:(${options})'
+          ;;
+      esac
+      ;;
+  esac
+}
+compdef _dhruv_completion dhruv`;
         break;
       case 'fish':
-        script = `complete -c dhruv -f -n '__fish_use_subcommand' -a '${commands}'\ncomplete -c dhruv -f -n 'not __fish_use_subcommand' -a '${options}'`;
+        script = `complete -c dhruv -f -n '__fish_use_subcommand' -a '${commands}'\ncomplete -c dhruv -f -n '__fish_seen_subcommand_from generate' -a 'tests documentation docs component'\ncomplete -c dhruv -f -n '__fish_seen_subcommand_from completion' -a 'bash zsh fish'\ncomplete -c dhruv -f -n 'not __fish_use_subcommand' -a '${options}'`;
         break;
       case 'bash':
         script = String.raw`#!/bin/bash
 _dhruv_completion() {
-  local commands="${commands}"
-  local options="${options}"
-  local choices="$commands $options"
-  COMPREPLY=( $(compgen -W "$choices" -- "\${COMP_WORDS[COMP_CWORD]}") )
+  local cur prev commands options
+  COMPREPLY=()
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  commands="${commands}"
+  options="${options}"
+
+  if [[ "$prev" == "generate" ]]; then
+    COMPREPLY=( $(compgen -W "tests documentation docs component" -- "$cur") )
+    return 0
+  fi
+  if [[ "$prev" == "completion" ]]; then
+    COMPREPLY=( $(compgen -W "bash zsh fish" -- "$cur") )
+    return 0
+  fi
+  if [[ "$prev" == "review" || "$prev" == "optimize" || "$prev" == "security-check" ]]; then
+    COMPREPLY=( $(compgen -f -- "$cur") )
+    return 0
+  fi
+
+  if [[ "$cur" == -* ]]; then
+    COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+  elif [[ $COMP_CWORD -eq 1 ]]; then
+    COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+  else
+    COMPREPLY=( $(compgen -W "$commands $options" -- "$cur") )
+  fi
 }
 complete -F _dhruv_completion dhruv`;
         break;