hanzo-mcp 0.7.7__py3-none-any.whl → 0.8.1__py3-none-any.whl

hanzo_mcp/tools/filesystem/batch_search.py

@@ -11,41 +11,42 @@ Perfect for complex research and refactoring tasks where you need
 to find all occurrences across different dimensions.
 """
 
-import asyncio
-import json
 import re
-from dataclasses import dataclass, asdict
-from pathlib import Path
-from typing import Dict, List, Optional, Set, Tuple, Any, Union
+import asyncio
 from enum import Enum
+from typing import Any, Dict, List, Tuple, Optional
+from pathlib import Path
+from dataclasses import asdict, dataclass
+from typing_extensions import Unpack, Annotated, TypedDict, final, override
 
-from mcp.server.fastmcp import Context as MCPContext
-from mcp.server import FastMCP
 from pydantic import Field
-from typing_extensions import Annotated, TypedDict, Unpack, final, override
+from mcp.server import FastMCP
+from mcp.server.fastmcp import Context as MCPContext
 
 from hanzo_mcp.tools.filesystem.base import FilesystemBaseTool
 from hanzo_mcp.tools.filesystem.grep import Grep
+from hanzo_mcp.tools.common.permissions import PermissionManager
 from hanzo_mcp.tools.filesystem.ast_tool import ASTTool
-from hanzo_mcp.tools.filesystem.git_search import GitSearchTool
+from hanzo_mcp.tools.vector.ast_analyzer import Symbol, ASTAnalyzer
 from hanzo_mcp.tools.vector.vector_search import VectorSearchTool
-from hanzo_mcp.tools.vector.ast_analyzer import ASTAnalyzer, Symbol
-from hanzo_mcp.tools.common.permissions import PermissionManager
+from hanzo_mcp.tools.filesystem.git_search import GitSearchTool
 from hanzo_mcp.tools.vector.project_manager import ProjectVectorManager
 
 
 class SearchType(Enum):
     """Types of searches that can be performed."""
+
     GREP = "grep"
-    VECTOR = "vector" 
+    VECTOR = "vector"
     AST = "ast"
     SYMBOL = "symbol"
     GIT = "git"
 
 
-@dataclass 
+@dataclass
 class SearchResult:
     """Search result combining different search types."""
+
     file_path: str
     line_number: Optional[int]
     content: str
@@ -54,47 +55,58 @@ class SearchResult:
     context: Optional[str] = None  # AST/function context
     symbol_info: Optional[Symbol] = None
     project: Optional[str] = None
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for JSON serialization."""
         result = asdict(self)
-        result['search_type'] = self.search_type.value
+        result["search_type"] = self.search_type.value
         if self.symbol_info:
-            result['symbol_info'] = asdict(self.symbol_info)
+            result["symbol_info"] = asdict(self.symbol_info)
         return result
 
 
 @dataclass
 class BatchSearchResults:
     """Container for all batch search results."""
+
     query: str
     total_results: int
     results_by_type: Dict[SearchType, List[SearchResult]]
     combined_results: List[SearchResult]
     search_time_ms: float
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for JSON serialization."""
         return {
-            'query': self.query,
-            'total_results': self.total_results,
-            'results_by_type': {k.value: [r.to_dict() for r in v] for k, v in self.results_by_type.items()},
-            'combined_results': [r.to_dict() for r in self.combined_results],
-            'search_time_ms': self.search_time_ms,
+            "query": self.query,
+            "total_results": self.total_results,
+            "results_by_type": {
+                k.value: [r.to_dict() for r in v]
+                for k, v in self.results_by_type.items()
+            },
+            "combined_results": [r.to_dict() for r in self.combined_results],
+            "search_time_ms": self.search_time_ms,
         }
 
 
-Queries = Annotated[List[Dict[str, Any]], Field(description="List of search queries with types", min_length=1)]
+Queries = Annotated[
+    List[Dict[str, Any]],
+    Field(description="List of search queries with types", min_length=1),
+]
 SearchPath = Annotated[str, Field(description="Path to search in", default=".")]
 Include = Annotated[str, Field(description="File pattern to include", default="*")]
 MaxResults = Annotated[int, Field(description="Maximum results per query", default=20)]
-IncludeContext = Annotated[bool, Field(description="Include function/method context", default=True)]
-CombineResults = Annotated[bool, Field(description="Combine and deduplicate results", default=True)]
+IncludeContext = Annotated[
+    bool, Field(description="Include function/method context", default=True)
+]
+CombineResults = Annotated[
+    bool, Field(description="Combine and deduplicate results", default=True)
+]
 
 
 class BatchSearchParams(TypedDict):
     """Parameters for batch search.
-    
+
     queries format: [
         {"type": "grep", "pattern": "TODO"},
         {"type": "vector_search", "query": "error handling"},
@@ -102,8 +114,9 @@ class BatchSearchParams(TypedDict):
         {"type": "git_search", "pattern": "bug fix", "search_type": "commits"}
     ]
     """
+
     queries: Queries
-    path: SearchPath  
+    path: SearchPath
     include: Include
     max_results: MaxResults
     include_context: IncludeContext
@@ -113,35 +126,38 @@ class BatchSearchParams(TypedDict):
 @final
 class BatchSearchTool(FilesystemBaseTool):
     """Search tool combining multiple search strategies."""
-    
-    def __init__(self, permission_manager: PermissionManager, 
-                 project_manager: Optional[ProjectVectorManager] = None):
+
+    def __init__(
+        self,
+        permission_manager: PermissionManager,
+        project_manager: Optional[ProjectVectorManager] = None,
+    ):
         """Initialize the search tool."""
         super().__init__(permission_manager)
         self.project_manager = project_manager
-        
+
         # Initialize component search tools
         self.grep_tool = Grep(permission_manager)
         self.grep_ast_tool = ASTTool(permission_manager)
         self.git_search_tool = GitSearchTool(permission_manager)
         self.ast_analyzer = ASTAnalyzer()
-        
+
         # Vector search is optional
         self.vector_tool = None
         if project_manager:
             self.vector_tool = VectorSearchTool(permission_manager, project_manager)
-        
+
         # Cache for AST analysis results
         self._ast_cache: Dict[str, Any] = {}
         self._symbol_cache: Dict[str, List[Symbol]] = {}
-    
+
     @property
     @override
     def name(self) -> str:
         """Get the tool name."""
         return "batch_search"
-    
-    @property  
+
+    @property
     @override
     def description(self) -> str:
         """Get the tool description."""
@@ -163,59 +179,71 @@ Perfect for comprehensive code analysis and refactoring tasks."""
 
     def _detect_search_intent(self, pattern: str) -> Tuple[bool, bool, bool]:
         """Analyze pattern to determine which search types to enable.
-        
+
         Returns:
             Tuple of (should_use_vector, should_use_ast, should_use_symbol)
         """
         # Default to all enabled
-        use_vector = True  
+        use_vector = True
         use_ast = True
         use_symbol = True
-        
+
         # If pattern looks like regex, focus on text search
-        regex_indicators = ['.*', '\\w', '\\d', '\\s', '[', ']', '(', ')', '|', '^', '$']
+        regex_indicators = [
+            ".*",
+            "\\w",
+            "\\d",
+            "\\s",
+            "[",
+            "]",
+            "(",
+            ")",
+            "|",
+            "^",
+            "$",
+        ]
         if any(indicator in pattern for indicator in regex_indicators):
             use_vector = False  # Regex patterns don't work well with vector search
-        
+
         # If pattern looks like a function/class name, prioritize symbol search
-        if re.match(r'^[a-zA-Z_][a-zA-Z0-9_]*$', pattern):
+        if re.match(r"^[a-zA-Z_][a-zA-Z0-9_]*$", pattern):
             use_symbol = True
             use_ast = True
-        
-        # If pattern contains natural language, prioritize vector search  
+
+        # If pattern contains natural language, prioritize vector search
         words = pattern.split()
-        if len(words) > 2 and not any(c in pattern for c in ['(', ')', '{', '}', '[', ']']):
+        if len(words) > 2 and not any(
+            c in pattern for c in ["(", ")", "{", "}", "[", "]"]
+        ):
             use_vector = True
-            
+
         return use_vector, use_ast, use_symbol
