ha-mcp-dev 7.4.1.dev444__tar.gz → 7.4.1.dev446__tar.gz

{ha_mcp_dev-7.4.1.dev444/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev446}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev444
+Version: 7.4.1.dev446
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -25,6 +25,7 @@ Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: truststore==0.10.4
 Requires-Dist: websockets==16.0
 Requires-Dist: cryptography==47.0.0
+Requires-Dist: pydantic-monty==0.0.9
 Dynamic: license-file
 
 > **Breaking change (v7.3.0):** `ha_config_set_yaml` has been moved to [beta](docs/beta.md).

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev444"
+version = "7.4.1.dev446"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -31,6 +31,7 @@ dependencies = [
     "truststore==0.10.4",
     "websockets==16.0",
     "cryptography==47.0.0",
+    "pydantic-monty==0.0.9",
 ]
 
 [project.urls]
@@ -76,6 +77,8 @@ explicit_package_bases = true
 module = [
     "fastmcp.*",
     "jq",
+    "pydantic_monty",
+    "pydantic_monty.*",
 ]
 ignore_missing_imports = true
 

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/src/ha_mcp/config.py

@@ -113,6 +113,37 @@ class Settings(BaseSettings):
     # supervisor UI rejects out-of-range values before they reach env vars.
     tool_search_max_results: int = Field(5, ge=2, le=10, alias="TOOL_SEARCH_MAX_RESULTS")
 
+    # Code Mode — sandboxed Python execution via pydantic-monty.
+    # Provides an "escape hatch" tool (ha_manage_custom_tool) that lets LLMs write
+    # custom one-off Python code when no existing tool covers the request.
+    # Disabled by default due to the inherent risk of LLM-generated code.
+    # Range bounds reject zero/negative values that would silently break the
+    # tool and clamp upper bounds at sane safety margins (5 min wall-clock,
+    # 256 MB memory, 10k recursion, 10k API/tool calls per execution).
+    enable_code_mode: bool = Field(False, alias="ENABLE_CODE_MODE")
+    code_mode_max_duration: float = Field(
+        30.0, ge=1.0, le=300.0, alias="CODE_MODE_MAX_DURATION"
+    )
+    code_mode_max_memory: int = Field(
+        10_485_760, ge=1_048_576, le=268_435_456, alias="CODE_MODE_MAX_MEMORY"
+    )  # 10 MB default; 1 MB floor, 256 MB ceiling
+    code_mode_max_recursion: int = Field(
+        100, ge=1, le=10_000, alias="CODE_MODE_MAX_RECURSION"
+    )
+    code_mode_max_invocations: int = Field(
+        100, ge=1, le=10_000, alias="CODE_MODE_MAX_INVOCATIONS"
+    )
+    # Path to a JSON file for persisting saved custom tools across restarts.
+    # Empty string disables persistence (saved tools live in process memory
+    # and are lost on restart). The addon sets this to /data/saved_tools.json
+    # by default so saved tools survive addon restarts (the /data directory
+    # is mapped per-addon by Supervisor and is preserved across addon
+    # updates).
+    code_mode_saved_tools_path: str = Field(
+        "", alias="CODE_MODE_SAVED_TOOLS_PATH"
+    )
+
+
     @property
     def env_file_name(self) -> str:
         """Get the current environment file name."""

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/src/ha_mcp/errors.py

@@ -81,6 +81,14 @@ class ErrorCode(StrEnum):
     # Component errors
     COMPONENT_NOT_INSTALLED = "COMPONENT_NOT_INSTALLED"
 
+    # Code-mode sandbox errors. The sandbox is a separate execution
+    # context; runtime failures inside it map cleanly to one of these
+    # three buckets so the LLM can self-recover instead of seeing every
+    # failure as INTERNAL_ERROR.
+    SANDBOX_LIMIT_EXCEEDED = "SANDBOX_LIMIT_EXCEEDED"
+    SANDBOX_SYNTAX_UNSUPPORTED = "SANDBOX_SYNTAX_UNSUPPORTED"
+    SANDBOX_RUNTIME_ERROR = "SANDBOX_RUNTIME_ERROR"
+
 
 # Default suggestions for common error codes
 DEFAULT_SUGGESTIONS: dict[ErrorCode, list[str]] = {

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/src/ha_mcp/server.py

@@ -590,6 +590,11 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         )
         pinned.extend(getattr(self, "_skill_tool_names", []))
 
