codegraphcontext 0.4.0__tar.gz → 0.4.2__tar.gz

{codegraphcontext-0.4.0/src/codegraphcontext.egg-info → codegraphcontext-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext
-Version: 0.4.0
+Version: 0.4.2
 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
@@ -53,6 +53,7 @@ Requires-Dist: pathspec>=0.12.1
 Requires-Dist: falkordb>=0.1.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: falkordblite>=0.1.0; sys_platform != "win32" and python_version >= "3.12"
+Requires-Dist: kuzu>=0.4.0; sys_platform == "win32" or (sys_platform != "win32" and python_version >= "3.10" and python_version < "3.12")
 Requires-Dist: fastapi>=0.100.0
 Requires-Dist: uvicorn>=0.22.0
 Provides-Extra: parsing
@@ -164,7 +165,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 ---
 
 ## Project Details
-- **Version:** 0.4.0
+- **Version:** 0.4.2
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -197,7 +198,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 -   **Interactive Setup:** A user-friendly command-line wizard for easy setup.
 -   **Dual Mode:** Works as a standalone **CLI toolkit** for developers and as an **MCP server** for AI agents.
 -   **Multi-Language Support:** Full support for 14 programming languages.
--   **Flexible Database Backend:** KùzuDB (default, zero-config for all platforms), FalkorDB Lite (Unix-only), FalkorDB Remote, or Neo4j (all platforms via Docker/native).
+-   **Flexible Database Backend:** KùzuDB (default on Windows), FalkorDB Lite (typical embedded default on Unix when installed), FalkorDB Remote, or Neo4j (all platforms via Docker/native).
 
 ---
 
@@ -221,8 +222,9 @@ Each language parser extracts functions, classes, methods, parameters, inheritan
 
 CodeGraphContext supports multiple graph database backends to suit your environment:
 
-| Feature | KùzuDB (Default) | FalkorDB Lite | Neo4j |
+| Feature | KùzuDB | FalkorDB Lite | Neo4j |
 | :--- | :--- | :--- | :--- |
+| **Typical default** | **Windows** (embedded, when `kuzu` is installed) | **Unix** (Python 3.12+, when `falkordblite` works) | When explicitly configured |
 | **Setup** | Zero-config / Embedded | Zero-config / In-process | Docker / External |
 | **Platform** | **All (Windows Native, macOS, Linux)** | Unix-only (Linux/macOS/WSL) | All Platforms |
 | **Use Case** | Desktop, IDE, Local development | Specialized Unix development | Enterprise, Massive graphs |
@@ -337,8 +339,8 @@ Use CodeGraphContext as an **MCP server** for AI assistants:
 
 2.  **Database Setup (Automatic)**
     
-    - **KùzuDB (Default):** Runs natively on Windows, macOS, and Linux without any setup. Just `pip install kuzu` and you're ready!
-    - **FalkorDB Lite (Alternative):** Supported on Unix/macOS/WSL for Python 3.12+.
+    - **KùzuDB (default on Windows):** Runs natively on Windows, macOS, and Linux. On Windows it is the usual embedded choice; `pip install kuzu` if needed.
+    - **FalkorDB Lite (typical default on Unix):** When Python 3.12+ and `falkordblite` are available on Unix/macOS/WSL, the embedded backend prefers FalkorDB Lite; otherwise KùzuDB is used.
     - **Neo4j (Alternative):** To use Neo4j instead, or if you prefer a server-based approach, run: `cgc neo4j setup`
 
 ---

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/README.md

@@ -97,7 +97,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 ---
 
 ## Project Details
-- **Version:** 0.4.0
+- **Version:** 0.4.2
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -130,7 +130,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 -   **Interactive Setup:** A user-friendly command-line wizard for easy setup.
 -   **Dual Mode:** Works as a standalone **CLI toolkit** for developers and as an **MCP server** for AI agents.
 -   **Multi-Language Support:** Full support for 14 programming languages.
--   **Flexible Database Backend:** KùzuDB (default, zero-config for all platforms), FalkorDB Lite (Unix-only), FalkorDB Remote, or Neo4j (all platforms via Docker/native).
+-   **Flexible Database Backend:** KùzuDB (default on Windows), FalkorDB Lite (typical embedded default on Unix when installed), FalkorDB Remote, or Neo4j (all platforms via Docker/native).
 
 ---
 
@@ -154,8 +154,9 @@ Each language parser extracts functions, classes, methods, parameters, inheritan
 
 CodeGraphContext supports multiple graph database backends to suit your environment:
 
-| Feature | KùzuDB (Default) | FalkorDB Lite | Neo4j |
+| Feature | KùzuDB | FalkorDB Lite | Neo4j |
 | :--- | :--- | :--- | :--- |
+| **Typical default** | **Windows** (embedded, when `kuzu` is installed) | **Unix** (Python 3.12+, when `falkordblite` works) | When explicitly configured |
 | **Setup** | Zero-config / Embedded | Zero-config / In-process | Docker / External |
 | **Platform** | **All (Windows Native, macOS, Linux)** | Unix-only (Linux/macOS/WSL) | All Platforms |
 | **Use Case** | Desktop, IDE, Local development | Specialized Unix development | Enterprise, Massive graphs |
@@ -270,8 +271,8 @@ Use CodeGraphContext as an **MCP server** for AI assistants:
 
 2.  **Database Setup (Automatic)**
     
-    - **KùzuDB (Default):** Runs natively on Windows, macOS, and Linux without any setup. Just `pip install kuzu` and you're ready!
-    - **FalkorDB Lite (Alternative):** Supported on Unix/macOS/WSL for Python 3.12+.
+    - **KùzuDB (default on Windows):** Runs natively on Windows, macOS, and Linux. On Windows it is the usual embedded choice; `pip install kuzu` if needed.
+    - **FalkorDB Lite (typical default on Unix):** When Python 3.12+ and `falkordblite` are available on Unix/macOS/WSL, the embedded backend prefers FalkorDB Lite; otherwise KùzuDB is used.
     - **Neo4j (Alternative):** To use Neo4j instead, or if you prefer a server-based approach, run: `cgc neo4j setup`
 
 ---

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codegraphcontext"
-version = "0.4.0"
+version = "0.4.2"
 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"
@@ -32,6 +32,7 @@ dependencies = [
     "falkordb>=0.1.0",
     "requests>=2.28.0",
     "falkordblite>=0.1.0; sys_platform != 'win32' and python_version >= '3.12'",
+    "kuzu>=0.4.0; sys_platform == 'win32' or (sys_platform != 'win32' and python_version >= '3.10' and python_version < '3.12')",
     "fastapi>=0.100.0",
     "uvicorn>=0.22.0"
 ]

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/src/codegraphcontext/cli/cli_helpers.py

@@ -24,6 +24,7 @@ from ..tools.code_finder import CodeFinder
 from ..tools.graph_builder import GraphBuilder
 from ..tools.package_resolver import get_local_package_path
 from ..utils.debug_log import info_logger, warning_logger
+from ..utils.repo_path import any_repo_matches_path
 from .config_manager import resolve_context, ResolvedContext, register_repo_in_context, ensure_first_run_bootstrap
 
 console = Console()
@@ -175,8 +176,8 @@ def index_helper(path: str, context: Optional[str] = None):
         return
 
     indexed_repos = code_finder.list_indexed_repositories()
-    repo_exists = any(Path(repo["path"]).resolve() == path_obj for repo in indexed_repos)
-    
+    repo_exists = any_repo_matches_path(indexed_repos, path_obj)
+
     if repo_exists:
         # Check if the repository actually has files (not just an empty node from interrupted indexing)
         # Use variable-length path to handle both flat (Repository->File) and
@@ -184,7 +185,7 @@ def index_helper(path: str, context: Optional[str] = None):
         try:
             with db_manager.get_driver().session() as session:
                 result = session.run(
-                    "MATCH (r:Repository {path: $path})-[:CONTAINS*]->(f:File) RETURN count(f) as file_count",
+                    "MATCH (r:Repository {path: $path})-[:CONTAINS*]->(f:File) RETURN count(DISTINCT f) as file_count",
                     path=str(path_obj)
                 )
                 record = result.single()
@@ -284,7 +285,7 @@ def list_repos_helper(context: Optional[str] = None):
 
         for repo in repos:
             repo_type = "Dependency" if repo.get("is_dependency") else "Project"
-            table.add_row(repo["name"], repo["path"], repo_type)
+            table.add_row(repo.get("name") or "", str(repo.get("path") or ""), repo_type)
         
         console.print(table)
     except Exception as e:
@@ -377,7 +378,7 @@ import urllib.parse
 from ..viz.server import run_server, set_db_manager
 
 def visualize_helper(repo_path: Optional[str] = None, port: int = 8000, context: Optional[str] = None):
-    """"Generates an interactive visualization using the Playground UI."""
+    """Generates an interactive visualization using the Playground UI."""
     services = _initialize_services(context)
     if not all(services[:3]):
         return
@@ -415,15 +416,33 @@ def visualize_helper(repo_path: Optional[str] = None, port: int = 8000, context:
             if cwd_static_dir.exists():
                 static_dir = cwd_static_dir
             else:
-                console.print(f"[yellow]Warning: Visualization assets not found.[/yellow]")
-                console.print(f"[dim]Checked paths:[/dim]")
-                console.print(f"  [dim]- {static_dir}[/dim]")
+                console.print("[bold red]Visualization assets not found.[/bold red]")
+                console.print("[dim]Checked paths:[/dim]")
+                console.print(f"  [dim]- {package_root / 'viz' / 'dist'}[/dim]")
                 console.print(f"  [dim]- {dev_static_dir}[/dim]")
                 console.print(f"  [dim]- {alt_dev_dir}[/dim]")
                 console.print(f"  [dim]- {cwd_static_dir}[/dim]")
-                console.print("[dim]Please run 'cd website && npm run build' first.[/dim]")
-                # We continue anyway to let the server start (helpful for dev)
-    
+                console.print(
+                    "[dim]If you installed from PyPI, upgrade after the next release "
+                    "(wheels must bundle viz/dist). If you are developing from source, run:[/dim]"
+                )
+                console.print("  [cyan]./scripts/sync_viz_dist.sh[/cyan]")
+                console.print(
+                    "[dim]or[/dim] [cyan]cd website && npm ci && npm run build[/cyan] "
+                    "[dim]then sync[/dim] [cyan]website/dist[/cyan] [dim]→[/dim] "
+                    "[cyan]src/codegraphcontext/viz/dist[/cyan][dim].[/dim]"
+                )
+                db_manager.close_driver()
+                raise SystemExit(1)
+
+    index_html = static_dir / "index.html"
+    if not index_html.is_file():
+        console.print(
+            f"[bold red]Invalid visualization bundle:[/bold red] missing {index_html}"
+        )
+        db_manager.close_driver()
+        raise SystemExit(1)
+
     # Construct the URL
     backend_url = f"http://localhost:{port}"
     params = {"backend": backend_url}
@@ -471,8 +490,8 @@ def reindex_helper(path: str, context: Optional[str] = None):
 
     # Check if already indexed
     indexed_repos = code_finder.list_indexed_repositories()
-    repo_exists = any(Path(repo["path"]).resolve() == path_obj for repo in indexed_repos)
-    
+    repo_exists = any_repo_matches_path(indexed_repos, path_obj)
+
     if repo_exists:
         console.print(f"[yellow]Deleting existing index for: {path_obj}[/yellow]")
         try:
@@ -671,7 +690,7 @@ def watch_helper(path: str, context: Optional[str] = None):
     # transient empty result from list_indexed_repositories never triggers a
     # destructive full rescan of an already-populated graph.
     indexed_repos = code_finder.list_indexed_repositories()
-    is_indexed = any(Path(repo["path"]).resolve() == path_obj for repo in indexed_repos)
+    is_indexed = any_repo_matches_path(indexed_repos, path_obj)
     if not is_indexed:
         # Fallback: count File nodes whose path starts with this repo's path.
         # If > 100 exist, the repo is clearly already indexed — skip the scan.

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/src/codegraphcontext/cli/config_manager.py

@@ -219,6 +219,18 @@ def find_local_env() -> Optional[Path]:
     return None
 
 
+def codegraphcontext_dotenv_at_cwd(cwd: Optional[Path] = None) -> Optional[Path]:
+    """
+    Return ``<cwd>/.codegraphcontext/.env`` if that file exists, else None.
+
+    *cwd* defaults to ``Path.cwd()``. Parent directories are **not** searched—same rule as
+    local context resolution (``find_local_cgc_dir``).
+    """
+    root = (cwd or Path.cwd()).resolve()
+    candidate = root / ".codegraphcontext" / ".env"
+    return candidate if candidate.exists() else None
+
+
 def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
     """
     Save configuration to file.
@@ -739,6 +751,21 @@ def resolve_context(
             is_local=True,
         )
 
+    # --- 2b. Saved workspace mapping (CWD -> child .codegraphcontext/) ---
+    mapping = get_workspace_mapping(cwd)
+    if mapping:
+        mapped_ctx_path = Path(mapping["context_path"])
+        if mapped_ctx_path.exists() and mapped_ctx_path.is_dir():
+            mapped_db = mapping.get("database", "falkordb")
+            return ResolvedContext(
+                mode="per-repo",
+                context_name="",
+                database=mapped_db,
+                db_path=str(mapped_ctx_path / "db" / mapped_db),
+                cgcignore_path=str(mapped_ctx_path / ".cgcignore"),
+                is_local=True,
+            )
+
     # --- 3. Global config.yaml ---
     if cfg.mode == "named":
         ctx_name = cfg.default_context
@@ -876,3 +903,149 @@ def list_contexts() -> List[ContextInfo]:
     """Return all named contexts."""
     cfg = load_context_config()
     return list(cfg.contexts.values())
+
+
+# =============================================================================
+# CHILD CONTEXT DISCOVERY
+# =============================================================================
+
+@dataclass
+class DiscoveredContext:
+    """A .codegraphcontext folder found in a child directory."""
+    path: str            # absolute path to the parent repo directory
+    cgc_path: str        # absolute path to the .codegraphcontext directory
+    repo_name: str       # name of the parent directory
+    database: str        # backend from local config.yaml, or default
+    db_path: str         # resolved db path
+    cgcignore_path: str  # path to .cgcignore if present
+
+
+def discover_child_contexts(
+    start: Optional[Path] = None,
+    max_depth: int = 1,
+) -> List[DiscoveredContext]:
+    """Walk child directories of *start* up to *max_depth* levels looking for
+    ``.codegraphcontext/`` folders that represent per-repo databases.
+
+    Returns a list of :class:`DiscoveredContext` for each match found.
+    The global ``~/.codegraphcontext`` is always excluded.
+    """
+    start = (start or Path.cwd()).resolve()
+    global_dir = CONFIG_DIR.resolve()
+    results: List[DiscoveredContext] = []
+
+    def _scan(directory: Path, depth: int) -> None:
+        if depth > max_depth:
+            return
+        try:
+            entries = sorted(directory.iterdir())
+        except PermissionError:
+            return
+        for entry in entries:
+            if not entry.is_dir() or entry.name.startswith("."):
+                continue
+            candidate = entry / ".codegraphcontext"
+            if candidate.exists() and candidate.is_dir() and candidate.resolve() != global_dir:
+                local_db = "falkordb"
+                local_yaml = candidate / "config.yaml"
+                if local_yaml.exists():
+                    try:
+                        with open(local_yaml) as f:
+                            raw = yaml.safe_load(f) or {}
+                        local_db = raw.get("database", "falkordb")
+                    except Exception:
+                        pass
+                results.append(DiscoveredContext(
+                    path=str(entry),
+                    cgc_path=str(candidate),
+                    repo_name=entry.name,
+                    database=local_db,
+                    db_path=str(candidate / "db" / local_db),
+                    cgcignore_path=str(candidate / ".cgcignore"),
+                ))
+            if depth < max_depth:
+                _scan(entry, depth + 1)
+
+    _scan(start, 1)
+    return results
+
+
+# =============================================================================
+# WORKSPACE MAPPINGS  (global persistence of CWD -> context path)
+# =============================================================================
+
+def _load_workspace_mappings() -> Dict[str, Dict[str, str]]:
+    """Load the ``workspace_mappings`` section from config.yaml."""
+    if not CONTEXT_CONFIG_FILE.exists():
+        return {}
+    try:
+        with open(CONTEXT_CONFIG_FILE, "r") as f:
+            raw = yaml.safe_load(f) or {}
+        return raw.get("workspace_mappings", {}) or {}
+    except Exception:
+        return {}
+
+
+def _save_workspace_mappings(mappings: Dict[str, Dict[str, str]]) -> None:
+    """Write *mappings* back into the ``workspace_mappings`` key of config.yaml,
+    preserving all other keys."""
+    ensure_config_dir()
+    raw: Dict[str, Any] = {}
+    if CONTEXT_CONFIG_FILE.exists():
+        try:
+            with open(CONTEXT_CONFIG_FILE, "r") as f:
+                raw = yaml.safe_load(f) or {}
+        except Exception:
+            raw = {}
+    raw["workspace_mappings"] = mappings
+    try:
+        with open(CONTEXT_CONFIG_FILE, "w") 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]")
+
+
+def get_workspace_mapping(cwd: Path) -> Optional[Dict[str, str]]:
+    """Look up a saved workspace mapping for *cwd*.
+
+    Returns a dict with ``context_path`` and ``database`` keys, or None.
+    """
+    mappings = _load_workspace_mappings()
+    return mappings.get(str(cwd.resolve()))
+
+
+def save_workspace_mapping(cwd: Path, context_path: Path) -> None:
+    """Persist an association from *cwd* to a ``.codegraphcontext`` directory."""
+    context_path = context_path.resolve()
+    local_db = "falkordb"
+    local_yaml = context_path / "config.yaml"
+    if local_yaml.exists():
+        try:
+            with open(local_yaml) as f:
+                raw = yaml.safe_load(f) or {}
+            local_db = raw.get("database", "falkordb")
+        except Exception:
+            pass
+
+    mappings = _load_workspace_mappings()
+    mappings[str(cwd.resolve())] = {
+        "context_path": str(context_path),
+        "database": local_db,
+    }
+    _save_workspace_mappings(mappings)
+
+
+def remove_workspace_mapping(cwd: Path) -> bool:
+    """Delete a saved workspace mapping. Returns True if one was removed."""
+    mappings = _load_workspace_mappings()
+    key = str(cwd.resolve())
+    if key in mappings:
+        del mappings[key]
+        _save_workspace_mappings(mappings)
+        return True
+    return False
+
+
+def list_workspace_mappings() -> Dict[str, Dict[str, str]]:
+    """Return all saved workspace mappings."""
+    return _load_workspace_mappings()

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/src/codegraphcontext/cli/main.py

@@ -19,7 +19,6 @@ import logging
 import json
 import os
 from pathlib import Path
-from dotenv import load_dotenv, find_dotenv, set_key
 from importlib.metadata import version as pkg_version, PackageNotFoundError
 
 from codegraphcontext.server import MCPServer
@@ -111,6 +110,7 @@ def mcp_setup():
     - VS Code, Cursor, Windsurf
     - Claude Desktop, Gemini CLI
     - Cline, RooCode, Amazon Q Developer
+    - OpenCode (prints stdio config + link to vendor docs)
     
     Works with FalkorDB by default (no database setup needed).
     """
@@ -290,19 +290,18 @@ def _load_credentials():
     Uses per-variable precedence - each variable is loaded from the highest priority source.
     Priority order (highest to lowest):
     1. Local `mcp.json` env vars (highest - explicit MCP server config)
-    2. Local `.env` in project directory (high - project-specific overrides)
+    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.
     """
     from dotenv import dotenv_values
-    from codegraphcontext.cli.config_manager import ensure_config_dir
+    from codegraphcontext.cli.config_manager import (
+        ensure_config_dir,
+        codegraphcontext_dotenv_at_cwd,
+    )
     
-    # Capture DATABASE_TYPE from actual shell env BEFORE we load .env files.
-    # If the user ran `DATABASE_TYPE=falkordb cgc …` we must not let
-    # DEFAULT_DATABASE=neo4j in .env steal priority later.
-    shell_db_type = os.environ.get('DATABASE_TYPE')
-    if shell_db_type and not os.environ.get('CGC_RUNTIME_DB_TYPE'):
-        os.environ['CGC_RUNTIME_DB_TYPE'] = shell_db_type
-
     # Ensure config directory exists (lazy initialization)
     ensure_config_dir()
     
@@ -319,14 +318,16 @@ def _load_credentials():
         except Exception as e:
             console.print(f"[yellow]Warning: Could not load global .env: {e}[/yellow]")
     
-    # 2. Local project .env (higher priority - project-specific overrides)
+    # 2. <cwd>/.codegraphcontext/.env only (overrides global when distinct)
     try:
-        dotenv_path = find_dotenv(usecwd=True, raise_error_if_not_found=False)
-        if dotenv_path:
-            config_sources.append(dotenv_values(dotenv_path))
-            config_source_names.append(str(dotenv_path))
+        local_cgc_env = codegraphcontext_dotenv_at_cwd(Path.cwd())
+        if local_cgc_env and local_cgc_env.resolve() != global_env_path.resolve():
+            config_sources.append(dotenv_values(str(local_cgc_env)))
+            config_source_names.append(str(local_cgc_env))
     except Exception as e:
-        console.print(f"[yellow]Warning: Could not load .env from current directory: {e}[/yellow]")
+        console.print(
+            f"[yellow]Warning: Could not load .codegraphcontext/.env at cwd: {e}[/yellow]"
+        )
     
     # 1. Local mcp.json (highest priority - explicit MCP server config)
     mcp_file_path = Path.cwd() / "mcp.json"
@@ -348,9 +349,9 @@ def _load_credentials():
     
     # Apply merged config to environment.
     # IMPORTANT: DB-selection keys set in the shell must win over .env defaults.
-    # E.g. `DATABASE_TYPE=falkordb cgc index …` must not be overridden by
+    # E.g. `DEFAULT_DATABASE=falkordb cgc index …` must not be overridden by
     # DEFAULT_DATABASE=neo4j sitting in ~/.codegraphcontext/.env
-    DB_OVERRIDE_KEYS = {"DATABASE_TYPE", "CGC_RUNTIME_DB_TYPE", "DEFAULT_DATABASE"}
+    DB_OVERRIDE_KEYS = {"CGC_RUNTIME_DB_TYPE", "DEFAULT_DATABASE"}
     for key, value in merged_config.items():
         if value is not None:  # Only set non-None values
             # Never let .env clobber a DB-type key that the user already set in the shell
@@ -369,16 +370,10 @@ def _load_credentials():
     
     
     # Show which database is actually being used.
-    # When DATABASE_TYPE is explicitly set, trust it.  When it's left to auto-
-    # detect, call get_database_manager() so the banner can never lie: e.g. if
-    # falkordblite is installed but its native .so is missing (frozen bundle),
-    # the factory falls back to KùzuDB and we display that correctly.
+    # When CGC_RUNTIME_DB_TYPE or DEFAULT_DATABASE is set, trust it. Otherwise
+    # call get_database_manager() so the banner matches factory fallbacks.
     runtime_db = os.environ.get("CGC_RUNTIME_DB_TYPE")
-    explicit_db = (
-        runtime_db
-        or os.environ.get("DEFAULT_DATABASE")
-        or os.environ.get("DATABASE_TYPE")
-    )
+    explicit_db = runtime_db or os.environ.get("DEFAULT_DATABASE")
 
     if explicit_db:
         default_db = explicit_db.lower()
@@ -416,12 +411,9 @@ def _load_credentials():
         if host:
             console.print(f"[cyan]Using database: FalkorDB Remote ({host})[/cyan]")
         else:
-            console.print("[yellow]⚠ DATABASE_TYPE=falkordb-remote but FALKORDB_HOST not set.[/yellow]")
-    elif default_db == "falkordb":
-        if os.environ.get("FALKORDB_HOST"):
-            console.print(f"[cyan]Using database: FalkorDB Remote ({os.environ.get('FALKORDB_HOST')})[/cyan]")
-        else:
-            console.print("[cyan]Using database: FalkorDB[/cyan]")
+            console.print(
+                "[yellow]⚠ DEFAULT_DATABASE=falkordb-remote but FALKORDB_HOST not set.[/yellow]"
+            )
     else:
         console.print(f"[cyan]Using database: {default_db}[/cyan]")
 
@@ -677,10 +669,12 @@ def bundle_load(
 @app.command("export", rich_help_panel="Bundle Shortcuts")
 def export_shortcut(
     output: str = typer.Argument(..., help="Output path for the .cgc bundle file"),
-    repo: Optional[str] = typer.Option(None, "--repo", "-r", help="Specific repository path to export")
+    repo: Optional[str] = typer.Option(None, "--repo", "-r", help="Specific repository path to export"),
+    no_stats: bool = typer.Option(False, "--no-stats", help="Skip generating statistics in the bundle"),
+    context: Optional[str] = typer.Option(None, "--context", "-c", help="Specific context to use"),
 ):
     """Shortcut for 'cgc bundle export'"""
-    bundle_export(output, repo, False)
+    bundle_export(output, repo, no_stats, context)
 
 @app.command("load", rich_help_panel="Bundle Shortcuts")
 def load_shortcut(
@@ -801,6 +795,7 @@ def doctor():
     
     # 1. Check configuration
     console.print("[bold]1. Checking Configuration...[/bold]")
+    config = {}
     try:
         config = config_manager.load_config()
         

{codegraphcontext-0.4.0 → codegraphcontext-0.4.2}/src/codegraphcontext/cli/registry_commands.py

@@ -17,93 +17,12 @@ console = Console()
 
 GITHUB_ORG = "CodeGraphContext"
 GITHUB_REPO = "CodeGraphContext"
-REGISTRY_API_URL = f"https://api.github.com/repos/{GITHUB_ORG}/{GITHUB_REPO}/releases"
-MANIFEST_URL = f"https://github.com/{GITHUB_ORG}/{GITHUB_REPO}/releases/download/on-demand-bundles/manifest.json"
 
 
 def fetch_available_bundles() -> List[Dict[str, Any]]:
-    """
-    Fetch all available bundles from GitHub Releases.
-    Returns a list of bundle dictionaries with metadata.
-    Preserves all versions - no deduplication.
-    """
-    all_bundles = []
-    
-    try:
-        # 1. Fetch on-demand bundles from manifest
-        try:
-            response = requests.get(MANIFEST_URL, timeout=10)
-            if response.status_code == 200:
-                manifest = response.json()
-                if manifest.get('bundles'):
-                    for bundle in manifest['bundles']:
-                        bundle['source'] = 'on-demand'
-                        # Ensure bundle has a full_name field (with version info)
-                        if 'bundle_name' in bundle:
-                            # Extract full name without .cgc extension
-                            bundle['full_name'] = bundle['bundle_name'].replace('.cgc', '')
-                        all_bundles.append(bundle)
-        except Exception as e:
-            console.print(f"[dim]Note: Could not fetch on-demand bundles: {e}[/dim]")
-        
-        # 2. Fetch weekly pre-indexed bundles
-        try:
-            response = requests.get(REGISTRY_API_URL, timeout=10)
-            if response.status_code == 200:
-                releases = response.json()
-                
-                # Find weekly releases (bundles-YYYYMMDD pattern)
-                weekly_releases = [r for r in releases if r['tag_name'].startswith('bundles-') and r['tag_name'] != 'bundles-latest']
-                
-                if weekly_releases:
-                    # Get the most recent weekly release
-                    latest_weekly = weekly_releases[0]
-                    
-                    for asset in latest_weekly.get('assets', []):
-                        if asset['name'].endswith('.cgc'):
-                            # Full bundle name without extension
-                            full_name = asset['name'].replace('.cgc', '')
-                            
-                            # Parse bundle name
-                            name_parts = full_name.split('-')
-                            bundle = {
-                                'name': name_parts[0],  # Base package name
-                                'full_name': full_name,  # Complete name with version
-                                'repo': f"{name_parts[0]}/{name_parts[0]}",  # Simplified
-                                'bundle_name': asset['name'],
-                                'version': name_parts[1] if len(name_parts) > 1 else 'latest',
-                                'commit': name_parts[2] if len(name_parts) > 2 else 'unknown',
-                                'size': f"{asset['size'] / 1024 / 1024:.1f}MB",
-                                'download_url': asset['browser_download_url'],
-                                'generated_at': asset['updated_at'],
-                                'source': 'weekly'
-                            }
-                            all_bundles.append(bundle)
-        except Exception as e:
-            console.print(f"[dim]Note: Could not fetch weekly bundles: {e}[/dim]")
-        
-        # Normalize all bundles to have required fields
-        for bundle in all_bundles:
-            # Ensure 'name' field exists (base package name)
-            if 'name' not in bundle:
-                repo = bundle.get('repo', '')
-                if '/' in repo:
-                    bundle['name'] = repo.split('/')[-1]
-                else:
-                    # Extract from full_name or bundle_name
-                    full_name = bundle.get('full_name', bundle.get('bundle_name', 'unknown'))
-                    bundle['name'] = full_name.split('-')[0]
-            
-            # Ensure 'full_name' exists
-            if 'full_name' not in bundle:
-                bundle['full_name'] = bundle.get('bundle_name', bundle.get('name', 'unknown')).replace('.cgc', '')
-        
-        # NO DEDUPLICATION - Keep all versions
-        return all_bundles
-    
-    except Exception as e:
-        console.print(f"[bold red]Error fetching bundles: {e}[/bold red]")
-        return []
+    """Fetch all available bundles from GitHub Releases (delegates to core BundleRegistry)."""
+    from ..core.bundle_registry import BundleRegistry
+    return BundleRegistry.fetch_available_bundles()
 
 
 def _get_base_package_name(bundle_name: str) -> str:
@@ -213,6 +132,7 @@ def search_bundles(query: str):
     matching_bundles = [
         b for b in bundles
         if query_lower in b.get('name', '').lower() or
+           query_lower in b.get('full_name', '').lower() or
            query_lower in b.get('repo', '').lower() or
            query_lower in b.get('description', '').lower()
     ]