@rahul05ranjan/dhruv-cli 1.5.0 → 1.6.1

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')
@@ -123,9 +123,9 @@ program
       if (opts.verbose) config.verbose = true;
       if (opts.json) config.responseFormat = 'json';
       if (opts.timeout) config.timeoutMs = Number(opts.timeout);
-      // Save config for session
+      // Set in-memory config overrides for the session
       const configModule = await import('./config/config.js');
-      configModule.saveConfig(config);
+      configModule.setSessionConfig(config);
     }
   });
 
@@ -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;

package/src/utils/projectType.ts

@@ -1,29 +1,90 @@
 // Use .js extension for ESM compatibility
 import fs from 'fs';
 import path from 'path';
+import { logger } from '../core/logger.js';
 
-export function detectProjectType(directory: string = process.cwd()): string {
+export interface ProjectContext {
+  type: string;
+  framework?: string;
+  diagnostic?: string;
+}
+
+export function detectProjectDetails(directory: string = process.cwd()): ProjectContext {
   const file = (name: string) => path.join(directory, name);
 
   if (fs.existsSync(file('package.json'))) {
     let pkg: { dependencies?: Record<string, string>; devDependencies?: Record<string, string> };
     try {
       pkg = JSON.parse(fs.readFileSync(file('package.json'), 'utf-8'));
-    } catch {
-      return 'unknown';
+    } catch (err) {
+      const diagnostic = `Malformed package.json in ${directory}: ${(err as Error).message}`;
+      logger.warn(diagnostic);
+      return { type: 'unknown', diagnostic };
     }
 
     const dependencies = { ...pkg.dependencies, ...pkg.devDependencies };
-    if (dependencies.react) return 'react';
-    if (dependencies.next) return 'nextjs';
-    if (dependencies.express) return 'node-express';
-    if (dependencies.typescript || fs.existsSync(file('tsconfig.json'))) return 'node-typescript';
-    return 'node';
+    if (dependencies.react) return { type: 'node', framework: 'react' };
+    if (dependencies.next) 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 { type: 'node', framework: 'node-express' };
+    if (dependencies.typescript || fs.existsSync(file('tsconfig.json'))) 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: string | undefined;
+    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 as Error).message}`;
+        logger.warn(diagnostic);
+        return { type: 'python', diagnostic };
+      }
+    }
+    return { type: 'python', framework };
+  }
+
+  if (fs.existsSync(file('go.mod'))) return { type: 'go' };
+  if (fs.existsSync(file('Cargo.toml'))) return { type: 'rust' };
+  if (fs.existsSync(file('pom.xml')) || fs.existsSync(file('build.gradle')) || fs.existsSync(file('build.gradle.kts'))) {
+    let framework: string | undefined;
+    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: string = process.cwd()): string {
+  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}`;
   }
-  if (fs.existsSync(file('requirements.txt'))) return 'python';
-  if (fs.existsSync(file('pyproject.toml'))) return 'python';
-  if (fs.existsSync(file('go.mod'))) return '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 details.type;
 }