hanzo-mcp 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

hanzo_mcp/tools/agent/unified_cli_tools.py

@@ -0,0 +1,259 @@
+"""Unified CLI Tools - DRY implementation using base agent classes.
+
+This module provides the single, clean implementation of all CLI tools
+following Python best practices and eliminating all duplication.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Any, Dict, List, Optional
+from pathlib import Path
+
+from mcp.server import FastMCP
+from mcp.server.fastmcp import Context
+
+from ..common.base import BaseTool
+from ...core.base_agent import CLIAgent, AgentConfig
+from ..common.permissions import PermissionManager
+from ...core.model_registry import registry
+
+
+class UnifiedCLITool(BaseTool, CLIAgent):
+    """Unified CLI tool that combines BaseTool and CLIAgent functionality.
+    
+    MRO: BaseTool first for proper method resolution order.
+    """
+    
+    def __init__(
+        self,
+        name: str,
+        description: str,
+        cli_command: str,
+        default_model: str,
+        permission_manager: Optional[PermissionManager] = None,
+    ):
+        """Initialize unified CLI tool.
+        
+        Args:
+            name: Tool name
+            description: Tool description
+            cli_command: CLI command to execute
+            default_model: Default model to use
+            permission_manager: Permission manager for access control
+        """
+        # Initialize CLIAgent with config
+        config = AgentConfig(model=default_model)
+        CLIAgent.__init__(self, config)
+        
+        # Store tool metadata
+        self._name = name
+        self._description = description
+        self._cli_command = cli_command
+        self.permission_manager = permission_manager
+    
+    @property
+    def name(self) -> str:
+        return self._name
+    
+    @property
+    def description(self) -> str:
+        return self._description
+    
+    @property
+    def cli_command(self) -> str:
+        return self._cli_command
+    
+    def build_command(self, prompt: str, **kwargs: Any) -> List[str]:
+        """Build the CLI command with model-specific formatting.
+        
+        Args:
+            prompt: The prompt
+            **kwargs: Additional parameters
+            
+        Returns:
+            Command arguments list
+        """
+        command = [self.cli_command]
+        
+        # Get model config from registry
+        model_config = registry.get(self.config.model)
+        
+        # Handle different CLI tool formats
+        if self.cli_command == "claude":
+            if model_config:
+                command.extend(["--model", model_config.full_name])
+            # Claude takes prompt via stdin
+            return command
+            
+        elif self.cli_command == "openai":
+            # OpenAI CLI format
+            command.extend(["api", "chat.completions.create"])
+            if model_config:
+                command.extend(["-m", model_config.full_name])
+            command.extend(["-g", "user", prompt])
+            return command
+            
+        elif self.cli_command in ["gemini", "grok"]:
+            # Simple format: command --model MODEL prompt
+            if model_config:
+                command.extend(["--model", model_config.full_name])
+            command.append(prompt)
+            return command
+            
+        elif self.cli_command == "openhands":
+            # OpenHands format
+            command.extend(["run", prompt])
+            if model_config:
+                command.extend(["--model", model_config.full_name])
+            if self.config.working_dir:
+                command.extend(["--workspace", str(self.config.working_dir)])
+            return command
+            
+        elif self.cli_command == "hanzo":
+            # Hanzo dev format
+            command.append("dev")
+            if model_config:
+                command.extend(["--model", model_config.full_name])
+            command.extend(["--prompt", prompt])
+            return command
+            
+        elif self.cli_command == "cline":
+            # Cline format
+            command.append(prompt)
+            command.append("--no-interactive")
+            return command
+            
+        elif self.cli_command == "aider":
+            # Aider format
+            if model_config:
+                command.extend(["--model", model_config.full_name])
+            command.extend(["--message", prompt])
+            command.extend(["--yes", "--no-stream"])
+            return command
+            
+        elif self.cli_command == "ollama":
+            # Ollama format for local models
+            command.extend(["run", self.config.model.replace("ollama/", "")])
+            command.append(prompt)
+            return command
+        
+        # Default format
+        command.append(prompt)
+        return command
+    
+    async def call(self, ctx: Context[Any, Any, Any], **params: Any) -> str:
+        """Execute the CLI tool via MCP interface.
+        
+        Args:
+            ctx: MCP context
+            **params: Tool parameters
+            
+        Returns:
+            Execution result
+        """
+        # Update config from params
+        if params.get("model"):
+            self.config.model = registry.resolve(params["model"])
+        if params.get("working_dir"):
+            self.config.working_dir = Path(params["working_dir"])
+        if params.get("timeout"):
+            self.config.timeout = params["timeout"]
+        
+        # Execute using base agent
+        result = await self.execute(
+            params.get("prompt", ""),
+            context=ctx,
+        )
+        
+        return result.content
+    
+    def register(self, mcp_server: FastMCP) -> None:
+        """Register this tool with the MCP server.
+        
+        Args:
+            mcp_server: The FastMCP server instance
+        """
+        tool_self = self
+        
+        @mcp_server.tool(name=self.name, description=self.description)
+        async def tool_wrapper(
+            prompt: str,
+            ctx: Context[Any, Any, Any],
+            model: Optional[str] = None,
+            working_dir: Optional[str] = None,
+            timeout: int = 300,
+        ) -> str:
+            return await tool_self.call(
+                ctx,
+                prompt=prompt,
+                model=model,
+                working_dir=working_dir,
+                timeout=timeout,
+            )
+
+
+def create_cli_tools(permission_manager: Optional[PermissionManager] = None) -> Dict[str, UnifiedCLITool]:
+    """Create all CLI tools with unified implementation.
+    
+    Args:
+        permission_manager: Permission manager for access control
+        
+    Returns:
+        Dictionary of tool name to tool instance
+    """
+    tools = {}
+    
+    # Define all tools with their configurations
+    tool_configs = [
+        ("claude", "Execute Claude CLI for AI assistance", "claude", "claude"),
+        ("cc", "Claude Code CLI (alias for claude)", "claude", "claude"),
+        ("codex", "Execute OpenAI Codex/GPT-4 CLI", "openai", "gpt-4-turbo"),
+        ("gemini", "Execute Google Gemini CLI", "gemini", "gemini"),
+        ("grok", "Execute xAI Grok CLI", "grok", "grok"),
+        ("openhands", "Execute OpenHands for autonomous coding", "openhands", "claude"),
+        ("oh", "OpenHands CLI (alias)", "openhands", "claude"),
+        ("hanzo_dev", "Execute Hanzo Dev AI assistant", "hanzo", "claude"),
+        ("cline", "Execute Cline for autonomous coding", "cline", "claude"),
+        ("aider", "Execute Aider for AI pair programming", "aider", "gpt-4-turbo"),
+    ]
+    
+    for name, description, cli_command, default_model in tool_configs:
+        tools[name] = UnifiedCLITool(
+            name=name,
+            description=description,
+            cli_command=cli_command,
+            default_model=default_model,
+            permission_manager=permission_manager,
+        )
+    
+    return tools
+
+
+def register_cli_tools(
+    mcp_server: FastMCP,
+    permission_manager: Optional[PermissionManager] = None,
+) -> List[BaseTool]:
+    """Register all CLI tools with the MCP server.
+    
+    Args:
+        mcp_server: The FastMCP server instance
+        permission_manager: Permission manager for access control
+        
+    Returns:
+        List of registered CLI tools
+    """
+    tools = create_cli_tools(permission_manager)
+    
+    # Register each tool
+    for tool in tools.values():
+        tool.register(mcp_server)
+    
+    return list(tools.values())
+
+
+__all__ = [
+    "UnifiedCLITool",
+    "create_cli_tools",
+    "register_cli_tools",
+]

hanzo_mcp/tools/common/batch_tool.py

@@ -140,6 +140,8 @@ To make a batch call, provide the following:
 
 Available tools in batch call:
 Tool: dispatch_agent,read,directory_tree,grep,grep_ast,run_command,notebook_read
+CLI Tools: claude,cc,codex,gemini,grok,openhands,oh,hanzo_dev,cline,aider
+AST/Symbols: ast,symbols (tree-sitter based code analysis)
 Not available: think,write,edit,multi_edit,notebook_edit
 """
 

hanzo_mcp/tools/common/context.py

@@ -67,7 +67,9 @@ class ToolContext:
         """
         return self._mcp_context.client_id
 
-    def set_tool_info(self, tool_name: str, execution_id: str | None = None) -> None:
+    async def set_tool_info(
+        self, tool_name: str, execution_id: str | None = None
+    ) -> None:
         """Set information about the currently executing tool.
 
         Args:

hanzo_mcp/tools/config/config_tool.py

@@ -4,10 +4,12 @@ Git-style config tool for managing settings.
 """
 
 from typing import Unpack, Optional, Annotated, TypedDict, final, override
+from pathlib import Path
 
 from pydantic import Field
 from mcp.server.fastmcp import Context as MCPContext
 
+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
 from hanzo_mcp.tools.config.index_config import IndexScope, IndexConfig
@@ -24,7 +26,7 @@ Action = Annotated[
 Key = Annotated[
     Optional[str],
     Field(
-        description="Configuration key (e.g., index.scope, vector.enabled)",
+        description="Configuration key (e.g., tools.write.enabled, enabled_tools.write, index.scope)",
         default=None,
     ),
 ]
@@ -64,6 +66,15 @@ class ConfigParams(TypedDict, total=False):
     path: Optional[str]
 
 
+def _parse_bool(value: str) -> Optional[bool]:
+    v = value.strip().lower()
+    if v in {"true", "1", "yes", "on"}:
+        return True
+    if v in {"false", "0", "no", "off"}:
+        return False
+    return None
+
+
 @final
 class ConfigTool(BaseTool):
     """Git-style configuration management tool."""
@@ -88,6 +99,7 @@ class ConfigTool(BaseTool):
 Usage:
 config index.scope
 config --action set index.scope project
+config --action set tools.write.enabled false
 config --action list
 config --action toggle index.scope --path ./project"""
 
@@ -131,7 +143,22 @@ config --action toggle index.scope --path ./project"""
             current_scope = self.index_config.get_scope(path)
             return f"index.scope={current_scope.value}"
 
-        # Handle tool-specific settings
+        # tools.<name>.enabled → enabled_tools lookup
+        if key.startswith("tools.") and key.endswith(".enabled"):
+            parts = key.split(".")
+            if len(parts) == 3:
+                tool_name = parts[1]
+                settings = load_settings(project_dir=path if scope == "local" else None)
+                return f"{key}={settings.is_tool_enabled(tool_name)}"
+
+        # enabled_tools.<name>
+        if key.startswith("enabled_tools."):
+            tool_name = key.split(".", 1)[1]
+            settings = load_settings(project_dir=path if scope == "local" else None)
+            val = settings.enabled_tools.get(tool_name)
+            return f"{key}={val if val is not None else 'unset'}"
+
+        # Indexing (legacy) per-tool setting: <tool>.enabled
         if "." in key:
             tool, setting = key.split(".", 1)
             if setting == "enabled":
@@ -140,6 +167,17 @@ config --action toggle index.scope --path ./project"""
 
         return f"Unknown key: {key}"
 
+    def _save_project_settings(self, settings, project_dir: Optional[str]) -> Path:
+        """Save to project config if path provided; else global."""
+        if project_dir:
+            project_path = Path(project_dir)
+            project_path.mkdir(parents=True, exist_ok=True)
+            cfg = project_path / ".hanzo-mcp.json"
+            cfg.write_text(__import__("json").dumps(settings.__dict__ if hasattr(settings, "__dict__") else {}, indent=2))
+            return cfg
+        # Fallback to global handler
+        return save_settings(settings, global_config=True)
+
     async def _handle_set(
         self,
         key: Optional[str],
@@ -151,7 +189,7 @@ config --action toggle index.scope --path ./project"""
         """Set configuration value."""
         if not key:
             return "Error: key required for set action"
-        if not value:
+        if value is None:
             return "Error: value required for set action"
 
         # Handle index scope
@@ -165,13 +203,54 @@ config --action toggle index.scope --path ./project"""
             except ValueError:
                 return f"Error: Invalid scope value '{value}'. Valid: project, global, auto"
 
-        # Handle tool-specific settings
+        # tools.<name>.enabled → enabled_tools mapping
+        if key.startswith("tools.") and key.endswith(".enabled"):
+            parts = key.split(".")
+            if len(parts) == 3:
+                tool_name = parts[1]
+                parsed = _parse_bool(value)
+                if parsed is None:
+                    return "Error: value must be boolean (true/false)"
+                settings = load_settings(project_dir=path if scope == "local" else None)
+                et = dict(settings.enabled_tools)
+                et[tool_name] = parsed
+                settings.enabled_tools = et
+                # Save
+                if scope == "local" and path:
+                    # Write a project .hanzo-mcp.json adjacent to the path
+                    # Note: save_settings(local) saves to CWD; we target specific path here
+                    out = self._save_project_settings(settings, path)
+                    return f"Set {key}={parsed} (project: {out})"
+                else:
+                    out = save_settings(settings, global_config=True)
+                    return f"Set {key}={parsed} (global: {out})"
+
+        # enabled_tools.<name>
+        if key.startswith("enabled_tools."):
+            tool_name = key.split(".", 1)[1]
+            parsed = _parse_bool(value)
+            if parsed is None:
+                return "Error: value must be boolean (true/false)"
+            settings = load_settings(project_dir=path if scope == "local" else None)
+            et = dict(settings.enabled_tools)
+            et[tool_name] = parsed
+            settings.enabled_tools = et
+            if scope == "local" and path:
+                out = self._save_project_settings(settings, path)
+                return f"Set {key}={parsed} (project: {out})"
+            else:
+                out = save_settings(settings, global_config=True)
+                return f"Set {key}={parsed} (global: {out})"
+
+        # Indexing (legacy) per-tool setting: <tool>.enabled (search indexers)
         if "." in key:
             tool, setting = key.split(".", 1)
             if setting == "enabled":
-                enabled = value.lower() in ["true", "yes", "1", "on"]
-                self.index_config.set_indexing_enabled(tool, enabled)
-                return f"Set {key}={enabled}"
+                parsed = _parse_bool(value)
+                if parsed is None:
+                    return "Error: value must be boolean (true/false)"
+                self.index_config.set_indexing_enabled(tool, parsed)
+                return f"Set {key}={parsed}"
 
         return f"Unknown key: {key}"
 
@@ -188,12 +267,18 @@ config --action toggle index.scope --path ./project"""
 
         output.append(f"\nProjects with custom config: {status['project_count']}")
 
-        output.append("\nTool settings:")
+        output.append("\nTool settings (indexing):")
         for tool, settings in status["tools"].items():
             output.append(f"  {tool}:")
             output.append(f"    enabled: {settings['enabled']}")
             output.append(f"    per_project: {settings['per_project']}")
 
+        # Also show enabled_tools snapshot
+        settings_snapshot = load_settings(project_dir=path if scope == "local" else None)
+        output.append("\nEnabled tools (execution):")
+        for tool_name, enabled in sorted(settings_snapshot.enabled_tools.items()):
+            output.append(f"  {tool_name}: {enabled}")
+
         return "\n".join(output)
 
     async def _handle_toggle(
@@ -210,7 +295,34 @@ config --action toggle index.scope --path ./project"""
             )
             return f"Toggled index.scope to {new_scope.value}"
 
-        # Handle tool enable/disable toggle
+        # Handle execution tool enable/disable: tools.<name>.enabled or enabled_tools.<name>
+        if key.startswith("tools.") and key.endswith(".enabled"):
+            parts = key.split(".")
+            if len(parts) == 3:
+                tool_name = parts[1]
+                settings = load_settings(project_dir=path if scope == "local" else None)
+                current = bool(settings.enabled_tools.get(tool_name, True))
+                settings.enabled_tools[tool_name] = not current
+                if scope == "local" and path:
+                    out = self._save_project_settings(settings, path)
+                    return f"Toggled {key} to {not current} (project: {out})"
+                else:
+                    out = save_settings(settings, global_config=True)
+                    return f"Toggled {key} to {not current} (global: {out})"
+
+        if key.startswith("enabled_tools."):
+            tool_name = key.split(".", 1)[1]
+            settings = load_settings(project_dir=path if scope == "local" else None)
+            current = bool(settings.enabled_tools.get(tool_name, True))
+            settings.enabled_tools[tool_name] = not current
+            if scope == "local" and path:
+                out = self._save_project_settings(settings, path)
+                return f"Toggled {key} to {not current} (project: {out})"
+            else:
+                out = save_settings(settings, global_config=True)
+                return f"Toggled {key} to {not current} (global: {out})"
+
+        # Handle indexing toggles (legacy)
         if "." in key:
             tool, setting = key.split(".", 1)
             if setting == "enabled":

hanzo_mcp/tools/filesystem/__init__.py

@@ -221,4 +221,22 @@ def register_filesystem_tools(
             tools = get_filesystem_tools(permission_manager, project_manager)
 
     ToolRegistry.register_tools(mcp_server, tools)
+
+    # Register 'symbols' as an alias for 'ast' to match common terminology
+    try:
+        ast_tool = next((t for t in tools if getattr(t, "name", "") == "ast"), None)
+        if ast_tool is not None:
+            class _SymbolsAlias(ASTTool):  # type: ignore[misc]
+                @property
+                def name(self) -> str:  # type: ignore[override]
+                    return "symbols"
+
+                @property
+                def description(self) -> str:  # type: ignore[override]
+                    return f"Alias of 'ast' tool.\n\n{ast_tool.description}"
+
+            ToolRegistry.register_tool(mcp_server, _SymbolsAlias(permission_manager))
+    except Exception:
+        # Alias is best-effort; don't fail tool registration if aliasing fails
+        pass
     return tools

hanzo_mcp/tools/llm/__init__.py

@@ -1,22 +1,50 @@
-"""LLM tools for Hanzo AI."""
-
-# Legacy imports for backwards compatibility
-from hanzo_mcp.tools.llm.llm_tool import LLMTool
-from hanzo_mcp.tools.llm.llm_manage import LLMManageTool
-from hanzo_mcp.tools.llm.consensus_tool import ConsensusTool
-from hanzo_mcp.tools.llm.provider_tools import (
-    GroqTool,
-    GeminiTool,
-    OpenAITool,
-    MistralTool,
-    AnthropicTool,
-    PerplexityTool,
-    create_provider_tools,
-)
+"""LLM tools for Hanzo AI.
+
+This package exposes LLM-related tools. Imports are guarded to keep the
+package importable on environments lacking optional dependencies or newer
+typing features.
+"""
+
+try:  # pragma: no cover - guard heavy imports
+    from hanzo_mcp.tools.llm.llm_tool import LLMTool
+except Exception:  # pragma: no cover
+    LLMTool = None  # type: ignore
+
+try:  # pragma: no cover
+    from hanzo_mcp.tools.llm.llm_manage import LLMManageTool
+except Exception:
+    LLMManageTool = None  # type: ignore
+
+try:  # pragma: no cover
+    from hanzo_mcp.tools.llm.consensus_tool import ConsensusTool
+except Exception:
+    ConsensusTool = None  # type: ignore
+
+try:  # pragma: no cover
+    from hanzo_mcp.tools.llm.llm_unified import UnifiedLLMTool
+except Exception:
+    UnifiedLLMTool = None  # type: ignore
+
+try:  # pragma: no cover
+    from hanzo_mcp.tools.llm.provider_tools import (
+        GroqTool,
+        GeminiTool,
+        OpenAITool,
+        MistralTool,
+        AnthropicTool,
+        PerplexityTool,
+        create_provider_tools,
+    )
+except Exception:  # pragma: no cover
+    GroqTool = GeminiTool = OpenAITool = MistralTool = AnthropicTool = PerplexityTool = None  # type: ignore
+
+    def create_provider_tools(*args, **kwargs):  # type: ignore
+        return []
+
 
 __all__ = [
     "LLMTool",
-    "LLMTool",
+    "UnifiedLLMTool",
     "ConsensusTool",
     "LLMManageTool",
     "create_provider_tools",

hanzo_mcp/tools/llm/llm_tool.py

@@ -280,6 +280,19 @@ Available: {", ".join(available) if available else "None"}"""
             # Running in test mode without MCP context
             pass
 
+        # Fast test path: allow offline deterministic responses
+        if os.getenv("HANZO_MCP_FAST_TESTS") == "1":
+            action = params.get("action", "query")
+            if action == "query":
+                prompt = params.get("prompt", "") or ""
+                # Simple keyword routing for tests
+                if "generate tasks" in prompt.lower():
+                    return '{"project": "Demo", "tasks": [{"title": "Init repo", "slug": "init-repo"}, {"title": "Add CI", "slug": "add-ci"}]}'
+                return "Architecture Proposal: minimal service layers and tests"
+            elif action == "consensus":
+                return "Consensus: aligned"
+            # Other actions can fall through to regular path if available
+
         if not LITELLM_AVAILABLE:
             return (
                 "Error: LiteLLM is not installed. Install it with: pip install litellm"