mcp-code-indexer 1.0.3__py3-none-any.whl → 1.0.5__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.0.3"
+__version__ = "1.0.5"
 __author__ = "MCP Code Indexer Contributors"
 __email__ = ""
 __license__ = "MIT"

mcp_code_indexer/file_scanner.py

@@ -338,7 +338,7 @@ class FileScanner:
         Get statistics about the project directory.
         
         Returns:
-            Dictionary with project statistics
+            Dictionary with project statistics for trackable files only
         """
         stats = {
             'total_files': 0,
@@ -349,8 +349,17 @@ class FileScanner:
         }
         
         try:
+            all_files_count = 0
             for file_path in self._walk_directory():
-                stats['total_files'] += 1
+                all_files_count += 1
+                
+                # Check if trackable first
+                if self.should_ignore_file(file_path):
+                    stats['ignored_files'] += 1
+                    continue
+                
+                # Only process trackable files for detailed stats
+                stats['trackable_files'] += 1
                 
                 # Track file size
                 try:
@@ -359,15 +368,12 @@ class FileScanner:
                 except OSError:
                     pass
                 
-                # Track extensions
+                # Track extensions for trackable files only
                 ext = file_path.suffix.lower()
                 stats['file_extensions'][ext] = stats['file_extensions'].get(ext, 0) + 1
-                
-                # Check if trackable
-                if self.should_ignore_file(file_path):
-                    stats['ignored_files'] += 1
-                else:
-                    stats['trackable_files'] += 1
+            
+            # Total files is just trackable files
+            stats['total_files'] = stats['trackable_files']
         
         except Exception as e:
             logger.error(f"Error getting project stats: {e}")

mcp_code_indexer/server/mcp_server.py

@@ -16,6 +16,7 @@ from typing import Any, Dict, List, Optional
 from mcp import types
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
+from pydantic import ValidationError
 
 from mcp_code_indexer.database.database import DatabaseManager
 from mcp_code_indexer.file_scanner import FileScanner
@@ -651,54 +652,146 @@ class MCPCodeIndexServer:
                 **result
             }
     
+    async def _run_session_with_retry(self, read_stream, write_stream, initialization_options) -> None:
+        """Run a single MCP session with error handling and retry logic."""
+        max_retries = 3
+        base_delay = 1.0  # seconds
+        
+        for attempt in range(max_retries + 1):
+            try:
+                logger.info(f"Starting MCP server protocol session (attempt {attempt + 1})...")
+                await self.server.run(
+                    read_stream,
+                    write_stream, 
+                    initialization_options
+                )
+                logger.info("MCP server session completed normally")
+                return  # Success, exit retry loop
+                
+            except ValidationError as e:
+                # Handle malformed requests gracefully
+                logger.warning(f"Received malformed request (attempt {attempt + 1}): {e}", extra={
+                    "structured_data": {
+                        "error_type": "ValidationError",
+                        "validation_errors": e.errors() if hasattr(e, 'errors') else str(e),
+                        "attempt": attempt + 1,
+                        "max_retries": max_retries
+                    }
+                })
+                
+                if attempt < max_retries:
+                    delay = base_delay * (2 ** attempt)  # Exponential backoff
+                    logger.info(f"Retrying in {delay} seconds...")
+                    await asyncio.sleep(delay)
+                else:
+                    logger.error("Max retries exceeded for validation errors. Server will continue but this session failed.")
+                    return
+                    
+            except (ConnectionError, BrokenPipeError, EOFError) as e:
+                # Handle client disconnection gracefully
+                logger.info(f"Client disconnected: {e}")
+                return
+                
+            except Exception as e:
+                # Handle other exceptions with full logging
+                import traceback
+                if "unhandled errors in a TaskGroup" in str(e) and "ValidationError" in str(e):
+                    # This is likely a ValidationError wrapped in a TaskGroup exception
+                    logger.warning(f"Detected wrapped validation error (attempt {attempt + 1}): {e}", extra={
+                        "structured_data": {
+                            "error_type": type(e).__name__, 
+                            "error_message": str(e),
+                            "attempt": attempt + 1,
+                            "max_retries": max_retries,
+                            "likely_validation_error": True
+                        }
+                    })
+                    
+                    if attempt < max_retries:
+                        delay = base_delay * (2 ** attempt)
+                        logger.info(f"Retrying in {delay} seconds...")
+                        await asyncio.sleep(delay)
+                    else:
+                        logger.error("Max retries exceeded for validation errors. Server will continue but this session failed.")
+                        return
+                else:
+                    # This is a genuine error, log and re-raise
+                    logger.error(f"MCP server session error: {e}", extra={
+                        "structured_data": {
+                            "error_type": type(e).__name__, 
+                            "error_message": str(e),
+                            "traceback": traceback.format_exc()
+                        }
+                    })
+                    raise
+
     async def run(self) -> None:
-        """Run the MCP server."""
+        """Run the MCP server with robust error handling."""
         logger.info("Starting server initialization...")
         await self.initialize()
         logger.info("Server initialization completed, starting MCP protocol...")
         
-        try:
-            async with stdio_server() as (read_stream, write_stream):
-                logger.info("stdio_server context established")
-                initialization_options = self.server.create_initialization_options()
-                logger.debug(f"Initialization options: {initialization_options}")
+        max_retries = 5
+        base_delay = 2.0  # seconds
+        
+        for attempt in range(max_retries + 1):
+            try:
+                async with stdio_server() as (read_stream, write_stream):
+                    logger.info(f"stdio_server context established (attempt {attempt + 1})")
+                    initialization_options = self.server.create_initialization_options()
+                    logger.debug(f"Initialization options: {initialization_options}")
+                    
+                    await self._run_session_with_retry(read_stream, write_stream, initialization_options)
+                    return  # Success, exit retry loop
+                        
+            except KeyboardInterrupt:
+                logger.info("Server stopped by user interrupt")
+                return
                 
-                try:
-                    logger.info("Starting MCP server protocol session...")
-                    await self.server.run(
-                        read_stream,
-                        write_stream, 
-                        initialization_options
-                    )
-                    logger.info("MCP server session completed normally")
-                except Exception as e:
-                    # Log the error with full traceback for debugging
-                    import traceback
-                    logger.error(f"MCP server session error: {e}", extra={
+            except Exception as e:
+                import traceback
+                
+                # Check if this is a wrapped validation error
+                error_str = str(e)
+                is_validation_error = (
+                    "ValidationError" in error_str or 
+                    "Field required" in error_str or 
+                    "Input should be" in error_str or
+                    "pydantic_core._pydantic_core.ValidationError" in error_str
+                )
+                
+                if is_validation_error:
+                    logger.warning(f"Detected validation error in session (attempt {attempt + 1}): Malformed client request", extra={
+                        "structured_data": {
+                            "error_type": "ValidationError", 
+                            "error_message": "Client sent malformed request (likely missing clientInfo)",
+                            "attempt": attempt + 1,
+                            "max_retries": max_retries,
+                            "will_retry": attempt < max_retries
+                        }
+                    })
+                    
+                    if attempt < max_retries:
+                        delay = base_delay * (2 ** min(attempt, 3))  # Cap exponential growth
+                        logger.info(f"Retrying server in {delay} seconds...")
+                        await asyncio.sleep(delay)
+                        continue
+                    else:
+                        logger.warning("Max retries exceeded for validation errors. Server is robust against malformed requests.")
+                        return
+                else:
+                    # This is a genuine fatal error
+                    logger.error(f"Fatal server error: {e}", extra={
                         "structured_data": {
                             "error_type": type(e).__name__, 
                             "error_message": str(e),
                             "traceback": traceback.format_exc()
                         }
                     })
-                    # Re-raise to let the MCP framework handle protocol-level errors
                     raise
-                    
-        except KeyboardInterrupt:
-            logger.info("Server stopped by user interrupt")
-        except Exception as e:
-            import traceback
-            logger.error(f"Fatal server error: {e}", extra={
-                "structured_data": {
-                    "error_type": type(e).__name__, 
-                    "error_message": str(e),
-                    "traceback": traceback.format_exc()
-                }
-            })
-            raise
-        finally:
-            # Clean shutdown
-            await self.shutdown()
+        
+        # Clean shutdown
+        await self.shutdown()
     
     async def shutdown(self) -> None:
         """Clean shutdown of server resources."""

{mcp_code_indexer-1.0.3.dist-info → mcp_code_indexer-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-code-indexer
-Version: 1.0.3
+Version: 1.0.5
 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

{mcp_code_indexer-1.0.3.dist-info → mcp_code_indexer-1.0.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-mcp_code_indexer/__init__.py,sha256=ofXDjKUt-BX9vnnbzqbW-ocPaO9dDlkSb55Atk7uzA0,473
+mcp_code_indexer/__init__.py,sha256=PUkiM7VGRk7n2B_Ma0fzZWC0wmHCjyE15wxsvU9I54E,473
 mcp_code_indexer/error_handler.py,sha256=cNSUFFrGBMLDv4qa78c7495L1wSl_dXCRbzCJOidx-Q,11590
-mcp_code_indexer/file_scanner.py,sha256=1Z6wq7H14V1OMAHIF4v9G7SY8hC1puDmU5IXsCKH4kU,11442
+mcp_code_indexer/file_scanner.py,sha256=ctXeZMROgDThEtjzsANTK9TbK-fhTScMBd4iyuleBT4,11734
 mcp_code_indexer/logging_config.py,sha256=5L1cYIG8IAX91yCjc5pzkbO_KPt0bvm_ABHB53LBZjI,5184
 mcp_code_indexer/main.py,sha256=Rou-mAN9-12PPP8jC7dIs2_UNambJuC2F8BF--j-0m8,3715
 mcp_code_indexer/merge_handler.py,sha256=lJR8eVq2qSrF6MW9mR3Fy8UzrNAaQ7RsI2FMNXne3vQ,14692
@@ -11,12 +11,12 @@ mcp_code_indexer/database/models.py,sha256=3wOxHKb6j3zKPWFSwB5g1TLpI507vLNZcqsxZ
 mcp_code_indexer/middleware/__init__.py,sha256=p-mP0pMsfiU2yajCPvokCUxUEkh_lu4XJP1LyyMW2ug,220
 mcp_code_indexer/middleware/error_middleware.py,sha256=v6jaHmPxf3qerYdb85X1tHIXLxgcbybpitKVakFLQTA,10109
 mcp_code_indexer/server/__init__.py,sha256=16xMcuriUOBlawRqWNBk6niwrvtv_JD5xvI36X1Vsmk,41
-mcp_code_indexer/server/mcp_server.py,sha256=tdBORkihjnWrAXXQVidwq9JNB9hrvR3brym0qfdNgvQ,35132
+mcp_code_indexer/server/mcp_server.py,sha256=Ok4nrwkRNLGmHTEeW-Ij00gVMMRtS5aX-Hi-lUot5bg,39900
 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.0.3.dist-info/licenses/LICENSE,sha256=JN9dyPPgYwH9C-UjYM7FLNZjQ6BF7kAzpF3_4PwY4rY,1086
-mcp_code_indexer-1.0.3.dist-info/METADATA,sha256=yASw5zg4MI23XClkWmle327l1Sm6M_L2QDfGS5Km7M8,11930
-mcp_code_indexer-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_code_indexer-1.0.3.dist-info/entry_points.txt,sha256=8HqWOw1Is7jOP1bvIgaSwouvT9z_Boe-9hd4NzyJOhY,68
-mcp_code_indexer-1.0.3.dist-info/top_level.txt,sha256=yKYCM-gMGt-cnupGfAhnZaoEsROLB6DQ1KFUuyKx4rw,17
-mcp_code_indexer-1.0.3.dist-info/RECORD,,
+mcp_code_indexer-1.0.5.dist-info/licenses/LICENSE,sha256=JN9dyPPgYwH9C-UjYM7FLNZjQ6BF7kAzpF3_4PwY4rY,1086
+mcp_code_indexer-1.0.5.dist-info/METADATA,sha256=JnsvZ1a4k6FP_wulSZAwm6kgB3FNuNRPWaG0HMVHd4o,11930
+mcp_code_indexer-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_code_indexer-1.0.5.dist-info/entry_points.txt,sha256=8HqWOw1Is7jOP1bvIgaSwouvT9z_Boe-9hd4NzyJOhY,68
+mcp_code_indexer-1.0.5.dist-info/top_level.txt,sha256=yKYCM-gMGt-cnupGfAhnZaoEsROLB6DQ1KFUuyKx4rw,17
+mcp_code_indexer-1.0.5.dist-info/RECORD,,