codegraphcontext 0.1.13__tar.gz → 0.1.14__tar.gz

{codegraphcontext-0.1.13/src/codegraphcontext.egg-info → codegraphcontext-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext
-Version: 0.1.13
+Version: 0.1.14
 Summary: An MCP server that indexes local code into a graph database to provide context to AI assistants.
 Author-email: Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 License: MIT License
@@ -46,6 +46,8 @@ Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: tree-sitter==0.20.4
 Requires-Dist: tree-sitter-languages==1.10.2
+Requires-Dist: pyyaml
+Requires-Dist: pytest
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: black>=23.11.0; extra == "dev"
@@ -53,14 +55,26 @@ Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
 Dynamic: license-file
 
 # CodeGraphContext
+
+<!-- ====== Project stats ====== -->
+<!-- ====== Project stats ====== -->
+
+[![Stars](https://img.shields.io/github/stars/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/stargazers)
+[![Forks](https://img.shields.io/github/forks/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/network/members)
+[![Open Issues](https://img.shields.io/github/issues-raw/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/issues)
+[![Open PRs](https://img.shields.io/github/issues-pr/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/pulls)
+[![Closed PRs](https://img.shields.io/github/issues-pr-closed/Shashankss1205/CodeGraphContext?logo=github&color=lightgrey)](https://github.com/Shashankss1205/CodeGraphContext/pulls?q=is%3Apr+is%3Aclosed)
+[![Contributors](https://img.shields.io/github/contributors/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/graphs/contributors)
+[![Languages](https://img.shields.io/github/languages/count/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext)
 [![Build Status](https://github.com/Shashankss1205/CodeGraphContext/actions/workflows/test.yml/badge.svg)](https://github.com/Shashankss1205/CodeGraphContext/actions/workflows/test.yml)
-[![PyPI version](https://img.shields.io/pypi/v/codegraphcontext)](https://pypi.org/project/codegraphcontext/)
-[![PyPI downloads](https://img.shields.io/pypi/dm/codegraphcontext)](https://pypi.org/project/codegraphcontext/)
-[![GitHub stars](https://img.shields.io/github/stars/Shashankss1205/CodeGraphContext?style=social)](https://github.com/Shashankss1205/CodeGraphContext/stargazers)
-[![License](https://img.shields.io/github/license/Shashankss1205/CodeGraphContext)](LICENSE)
-[![Website](https://img.shields.io/badge/website-up-brightgreen)](http://codegraphcontext.vercel.app/)
-[![Watch on YouTube](https://img.shields.io/badge/YouTube-Watch%20Demo-red?logo=youtube)](https://youtu.be/KYYSdxhg1xU)
-[![Join Discord](https://img.shields.io/badge/Discord-Join%20Chat-7289da?logo=discord&logoColor=white)](https://discord.gg/dR4QY32uYQ)
+[![PyPI version](https://img.shields.io/pypi/v/codegraphcontext?)](https://pypi.org/project/codegraphcontext/)
+[![PyPI downloads](https://img.shields.io/pypi/dm/codegraphcontext?)](https://pypi.org/project/codegraphcontext/)
+[![License](https://img.shields.io/github/license/Shashankss1205/CodeGraphContext?)](LICENSE)
+[![Website](https://img.shields.io/badge/website-up-brightgreen?)](http://codegraphcontext.vercel.app/)
+[![YouTube](https://img.shields.io/badge/YouTube-Watch%20Demo-red?logo=youtube)](https://youtu.be/KYYSdxhg1xU)
+[![Discord](https://img.shields.io/badge/Discord-Join%20Chat-7289da?logo=discord&logoColor=white)](https://discord.gg/dR4QY32uYQ)
+
+
 
 An MCP server that indexes local code into a graph database to provide context to AI assistants.
 
@@ -71,7 +85,7 @@ An MCP server that indexes local code into a graph database to provide context t
 ![Using the MCP server](images/Usecase.gif)
 
 ## Project Details
-- **Version:** 0.1.13
+- **Version:** 0.1.14
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)

{codegraphcontext-0.1.13 → codegraphcontext-0.1.14}/README.md

@@ -1,12 +1,24 @@
 # CodeGraphContext
+
+<!-- ====== Project stats ====== -->
+<!-- ====== Project stats ====== -->
+
+[![Stars](https://img.shields.io/github/stars/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/stargazers)
+[![Forks](https://img.shields.io/github/forks/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/network/members)
+[![Open Issues](https://img.shields.io/github/issues-raw/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/issues)
+[![Open PRs](https://img.shields.io/github/issues-pr/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/pulls)
+[![Closed PRs](https://img.shields.io/github/issues-pr-closed/Shashankss1205/CodeGraphContext?logo=github&color=lightgrey)](https://github.com/Shashankss1205/CodeGraphContext/pulls?q=is%3Apr+is%3Aclosed)
+[![Contributors](https://img.shields.io/github/contributors/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext/graphs/contributors)
+[![Languages](https://img.shields.io/github/languages/count/Shashankss1205/CodeGraphContext?logo=github)](https://github.com/Shashankss1205/CodeGraphContext)
 [![Build Status](https://github.com/Shashankss1205/CodeGraphContext/actions/workflows/test.yml/badge.svg)](https://github.com/Shashankss1205/CodeGraphContext/actions/workflows/test.yml)
-[![PyPI version](https://img.shields.io/pypi/v/codegraphcontext)](https://pypi.org/project/codegraphcontext/)
-[![PyPI downloads](https://img.shields.io/pypi/dm/codegraphcontext)](https://pypi.org/project/codegraphcontext/)
-[![GitHub stars](https://img.shields.io/github/stars/Shashankss1205/CodeGraphContext?style=social)](https://github.com/Shashankss1205/CodeGraphContext/stargazers)
-[![License](https://img.shields.io/github/license/Shashankss1205/CodeGraphContext)](LICENSE)
-[![Website](https://img.shields.io/badge/website-up-brightgreen)](http://codegraphcontext.vercel.app/)
-[![Watch on YouTube](https://img.shields.io/badge/YouTube-Watch%20Demo-red?logo=youtube)](https://youtu.be/KYYSdxhg1xU)
-[![Join Discord](https://img.shields.io/badge/Discord-Join%20Chat-7289da?logo=discord&logoColor=white)](https://discord.gg/dR4QY32uYQ)
+[![PyPI version](https://img.shields.io/pypi/v/codegraphcontext?)](https://pypi.org/project/codegraphcontext/)
+[![PyPI downloads](https://img.shields.io/pypi/dm/codegraphcontext?)](https://pypi.org/project/codegraphcontext/)
+[![License](https://img.shields.io/github/license/Shashankss1205/CodeGraphContext?)](LICENSE)
+[![Website](https://img.shields.io/badge/website-up-brightgreen?)](http://codegraphcontext.vercel.app/)
+[![YouTube](https://img.shields.io/badge/YouTube-Watch%20Demo-red?logo=youtube)](https://youtu.be/KYYSdxhg1xU)
+[![Discord](https://img.shields.io/badge/Discord-Join%20Chat-7289da?logo=discord&logoColor=white)](https://discord.gg/dR4QY32uYQ)
+
+
 
 An MCP server that indexes local code into a graph database to provide context to AI assistants.
 
@@ -17,7 +29,7 @@ An MCP server that indexes local code into a graph database to provide context t
 ![Using the MCP server](images/Usecase.gif)
 
 ## Project Details
-- **Version:** 0.1.13
+- **Version:** 0.1.14
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)

{codegraphcontext-0.1.13 → codegraphcontext-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codegraphcontext"
-version = "0.1.13"
+version = "0.1.14"
 description = "An MCP server that indexes local code into a graph database to provide context to AI assistants."
 authors = [{ name = "Shashank Shekhar Singh", email = "shashankshekharsingh1205@gmail.com" }]
 readme = "README.md"
@@ -24,7 +24,9 @@ dependencies = [
     "inquirerpy>=0.3.4",
     "python-dotenv>=1.0.0",
     "tree-sitter==0.20.4",                   
-    "tree-sitter-languages==1.10.2"
+    "tree-sitter-languages==1.10.2",
+    "pyyaml",
+    "pytest"
 ]
 
 [project.urls]

codegraphcontext-0.1.14/src/codegraphcontext/cli/main.py

@@ -0,0 +1,288 @@
+# src/codegraphcontext/cli/main.py
+"""
+This module defines the command-line interface (CLI) for the CodeGraphContext application.
+It uses the Typer library to create a user-friendly and well-documented CLI.
+
+Commands:
+- setup: Runs an interactive wizard to configure the Neo4j database connection.
+- start: Launches the main MCP server.
+- tool: A placeholder for directly calling server tools (for debugging).
+- help: Displays help information.
+- version: Show the installed version.
+"""
+import typer
+from rich.console import Console
+from rich.table import Table
+from typing import Optional
+import asyncio
+import logging
+import json
+import os
+import time
+from pathlib import Path
+from dotenv import load_dotenv, find_dotenv
+from importlib.metadata import version as pkg_version, PackageNotFoundError
+from codegraphcontext.server import MCPServer
+from .setup_wizard import run_setup_wizard
+
+# Set the log level for the noisy neo4j logger to WARNING to keep the output clean.
+logging.getLogger("neo4j").setLevel(logging.WARNING)
+
+# Initialize the Typer app and Rich console for formatted output.
+app = typer.Typer(
+    name="cgc",
+    help="CodeGraphContext: An MCP server for AI-powered code analysis.",
+    add_completion=False,
+)
+console = Console(stderr=True)
+
+# Configure basic logging for the application.
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(name)s - %(message)s')
+
+
+def get_version() -> str:
+    """
+    Try to read version from the installed package metadata.
+    Fallback to a dev version if not installed.
+    """
+    try:
+        return pkg_version("codegraphcontext")  # must match [project].name in pyproject.toml
+    except PackageNotFoundError:
+        return "0.0.0 (dev)"
+
+
+@app.command()
+def setup():
+    """
+    Runs the interactive setup wizard to configure the server and database connection.
+    This helps users set up a local Docker-based Neo4j instance or connect to a remote one.
+    """
+    run_setup_wizard()
+
+def _load_credentials():
+    """
+    Loads Neo4j credentials from various sources into environment variables.
+    Priority order:
+    1. Local `mcp.json`
+    2. Global `~/.codegraphcontext/.env`
+    3. Any `.env` file found in the directory tree.
+    """
+    # 1. Prefer loading from mcp.json
+    mcp_file_path = Path.cwd() / "mcp.json"
+    if mcp_file_path.exists():
+        try:
+            with open(mcp_file_path, "r") as f:
+                mcp_config = json.load(f)
+            server_env = mcp_config.get("mcpServers", {}).get("CodeGraphContext", {}).get("env", {})
+            for key, value in server_env.items():
+                os.environ[key] = value
+            console.print("[green]Loaded Neo4j credentials from local mcp.json.[/green]")
+            return
+        except Exception as e:
+            console.print(f"[bold red]Error loading mcp.json:[/bold red] {e}")
+    
+    # 2. Try global .env file
+    global_env_path = Path.home() / ".codegraphcontext" / ".env"
+    if global_env_path.exists():
+        try:
+            load_dotenv(dotenv_path=global_env_path)
+            console.print(f"[green]Loaded Neo4j credentials from global .env file: {global_env_path}[/green]")
+            return
+        except Exception as e:
+            console.print(f"[bold red]Error loading global .env file from {global_env_path}:[/bold red] {e}")
+
+    # 3. Fallback to any discovered .env
+    try:
+        dotenv_path = find_dotenv(usecwd=True, raise_error_if_not_found=False)
+        if dotenv_path:
+            load_dotenv(dotenv_path)
+            console.print(f"[green]Loaded Neo4j credentials from discovered .env file: {dotenv_path}[/green]")
+        else:
+            console.print("[yellow]No local mcp.json or .env file found. Credentials may not be set.[/yellow]")
+    except Exception as e:
+        console.print(f"[bold red]Error loading .env file:[/bold red] {e}")
+
+
+@app.command()
+def start():
+    """
+    Starts the CodeGraphContext MCP server, which listens for JSON-RPC requests from stdin.
+    """
+    console.print("[bold green]Starting CodeGraphContext Server...[/bold green]")
+    _load_credentials()
+
+    server = None
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    try:
+        # Initialize and run the main server.
+        server = MCPServer(loop=loop)
+        loop.run_until_complete(server.run())
+    except ValueError as e:
+        # This typically happens if credentials are still not found after all checks.
+        console.print(f"[bold red]Configuration Error:[/bold red] {e}")
+        console.print("Please run `cgc setup` to configure the server.")
+    except KeyboardInterrupt:
+        # Handle graceful shutdown on Ctrl+C.
+        console.print("\n[bold yellow]Server stopped by user.[/bold yellow]")
+    finally:
+        # Ensure server and event loop are properly closed.
+        if server:
+            server.shutdown()
+        loop.close()
+
+
+
+def _run_tool(tool_name: str, tool_args: dict):
+    """Helper function to run a tool and handle the server lifecycle."""
+    _load_credentials()
+    try:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        server = MCPServer(loop=loop)
+
+        result = loop.run_until_complete(server.handle_tool_call(tool_name, tool_args))
+        
+        if isinstance(result, dict) and "job_id" in result:
+            job_id = result["job_id"]
+            console.print(f"[green]Successfully started job '{job_id}' for tool '{tool_name}'.[/green]")
+            console.print(f"Estimated files: {result.get('estimated_files')}, Estimated duration: {result.get('estimated_duration_human')}")
+            console.print(f"\n[bold yellow]Polling for completion...[/bold yellow]")
+            
+            while True:
+                time.sleep(2)
+                status_result = loop.run_until_complete(server.handle_tool_call("check_job_status", {"job_id": job_id}))
+                job_status = status_result.get("job", {}).get("status")
+                processed_files = status_result.get("job", {}).get("processed_files", 0)
+                total_files = status_result.get("job", {}).get("total_files", 0)
+                console.print(f"Job status: {job_status} ({processed_files}/{total_files} files)")
+                if job_status in ["completed", "failed", "cancelled"]:
+                    console.print(json.dumps(status_result, indent=2))
+                    break
+        else:
+            console.print(json.dumps(result, indent=2))
+
+    except ValueError as e:
+        console.print(f"[bold red]Configuration Error:[/bold red] {e}")
+    except Exception as e:
+        console.print(f"[bold red]An unexpected error occurred:[/bold red] {e}")
+    finally:
+        if 'loop' in locals() and loop.is_running():
+            loop.close()
+
+@app.command()
+def index(path: Optional[str] = typer.Argument(None, help="Path to the directory or file to index. Defaults to the current directory.")):
+    """
+    Indexes a directory or file by adding it to the code graph.
+    If no path is provided, it indexes the current directory.
+    """
+    if path is None:
+        path = "."
+    _run_tool("add_code_to_graph", {"path": path})
+
+@app.command()
+def delete(path: str = typer.Argument(..., help="Path of the repository to delete from the code graph.")):
+    """
+    Deletes a repository from the code graph.
+    """
+    _run_tool("delete_repository", {"repo_path": path})
+
+@app.command()
+def visualize(query: Optional[str] = typer.Argument(None, help="The Cypher query to visualize.")):
+    """
+    Generates a URL to visualize a Cypher query in the Neo4j Browser.
+    If no query is provided, a default query will be used.
+    """
+    if query is None:
+        query = "MATCH p=()-->() RETURN p"
+    _run_tool("visualize_graph_query", {"cypher_query": query})
+
+@app.command(name="list_repos")
+def list_repos():
+    """
+    Lists all indexed repositories.
+    """
+    _run_tool("list_indexed_repositories", {})
+
+@app.command(name="add_package")
+def add_package(package_name: str = typer.Argument(..., help="Name of the Python package to add.")):
+    """
+    Adds a Python package to the code graph.
+    """
+    _run_tool("add_package_to_graph", {"package_name": package_name})
+
+@app.command()
+def cypher(query: str = typer.Argument(..., help="The read-only Cypher query to execute.")):
+    """
+    Executes a read-only Cypher query.
+    """
+    _run_tool("execute_cypher_query", {"cypher_query": query})
+
+
+@app.command(name="list_mcp_tools")
+def list_mcp_tools():
+    """
+    Lists all available tools and their descriptions.
+    """
+    _load_credentials()
+    console.print("[bold green]Available Tools:[/bold green]")
+    try:
+        # Instantiate the server to access the tool definitions.
+        server = MCPServer()
+        tools = server.tools.values()
+
+        table = Table(show_header=True, header_style="bold magenta")
+        table.add_column("Tool Name", style="dim", width=30)
+        table.add_column("Description")
+
+        for tool in sorted(tools, key=lambda t: t['name']):
+            table.add_row(tool['name'], tool['description'])
+
+        console.print(table)
+
+    except ValueError as e:
+        console.print(f"[bold red]Error loading tools:[/bold red] {e}")
+        console.print("Please ensure your Neo4j credentials are set up correctly (`cgc setup`), as they are needed to initialize the server.")
+    except Exception as e:
+        console.print(f"[bold red]An unexpected error occurred:[/bold red] {e}")
+
+
+@app.command()
+def help(ctx: typer.Context):
+    """Show the main help message and exit."""
+    root_ctx = ctx.parent or ctx
+    typer.echo(root_ctx.get_help())
+
+
+@app.command("version")
+def version_cmd():
+    """Show the application version."""
+    console.print(f"CodeGraphContext [bold cyan]{get_version()}[/bold cyan]")
+
+
+@app.callback(invoke_without_command=True)
+def main(
+    ctx: typer.Context,
+    version_: bool = typer.Option(
+        None,
+        "--version",
+        "-v",
+        help="Show the application version and exit.",
+        is_eager=True,
+    ),
+):
+    """
+    Main entry point for the cgc CLI application.
+    If no subcommand is provided, it displays a welcome message with instructions.
+    """
+    if version_:
+        console.print(f"CodeGraphContext [bold cyan]{get_version()}[/bold cyan]")
+        raise typer.Exit()
+
+    if ctx.invoked_subcommand is None:
+        console.print("[bold green]👋 Welcome to CodeGraphContext (cgc)![/bold green]\n")
+        console.print("👉 Run [cyan]cgc setup[/cyan] to configure the server and database.")
+        console.print("👉 Run [cyan]cgc start[/cyan] to launch the server.")
+        console.print("👉 Run [cyan]cgc help[/cyan] to see all available commands.\n")
+        console.print("👉 Run [cyan]cgc --version[/cyan] to check the version.\n")
+        console.print("👉 Running [green]codegraphcontext [white]works the same as using [green]cgc")

codegraphcontext-0.1.14/src/codegraphcontext/cli/setup_macos.py

@@ -0,0 +1,95 @@
+# src/codegraphcontext/cli/setup_macos.py
+import platform
+import time
+from pathlib import Path
+
+def _has_brew(run_command, console) -> bool:
+    return run_command(["which", "brew"], console, check=False) is not None
+
+def _brew_install_neo4j(run_command, console) -> str:
+    if run_command(["brew", "install", "neo4j@5"], console, check=False):
+        return "neo4j@5"
+    if run_command(["brew", "install", "neo4j"], console, check=False):
+        return "neo4j"
+    return ""
+
+def _brew_start(service: str, run_command, console) -> bool:
+    return run_command(["brew", "services", "start", service], console, check=False) is not None
+
+def _set_initial_password(new_pw: str, run_command, console) -> bool:
+    cmd = [
+        "cypher-shell",
+        "-u", "neo4j",
+        "-p", "neo4j",
+        f"ALTER CURRENT USER SET PASSWORD FROM 'neo4j' TO '{new_pw}'",
+    ]
+    return run_command(cmd, console, check=False) is not None
+
+def setup_macos_binary(console, prompt, run_command, _generate_mcp_json):
+    """Automates Neo4j install & config on macOS via Homebrew."""
+    os_name = platform.system()
+    console.print(f"Detected Operating System: [bold yellow]{os_name}[/bold yellow]")
+
+    if os_name != "Darwin":
+        console.print("[yellow]This installer is for macOS only.[/yellow]")
+        return
+
+    console.print("[bold]Starting automated Neo4j installation for macOS.[/bold]")
+
+    if not prompt([{
+        "type": "confirm",
+        "message": "Proceed with Homebrew-based install of Neo4j?",
+        "name": "proceed",
+        "default": True
+    }]).get("proceed"):
+        return
+
+    console.print("\n[bold]Step: Checking for Homebrew...[/bold]")
+    if not _has_brew(run_command, console):
+        console.print(
+            "[bold red]Homebrew not found.[/bold red] "
+            "Install from [bold blue]https://brew.sh[/bold blue] and re-run this setup."
+        )
+        return
+
+    console.print("\n[bold]Step: Installing Neo4j via Homebrew...[/bold]")
+    service = _brew_install_neo4j(run_command, console)
+    if not service:
+        console.print("[bold red]Failed to install Neo4j via Homebrew.[/bold red]")
+        return
+
+    console.print(f"\n[bold]Step: Starting Neo4j service ({service})...[/bold]")
+    if not _brew_start(service, run_command, console):
+        console.print("[bold red]Failed to start Neo4j with brew services.[/bold red]")
+        return
+
+    while True:
+        answers = prompt([
+            {"type": "password", "message": "Enter a new password for Neo4j:", "name": "pw"},
+            {"type": "password", "message": "Confirm the new password:", "name": "pw2"},
+        ]) or {}
+        if not answers:
+            return
+        pw, pw2 = answers.get("pw"), answers.get("pw2")
+        if pw and pw == pw2:
+            new_password = pw
+            break
+        console.print("[red]Passwords do not match or are empty. Please try again.[/red]")
+
+    console.print("\n[yellow]Waiting 10 seconds for Neo4j to finish starting...[/yellow]")
+    time.sleep(10)
+
+    console.print("\n[bold]Step: Setting initial password with cypher-shell...[/bold]")
+    if not _set_initial_password(new_password, run_command, console):
+        console.print(
+            "[bold red]Failed to set the initial password.[/bold red]\n"
+            "Try manually:\n"
+            "  cypher-shell -u neo4j -p neo4j \"ALTER CURRENT USER SET PASSWORD FROM 'neo4j' TO '<your_pw>'\""
+        )
+        return
+
+    creds = {"uri": "neo4j://localhost:7687", "username": "neo4j", "password": new_password}
+    _generate_mcp_json(creds)
+
+    env_path = Path.home() / ".codegraphcontext" / ".env"
+    console.print(f"\n[bold green]All done![/bold green] Neo4j running. Credentials saved to: [bold]{env_path}[/bold]")

{codegraphcontext-0.1.13 → codegraphcontext-0.1.14}/src/codegraphcontext/cli/setup_wizard.py

@@ -374,11 +374,16 @@ def setup_local_db():
     ]
     result = prompt(questions)
     local_method = result.get("local_method")
-    
+
     if local_method and "Docker" in local_method:
         setup_docker()
     elif local_method:
-        setup_local_binary()
+        if platform.system() == "Darwin":
+            # lazy import to avoid circular import
+            from .setup_macos import setup_macos_binary
+            setup_macos_binary(console, prompt, run_command, _generate_mcp_json)
+        else:
+            setup_local_binary()
 
 def setup_docker():
     """Creates Docker files and runs docker-compose for Neo4j."""

{codegraphcontext-0.1.13 → codegraphcontext-0.1.14}/src/codegraphcontext/core/watcher.py

@@ -25,7 +25,7 @@ class RepositoryEventHandler(FileSystemEventHandler):
     to build a baseline and then uses this cached state to perform efficient
     updates when files are changed, created, or deleted.
     """
-    def __init__(self, graph_builder: "GraphBuilder", repo_path: Path, debounce_interval=2.0):
+    def __init__(self, graph_builder: "GraphBuilder", repo_path: Path, debounce_interval=2.0, perform_initial_scan: bool = True):
         """
         Initializes the event handler.
 
@@ -33,6 +33,7 @@ class RepositoryEventHandler(FileSystemEventHandler):
             graph_builder: An instance of the GraphBuilder to perform graph operations.
             repo_path: The absolute path to the repository directory to watch.
             debounce_interval: The time in seconds to wait for more changes before processing an event.
+            perform_initial_scan: Whether to perform an initial scan of the repository.
         """
         super().__init__()
         self.graph_builder = graph_builder
@@ -45,7 +46,8 @@ class RepositoryEventHandler(FileSystemEventHandler):
         self.imports_map = {}
         
         # Perform the initial scan and linking when the watcher is created.
-        self._initial_scan()
+        if perform_initial_scan:
+            self._initial_scan()
 
     def _initial_scan(self):
         """Scans the entire repository, parses all files, and builds the initial graph."""
@@ -82,30 +84,39 @@ class RepositoryEventHandler(FileSystemEventHandler):
     def _handle_modification(self, event_path_str: str):
         """
         Orchestrates the complete update cycle for a modified or created file.
-        This involves updating the graph and then re-linking the relationships.
+        This involves re-scanning the entire repo to update cross-file relationships.
         """
-        logger.info(f"File change detected, starting full update for: {event_path_str}")
+        logger.info(f"File change detected, starting full repository refresh for: {event_path_str}")
         modified_path = Path(event_path_str)
 
-        # 1. Update the specific file in the graph (delete old nodes, create new ones).
-        new_file_data = self.graph_builder.update_file_in_graph(
+        # 1. Get all supported files in the repository.
+        supported_extensions = self.graph_builder.parsers.keys()
+        all_files = [f for f in self.repo_path.rglob("*") if f.is_file() and f.suffix in supported_extensions]
+
+        # 2. Re-scan all files to get a fresh, global map of all symbols.
+        self.imports_map = self.graph_builder._pre_scan_for_imports(all_files)
+        logger.info("Refreshed global imports map.")
+
+        # 3. Update the specific file that changed in the graph.
+        # This deletes old nodes and adds new ones for the single file.
+        self.graph_builder.update_file_in_graph(
             modified_path, self.repo_path, self.imports_map
         )
 
-        if not new_file_data:
-            logger.error(f"Update failed for {event_path_str}, skipping re-link.")
-            return
-
-        # 2. Update the in-memory cache of the repository's state.
-        self.all_file_data = [d for d in self.all_file_data if d.get("file_path") != event_path_str]
-        if not new_file_data.get("deleted"):
-            self.all_file_data.append(new_file_data)
+        # 4. Re-parse all files to have a complete, in-memory representation for the linking pass.
+        # This is necessary because a change in one file can affect relationships in others.
+        self.all_file_data = []
+        for f in all_files:
+            parsed_data = self.graph_builder.parse_file(self.repo_path, f)
+            if "error" not in parsed_data:
+                self.all_file_data.append(parsed_data)
+        logger.info("Refreshed in-memory cache of all file data.")
 
-        # 3. CRITICAL: Re-link the entire graph's call relationships using the updated cache.
-        # This is necessary because a change in one file can affect its relationship with any other file.
-        logger.info("Re-linking the call graph with updated information...")
+        # 5. CRITICAL: Re-link the entire graph using the fully updated cache and imports map.
+        logger.info("Re-linking the entire graph for calls and inheritance...")
         self.graph_builder._create_all_function_calls(self.all_file_data, self.imports_map)
-        logger.info(f"Graph update for {event_path_str} complete! ✅")
+        self.graph_builder._create_all_inheritance_links(self.all_file_data, self.imports_map)
+        logger.info(f"Graph refresh for change in {event_path_str} complete! ✅")
 
     # The following methods are called by the watchdog observer when a file event occurs.
     def on_created(self, event):
@@ -136,8 +147,9 @@ class CodeWatcher:
         self.graph_builder = graph_builder
         self.observer = Observer()
         self.watched_paths = set() # Keep track of paths already being watched.
+        self.watches = {} # Store watch objects to allow unscheduling
 
-    def watch_directory(self, path: str):
+    def watch_directory(self, path: str, perform_initial_scan: bool = True):
         """Schedules a directory to be watched for changes."""
         path_obj = Path(path).resolve()
         path_str = str(path_obj)
@@ -147,13 +159,34 @@ class CodeWatcher:
             return {"message": f"Path already being watched: {path_str}"}
         
         # Create a new, dedicated event handler for this specific repository path.
-        event_handler = RepositoryEventHandler(self.graph_builder, path_obj)
+        event_handler = RepositoryEventHandler(self.graph_builder, path_obj, perform_initial_scan=perform_initial_scan)
         
-        self.observer.schedule(event_handler, path_str, recursive=True)
+        watch = self.observer.schedule(event_handler, path_str, recursive=True)
+        self.watches[path_str] = watch
         self.watched_paths.add(path_str)
         logger.info(f"Started watching for code changes in: {path_str}")
         
-        return {"message": f"Started watching {path_str}. Initial scan is in progress."}
+        return {"message": f"Started watching {path_str}."}
+    def unwatch_directory(self, path: str):
+        """Stops watching a directory for changes."""
+        path_obj = Path(path).resolve()
+        path_str = str(path_obj)
+
+        if path_str not in self.watched_paths:
+            logger.warning(f"Attempted to unwatch a path that is not being watched: {path_str}")
+            return {"error": f"Path not currently being watched: {path_str}"}
+
+        watch = self.watches.pop(path_str, None)
+        if watch:
+            self.observer.unschedule(watch)
+        
+        self.watched_paths.discard(path_str)
+        logger.info(f"Stopped watching for code changes in: {path_str}")
+        return {"message": f"Stopped watching {path_str}."}
+
+    def list_watched_paths(self) -> list:
+        """Returns a list of all currently watched directory paths."""
+        return list(self.watched_paths)
 
     def start(self):
         """Starts the observer thread."""