+        # Pin code mode tool so it gets individual permission gating
+        # rather than being hidden behind the BM25 search proxy.
+        if self.settings.enable_code_mode:
+            pinned.append("ha_manage_custom_tool")
+
         # The client may not support resources or server instructions — add
         # skills hint to the search tool description (the one place the LLM
         # is guaranteed to see).
@@ -609,12 +614,19 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
                     max_results=self.settings.tool_search_max_results,
                     always_visible=pinned,
                     search_tool_description=description,
+                    # Pinned tools must be excluded from the proxy's
+                    # category sets when code mode is on; otherwise sandbox
+                    # code can launder a recursive ``ha_manage_custom_tool``
+                    # invocation through ``ha_call_write_tool``. See the
+                    # docstring on ``_rebuild_category_cache``.
+                    enable_code_mode=self.settings.enable_code_mode,
                 )
             )
             logger.info(
-                "Tool search transform applied (%d pinned tools, max_results=%d)",
+                "Tool search transform applied (%d pinned tools, max_results=%d, code_mode=%s)",
                 len(pinned),
                 self.settings.tool_search_max_results,
+                self.settings.enable_code_mode,
             )
         except Exception:
             logger.exception("Failed to apply tool search transform")

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/src/ha_mcp/settings_ui.py

@@ -50,6 +50,7 @@ class ToolStub(TypedDict):
     destructiveHint: NotRequired[bool]
     disabled_by: NotRequired[str]
 
+
 _VALID_STATES = frozenset({"enabled", "disabled", "pinned"})
 
 logger = logging.getLogger(__name__)
@@ -261,7 +262,9 @@ def _render_stub(name: str, meta: ToolStub) -> dict[str, Any]:
     return rendered
 
 
-async def _get_tool_metadata(server: HomeAssistantSmartMCPServer) -> list[dict[str, Any]]:
+async def _get_tool_metadata(
+    server: HomeAssistantSmartMCPServer,
+) -> list[dict[str, Any]]:
     """Extract metadata for all registered tools from the server.
 
     Uses FastMCP's internal ``local_provider._list_tools()`` because the
@@ -291,14 +294,16 @@ async def _get_tool_metadata(server: HomeAssistantSmartMCPServer) -> list[dict[s
         title = getattr(tool, "title", None) or tool.name
         if tool.annotations and getattr(tool.annotations, "title", None):
             title = tool.annotations.title
-        tools.append({
-            "name": tool.name,
-            "title": title,
-            "description": (tool.description or "")[:200],
-            "tags": tags,
-            "primary_tag": primary,
-            "annotations": annotations,
-        })
+        tools.append(
+            {
+                "name": tool.name,
+                "title": title,
+                "description": (tool.description or "")[:200],
+                "tags": tags,
+                "primary_tag": primary,
+                "annotations": annotations,
+            }
+        )
 
     registered_names = {t["name"] for t in tools}
 
@@ -362,7 +367,8 @@ def apply_tool_visibility(
     return pinned_names
 
 
-_SETTINGS_HTML = """\
+_SETTINGS_HTML = (
+    """\
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -525,8 +531,12 @@ async function restartAddon() {
   }
 }
 
-const DEFAULT_PINNED = """ + json.dumps(list(DEFAULT_PINNED_TOOLS)) + """;
-const MANDATORY = """ + json.dumps(list(MANDATORY_TOOLS)) + """;
+const DEFAULT_PINNED = """
+    + json.dumps(list(DEFAULT_PINNED_TOOLS))
+    + """;
+const MANDATORY = """
+    + json.dumps(list(MANDATORY_TOOLS))
+    + """;
 
 function getState(name) {
   if (toolStates[name]) return toolStates[name];
@@ -763,6 +773,7 @@ loadTools();
 </body>
 </html>
 """
+)
 
 
 def register_settings_routes(
@@ -868,15 +879,18 @@ def register_settings_routes(
         pinned_count = sum(1 for s in states.values() if s == "pinned")
         logger.info(
             "Saved tool config (restart required to apply): %d disabled, %d pinned",
-            disabled_count, pinned_count,
+            disabled_count,
+            pinned_count,
         )
 
-        return JSONResponse({
-            "success": True,
-            "disabled": disabled_count,
-            "pinned": pinned_count,
-            "restart_required": True,
-        })
+        return JSONResponse(
+            {
+                "success": True,
+                "disabled": disabled_count,
+                "pinned": pinned_count,
+                "restart_required": True,
+            }
+        )
 
     async def _restart_addon(_: Request) -> JSONResponse:
         token = os.environ.get("SUPERVISOR_TOKEN")
@@ -892,13 +906,20 @@ def register_settings_routes(
         # Short timeout — the supervisor kills our process during restart so
         # the connection will drop. A connection drop is actually success.
         try:
-            async with httpx.AsyncClient(timeout=5.0) as client:
+            async with httpx.AsyncClient(
+                timeout=5.0, verify=server.settings.verify_ssl
+            ) as client:
                 resp = await client.post(
                     "http://supervisor/addons/self/restart",
                     headers={"Authorization": f"Bearer {token}"},
                 )
-        except (httpx.ReadError, httpx.RemoteProtocolError, httpx.ConnectError):
-            # Connection dropped mid-request — restart is happening
+        except (httpx.ReadError, httpx.RemoteProtocolError):
+            # Connection dropped mid-request — restart is happening.
+            # `ConnectError` is deliberately NOT in this tuple: it fires
+            # before a connection is established (DNS failure, TCP refused,
+            # Supervisor socket misconfigured) and means the restart was
+            # never initiated. Falls through to the `httpx.HTTPError`
+            # handler below, which returns 502 + CONNECTION_FAILED.
             logger.info("Restart request connection dropped (expected during restart)")
             return JSONResponse({"success": True, "message": "Restart initiated"})
         except httpx.HTTPError as e:
@@ -924,9 +945,11 @@ def register_settings_routes(
         return JSONResponse({"success": True, "message": "Restart initiated"})
 
     async def _settings_info(_: Request) -> JSONResponse:
-        return JSONResponse({
-            "is_addon": is_running_in_addon(),
-        })
+        return JSONResponse(
+            {
+                "is_addon": is_running_in_addon(),
+            }
+        )
 
     secret_prefix = secret_path.rstrip("/") if secret_path else ""
     is_addon = is_running_in_addon()
@@ -958,7 +981,15 @@ def register_settings_routes(
         # endpoint. The frontend uses relative fetches (./api/settings/...)
         # so the JS works at either prefix unchanged.
         mcp.custom_route(f"{secret_prefix}/settings", methods=["GET"])(_settings_page)
-        mcp.custom_route(f"{secret_prefix}/api/settings/tools", methods=["GET"])(_get_tools)
-        mcp.custom_route(f"{secret_prefix}/api/settings/tools", methods=["POST"])(_save_tools)
-        mcp.custom_route(f"{secret_prefix}/api/settings/restart", methods=["POST"])(_restart_addon)
-        mcp.custom_route(f"{secret_prefix}/api/settings/info", methods=["GET"])(_settings_info)
+        mcp.custom_route(f"{secret_prefix}/api/settings/tools", methods=["GET"])(
+            _get_tools
+        )
+        mcp.custom_route(f"{secret_prefix}/api/settings/tools", methods=["POST"])(
+            _save_tools
+        )
+        mcp.custom_route(f"{secret_prefix}/api/settings/restart", methods=["POST"])(
+            _restart_addon
+        )
+        mcp.custom_route(f"{secret_prefix}/api/settings/info", methods=["GET"])(
+            _settings_info
+        )

{ha_mcp_dev-7.4.1.dev444 → ha_mcp_dev-7.4.1.dev446}/src/ha_mcp/tools/tools_bug_report.py

@@ -19,6 +19,7 @@ from pydantic import Field
 
 from ha_mcp import __version__
 
+from ..config import get_global_settings
 from ..utils.usage_logger import (
     AVG_LOG_ENTRIES_PER_TOOL,
     get_recent_logs,
@@ -181,7 +182,9 @@ async def _fetch_addon_logs() -> str:
         return ""
 
     try:
-        async with httpx.AsyncClient(timeout=10.0) as http_client:
+        async with httpx.AsyncClient(
+            timeout=10.0, verify=get_global_settings().verify_ssl
+        ) as http_client:
             resp = await http_client.get(
                 "http://supervisor/addons/self/logs",
                 headers={"Authorization": f"Bearer {token}"},