mcp-vector-search 0.7.5__py3-none-any.whl → 0.7.6__py3-none-any.whl

mcp_vector_search/__init__.py

@@ -1,7 +1,7 @@
 """MCP Vector Search - CLI-first semantic code search with MCP integration."""
 
-__version__ = "0.7.5"
-__build__ = "27"
+__version__ = "0.7.6"
+__build__ = "28"
 __author__ = "Robert Matsuoka"
 __email__ = "bobmatnyc@gmail.com"
 

mcp_vector_search/cli/commands/demo.py

@@ -9,7 +9,7 @@ import typer
 from loguru import logger
 from rich.console import Console
 
-from ..output import print_error, print_info, print_success, print_warning
+from ..output import print_error, print_info, print_success
 
 console = Console()
 
@@ -321,9 +321,7 @@ class UserAPI:
             console.print("  ✅ Automatic code indexing")
             if not quick:
                 console.print("  ✅ Semantic code search in action")
-                console.print(
-                    "  ✅ Finding code by meaning (not just keywords)\n"
-                )
+                console.print("  ✅ Finding code by meaning (not just keywords)\n")
 
             console.print("[bold cyan]Next steps to use in your project:[/bold cyan]")
             console.print("  1. [green]cd /your/project[/green]")

mcp_vector_search/cli/commands/index.py

