tree-sitter-analyzer 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

tree_sitter_analyzer/mcp/server.py

@@ -138,8 +138,21 @@ class TreeSitterAnalyzerMCPServer:
         include_complexity = arguments.get("include_complexity", True)
         include_details = arguments.get("include_details", False)
 
+        # Resolve relative path against project root for consistent behavior
+        import os
+
+        base_root = getattr(
+            getattr(self.security_validator, "boundary_manager", None),
+            "project_root",
+            None,
+        )
+        if not os.path.isabs(file_path) and base_root:
+            resolved_path = os.path.realpath(os.path.join(base_root, file_path))
+        else:
+            resolved_path = file_path
+
         # Security validation
-        is_valid, error_msg = self.security_validator.validate_file_path(file_path)
+        is_valid, error_msg = self.security_validator.validate_file_path(resolved_path)
         if not is_valid:
             raise ValueError(f"Invalid file path: {error_msg}")
 
@@ -150,16 +163,16 @@ class TreeSitterAnalyzerMCPServer:
         from ..language_detector import detect_language_from_file
 
         # Validate file exists
-        if not Path(file_path).exists():
+        if not Path(resolved_path).exists():
             raise FileNotFoundError(f"File not found: {file_path}")
 
         # Detect language if not specified
         if not language:
-            language = detect_language_from_file(file_path)
+            language = detect_language_from_file(resolved_path)
 
         # Create analysis request
         request = AnalysisRequest(
-            file_path=file_path,
+            file_path=resolved_path,
             language=language,
             include_complexity=include_complexity,
             include_details=include_details,
@@ -332,8 +345,13 @@ class TreeSitterAnalyzerMCPServer:
                 # Validate file path security
                 if "file_path" in arguments:
                     file_path = arguments["file_path"]
-                    if not self.security_validator.validate_file_path(file_path):
-                        raise ValueError(f"Invalid or unsafe file path: {file_path}")
+                    is_valid, error_msg = self.security_validator.validate_file_path(
+                        file_path
+                    )
+                    if not is_valid:
+                        raise ValueError(
+                            f"Invalid or unsafe file path: {error_msg or file_path}"
+                        )
 
                 # Handle tool calls with simplified parameter handling
                 if name == "check_code_scale":
@@ -467,9 +485,12 @@ class TreeSitterAnalyzerMCPServer:
                 logger.info("Client requested prompts list (returning empty)")
                 return []
 
-        except Exception:
-            # If Prompt type is unavailable, it's safe to ignore
-            pass
+        except Exception as e:
+            # If Prompt type is unavailable, log at debug level and continue safely
+            try:
+                logger.debug(f"Prompts API unavailable or incompatible: {e}")
+            except (ValueError, OSError):
+                pass
 
         self.server = server
         try:

tree_sitter_analyzer/mcp/tools/read_partial_tool.py

@@ -7,6 +7,7 @@ allowing selective content extraction with line and column range support.
 """
 
 import json
+import os
 from pathlib import Path
 from typing import Any
 
@@ -29,6 +30,7 @@ class ReadPartialTool:
     def __init__(self, project_root: str = None) -> None:
         """Initialize the read partial tool."""
         self.security_validator = SecurityValidator(project_root)
+        self.project_root = project_root
         logger.info("ReadPartialTool initialized with security validation")
 
     def get_tool_schema(self) -> dict[str, Any]:
@@ -104,8 +106,23 @@ class ReadPartialTool:
         end_column = arguments.get("end_column")
         # output_format = arguments.get("format", "text")  # Not used currently
 
-        # Security validation
-        is_valid, error_msg = self.security_validator.validate_file_path(file_path)
+        # Resolve relative path against project root for consistent behavior
+        base_root = (
+            getattr(
+                getattr(self.security_validator, "boundary_manager", None),
+                "project_root",
+                None,
+            )
+            or self.project_root
+        )
+
+        if not os.path.isabs(file_path) and base_root:
+            resolved_path = os.path.realpath(os.path.join(base_root, file_path))
+        else:
+            resolved_path = file_path
+
+        # Security validation (validate resolved absolute path when possible)
+        is_valid, error_msg = self.security_validator.validate_file_path(resolved_path)
         if not is_valid:
             logger.warning(
                 f"Security validation failed for file path: {file_path} - {error_msg}"
@@ -113,7 +130,7 @@ class ReadPartialTool:
             raise ValueError(f"Invalid file path: {error_msg}")
 
         # Validate file exists
-        if not Path(file_path).exists():
+        if not Path(resolved_path).exists():
             raise ValueError("Invalid file path: file does not exist")
 
         # Validate line numbers
@@ -141,7 +158,7 @@ class ReadPartialTool:
 
             with get_performance_monitor().measure_operation("read_code_partial"):
                 content = self._read_file_partial(
-                    file_path, start_line, end_line, start_column, end_column
+                    resolved_path, start_line, end_line, start_column, end_column
                 )
 
                 if content is None:

tree_sitter_analyzer/mcp/tools/table_format_tool.py

@@ -6,6 +6,7 @@ This tool provides table-formatted output for code analysis results through the
 equivalent to the CLI --table=full option functionality.
 """
 
+import os
 from pathlib import Path
 from typing import Any
 
@@ -271,8 +272,25 @@ class TableFormatTool:
             format_type = args.get("format_type", "full")
             language = args.get("language")
 
+            # Resolve relative path against project root for consistent behavior
+            base_root = (
+                getattr(
+                    getattr(self.security_validator, "boundary_manager", None),
+                    "project_root",
+                    None,
+                )
+                or self.project_root
+            )
+
+            if not os.path.isabs(file_path) and base_root:
+                resolved_path = os.path.realpath(os.path.join(base_root, file_path))
+            else:
+                resolved_path = file_path
+
             # Security validation
-            is_valid, error_msg = self.security_validator.validate_file_path(file_path)
+            is_valid, error_msg = self.security_validator.validate_file_path(
+                resolved_path
+            )
             if not is_valid:
                 self.logger.warning(
                     f"Security validation failed for file path: {file_path} - {error_msg}"
@@ -292,20 +310,20 @@ class TableFormatTool:
                 )
 
             # Validate file exists
-            if not Path(file_path).exists():
+            if not Path(resolved_path).exists():
                 # Tests expect FileNotFoundError here
                 raise FileNotFoundError(f"File not found: {file_path}")
 
             # Detect language if not provided
             if not language:
-                language = detect_language_from_file(file_path)
+                language = detect_language_from_file(resolved_path)
 
             # Use performance monitoring
             monitor = get_performance_monitor()
             with monitor.measure_operation("code_structure_analysis"):
                 # Analyze structure using the unified analysis engine
                 request = AnalysisRequest(
-                    file_path=file_path,
+                    file_path=resolved_path,
                     language=language,
                     include_complexity=True,
                     include_details=True,