-    
-    async def _run_grep_search(self, pattern: str, path: str, include: str, 
-                              tool_ctx, max_results: int) -> List[SearchResult]:
+
+    async def _run_grep_search(
+        self, pattern: str, path: str, include: str, tool_ctx, max_results: int
+    ) -> List[SearchResult]:
         """Run grep search and convert results."""
         await tool_ctx.info(f"Running grep search for: {pattern}")
-        
+
         try:
             # Use the existing grep tool
             grep_result = await self.grep_tool.call(
-                tool_ctx.mcp_context,
-                pattern=pattern,
-                path=path, 
-                include=include
+                tool_ctx.mcp_context, pattern=pattern, path=path, include=include
             )
-            
+
             results = []
             if "Found" in grep_result and "matches" in grep_result:
                 # Parse grep results
-                lines = grep_result.split('\n')
+                lines = grep_result.split("\n")
                 for line in lines[2:]:  # Skip header lines
-                    if ':' in line and len(line.strip()) > 0:
+                    if ":" in line and len(line.strip()) > 0:
                         try:
-                            parts = line.split(':', 2)
+                            parts = line.split(":", 2)
                             if len(parts) >= 3:
                                 file_path = parts[0]
                                 line_num = int(parts[1])
                                 content = parts[2].strip()
-                                
+
                                 result = SearchResult(
                                     file_path=file_path,
                                     line_number=line_num,
@@ -224,66 +252,67 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                                     score=1.0,  # Grep results are exact matches
                                 )
                                 results.append(result)
-                                
+
                                 if len(results) >= max_results:
                                     break
                         except (ValueError, IndexError):
                             continue
-            
+
             await tool_ctx.info(f"Grep search found {len(results)} results")
             return results
-                        
+
         except Exception as e:
             await tool_ctx.error(f"Grep search failed: {str(e)}")
             return []
-    
-    async def _run_vector_search(self, pattern: str, path: str, tool_ctx, 
-                                max_results: int) -> List[SearchResult]:
+
+    async def _run_vector_search(
+        self, pattern: str, path: str, tool_ctx, max_results: int
+    ) -> List[SearchResult]:
         """Run vector search and convert results."""
         if not self.vector_tool:
             return []
-            
+
         await tool_ctx.info(f"Running vector search for: {pattern}")
-        
+
         try:
             # Determine search scope based on path
             if path == ".":
                 search_scope = "current"
             else:
                 search_scope = "all"  # Could be enhanced to detect project
-            
+
             vector_result = await self.vector_tool.call(
                 tool_ctx.mcp_context,
                 query=pattern,
                 limit=max_results,
                 score_threshold=0.3,
                 search_scope=search_scope,
-                include_content=True
+                include_content=True,
             )
-            
+
             results = []
             # Parse vector search results - this would need to be enhanced
             # based on the actual format returned by vector_tool
             if "Found" in vector_result:
                 # This is a simplified parser - would need to match actual format
-                lines = vector_result.split('\n')
+                lines = vector_result.split("\n")
                 current_file = None
                 current_score = 0.0
-                
+
                 for line in lines:
                     if "Result" in line and "Score:" in line:
                         # Extract score
-                        score_match = re.search(r'Score: ([\d.]+)%', line)
+                        score_match = re.search(r"Score: ([\d.]+)%", line)
                         if score_match:
                             current_score = float(score_match.group(1)) / 100.0
-                        
+
                         # Extract file path
                         if " - " in line:
                             parts = line.split(" - ")
                             if len(parts) > 1:
                                 current_file = parts[-1].strip()
-                    
-                    elif current_file and line.strip() and not line.startswith('-'):
+
+                    elif current_file and line.strip() and not line.startswith("-"):
                         # This is content
                         result = SearchResult(
                             file_path=current_file,
@@ -293,99 +322,107 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                             score=current_score,
                         )
                         results.append(result)
-                        
+
                         if len(results) >= max_results:
                             break
-            
+
             await tool_ctx.info(f"Vector search found {len(results)} results")
             return results
-            
+
         except Exception as e:
             await tool_ctx.error(f"Vector search failed: {str(e)}")
             return []
-    
-    async def _run_ast_search(self, pattern: str, path: str, include: str,
-                             tool_ctx, max_results: int) -> List[SearchResult]:
-        """Run AST-aware search and convert results.""" 
+
+    async def _run_ast_search(
+        self, pattern: str, path: str, include: str, tool_ctx, max_results: int
+    ) -> List[SearchResult]:
+        """Run AST-aware search and convert results."""
         await tool_ctx.info(f"Running AST search for: {pattern}")
-        
+
         try:
             ast_result = await self.grep_ast_tool.call(
                 tool_ctx.mcp_context,
                 pattern=pattern,
                 path=path,
                 ignore_case=False,
-                line_number=True
+                line_number=True,
             )
-            
+
             results = []
             if ast_result and not ast_result.startswith("No matches"):
                 # Parse AST results - they include structural context
                 current_file = None
                 context_lines = []
-                
-                for line in ast_result.split('\n'):
-                    if line.endswith(':') and '/' in line:
+
+                for line in ast_result.split("\n"):
+                    if line.endswith(":") and "/" in line:
                         # This is a file header
                         current_file = line[:-1]
                         context_lines = []
                     elif current_file and line.strip():
-                        if ':' in line and line.strip()[0].isdigit():
+                        if ":" in line and line.strip()[0].isdigit():
                             # This looks like a line with number
                             try:
-                                parts = line.split(':', 1)
+                                parts = line.split(":", 1)
                                 line_num = int(parts[0].strip())
                                 content = parts[1].strip() if len(parts) > 1 else ""
-                                
+
                                 result = SearchResult(
                                     file_path=current_file,
                                     line_number=line_num,
                                     content=content,
                                     search_type=SearchType.AST,
                                     score=0.9,  # High score for AST matches
-                                    context='\n'.join(context_lines) if context_lines else None
+                                    context=(
+                                        "\n".join(context_lines)
+                                        if context_lines
+                                        else None
+                                    ),
                                 )
                                 results.append(result)
-                                
+
                                 if len(results) >= max_results:
                                     break
-                                    
+
                             except ValueError:
                                 context_lines.append(line)
                         else:
                             context_lines.append(line)
-            
+
             await tool_ctx.info(f"AST search found {len(results)} results")
             return results
-            
+
         except Exception as e:
             await tool_ctx.error(f"AST search failed: {str(e)}")
             return []
-    
-    async def _run_symbol_search(self, pattern: str, path: str, tool_ctx,
-                                max_results: int) -> List[SearchResult]:
+
+    async def _run_symbol_search(
+        self, pattern: str, path: str, tool_ctx, max_results: int
+    ) -> List[SearchResult]:
         """Run symbol search using AST analysis."""
         await tool_ctx.info(f"Running symbol search for: {pattern}")
-        
+
         try:
             results = []
             path_obj = Path(path)
-            
+
             # Find files to analyze
             files_to_check = []
             if path_obj.is_file():
                 files_to_check.append(str(path_obj))
             elif path_obj.is_dir():
                 # Look for source files
-                for ext in ['.py', '.js', '.ts', '.java', '.cpp', '.c']:
-                    files_to_check.extend(path_obj.rglob(f'*{ext}'))
-                files_to_check = [str(f) for f in files_to_check[:50]]  # Limit for performance
-            
+                for ext in [".py", ".js", ".ts", ".java", ".cpp", ".c"]:
+                    files_to_check.extend(path_obj.rglob(f"*{ext}"))
+                files_to_check = [
+                    str(f) for f in files_to_check[:50]
+                ]  # Limit for performance
+
             # Analyze files for symbols
             for file_path in files_to_check:
                 if not self.is_path_allowed(file_path):
                     continue
-                    
+
                 # Check cache first
                 if file_path in self._symbol_cache:
                     symbols = self._symbol_cache[file_path]
@@ -394,59 +431,73 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                     file_ast = self.ast_analyzer.analyze_file(file_path)
                     symbols = file_ast.symbols if file_ast else []
                     self._symbol_cache[file_path] = symbols
-                
+
                 # Search symbols
                 for symbol in symbols:
                     if re.search(pattern, symbol.name, re.IGNORECASE):
                         result = SearchResult(
                             file_path=symbol.file_path,
                             line_number=symbol.line_start,
-                            content=f"{symbol.type} {symbol.name}" + (f" - {symbol.docstring[:100]}..." if symbol.docstring else ""),
+                            content=f"{symbol.type} {symbol.name}"
+                            + (
+                                f" - {symbol.docstring[:100]}..."
+                                if symbol.docstring
+                                else ""
+                            ),
                             search_type=SearchType.SYMBOL,
                             score=0.95,  # Very high score for symbol matches
                             symbol_info=symbol,
-                            context=symbol.signature
+                            context=symbol.signature,
                         )
                         results.append(result)