@@ -13,7 +13,6 @@ from ...core.exceptions import ProjectNotFoundError
 from ...core.indexer import SemanticIndexer
 from ...core.project import ProjectManager
 from ..output import (
-    create_progress,
     print_error,
     print_index_stats,
     print_info,
@@ -201,17 +200,138 @@ async def _run_batch_indexing(
 ) -> None:
     """Run batch indexing of all files."""
     if show_progress:
-        with create_progress() as progress:
-            task = progress.add_task("Indexing files...", total=None)
+        # Import enhanced progress utilities
+        from rich.layout import Layout
+        from rich.live import Live
+        from rich.panel import Panel
+        from rich.progress import (
+            BarColumn,
+            Progress,
+            SpinnerColumn,
+            TextColumn,
+            TimeRemainingColumn,
+        )
+        from rich.table import Table
+
+        from ..output import console
+
+        # Pre-scan to get total file count
+        console.print("[dim]Scanning for indexable files...[/dim]")
+        indexable_files, files_to_index = await indexer.get_files_to_index(
+            force_reindex=force_reindex
+        )
+        total_files = len(files_to_index)
 
-            # Start indexing
-            indexed_count = await indexer.index_project(
-                force_reindex=force_reindex,
-                show_progress=False,  # We handle progress here
+        if total_files == 0:
+            console.print("[yellow]No files need indexing[/yellow]")
+            indexed_count = 0
+        else:
+            console.print(f"[dim]Found {total_files} files to index[/dim]\n")
+
+            # Track recently indexed files for display
+            recent_files = []
+            current_file_name = ""
+            indexed_count = 0
+            failed_count = 0
+
+            # Create layout for two-panel display
+            layout = Layout()
+            layout.split_column(
+                Layout(name="progress", size=4),
+                Layout(name="samples", size=7),
+            )
+
+            # Create progress bar
+            progress = Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                BarColumn(bar_width=40),
+                TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
+                TextColumn("({task.completed}/{task.total} files)"),
+                TimeRemainingColumn(),
+                console=console,
             )
 
-            progress.update(task, completed=indexed_count, total=indexed_count)
+            task = progress.add_task("Indexing files...", total=total_files)
+
+            # Create live display with both panels
+            with Live(layout, console=console, refresh_per_second=4):
+                # Index files with progress updates
+                async for (
+                    file_path,
+                    chunks_added,
+                    success,
+                ) in indexer.index_files_with_progress(files_to_index, force_reindex):
+                    # Update counts
+                    if success:
+                        indexed_count += 1
+                    else:
+                        failed_count += 1
+
+                    # Update progress
+                    progress.update(task, advance=1)
+
+                    # Update current file name for display
+                    current_file_name = file_path.name
+
+                    # Keep last 5 files for sampling display
+                    try:
+                        relative_path = str(file_path.relative_to(indexer.project_root))
+                    except ValueError:
+                        relative_path = str(file_path)
+
+                    recent_files.append((relative_path, chunks_added, success))
+                    if len(recent_files) > 5:
+                        recent_files.pop(0)
+
+                    # Update display layouts
+                    layout["progress"].update(
+                        Panel(
+                            progress,
+                            title="[bold]Indexing Progress[/bold]",
+                            border_style="blue",
+                        )
+                    )
+
+                    # Build samples panel content
+                    samples_table = Table.grid(expand=True)
+                    samples_table.add_column(style="dim")
+
+                    if current_file_name:
+                        samples_table.add_row(
+                            f"[bold cyan]Currently processing:[/bold cyan] {current_file_name}"
+                        )
+                        samples_table.add_row("")
+
+                    samples_table.add_row("[dim]Recently indexed:[/dim]")
+                    for rel_path, chunk_count, file_success in recent_files[-5:]:
+                        icon = "✓" if file_success else "✗"
+                        style = "green" if file_success else "red"
+                        chunk_info = (
+                            f"({chunk_count} chunks)"
+                            if chunk_count > 0
+                            else "(no chunks)"
+                        )
+                        samples_table.add_row(
+                            f"  [{style}]{icon}[/{style}] [cyan]{rel_path}[/cyan] [dim]{chunk_info}[/dim]"
+                        )
+
+                    layout["samples"].update(
+                        Panel(
+                            samples_table,
+                            title="[bold]File Processing[/bold]",
+                            border_style="dim",
+                        )
+                    )
+
+            # Final progress summary
+            console.print()
+            if failed_count > 0:
+                console.print(
+                    f"[yellow]⚠ {failed_count} files failed to index[/yellow]"
+                )
     else:
+        # Non-progress mode (fallback to original behavior)
         indexed_count = await indexer.index_project(
             force_reindex=force_reindex,
             show_progress=show_progress,
@@ -374,28 +494,8 @@ async def _reindex_entire_project(project_root: Path) -> None:
             print_info("Clearing existing index...")
             await database.reset()
 
-            # Then reindex everything with progress
-            with create_progress() as progress:
-                task = progress.add_task("Reindexing files...", total=None)
-
-                # Force reindex all files
-                indexed_count = await indexer.index_project(
-                    force_reindex=True,  # Force reindexing
-                    show_progress=False,  # We handle progress here
-                )
-
-                progress.update(task, completed=indexed_count, total=indexed_count)
-
-            # Show statistics
-            stats = await indexer.get_indexing_stats()
-
-            # Display success message with chunk count for clarity
-            total_chunks = stats.get("total_chunks", 0)
-            print_success(
-                f"Processed {indexed_count} files ({total_chunks} searchable chunks created)"
-            )
-
-            print_index_stats(stats)
+            # Then reindex everything with enhanced progress display
+            await _run_batch_indexing(indexer, force_reindex=True, show_progress=True)
 
     except Exception as e:
         logger.error(f"Full reindex error: {e}")

mcp_vector_search/cli/commands/mcp.py

@@ -7,7 +7,7 @@ import subprocess
 import sys
 import tomllib
 from pathlib import Path
-from typing import Dict, Any
+from typing import Any
 
 import typer
 from rich.console import Console
@@ -49,26 +49,26 @@ SUPPORTED_TOOLS = {
         "name": "Auggie",
         "config_path": "~/.augment/settings.json",
         "format": "json",
-        "description": "Augment Code AI assistant"
+        "description": "Augment Code AI assistant",
     },
     "claude-code": {
         "name": "Claude Code",
         "config_path": ".mcp.json",
         "format": "json",
-        "description": "Claude Code (project-scoped)"
+        "description": "Claude Code (project-scoped)",
     },
     "codex": {
         "name": "Codex",
         "config_path": "~/.codex/config.toml",
         "format": "toml",
-        "description": "OpenAI Codex CLI"
+        "description": "OpenAI Codex CLI",
     },
     "gemini": {
         "name": "Gemini",
         "config_path": "~/.gemini/mcp.json",
         "format": "json",
-        "description": "Google Gemini CLI"
-    }
+        "description": "Google Gemini CLI",
+    },
 }
 
 
