codegraphcontext 0.4.12__py3-none-any.whl → 0.4.14__py3-none-any.whl

codegraphcontext/api/router.py

@@ -87,7 +87,7 @@ async def execute_query(
     server: MCPServer = Depends(get_server)
 ):
     result = await server.handle_tool_call("execute_cypher_query", {
-        "query": request.query,
+        "cypher_query": request.query,
         "params": request.params
     })
     

codegraphcontext/cli/config_manager.py

@@ -31,6 +31,7 @@ DEFAULT_CONFIG = {
     "FALKORDB_PATH": str(CONFIG_DIR / "global" / "db" / "falkordb"),
     "FALKORDB_SOCKET_PATH": str(CONFIG_DIR / "global" / "db" / "falkordb.sock"),
     "LADYBUGDB_PATH": str(CONFIG_DIR / "global" / "db" / "ladybugdb"),
+    "KUZUDB_PATH": str(CONFIG_DIR / "global" / "db" / "kuzudb"),
     "INDEX_VARIABLES": "true",
     "ALLOW_DB_DELETION": "false",
     "DEBUG_LOGS": "false",
@@ -72,6 +73,7 @@ CONFIG_DESCRIPTIONS = {
     "FALKORDB_PATH": "Path to FalkorDB database file",
     "FALKORDB_SOCKET_PATH": "Path to FalkorDB Unix socket",
     "LADYBUGDB_PATH": "Path to LadybugDB database directory",
+    "KUZUDB_PATH": "Path to KuzuDB database directory",
     "INDEX_VARIABLES": "Index variable nodes in the graph (lighter graph if false)",
     "ALLOW_DB_DELETION": "Allow full database deletion commands",
     "DEBUG_LOGS": "Enable debug logging (for development/troubleshooting)",
@@ -232,7 +234,7 @@ def load_config() -> Dict[str, str]:
     # Load global config
     if CONFIG_FILE.exists():
         try:
-            with open(CONFIG_FILE, "r") as f:
+            with open(CONFIG_FILE, "r", encoding="utf-8") as f:
                 for line in f:
                     line = line.strip()
                     if line and not line.startswith("#") and "=" in line:
@@ -245,7 +247,7 @@ def load_config() -> Dict[str, str]:
     local_env = find_local_env()
     if local_env and local_env.exists():
         try:
-            with open(local_env, "r") as f:
+            with open(local_env, "r", encoding="utf-8") as f:
                 for line in f:
                     line = line.strip()
                     if line and not line.startswith("#") and "=" in line:
@@ -319,7 +321,7 @@ def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
     if preserve_db_credentials and CONFIG_FILE.exists():
         # Load existing credentials from file to preserve them
         try:
-            with open(CONFIG_FILE, "r") as f:
+            with open(CONFIG_FILE, "r", encoding="utf-8") as f:
                 for line in f:
                     line = line.strip()
                     if line and not line.startswith("#") and "=" in line:
@@ -340,7 +342,7 @@ def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
                 credentials_to_write[key] = config[key]
     
     try:
-        with open(CONFIG_FILE, "w") as f:
+        with open(CONFIG_FILE, "w", encoding="utf-8") as f:
             f.write("# CodeGraphContext Configuration\n")
             f.write(f"# Location: {CONFIG_FILE}\n\n")
             
@@ -454,7 +456,7 @@ def validate_config_value(key: str, value: str) -> tuple[bool, Optional[str]]:
         except Exception as e:
             return False, f"Cannot create log directory: {e}"
     
-    if key in ("FALKORDB_PATH", "FALKORDB_SOCKET_PATH", "LADYBUGDB_PATH"):
+    if key in ("FALKORDB_PATH", "FALKORDB_SOCKET_PATH", "LADYBUGDB_PATH", "KUZUDB_PATH"):
         # Validate path is writable
         db_path = Path(normalize_config_path(value, absolute=True))
         try:
@@ -694,7 +696,7 @@ def load_context_config() -> ContextConfig:
         return cfg
 
     try:
-        with open(CONTEXT_CONFIG_FILE, "r") as f:
+        with open(CONTEXT_CONFIG_FILE, "r", encoding="utf-8") as f:
             raw = yaml.safe_load(f) or {}
 
         contexts: Dict[str, ContextInfo] = {}
@@ -744,7 +746,7 @@ def save_context_config(cfg: ContextConfig) -> None:
     }
 
     try:
-        with open(CONTEXT_CONFIG_FILE, "w") as f:
+        with open(CONTEXT_CONFIG_FILE, "w", encoding="utf-8") as f:
             yaml.dump(raw, f, default_flow_style=False, sort_keys=False)
     except Exception as e:
         console.print(f"[red]Error saving config.yaml: {e}[/red]")
@@ -836,7 +838,7 @@ def resolve_context(
         local_db = "falkordb"
         if local_yaml.exists():
             try:
-                with open(local_yaml) as f:
+                with open(local_yaml, encoding="utf-8") as f:
                     local_raw = yaml.safe_load(f) or {}
                 local_db = local_raw.get("database", "falkordb")
             except Exception:
@@ -1051,7 +1053,7 @@ def discover_child_contexts(
                 local_yaml = candidate / "config.yaml"
                 if local_yaml.exists():
                     try:
-                        with open(local_yaml) as f:
+                        with open(local_yaml, encoding="utf-8") as f:
                             raw = yaml.safe_load(f) or {}
                         local_db = raw.get("database", "falkordb")
                     except Exception:
@@ -1080,7 +1082,7 @@ def _load_workspace_mappings() -> Dict[str, Dict[str, str]]:
     if not CONTEXT_CONFIG_FILE.exists():
         return {}
     try:
-        with open(CONTEXT_CONFIG_FILE, "r") as f:
+        with open(CONTEXT_CONFIG_FILE, "r", encoding="utf-8") as f:
             raw = yaml.safe_load(f) or {}
         return raw.get("workspace_mappings", {}) or {}
     except Exception:
@@ -1094,13 +1096,13 @@ def _save_workspace_mappings(mappings: Dict[str, Dict[str, str]]) -> None:
     raw: Dict[str, Any] = {}
     if CONTEXT_CONFIG_FILE.exists():
         try:
-            with open(CONTEXT_CONFIG_FILE, "r") as f:
+            with open(CONTEXT_CONFIG_FILE, "r", encoding="utf-8") as f:
                 raw = yaml.safe_load(f) or {}
         except Exception:
             raw = {}
     raw["workspace_mappings"] = mappings
     try:
-        with open(CONTEXT_CONFIG_FILE, "w") as f:
+        with open(CONTEXT_CONFIG_FILE, "w", encoding="utf-8") as f:
             yaml.dump(raw, f, default_flow_style=False, sort_keys=False)
     except Exception as e:
         console.print(f"[red]Error saving workspace mappings: {e}[/red]")
@@ -1122,7 +1124,7 @@ def save_workspace_mapping(cwd: Path, context_path: Path) -> None:
     local_yaml = context_path / "config.yaml"
     if local_yaml.exists():
         try:
-            with open(local_yaml) as f:
+            with open(local_yaml, encoding="utf-8") as f:
                 raw = yaml.safe_load(f) or {}
             local_db = raw.get("database", "falkordb")
         except Exception:

codegraphcontext/cli/main.py

@@ -22,7 +22,6 @@ from pathlib import Path
 from importlib.metadata import version as pkg_version, PackageNotFoundError
 
 from codegraphcontext.server import MCPServer
-from codegraphcontext.core.database import DatabaseManager
 from .setup_wizard import run_neo4j_setup_wizard, configure_mcp_client
 from . import config_manager
 # Import the new helper functions
@@ -108,7 +107,7 @@ def mcp_setup():
     Configure MCP Client (IDE/CLI Integration).
     
     Sets up CodeGraphContext integration with your IDE or CLI tool:
-    - VS Code, Cursor, Windsurf
+    - VS Code, Cursor, Windsurf, Zed
     - Claude Desktop, Gemini CLI
     - Cline, RooCode, Amazon Q Developer, Goose
     - OpenCode (prints stdio config + link to vendor docs)
@@ -125,7 +124,7 @@ def mcp_start():
     Start the CodeGraphContext MCP server.
     
     Starts the server which listens for JSON-RPC requests from stdin.
-    This is used by IDE integrations (VS Code, Cursor, etc.).
+    This is used by IDE integrations (VS Code, Cursor, Zed, etc.).
     """
     console.print("[bold green]Starting CodeGraphContext Server...[/bold green]")
     _load_credentials()
@@ -250,7 +249,7 @@ def context_list():
 @context_app.command("create")
 def context_create(
     name: str = typer.Argument(..., help="Name of the new context"),
-    database: str = typer.Option(None, "--database", "-d", help="Database backend (falkordb, kuzudb, neo4j). Defaults to DEFAULT_DATABASE from config."),
+    database: str = typer.Option(None, "--database", "--db", "-db", "-d", help="Database backend (falkordb, kuzudb, neo4j). Defaults to DEFAULT_DATABASE from config."),
     db_path: str = typer.Option(None, "--db-path", help="Explicit path for the DB (defaults to ~/.codegraphcontext/contexts/<name>/db)"),
 ):
     """Create a new logical context."""
@@ -291,17 +290,14 @@ def _load_credentials(cli_context_flag: Optional[str] = None):
     Uses per-variable precedence - each variable is loaded from the highest priority source.
     Priority order (highest to lowest):
     1. Runtime environment variables (shell/CI)
-    2. Local `.env` in project directory (project-specific overrides)
+    2. Local `.codegraphcontext/.env` and `.env` in the current project directory (project-specific overrides)
     3. Global `~/.codegraphcontext/.env` (user defaults, including `cgc config set`)
     4. Local `mcp.json` env vars (project defaults)
-    1. Local `mcp.json` env vars (highest - explicit MCP server config)
-    2. ``<cwd>/.codegraphcontext/.env`` only (no parent-directory walk)
-    3. Global `~/.codegraphcontext/.env` (lowest - user defaults)
 
-    Step 2 skips duplicate loading when that file is the same path as the global file.
-    Arbitrary repo-root `.env` files are not loaded—only CodeGraphContext config paths.
+    Duplicate loading is skipped when the local file resolves to the same path as the global file.
+    Arbitrary parent directory `.env` files are not loaded—ensuring isolation.
     """
-    from dotenv import dotenv_values, find_dotenv
+    from dotenv import dotenv_values
     from codegraphcontext.cli.config_manager import (
         ensure_config_dir,
         codegraphcontext_dotenv_at_cwd,
@@ -360,12 +356,12 @@ def _load_credentials(cli_context_flag: Optional[str] = None):
         except Exception as e:
             console.print(f"[yellow]Warning: Could not load global .env: {e}[/yellow]")
     
-    # 2. Local project .env (project-specific overrides)
+    # 2. Local project .env (project-specific overrides - restricted to CWD only, no parent walk)
     try:
-        dotenv_path = find_dotenv(usecwd=True, raise_error_if_not_found=False)
-        if dotenv_path:
-            with open(dotenv_path, "r", encoding="utf-8", errors="replace") as f:
-                _append_source(str(dotenv_path), dotenv_values(stream=f))
+        local_dot_env = Path.cwd() / ".env"
+        if local_dot_env.exists() and local_dot_env.resolve() != global_env_path.resolve():
+            with open(local_dot_env, "r", encoding="utf-8", errors="replace") as f:
+                _append_source(str(local_dot_env), dotenv_values(stream=f))
     except Exception as e:
         console.print(f"[yellow]Warning: Could not load .env from current directory: {e}[/yellow]")
 
@@ -637,7 +633,7 @@ def bundle_export(
         if repo_path:
             console.print(f"[dim]Repository: {repo_path}[/dim]")
         else:
-            console.print(f"[dim]Exporting all repositories[/dim]")
+            console.print("[dim]Exporting all repositories[/dim]")
         
         bundle = CGCBundle(db_manager)
         success, message = bundle.export_to_bundle(
@@ -748,7 +744,7 @@ def bundle_load(
     
     # Try to download from registry
     console.print(f"[yellow]Bundle '{bundle_name}' not found locally.[/yellow]")
-    console.print(f"[cyan]Attempting to download from registry...[/cyan]")
+    console.print("[cyan]Attempting to download from registry...[/cyan]")
     
     try:
         from .registry_commands import download_bundle
@@ -768,7 +764,7 @@ def bundle_load(
     
     except Exception as e:
         console.print(f"[bold red]Error: {e}[/bold red]")
-        console.print(f"[dim]Use 'cgc registry list' to see available bundles[/dim]")
+        console.print("[dim]Use 'cgc registry list' to see available bundles[/dim]")
         raise typer.Exit(code=1)
 
 # Shortcut commands at root level
@@ -888,7 +884,7 @@ def registry_download(
     bundle_path = download_bundle(name, output_dir, auto_load=load)
     
     if load and bundle_path:
-        console.print(f"\n[cyan]Loading bundle...[/cyan]")
+        console.print("\n[cyan]Loading bundle...[/cyan]")
         bundle_import(bundle_path, clear=False)
 
 @registry_app.command("request")
@@ -941,13 +937,13 @@ def doctor():
         if config_manager.CONFIG_FILE.exists():
             console.print(f"   [green]✓[/green] Config loaded from {config_manager.CONFIG_FILE}")
         else:
-            console.print(f"   [yellow]ℹ[/yellow] No .env config found, using defaults")
+            console.print("   [yellow]ℹ[/yellow] No .env config found, using defaults")
             console.print(f"   [dim]Config will be created at: {config_manager.CONFIG_FILE}[/dim]")
             
         if config_manager.CONTEXT_CONFIG_FILE.exists():
             console.print(f"   [green]✓[/green] Context config loaded from {config_manager.CONTEXT_CONFIG_FILE}")
         else:
-            console.print(f"   [yellow]ℹ[/yellow] No Context config found")
+            console.print("   [yellow]ℹ[/yellow] No Context config found")
             console.print(f"   [dim]Context config will be auto-generated at: {config_manager.CONTEXT_CONFIG_FILE}[/dim]")
         
         # Validate each config value
@@ -958,12 +954,12 @@ def doctor():
                 invalid_configs.append(f"{key}: {error_msg}")
         
         if invalid_configs:
-            console.print(f"   [red]✗[/red] Invalid configuration values found:")
+            console.print("   [red]✗[/red] Invalid configuration values found:")
             for err in invalid_configs:
                 console.print(f"     - {err}")
             all_checks_passed = False
         else:
-            console.print(f"   [green]✓[/green] All configuration values are valid")
+            console.print("   [green]✓[/green] All configuration values are valid")
     except Exception as e:
         console.print(f"   [red]✗[/red] Configuration error: {e}")
         all_checks_passed = False
@@ -982,6 +978,7 @@ def doctor():
             password = os.environ.get("NEO4J_PASSWORD")
             database_name = os.environ.get("NEO4J_DATABASE")
 
+            from codegraphcontext.core.database import DatabaseManager
             missing = DatabaseManager.get_missing_credentials(uri, username, password)
             console.print(f"   [cyan]Credential check:[/cyan] {'OK' if not missing else 'Missing ' + ', '.join(missing)}")
             if missing:
@@ -1003,10 +1000,10 @@ def doctor():
                     console.print("       Start Neo4j Desktop or run: docker run -d -p 7687:7687 -p 7474:7474 neo4j")
                     all_checks_passed = False
 
-                console.print(f"   [cyan]Testing Neo4j authentication/query...[/cyan]")
+                console.print("   [cyan]Testing Neo4j authentication/query...[/cyan]")
                 is_connected, error_msg = DatabaseManager.test_connection(uri, username, password, database=database_name)
                 if is_connected:
-                    console.print(f"   [green]✓[/green] Neo4j connection successful")
+                    console.print("   [green]✓[/green] Neo4j connection successful")
                 else:
                     console.print(f"   [red]✗[/red] Neo4j connection failed (source: {db_source})")
                     console.print(f"       Reason: {error_msg}")
@@ -1015,28 +1012,28 @@ def doctor():
             from importlib.util import find_spec
 
             if find_spec("kuzu") is not None:
-                console.print(f"   [green]✓[/green] KuzuDB is installed")
+                console.print("   [green]✓[/green] KuzuDB is installed")
             else:
-                console.print(f"   [red]✗[/red] KuzuDB is not installed")
-                console.print(f"       Run: pip install kuzu")
+                console.print("   [red]✗[/red] KuzuDB is not installed")
+                console.print("       Run: pip install kuzu")
                 all_checks_passed = False
         elif default_db == "ladybugdb":
             from importlib.util import find_spec
 
             if find_spec("ladybug") is not None:
-                console.print(f"   [green]✓[/green] LadybugDB core (ladybug) is installed")
+                console.print("   [green]✓[/green] LadybugDB core (ladybug) is installed")
             else:
-                console.print(f"   [red]✗[/red] LadybugDB core (ladybug) is not installed")
-                console.print(f"       Run: pip install ladybug")
+                console.print("   [red]✗[/red] LadybugDB core (ladybug) is not installed")
+                console.print("       Run: pip install ladybug")
                 all_checks_passed = False
         else:
             # FalkorDB
             try:
                 import falkordb
-                console.print(f"   [green]✓[/green] FalkorDB Lite is installed")
+                console.print("   [green]✓[/green] FalkorDB Lite is installed")
             except ImportError:
-                console.print(f"   [yellow]⚠[/yellow] FalkorDB Lite not installed (Python 3.12+ only)")
-                console.print(f"       Run: pip install falkordblite")
+                console.print("   [yellow]⚠[/yellow] FalkorDB Lite not installed (Python 3.12+ only)")
+                console.print("       Run: pip install falkordblite")
     except Exception as e:
         console.print(f"   [red]✗[/red] Database check error: {e}")
         all_checks_passed = False
@@ -1045,11 +1042,11 @@ def doctor():
     console.print("\n[bold]3. Checking Tree-Sitter Installation...[/bold]")
     try:
         from tree_sitter import Language, Parser
-        console.print(f"   [green]✓[/green] tree-sitter is installed")
+        console.print("   [green]✓[/green] tree-sitter is installed")
         
         try:
             from tree_sitter_language_pack import get_language
-            console.print(f"   [green]✓[/green] tree-sitter-language-pack is installed")
+            console.print("   [green]✓[/green] tree-sitter-language-pack is installed")
             
             from codegraphcontext.utils.tree_sitter_manager import LANGUAGE_ALIASES, LANGUAGE_PACK_NAMES
             all_langs = sorted(set(LANGUAGE_ALIASES.values()))
@@ -1067,7 +1064,7 @@ def doctor():
             if unavailable:
                 console.print(f"   [yellow]⚠[/yellow] Unavailable: {', '.join(unavailable)}")
         except ImportError:
-            console.print(f"   [red]✗[/red] tree-sitter-language-pack not installed")
+            console.print("   [red]✗[/red] tree-sitter-language-pack not installed")
             all_checks_passed = False
     except ImportError as e:
         console.print(f"   [red]✗[/red] tree-sitter not installed: {e}")
@@ -1085,12 +1082,12 @@ def doctor():
             try:
                 test_file.touch()
                 test_file.unlink()
-                console.print(f"   [green]✓[/green] Config directory is writable")
+                console.print("   [green]✓[/green] Config directory is writable")
             except Exception as e:
                 console.print(f"   [red]✗[/red] Config directory not writable: {e}")
                 all_checks_passed = False
         else:
-            console.print(f"   [yellow]⚠[/yellow] Config directory doesn't exist, will be created on first use")
+            console.print("   [yellow]⚠[/yellow] Config directory doesn't exist, will be created on first use")
     except Exception as e:
         console.print(f"   [red]✗[/red] Permission check error: {e}")
         all_checks_passed = False
@@ -1102,7 +1099,7 @@ def doctor():
     if cgc_path:
         console.print(f"   [green]✓[/green] cgc command found at: {cgc_path}")
     else:
-        console.print(f"   [yellow]⚠[/yellow] cgc command not in PATH (using python -m cgc)")
+        console.print("   [yellow]⚠[/yellow] cgc command not in PATH (using python -m cgc)")
     
     # Final summary
     console.print("\n" + "=" * 60)
@@ -2393,7 +2390,7 @@ def analyze_dead_code(
                 location_str
             )
         
-        console.print(f"\n[bold yellow]⚠️  Potentially Unused Functions:[/bold yellow]")
+        console.print("\n[bold yellow]⚠️  Potentially Unused Functions:[/bold yellow]")
         console.print(table)
         console.print(f"\n[dim]Total: {len(unused_funcs)} function(s)[/dim]")
         console.print(f"[dim]Note: {results.get('note', '')}[/dim]")

codegraphcontext/cli/registry_commands.py

@@ -11,7 +11,6 @@ from rich.table import Table
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from pathlib import Path
 from typing import Optional, List, Dict, Any
-import time
 
 console = Console()
 
@@ -20,7 +19,7 @@ GITHUB_REPO = "CodeGraphContext"
 
 
 def fetch_available_bundles() -> List[Dict[str, Any]]:
-    """Fetch all available bundles from GitHub Releases (delegates to core BundleRegistry)."""
+    """Fetch all available bundles from the Hugging Face registry (delegates to core BundleRegistry)."""
     from ..core.bundle_registry import BundleRegistry
     return BundleRegistry.fetch_available_bundles()
 
@@ -34,17 +33,27 @@ def _get_base_package_name(bundle_name: str) -> str:
         'flask-main-abc123' -> 'flask'
         'requests' -> 'requests'
     """
+    import re
     # Remove .cgc extension if present
     name = bundle_name.replace('.cgc', '')
     
-    # Split by hyphen and take the first part
-    # This assumes package names don't contain hyphens (may need refinement)
-    parts = name.split('-')
-    
-    # For multi-word package names like 'python-bitcoin-utils',
-    # we need smarter logic. For now, take first part.
-    # TODO: Improve this with a known package list or better heuristics
-    return parts[0]
+    # If the bundle name contains '-main-' or '-master-', split on that
+    for branch_indicator in ('-main-', '-master-'):
+        if branch_indicator in name:
+            return name.split(branch_indicator)[0]
+            
+    # Try matching standard trailing branch and commit hash pattern
+    # e.g., -[branch]-[commit_hash] where commit_hash is a hex string
+    match = re.search(r'-(?:main|master|dev|development|release)-[a-fA-F0-9]{7,40}$', name)
+    if match:
+        return name[:match.start()]
+        
+    # Try matching generic trailing branch and 7-8 char hex commit hash
+    match_generic = re.search(r'-([a-zA-Z0-9_]+)-([a-fA-F0-9]{7,8})$', name)
+    if match_generic:
+        return name[:match_generic.start()]
+        
+    return name
 
 
 def list_bundles(verbose: bool = False, unique: bool = False):
@@ -168,6 +177,8 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
     and base names (e.g., 'python-bitcoin-utils' - picks most recent version).
     """
     console.print(f"[cyan]Looking for bundle '{name}'...[/cyan]")
+
+    lookup_name = name[:-4] if name.lower().endswith('.cgc') else name
     
     bundles = fetch_available_bundles()
     
@@ -178,7 +189,7 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
     # Strategy 1: Try exact match on full_name (with version)
     bundle = None
     for b in bundles:
-        if b.get('full_name', '').lower() == name.lower():
+        if b.get('full_name', '').lower() == lookup_name.lower():
             bundle = b
             console.print(f"[dim]Found exact match: {b.get('full_name')}[/dim]")
             break
@@ -188,7 +199,7 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
     if not bundle:
         matching_bundles = []
         for b in bundles:
-            if b.get('name', '').lower() == name.lower():
+            if b.get('name', '').lower() == lookup_name.lower():
                 matching_bundles.append(b)
         
         if matching_bundles:
@@ -200,7 +211,7 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
             console.print(f"[cyan]  → {bundle.get('full_name')}[/cyan]")
             
             if len(matching_bundles) > 1:
-                console.print(f"\n[dim]Other available versions:[/dim]")
+                console.print("\n[dim]Other available versions:[/dim]")
                 for b in matching_bundles[1:4]:  # Show up to 3 alternatives
                     console.print(f"[dim]  • {b.get('full_name')}[/dim]")
                 if len(matching_bundles) > 4:
@@ -211,7 +222,7 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
     if not bundle:
         # Find bundles with similar base names
         suggestions = []
-        name_lower = name.lower()
+        name_lower = lookup_name.lower()
         for b in bundles:
             base_name = b.get('name', '').lower()
             full_name = b.get('full_name', '').lower()
@@ -253,7 +264,7 @@ def download_bundle(name: str, output_dir: Optional[str] = None, auto_load: bool
         if not typer.confirm("Overwrite?", default=False):
             console.print("[yellow]Download cancelled[/yellow]")
             if auto_load:
-                console.print(f"[cyan]Using existing bundle for loading...[/cyan]")
+                console.print("[cyan]Using existing bundle for loading...[/cyan]")
                 return str(output_path)
             return
         output_path.unlink()
@@ -324,14 +335,14 @@ def request_bundle(repo_url: str, wait: bool = False):
     console.print("[cyan]Please use one of these methods:[/cyan]\n")
     
     console.print("1. [bold]Via Website (Recommended):[/bold]")
-    console.print(f"   Visit: https://codegraphcontext.vercel.app")
+    console.print("   Visit: https://codegraphcontext.vercel.app")
     console.print(f"   Enter: {repo_url}")
-    console.print(f"   Click 'Generate Bundle'\n")
+    console.print("   Click 'Generate Bundle'\n")
     
     console.print("2. [bold]Via GitHub Actions (Manual):[/bold]")
     console.print(f"   Go to: https://github.com/{GITHUB_ORG}/{GITHUB_REPO}/actions")
-    console.print(f"   Select: 'Generate Bundle On-Demand'")
-    console.print(f"   Click: 'Run workflow'")
+    console.print("   Select: 'Generate Bundle On-Demand'")
+    console.print("   Click: 'Run workflow'")
     console.print(f"   Enter: {repo_url}\n")
     
     console.print("[dim]Bundle generation typically takes 5-10 minutes.[/dim]")

codegraphcontext/cli/setup_wizard.py

@@ -92,8 +92,8 @@ def _generate_mcp_json(creds):
                     "disabledTools": [],
                     "disabled": False
                 },
-                "disabled": False,
-                "alwaysAllow": []
+                "disabled": False 
+        
             }
         }
     }
@@ -256,7 +256,7 @@ def _configure_ide(mcp_config):
     questions = [
         {
             "type": "confirm",
-            "message": "Automatically configure your IDE/CLI (VS Code, Cursor, Windsurf, Claude, Gemini, Cline, RooCode, ChatGPT Codex, Amazon Q Developer, Aider, Kiro, Goose, Antigravity, OpenCode)?",
+            "message": "Automatically configure your IDE/CLI (VS Code, Cursor, Windsurf, Zed, Claude, Gemini, Cline, RooCode, ChatGPT Codex, Amazon Q Developer, Aider, Kiro, Goose, Antigravity, OpenCode)?",
             "name": "configure_ide",
             "default": True,
         }
@@ -270,7 +270,7 @@ def _configure_ide(mcp_config):
         {
             "type": "list",
             "message": "Choose your IDE/CLI to configure:",
-            "choices": ["VS Code", "Cursor", "Windsurf", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "RooCode", "Amazon Q Developer", "JetBrainsAI", "Aider", "Kiro", "Goose", "Antigravity", "OpenCode", "None of the above"],
+            "choices": ["VS Code", "Cursor", "Windsurf", "Zed", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "RooCode", "Amazon Q Developer", "JetBrainsAI", "Aider", "Kiro", "Goose", "Antigravity", "OpenCode", "None of the above"],
             "name": "ide_choice",
         }
     ]
@@ -289,7 +289,7 @@ def _configure_ide(mcp_config):
         )
         return
 
-    if ide_choice in ["VS Code", "Cursor", "Windsurf", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "RooCode", "Amazon Q Developer", "JetBrainsAI", "Aider", "Kiro", "Goose", "Antigravity"]:
+    if ide_choice in ["VS Code", "Cursor", "Windsurf", "Zed", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "RooCode", "Amazon Q Developer", "JetBrainsAI", "Aider", "Kiro", "Goose", "Antigravity"]:
         console.print(f"\n[bold cyan]Configuring for {ide_choice}...[/bold cyan]")
 
         if ide_choice == "Amazon Q Developer":
@@ -320,6 +320,10 @@ def _configure_ide(mcp_config):
                 Path.home() / "AppData" / "Roaming" / "windsurf" / "settings.json",
                 Path.home() / ".config" / "Windsurf" / "User" / "settings.json",
             ],
+            "Zed": [
+                Path.home() / ".config" / "zed" / "settings.json",
+                Path.home() / "AppData" / "Roaming" / "Zed" / "settings.json"
+            ],
             "Claude code": [
                 Path.home() / ".claude.json"
             ],
@@ -398,10 +402,14 @@ def _configure_ide(mcp_config):
             console.print(f"[red]Error: Configuration file at {target_path} is not a valid JSON object.[/red]")
             return
 
-        if "mcpServers" not in settings:
-            settings["mcpServers"] = {}
-        
-        settings["mcpServers"].update(mcp_config["mcpServers"])
+        if ide_choice == "Zed":
+            if "context_servers" not in settings:
+                settings["context_servers"] = {}
+            settings["context_servers"].update(mcp_config["mcpServers"])
+        else:
+            if "mcpServers" not in settings:
+                settings["mcpServers"] = {}
+            settings["mcpServers"].update(mcp_config["mcpServers"])
 
         try:
             with open(target_path, "w") as f:
@@ -677,6 +685,7 @@ def setup_existing_db():
             
             # Validate the user input
             console.print("\n[cyan]🔍 Validating configuration...[/cyan]")
+            from codegraphcontext.core.database import DatabaseManager
             is_valid, validation_error = DatabaseManager.validate_config(
                 manual_creds.get("uri", ""),
                 manual_creds.get("username", ""),
@@ -795,6 +804,7 @@ def setup_hosted_db():
             
             # Validate the user input
             console.print("\n[cyan]🔍 Validating configuration...[/cyan]")
+            from codegraphcontext.core.database import DatabaseManager
             is_valid, validation_error = DatabaseManager.validate_config(
                 manual_creds.get("uri", ""),
                 manual_creds.get("username", ""),
@@ -913,6 +923,7 @@ volumes:
 
     # Validate configuration format before attempting Docker operations
     console.print("\n[cyan]🔍 Validating configuration...[/cyan]")
+    from codegraphcontext.core.database import DatabaseManager
     is_valid, validation_error = DatabaseManager.validate_config(
         DEFAULT_NEO4J_URI, 
         DEFAULT_NEO4J_USERNAME, 
@@ -972,6 +983,7 @@ volumes:
                 
                 # updated test_connection method
                 console.print(f"[yellow]Testing connection... (attempt {attempt + 1}/{max_attempts})[/yellow]")
+                from codegraphcontext.core.database import DatabaseManager
                 is_connected, error_msg = DatabaseManager.test_connection(DEFAULT_NEO4J_URI, DEFAULT_NEO4J_USERNAME, password)
                 
                 if is_connected: