claude-dev-cli 0.10.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

claude_dev_cli/cli.py

@@ -806,41 +806,83 @@ def generate() -> None:
 
 
 @generate.command('tests')
-@click.argument('file_path', type=click.Path(exists=True))
-@click.option('-o', '--output', type=click.Path(), help='Output file path')
+@click.argument('paths', nargs=-1, type=click.Path(exists=True))
+@click.option('-o', '--output', type=click.Path(), help='Output file path (single file only)')
 @click.option('-a', '--api', help='API config to use')
 @click.option('-i', '--interactive', is_flag=True, help='Interactive refinement mode')
 @click.option('--auto-context', is_flag=True, help='Include dependencies and related files')
+@click.option('--max-files', type=int, default=10, help='Maximum files to process (default: 10)')
 @click.pass_context
 def gen_tests(
     ctx: click.Context,
-    file_path: str,
+    paths: tuple,
     output: Optional[str],
     api: Optional[str],
     interactive: bool,
-    auto_context: bool
+    auto_context: bool,
+    max_files: int
 ) -> None:
-    """Generate pytest tests for a Python file."""
+    """Generate pytest tests for Python files.
+    
+    Can generate tests for multiple files or directories:
+    
+      cdc generate tests file1.py file2.py
+      cdc generate tests src/
+    """
     console = ctx.obj['console']
+    from claude_dev_cli.path_utils import expand_paths
     
     try:
+        if not paths:
+            console.print("[yellow]No files specified. Provide file paths.[/yellow]")
+            return
+        
+        files = expand_paths(list(paths), max_files=max_files)
+        if not files:
+            console.print("[yellow]No files found.[/yellow]")
+            return
+        
+        # Output only works with single file
+        if output and len(files) > 1:
+            console.print("[yellow]Warning: --output only works with single file. Ignoring output option.[/yellow]")
+            output = None
+        
+        if len(files) > 1:
+            console.print(f"\n[bold]Generating tests for {len(files)} file(s):[/bold]")
+            for f in files[:5]:
+                console.print(f"  • {f}")
+            if len(files) > 5:
+                console.print(f"  ... and {len(files) - 5} more")
+            console.print()
+        
+        # Build combined prompt
+        files_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                files_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
         if auto_context:
             from claude_dev_cli.context import ContextGatherer
             
             with console.status("[bold blue]Gathering context..."):
                 gatherer = ContextGatherer()
-                context = gatherer.gather_for_file(Path(file_path), include_git=False)
+                context = gatherer.gather_for_file(files[0], include_git=False)
                 context_info = context.format_for_prompt()
             
             console.print("[dim]✓ Context gathered (dependencies, related files)[/dim]")
             
-            # Use context-aware test generation
             client = ClaudeClient(api_config_name=api)
-            enhanced_prompt = f"{context_info}\n\nPlease generate comprehensive pytest tests for the main file, including fixtures, edge cases, and proper mocking where needed."
-            result = client.call(enhanced_prompt)
+            prompt = f"{context_info}\n\nFiles:{files_content}\n\nPlease generate comprehensive pytest tests for these files, including fixtures, edge cases, and proper mocking where needed."
         else:
-            with console.status("[bold blue]Generating tests..."):
-                result = generate_tests(file_path, api_config_name=api)
+            with console.status(f"[bold blue]Generating tests for {len(files)} file(s)..."):
+                client = ClaudeClient(api_config_name=api)
+                prompt = f"Files to test:{files_content}\n\nPlease generate comprehensive pytest tests for these files, including fixtures, edge cases, and proper mocking where needed."
+        
+        result = client.call(prompt)
         
         if interactive:
             # Show initial result