@@ -124,15 +124,18 @@ def get_mcp_server_command(
 
 
 def get_mcp_server_config_for_tool(
-    project_root: Path, tool_name: str, server_name: str, enable_file_watching: bool = True
-) -> Dict[str, Any]:
+    project_root: Path,
+    tool_name: str,
+    server_name: str,
+    enable_file_watching: bool = True,
+) -> dict[str, Any]:
     """Generate MCP server configuration for a specific tool."""
     base_config = {
         "command": "uv",
         "args": ["run", "mcp-vector-search", "mcp"],
         "env": {
             "MCP_ENABLE_FILE_WATCHING": "true" if enable_file_watching else "false"
-        }
+        },
     }
 
     if tool_name == "auggie":
@@ -140,29 +143,20 @@ def get_mcp_server_config_for_tool(
         return base_config
     elif tool_name == "claude-code":
         # Claude Code requires type: stdio and no cwd
-        return {
-            "type": "stdio",
-            **base_config
-        }
+        return {"type": "stdio", **base_config}
     elif tool_name == "codex":
         # Codex uses TOML format with different structure
         return {
             "command": base_config["command"],
             "args": base_config["args"],
-            "env": base_config["env"]
+            "env": base_config["env"],
         }
     elif tool_name == "gemini":
         # Gemini uses standard format with cwd
-        return {
-            **base_config,
-            "cwd": str(project_root.absolute())
-        }
+        return {**base_config, "cwd": str(project_root.absolute())}
     else:
         # Default configuration
-        return {
-            **base_config,
-            "cwd": str(project_root.absolute())
-        }
+        return {**base_config, "cwd": str(project_root.absolute())}
 
 
 def create_project_claude_config(
@@ -215,7 +209,7 @@ def configure_tool_mcp(
     project_root: Path,
     server_name: str = "mcp-vector-search",
     enable_file_watching: bool = True,
-    force: bool = False
+    force: bool = False,
 ) -> bool:
     """Configure MCP integration for a specific AI tool."""
     if tool_name not in SUPPORTED_TOOLS:
@@ -236,13 +230,21 @@ def configure_tool_mcp(
 
     try:
         if tool_name == "auggie":
-            return configure_auggie_mcp(config_path, project_root, server_name, enable_file_watching, force)
+            return configure_auggie_mcp(
+                config_path, project_root, server_name, enable_file_watching, force
+            )
         elif tool_name == "claude-code":
-            return configure_claude_code_mcp(config_path, project_root, server_name, enable_file_watching, force)
+            return configure_claude_code_mcp(
+                config_path, project_root, server_name, enable_file_watching, force
+            )
         elif tool_name == "codex":
-            return configure_codex_mcp(config_path, project_root, server_name, enable_file_watching, force)
+            return configure_codex_mcp(
+                config_path, project_root, server_name, enable_file_watching, force
+            )
         elif tool_name == "gemini":
-            return configure_gemini_mcp(config_path, project_root, server_name, enable_file_watching, force)
+            return configure_gemini_mcp(
+                config_path, project_root, server_name, enable_file_watching, force
+            )
         else:
             print_error(f"Configuration for {tool_name} not implemented yet")
             return False
@@ -256,7 +258,7 @@ def configure_auggie_mcp(
     project_root: Path,
     server_name: str,
     enable_file_watching: bool,
-    force: bool
+    force: bool,
 ) -> bool:
     """Configure Auggie MCP integration."""
     # Create backup if file exists
@@ -268,7 +270,9 @@ def configure_auggie_mcp(
             with open(config_path) as f:
                 config = json.load(f)
             if config.get("mcpServers", {}).get(server_name):
-                print_warning(f"MCP server '{server_name}' already exists in Auggie config")
+                print_warning(
+                    f"MCP server '{server_name}' already exists in Auggie config"
+                )
                 print_info("Use --force to overwrite")
                 return False
         shutil.copy2(config_path, backup_path)
@@ -283,7 +287,9 @@ def configure_auggie_mcp(
         config["mcpServers"] = {}
 
     # Get server configuration
-    server_config = get_mcp_server_config_for_tool(project_root, "auggie", server_name, enable_file_watching)
+    server_config = get_mcp_server_config_for_tool(
+        project_root, "auggie", server_name, enable_file_watching
+    )
     config["mcpServers"][server_name] = server_config
 
     # Write updated config
@@ -299,7 +305,7 @@ def configure_claude_code_mcp(
     project_root: Path,
     server_name: str,
     enable_file_watching: bool,
-    force: bool
+    force: bool,
 ) -> bool:
     """Configure Claude Code MCP integration."""
     # Use existing function for Claude Code
@@ -307,7 +313,9 @@ def configure_claude_code_mcp(
         with open(config_path) as f:
             config = json.load(f)
         if config.get("mcpServers", {}).get(server_name):
-            print_warning(f"MCP server '{server_name}' already exists in Claude Code config")
+            print_warning(
+                f"MCP server '{server_name}' already exists in Claude Code config"
+            )
             print_info("Use --force to overwrite")
             return False
 
@@ -321,7 +329,7 @@ def configure_codex_mcp(
     project_root: Path,
     server_name: str,
     enable_file_watching: bool,
-    force: bool
+    force: bool,
 ) -> bool:
     """Configure Codex MCP integration."""
     # Create backup if file exists
@@ -334,7 +342,9 @@ def configure_codex_mcp(
                 with open(config_path, "rb") as f:
                     config = tomllib.load(f)
                 if config.get("mcp_servers", {}).get(server_name):
-                    print_warning(f"MCP server '{server_name}' already exists in Codex config")
+                    print_warning(
+                        f"MCP server '{server_name}' already exists in Codex config"
+                    )
                     print_info("Use --force to overwrite")
                     return False
             except Exception as e:
@@ -342,19 +352,21 @@ def configure_codex_mcp(
 
         shutil.copy2(config_path, backup_path)
         # Read as text to preserve existing content
-        with open(config_path, "r") as f:
+        with open(config_path) as f:
             config_text = f.read()
     else:
         config_path.parent.mkdir(parents=True, exist_ok=True)
         config_text = ""
 
     # Get server configuration
-    server_config = get_mcp_server_config_for_tool(project_root, "codex", server_name, enable_file_watching)
+    server_config = get_mcp_server_config_for_tool(
+        project_root, "codex", server_name, enable_file_watching
+    )
 
     # Generate TOML section for the server
     toml_section = f"\n[mcp_servers.{server_name}]\n"
     toml_section += f'command = "{server_config["command"]}"\n'
-    toml_section += f'args = {server_config["args"]}\n'
+    toml_section += f"args = {server_config['args']}\n"
 
     if server_config.get("env"):
         toml_section += f"\n[mcp_servers.{server_name}.env]\n"
@@ -364,7 +376,7 @@ def configure_codex_mcp(
     # Append or replace the section
     if f"[mcp_servers.{server_name}]" in config_text:
         # Replace existing section (simple approach)
-        lines = config_text.split('\n')
+        lines = config_text.split("\n")
         new_lines = []
         skip_section = False
 
@@ -378,7 +390,7 @@ def configure_codex_mcp(
             elif not skip_section:
                 new_lines.append(line)
 
-        config_text = '\n'.join(new_lines) + toml_section
+        config_text = "\n".join(new_lines) + toml_section
     else:
         config_text += toml_section
 
@@ -395,7 +407,7 @@ def configure_gemini_mcp(
     project_root: Path,
     server_name: str,
     enable_file_watching: bool,
-    force: bool
+    force: bool,
 ) -> bool:
     """Configure Gemini MCP integration."""
     # Create backup if file exists
@@ -407,7 +419,9 @@ def configure_gemini_mcp(
             with open(config_path) as f:
                 config = json.load(f)
             if config.get("mcpServers", {}).get(server_name):
-                print_warning(f"MCP server '{server_name}' already exists in Gemini config")
+                print_warning(
+                    f"MCP server '{server_name}' already exists in Gemini config"
+                )
                 print_info("Use --force to overwrite")
                 return False
         shutil.copy2(config_path, backup_path)
@@ -422,7 +436,9 @@ def configure_gemini_mcp(
         config["mcpServers"] = {}
 
     # Get server configuration
-    server_config = get_mcp_server_config_for_tool(project_root, "gemini", server_name, enable_file_watching)
+    server_config = get_mcp_server_config_for_tool(
+        project_root, "gemini", server_name, enable_file_watching
+    )
     config["mcpServers"][server_name] = server_config
 
     # Write updated config
@@ -481,7 +497,9 @@ def configure_auggie(
             raise typer.Exit(1)
 
         enable_file_watching = not no_watch
-        success = configure_tool_mcp("auggie", project_root, server_name, enable_file_watching, force)
+        success = configure_tool_mcp(
+            "auggie", project_root, server_name, enable_file_watching, force
+        )
 
         if success:
             print_info("Auggie will automatically detect the server when restarted")
@@ -540,10 +558,14 @@ def configure_claude_code(
             raise typer.Exit(1)
 
         enable_file_watching = not no_watch
-        success = configure_tool_mcp("claude-code", project_root, server_name, enable_file_watching, force)
+        success = configure_tool_mcp(
+            "claude-code", project_root, server_name, enable_file_watching, force
+        )
 
         if success:
-            print_info("Claude Code will automatically detect the server when you open this project")
+            print_info(
+                "Claude Code will automatically detect the server when you open this project"
+            )
         else:
             raise typer.Exit(1)
 
@@ -599,7 +621,9 @@ def configure_codex(
             raise typer.Exit(1)
 
         enable_file_watching = not no_watch
-        success = configure_tool_mcp("codex", project_root, server_name, enable_file_watching, force)
+        success = configure_tool_mcp(
+            "codex", project_root, server_name, enable_file_watching, force
+        )
 
         if success:
             print_info("Codex will automatically detect the server when restarted")
@@ -658,7 +682,9 @@ def configure_gemini(
             raise typer.Exit(1)
 
         enable_file_watching = not no_watch
-        success = configure_tool_mcp("gemini", project_root, server_name, enable_file_watching, force)
+        success = configure_tool_mcp(
+            "gemini", project_root, server_name, enable_file_watching, force
+        )
 
         if success:
             print_info("Gemini will automatically detect the server when restarted")
@@ -730,10 +756,14 @@ def install_mcp_integration(
             raise typer.Exit(1)
 
         enable_file_watching = not no_watch
-        success = configure_tool_mcp("claude-code", project_root, server_name, enable_file_watching, force)
+        success = configure_tool_mcp(
+            "claude-code", project_root, server_name, enable_file_watching, force
+        )
 
         if success:
-            print_info("Claude Code will automatically detect the server when you open this project")
+            print_info(
+                "Claude Code will automatically detect the server when you open this project"
+            )
 
         # Test the server (using project_root for the server command)
         print_info("Testing server startup...")
@@ -870,15 +900,12 @@ def list_tools() -> None:
         except Exception:
             status = "❓ Unknown"
 
-        table.add_row(
-            tool_id,
-            tool_info["name"],
-            str(config_path),
-            status
-        )
+        table.add_row(tool_id, tool_info["name"], str(config_path), status)
 
     console.print(table)
-    console.print("\n[dim]💡 Use 'mcp-vector-search mcp <tool>' to configure a specific tool[/dim]")
+    console.print(
+        "\n[dim]💡 Use 'mcp-vector-search mcp <tool>' to configure a specific tool[/dim]"
+    )
 
 
 @mcp_app.command("tools")

mcp_vector_search/cli/commands/status.py

@@ -102,15 +102,28 @@ def main(
         if project_root is None:
             project_root = Path.cwd()
 
-        asyncio.run(
-            show_status(
-                project_root=project_root,
-                verbose=verbose,
-                health_check=health_check,
-                mcp=mcp,
-                json_output=json_output,
-            )
-        )
+        async def run_status_with_timeout():
+            """Run status command with timeout protection."""
+            try:
+                await asyncio.wait_for(
+                    show_status(
+                        project_root=project_root,
+                        verbose=verbose,
+                        health_check=health_check,
+                        mcp=mcp,
+                        json_output=json_output,
+                    ),
+                    timeout=30.0,  # 30 second timeout
+                )
+            except TimeoutError:
+                logger.error("Status check timed out after 30 seconds")
+                print_error(
+                    "Status check timed out after 30 seconds. "
+                    "Try running with --verbose for more details."
+                )
+                raise typer.Exit(1)
+
+        asyncio.run(run_status_with_timeout())
 
     except Exception as e:
         logger.error(f"Status check failed: {e}")
@@ -162,6 +175,7 @@ async def show_status(
             file_extensions=config.file_extensions,
         )
 
+        # Get indexing stats (runs async file scanning in thread pool)
         async with database:
             index_stats = await indexer.get_indexing_stats()
             db_stats = await database.get_stats()

mcp_vector_search/cli/main.py

@@ -122,8 +122,6 @@ def deprecated_install():
     _deprecated_command("install", "init")()
 
 
-
-
 # Deprecated: find -> search
 @app.command("find", hidden=True)
 def deprecated_find():