ha-mcp-dev 7.3.0.dev382__tar.gz → 7.3.0.dev384__tar.gz

{ha_mcp_dev-7.3.0.dev382/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.3.0.dev384}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.3.0.dev382
+Version: 7.3.0.dev384
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -37,7 +37,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-86-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-85-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -180,7 +180,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (86 tools)</b></summary>
+<summary><b>Complete Tool List (85 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -196,7 +196,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Files** | `ha_delete_file`, `ha_list_files`, `ha_read_file`, `ha_write_file` |
 | **Groups** | `ha_config_list_groups`, `ha_config_remove_group`, `ha_config_set_group` |
 | **HACS** | `ha_hacs_add_repository`, `ha_hacs_download`, `ha_hacs_repository_info`, `ha_hacs_search` |
-| **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema`, `ha_set_config_entry_helper` |
+| **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema` |
 | **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_delete_config_entry`, `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/README.md

@@ -8,7 +8,7 @@
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-86-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-85-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -151,7 +151,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (86 tools)</b></summary>
+<summary><b>Complete Tool List (85 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -167,7 +167,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Files** | `ha_delete_file`, `ha_list_files`, `ha_read_file`, `ha_write_file` |
 | **Groups** | `ha_config_list_groups`, `ha_config_remove_group`, `ha_config_set_group` |
 | **HACS** | `ha_hacs_add_repository`, `ha_hacs_download`, `ha_hacs_repository_info`, `ha_hacs_search` |
-| **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema`, `ha_set_config_entry_helper` |
+| **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema` |
 | **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_delete_config_entry`, `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.3.0.dev382"
+version = "7.3.0.dev384"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/src/ha_mcp/__main__.py

@@ -62,14 +62,17 @@ class OAuthProxyClient:
         """Get the OAuth client for the current request context."""
         from fastmcp.server.dependencies import get_access_token
 
-        from ha_mcp.client.rest_client import HomeAssistantClient
+        from ha_mcp.client.rest_client import (
+            HomeAssistantAuthError,
+            HomeAssistantClient,
+        )
 
         # Get the access token from the current request context
         token = get_access_token()
 
         if not token:
             logger.warning("No access token in context")
-            raise RuntimeError("No OAuth token in request context")
+            raise HomeAssistantAuthError("No OAuth token in request context")
 
         # Extract HA token from claims (URL is server-side config)
         claims = token.claims
@@ -78,7 +81,7 @@ class OAuthProxyClient:
             logger.error(
                 f"OAuth token missing HA credentials. Keys present: {list(claims.keys()) if claims else []}"
             )
-            raise RuntimeError("No Home Assistant credentials in OAuth token claims")
+            raise HomeAssistantAuthError("No Home Assistant credentials in OAuth token claims")
 
         ha_token = claims["ha_token"]
 

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/src/ha_mcp/client/rest_client.py

@@ -43,6 +43,17 @@ class HomeAssistantAPIError(HomeAssistantError):
         self.response_data = response_data
 
 
+class HomeAssistantCommandError(HomeAssistantError):
+    """WebSocket command returned success=False.
+
+    Raised by ``WebSocketClient.send_command`` when Home Assistant responds
+    with ``{type: "result", success: False}``. Used as a type marker in
+    ``_classify_exception``'s match dispatch; classification then falls
+    through to ``_classify_by_message`` for pattern matching on the
+    error message.
+    """
+
+
 class HomeAssistantClient:
     """Authenticated HTTP client for Home Assistant API."""
 

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/src/ha_mcp/client/websocket_client.py

@@ -20,6 +20,7 @@ from urllib.parse import urlparse
 import websockets
 
 from ..config import get_global_settings
+from .rest_client import HomeAssistantCommandError, HomeAssistantConnectionError
 
 logger = logging.getLogger(__name__)
 
@@ -218,7 +219,7 @@ class HomeAssistantWebSocketClient:
                 message_type="auth_required", timeout=5
             )
             if not auth_msg:
-                raise Exception("Did not receive auth_required message")
+                raise HomeAssistantConnectionError("Did not receive auth_required message")
 
             # Send authentication
             await self._send_auth()
@@ -411,7 +412,7 @@ class HomeAssistantWebSocketClient:
             Response from Home Assistant
         """
         if not self._state.is_ready:
-            raise Exception("WebSocket not authenticated")
+            raise HomeAssistantConnectionError("WebSocket not authenticated")
 
         message_id = self.get_next_message_id()
         message = {"id": message_id, "type": command_type, **kwargs}
@@ -439,7 +440,7 @@ class HomeAssistantWebSocketClient:
                         if isinstance(error, dict)
                         else str(error)
                     )
-                    raise Exception(f"Command failed: {error_msg}")
+                    raise HomeAssistantCommandError(f"Command failed: {error_msg}")
 
                 # Return success response according to HA WebSocket format
                 return {
@@ -484,7 +485,7 @@ class HomeAssistantWebSocketClient:
             A (result_response, event_response) tuple.
         """
         if not self._state.is_ready:
-            raise Exception("WebSocket not authenticated")
+            raise HomeAssistantConnectionError("WebSocket not authenticated")
 
         message_id = self.get_next_message_id()
         message = {"id": message_id, "type": command_type, **kwargs}
@@ -516,7 +517,7 @@ class HomeAssistantWebSocketClient:
                 if isinstance(error, dict)
                 else str(error)
             )
-            raise Exception(f"Command failed: {error_msg}")
+            raise HomeAssistantCommandError(f"Command failed: {error_msg}")
 
         try:
             event_response = await asyncio.wait_for(

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/src/ha_mcp/server.py

@@ -351,10 +351,14 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
             "conditions actions get show detail"
         ),
         # s09: "create helper" → ha_config_set_helper should outrank remove_helper
+        # Covers all 27 helper types (12 simple + 15 flow-based, unified in #967).
         "ha_config_set_helper": (
-            "create new add helper input_boolean input_number input_text "
-            "counter timer input_datetime input_select input_button "
-            "schedule zone group min_max"
+            "create update new add helper "
+            "input_boolean input_button input_number input_text input_datetime "
+            "input_select counter timer schedule zone person tag "
+            "template group utility_meter derivative min_max threshold "
+            "integration statistics trend random filter tod "
+            "generic_thermostat switch_as_x generic_hygrostat"
         ),
         # Boost tools that compete with ha_deep_search for common queries
         "ha_config_get_script": (

{ha_mcp_dev-7.3.0.dev382 → ha_mcp_dev-7.3.0.dev384}/src/ha_mcp/tools/helpers.py

@@ -7,6 +7,7 @@ Centralized utilities that can be shared across multiple tool implementations.
 import functools
 import json
 import logging
+import re
 import sys
 import time
 from typing import Any, Literal, NoReturn, overload
@@ -16,6 +17,7 @@ from fastmcp.exceptions import ToolError
 from ..client.rest_client import (
     HomeAssistantAPIError,
     HomeAssistantAuthError,
+    HomeAssistantCommandError,
     HomeAssistantConnectionError,
 )
 from ..client.websocket_client import HomeAssistantWebSocketClient
@@ -142,6 +144,14 @@ def _classify_exception(
             )
         case HomeAssistantAPIError():
             result = _classify_api_status(error, error_msg, context)
+        case HomeAssistantCommandError():
+            # WebSocket command-failure. The ``error.code`` on Supervisor
+            # calls routed through HA Core's hassio WS bridge is always
+            # ``unknown_error`` (see homeassistant/components/hassio/
+            # websocket_api.py), so discrimination must come from the
+            # message. Fall through to ``_classify_by_message`` which
+            # pattern-matches schema, auth, not-found and timeout cases.
+            result = None
         case TimeoutError():
             operation = context.get("operation", "request") if context else "request"
             timeout_seconds = context.get("timeout_seconds", 30) if context else 30
@@ -163,7 +173,29 @@ def _classify_by_message(
 ) -> dict[str, Any]:
     """Classify exception by error message patterns."""
     result: dict[str, Any]
-    if "not found" in error_str or "404" in error_str:
+    # Schema-branch must precede the "not found" / 404 branch (most-specific-first):
+    # a vol.Invalid message phrased like "Command failed: key X not found" would
+    # otherwise misclassify as RESOURCE_NOT_FOUND. The "command failed:" prefix
+    # gates the branch so non-schema WS errors fall through.
+    if "command failed:" in error_str and (
+        any(
+            marker in error_str
+            for marker in (
+                "missing option",
+                "extra keys not allowed",
+                "unknown secret",
+                "unknown type",
+            )
+        )
+        or re.search(r"expected (?:a |str|int|bool|dict|list|float|type|one of)", error_str)
+    ):
+        # Supervisor schema validation: vol.Invalid message arriving as a
+        # HomeAssistantCommandError via HA Core's hassio WS bridge. The
+        # markers plus the "expected <type>" anchor regex cover the
+        # heterogeneous vol.Invalid vocabulary without relying on an
+        # error code (always unknown_error from the bridge).
+        result = create_validation_error(error_msg, context=context)
+    elif "not found" in error_str or "404" in error_str:
         entity_id = context.get("entity_id") if context else None
         if entity_id:
             result = create_entity_not_found_error(entity_id, details=error_msg)
@@ -173,8 +205,23 @@ def _classify_by_message(
         result = create_timeout_error("operation", 30, details=error_msg, context=context)
     elif "connection" in error_str or "connect" in error_str:
         result = create_connection_error(error_msg, context=context)
-    elif "auth" in error_str or "token" in error_str or "401" in error_str:
+    elif any(
+        phrase in error_str
+        for phrase in (
+            "unauthorized",
+            "authentication",
+            "invalid token",
+            "access denied",
+        )
+    ) or "401" in error_str:
         result = create_auth_error(error_msg, context=context)
+    elif error_str.startswith("command failed:"):
+        # HomeAssistantCommandError fallback: WS ``success=False`` with a
+        # message that doesn't match any specific marker above. This is a
+        # known failure mode (the WS command itself failed), not an
+        # unexpected internal error — route to SERVICE_CALL_FAILED,
+        # mirroring the 4xx fallback in _classify_api_status.
+        result = create_error_response(ErrorCode.SERVICE_CALL_FAILED, error_msg, context=context)
     else:
         result = create_error_response(
             ErrorCode.INTERNAL_ERROR, "An unexpected error occurred", details=error_msg, context=context