@@ -892,41 +934,83 @@ def gen_tests(
 
 
 @generate.command('docs')
-@click.argument('file_path', type=click.Path(exists=True))
-@click.option('-o', '--output', type=click.Path(), help='Output file path')
+@click.argument('paths', nargs=-1, type=click.Path(exists=True))
+@click.option('-o', '--output', type=click.Path(), help='Output file path (single file only)')
 @click.option('-a', '--api', help='API config to use')
 @click.option('-i', '--interactive', is_flag=True, help='Interactive refinement mode')
 @click.option('--auto-context', is_flag=True, help='Include dependencies and related files')
+@click.option('--max-files', type=int, default=10, help='Maximum files to process (default: 10)')
 @click.pass_context
 def gen_docs(
     ctx: click.Context,
-    file_path: str,
+    paths: tuple,
     output: Optional[str],
     api: Optional[str],
     interactive: bool,
-    auto_context: bool
+    auto_context: bool,
+    max_files: int
 ) -> None:
-    """Generate documentation for a Python file."""
+    """Generate documentation for files.
+    
+    Can generate docs for multiple files or directories:
+    
+      cdc generate docs file1.py file2.py
+      cdc generate docs src/
+    """
     console = ctx.obj['console']
+    from claude_dev_cli.path_utils import expand_paths
     
     try:
+        if not paths:
+            console.print("[yellow]No files specified. Provide file paths.[/yellow]")
+            return
+        
+        files = expand_paths(list(paths), max_files=max_files)
+        if not files:
+            console.print("[yellow]No files found.[/yellow]")
+            return
+        
+        # Output only works with single file
+        if output and len(files) > 1:
+            console.print("[yellow]Warning: --output only works with single file. Ignoring output option.[/yellow]")
+            output = None
+        
+        if len(files) > 1:
+            console.print(f"\n[bold]Generating docs for {len(files)} file(s):[/bold]")
+            for f in files[:5]:
+                console.print(f"  • {f}")
+            if len(files) > 5:
+                console.print(f"  ... and {len(files) - 5} more")
+            console.print()
+        
+        # Build combined prompt
+        files_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                files_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
         if auto_context:
             from claude_dev_cli.context import ContextGatherer
             
             with console.status("[bold blue]Gathering context..."):
                 gatherer = ContextGatherer()
-                context = gatherer.gather_for_file(Path(file_path), include_git=False)
+                context = gatherer.gather_for_file(files[0], include_git=False)
                 context_info = context.format_for_prompt()
             
             console.print("[dim]✓ Context gathered (dependencies, related files)[/dim]")
             
-            # Use context-aware documentation generation
             client = ClaudeClient(api_config_name=api)
-            enhanced_prompt = f"{context_info}\n\nPlease generate comprehensive documentation for the main file, including API reference, usage examples, and integration notes."
-            result = client.call(enhanced_prompt)
+            prompt = f"{context_info}\n\nFiles:{files_content}\n\nPlease generate comprehensive documentation for these files, including API reference, usage examples, and integration notes."
         else:
-            with console.status("[bold blue]Generating documentation..."):
-                result = generate_docs(file_path, api_config_name=api)
+            with console.status(f"[bold blue]Generating documentation for {len(files)} file(s)..."):
+                client = ClaudeClient(api_config_name=api)
+                prompt = f"Files to document:{files_content}\n\nPlease generate comprehensive documentation for these files, including API reference, usage examples, and integration notes."
+        
+        result = client.call(prompt)
         
         if interactive:
             console.print("\n[bold]Initial Documentation:[/bold]\n")
@@ -976,23 +1060,375 @@ def gen_docs(
         sys.exit(1)
 
 
+@generate.command('code')
+@click.option('--description', help='Inline code specification')
+@click.option('-f', '--file', 'spec_file', type=click.Path(exists=True), help='Read specification from file')
+@click.option('--pdf', type=click.Path(exists=True), help='Read specification from PDF')
+@click.option('--url', help='Fetch specification from URL')
+@click.option('-o', '--output', required=True, type=click.Path(), help='Output file path (required)')
+@click.option('--language', help='Target language (auto-detected from output extension)')
+@click.option('-m', '--model', help='Model profile to use')
+@click.option('-a', '--api', help='API config to use')
+@click.option('-i', '--interactive', is_flag=True, help='Interactive refinement mode')
+@click.option('--auto-context', is_flag=True, help='Include project context')
+@click.pass_context
+def gen_code(
+    ctx: click.Context,
+    description: Optional[str],
+    spec_file: Optional[str],
+    pdf: Optional[str],
+    url: Optional[str],
+    output: str,
+    language: Optional[str],
+    model: Optional[str],
+    api: Optional[str],
+    interactive: bool,
+    auto_context: bool
+) -> None:
+    """Generate code from a specification.
+    
+    Reads specification from text, file, PDF, or URL and generates complete code.
+    
+    Examples:
+      cdc generate code --description "REST API client" -o client.py
+      cdc generate code --file spec.md -o implementation.go
+      cdc generate code --pdf requirements.pdf -o app.js
+      cdc generate code --url https://example.com/spec -o service.py
+    """
+    console = ctx.obj['console']
+    from claude_dev_cli.input_sources import get_input_content
+    from pathlib import Path
+    
+    try:
+        # Get specification content
+        spec_content, source_desc = get_input_content(
+            description=description,
+            file_path=spec_file,
+            pdf_path=pdf,
+            url=url,
+            console=console
+        )
+        
+        # Detect language from output extension if not specified
+        if not language:
+            ext = Path(output).suffix.lstrip('.')
+            language_map = {
+                'py': 'Python',
+                'js': 'JavaScript',
+                'ts': 'TypeScript',
+                'go': 'Go',
+                'rs': 'Rust',
+                'java': 'Java',
+                'cpp': 'C++',
+                'c': 'C',
+                'cs': 'C#',
+                'rb': 'Ruby',
+                'php': 'PHP',
+                'swift': 'Swift',
+                'kt': 'Kotlin',
+            }
+            language = language_map.get(ext, ext.upper() if ext else None)
+        
+        console.print(f"[cyan]Generating code from:[/cyan] {source_desc}")
+        if language:
+            console.print(f"[cyan]Target language:[/cyan] {language}")
+        console.print(f"[cyan]Output:[/cyan] {output}\n")
+        
+        # Build prompt
+        prompt = f"Specification:\n\n{spec_content}\n\n"
+        if language:
+            prompt += f"Generate complete, production-ready {language} code that implements this specification. "
+        else:
+            prompt += "Generate complete, production-ready code that implements this specification. "
+        prompt += "Include proper error handling, documentation, and best practices."
+        
+        # Add context if requested
+        if auto_context:
+            from claude_dev_cli.context import ContextGatherer
+            
+            with console.status("[bold blue]Gathering project context..."):
+                gatherer = ContextGatherer()
+                # Gather context from current directory
+                context = gatherer.gather_for_file(".", include_git=True)
+                context_info = context.format_for_prompt()
+            
+            console.print("[dim]✓ Context gathered[/dim]")
+            prompt = f"{context_info}\n\n{prompt}"
+        
+        # Generate code
+        with console.status(f"[bold blue]Generating code..."):
+            client = ClaudeClient(api_config_name=api, model=model)
+            result = client.call(prompt)
+        
+        # Interactive refinement
+        if interactive:
+            console.print("\n[bold]Initial Code:[/bold]\n")
+            console.print(result)
+            
+            client = ClaudeClient(api_config_name=api, model=model)
+            conversation_context = [result]
+            
+            while True:
+                console.print("\n[dim]Commands: 'save' to save and exit, 'exit' to discard, or ask for changes[/dim]")
+                user_input = console.input("[cyan]You:[/cyan] ").strip()
+                
+                if user_input.lower() == 'exit':
+                    console.print("[yellow]Discarded changes[/yellow]")
+                    return
+                
+                if user_input.lower() == 'save':
+                    result = conversation_context[-1]
+                    break
+                
+                if not user_input:
+                    continue
+                
+                # Get refinement
+                refinement_prompt = f"Previous code:\n\n{conversation_context[-1]}\n\nUser request: {user_input}\n\nProvide the updated code."
+                
+                console.print("\n[bold green]Claude:[/bold green] ", end='')
+                response_parts = []
+                for chunk in client.call_streaming(refinement_prompt):
+                    console.print(chunk, end='')
+                    response_parts.append(chunk)
+                console.print()
+                
+                result = ''.join(response_parts)
+                conversation_context.append(result)
+        
+        # Save output
+        Path(output).write_text(result)
+        console.print(f"\n[green]✓[/green] Code saved to: {output}")
+    
+    except Exception as e:
+        console.print(f"[red]Error: {e}[/red]")
+        sys.exit(1)
+
+
+@generate.command('feature')
+@click.argument('paths', nargs=-1, type=click.Path(exists=True))
+@click.option('--description', help='Inline feature specification')
+@click.option('-f', '--file', 'spec_file', type=click.Path(exists=True), help='Read specification from file')
+@click.option('--pdf', type=click.Path(exists=True), help='Read specification from PDF')
+@click.option('--url', help='Fetch specification from URL')
+@click.option('--max-files', type=int, default=10, help='Maximum files to modify (default: 10)')
+@click.option('-m', '--model', help='Model profile to use')
+@click.option('-a', '--api', help='API config to use')
+@click.option('-i', '--interactive', is_flag=True, help='Interactive refinement mode')
+@click.option('--auto-context', is_flag=True, help='Include project context')
+@click.option('--preview', is_flag=True, help='Preview changes without applying')
+@click.pass_context
+def gen_feature(
+    ctx: click.Context,
+    paths: tuple,
+    description: Optional[str],
+    spec_file: Optional[str],
+    pdf: Optional[str],
+    url: Optional[str],
+    max_files: int,
+    model: Optional[str],
+    api: Optional[str],
+    interactive: bool,
+    auto_context: bool,
+    preview: bool
+) -> None:
+    """Generate code to add a feature to existing project.
+    
+    Analyzes existing code and generates changes to implement a feature.
+    
+    Examples:
+      cdc generate feature --description "Add authentication" src/
+      cdc generate feature --file feature-spec.md
+      cdc generate feature --pdf requirements.pdf --preview
+      cdc generate feature --url https://example.com/spec src/
+    """
+    console = ctx.obj['console']
+    from claude_dev_cli.input_sources import get_input_content
+    from claude_dev_cli.path_utils import expand_paths, auto_detect_files
+    
+    try:
+        # Get feature specification
+        spec_content, source_desc = get_input_content(
+            description=description,
+            file_path=spec_file,
+            pdf_path=pdf,
+            url=url,
+            console=console
+        )
+        
+        # Determine files to analyze
+        if paths:
+            files = expand_paths(list(paths), max_files=max_files)
+        else:
+            files = auto_detect_files()
+            if files:
+                console.print(f"[dim]Auto-detected {len(files)} file(s) from project[/dim]")
+        
+        if not files:
+            console.print("[yellow]No files found. Specify paths or run in a project directory.[/yellow]")
+            return
+        
+        console.print(f"[cyan]Feature specification from:[/cyan] {source_desc}")
+        console.print(f"[cyan]Analyzing:[/cyan] {len(files)} file(s)\n")
+        
+        # Show files
+        if len(files) > 1:
+            console.print(f"[bold]Files to analyze:[/bold]")
+            for f in files[:5]:
+                console.print(f"  • {f}")
+            if len(files) > 5:
+                console.print(f"  ... and {len(files) - 5} more")
+            console.print()
+        
+        # Build codebase content
+        codebase_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                codebase_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
+        # Build prompt
+        prompt = f"Feature Specification:\n\n{spec_content}\n\n"
+        prompt += f"Existing Codebase:{codebase_content}\n\n"
+        prompt += "Analyze the existing code and provide:\n"
+        prompt += "1. Implementation plan for the feature\n"
+        prompt += "2. List of files to modify or create\n"
+        prompt += "3. Complete code changes (diffs or new files)\n"
+        prompt += "4. Any necessary setup or configuration changes\n\n"
+        prompt += "Be specific and provide complete, working code."
+        
+        # Add context if requested
+        if auto_context:
+            from claude_dev_cli.context import ContextGatherer
+            
+            with console.status("[bold blue]Gathering project context..."):
+                gatherer = ContextGatherer()
+                context = gatherer.gather_for_file(files[0], include_git=True)
+                context_info = context.format_for_prompt()
+            
+            console.print("[dim]✓ Context gathered[/dim]")
+            prompt = f"{context_info}\n\n{prompt}"
+        
+        # Generate feature implementation
+        with console.status(f"[bold blue]Analyzing codebase and generating feature implementation..."):
+            client = ClaudeClient(api_config_name=api, model=model)
+            result = client.call(prompt)
+        
+        # Show result
+        from rich.markdown import Markdown
+        md = Markdown(result)
+        console.print(md)
+        
+        if preview:
+            console.print("\n[yellow]Preview mode - no changes applied[/yellow]")
+            console.print("[dim]Remove --preview flag to apply changes[/dim]")
+            return
+        
+        # Interactive refinement
+        if interactive:
+            client = ClaudeClient(api_config_name=api, model=model)
+            conversation_context = [result]
+            
+            while True:
+                console.print("\n[dim]Ask for changes, 'apply' to confirm, or 'exit' to cancel[/dim]")
+                user_input = console.input("[cyan]You:[/cyan] ").strip()
+                
+                if user_input.lower() == 'exit':
+                    console.print("[yellow]Cancelled[/yellow]")
+                    return
+                
+                if user_input.lower() == 'apply':
+                    console.print("[green]✓[/green] Implementation plan ready")
+                    console.print("[dim]Apply the changes manually from the output above[/dim]")
+                    return
+                
+                if not user_input:
+                    continue
+                
+                # Get refinement
+                refinement_prompt = f"Previous implementation plan:\n\n{conversation_context[-1]}\n\nUser request: {user_input}\n\nProvide the updated implementation."
+                
+                console.print("\n[bold green]Claude:[/bold green] ", end='')
+                response_parts = []
+                for chunk in client.call_streaming(refinement_prompt):
+                    console.print(chunk, end='')
+                    response_parts.append(chunk)
+                console.print()
+                
+                result = ''.join(response_parts)
+                conversation_context.append(result)
+        else:
+            console.print("\n[green]✓[/green] Feature implementation generated")
+            console.print("[dim]Apply the changes manually from the output above[/dim]")
+    
+    except Exception as e:
+        console.print(f"[red]Error: {e}[/red]")
+        sys.exit(1)
+
+
 @main.command('review')
-@click.argument('file_path', type=click.Path(exists=True))
+@click.argument('paths', nargs=-1, type=click.Path(exists=True))
 @click.option('-a', '--api', help='API config to use')
 @click.option('-i', '--interactive', is_flag=True, help='Interactive follow-up questions')
 @click.option('--auto-context', is_flag=True, help='Automatically include git, dependencies, and related files')
+@click.option('--max-files', type=int, default=20, help='Maximum files to review (default: 20)')
 @click.pass_context
 def review(
     ctx: click.Context,
-    file_path: str,
+    paths: tuple,
     api: Optional[str],
     interactive: bool,
-    auto_context: bool
+    auto_context: bool,
+    max_files: int
 ) -> None:
-    """Review code for bugs and improvements."""
+    """Review code for bugs and improvements.
+    
+    Can review multiple files, directories, or auto-detect git changes:
+    
+      cdc review file1.py file2.py    # Multiple files
+      cdc review src/                 # Directory
+      cdc review                      # Auto-detect git changes
+    """
     console = ctx.obj['console']
+    from claude_dev_cli.path_utils import expand_paths, auto_detect_files
     
     try:
+        # Determine files to review
+        if paths:
+            # Expand paths (handles directories, multiple files)
+            files = expand_paths(list(paths), max_files=max_files)
+        else:
+            # Auto-detect files from git
+            files = auto_detect_files()
+            if files:
+                console.print(f"[dim]Auto-detected {len(files)} file(s) from git changes[/dim]")
+        
+        if not files:
+            console.print("[yellow]No files to review. Specify files or make some changes.[/yellow]")
+            return
+        
+        # Show files being reviewed
+        if len(files) > 1:
+            console.print(f"\n[bold]Reviewing {len(files)} file(s):[/bold]")
+            for f in files[:10]:  # Show first 10
+                console.print(f"  • {f}")
+            if len(files) > 10:
+                console.print(f"  ... and {len(files) - 10} more")
+            console.print()
+        
+        # Build combined prompt for multiple files
+        files_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                files_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
         # Gather context if requested
         context_info = ""
         if auto_context:
@@ -1000,31 +1436,24 @@ def review(
             
             with console.status("[bold blue]Gathering context..."):
                 gatherer = ContextGatherer()
-                context = gatherer.gather_for_review(Path(file_path))
+                # Use first file for context gathering
+                context = gatherer.gather_for_review(files[0])
                 context_info = context.format_for_prompt()
             
             console.print("[dim]✓ Context gathered (git, dependencies, tests)[/dim]")
         
-        with console.status("[bold blue]Reviewing code..."):
-            # If we have context, prepend it to the file analysis
+        with console.status(f"[bold blue]Reviewing {len(files)} file(s)..."):
+            client = ClaudeClient(api_config_name=api)
             if context_info:
-                # Read file separately for context-aware review
-                result = code_review(file_path, api_config_name=api)
-                # The context module already includes the file, so we use it differently
-                client = ClaudeClient(api_config_name=api)
-                enhanced_prompt = f"{context_info}\n\nPlease review this code for bugs and improvements."
-                result = client.call(enhanced_prompt)
+                prompt = f"{context_info}\n\nFiles to review:{files_content}\n\nPlease review this code for bugs and improvements."
             else:
-                result = code_review(file_path, api_config_name=api)
+                prompt = f"Files to review:{files_content}\n\nPlease review this code for bugs, security issues, and improvements."
+            result = client.call(prompt)
         
         md = Markdown(result)
         console.print(md)
         
         if interactive:
-            client = ClaudeClient(api_config_name=api)
-            with open(file_path, 'r') as f:
-                file_content = f.read()
-            
             console.print("\n[dim]Ask follow-up questions about the review, or 'exit' to quit[/dim]")
             
             while True:
@@ -1036,7 +1465,7 @@ def review(
                 if not user_input:
                     continue
                 
-                follow_up_prompt = f"Code review:\n\n{result}\n\nOriginal code:\n\n{file_content}\n\nUser question: {user_input}"
+                follow_up_prompt = f"Code review:\n\n{result}\n\nFiles:{files_content}\n\nUser question: {user_input}"
                 
                 console.print("\n[bold green]Claude:[/bold green] ", end='')
                 for chunk in client.call_streaming(follow_up_prompt):
@@ -1106,49 +1535,95 @@ def debug(
 
 
 @main.command('refactor')
-@click.argument('file_path', type=click.Path(exists=True))
-@click.option('-o', '--output', type=click.Path(), help='Output file path')
+@click.argument('paths', nargs=-1, type=click.Path(exists=True))
+@click.option('-o', '--output', type=click.Path(), help='Output file path (single file only)')
 @click.option('-a', '--api', help='API config to use')
 @click.option('-i', '--interactive', is_flag=True, help='Interactive refinement mode')
 @click.option('--auto-context', is_flag=True, help='Automatically include git, dependencies, and related files')
+@click.option('--max-files', type=int, default=20, help='Maximum files to refactor (default: 20)')
 @click.pass_context
 def refactor(
     ctx: click.Context,
-    file_path: str,
+    paths: tuple,
     output: Optional[str],
     api: Optional[str],
     interactive: bool,
-    auto_context: bool
+    auto_context: bool,
+    max_files: int
 ) -> None:
-    """Suggest refactoring improvements."""
+    """Suggest refactoring improvements.
+    
+    Can refactor multiple files, directories, or auto-detect git changes:
+    
+      cdc refactor file1.py file2.py    # Multiple files
+      cdc refactor src/                 # Directory
+      cdc refactor                      # Auto-detect git changes
+    """
     console = ctx.obj['console']
+    from claude_dev_cli.path_utils import expand_paths, auto_detect_files
     
     try:
+        # Determine files to refactor
+        if paths:
+            files = expand_paths(list(paths), max_files=max_files)
+        else:
+            files = auto_detect_files()
+            if files:
+                console.print(f"[dim]Auto-detected {len(files)} file(s) from git changes[/dim]")
+        
+        if not files:
+            console.print("[yellow]No files to refactor. Specify files or make some changes.[/yellow]")
+            return
+        
+        # Output only works with single file
+        if output and len(files) > 1:
+            console.print("[yellow]Warning: --output only works with single file. Ignoring output option.[/yellow]")
+            output = None
+        
+        # Show files being refactored
+        if len(files) > 1:
+            console.print(f"\n[bold]Refactoring {len(files)} file(s):[/bold]")
+            for f in files[:10]:
+                console.print(f"  • {f}")
+            if len(files) > 10:
+                console.print(f"  ... and {len(files) - 10} more")
+            console.print()
+        
+        # Build combined prompt
+        files_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                files_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
         # Gather context if requested
         if auto_context:
             from claude_dev_cli.context import ContextGatherer
             
             with console.status("[bold blue]Gathering context..."):
                 gatherer = ContextGatherer()
-                context = gatherer.gather_for_file(Path(file_path))
+                context = gatherer.gather_for_file(files[0])
                 context_info = context.format_for_prompt()
             
             console.print("[dim]✓ Context gathered[/dim]")
             
-            # Use context-aware refactoring
             client = ClaudeClient(api_config_name=api)
-            enhanced_prompt = f"{context_info}\n\nPlease suggest refactoring improvements for the main file."
-            result = client.call(enhanced_prompt)
+            prompt = f"{context_info}\n\nFiles:{files_content}\n\nPlease suggest refactoring improvements."
         else:
-            with console.status("[bold blue]Analyzing code..."):
-                result = refactor_code(file_path, api_config_name=api)
+            with console.status(f"[bold blue]Analyzing {len(files)} file(s)..."):
+                client = ClaudeClient(api_config_name=api)
+                prompt = f"Files to refactor:{files_content}\n\nPlease suggest refactoring improvements focusing on code quality, maintainability, and performance."
+        
+        result = client.call(prompt)
         
         if interactive:
             console.print("\n[bold]Initial Refactoring:[/bold]\n")
             md = Markdown(result)
             console.print(md)
             
-            client = ClaudeClient(api_config_name=api)
             conversation_context = [result]
             
             while True:
@@ -1233,6 +1708,95 @@ def git_commit(ctx: click.Context, api: Optional[str], auto_context: bool) -> No
         sys.exit(1)
 
 
+@git.command('review')
+@click.option('-a', '--api', help='API config to use')
+@click.option('--staged', is_flag=True, help='Review only staged changes')
+@click.option('--branch', help='Review changes in branch (e.g., main..HEAD)')
+@click.option('-i', '--interactive', is_flag=True, help='Interactive follow-up questions')
+@click.pass_context
+def git_review(
+    ctx: click.Context,
+    api: Optional[str],
+    staged: bool,
+    branch: Optional[str],
+    interactive: bool
+) -> None:
+    """Review git changes.
+    
+    Examples:
+      cdc git review --staged          # Review staged changes
+      cdc git review                   # Review all changes
+      cdc git review --branch main..HEAD  # Review branch changes
+    """
+    console = ctx.obj['console']
+    from claude_dev_cli.path_utils import get_git_changes
+    
+    try:
+        # Get changed files
+        if branch:
+            files = get_git_changes(commit_range=branch)
+            scope = f"branch {branch}"
+        elif staged:
+            files = get_git_changes(staged_only=True)
+            scope = "staged changes"
+        else:
+            files = get_git_changes(staged_only=False)
+            scope = "all changes"
+        
+        if not files:
+            console.print(f"[yellow]No changes found in {scope}.[/yellow]")
+            return
+        
+        console.print(f"\n[bold]Reviewing {len(files)} changed file(s) from {scope}:[/bold]")
+        for f in files[:10]:
+            console.print(f"  • {f}")
+        if len(files) > 10:
+            console.print(f"  ... and {len(files) - 10} more")
+        console.print()
+        
+        # Build files content
+        files_content = ""
+        for file_path in files:
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                files_content += f"\n\n## File: {file_path}\n\n```\n{content}\n```\n"
+            except Exception as e:
+                console.print(f"[yellow]Warning: Could not read {file_path}: {e}[/yellow]")
+        
+        # Review
+        with console.status(f"[bold blue]Reviewing {len(files)} file(s)..."):
+            client = ClaudeClient(api_config_name=api)
+            prompt = f"Changed files in {scope}:{files_content}\n\nPlease review these git changes for bugs, security issues, code quality, and potential improvements. Focus on what changed and why it might be problematic."
+            result = client.call(prompt)
+        
+        md = Markdown(result)
+        console.print(md)
+        
+        if interactive:
+            console.print("\n[dim]Ask follow-up questions about the review, or 'exit' to quit[/dim]")
+            
+            while True:
+                user_input = console.input("\n[cyan]You:[/cyan] ").strip()
+                
+                if user_input.lower() == 'exit':
+                    break
+                
+                if not user_input:
+                    continue
+                
+                follow_up_prompt = f"Code review:\n\n{result}\n\nChanged files:{files_content}\n\nUser question: {user_input}"
+                
+                console.print("\n[bold green]Claude:[/bold green] ", end='')
+                for chunk in client.call_streaming(follow_up_prompt):
+                    console.print(chunk, end='')
+                console.print()
+    
+    except Exception as e:
+        console.print(f"[red]Error: {e}[/red]")
+        sys.exit(1)
+
+
 @main.group()
 def context() -> None:
     """Context gathering tools and information."""