-                        
+
                         if len(results) >= max_results:
                             break
-                
+
                 if len(results) >= max_results:
                     break
-            
+
             await tool_ctx.info(f"Symbol search found {len(results)} results")
             return results
-            
+
         except Exception as e:
             await tool_ctx.error(f"Symbol search failed: {str(e)}")
             return []
-    
-    async def _add_function_context(self, results: List[SearchResult], tool_ctx) -> List[SearchResult]:
+
+    async def _add_function_context(
+        self, results: List[SearchResult], tool_ctx
+    ) -> List[SearchResult]:
         """Add function/method context to results where relevant."""
         enhanced_results = []
-        
+
         for result in results:
             enhanced_result = result
-            
+
             if result.line_number and not result.context:
                 try:
                     # Read the file and find surrounding function
                     file_path = Path(result.file_path)
                     if file_path.exists() and self.is_path_allowed(str(file_path)):
-                        
                         # Check if we have AST analysis cached
                         if str(file_path) not in self._ast_cache:
                             file_ast = self.ast_analyzer.analyze_file(str(file_path))
                             self._ast_cache[str(file_path)] = file_ast
                         else:
                             file_ast = self._ast_cache[str(file_path)]
-                        
+
                         if file_ast:
                             # Find symbol containing this line
                             for symbol in file_ast.symbols:
-                                if (symbol.line_start <= result.line_number <= symbol.line_end and
-                                    symbol.type in ['function', 'method']):
+                                if (
+                                    symbol.line_start
+                                    <= result.line_number
+                                    <= symbol.line_end
+                                    and symbol.type
+                                    in [
+                                        "function",
+                                        "method",
+                                    ]
+                                ):
                                     enhanced_result = SearchResult(
                                         file_path=result.file_path,
                                         line_number=result.line_number,
@@ -455,27 +506,31 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                                         score=result.score,
                                         context=f"In {symbol.type} {symbol.name}(): {symbol.signature or ''}",
                                         symbol_info=symbol,
-                                        project=result.project
+                                        project=result.project,
                                     )
                                     break
                 except Exception as e:
-                    await tool_ctx.warning(f"Could not add context for {result.file_path}: {str(e)}")
-            
+                    await tool_ctx.warning(
+                        f"Could not add context for {result.file_path}: {str(e)}"
+                    )
+
             enhanced_results.append(enhanced_result)
-        
+
         return enhanced_results
-    
-    def _combine_and_rank_results(self, results_by_type: Dict[SearchType, List[SearchResult]]) -> List[SearchResult]:
+
+    def _combine_and_rank_results(
+        self, results_by_type: Dict[SearchType, List[SearchResult]]
+    ) -> List[SearchResult]:
         """Combine results from different search types and rank by relevance."""
         all_results = []
         seen_combinations = set()
-        
+
         # Combine all results, avoiding duplicates
-        for search_type, results in results_by_type.items():
+        for _search_type, results in results_by_type.items():
             for result in results:
                 # Create a key to identify duplicates
                 key = (result.file_path, result.line_number)
-                
+
                 if key not in seen_combinations:
                     seen_combinations.add(key)
                     all_results.append(result)
@@ -483,50 +538,57 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                     # Merge with existing result based on score and type priority
                     type_priority = {
                         SearchType.SYMBOL: 4,
-                        SearchType.GREP: 3, 
+                        SearchType.GREP: 3,
                         SearchType.AST: 2,
-                        SearchType.VECTOR: 1
+                        SearchType.VECTOR: 1,
                     }
-                    
+
                     for existing in all_results:
                         existing_key = (existing.file_path, existing.line_number)
                         if existing_key == key:
                             # Update if the new result has higher priority or better score
                             result_priority = type_priority[result.search_type]
                             existing_priority = type_priority[existing.search_type]
-                            
+
                             # Replace existing if: higher priority type, or same priority but higher score
-                            if (result_priority > existing_priority or 
-                                (result_priority == existing_priority and result.score > existing.score)):
+                            if result_priority > existing_priority or (
+                                result_priority == existing_priority
+                                and result.score > existing.score
+                            ):
                                 # Replace the entire result to preserve type
                                 idx = all_results.index(existing)
                                 all_results[idx] = result
                             else:
                                 # Still merge useful information
                                 existing.context = existing.context or result.context
-                                existing.symbol_info = existing.symbol_info or result.symbol_info
+                                existing.symbol_info = (
+                                    existing.symbol_info or result.symbol_info
+                                )
                             break
-        
+
         # Sort by score (descending) then by search type priority
         type_priority = {
             SearchType.SYMBOL: 4,
-            SearchType.GREP: 3, 
+            SearchType.GREP: 3,
             SearchType.AST: 2,
-            SearchType.VECTOR: 1
+            SearchType.VECTOR: 1,
         }
-        
-        all_results.sort(key=lambda r: (r.score, type_priority[r.search_type]), reverse=True)
-        
+
+        all_results.sort(
+            key=lambda r: (r.score, type_priority[r.search_type]), reverse=True
+        )
+
         return all_results
-    
+
     @override
     async def call(self, ctx: MCPContext, **params: Unpack[BatchSearchParams]) -> str:
         """Execute batch search with multiple queries in parallel."""
         import time
+
         start_time = time.time()
-        
+
         tool_ctx = self.create_tool_context(ctx)
-        
+
         # Extract parameters
         queries = params["queries"]
         path = params.get("path", ".")
@@ -534,120 +596,145 @@ Perfect for comprehensive code analysis and refactoring tasks."""
         max_results = params.get("max_results", 20)
         include_context = params.get("include_context", True)
         combine_results = params.get("combine_results", True)
-        
+
         # Validate path
         path_validation = self.validate_path(path)
         if path_validation.is_error:
             await tool_ctx.error(path_validation.error_message)
             return f"Error: {path_validation.error_message}"
-        
+
         # Check path permissions and existence
         allowed, error_msg = await self.check_path_allowed(path, tool_ctx)
         if not allowed:
             return error_msg
-            
+
         exists, error_msg = await self.check_path_exists(path, tool_ctx)
         if not exists:
             return error_msg
-        
-        await tool_ctx.info(f"Starting batch search with {len(queries)} queries in {path}")
-        
+
+        await tool_ctx.info(
+            f"Starting batch search with {len(queries)} queries in {path}"
+        )
+
         # Run all queries in parallel
         search_tasks = []
         query_info = []  # Track query info for results
-        
+
         for query in queries:
             query_type = query.get("type", "grep")
             query_info.append(query)
-            
+
             if query_type == "grep":
                 pattern = query.get("pattern")
                 if pattern:
                     search_tasks.append(
-                        self._run_grep_search(pattern, path, include, tool_ctx, max_results)
+                        self._run_grep_search(
+                            pattern, path, include, tool_ctx, max_results
+                        )
                     )
-            
+
             elif query_type == "grep_ast":
                 pattern = query.get("pattern")
                 if pattern:
                     search_tasks.append(
-                        self._run_ast_search(pattern, path, include, tool_ctx, max_results)
+                        self._run_ast_search(
+                            pattern, path, include, tool_ctx, max_results
+                        )
                     )
-                    
+
             elif query_type == "vector_search" and self.vector_tool:
                 search_query = query.get("query") or query.get("pattern")
                 if search_query:
                     search_tasks.append(
-                        self._run_vector_search(search_query, path, tool_ctx, max_results)
+                        self._run_vector_search(
+                            search_query, path, tool_ctx, max_results
+                        )
                     )
-                    
+
             elif query_type == "git_search":
                 pattern = query.get("pattern")
                 search_type = query.get("search_type", "content")
                 if pattern:
                     search_tasks.append(
-                        self._run_git_search(pattern, path, search_type, tool_ctx, max_results)
+                        self._run_git_search(
+                            pattern, path, search_type, tool_ctx, max_results
+                        )
                     )
-            
+
             else:
-                await tool_ctx.warning(f"Unknown or unavailable search type: {query_type}")
-        
+                await tool_ctx.warning(
+                    f"Unknown or unavailable search type: {query_type}"
+                )
+
         # Execute all searches in parallel
         search_results = await asyncio.gather(*search_tasks, return_exceptions=True)
-        
+
         # Collect all results
         all_results = []
         results_by_query = {}
-        
+
         for i, (query, result) in enumerate(zip(query_info, search_results)):
             if isinstance(result, Exception):
-                await tool_ctx.error(f"Query {i+1} failed: {str(result)}")
+                await tool_ctx.error(f"Query {i + 1} failed: {str(result)}")
                 results_by_query[i] = []
             else:
                 results_by_query[i] = result
                 all_results.extend(result)
-        
+
         # Combine and deduplicate results if requested
         if combine_results:
             combined_results = self._combine_results(all_results)
         else:
             combined_results = all_results
-        
+
         # Add context if requested
         if include_context:
-            combined_results = await self._add_context_to_results(combined_results, tool_ctx)
-        
+            combined_results = await self._add_context_to_results(
+                combined_results, tool_ctx
+            )
+
         end_time = time.time()
         search_time_ms = (end_time - start_time) * 1000
-        
+
         # Sort by relevance score
         combined_results.sort(key=lambda r: r.score, reverse=True)
-        
+
         # Limit total results
-        combined_results = combined_results[:max_results * 2]  # Allow more when combining
-        
+        combined_results = combined_results[
+            : max_results * 2
+        ]  # Allow more when combining
+
         # Create batch results object
         batch_results = BatchSearchResults(
             query=f"Batch search with {len(queries)} queries",
             total_results=len(combined_results),
             results_by_type={
-                SearchType.GREP: [r for r in combined_results if r.search_type == SearchType.GREP],
-                SearchType.VECTOR: [r for r in combined_results if r.search_type == SearchType.VECTOR],
-                SearchType.AST: [r for r in combined_results if r.search_type == SearchType.AST],
-                SearchType.GIT: [r for r in combined_results if r.search_type == SearchType.GIT],
+                SearchType.GREP: [
+                    r for r in combined_results if r.search_type == SearchType.GREP
+                ],
+                SearchType.VECTOR: [
+                    r for r in combined_results if r.search_type == SearchType.VECTOR
+                ],
+                SearchType.AST: [
+                    r for r in combined_results if r.search_type == SearchType.AST
+                ],
+                SearchType.GIT: [
+                    r for r in combined_results if r.search_type == SearchType.GIT
+                ],
             },
             combined_results=combined_results,
-            search_time_ms=search_time_ms
+            search_time_ms=search_time_ms,
         )
-        
+
         # Format output
         return self._format_batch_results(batch_results, query_info)
-    
-    async def _run_git_search(self, pattern: str, path: str, search_type: str, 
-                             tool_ctx, max_results: int) -> List[SearchResult]:
+
+    async def _run_git_search(
+        self, pattern: str, path: str, search_type: str, tool_ctx, max_results: int
+    ) -> List[SearchResult]:
         """Run git search and convert results."""
         await tool_ctx.info(f"Running git search for: {pattern} (type: {search_type})")
-        
+
         try:
             # Use the git search tool
             git_result = await self.git_search_tool.call(
@@ -655,24 +742,24 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                 pattern=pattern,
                 path=path,
                 search_type=search_type,
-                max_count=max_results
+                max_count=max_results,
             )
-            
+
             results = []
             if "Found" in git_result:
                 # Parse git search results - simplified parser
-                lines = git_result.split('\n')
+                lines = git_result.split("\n")
                 current_file = None
-                
+
                 for line in lines:
                     if line.strip():
                         # Extract file path and content
-                        if ':' in line:
-                            parts = line.split(':', 2)
+                        if ":" in line:
+                            parts = line.split(":", 2)
                             if len(parts) >= 2:
                                 file_path = parts[0].strip()
                                 content = parts[-1].strip() if len(parts) > 2 else line
-                                
+
                                 result = SearchResult(
                                     file_path=file_path,
                                     line_number=None,
@@ -681,26 +768,26 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                                     score=0.8,  # Git results are relevant
                                 )
                                 results.append(result)
-                                
+
                                 if len(results) >= max_results:
                                     break
-            
+
             await tool_ctx.info(f"Git search found {len(results)} results")
             return results
-                        
+
         except Exception as e:
             await tool_ctx.error(f"Git search failed: {str(e)}")
             return []
-    
+
     def _combine_results(self, results: List[SearchResult]) -> List[SearchResult]:
         """Combine and deduplicate search results."""
         # Use file path and line number as key for deduplication
         seen = {}
         combined = []
-        
+
         for result in results:
             key = (result.file_path, result.line_number)
-            
+
             if key not in seen:
                 seen[key] = result
                 combined.append(result)
@@ -712,81 +799,86 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                     idx = combined.index(existing)
                     combined[idx] = result
                     seen[key] = result
-        
+
         return combined
-    
-    async def _add_context_to_results(self, results: List[SearchResult], tool_ctx) -> List[SearchResult]:
+
+    async def _add_context_to_results(
+        self, results: List[SearchResult], tool_ctx
+    ) -> List[SearchResult]:
         """Add function/method context to results."""
         # This is a simplified version - you could enhance with full AST context
         return await self._add_function_context(results, tool_ctx)
-    
-    def _format_batch_results(self, results: BatchSearchResults, query_info: List[Dict]) -> str:
+
+    def _format_batch_results(
+        self, results: BatchSearchResults, query_info: List[Dict]
+    ) -> str:
         """Format batch search results for display."""
         output = []
-        
+
         # Header
         output.append(f"=== Batch Search Results ===")
         output.append(f"Queries: {len(query_info)}")
         output.append(f"Total results: {results.total_results}")
         output.append(f"Search time: {results.search_time_ms:.1f}ms\n")
-        
+
         # Summary by type
         output.append("Results by type:")
         for search_type, type_results in results.results_by_type.items():
             if type_results:
                 output.append(f"  {search_type.value}: {len(type_results)} results")
         output.append("")
-        
+
         # Query summary
         output.append("Queries executed:")
         for i, query in enumerate(query_info):
             query_type = query.get("type", "grep")
             pattern = query.get("pattern") or query.get("query", "")
-            output.append(f"  {i+1}. {query_type}: {pattern}")
+            output.append(f"  {i + 1}. {query_type}: {pattern}")
         output.append("")
-        
+
         # Results
         if results.combined_results:
             output.append("=== Top Results ===\n")
-            
+
             # Group by file
             results_by_file = {}
             for result in results.combined_results[:50]:  # Limit display
                 if result.file_path not in results_by_file:
                     results_by_file[result.file_path] = []
                 results_by_file[result.file_path].append(result)
-            
+
             # Display results by file
             for file_path, file_results in results_by_file.items():
                 output.append(f"{file_path}")
                 output.append("-" * len(file_path))
-                
+
                 # Sort by line number if available
                 file_results.sort(key=lambda r: r.line_number or 0)
-                
+
                 for result in file_results:
                     score_str = f"[{result.search_type.value} {result.score:.2f}]"
-                    
+
                     if result.line_number:
-                        output.append(f"  {result.line_number:>4}: {score_str} {result.content}")
+                        output.append(
+                            f"  {result.line_number:>4}: {score_str} {result.content}"
+                        )
                     else:
                         output.append(f"       {score_str} {result.content}")
-                    
+
                     if result.context:
                         output.append(f"         Context: {result.context}")
-                
+
                 output.append("")
         else:
             output.append("No results found.")
-        
+
         return "\n".join(output)
-    
-    
+
     @override
     def register(self, mcp_server: FastMCP) -> None:
         """Register the batch search tool with the MCP server."""
         tool_self = self
-        
+
         @mcp_server.tool(name=self.name, description=self.description)
         async def batch_search(
             ctx: MCPContext,
@@ -795,7 +887,7 @@ Perfect for comprehensive code analysis and refactoring tasks."""
             include: Include = "*",
             max_results: MaxResults = 20,
             include_context: IncludeContext = True,
-            combine_results: CombineResults = True
+            combine_results: CombineResults = True,
         ) -> str:
             return await tool_self.call(
                 ctx,
@@ -804,5 +896,5 @@ Perfect for comprehensive code analysis and refactoring tasks."""
                 include=include,
                 max_results=max_results,
                 include_context=include_context,
-                combine_results=combine_results
-            )
+                combine_results=combine_results,
+            )