hanzo-mcp 0.5.0__tar.gz → 0.5.2__tar.gz

{hanzo_mcp-0.5.0 → hanzo_mcp-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hanzo-mcp
-Version: 0.5.0
+Version: 0.5.2
 Summary: MCP implementation of Hanzo capabilities
 Author-email: Hanzo Industries Inc <dev@hanzo.ai>
 License: MIT
@@ -45,6 +45,10 @@ Dynamic: license-file
 
 # Hanzo MCP
 
+[![Open in Hanzo.App](https://img.shields.io/badge/Open%20in-Hanzo.App-8A2BE2?style=for-the-badge&logo=rocket)](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp)
+[![Add Feature with Hanzo Dev](https://img.shields.io/badge/Add%20Feature-Hanzo%20Dev-00D4AA?style=for-the-badge&logo=plus)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=feature)
+[![Fix Bugs with Hanzo Dev](https://img.shields.io/badge/Fix%20Bugs-Hanzo%20Dev-FF6B6B?style=for-the-badge&logo=wrench)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=bugfix)
+
 An implementation of Hanzo capabilities using the Model Context Protocol (MCP).
 
 ## Overview
@@ -67,26 +71,59 @@ This project provides an MCP server that implements Hanzo-like functionality, al
 
 ## Tools Implemented
 
-| Tool                   | Description                                                                                   |
-| ---------------------- | --------------------------------------------------------------------------------------------- |
-| `read_files`           | Read one or multiple files with encoding detection                                            |
-| `write_file`           | Create or overwrite files                                                                     |
-| `edit_file`            | Make line-based edits to text files                                                           |
-| `directory_tree`       | Get a recursive tree view of directories                                                      |
-| `get_file_info`        | Get metadata about a file or directory                                                        |
-| `search_content`       | Search for patterns in file contents                                                          |
-| `content_replace`      | Replace patterns in file contents                                                             |
-| `run_command`          | Execute shell commands (also used for directory creation, file moving, and directory listing) |
-| `run_script`           | Execute scripts with specified interpreters                                                   |
-| `script_tool`          | Execute scripts in specific programming languages                                             |
-| `project_analyze_tool` | Analyze project structure and dependencies                                                    |
-| `read_notebook`        | Extract and read source code from all cells in a Jupyter notebook with outputs                |
-| `edit_notebook`        | Edit, insert, or delete cells in a Jupyter notebook                                           |
-| `think`                | Structured space for complex reasoning and analysis without making changes                    |
-| `dispatch_agent`       | Launch one or more agents that can perform tasks using read-only tools concurrently           |
+### Core File Operations
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `read`            | Read one or multiple files with encoding detection and line range support           |
+| `write`           | Create or overwrite files with content                                              |
+| `edit`            | Make precise line-based edits to existing files                                     |
+| `multi_edit`      | Make multiple edits to a single file in one atomic operation                        |
+| `directory_tree`  | Get a recursive tree view of directories with customizable depth and filters        |
+| `content_replace` | Replace patterns in file contents using regex                                       |
+
+### Search & Analysis
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `grep`            | Fast pattern search across files using ripgrep                                      |
+| `grep_ast`        | AST-aware code search that understands code structure                               |
+| `unified_search`  | Intelligent multi-modal search combining text, vector, AST, and symbol search       |
+| `vector_search`   | Semantic search across indexed documents and code                                   |
+| `vector_index`    | Index documents and code in project-aware vector databases                          |
+
+### Shell & Commands
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `run_command`     | Execute shell commands with timeout, environment control, and session support       |
+
+### Jupyter Support
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `notebook_read`   | Read Jupyter notebook cells with outputs and metadata                               |
+| `notebook_edit`   | Edit, insert, or delete cells in Jupyter notebooks                                  |
+
+### Task Management
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `todo_read`       | Read the current task list for tracking progress                                    |
+| `todo_write`      | Create and manage structured task lists with status and priority                    |
+
+### Advanced Tools
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `think`           | Structured space for complex reasoning and analysis without making changes          |
+| `dispatch_agent`  | Launch specialized sub-agents for concurrent task execution                         |
+| `batch`           | Execute multiple tool calls in a single operation for performance                   |
+
+For detailed documentation on all tools, see [TOOLS_DOCUMENTATION.md](./TOOLS_DOCUMENTATION.md).
 
 ## Getting Started
 
+### 🚀 Try it Instantly in Hanzo.App
+
+**No setup required!** Launch this project instantly in your browser:
+
+[![Open in Hanzo.App](https://img.shields.io/badge/Launch%20Now-Hanzo.App-8A2BE2?style=for-the-badge&logo=rocket&logoColor=white)](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp)
+
 ### Quick Install
 
 ```bash
@@ -120,7 +157,7 @@ cd mcp
 make install-desktop
 
 # With custom paths and server name
-make install-desktop ALLOWED_PATHS="/path/to/projects,/another/path" SERVER_NAME="hanzo-dev"
+make install-desktop ALLOWED_PATHS="/path/to/projects,/another/path" SERVER_NAME="hanzo"
 
 # Disable write tools (useful if you prefer using your IDE for edits)
 make install-desktop DISABLE_WRITE=1
@@ -215,7 +252,11 @@ make publish-test
 
 ### Contributing
 
-To contribute to this project:
+**New contributors welcome!** 🎉 We've made it easy to contribute:
+
+[![Contribute with Hanzo Dev](https://img.shields.io/badge/Contribute%20with-Hanzo%20Dev-00D4AA?style=for-the-badge&logo=code)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=contribute)
+
+**Traditional approach:**
 
 1. Fork the repository
 2. Create a feature branch (`git checkout -b feature/amazing-feature`)
@@ -223,6 +264,13 @@ To contribute to this project:
 4. Push to the branch (`git push origin feature/amazing-feature`)
 5. Open a Pull Request
 
+**Or use Hanzo Dev for AI-assisted contributions:**
+- [Launch in Hanzo.App](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp) for instant setup
+- [Add new features](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=feature) with AI assistance
+- [Fix bugs automatically](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=bugfix)
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for detailed guidelines.
+
 ## License
 
 This project is licensed under the MIT License - see the LICENSE file for details.

hanzo_mcp-0.5.2/README.md

@@ -0,0 +1,231 @@
+# Hanzo MCP
+
+[![Open in Hanzo.App](https://img.shields.io/badge/Open%20in-Hanzo.App-8A2BE2?style=for-the-badge&logo=rocket)](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp)
+[![Add Feature with Hanzo Dev](https://img.shields.io/badge/Add%20Feature-Hanzo%20Dev-00D4AA?style=for-the-badge&logo=plus)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=feature)
+[![Fix Bugs with Hanzo Dev](https://img.shields.io/badge/Fix%20Bugs-Hanzo%20Dev-FF6B6B?style=for-the-badge&logo=wrench)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=bugfix)
+
+An implementation of Hanzo capabilities using the Model Context Protocol (MCP).
+
+## Overview
+
+This project provides an MCP server that implements Hanzo-like functionality, allowing Claude to directly execute instructions for modifying and improving project files. By leveraging the Model Context Protocol, this implementation enables seamless integration with various MCP clients including Claude Desktop.
+
+![example](./docs/example.gif)
+
+## Features
+
+- **Code Understanding**: Analyze and understand codebases through file access and pattern searching
+- **Code Modification**: Make targeted edits to files with proper permission handling
+- **Enhanced Command Execution**: Run commands and scripts in various languages with improved error handling and shell support
+- **File Operations**: Manage files with proper security controls through shell commands
+- **Code Discovery**: Find relevant files and code patterns across your project
+- **Project Analysis**: Understand project structure, dependencies, and frameworks
+- **Agent Delegation**: Delegate complex tasks to specialized sub-agents that can work concurrently
+- **Multiple LLM Provider Support**: Configure any LiteLLM-compatible model for agent operations
+- **Jupyter Notebook Support**: Read and edit Jupyter notebooks with full cell and output handling
+
+## Tools Implemented
+
+### Core File Operations
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `read`            | Read one or multiple files with encoding detection and line range support           |
+| `write`           | Create or overwrite files with content                                              |
+| `edit`            | Make precise line-based edits to existing files                                     |
+| `multi_edit`      | Make multiple edits to a single file in one atomic operation                        |
+| `directory_tree`  | Get a recursive tree view of directories with customizable depth and filters        |
+| `content_replace` | Replace patterns in file contents using regex                                       |
+
+### Search & Analysis
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `grep`            | Fast pattern search across files using ripgrep                                      |
+| `grep_ast`        | AST-aware code search that understands code structure                               |
+| `unified_search`  | Intelligent multi-modal search combining text, vector, AST, and symbol search       |
+| `vector_search`   | Semantic search across indexed documents and code                                   |
+| `vector_index`    | Index documents and code in project-aware vector databases                          |
+
+### Shell & Commands
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `run_command`     | Execute shell commands with timeout, environment control, and session support       |
+
+### Jupyter Support
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `notebook_read`   | Read Jupyter notebook cells with outputs and metadata                               |
+| `notebook_edit`   | Edit, insert, or delete cells in Jupyter notebooks                                  |
+
+### Task Management
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `todo_read`       | Read the current task list for tracking progress                                    |
+| `todo_write`      | Create and manage structured task lists with status and priority                    |
+
+### Advanced Tools
+| Tool              | Description                                                                         |
+| ----------------- | ----------------------------------------------------------------------------------- |
+| `think`           | Structured space for complex reasoning and analysis without making changes          |
+| `dispatch_agent`  | Launch specialized sub-agents for concurrent task execution                         |
+| `batch`           | Execute multiple tool calls in a single operation for performance                   |
+
+For detailed documentation on all tools, see [TOOLS_DOCUMENTATION.md](./TOOLS_DOCUMENTATION.md).
+
+## Getting Started
+
+### 🚀 Try it Instantly in Hanzo.App
+
+**No setup required!** Launch this project instantly in your browser:
+
+[![Open in Hanzo.App](https://img.shields.io/badge/Launch%20Now-Hanzo.App-8A2BE2?style=for-the-badge&logo=rocket&logoColor=white)](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp)
+
+### Quick Install
+
+```bash
+# Install using uv
+uv pip install hanzo-mcp
+
+# Or using pip
+pip install hanzo-mcp
+```
+
+### Claude Desktop Integration
+
+To install and configure hanzo-mcp for use with Claude Desktop:
+
+```bash
+# Install the package globally
+uv pip install hanzo-mcp
+
+# Install configuration to Claude Desktop with default settings
+hanzo-mcp --install
+```
+
+For development, if you want to install your local version to Claude Desktop:
+
+```bash
+# Clone and navigate to the repository
+git clone https://github.com/hanzoai/mcp.git
+cd mcp
+
+# Install and configure for Claude Desktop
+make install-desktop
+
+# With custom paths and server name
+make install-desktop ALLOWED_PATHS="/path/to/projects,/another/path" SERVER_NAME="hanzo"
+
+# Disable write tools (useful if you prefer using your IDE for edits)
+make install-desktop DISABLE_WRITE=1
+```
+
+After installation, restart Claude Desktop. You'll see "hanzo" (or your custom server name) available in the MCP server dropdown.
+
+For detailed installation and configuration instructions, please refer to the [documentation](./docs/).
+
+Of course, you can also read [USEFUL_PROMPTS](./docs/USEFUL_PROMPTS.md) for some inspiration on how to use hanzo-mcp.
+
+## Security
+
+This implementation follows best practices for securing access to your filesystem:
+
+- Permission prompts for file modifications and command execution
+- Restricted access to specified directories only
+- Input validation and sanitization
+- Proper error handling and reporting
+
+## Documentation
+
+Comprehensive documentation is available in the [docs](./docs/) directory. You can build and view the documentation locally:
+
+```bash
+# Build the documentation
+make docs
+
+# Start a local server to view the documentation
+make docs-serve
+```
+
+Then open http://localhost:8000/ in your browser to view the documentation.
+
+## Development
+
+### Setup Development Environment
+
+```bash
+# Clone the repository
+git clone https://github.com/hanzoai/mcp.git
+cd mcp
+
+# Install Python 3.13 using uv
+make install-python
+
+# Setup virtual environment and install dependencies
+make setup
+
+# Or install with development dependencies
+make install-dev
+```
+
+### Testing
+
+```bash
+# Run tests
+make test
+
+# Run tests with coverage
+make test-cov
+```
+
+### Building and Publishing
+
+```bash
+# Build package
+make build
+
+# Version bumping
+make bump-patch    # Increment patch version (0.1.x → 0.1.x+1)
+make bump-minor    # Increment minor version (0.x.0 → 0.x+1.0)
+make bump-major    # Increment major version (x.0.0 → x+1.0.0)
+
+# Manual version bumping (alternative to make commands)
+python -m scripts.bump_version patch  # Increment patch version
+python -m scripts.bump_version minor  # Increment minor version
+python -m scripts.bump_version major  # Increment major version
+
+# Publishing (creates git tag and pushes it to GitHub)
+make publish                     # Publish using configured credentials in .pypirc
+PYPI_TOKEN=your_token make publish  # Publish with token from environment variable
+
+# Publishing (creates git tag, pushes to GitHub, and publishes to PyPI)
+make patch    # Bump patch version, build, publish, create git tag, and push
+make minor    # Bump minor version, build, publish, create git tag, and push
+make major    # Bump major version, build, publish, create git tag, and push
+
+# Publish to Test PyPI
+make publish-test
+```
+
+### Contributing
+
+**New contributors welcome!** 🎉 We've made it easy to contribute:
+
+[![Contribute with Hanzo Dev](https://img.shields.io/badge/Contribute%20with-Hanzo%20Dev-00D4AA?style=for-the-badge&logo=code)](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=contribute)
+
+**Traditional approach:**
+
+1. Fork the repository
+2. Create a feature branch (`git checkout -b feature/amazing-feature`)
+3. Commit your changes (`git commit -m 'Add some amazing feature'`)
+4. Push to the branch (`git push origin feature/amazing-feature`)
+5. Open a Pull Request
+
+**Or use Hanzo Dev for AI-assisted contributions:**
+- [Launch in Hanzo.App](https://hanzo.app/launch?repo=https://github.com/hanzoai/mcp) for instant setup
+- [Add new features](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=feature) with AI assistance
+- [Fix bugs automatically](https://hanzo.app/dev?repo=https://github.com/hanzoai/mcp&action=bugfix)
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for detailed guidelines.
+
+## License
+
+This project is licensed under the MIT License - see the LICENSE file for details.

{hanzo_mcp-0.5.0 → hanzo_mcp-0.5.2}/hanzo_mcp/__init__.py

@@ -1,3 +1,3 @@
 """Hanzo MCP - Implementation of Hanzo capabilities using MCP."""
 
-__version__ = "0.5.0"
+__version__ = "0.5.2"

{hanzo_mcp-0.5.0 → hanzo_mcp-0.5.2}/hanzo_mcp/config/settings.py

@@ -280,6 +280,67 @@ def get_project_config_path(project_dir: Optional[str] = None) -> Optional[Path]
     return None
 
 
+def ensure_project_hanzo_dir(project_dir: str) -> Path:
+    """Ensure .hanzo directory exists in project and return its path."""
+    project_path = Path(project_dir)
+    hanzo_dir = project_path / ".hanzo"
+    hanzo_dir.mkdir(exist_ok=True)
+    
+    # Create default structure
+    (hanzo_dir / "db").mkdir(exist_ok=True)  # Vector database
+    
+    # Create default project config if it doesn't exist
+    config_path = hanzo_dir / "mcp-settings.json"
+    if not config_path.exists():
+        default_project_config = {
+            "name": project_path.name,
+            "root_path": str(project_path),
+            "rules": [
+                "Follow project-specific coding standards",
+                "Test all changes before committing",
+                "Update documentation for new features"
+            ],
+            "workflows": {
+                "development": {
+                    "steps": ["edit", "test", "commit"],
+                    "tools": ["read", "write", "edit", "run_command"]
+                },
+                "documentation": {
+                    "steps": ["read", "analyze", "write"],
+                    "tools": ["read", "write", "vector_search"]
+                }
+            },
+            "tasks": [],
+            "enabled_tools": {},
+            "disabled_tools": [],
+            "mcp_servers": []
+        }
+        
+        with open(config_path, 'w') as f:
+            json.dump(default_project_config, f, indent=2)
+    
+    return hanzo_dir
+
+
+def detect_project_from_path(file_path: str) -> Optional[Dict[str, str]]:
+    """Detect project information from a file path by looking for LLM.md."""
+    path = Path(file_path).resolve()
+    current_path = path.parent if path.is_file() else path
+    
+    while current_path != current_path.parent:  # Stop at filesystem root
+        llm_md_path = current_path / "LLM.md"
+        if llm_md_path.exists():
+            return {
+                "name": current_path.name,
+                "root_path": str(current_path),
+                "llm_md_path": str(llm_md_path),
+                "hanzo_dir": str(ensure_project_hanzo_dir(str(current_path)))
+            }
+        current_path = current_path.parent
+    
+    return None
+
+
 def load_settings(
     project_dir: Optional[str] = None,
     config_overrides: Optional[Dict[str, Any]] = None

{hanzo_mcp-0.5.0 → hanzo_mcp-0.5.2}/hanzo_mcp/tools/__init__.py

@@ -14,13 +14,22 @@ from fastmcp import FastMCP
 from hanzo_mcp.tools.agent import register_agent_tools
 from hanzo_mcp.tools.common import register_batch_tool, register_thinking_tool
 from hanzo_mcp.tools.common.base import BaseTool
-
 from hanzo_mcp.tools.common.permissions import PermissionManager
+from hanzo_mcp.tools.common.tool_enable import ToolEnableTool
+from hanzo_mcp.tools.common.tool_disable import ToolDisableTool
+from hanzo_mcp.tools.common.tool_list import ToolListTool
+from hanzo_mcp.tools.common.stats import StatsTool
 from hanzo_mcp.tools.filesystem import register_filesystem_tools
 from hanzo_mcp.tools.jupyter import register_jupyter_tools
 from hanzo_mcp.tools.shell import register_shell_tools
 from hanzo_mcp.tools.todo import register_todo_tools
 from hanzo_mcp.tools.vector import register_vector_tools
+from hanzo_mcp.tools.database import register_database_tools, DatabaseManager
+from hanzo_mcp.tools.mcp.mcp_add import McpAddTool
+from hanzo_mcp.tools.mcp.mcp_remove import McpRemoveTool
+from hanzo_mcp.tools.mcp.mcp_stats import McpStatsTool
+from hanzo_mcp.tools.editor import NeovimEditTool, NeovimCommandTool, NeovimSessionTool
+from hanzo_mcp.tools.llm import LLMTool, ConsensusTool, LLMManageTool, create_provider_tools
 
 
 def register_all_tools(
@@ -76,13 +85,38 @@ def register_all_tools(
         "directory_tree": is_tool_enabled("directory_tree", True),
         "grep": is_tool_enabled("grep", not disable_search_tools),
         "grep_ast": is_tool_enabled("grep_ast", not disable_search_tools),
+        "git_search": is_tool_enabled("git_search", not disable_search_tools),
         "content_replace": is_tool_enabled("content_replace", not disable_write_tools),
+        "batch_search": is_tool_enabled("batch_search", not disable_search_tools),
+        "find_files": is_tool_enabled("find_files", True),
+    }
+    
+    # Vector tools setup (needed for unified search)
+    project_manager = None
+    vector_enabled = {
+        "vector_index": is_tool_enabled("vector_index", False),
+        "vector_search": is_tool_enabled("vector_search", False),
     }
     
+    # Create project manager if vector tools or batch_search are enabled
+    if any(vector_enabled.values()) or filesystem_enabled.get("batch_search", False):
+        if vector_config:
+            from hanzo_mcp.tools.vector.project_manager import ProjectVectorManager
+            search_paths = [str(path) for path in permission_manager.allowed_paths]
+            project_manager = ProjectVectorManager(
+                global_db_path=vector_config.get("data_path"),
+                embedding_model=vector_config.get("embedding_model", "text-embedding-3-small"),
+                dimension=vector_config.get("dimension", 1536),
+            )
+            # Auto-detect projects from search paths
+            detected_projects = project_manager.detect_projects(search_paths)
+            print(f"Detected {len(detected_projects)} projects with LLM.md files")
+    
     filesystem_tools = register_filesystem_tools(
         mcp_server, 
         permission_manager, 
         enabled_tools=filesystem_enabled,
+        project_manager=project_manager,
     )
     for tool in filesystem_tools:
         all_tools[tool.name] = tool
@@ -137,22 +171,14 @@ def register_all_tools(
         for tool in thinking_tool:
             all_tools[tool.name] = tool
 
-    # Register vector tools if enabled
-    vector_enabled = {
-        "vector_index": is_tool_enabled("vector_index", False),
-        "vector_search": is_tool_enabled("vector_search", False),
-    }
-    
-    if any(vector_enabled.values()) and vector_config:
-        # Get allowed paths for project detection
-        search_paths = [str(path) for path in permission_manager.allowed_paths]
-        
+    # Register vector tools if enabled (reuse project_manager if available)
+    if any(vector_enabled.values()) and project_manager:
         vector_tools = register_vector_tools(
             mcp_server, 
             permission_manager, 
             vector_config=vector_config,
             enabled_tools=vector_enabled,
-            search_paths=search_paths,
+            project_manager=project_manager,
         )
         for tool in vector_tools:
             all_tools[tool.name] = tool
@@ -160,3 +186,123 @@ def register_all_tools(
     # Register batch tool if enabled (batch tool is typically always enabled)
     if is_tool_enabled("batch", True):
         register_batch_tool(mcp_server, all_tools)
+    
+    # Register database tools if enabled
+    db_manager = None
+    database_enabled = {
+        "sql_query": is_tool_enabled("sql_query", True),
+        "sql_search": is_tool_enabled("sql_search", True),
+        "sql_stats": is_tool_enabled("sql_stats", True),
+        "graph_add": is_tool_enabled("graph_add", True),
+        "graph_remove": is_tool_enabled("graph_remove", True),
+        "graph_query": is_tool_enabled("graph_query", True),
+        "graph_search": is_tool_enabled("graph_search", True),
+        "graph_stats": is_tool_enabled("graph_stats", True),
+    }
+    
+    if any(database_enabled.values()):
+        db_manager = DatabaseManager(permission_manager)
+        database_tools = register_database_tools(
+            mcp_server,
+            permission_manager,
+            db_manager=db_manager,
+        )
+        # Filter based on enabled state
+        for tool in database_tools:
+            if database_enabled.get(tool.name, True):
+                all_tools[tool.name] = tool
+    
+    # Register MCP management tools if enabled
+    mcp_enabled = {
+        "mcp_add": is_tool_enabled("mcp_add", True),
+        "mcp_remove": is_tool_enabled("mcp_remove", True),
+        "mcp_stats": is_tool_enabled("mcp_stats", True),
+    }
+    
+    if mcp_enabled.get("mcp_add", True):
+        tool = McpAddTool()
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    if mcp_enabled.get("mcp_remove", True):
+        tool = McpRemoveTool()
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    if mcp_enabled.get("mcp_stats", True):
+        tool = McpStatsTool()
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    # Register system tools (always enabled)
+    # Tool enable/disable tools
+    tool_enable = ToolEnableTool()
+    tool_enable.register(mcp_server)
+    all_tools[tool_enable.name] = tool_enable
+    
+    tool_disable = ToolDisableTool()
+    tool_disable.register(mcp_server)
+    all_tools[tool_disable.name] = tool_disable
+    
+    tool_list = ToolListTool()
+    tool_list.register(mcp_server)
+    all_tools[tool_list.name] = tool_list
+    
+    # Stats tool
+    stats_tool = StatsTool(db_manager=db_manager)
+    stats_tool.register(mcp_server)
+    all_tools[stats_tool.name] = stats_tool
+    
+    # Register editor tools if enabled
+    editor_enabled = {
+        "neovim_edit": is_tool_enabled("neovim_edit", True),
+        "neovim_command": is_tool_enabled("neovim_command", True),
+        "neovim_session": is_tool_enabled("neovim_session", True),
+    }
+    
+    if editor_enabled.get("neovim_edit", True):
+        tool = NeovimEditTool(permission_manager)
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    if editor_enabled.get("neovim_command", True):
+        tool = NeovimCommandTool(permission_manager)
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    if editor_enabled.get("neovim_session", True):
+        tool = NeovimSessionTool()
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    # Register LLM tools if enabled
+    llm_enabled = {
+        "llm": is_tool_enabled("llm", True),
+        "consensus": is_tool_enabled("consensus", True),
+        "llm_manage": is_tool_enabled("llm_manage", True),
+    }
+    
+    if llm_enabled.get("llm", True):
+        tool = LLMTool()
+        if tool.available_providers:  # Only register if API keys found
+            tool.register(mcp_server)
+            all_tools[tool.name] = tool
+    
+    if llm_enabled.get("consensus", True):
+        tool = ConsensusTool()
+        if tool.llm_tool.available_providers:  # Only register if API keys found
+            tool.register(mcp_server)
+            all_tools[tool.name] = tool
+    
+    if llm_enabled.get("llm_manage", True):
+        tool = LLMManageTool()
+        tool.register(mcp_server)
+        all_tools[tool.name] = tool
+    
+    # Register provider-specific LLM tools
+    # These are only registered if their API keys are available
+    provider_tools = create_provider_tools()
+    for tool in provider_tools:
+        if is_tool_enabled(tool.name, True):
+            tool.register(mcp_server)
+            all_tools[tool.name] = tool

{hanzo_mcp-0.5.0 → hanzo_mcp-0.5.2}/hanzo_mcp/tools/common/base.py

@@ -170,8 +170,13 @@ class ToolRegistry:
             mcp_server: The FastMCP server instance
             tool: The tool to register
         """
-        # Use the tool's register method which handles all the details
-        tool.register(mcp_server)
+        # Check if tool is enabled before registering
+        # Import here to avoid circular imports
+        from hanzo_mcp.tools.common.tool_enable import ToolEnableTool
+        
+        if ToolEnableTool.is_tool_enabled(tool.name):
+            # Use the tool's register method which handles all the details
+            tool.register(mcp_server)
 
     @staticmethod
     def register_tools(mcp_server: FastMCP, tools: list[BaseTool]) -> None: