hanzo-mcp 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

hanzo_mcp/tools/common/stats.py

@@ -7,6 +7,8 @@ from datetime import datetime
 import psutil
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.mcp.mcp_add import McpAddTool
 from hanzo_mcp.tools.common.context import create_tool_context
@@ -57,6 +59,9 @@ Example:
 """
 
     @override
+    @auto_timeout("stats")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/common/thinking_tool.py

@@ -7,6 +7,8 @@ from typing import Unpack, Annotated, TypedDict, final, override
 
 from pydantic import Field
 from mcp.server import FastMCP
+
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
 from mcp.server.fastmcp import Context as MCPContext
 
 from hanzo_mcp.tools.common.base import BaseTool
@@ -93,6 +95,9 @@ Feature Implementation Planning
         pass
 
     @override
+    @auto_timeout("thinking")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/common/timeout_parser.py

@@ -0,0 +1,103 @@
+"""Human-readable timeout parsing utilities."""
+
+import re
+from typing import Union
+
+
+def parse_timeout(timeout_str: Union[str, int, float]) -> float:
+    """Parse timeout from human-readable string or numeric value.
+
+    Supports formats like:
+    - "2min", "5m", "120s", "30sec", "1.5h", "0.5hr"
+    - 120 (seconds as number)
+    - "120" (seconds as string)
+
+    Args:
+        timeout_str: Timeout value as string or number
+
+    Returns:
+        Timeout in seconds as float
+
+    Raises:
+        ValueError: If format is not recognized
+    """
+    if isinstance(timeout_str, (int, float)):
+        return float(timeout_str)
+
+    if isinstance(timeout_str, str):
+        # Handle pure numeric strings
+        try:
+            return float(timeout_str)
+        except ValueError:
+            pass
+
+        # Handle human-readable formats
+        timeout_str = timeout_str.lower().strip()
+
+        # Regex patterns for different time units
+        patterns = [
+            # Hours: 1h, 1.5hr, 2hour, 3hours
+            (r'^(\d*\.?\d+)\s*h(?:r|our|ours)?$', 3600),
+            # Minutes: 2m, 5min, 10mins, 1.5minute
+            (r'^(\d*\.?\d+)\s*m(?:in|ins|inute|inutes)?$', 60),
+            # Seconds: 30s, 120sec, 45secs, 60second, 90seconds
+            (r'^(\d*\.?\d+)\s*s(?:ec|ecs|econd|econds)?$', 1),
+        ]
+
+        for pattern, multiplier in patterns:
+            match = re.match(pattern, timeout_str)
+            if match:
+                value = float(match.group(1))
+                return value * multiplier
+
+        # If no pattern matches, raise error
+        raise ValueError(
+            f"Invalid timeout format: '{timeout_str}'. "
+            f"Supported formats: 2min, 5m, 120s, 30sec, 1.5h, 0.5hr, or numeric seconds."
+        )
+
+    raise ValueError(f"Unsupported timeout type: {type(timeout_str)}")
+
+
+def format_timeout(seconds: float) -> str:
+    """Format timeout seconds into human-readable string.
+
+    Args:
+        seconds: Timeout in seconds
+
+    Returns:
+        Human-readable string like "2m", "90s", "1.5h"
+    """
+    if seconds >= 3600:  # >= 1 hour
+        hours = seconds / 3600
+        if hours.is_integer():
+            return f"{int(hours)}h"
+        else:
+            return f"{hours:.1f}h"
+    elif seconds >= 60:  # >= 1 minute
+        minutes = seconds / 60
+        if minutes.is_integer():
+            return f"{int(minutes)}m"
+        else:
+            return f"{minutes:.1f}m"
+    else:  # < 1 minute
+        if seconds.is_integer():
+            return f"{int(seconds)}s"
+        else:
+            return f"{seconds:.1f}s"
+
+
+# Test the parser
+if __name__ == "__main__":
+    test_cases = [
+        "2min", "5m", "120s", "30sec", "1.5h", "0.5hr",
+        "90", 120, 3600.0, "1hour", "2hours", "30seconds"
+    ]
+
+    for case in test_cases:
+        try:
+            result = parse_timeout(case)
+            formatted = format_timeout(result)
+            print(f"{case} -> {result}s ({formatted})")
+        except ValueError as e:
+            print(f"{case} -> ERROR: {e}")

hanzo_mcp/tools/common/tool_disable.py

@@ -5,6 +5,8 @@ from typing import Unpack, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.tool_enable import ToolEnableTool
@@ -72,6 +74,9 @@ Use 'tool_enable' to re-enable disabled tools.
 """
 
     @override
+    @auto_timeout("tool_disable")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/common/tool_enable.py

@@ -7,6 +7,8 @@ from pathlib import Path
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 
@@ -119,6 +121,9 @@ Use 'tool_list' to see all available tools and their status.
 """
 
     @override
+    @auto_timeout("tool_enable")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/common/tool_list.py

@@ -5,6 +5,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.tool_enable import ToolEnableTool
@@ -158,6 +160,9 @@ Use 'tool_enable' and 'tool_disable' to change tool status.
 """
 
     @override
+    @auto_timeout("tool_list")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/config/config_tool.py

@@ -9,6 +9,8 @@ from pathlib import Path
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.config import load_settings, save_settings
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -104,6 +106,9 @@ config --action list
 config --action toggle index.scope --path ./project"""
 
     @override
+    @auto_timeout("config")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/config/mode_tool.py

@@ -3,6 +3,8 @@
 from typing import Optional, override
 
 from mcp.server import FastMCP
+
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
 from mcp.server.fastmcp import Context as MCPContext
 
 from hanzo_mcp.tools.common.base import BaseTool
@@ -310,6 +312,9 @@ mode --action current"""
             """Handle mode tool calls."""
             return await tool_self.run(ctx, action=action, name=name)
 
+    @auto_timeout("mode")
+
+
     async def call(self, ctx: MCPContext, **params) -> str:
         """Call the tool with arguments."""
         return await self.run(ctx, action=params.get("action", "list"), name=params.get("name"))

hanzo_mcp/tools/database/graph.py

@@ -15,6 +15,8 @@ from typing import (
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.permissions import PermissionManager
 from hanzo_mcp.tools.database.database_manager import DatabaseManager
@@ -146,6 +148,9 @@ graph --action search --pattern "John" --node-type User
 """
 
     @override
+    @auto_timeout("graph")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/graph_add.py

@@ -6,6 +6,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -137,6 +139,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("graph_add")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/graph_query.py

@@ -15,6 +15,8 @@ from collections import deque
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -147,6 +149,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("graph_query")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/graph_remove.py

@@ -5,6 +5,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -116,6 +118,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("graph_remove")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/graph_search.py

@@ -7,6 +7,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -117,6 +119,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("graph_search")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/graph_stats.py

@@ -7,6 +7,8 @@ from collections import defaultdict
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -97,6 +99,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("graph_stats")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/sql.py

@@ -15,6 +15,8 @@ from typing import (
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.permissions import PermissionManager
 from hanzo_mcp.tools.database.database_manager import DatabaseManager
@@ -100,6 +102,9 @@ sql --action stats --table users
 """
 
     @override
+    @auto_timeout("sql")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/sql_query.py

@@ -6,6 +6,7 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -89,6 +90,7 @@ Examples:
 Note: Use sql_search for text search operations."""
 
     @override
+    @auto_timeout("sql_query")
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/sql_search.py

@@ -6,6 +6,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -107,6 +109,9 @@ Examples:
 Use sql_query for complex queries with joins, conditions, etc."""
 
     @override
+    @auto_timeout("sql_search")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/database/sql_stats.py

@@ -6,6 +6,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -75,6 +77,9 @@ Examples:
 """
 
     @override
+    @auto_timeout("sql_stats")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/editor/neovim_command.py

@@ -9,6 +9,8 @@ from typing import List, Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -128,6 +130,9 @@ Note: Requires Neovim to be installed.
 """
 
     @override
+    @auto_timeout("neovim_command")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/editor/neovim_edit.py

@@ -8,6 +8,8 @@ from typing import Unpack, Optional, Annotated, TypedDict, final, override
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 from hanzo_mcp.tools.common.permissions import PermissionManager
@@ -125,6 +127,9 @@ Note: Requires Neovim to be installed and available in PATH.
 """
 
     @override
+    @auto_timeout("neovim_edit")
+
+
     async def call(
         self,
         ctx: MCPContext,
@@ -252,7 +257,7 @@ Or visit: https://neovim.io/"""
                             end if
                         end tell"""
 
-                        subprocess.run(["osascript", "-e", applescript])
+                        subprocess.run(["osascript", "-e", applescript], timeout=10)
                         return f"Opened {file_path} in Neovim (new terminal window)"
 
                 elif shutil.which("gnome-terminal"):
@@ -272,7 +277,7 @@ Or visit: https://neovim.io/"""
 
             else:
                 # Run and wait for completion
-                result = subprocess.run(cmd)
+                result = subprocess.run(cmd, timeout=120)
 
                 if result.returncode == 0:
                     return f"Successfully edited {file_path} in Neovim"

hanzo_mcp/tools/editor/neovim_session.py

@@ -11,6 +11,8 @@ from datetime import datetime
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
+
 from hanzo_mcp.tools.common.base import BaseTool
 from hanzo_mcp.tools.common.context import create_tool_context
 
@@ -114,6 +116,9 @@ Note: Requires Neovim to be installed.
 """
 
     @override
+    @auto_timeout("neovim_session")
+
+
     async def call(
         self,
         ctx: MCPContext,

hanzo_mcp/tools/filesystem/__init__.py

@@ -9,30 +9,25 @@ from mcp.server import FastMCP
 from hanzo_mcp.tools.common.base import BaseTool, ToolRegistry
 from hanzo_mcp.tools.filesystem.diff import create_diff_tool
 from hanzo_mcp.tools.filesystem.edit import Edit
+from hanzo_mcp.tools.filesystem.grep import Grep
 from hanzo_mcp.tools.filesystem.read import ReadTool
 from hanzo_mcp.tools.filesystem.watch import watch_tool
 from hanzo_mcp.tools.filesystem.write import Write
 from hanzo_mcp.tools.common.permissions import PermissionManager
 from hanzo_mcp.tools.filesystem.ast_tool import ASTTool
-from hanzo_mcp.tools.filesystem.find import FindTool
+from hanzo_mcp.tools.filesystem.find_files import FindFilesTool
 from hanzo_mcp.tools.filesystem.git_search import GitSearchTool
 from hanzo_mcp.tools.filesystem.multi_edit import MultiEdit
 from hanzo_mcp.tools.filesystem.rules_tool import RulesTool
+from hanzo_mcp.tools.filesystem.search_tool import SearchTool
+from hanzo_mcp.tools.filesystem.batch_search import BatchSearchTool
 from hanzo_mcp.tools.filesystem.directory_tree import DirectoryTreeTool
 from hanzo_mcp.tools.filesystem.content_replace import ContentReplaceTool
 
-# Import unified search tool (which includes legacy Grep as alias)
-from hanzo_mcp.tools.filesystem.search import (
-    UnifiedSearchTool,
-    Grep,  # Legacy alias for backward compatibility
-    create_unified_search_tool,
-    create_grep_tool,
-)
-
 # Import new search tools
 try:
     from hanzo_mcp.tools.search import (
-        FindTool as SearchFindTool,  # Rename to avoid conflict with filesystem FindTool
+        FindTool,
         UnifiedSearch,
         create_find_tool,
         create_unified_search_tool,
@@ -49,15 +44,14 @@ __all__ = [
     "Edit",
     "MultiEdit",
     "DirectoryTreeTool",
-    "Grep",  # Legacy alias for UnifiedSearchTool
-    "UnifiedSearchTool",  # New unified search tool
+    "Grep",
     "ContentReplaceTool",
     "ASTTool",
     "GitSearchTool",
-    "FindTool",
+    "BatchSearchTool",
+    "FindFilesTool",
     "RulesTool",
-    "create_unified_search_tool",
-    "create_grep_tool",
+    "SearchTool",
     "get_filesystem_tools",
     "register_filesystem_tools",
 ]
@@ -82,14 +76,15 @@ def get_read_only_filesystem_tools(
         Grep(permission_manager),
         ASTTool(permission_manager),
         GitSearchTool(permission_manager),
-        FindTool(permission_manager),
+        FindFilesTool(permission_manager),
         RulesTool(permission_manager),
         watch_tool,
         create_diff_tool(permission_manager),
     ]
 
-    # Add unified search tool (replaces old SearchTool and BatchSearchTool)
-    tools.append(UnifiedSearchTool(permission_manager, project_manager))
+    # Add search if project manager is available
+    if project_manager:
+        tools.append(SearchTool(permission_manager, project_manager))
 
     # Add new search tools if available
     if UNIFIED_SEARCH_AVAILABLE:
@@ -118,14 +113,15 @@ def get_filesystem_tools(permission_manager: PermissionManager, project_manager=
         ContentReplaceTool(permission_manager),
         ASTTool(permission_manager),
         GitSearchTool(permission_manager),
-        FindTool(permission_manager),
+        FindFilesTool(permission_manager),
         RulesTool(permission_manager),
         watch_tool,
         create_diff_tool(permission_manager),
     ]
 
-    # Add unified search tool (replaces old SearchTool and BatchSearchTool)
-    tools.append(UnifiedSearchTool(permission_manager, project_manager))
+    # Add search if project manager is available
+    if project_manager:
+        tools.append(SearchTool(permission_manager, project_manager))
 
     # Add new search tools if available
     if UNIFIED_SEARCH_AVAILABLE:
@@ -162,13 +158,14 @@ def register_filesystem_tools(
         "edit": Edit,
         "multi_edit": MultiEdit,
         "directory_tree": DirectoryTreeTool,
-        "grep": Grep,  # Legacy alias for UnifiedSearchTool
-        "search": UnifiedSearchTool,  # New unified search tool (replaces SearchTool and BatchSearchTool)
+        "grep": Grep,
         "ast": ASTTool,  # AST-based code structure search with tree-sitter
         "git_search": GitSearchTool,
         "content_replace": ContentReplaceTool,
-        "find": FindTool,
+        "batch_search": BatchSearchTool,
+        "find_files": FindFilesTool,
         "rules": RulesTool,
+        "search": SearchTool,
         "watch": lambda pm: watch_tool,  # Singleton instance
         "diff": create_diff_tool,
     }
@@ -185,8 +182,8 @@ def register_filesystem_tools(
         for tool_name, enabled in enabled_tools.items():
             if enabled and tool_name in tool_classes:
                 tool_class = tool_classes[tool_name]
-                if tool_name == "search":
-                    # Unified search tool requires project_manager
+                if tool_name in ["batch_search", "search"]:
+                    # Batch search and search require project_manager
                     tools.append(tool_class(permission_manager, project_manager))
                 elif tool_name == "watch":
                     # Watch tool is a singleton

hanzo_mcp/tools/filesystem/ast_tool.py

@@ -15,6 +15,7 @@ from grep_ast.grep_ast import TreeContext
 from mcp.server.fastmcp import Context as MCPContext
 
 from hanzo_mcp.tools.filesystem.base import FilesystemBaseTool
+from hanzo_mcp.tools.common.auto_timeout import auto_timeout
 
 Pattern = Annotated[
     str,
@@ -97,6 +98,7 @@ ast "def test_" ./tests
 Searches code structure intelligently, understanding syntax and providing semantic context."""
 
     @override
+    @auto_timeout("ast")
     async def call(
         self,
         ctx: MCPContext,
@@ -112,14 +114,11 @@ Searches code structure intelligently, understanding syntax and providing semant
             Tool result
         """
         tool_ctx = self.create_tool_context(ctx)
-        self.set_tool_context_info(tool_ctx)
+        await self.set_tool_context_info(tool_ctx)
 
         # Extract parameters
         pattern: Pattern = params["pattern"]
         path: SearchPath = params["path"]
-        
-        # Expand path (handles ~, $HOME, etc.)
-        path = self.expand_path(path)
         ignore_case = params.get("ignore_case", False)
         line_number = params.get("line_number", False)