ha-mcp-dev 7.0.0.dev274__tar.gz → 7.0.0.dev276__tar.gz

{ha_mcp_dev-7.0.0.dev274/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.0.0.dev276}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.0.0.dev274
+Version: 7.0.0.dev276
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.0.0.dev274"
+version = "7.0.0.dev276"
 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.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/auth/provider.py

@@ -168,7 +168,7 @@ class HomeAssistantOAuthProvider(OAuthProvider):
             decoded = urlsafe_b64decode(token.encode()).decode()
             payload = json.loads(decoded)
 
-            ha_token = payload.get("ha_token")
+            ha_token: str | None = payload.get("ha_token")
 
             if ha_token:
                 return str(ha_token)

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/client/rest_client.py

@@ -769,6 +769,26 @@ class HomeAssistantClient:
             )
         return found
 
+    async def delete_config_entry(self, entry_id: str) -> dict[str, Any]:
+        """Delete a config entry via REST API.
+
+        The WebSocket command ``config_entries/delete`` is not supported by
+        Home Assistant.  The REST endpoint ``DELETE /api/config/config_entries/
+        entry/{entry_id}`` is the correct way to remove a config entry.
+
+        Args:
+            entry_id: Config entry ID to delete.
+
+        Returns:
+            Result dict with ``require_restart`` flag.
+
+        Raises:
+            HomeAssistantAPIError: If the entry is not found or the API
+                returns an error status.
+        """
+        logger.debug(f"Deleting config entry: {entry_id}")
+        return await self._request("DELETE", f"/config/config_entries/entry/{entry_id}")
+
     async def send_websocket_message(self, message: dict[str, Any]) -> dict[str, Any]:
         """Send message via WebSocket and wait for response.
 

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/errors.py

@@ -78,6 +78,9 @@ class ErrorCode(StrEnum):
     RESOURCE_ALREADY_EXISTS = "RESOURCE_ALREADY_EXISTS"
     RESOURCE_LOCKED = "RESOURCE_LOCKED"
 
+    # Component errors
+    COMPONENT_NOT_INSTALLED = "COMPONENT_NOT_INSTALLED"
+
 
 # Default suggestions for common error codes
 DEFAULT_SUGGESTIONS: dict[ErrorCode, list[str]] = {
@@ -183,6 +186,10 @@ DEFAULT_SUGGESTIONS: dict[ErrorCode, list[str]] = {
         "Check Home Assistant MCP server logs",
         "Report this issue if it persists",
     ],
+    ErrorCode.COMPONENT_NOT_INSTALLED: [
+        "Install the required custom component via HACS",
+        "Restart Home Assistant after installation",
+    ],
 }
 
 

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/server.py

@@ -10,6 +10,7 @@ Implements lazy initialization pattern for improved startup time:
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable, Coroutine
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, cast
 
@@ -388,7 +389,7 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
             # Use factory to capture ref_files in closure
             def _make_skill_handler(
                 s_name: str, s_uri: str, files: list[dict[str, str]],
-            ):
+            ) -> Callable[[], Coroutine[Any, Any, dict[str, Any]]]:
                 async def handler() -> dict[str, Any]:
                     return {
                         "skill": s_name,

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/tools/tools_filesystem.py

@@ -20,6 +20,7 @@ from typing import Annotated, Any
 from fastmcp.exceptions import ToolError
 from pydantic import Field
 
+from ..errors import ErrorCode, create_error_response
 from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
 from .util_helpers import add_timezone_metadata, coerce_bool_param, coerce_int_param
 
@@ -55,23 +56,34 @@ def is_filesystem_tools_enabled() -> bool:
     return value in ("true", "1", "yes", "on")
 
 
-async def _check_mcp_tools_available(client: Any) -> tuple[bool, str | None]:
-    """Check if the ha_mcp_tools custom component is available.
+async def _is_mcp_tools_available(client: Any) -> bool:
+    """Return True if the ha_mcp_tools custom component is registered in HA services.
 
-    Returns:
-        Tuple of (is_available, error_message if not available)
+    Raises if the services API call fails — callers handle API errors via
+    their own exception_to_structured_error blocks.
     """
-    try:
-        # Check if the domain is in the list of services
-        services = await client.get_services()
-        if MCP_TOOLS_DOMAIN in services:
-            return True, None
-        return False, (
+    # HA /api/services returns a list of {"domain": str, "services": {...}} objects.
+    # This format has been stable since before HA 0.7 (the first public release).
+    services = await client.get_services()
+    return any(
+        isinstance(s, dict) and s.get("domain") == MCP_TOOLS_DOMAIN
+        for s in services
+    )
+
+
+async def _assert_mcp_tools_available(client: Any) -> None:
+    """Raise ToolError if ha_mcp_tools is not available.
+
+    Must be called within a try block that handles API errors via
+    exception_to_structured_error, so connection failures are classified
+    correctly rather than masked as COMPONENT_NOT_INSTALLED.
+    """
+    if not await _is_mcp_tools_available(client):
+        raise_tool_error(create_error_response(
+            ErrorCode.COMPONENT_NOT_INSTALLED,
             f"The {MCP_TOOLS_DOMAIN} custom component is not installed. "
-            "Use ha_install_mcp_tools() to install it via HACS, then restart Home Assistant."
-        )
-    except Exception as e:
-        return False, f"Failed to check for {MCP_TOOLS_DOMAIN}: {str(e)}"
+            "Use ha_install_mcp_tools() to install it via HACS, then restart Home Assistant.",
+        ))
 
 
 def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
@@ -145,20 +157,7 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if custom component is available
-            is_available, error_msg = await _check_mcp_tools_available(client)
-            if not is_available:
-                return await add_timezone_metadata(
-                    client,
-                    {
-                        "success": False,
-                        "error": error_msg,
-                        "error_code": "MCP_TOOLS_NOT_INSTALLED",
-                        "suggestions": [
-                            "Run ha_install_mcp_tools() to install the custom component",
-                            "Restart Home Assistant after installation",
-                        ],
-                    },
-                )
+            await _assert_mcp_tools_available(client)
 
             # Build service data
             service_data: dict[str, Any] = {"path": path}
@@ -192,13 +191,10 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_list_files", "path": path, "pattern": pattern},
-                raise_error=False,
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -277,20 +273,7 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             )
 
             # Check if custom component is available
-            is_available, error_msg = await _check_mcp_tools_available(client)
-            if not is_available:
-                return await add_timezone_metadata(
-                    client,
-                    {
-                        "success": False,
-                        "error": error_msg,
-                        "error_code": "MCP_TOOLS_NOT_INSTALLED",
-                        "suggestions": [
-                            "Run ha_install_mcp_tools() to install the custom component",
-                            "Restart Home Assistant after installation",
-                        ],
-                    },
-                )
+            await _assert_mcp_tools_available(client)
 
             # Build service data
             service_data: dict[str, Any] = {"path": path}
@@ -320,13 +303,10 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_read_file", "path": path},
-                raise_error=False,
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -420,20 +400,7 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             create_dirs_bool = coerce_bool_param(create_dirs, "create_dirs", default=True)
 
             # Check if custom component is available
-            is_available, error_msg = await _check_mcp_tools_available(client)
-            if not is_available:
-                return await add_timezone_metadata(
-                    client,
-                    {
-                        "success": False,
-                        "error": error_msg,
-                        "error_code": "MCP_TOOLS_NOT_INSTALLED",
-                        "suggestions": [
-                            "Run ha_install_mcp_tools() to install the custom component",
-                            "Restart Home Assistant after installation",
-                        ],
-                    },
-                )
+            await _assert_mcp_tools_available(client)
 
             # Build service data
             service_data: dict[str, Any] = {
@@ -466,13 +433,10 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_write_file", "path": path},
-                raise_error=False,
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -556,20 +520,7 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 )
 
             # Check if custom component is available
-            is_available, error_msg = await _check_mcp_tools_available(client)
-            if not is_available:
-                return await add_timezone_metadata(
-                    client,
-                    {
-                        "success": False,
-                        "error": error_msg,
-                        "error_code": "MCP_TOOLS_NOT_INSTALLED",
-                        "suggestions": [
-                            "Run ha_install_mcp_tools() to install the custom component",
-                            "Restart Home Assistant after installation",
-                        ],
-                    },
-                )
+            await _assert_mcp_tools_available(client)
 
             # Build service data
             service_data: dict[str, Any] = {"path": path}
@@ -597,10 +548,7 @@ def register_filesystem_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_delete_file", "path": path},
-                raise_error=False,
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/tools/tools_hacs.py

@@ -11,6 +11,7 @@ from typing import Annotated, Any, Literal
 from fastmcp.exceptions import ToolError
 from pydantic import Field
 
+from ..errors import ErrorCode, create_error_response
 from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
 from .util_helpers import add_timezone_metadata, coerce_int_param
 
@@ -32,29 +33,35 @@ CATEGORY_DISPLAY = {v: k for k, v in CATEGORY_MAP.items()}
 CATEGORY_DISPLAY["plugin"] = "lovelace"  # Display as lovelace for users
 
 
-async def _check_hacs_available(client: Any) -> tuple[bool, str | None]:
-    """
-    Check if HACS is installed and available via WebSocket.
+async def _is_hacs_available() -> bool:
+    """Return True if HACS is installed and responding via WebSocket.
 
-    Returns:
-        Tuple of (is_available, error_message)
+    Raises if the WebSocket connection fails — callers handle API errors via
+    their own exception_to_structured_error blocks.
     """
-    try:
-        from ..client.websocket_client import get_websocket_client
-        ws_client = await get_websocket_client()
+    from ..client.websocket_client import get_websocket_client
+    ws_client = await get_websocket_client()
+    response = await ws_client.send_command("hacs/info")
+    return bool(response.get("success"))
+
 
-        # Try to get HACS info to verify it's installed
-        response = await ws_client.send_command("hacs/info")
+async def _assert_hacs_available() -> None:
+    """Raise ToolError if HACS is not available.
 
-        if response.get("success"):
-            return True, None
-        else:
-            return False, "HACS is installed but returned an error"
-    except Exception as e:
-        error_str = str(e).lower()
-        if "unknown command" in error_str or "not found" in error_str:
-            return False, "HACS is not installed or not loaded. Please install HACS from https://hacs.xyz/"
-        return False, f"Failed to connect to HACS: {str(e)}"
+    Must be called within a try block that handles API errors via
+    exception_to_structured_error, so connection failures are classified
+    correctly rather than masked as COMPONENT_NOT_INSTALLED.
+    """
+    if not await _is_hacs_available():
+        raise_tool_error(create_error_response(
+            ErrorCode.COMPONENT_NOT_INSTALLED,
+            "HACS is not installed or not loaded.",
+            suggestions=[
+                "Install HACS from https://hacs.xyz/",
+                "Restart Home Assistant after HACS installation",
+                "Check Home Assistant logs for HACS errors",
+            ],
+        ))
 
 
 def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
@@ -83,18 +90,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             # Get HACS info via WebSocket
             from ..client.websocket_client import get_websocket_client
@@ -123,18 +119,15 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_hacs_info"},
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Check Home Assistant connection",
                     "Restart Home Assistant if HACS was recently installed",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(annotations={"idempotentHint": True, "readOnlyHint": True, "tags": ["hacs", "search"], "title": "List HACS Installed"})
     @log_tool_usage
@@ -179,18 +172,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             # Get installed repositories via WebSocket
             from ..client.websocket_client import get_websocket_client
@@ -244,18 +226,15 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_hacs_list_installed", "category": category},
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Check category name is valid: integration, lovelace, theme, appdaemon, python_script",
                     "Check Home Assistant connection",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(annotations={"idempotentHint": True, "readOnlyHint": True, "tags": ["hacs", "search"], "title": "Search HACS Store"})
     @log_tool_usage
@@ -329,18 +308,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             ) or 0
 
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             # Get all repositories via WebSocket
             from ..client.websocket_client import get_websocket_client
@@ -426,18 +394,15 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_hacs_search", "query": query, "category": category},
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Try a simpler search query",
                     "Check category name is valid: integration, lovelace, theme, appdaemon, python_script",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(annotations={"idempotentHint": True, "readOnlyHint": True, "tags": ["hacs", "info"], "title": "Get HACS Repository Info"})
     @log_tool_usage
@@ -468,18 +433,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             from ..client.websocket_client import get_websocket_client
             ws_client = await get_websocket_client()
@@ -545,18 +499,15 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"tool": "ha_hacs_repository_info", "repository_id": repository_id},
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Check repository ID format (e.g., 'hacs/integration' or 'owner/repo')",
                     "Use ha_hacs_search() to find the correct repository ID",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(annotations={"destructiveHint": True, "tags": ["hacs", "management"], "title": "Add HACS Repository"})
     @log_tool_usage
@@ -604,18 +555,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             # Validate repository format
             if "/" not in repository:
@@ -667,14 +607,13 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={
                     "tool": "ha_hacs_add_repository",
                     "repository": repository,
                     "category": category,
                 },
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Check repository format: 'owner/repo'",
@@ -683,8 +622,6 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "Check repository follows HACS guidelines: https://hacs.xyz/docs/publish/start",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(annotations={"destructiveHint": True, "tags": ["hacs", "management"], "title": "Download/Install HACS Repository"})
     @log_tool_usage
@@ -731,18 +668,7 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                return await add_timezone_metadata(client, {
-                    "success": False,
-                    "error": error_msg,
-                    "error_code": "HACS_NOT_AVAILABLE",
-                    "suggestions": [
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                })
+            await _assert_hacs_available()
 
             from ..client.websocket_client import get_websocket_client
             ws_client = await get_websocket_client()
@@ -806,14 +732,13 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         except ToolError:
             raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={
                     "tool": "ha_hacs_download",
                     "repository_id": repository_id,
                     "version": version,
                 },
-                raise_error=False,
                 suggestions=[
                     "Verify HACS is installed: https://hacs.xyz/",
                     "Check repository ID is valid (use ha_hacs_search() to find it)",
@@ -821,5 +746,3 @@ def register_hacs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "Check version format (e.g., 'v1.2.3' or '1.2.3')",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/tools/tools_integrations.py

@@ -353,25 +353,8 @@ def register_integration_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     },
                 ))
 
-            message = {
-                "type": "config_entries/delete",
-                "entry_id": entry_id,
-            }
-
-            result = await client.send_websocket_message(message)
-
-            if not result.get("success"):
-                error_msg = result.get("error", {})
-                if isinstance(error_msg, dict):
-                    error_msg = error_msg.get("message", str(error_msg))
-                raise_tool_error(create_error_response(
-                    ErrorCode.SERVICE_CALL_FAILED,
-                    f"Failed to delete config entry: {error_msg}",
-                    context={"entry_id": entry_id},
-                ))
-
-            # Get result info
-            require_restart = result.get("result", {}).get("require_restart", False)
+            result = await client.delete_config_entry(entry_id)
+            require_restart = result.get("require_restart", False)
 
             return {
                 "success": True,

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276}/src/ha_mcp/tools/tools_mcp_component.py

@@ -52,7 +52,7 @@ def register_mcp_component_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
     logger.info("MCP tools installer enabled via feature flag")
 
     # Import HACS helpers - we depend on HACS functionality
-    from .tools_hacs import CATEGORY_MAP, _check_hacs_available
+    from .tools_hacs import CATEGORY_MAP, _assert_hacs_available
 
     @mcp.tool(
         annotations={
@@ -98,17 +98,7 @@ def register_mcp_component_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """
         try:
             # Check if HACS is available
-            is_available, error_msg = await _check_hacs_available(client)
-            if not is_available:
-                raise_tool_error(create_error_response(
-                    ErrorCode.SERVICE_CALL_FAILED,
-                    error_msg or "HACS is not available",
-                    suggestions=[
-                        "Install HACS from https://hacs.xyz/",
-                        "Ensure Home Assistant has been restarted after HACS installation",
-                        "Check Home Assistant logs for HACS errors",
-                    ],
-                ))
+            await _assert_hacs_available()
 
             from ..client.websocket_client import get_websocket_client
 

{ha_mcp_dev-7.0.0.dev274 → ha_mcp_dev-7.0.0.dev276/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.0.0.dev274
+Version: 7.0.0.dev276
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT