mcp-vector-search 0.6.1__py3-none-any.whl → 0.7.0__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.6.1"
-__build__ = "21"
+__version__ = "0.7.0"
+__build__ = "22"
 __author__ = "Robert Matsuoka"
 __email__ = "bobmatnyc@gmail.com"
 

mcp_vector_search/cli/commands/config.py

@@ -347,5 +347,35 @@ def _show_available_keys() -> None:
     )
 
 
+# ============================================================================
+# CONFIG SUBCOMMANDS
+# ============================================================================
+
+
+@config_app.command("models")
+def list_embedding_models() -> None:
+    """📚 List available embedding models.
+
+    Shows all available embedding models that can be used for semantic search.
+    You can also use any model from Hugging Face that's compatible with sentence-transformers.
+
+    Examples:
+        mcp-vector-search config models
+    """
+    from ...config.defaults import DEFAULT_EMBEDDING_MODELS
+
+    console.print("[bold blue]Available Embedding Models:[/bold blue]\n")
+
+    for category, model in DEFAULT_EMBEDDING_MODELS.items():
+        console.print(f"[cyan]{category.title()}:[/cyan] {model}")
+
+    console.print(
+        "\n[dim]You can also use any model from Hugging Face that's compatible with sentence-transformers[/dim]"
+    )
+    console.print(
+        "[dim]Set model: [cyan]mcp-vector-search config set embedding_model MODEL_NAME[/cyan][/dim]"
+    )
+
+
 if __name__ == "__main__":
     config_app()

mcp_vector_search/cli/commands/index.py

@@ -495,5 +495,87 @@ async def _clean_index(project_root: Path) -> None:
         print_success("Index cleaned successfully")
 
 
+# ============================================================================
+# INDEX SUBCOMMANDS
+# ============================================================================
+
+
+@index_app.command("watch")
+def watch_cmd(
+    project_root: Path = typer.Argument(
+        Path.cwd(),
+        help="Project root directory to watch",
+        exists=True,
+        file_okay=False,
+        dir_okay=True,
+        readable=True,
+    ),
+) -> None:
+    """👀 Watch for file changes and auto-update index.
+
+    Monitors your project directory for file changes and automatically updates
+    the search index when files are modified, added, or deleted.
+
+    Examples:
+        mcp-vector-search index watch
+        mcp-vector-search index watch /path/to/project
+    """
+    from .watch import app as watch_app
+
+    # Import and run watch command
+    watch_app()
+
+
+@index_app.command("auto")
+def auto_cmd() -> None:
+    """🔄 Manage automatic indexing.
+
+    Configure automatic indexing strategies like git hooks and scheduled tasks.
+    This command provides subcommands for setup, status, and checking.
+
+    Examples:
+        mcp-vector-search index auto setup
+        mcp-vector-search index auto status
+        mcp-vector-search index auto check
+    """
+    from .auto_index import auto_index_app
+
+    # This will show help for the auto subcommands
+    auto_index_app()
+
+
+@index_app.command("health")
+def health_cmd(
+    project_root: Path | None = typer.Option(
+        None,
+        "--project-root",
+        "-p",
+        help="Project root directory",
+        exists=True,
+        file_okay=False,
+        dir_okay=True,
+        readable=True,
+    ),
+    repair: bool = typer.Option(
+        False,
+        "--repair",
+        help="Attempt to repair index issues",
+    ),
+) -> None:
+    """🩺 Check index health and optionally repair.
+
+    Validates the search index integrity and provides diagnostic information.
+    Can attempt to repair common issues automatically.
+
+    Examples:
+        mcp-vector-search index health
+        mcp-vector-search index health --repair
+    """
+    from .reset import health_main
+
+    # Call the health function from reset.py
+    health_main(project_root=project_root, repair=repair)
+
+
 if __name__ == "__main__":
     index_app()

mcp_vector_search/cli/commands/search.py

@@ -20,13 +20,24 @@ from ..output import (
     print_tip,
 )
 
-# Create search subcommand app with "did you mean" functionality (kept for backward compatibility)
-search_app = create_enhanced_typer(help="Search code semantically")
+# Create search subcommand app with "did you mean" functionality
+search_app = create_enhanced_typer(
+    help="🔍 Search code semantically",
+    invoke_without_command=True,
+)
+
 
+# Define search_main as the callback for the search command
+# This makes `mcp-vector-search search "query"` work as main search
+# and `mcp-vector-search search SUBCOMMAND` work for subcommands
 
+
+@search_app.callback(invoke_without_command=True)
 def search_main(
     ctx: typer.Context,
-    query: str = typer.Argument(..., help="Search query or file path (for --similar)"),
+    query: str | None = typer.Argument(
+        None, help="Search query or file path (for --similar)"
+    ),
     project_root: Path | None = typer.Option(
         None,
         "--project-root",
@@ -161,6 +172,15 @@ def search_main(
 
     [dim]💡 Tip: Use quotes for multi-word queries. Adjust --threshold for more/fewer results.[/dim]
     """
+    # If no query provided and no subcommand invoked, exit (show help)
+    if query is None:
+        if ctx.invoked_subcommand is None:
+            # No query and no subcommand - show help
+            raise typer.Exit()
+        else:
+            # A subcommand was invoked - let it handle the request
+            return
+
     try:
         project_root = project_root or ctx.obj.get("project_root") or Path.cwd()
 
@@ -640,10 +660,113 @@ async def run_context_search(
             )
 
 
-# Add commands to search_app for backward compatibility
+# ============================================================================
+# SEARCH SUBCOMMANDS
+# ============================================================================
+
+
+@search_app.command("interactive")
+def interactive_search(
+    ctx: typer.Context,
+    project_root: Path | None = typer.Option(
+        None, "--project-root", "-p", help="Project root directory"
+    ),
+) -> None:
+    """🎯 Start an interactive search session.
+
+    Provides a rich terminal interface for searching your codebase with real-time
+    filtering, query refinement, and result navigation.
+
+    Examples:
+        mcp-vector-search search interactive
+        mcp-vector-search search interactive --project-root /path/to/project
+    """
+    import asyncio
+
+    from ..interactive import start_interactive_search
+    from ..output import console
+
+    root = project_root or ctx.obj.get("project_root") or Path.cwd()
+
+    try:
+        asyncio.run(start_interactive_search(root))
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Interactive search cancelled[/yellow]")
+    except Exception as e:
+        print_error(f"Interactive search failed: {e}")
+        raise typer.Exit(1)
+
+
+@search_app.command("history")
+def show_history(
+    ctx: typer.Context,
+    limit: int = typer.Option(20, "--limit", "-l", help="Number of entries to show"),
+    project_root: Path | None = typer.Option(
+        None, "--project-root", "-p", help="Project root directory"
+    ),
+) -> None:
+    """📜 Show search history.
+
+    Displays your recent search queries with timestamps and result counts.
+    Use this to revisit previous searches or track your search patterns.
+
+    Examples:
+        mcp-vector-search search history
+        mcp-vector-search search history --limit 50
+    """
+    from ..history import show_search_history
+
+    root = project_root or ctx.obj.get("project_root") or Path.cwd()
+    show_search_history(root, limit)
+
+
+@search_app.command("favorites")
+def show_favorites_cmd(
+    ctx: typer.Context,
+    action: str | None = typer.Argument(None, help="Action: list, add, remove"),
+    query: str | None = typer.Argument(None, help="Query to add/remove"),
+    description: str | None = typer.Option(
+        None, "--desc", help="Description for favorite"
+    ),
+    project_root: Path | None = typer.Option(
+        None, "--project-root", "-p", help="Project root directory"
+    ),
+) -> None:
+    """⭐ Manage favorite queries.
+
+    List, add, or remove favorite search queries for quick access.
+
+    Examples:
+        mcp-vector-search search favorites                # List all favorites
+        mcp-vector-search search favorites list           # List all favorites
+        mcp-vector-search search favorites add "auth"     # Add favorite
+        mcp-vector-search search favorites remove "auth"  # Remove favorite
+    """
+    from ..history import SearchHistory, show_favorites
+
+    root = project_root or ctx.obj.get("project_root") or Path.cwd()
+    history_manager = SearchHistory(root)
+
+    # Default to list if no action provided
+    if not action or action == "list":
+        show_favorites(root)
+    elif action == "add":
+        if not query:
+            print_error("Query is required for 'add' action")
+            raise typer.Exit(1)
+        history_manager.add_favorite(query, description)
+    elif action == "remove":
+        if not query:
+            print_error("Query is required for 'remove' action")
+            raise typer.Exit(1)
+        history_manager.remove_favorite(query)
+    else:
+        print_error(f"Unknown action: {action}. Use: list, add, or remove")
+        raise typer.Exit(1)
+
+
+# Add main command to search_app (allows: mcp-vector-search search main "query")
 search_app.command("main")(search_main)
-search_app.command("similar")(search_similar_cmd)
-search_app.command("context")(search_context_cmd)
 
 
 if __name__ == "__main__":

mcp_vector_search/cli/main.py

@@ -8,31 +8,8 @@ from rich.console import Console
 from rich.traceback import install
 
 from .. import __build__, __version__
-from .commands.auto_index import auto_index_app
-from .commands.config import config_app
-from .commands.index import index_app
-from .commands.init import (
-    check_initialization as init_check,
-)
-from .commands.init import (
-    init_mcp_integration,
-    list_embedding_models,
-)
-from .commands.init import (
-    main as init_main,
-)
-from .commands.mcp import mcp_app
-from .commands.reset import health_main, reset_app
-from .commands.search import (
-    search_app,
-    search_context_cmd,
-    search_main,
-    search_similar_cmd,
-)
-from .commands.status import status_app
-from .commands.watch import app as watch_app
 from .didyoumean import add_common_suggestions, create_enhanced_typer
-from .output import print_error, setup_logging
+from .output import print_warning, setup_logging
 from .suggestions import get_contextual_suggestions
 
 # Install rich traceback handler
@@ -55,229 +32,290 @@ unfamiliar codebases, finding similar patterns, and integrating with AI tools.
   2. Search code: [green]mcp-vector-search search "your query"[/green]
   3. Check status: [green]mcp-vector-search status[/green]
 
-[bold cyan]Key Features:[/bold cyan]
-  🤖 MCP Integration: Works with Claude Code, Cursor, and AI tools
-  ⚡ Fast Indexing: Incremental updates with file watching
-  🎯 Semantic Search: Find code by meaning, not just keywords
-  📊 Rich Output: Beautiful terminal formatting with syntax highlighting
-
-[bold cyan]Configuration Files:[/bold cyan]
-  • Project: .mcp-vector-search/config.json
-  • Claude Code: .claude/settings.local.json
-  • Global cache: ~/.cache/mcp-vector-search/
-
-[dim]For detailed help on any command: [cyan]mcp-vector-search COMMAND --help[/cyan][/dim]
-[dim]Documentation: [cyan]https://github.com/yourusername/mcp-vector-search[/cyan][/dim]
+[bold cyan]Main Commands:[/bold cyan]
+  init      🔧 Initialize project
+  doctor    🩺 Check system health
+  status    📊 Show project status
+  search    🔍 Search code semantically
+  index     📇 Index codebase
+  mcp       🤖 MCP integration
+  config    ⚙️  Configure settings
+  help      ❓ Get help
+  version   ℹ️  Show version
+
+[dim]For detailed help: [cyan]mcp-vector-search COMMAND --help[/cyan][/dim]
     """,
     add_completion=False,
     rich_markup_mode="rich",
 )
 
-# Import command functions for direct registration and aliases
-from .commands.index import main as index_main  # noqa: E402
-from .commands.install import demo as install_demo  # noqa: E402
-from .commands.install import main as install_main  # noqa: E402
+# Import command modules
+from .commands.config import config_app  # noqa: E402
+from .commands.index import index_app  # noqa: E402
+from .commands.init import init_app  # noqa: E402
+from .commands.init import main as init_main  # noqa: E402
+from .commands.mcp import mcp_app  # noqa: E402
+from .commands.search import search_app, search_main  # noqa: E402, F401
 from .commands.status import main as status_main  # noqa: E402
 
-# Note: config doesn't have a main function, it uses subcommands via config_app
-app.command("install", help="🚀 Install mcp-vector-search in projects")(install_main)
-app.command("demo", help="🎬 Run installation demo with sample project")(install_demo)
-app.command("status", help="📊 Show project status and statistics")(status_main)
-# Register init as a direct command
+# ============================================================================
+# MAIN COMMANDS - Clean hierarchy
+# ============================================================================
+
+# 1. INIT - Initialize project
 app.command("init", help="🔧 Initialize project for semantic search")(init_main)
-# Add init subcommands as separate commands
-app.command("init-check", help="Check if project is initialized")(init_check)
-app.command("init-mcp", help="Install/fix Claude Code MCP integration")(
-    init_mcp_integration
-)
-app.command("init-models", help="List available embedding models")(
-    list_embedding_models
-)
-app.add_typer(index_app, name="index", help="Index codebase for semantic search")
-app.add_typer(config_app, name="config", help="Manage project configuration")
-app.add_typer(watch_app, name="watch", help="Watch for file changes and update index")
-app.add_typer(auto_index_app, name="auto-index", help="Manage automatic indexing")
-app.add_typer(mcp_app, name="mcp", help="Manage Claude Code MCP integration")
-app.add_typer(reset_app, name="reset", help="Reset and recovery operations")
-
-# Add search command - simplified syntax as default
-app.command("search", help="Search code semantically")(search_main)
-
-# Keep old nested structure for backward compatibility
-app.add_typer(
-    search_app, name="search-legacy", help="Legacy search commands", hidden=True
-)
-app.add_typer(
-    status_app, name="status-legacy", help="Legacy status commands", hidden=True
-)
+app.add_typer(init_app, name="init", hidden=True)  # Subcommands under init
 
-# Add command aliases for better user experience
-app.command("find", help="Search code semantically (alias for search)")(search_main)
-app.command("f", help="Search code semantically (short alias)", hidden=True)(
-    search_main
-)  # Hidden short alias
-app.command("s", help="Search code semantically (short alias)", hidden=True)(
-    search_main
-)  # Hidden short alias
-app.command("query", help="Search code semantically (alias for search)", hidden=True)(
-    search_main
-)  # Hidden alias
-
-# Index aliases
-app.command("i", help="Index codebase (short alias)", hidden=True)(
-    index_main
-)  # Hidden short alias
-app.command("build", help="Index codebase (alias for index)", hidden=True)(
-    index_main
-)  # Hidden alias
-app.command("scan", help="Index codebase (alias for index)", hidden=True)(
-    index_main
-)  # Hidden alias
-
-# Status aliases
-app.command("st", help="Show status (short alias)", hidden=True)(
-    status_main
-)  # Hidden short alias
-app.command("info", help="Show project information (alias for status)", hidden=True)(
-    status_main
-)  # Hidden alias
-
-# Config aliases - Since config uses subcommands, these will be handled by the enhanced typer error resolution
-# app.command("c", help="Manage configuration (short alias)", hidden=True)  # Will be handled by typo resolution
-# app.command("cfg", help="Manage configuration (alias for config)", hidden=True)  # Will be handled by typo resolution
-
-# Specialized search commands
-app.command("search-similar", help="Find code similar to a specific file or function")(
-    search_similar_cmd
-)
-app.command("search-context", help="Search for code based on contextual description")(
-    search_context_cmd
-)
-app.command("health", help="Check index health and optionally repair")(health_main)
+# 2. DOCTOR - System health check
+# (defined below inline)
 
+# 3. STATUS - Project status
+app.command("status", help="📊 Show project status and statistics")(status_main)
 
-# Add interactive search command
-@app.command("interactive")
-def interactive_search(
-    ctx: typer.Context,
-    project_root: Path | None = typer.Option(
-        None, "--project-root", "-p", help="Project root directory"
-    ),
-) -> None:
-    """Start an interactive search session with filtering and refinement.
+# 4. SEARCH - Search code
+# Register search as both a command and a typer group
+app.add_typer(search_app, name="search", help="🔍 Search code semantically")
 
-    The interactive mode provides a rich terminal interface for searching your codebase
-    with real-time filtering, query refinement, and result navigation.
+# 5. INDEX - Index codebase
+app.add_typer(index_app, name="index", help="📇 Index codebase for semantic search")
 
-    Examples:
-        mcp-vector-search interactive
-        mcp-vector-search interactive --project-root /path/to/project
-    """
-    import asyncio
+# 6. MCP - MCP integration
+app.add_typer(mcp_app, name="mcp", help="🤖 Manage Claude Code MCP integration")
 
-    from .interactive import start_interactive_search
+# 7. CONFIG - Configuration
+app.add_typer(config_app, name="config", help="⚙️  Manage project configuration")
 
-    root = project_root or ctx.obj.get("project_root") or Path.cwd()
+# 8. HELP - Enhanced help
+# (defined below inline)
 
-    try:
-        asyncio.run(start_interactive_search(root))
-    except KeyboardInterrupt:
-        console.print("\n[yellow]Interactive search cancelled[/yellow]")
-    except Exception as e:
-        print_error(f"Interactive search failed: {e}")
+# 9. VERSION - Version info
+# (defined below inline)
+
+
+# ============================================================================
+# DEPRECATED COMMANDS - With helpful suggestions
+# ============================================================================
+
+
+def _deprecated_command(old_cmd: str, new_cmd: str):
+    """Helper to create deprecated command with suggestion."""
+
+    def wrapper(*args, **kwargs):
+        print_warning(
+            f"⚠️  The command '{old_cmd}' is deprecated.\n"
+            f"   Please use '{new_cmd}' instead.\n"
+            f"   Run: [cyan]mcp-vector-search {new_cmd} --help[/cyan] for details."
+        )
         raise typer.Exit(1)
 
+    return wrapper
 
-# Add history management commands
-@app.command("history")
-def show_history(
-    ctx: typer.Context,
-    limit: int = typer.Option(20, "--limit", "-l", help="Number of entries to show"),
-    project_root: Path | None = typer.Option(
-        None, "--project-root", "-p", help="Project root directory"
-    ),
-) -> None:
-    """Show search history.
 
-    Displays your recent search queries with timestamps and result counts.
-    Use this to revisit previous searches or track your search patterns.
+# Deprecated: install -> init
+@app.command("install", hidden=True)
+def deprecated_install():
+    """[DEPRECATED] Use 'init' instead."""
+    _deprecated_command("install", "init")()
 
-    Examples:
-        mcp-vector-search history
-        mcp-vector-search history --limit 50
-    """
-    from .history import show_search_history
 
-    root = project_root or ctx.obj.get("project_root") or Path.cwd()
-    show_search_history(root, limit)
+# Deprecated: demo -> removed
+@app.command("demo", hidden=True)
+def deprecated_demo():
+    """[DEPRECATED] Command removed."""
+    print_warning(
+        "⚠️  The 'demo' command has been removed.\n"
+        "   Use [cyan]mcp-vector-search init --help[/cyan] for setup instructions."
+    )
+    raise typer.Exit(1)
 
 
-@app.command("favorites")
-def show_favorites_cmd(
-    ctx: typer.Context,
-    project_root: Path | None = typer.Option(
-        None, "--project-root", "-p", help="Project root directory"
-    ),
-) -> None:
-    """Show favorite queries.
+# Deprecated: find -> search
+@app.command("find", hidden=True)
+def deprecated_find():
+    """[DEPRECATED] Use 'search' instead."""
+    _deprecated_command("find", "search")()
 
-    Displays your saved favorite search queries. Favorites allow you to quickly
-    access frequently used searches without typing them again.
 
-    Examples:
-        mcp-vector-search favorites
-    """
-    from .history import show_favorites
+# Deprecated: search-similar -> search --similar
+@app.command("search-similar", hidden=True)
+def deprecated_search_similar():
+    """[DEPRECATED] Use 'search --similar' instead."""
+    _deprecated_command("search-similar", "search --similar")()
 
-    root = project_root or ctx.obj.get("project_root") or Path.cwd()
-    show_favorites(root)
 
+# Deprecated: search-context -> search --context
+@app.command("search-context", hidden=True)
+def deprecated_search_context():
+    """[DEPRECATED] Use 'search --context' instead."""
+    _deprecated_command("search-context", "search --context")()
 
-@app.command("add-favorite")
-def add_favorite(
-    ctx: typer.Context,
-    query: str = typer.Argument(..., help="Query to add to favorites"),
-    description: str | None = typer.Option(None, "--desc", help="Optional description"),
-    project_root: Path | None = typer.Option(
-        None, "--project-root", "-p", help="Project root directory"
-    ),
-) -> None:
-    """Add a query to favorites.
 
-    Save a search query to your favorites list for quick access later.
-    Optionally include a description to help remember what the query is for.
+# Deprecated: interactive -> search interactive
+@app.command("interactive", hidden=True)
+def deprecated_interactive():
+    """[DEPRECATED] Use 'search interactive' instead."""
+    _deprecated_command("interactive", "search interactive")()
+
+
+# Deprecated: history -> search history
+@app.command("history", hidden=True)
+def deprecated_history():
+    """[DEPRECATED] Use 'search history' instead."""
+    _deprecated_command("history", "search history")()
+
+
+# Deprecated: favorites -> search favorites
+@app.command("favorites", hidden=True)
+def deprecated_favorites():
+    """[DEPRECATED] Use 'search favorites' instead."""
+    _deprecated_command("favorites", "search favorites")()
+
+
+# Deprecated: add-favorite -> search favorites add
+@app.command("add-favorite", hidden=True)
+def deprecated_add_favorite():
+    """[DEPRECATED] Use 'search favorites add' instead."""
+    _deprecated_command("add-favorite", "search favorites add")()
+
+
+# Deprecated: remove-favorite -> search favorites remove
+@app.command("remove-favorite", hidden=True)
+def deprecated_remove_favorite():
+    """[DEPRECATED] Use 'search favorites remove' instead."""
+    _deprecated_command("remove-favorite", "search favorites remove")()
+
+
+# Deprecated: health -> index health
+@app.command("health", hidden=True)
+def deprecated_health():
+    """[DEPRECATED] Use 'index health' instead."""
+    _deprecated_command("health", "index health")()
+
+
+# Deprecated: watch -> index watch
+@app.command("watch", hidden=True)
+def deprecated_watch():
+    """[DEPRECATED] Use 'index watch' instead."""
+    _deprecated_command("watch", "index watch")()
+
+
+# Deprecated: auto-index -> index auto
+@app.command("auto-index", hidden=True)
+def deprecated_auto_index():
+    """[DEPRECATED] Use 'index auto' instead."""
+    _deprecated_command("auto-index", "index auto")()
+
+
+# Deprecated: reset -> mcp reset or config reset
+@app.command("reset", hidden=True)
+def deprecated_reset():
+    """[DEPRECATED] Use 'mcp reset' or 'config reset' instead."""
+    print_warning(
+        "⚠️  The 'reset' command is deprecated.\n"
+        "   Use [cyan]mcp-vector-search mcp reset[/cyan] for MCP reset\n"
+        "   Use [cyan]mcp-vector-search config reset[/cyan] for config reset"
+    )
+    raise typer.Exit(1)
+
+
+# Deprecated: init-check -> init check
+@app.command("init-check", hidden=True)
+def deprecated_init_check():
+    """[DEPRECATED] Use 'init check' instead."""
+    _deprecated_command("init-check", "init check")()
+
+
+# Deprecated: init-mcp -> mcp install
+@app.command("init-mcp", hidden=True)
+def deprecated_init_mcp():
+    """[DEPRECATED] Use 'mcp install' instead."""
+    _deprecated_command("init-mcp", "mcp install")()
+
+
+# Deprecated: init-models -> config models
+@app.command("init-models", hidden=True)
+def deprecated_init_models():
+    """[DEPRECATED] Use 'config models' instead."""
+    _deprecated_command("init-models", "config models")()
+
+
+# ============================================================================
+# MAIN INLINE COMMANDS
+# ============================================================================
+
+
+@app.command("doctor")
+def doctor_command() -> None:
+    """🩺 Check system dependencies and configuration.
+
+    Runs diagnostic checks to ensure all required dependencies are installed
+    and properly configured. Use this to troubleshoot installation issues.
 
     Examples:
-        mcp-vector-search add-favorite "authentication functions"
-        mcp-vector-search add-favorite "error handling" --desc "Error handling patterns"
+        mcp-vector-search doctor
     """
-    from .history import SearchHistory
+    from .commands.status import check_dependencies
 
-    root = project_root or ctx.obj.get("project_root") or Path.cwd()
-    history_manager = SearchHistory(root)
-    history_manager.add_favorite(query, description)
+    console.print("[bold blue]🩺 MCP Vector Search - System Check[/bold blue]\n")
 
+    # Check dependencies
+    deps_ok = check_dependencies()
 
-@app.command("remove-favorite")
-def remove_favorite(
-    ctx: typer.Context,
-    query: str = typer.Argument(..., help="Query to remove from favorites"),
-    project_root: Path | None = typer.Option(
-        None, "--project-root", "-p", help="Project root directory"
+    if deps_ok:
+        console.print("\n[green]✓ All dependencies are available[/green]")
+    else:
+        console.print("\n[red]✗ Some dependencies are missing[/red]")
+        console.print(
+            "Run [code]pip install mcp-vector-search[/code] to install missing dependencies"
+        )
+
+
+@app.command("help")
+def help_command(
+    command: str | None = typer.Argument(
+        None, help="Command to get help for (optional)"
     ),
 ) -> None:
-    """Remove a query from favorites.
+    """❓ Show contextual help and suggestions.
 
-    Remove a previously saved favorite query from your favorites list.
+    Get detailed help about specific commands or general usage guidance
+    based on your project state.
 
     Examples:
-        mcp-vector-search remove-favorite "authentication functions"
+        mcp-vector-search help           # General help
+        mcp-vector-search help search    # Help for search command
+        mcp-vector-search help init      # Help for init command
     """
-    from .history import SearchHistory
+    try:
+        project_root = Path.cwd()
+        console.print(
+            f"[bold blue]mcp-vector-search[/bold blue] version [green]{__version__}[/green]"
+        )
+        console.print("[dim]CLI-first semantic code search with MCP integration[/dim]")
 
-    root = project_root or ctx.obj.get("project_root") or Path.cwd()
-    history_manager = SearchHistory(root)
-    history_manager.remove_favorite(query)
+        if command:
+            # Show help for specific command
+            console.print(
+                f"\n[dim]Run: [bold]mcp-vector-search {command} --help[/bold] for detailed help[/dim]"
+            )
+        else:
+            # Show general contextual suggestions
+            get_contextual_suggestions(project_root)
+    except Exception as e:
+        logger.debug(f"Failed to show contextual help: {e}")
+        console.print(
+            "\n[dim]Use [bold]mcp-vector-search --help[/bold] for more information.[/dim]"
+        )
+
+
+@app.command("version")
+def version_command() -> None:
+    """ℹ️  Show version information."""
+    console.print(
+        f"[bold blue]mcp-vector-search[/bold blue] version [green]{__version__}[/green] [dim](build {__build__})[/dim]"
+    )
+    console.print("\n[dim]CLI-first semantic code search with MCP integration[/dim]")
+    console.print("[dim]Built with ChromaDB, Tree-sitter, and modern Python[/dim]")
 
 
 @app.callback()
@@ -338,93 +376,10 @@ def main(
         if project_root:
             logger.info(f"Using project root: {project_root}")
 
-    # Note: Contextual help moved to a separate command to avoid interfering with didyoumean
-
-
-@app.command()
-def version() -> None:
-    """Show version information."""
-    console.print(
-        f"[bold blue]mcp-vector-search[/bold blue] version [green]{__version__}[/green] [dim](build {__build__})[/dim]"
-    )
-    console.print("\n[dim]CLI-first semantic code search with MCP integration[/dim]")
-    console.print("[dim]Built with ChromaDB, Tree-sitter, and modern Python[/dim]")
-
-
-def handle_command_error(ctx, param, value):
-    """Handle command errors with enhanced suggestions."""
-    if ctx.resilient_parsing:
-        return
-
-    # This will be called when a command is not found
-    import click
-
-    try:
-        return value
-    except click.UsageError as e:
-        if "No such command" in str(e):
-            # Extract the command name from the error
-            import re
-
-            match = re.search(r"No such command '([^']+)'", str(e))
-            if match:
-                command_name = match.group(1)
-
-                # Use both the original suggestions and contextual suggestions
-                add_common_suggestions(ctx, command_name)
-
-                # Add contextual suggestions based on project state
-                try:
-                    project_root = ctx.obj.get("project_root") if ctx.obj else None
-                    get_contextual_suggestions(project_root, command_name)
-                except Exception as e:
-                    # If contextual suggestions fail, don't break the error flow
-                    logger.debug(f"Failed to get contextual suggestions: {e}")
-                    pass
-        raise
-
-
-@app.command()
-def help_contextual() -> None:
-    """Show contextual help and suggestions based on project state."""
-    try:
-        project_root = Path.cwd()
-        console.print(
-            f"[bold blue]mcp-vector-search[/bold blue] version [green]{__version__}[/green]"
-        )
-        console.print("[dim]CLI-first semantic code search with MCP integration[/dim]")
-        get_contextual_suggestions(project_root)
-    except Exception as e:
-        logger.debug(f"Failed to show contextual help: {e}")
-        console.print(
-            "\n[dim]Use [bold]mcp-vector-search --help[/bold] for more information.[/dim]"
-        )
-
-
-@app.command()
-def doctor() -> None:
-    """Check system dependencies and configuration.
-
-    Runs diagnostic checks to ensure all required dependencies are installed
-    and properly configured. Use this command to troubleshoot installation issues.
-
-    Examples:
-        mcp-vector-search doctor
-    """
-    from .commands.status import check_dependencies
-
-    console.print("[bold blue]MCP Vector Search - System Check[/bold blue]\n")
 
-    # Check dependencies
-    deps_ok = check_dependencies()
-
-    if deps_ok:
-        console.print("\n[green]✓ All dependencies are available[/green]")
-    else:
-        console.print("\n[red]✗ Some dependencies are missing[/red]")
-        console.print(
-            "Run [code]pip install mcp-vector-search[/code] to install missing dependencies"
-        )
+# ============================================================================
+# CLI ENTRY POINT WITH ERROR HANDLING
+# ============================================================================
 
 
 def cli_with_suggestions():

{mcp_vector_search-0.6.1.dist-info → mcp_vector_search-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-vector-search
-Version: 0.6.1
+Version: 0.7.0
 Summary: CLI-first semantic code search with MCP integration
 Project-URL: Homepage, https://github.com/bobmatnyc/mcp-vector-search
 Project-URL: Documentation, https://mcp-vector-search.readthedocs.io

{mcp_vector_search-0.6.1.dist-info → mcp_vector_search-0.7.0.dist-info}/RECORD

@@ -1,22 +1,22 @@
-mcp_vector_search/__init__.py,sha256=7RjW6QzohQ-IjqQ-eJnvKjAlZ7tIsfxbJILz4NVfxFA,299
+mcp_vector_search/__init__.py,sha256=ho6kD5LiKg5_bjlfaFha23peWF_iCKd3FsCslGTEpsQ,299
 mcp_vector_search/py.typed,sha256=lCKeV9Qcn9sGtbRsgg-LJO2ZwWRuknnnlmomq3bJFH0,43
 mcp_vector_search/cli/__init__.py,sha256=TNB7CaOASz8u3yHWLbNmo8-GtHF0qwUjVKWAuNphKgo,40
 mcp_vector_search/cli/didyoumean.py,sha256=F_ss-EX4F9RgnMsEhdTwLpyNCah9SqnBZc2tBtzASck,15918
 mcp_vector_search/cli/export.py,sha256=iluxuRT2KELdKlQeDAlVkteiel4GGrng153UAw9H0as,10804
 mcp_vector_search/cli/history.py,sha256=6wRrSfxpUe9hJXuaEeVxOVkFlcpqkIiGfwzDgd5N6c8,9323
 mcp_vector_search/cli/interactive.py,sha256=T7P4dAdvbglznzQYgiePv5YNyOx9FeE57Y3OKYnnbYE,12744
-mcp_vector_search/cli/main.py,sha256=VsW2U-E-_9jB6UfA4vTE0K-d657WZyLyIM2hvXgre9c,17057
+mcp_vector_search/cli/main.py,sha256=iUixejFrC7HO6m-0tzPWu_LXTScvg1Zg_nUZkEpDroQ,14660
 mcp_vector_search/cli/output.py,sha256=7ShIk_UKzhDzRGxI6JluPu0gGkbmKOevqgIAKR4oCa0,12560
 mcp_vector_search/cli/suggestions.py,sha256=h-UaxoLcHmFbhZSm0WG7nKJXAIRIqhv7aGsXijp7vA8,13273
 mcp_vector_search/cli/commands/__init__.py,sha256=vQls-YKZ54YEwmf7g1dL0T2SS9D4pdQljXzsUChG_V4,42
 mcp_vector_search/cli/commands/auto_index.py,sha256=imVVbxWRlA128NPdK9BetNNl3ELrsdq-hqcsLqyAmoM,12712
-mcp_vector_search/cli/commands/config.py,sha256=EHLqToCXrZs3gjIAg7pV8Bq8yVslUXWC4AnTcZQgSPQ,11337
-mcp_vector_search/cli/commands/index.py,sha256=haEj8MfCzHvv4wGaPryd01aJKFt_AGGT-zwyvSnp9fQ,15639
+mcp_vector_search/cli/commands/config.py,sha256=mKE8gUgAOqCM__4yzEEu9HJPbx9X15lN264zkDJBRxg,12399
+mcp_vector_search/cli/commands/index.py,sha256=AWQk_nc5vOW0nxy2yjRre_2uktA4J32D-302IS3dT3M,17862
 mcp_vector_search/cli/commands/init.py,sha256=1kK2YmWnMCnAmWjI3Om3d_NE89APisL-vvUFfKcyp2I,26408
 mcp_vector_search/cli/commands/install.py,sha256=phk7Eb7UOU5IsRfJyaDPdOfdUWli9gyA4cHjhgXcNEI,24609
 mcp_vector_search/cli/commands/mcp.py,sha256=FKZNxYrDc7HfPTFBUEypCv-8atsrHEdbtU6Yfg9QUMA,18569
 mcp_vector_search/cli/commands/reset.py,sha256=bsIT6zjDf6gsvIkVaRaUClYzlTyNe--8t0NWkBY0ldU,13724
-mcp_vector_search/cli/commands/search.py,sha256=JFEkXQjevx2XZJhHTH8xy7G7XVcH5nGazJfacKSyEA4,20650
+mcp_vector_search/cli/commands/search.py,sha256=yyou7wO9qZ_w2oiKdyOrk2WUxvkFpc-Up8hpflxYlyw,24802
 mcp_vector_search/cli/commands/status.py,sha256=7ro6M3aifV0cuCqqxJ278P9g-fbhzvjoOABUoitMrPo,18929
 mcp_vector_search/cli/commands/watch.py,sha256=2pyWRoo4fIppFnyQ4sW4IBLHmpb_IwnTjRnzHkVBPcQ,8927
 mcp_vector_search/config/__init__.py,sha256=r_qAQkU5gc0EQ2pv8EQARACe4klhrR_WRJqCb9lfGc0,54
@@ -55,8 +55,8 @@ mcp_vector_search/utils/__init__.py,sha256=Eq6lY-oPMfCt-GpPUbg9QbmTHuQVmTaVDBMU2
 mcp_vector_search/utils/gitignore.py,sha256=bzie3V5gOGIN7j3FNVLLCx8O_hfZJDUqqAy5T3lT3Ek,7685
 mcp_vector_search/utils/timing.py,sha256=THC7mfbTYnUpnnDcblgQacYMzbEkfFoIShx6plmhCgg,11285
 mcp_vector_search/utils/version.py,sha256=d7fS-CLemxb8UzZ9j18zH0Y0Ud097ljKKYYOPulnGPE,1138
-mcp_vector_search-0.6.1.dist-info/METADATA,sha256=C_UHz8WxHNfvbm2YMNmvhvC8PFFaF4nBCueGUq1pKQA,19120
-mcp_vector_search-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_vector_search-0.6.1.dist-info/entry_points.txt,sha256=y3Ygtc_JiBchNEIL-tPABo7EbzBExGAxwGdkkeP5D2I,86
-mcp_vector_search-0.6.1.dist-info/licenses/LICENSE,sha256=FqZUgGJH_tZKZLQsMCpXaLawRyLmyFKRVfMwYyEcyTs,1072
-mcp_vector_search-0.6.1.dist-info/RECORD,,
+mcp_vector_search-0.7.0.dist-info/METADATA,sha256=OPh6-HFukz8BtVkxPBP7yHps009YlISZthb8oHv2YS0,19120
+mcp_vector_search-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_vector_search-0.7.0.dist-info/entry_points.txt,sha256=y3Ygtc_JiBchNEIL-tPABo7EbzBExGAxwGdkkeP5D2I,86
+mcp_vector_search-0.7.0.dist-info/licenses/LICENSE,sha256=FqZUgGJH_tZKZLQsMCpXaLawRyLmyFKRVfMwYyEcyTs,1072
+mcp_vector_search-0.7.0.dist-info/RECORD,,