codegraphcontext 0.2.0__tar.gz → 0.2.2__tar.gz

{codegraphcontext-0.2.0/src/codegraphcontext.egg-info → codegraphcontext-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext
-Version: 0.2.0
+Version: 0.2.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
@@ -146,7 +146,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 ---
 
 ## Project Details
-- **Version:** 0.2.0
+- **Version:** 0.2.2
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -271,7 +271,7 @@ Use CodeGraphContext as a **powerful command-line toolkit** for code analysis:
 
 #### 🤖 Mode 2: MCP Server (AI-Powered)
 Use CodeGraphContext as an **MCP server** for AI assistants:
-- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, etc.)
+- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, Kiro, etc.)
 - Let AI agents query your codebase using natural language
 - Automatic code understanding and relationship analysis
 - Perfect for AI-assisted development workflows
@@ -371,6 +371,7 @@ cgc help
     *   Cline
     *   RooCode
     *   Amazon Q Developer
+    *   Kiro
 
     Upon successful configuration, `cgc mcp setup` will generate and place the necessary configuration files:
     *   It creates an `mcp.json` file in your current directory for reference.

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/README.md

@@ -84,7 +84,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 ---
 
 ## Project Details
-- **Version:** 0.2.0
+- **Version:** 0.2.2
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -209,7 +209,7 @@ Use CodeGraphContext as a **powerful command-line toolkit** for code analysis:
 
 #### 🤖 Mode 2: MCP Server (AI-Powered)
 Use CodeGraphContext as an **MCP server** for AI assistants:
-- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, etc.)
+- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, Kiro, etc.)
 - Let AI agents query your codebase using natural language
 - Automatic code understanding and relationship analysis
 - Perfect for AI-assisted development workflows
@@ -309,6 +309,7 @@ cgc help
     *   Cline
     *   RooCode
     *   Amazon Q Developer
+    *   Kiro
 
     Upon successful configuration, `cgc mcp setup` will generate and place the necessary configuration files:
     *   It creates an `mcp.json` file in your current directory for reference.

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codegraphcontext"
-version = "0.2.0"
+version = "0.2.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"

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/cli/config_manager.py

@@ -92,9 +92,9 @@ def load_config() -> Dict[str, str]:
     1. Environment variables
     2. Local .env file (in current or parent directories)
     3. Global ~/.codegraphcontext/.env
-    """
-    ensure_config_dir()
     
+    Note: Does NOT create config directory - caller must call ensure_config_dir() first if needed.
+    """
     # Start with defaults
     config = DEFAULT_CONFIG.copy()
     
@@ -160,12 +160,15 @@ def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
     """
     Save configuration to file.
     If preserve_db_credentials is True, existing database credentials will be preserved.
+    If preserve_db_credentials is False, credentials from config dict will be written.
     """
     ensure_config_dir()
     
-    # Load existing config to preserve database credentials
-    existing_config = {}
+    # Determine which credentials to write
+    credentials_to_write = {}
+    
     if preserve_db_credentials and CONFIG_FILE.exists():
+        # Load existing credentials from file to preserve them
         try:
             with open(CONFIG_FILE, "r") as f:
                 for line in f:
@@ -174,9 +177,14 @@ def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
                         key, value = line.split("=", 1)
                         key = key.strip()
                         if key in DATABASE_CREDENTIAL_KEYS:
-                            existing_config[key] = value.strip()
+                            credentials_to_write[key] = value.strip()
         except Exception:
             pass
+    else:
+        # Use credentials from the config dict being passed in
+        for key in DATABASE_CREDENTIAL_KEYS:
+            if key in config:
+                credentials_to_write[key] = config[key]
     
     try:
         with open(CONFIG_FILE, "w") as f:
@@ -184,11 +192,11 @@ def save_config(config: Dict[str, str], preserve_db_credentials: bool = True):
             f.write(f"# Location: {CONFIG_FILE}\n\n")
             
             # Write database credentials first if they exist
-            if existing_config:
+            if credentials_to_write:
                 f.write("# ===== Database Credentials =====\n")
                 for key in sorted(DATABASE_CREDENTIAL_KEYS):
-                    if key in existing_config:
-                        f.write(f"{key}={existing_config[key]}\n")
+                    if key in credentials_to_write:
+                        f.write(f"{key}={credentials_to_write[key]}\n")
                 f.write("\n")
             
             # Write configuration settings
@@ -296,6 +304,9 @@ def get_config_value(key: str) -> Optional[str]:
 
 def set_config_value(key: str, value: str) -> bool:
     """Set a configuration value. Returns True if successful."""
+    # Ensure config directory exists
+    ensure_config_dir()
+    
     # Validate
     is_valid, error_msg = validate_config_value(key, value)
     if not is_valid:
@@ -313,6 +324,7 @@ def set_config_value(key: str, value: str) -> bool:
 
 def reset_config():
     """Reset configuration to defaults (preserves database credentials)."""
+    ensure_config_dir()
     save_config(DEFAULT_CONFIG.copy(), preserve_db_credentials=True)
     console.print("[green]✅ Configuration reset to defaults[/green]")
     console.print("[cyan]Note: Database credentials were preserved[/cyan]")

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/cli/main.py

@@ -199,6 +199,9 @@ def neo4j_setup_alias():
     neo4j_setup()
 
 
+# ============================================================================
+# CREDENTIALS LOADING PRECEDENCE
+# ============================================================================
 
 def _load_credentials():
     """
@@ -210,6 +213,10 @@ def _load_credentials():
     3. Global `~/.codegraphcontext/.env` (lowest - user defaults)
     """
     from dotenv import dotenv_values
+    from codegraphcontext.cli.config_manager import ensure_config_dir
+    
+    # Ensure config directory exists (lazy initialization)
+    ensure_config_dir()
     
     # Collect all config sources in reverse priority order (lowest to highest)
     config_sources = []
@@ -287,8 +294,6 @@ def _load_credentials():
     else:
         console.print("[cyan]Using database: FalkorDB[/cyan]")
 
-
-
 # ============================================================================
 # CONFIG COMMAND GROUP
 # ============================================================================
@@ -655,7 +660,13 @@ def doctor():
     console.print("[bold]1. Checking Configuration...[/bold]")
     try:
         config = config_manager.load_config()
-        console.print(f"   [green]✓[/green] Configuration loaded from {config_manager.CONFIG_FILE}")
+        
+        # Check if config file actually exists
+        if config_manager.CONFIG_FILE.exists():
+            console.print(f"   [green]✓[/green] Configuration loaded from {config_manager.CONFIG_FILE}")
+        else:
+            console.print(f"   [yellow]ℹ[/yellow] No config file found, using defaults")
+            console.print(f"   [dim]Config will be created at: {config_manager.CONFIG_FILE}[/dim]")
         
         # Validate each config value
         invalid_configs = []
@@ -1332,7 +1343,7 @@ def find_by_content_search(
             results = code_finder.find_by_content(query)
         except Exception as e:
             error_msg = str(e).lower()
-            if 'fulltext' in error_msg or 'db.index.fulltext' in error_msg:
+            if ('fulltext' in error_msg or 'db.index.fulltext' in error_msg) and "Falkor" in db_manager.__class__.__name__:
                 console.print("\n[bold red]❌ Full-text search is not supported on FalkorDB[/bold red]\n")
                 console.print("[yellow]💡 You have two options:[/yellow]\n")
                 console.print("  1. [cyan]Switch to Neo4j:[/cyan]")
@@ -2047,9 +2058,12 @@ def cypher_legacy(query: str = typer.Argument(..., help="The read-only Cypher qu
 # ============================================================================
 
 @app.command("i", rich_help_panel="Shortcuts")
-def index_abbrev(path: Optional[str] = typer.Argument(None, help="Path to index")):
+def index_abbrev(
+    path: Optional[str] = typer.Argument(None, help="Path to index"),
+    force: bool = typer.Option(False, "--force", "-f", help="Force re-index (delete existing and rebuild)")
+):
     """Shortcut for 'cgc index'"""
-    index(path)
+    index(path, force=force)
 
 @app.command("ls", rich_help_panel="Shortcuts")
 def list_abbrev():

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/cli/setup_macos.py

@@ -25,7 +25,7 @@ def _set_initial_password(new_pw: str, run_command, console) -> bool:
     ]
     return run_command(cmd, console, check=False) is not None
 
-def setup_macos_binary(console, prompt, run_command, _generate_mcp_json):
+def setup_macos_binary(console, prompt, run_command, _save_neo4j_credentials):
     """Automates Neo4j install & config on macOS via Homebrew."""
     os_name = platform.system()
     console.print(f"Detected Operating System: [bold yellow]{os_name}[/bold yellow]")
@@ -89,7 +89,5 @@ def setup_macos_binary(console, prompt, run_command, _generate_mcp_json):
         return
 
     creds = {"uri": "neo4j://localhost:7687", "username": "neo4j", "password": new_password}
-    _generate_mcp_json(creds)
+    _save_neo4j_credentials(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.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/cli/setup_wizard.py

@@ -19,6 +19,39 @@ DEFAULT_NEO4J_USERNAME = "neo4j"
 DEFAULT_NEO4J_BOLT_PORT = 7687
 DEFAULT_NEO4J_HTTP_PORT = 7474
 
+def _save_neo4j_credentials(creds):
+    """
+    Save Neo4j credentials to .env file (database setup only).
+    Does NOT generate MCP config or configure IDE.
+    """
+    from codegraphcontext.cli.config_manager import load_config, save_config, ensure_config_dir
+    
+    ensure_config_dir()
+    
+    # Load existing config (or defaults if no file exists)
+    config = load_config()
+    
+    # Update Neo4j credentials
+    config["NEO4J_URI"] = creds.get('uri', '')
+    config["NEO4J_USERNAME"] = creds.get('username', 'neo4j')
+    config["NEO4J_PASSWORD"] = creds.get('password', '')
+    
+    # Set default database to neo4j
+    config["DEFAULT_DATABASE"] = "neo4j"
+    
+    # Save config (preserves all other settings)
+    save_config(config, preserve_db_credentials=False)
+    
+    console.print("\n[bold green]✅ Neo4j setup complete![/bold green]")
+    console.print(f"[cyan]📝 Credentials saved to ~/.codegraphcontext/.env[/cyan]")
+    console.print(f"[cyan]🔧 Default database set to 'neo4j'[/cyan]")
+    console.print("\n[dim]You can now use cgc commands with Neo4j:[/dim]")
+    console.print("[dim]  • cgc index .          - Index your code[/dim]")
+    console.print("[dim]  • cgc find function    - Search your codebase[/dim]")
+    console.print("\n[dim]To use cgc as an MCP server in your IDE, run:[/dim]")
+    console.print("[dim]  cgc mcp setup[/dim]")
+
+
 def _generate_mcp_json(creds):
     """Generates and prints the MCP JSON configuration."""
     cgc_path = shutil.which("cgc") or sys.executable
@@ -69,15 +102,8 @@ def _generate_mcp_json(creds):
         json.dump(mcp_config, f, indent=2)
     console.print(f"\n[cyan]For your convenience, the configuration has also been saved to: {mcp_file}[/cyan]")
 
-    # Also save to a .env file for convenience
-    env_file = Path.home() / ".codegraphcontext" / ".env"
-    env_file.parent.mkdir(parents=True, exist_ok=True)
-    with open(env_file, "w") as f:
-        f.write(f"NEO4J_URI={creds.get('uri', '')}\n")
-        f.write(f"NEO4J_USERNAME={creds.get('username', 'neo4j')}\n")
-        f.write(f"NEO4J_PASSWORD={creds.get('password', '')}\n")
-
-    console.print(f"[cyan]Neo4j credentials also saved to: {env_file}[/cyan]")
+    # Also save credentials to .env using the proper function
+    _save_neo4j_credentials(creds)
     _configure_ide(mcp_config)
 
 
@@ -114,7 +140,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)?",
+            "message": "Automatically configure your IDE/CLI (VS Code, Cursor, Windsurf, Claude, Gemini, Cline, RooCode, ChatGPT Codex, Amazon Q Developer, Aider, Kiro)?",
             "name": "configure_ide",
             "default": True,
         }
@@ -128,7 +154,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", "None of the above"],
+            "choices": ["VS Code", "Cursor", "Windsurf", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "RooCode", "Amazon Q Developer", "JetBrainsAI", "Aider", "Kiro", "None of the above"],
             "name": "ide_choice",
         }
     ]
@@ -140,7 +166,7 @@ def _configure_ide(mcp_config):
         return
 
 
-    if ide_choice in ["VS Code", "Cursor/CLI", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "Windsurf", "RooCode", "Amazon Q Developer , JetBrainsAI", "Aider"]:
+    if ide_choice in ["VS Code", "Cursor/CLI", "Claude code", "Gemini CLI", "ChatGPT Codex", "Cline", "Windsurf", "RooCode", "Amazon Q Developer , JetBrainsAI", "Aider", "Kiro"]:
         console.print(f"\n[bold cyan]Configuring for {ide_choice}...[/bold cyan]")
 
         if ide_choice == "Amazon Q Developer":
@@ -198,6 +224,11 @@ def _configure_ide(mcp_config):
                 Path.home() / "Library" / "Application Support" / "aider" / "settings.json",
                 Path.home() / "AppData" / "Roaming" / "aider" / "settings.json",
                 Path.home() / ".config" / "Aider" / "User" / "settings.json",
+            ],
+            "Kiro": [
+                Path.home() / ".kiro" / "settings" / "mcp.json",                                   # macOS / Linux / Windows (user-level global)
+                Path.home() / ".config" / "kiro" / "settings" / "mcp.json",                         # Linux (XDG config)
+                Path.home() / "AppData" / "Roaming" / "Kiro" / "settings" / "mcp.json",             # Windows
             ]
         }
 
@@ -540,7 +571,7 @@ def setup_existing_db():
 
 
     if creds.get("uri") and creds.get("password"):
-        _generate_mcp_json(creds)
+        _save_neo4j_credentials(creds)
     else:
         console.print("[red]❌ Incomplete credentials. Please try again.[/red]")
 
@@ -658,7 +689,7 @@ def setup_hosted_db():
 
 
     if creds.get("uri") and creds.get("password"):
-        _generate_mcp_json(creds)
+        _save_neo4j_credentials(creds)
     else:
         console.print("[red]❌ Incomplete credentials. Please try again.[/red]")
 
@@ -681,7 +712,7 @@ def setup_local_db():
         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)
+            setup_macos_binary(console, prompt, run_command, _save_neo4j_credentials)
         else:
             setup_local_binary()
 
@@ -829,7 +860,7 @@ volumes:
                 "password": password
             }
 
-            _generate_mcp_json(creds)
+            _save_neo4j_credentials(creds)
             
             console.print("\n[bold green]🎉 Setup complete![/bold green]")
             console.print("Neo4j is running at:")
@@ -924,5 +955,5 @@ def setup_local_binary():
         "username": "neo4j",
         "password": new_password
     }
-    _generate_mcp_json(creds)
+    _save_neo4j_credentials(creds)
     console.print("\n[bold green]All done! Your local Neo4j instance is ready to use.[/bold green]")

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/core/database.py

@@ -178,8 +178,12 @@ class DatabaseManager:
             try:
                 # Extract host and port from URI
                 host_port = uri.split('://')[1]
-                host = host_port.split(':')[0]
-                port = int(host_port.split(':')[1])
+                if ':' in host_port:
+                    host = host_port.split(':')[0]
+                    port = int(host_port.split(':')[1])
+                else:
+                    host = host_port
+                    port = 7687 # Default Neo4j port
                 
                 # Test socket connection
                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/tools/code_finder.py

@@ -84,13 +84,14 @@ class CodeFinder:
                 CALL db.index.fulltext.queryNodes("code_search_index", $search_term) YIELD node, score
                 WITH node, score
                 WHERE node:Function OR node:Class OR node:Variable
+                MATCH (node)<-[:CONTAINS]-(f:File)
                 RETURN
                     CASE 
                         WHEN node:Function THEN 'function'
                         WHEN node:Class THEN 'class'
                         ELSE 'variable' 
                     END as type,
-                    node.name as name, node.path as path,
+                    node.name as name, f.path as path,
                     node.line_number as line_number, node.source as source,
                     node.docstring as docstring, node.is_dependency as is_dependency
                 ORDER BY score DESC

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2}/src/codegraphcontext/tools/graph_builder.py

@@ -277,7 +277,12 @@ class GraphBuilder:
             """, path=file_path_str, name=file_name, relative_path=relative_path, is_dependency=is_dependency)
 
             file_path_obj = Path(file_path_str)
-            repo_path_obj = Path(repo_result['path'])
+            if repo_result:
+                repo_path_obj = Path(repo_result['path'])
+            else:
+                # Fallback to the path we queried for
+                warning_logger(f"Repository node not found for {file_data['repo_path']} during indexing of {file_name}. Using original path.")
+                repo_path_obj = Path(file_data['repo_path']).resolve()
             
             relative_path_to_file = file_path_obj.relative_to(repo_path_obj)
             

{codegraphcontext-0.2.0 → codegraphcontext-0.2.2/src/codegraphcontext.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext
-Version: 0.2.0
+Version: 0.2.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
@@ -146,7 +146,7 @@ A powerful **MCP server** and **CLI toolkit** that indexes local code into a gra
 ---
 
 ## Project Details
-- **Version:** 0.2.0
+- **Version:** 0.2.2
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -271,7 +271,7 @@ Use CodeGraphContext as a **powerful command-line toolkit** for code analysis:
 
 #### 🤖 Mode 2: MCP Server (AI-Powered)
 Use CodeGraphContext as an **MCP server** for AI assistants:
-- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, etc.)
+- Connect to AI IDEs (VS Code, Cursor, Windsurf, Claude, Kiro, etc.)
 - Let AI agents query your codebase using natural language
 - Automatic code understanding and relationship analysis
 - Perfect for AI-assisted development workflows
@@ -371,6 +371,7 @@ cgc help
     *   Cline
     *   RooCode
     *   Amazon Q Developer
+    *   Kiro
 
     Upon successful configuration, `cgc mcp setup` will generate and place the necessary configuration files:
     *   It creates an `mcp.json` file in your current directory for reference.