mcp-code-indexer 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

mcp_code_indexer/__init__.py

@@ -6,7 +6,7 @@ intelligent codebase navigation through searchable file descriptions,
 token-aware overviews, and advanced merge capabilities.
 """
 
-__version__ = "1.4.1"
+__version__ = "1.5.0"
 __author__ = "MCP Code Indexer Contributors"
 __email__ = ""
 __license__ = "MIT"

mcp_code_indexer/database/database.py

@@ -179,6 +179,126 @@ class DatabaseManager:
                     last_accessed=datetime.fromisoformat(row['last_accessed'])
                 )
             return None
+
+    async def find_matching_project(
+        self, 
+        project_name: str, 
+        remote_origin: Optional[str] = None,
+        upstream_origin: Optional[str] = None,
+        folder_path: Optional[str] = None
+    ) -> Optional[Project]:
+        """
+        Find project by matching criteria.
+        
+        Args:
+            project_name: Name of the project
+            remote_origin: Remote origin URL
+            upstream_origin: Upstream origin URL  
+            folder_path: Project folder path
+            
+        Returns:
+            Matching project or None
+        """
+        projects = await self.get_all_projects()
+        normalized_name = project_name.lower()
+        
+        best_match = None
+        best_score = 0
+        
+        for project in projects:
+            score = 0
+            match_factors = []
+            
+            # Check name match (case-insensitive)
+            if project.name.lower() == normalized_name:
+                score += 1
+                match_factors.append("name")
+            
+            # Check remote origin match
+            if remote_origin and project.remote_origin == remote_origin:
+                score += 1
+                match_factors.append("remote_origin")
+            
+            # Check upstream origin match
+            if upstream_origin and project.upstream_origin == upstream_origin:
+                score += 1
+                match_factors.append("upstream_origin")
+            
+            # Check folder path in aliases
+            if folder_path and folder_path in project.aliases:
+                score += 1
+                match_factors.append("folder_path")
+            
+            # Enhanced matching: If name matches and no remote origins are provided,
+            # consider it a strong match to prevent duplicates
+            if (score == 1 and "name" in match_factors and 
+                not remote_origin and not project.remote_origin and
+                not upstream_origin and not project.upstream_origin):
+                logger.info(f"Name-only match with no remotes for project {project.name} - treating as strong match")
+                score = 2  # Boost score to strong match level
+                match_factors.append("no_remotes_boost")
+            
+            # If we have 2+ matches, this is a strong candidate
+            if score >= 2:
+                if score > best_score:
+                    best_score = score
+                    best_match = project
+                    logger.info(f"Strong match for project {project.name} (score: {score}, factors: {match_factors})")
+        
+        return best_match
+
+    async def get_or_create_project(
+        self,
+        project_name: str,
+        folder_path: str,
+        remote_origin: Optional[str] = None,
+        upstream_origin: Optional[str] = None
+    ) -> Project:
+        """
+        Get or create a project using intelligent matching.
+        
+        Args:
+            project_name: Name of the project
+            folder_path: Project folder path
+            remote_origin: Remote origin URL
+            upstream_origin: Upstream origin URL
+            
+        Returns:
+            Existing or newly created project
+        """
+        # Try to find existing project
+        project = await self.find_matching_project(
+            project_name, remote_origin, upstream_origin, folder_path
+        )
+        
+        if project:
+            # Update aliases if folder path not already included
+            if folder_path not in project.aliases:
+                project.aliases.append(folder_path)
+                await self.update_project(project)
+                logger.info(f"Added folder path {folder_path} to project {project.name} aliases")
+            
+            # Update access time
+            await self.update_project_access_time(project.id)
+            return project
+        
+        # Create new project
+        from ..database.models import Project
+        import uuid
+        
+        new_project = Project(
+            id=str(uuid.uuid4()),
+            name=project_name,
+            remote_origin=remote_origin,
+            upstream_origin=upstream_origin,
+            aliases=[folder_path],
+            created=datetime.utcnow(),
+            last_accessed=datetime.utcnow()
+        )
+        
+        await self.create_project(new_project)
+        logger.info(f"Created new project: {new_project.name} ({new_project.id})")
+        return new_project
     
     async def update_project_access_time(self, project_id: str) -> None:
         """Update the last accessed time for a project."""

mcp_code_indexer/git_hook_handler.py

@@ -83,8 +83,9 @@ class GitHookHandler:
             # Get git info from current directory
             project_info = await self._identify_project_from_git()
             
-            # Get git diff
+            # Get git diff and commit message
             git_diff = await self._get_git_diff()
+            commit_message = await self._get_commit_message()
             
             if not git_diff or len(git_diff) > self.config["max_diff_size"]:
                 self.logger.info(f"Skipping git hook update - diff too large or empty")
@@ -102,6 +103,7 @@ class GitHookHandler:
             # Build prompt for OpenRouter
             prompt = self._build_githook_prompt(
                 git_diff, 
+                commit_message,
                 current_overview, 
                 current_descriptions,
                 changed_files
@@ -204,6 +206,24 @@ class GitHookHandler:
                 return diff_result
             except subprocess.CalledProcessError as e:
                 raise GitHookError(f"Failed to get git diff: {e}")
+
+    async def _get_commit_message(self) -> str:
+        """
+        Get the commit message for context about what was changed.
+        
+        Returns:
+            Commit message as string
+        """
+        try:
+            # Get the commit message from the latest commit
+            message_result = await self._run_git_command([
+                "log", "-1", "--pretty=%B"
+            ])
+            return message_result.strip()
+            
+        except subprocess.CalledProcessError:
+            # If no commits exist yet, return empty string
+            return ""
     
     def _extract_changed_files(self, git_diff: str) -> List[str]:
         """
@@ -232,12 +252,12 @@ class GitHookHandler:
     async def _get_project_overview(self, project_info: Dict[str, Any]) -> str:
         """Get current project overview from database."""
         try:
-            # Try to get existing project
-            project = await self.db_manager.get_project(
+            # Try to find existing project
+            project = await self.db_manager.find_matching_project(
                 project_info["projectName"],
-                project_info["folderPath"],
                 project_info.get("remoteOrigin"),
-                project_info.get("upstreamOrigin")
+                project_info.get("upstreamOrigin"),
+                project_info["folderPath"]
             )
             
             if project:
@@ -255,12 +275,12 @@ class GitHookHandler:
     async def _get_all_descriptions(self, project_info: Dict[str, Any]) -> Dict[str, str]:
         """Get all current file descriptions from database."""
         try:
-            # Try to get existing project
-            project = await self.db_manager.get_project(
+            # Try to find existing project
+            project = await self.db_manager.find_matching_project(
                 project_info["projectName"],
-                project_info["folderPath"],
                 project_info.get("remoteOrigin"),
-                project_info.get("upstreamOrigin")
+                project_info.get("upstreamOrigin"),
+                project_info["folderPath"]
             )
             
             if project:
@@ -278,6 +298,7 @@ class GitHookHandler:
     def _build_githook_prompt(
         self, 
         git_diff: str, 
+        commit_message: str,
         overview: str, 
         descriptions: Dict[str, str], 
         changed_files: List[str]
@@ -287,6 +308,7 @@ class GitHookHandler:
         
         Args:
             git_diff: Git diff content
+            commit_message: Commit message explaining the changes
             overview: Current project overview
             descriptions: Current file descriptions
             changed_files: List of changed file paths
@@ -294,7 +316,10 @@ class GitHookHandler:
         Returns:
             Formatted prompt for the API
         """
-        return f"""Analyze this git diff and update the file descriptions and project overview as needed.
+        return f"""Analyze this git commit and update the file descriptions and project overview as needed.
+
+COMMIT MESSAGE:
+{commit_message or "No commit message available"}
 
 CURRENT PROJECT OVERVIEW:
 {overview or "No overview available"}
@@ -310,10 +335,12 @@ CHANGED FILES:
 
 INSTRUCTIONS:
 
-1. **File Descriptions**: Update descriptions for any files that have changed significantly. Only include files that need actual description updates.
+Use the COMMIT MESSAGE to understand the intent and context of the changes. The commit message explains what the developer was trying to accomplish.
+
+1. **File Descriptions**: Update descriptions for any files that have changed significantly. Consider both the diff content and the commit message context. Only include files that need actual description updates.
 
 2. **Project Overview**: Update ONLY if there are major structural changes like:
-   - New major features or components
+   - New major features or components (which may be indicated by commit message)
    - Architectural changes (new patterns, frameworks, or approaches)
    - Significant dependency additions
    - New API endpoints or workflows
@@ -485,22 +512,36 @@ Return ONLY the JSON, no other text."""
             # Update file descriptions
             file_updates = updates.get("file_updates", {})
             for file_path, description in file_updates.items():
-                await self.db_manager.upsert_file_description(
+                from mcp_code_indexer.database.models import FileDescription
+                from datetime import datetime
+                
+                file_desc = FileDescription(
                     project_id=project.id,
                     branch=project_info["branch"],
                     file_path=file_path,
-                    description=description
+                    description=description,
+                    file_hash=None,
+                    last_modified=datetime.utcnow(),
+                    version=1
                 )
+                await self.db_manager.create_file_description(file_desc)
                 self.logger.info(f"Updated description for {file_path}")
             
             # Update project overview if provided
             overview_update = updates.get("overview_update")
             if overview_update and overview_update.strip():
-                await self.db_manager.upsert_project_overview(
+                from mcp_code_indexer.database.models import ProjectOverview
+                from datetime import datetime
+                
+                overview = ProjectOverview(
                     project_id=project.id,
                     branch=project_info["branch"],
-                    overview=overview_update
+                    overview=overview_update,
+                    last_modified=datetime.utcnow(),
+                    total_files=len(file_updates),
+                    total_tokens=len(overview_update.split())
                 )
+                await self.db_manager.create_project_overview(overview)
                 self.logger.info("Updated project overview")
             
         except Exception as e:

mcp_code_indexer/main.py

@@ -510,6 +510,14 @@ async def handle_githook(args: argparse.Namespace) -> None:
         print(f"Git hook error: {e}", file=sys.stderr)
         sys.exit(1)
     finally:
+        # Clean up database connections
+        if 'db_manager' in locals():
+            try:
+                await db_manager.close_pool()
+                logger.debug("Database connections closed")
+            except Exception as e:
+                logger.warning(f"Error closing database connections: {e}")
+        
         logger.info("=== GITHOOK SESSION ENDED ===")
         
         # Close logger handlers to flush any remaining logs

{mcp_code_indexer-1.4.1.dist-info → mcp_code_indexer-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-code-indexer
-Version: 1.4.1
+Version: 1.5.0
 Summary: MCP server that tracks file descriptions across codebases, enabling AI agents to efficiently navigate and understand code through searchable summaries and token-aware overviews.
 Author: MCP Code Indexer Contributors
 Maintainer: MCP Code Indexer Contributors
@@ -57,8 +57,8 @@ Dynamic: requires-python
 
 # MCP Code Indexer 🚀
 
-[![PyPI version](https://badge.fury.io/py/mcp-code-indexer.svg?2)](https://badge.fury.io/py/mcp-code-indexer)
-[![Python](https://img.shields.io/pypi/pyversions/mcp-code-indexer.svg?2)](https://pypi.org/project/mcp-code-indexer/)
+[![PyPI version](https://badge.fury.io/py/mcp-code-indexer.svg?3)](https://badge.fury.io/py/mcp-code-indexer)
+[![Python](https://img.shields.io/pypi/pyversions/mcp-code-indexer.svg?3)](https://pypi.org/project/mcp-code-indexer/)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 A production-ready **Model Context Protocol (MCP) server** that revolutionizes how AI agents navigate and understand codebases. Instead of repeatedly scanning files, agents get instant access to intelligent descriptions, semantic search, and context-aware recommendations.

{mcp_code_indexer-1.4.1.dist-info → mcp_code_indexer-1.5.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-mcp_code_indexer/__init__.py,sha256=NiKQWxFDFIhYEDn_q4vGaSEhBDwKtGiJlbQlxFpTxZo,473
+mcp_code_indexer/__init__.py,sha256=MkcEc96Vu59HUZk8IWIwS4psMwejpOuIvqik9_crg-w,473
 mcp_code_indexer/__main__.py,sha256=4Edinoe0ug43hobuLYcjTmGp2YJnlFYN4_8iKvUBJ0Q,213
 mcp_code_indexer/error_handler.py,sha256=cNSUFFrGBMLDv4qa78c7495L1wSl_dXCRbzCJOidx-Q,11590
 mcp_code_indexer/file_scanner.py,sha256=ctXeZMROgDThEtjzsANTK9TbK-fhTScMBd4iyuleBT4,11734
-mcp_code_indexer/git_hook_handler.py,sha256=kp58PZUEU52H3ReqT84SC-BftwOo9WCjsAM6QHoj9rg,19448
+mcp_code_indexer/git_hook_handler.py,sha256=u_C5zVSDFkagBufgqOPgZHh3ZgvUuDzfqm0BLmCE2Fo,21253
 mcp_code_indexer/logging_config.py,sha256=yCGQD-xx9oobS-YctOFcaE1Q3iiuOj2E6cTfKHbh_wc,7358
-mcp_code_indexer/main.py,sha256=F1Ym1bSyatLk3jr9D2utqYZvWF7zq-bgOWjcmMZkvb4,30193
+mcp_code_indexer/main.py,sha256=e4Peuus4kZt0lc986pCtOz3Kk194rGN6cwsvxTqde28,30512
 mcp_code_indexer/merge_handler.py,sha256=lJR8eVq2qSrF6MW9mR3Fy8UzrNAaQ7RsI2FMNXne3vQ,14692
 mcp_code_indexer/token_counter.py,sha256=WrifOkbF99nWWHlRlhCHAB2KN7qr83GOHl7apE-hJcE,8460
 mcp_code_indexer/data/stop_words_english.txt,sha256=7Zdd9ameVgA6tN_zuXROvHXD4hkWeELVywPhb7FJEkw,6343
 mcp_code_indexer/database/__init__.py,sha256=aPq_aaRp0aSwOBIq9GkuMNjmLxA411zg2vhdrAuHm-w,38
-mcp_code_indexer/database/database.py,sha256=c7-rtj7ZM2w9HcKphSjNccygwnTwDCiret79xbP1Jtg,31000
+mcp_code_indexer/database/database.py,sha256=iVPdKD5HCjPv4AJeO4Uy-pBaYUgJ_a3KzysyCaA4D8s,35446
 mcp_code_indexer/database/models.py,sha256=_vCmJnPXZSiInRzyvs4c7QUWuNNW8qsOoDlGX8J-Gnk,7124
 mcp_code_indexer/middleware/__init__.py,sha256=p-mP0pMsfiU2yajCPvokCUxUEkh_lu4XJP1LyyMW2ug,220
 mcp_code_indexer/middleware/error_middleware.py,sha256=v6jaHmPxf3qerYdb85X1tHIXLxgcbybpitKVakFLQTA,10109
@@ -17,9 +17,9 @@ mcp_code_indexer/server/__init__.py,sha256=16xMcuriUOBlawRqWNBk6niwrvtv_JD5xvI36
 mcp_code_indexer/server/mcp_server.py,sha256=bRl5JTFWlQ0MrIulkts6fDws6kPqfy6kKoQdenMOk04,61290
 mcp_code_indexer/tiktoken_cache/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 mcp_code_indexer/tools/__init__.py,sha256=m01mxML2UdD7y5rih_XNhNSCMzQTz7WQ_T1TeOcYlnE,49
-mcp_code_indexer-1.4.1.dist-info/licenses/LICENSE,sha256=JN9dyPPgYwH9C-UjYM7FLNZjQ6BF7kAzpF3_4PwY4rY,1086
-mcp_code_indexer-1.4.1.dist-info/METADATA,sha256=teVJB_nIJwLXbUEui2qlYSXmPaGKRO-B32xyHluZSh0,16721
-mcp_code_indexer-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_code_indexer-1.4.1.dist-info/entry_points.txt,sha256=8HqWOw1Is7jOP1bvIgaSwouvT9z_Boe-9hd4NzyJOhY,68
-mcp_code_indexer-1.4.1.dist-info/top_level.txt,sha256=yKYCM-gMGt-cnupGfAhnZaoEsROLB6DQ1KFUuyKx4rw,17
-mcp_code_indexer-1.4.1.dist-info/RECORD,,
+mcp_code_indexer-1.5.0.dist-info/licenses/LICENSE,sha256=JN9dyPPgYwH9C-UjYM7FLNZjQ6BF7kAzpF3_4PwY4rY,1086
+mcp_code_indexer-1.5.0.dist-info/METADATA,sha256=yTD1vbKGaJ8RGmFL4SsRYZj1mwB4Wls5_FHz2YwISTM,16721
+mcp_code_indexer-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_code_indexer-1.5.0.dist-info/entry_points.txt,sha256=8HqWOw1Is7jOP1bvIgaSwouvT9z_Boe-9hd4NzyJOhY,68
+mcp_code_indexer-1.5.0.dist-info/top_level.txt,sha256=yKYCM-gMGt-cnupGfAhnZaoEsROLB6DQ1KFUuyKx4rw,17
+mcp_code_indexer-1.5.0.dist-info/RECORD,,