ha-mcp-dev 9.3.0.dev3516__tar.gz → 9.3.0.dev3519__tar.gz

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.3.0.dev3516
+Version: 9.3.0.dev3519
 Summary: Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants.
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.3.0.dev3516"
+version = "9.3.0.dev3519"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 requires-python = ">=3.14,<3.15"
@@ -136,7 +136,6 @@ module = [
     "tests.src.unit.policy.test_model",
     "tests.src.unit.policy.test_mrtr",
     "tests.src.unit.policy.test_mrtr_transport",
-    "tests.src.unit.test_area_filter_search",
     "tests.src.unit.test_auto_backup_e2e_isolation",
     "tests.src.unit.test_backup_access",
     "tests.src.unit.test_backup_calendar_restore",
@@ -154,8 +153,6 @@ module = [
     "tests.src.unit.test_build_skill_content",
     "tests.src.unit.test_bulk_device_control",
     "tests.src.unit.test_bulk_selector",
-    "tests.src.unit.test_call_service_return_response",
-    "tests.src.unit.test_call_service_snapshot_guard",
     "tests.src.unit.test_call_service_ws_command",
     "tests.src.unit.test_caller_token_auth",
     "tests.src.unit.test_card_definitions",
@@ -164,10 +161,8 @@ module = [
     "tests.src.unit.test_codex_workflow_contracts",
     "tests.src.unit.test_compact_service_result",
     "tests.src.unit.test_component_api",
-    "tests.src.unit.test_component_automation_config",
     "tests.src.unit.test_component_bulk_call_service_contract",
     "tests.src.unit.test_component_call_service_contract",
-    "tests.src.unit.test_component_config_entries",
     "tests.src.unit.test_component_dashboard_edit",
     "tests.src.unit.test_component_dashboards_contract",
     "tests.src.unit.test_component_helper_collections",
@@ -180,7 +175,6 @@ module = [
     "tests.src.unit.test_config",
     "tests.src.unit.test_config_flow",
     "tests.src.unit.test_config_flow_server",
-    "tests.src.unit.test_config_get_dashboard_search_error",
     "tests.src.unit.test_core_contract",
     "tests.src.unit.test_custom_component_file_edits",
     "tests.src.unit.test_custom_component_file_writes",
@@ -188,7 +182,6 @@ module = [
     "tests.src.unit.test_dashboard_patch",
     "tests.src.unit.test_dashboard_screenshot",
     "tests.src.unit.test_dashboard_screenshot_theme_guard",
-    "tests.src.unit.test_deep_search_helper_rename_1794",
     "tests.src.unit.test_domain_handlers",
     "tests.src.unit.test_e2e_failure_diagnostics",
     "tests.src.unit.test_e2e_lane_env_shape",
@@ -218,8 +211,6 @@ module = [
     "tests.src.unit.test_ha_overview_component_routing",
     "tests.src.unit.test_ha_search_component_routing",
     "tests.src.unit.test_ha_search_merge",
-    "tests.src.unit.test_ha_search_request_count",
-    "tests.src.unit.test_ha_write_file_edits",
     "tests.src.unit.test_hacs_actions",
     "tests.src.unit.test_hacs_own_repository",
     "tests.src.unit.test_hacs_repo_registration",
@@ -231,18 +222,15 @@ module = [
     "tests.src.unit.test_helper_input_validation",
     "tests.src.unit.test_helper_response_shape",
     "tests.src.unit.test_history_helpers",
-    "tests.src.unit.test_history_summary",
     "tests.src.unit.test_http_transport_options",
     "tests.src.unit.test_image_info",
     "tests.src.unit.test_individual_fetch_settings",
     "tests.src.unit.test_integration_reconfigure",
-    "tests.src.unit.test_integration_ws_commands",
     "tests.src.unit.test_listen_sockets",
     "tests.src.unit.test_llm_api",
     "tests.src.unit.test_llm_api_call_exposure",
     "tests.src.unit.test_llm_api_probe",
     "tests.src.unit.test_llm_tool_metadata",
-    "tests.src.unit.test_mandatory_tool_warnings",
     "tests.src.unit.test_mcp_webhook",
     "tests.src.unit.test_oauth",
     "tests.src.unit.test_oauth_autoapprove",
@@ -252,7 +240,6 @@ module = [
     "tests.src.unit.test_oauth_ha_auth",
     "tests.src.unit.test_oauth_legacy_component",
     "tests.src.unit.test_oidc_compat",
-    "tests.src.unit.test_overview_repairs",
     "tests.src.unit.test_overview_system_info",
     "tests.src.unit.test_performance_parallelization",
     "tests.src.unit.test_read_only",
@@ -270,7 +257,6 @@ module = [
     "tests.src.unit.test_rest_client_scripts",
     "tests.src.unit.test_scene_fragment_matcher",
     "tests.src.unit.test_search_fields_projection",
-    "tests.src.unit.test_search_pagination",
     "tests.src.unit.test_search_related_graph",
     "tests.src.unit.test_search_time_budget_settings",
     "tests.src.unit.test_server_access_switch",
@@ -287,7 +273,6 @@ module = [
     "tests.src.unit.test_strict_bps",
     "tests.src.unit.test_supply_chain_workflow_shape",
     "tests.src.unit.test_template_deleted_recovery",
-    "tests.src.unit.test_template_generic_routing",
     "tests.src.unit.test_template_helper_backup",
     "tests.src.unit.test_template_restore_safety",
     "tests.src.unit.test_template_review_outcomes",
@@ -332,8 +317,6 @@ module = [
     "tests.src.unit.test_zone_tools_core_contract",
     "tests.src.unit.visibility.test_enforcement",
     "tests.src.unit.visibility.test_hidden_config_file_reads",
-    "tests.src.unit.visibility.test_overview_filter",
-    "tests.src.unit.visibility.test_smart_search_filter",
 ]
 ignore_errors = true
 
@@ -575,4 +558,20 @@ dev = [
     "ast-grep-cli>=0.42.0",
     "python-semantic-release==10.7.0",
     "hamcp-test-env",
+    "python-otbr-api==3.1.0",
+    "pyroute2==0.9.6",
+    "zwave-js-server-python==0.74.0",
+    "zha==2.4.3",
+    "zha-quirks==2.4.1",
+    "aiousbwatcher==1.1.2",
+    "serialx==1.15.1",
+    "aiohasupervisor==0.8.1",
+    "universal-silabs-flasher==1.3.0",
+    "ha-silabs-firmware-client==0.4.0",
+    "pygbl==1.2.0",
+    "infrared-protocols==10.5.0",
+    "xknx==4.1.1",
+    "xknxproject==3.10.0",
+    "knx-frontend==2026.11.8.11926",
+    "knx-telegram-store[sqlite,postgres]==0.15.2",
 ]

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.3.0.dev3516"
+version = "9.3.0.dev3519"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's
@@ -195,7 +195,6 @@ module = [
     "tests.src.unit.policy.test_model",
     "tests.src.unit.policy.test_mrtr",
     "tests.src.unit.policy.test_mrtr_transport",
-    "tests.src.unit.test_area_filter_search",
     "tests.src.unit.test_auto_backup_e2e_isolation",
     "tests.src.unit.test_backup_access",
     "tests.src.unit.test_backup_calendar_restore",
@@ -213,8 +212,6 @@ module = [
     "tests.src.unit.test_build_skill_content",
     "tests.src.unit.test_bulk_device_control",
     "tests.src.unit.test_bulk_selector",
-    "tests.src.unit.test_call_service_return_response",
-    "tests.src.unit.test_call_service_snapshot_guard",
     "tests.src.unit.test_call_service_ws_command",
     "tests.src.unit.test_caller_token_auth",
     "tests.src.unit.test_card_definitions",
@@ -223,10 +220,8 @@ module = [
     "tests.src.unit.test_codex_workflow_contracts",
     "tests.src.unit.test_compact_service_result",
     "tests.src.unit.test_component_api",
-    "tests.src.unit.test_component_automation_config",
     "tests.src.unit.test_component_bulk_call_service_contract",
     "tests.src.unit.test_component_call_service_contract",
-    "tests.src.unit.test_component_config_entries",
     "tests.src.unit.test_component_dashboard_edit",
     "tests.src.unit.test_component_dashboards_contract",
     "tests.src.unit.test_component_helper_collections",
@@ -239,7 +234,6 @@ module = [
     "tests.src.unit.test_config",
     "tests.src.unit.test_config_flow",
     "tests.src.unit.test_config_flow_server",
-    "tests.src.unit.test_config_get_dashboard_search_error",
     "tests.src.unit.test_core_contract",
     "tests.src.unit.test_custom_component_file_edits",
     "tests.src.unit.test_custom_component_file_writes",
@@ -247,7 +241,6 @@ module = [
     "tests.src.unit.test_dashboard_patch",
     "tests.src.unit.test_dashboard_screenshot",
     "tests.src.unit.test_dashboard_screenshot_theme_guard",
-    "tests.src.unit.test_deep_search_helper_rename_1794",
     "tests.src.unit.test_domain_handlers",
     "tests.src.unit.test_e2e_failure_diagnostics",
     "tests.src.unit.test_e2e_lane_env_shape",
@@ -277,8 +270,6 @@ module = [
     "tests.src.unit.test_ha_overview_component_routing",
     "tests.src.unit.test_ha_search_component_routing",
     "tests.src.unit.test_ha_search_merge",
-    "tests.src.unit.test_ha_search_request_count",
-    "tests.src.unit.test_ha_write_file_edits",
     "tests.src.unit.test_hacs_actions",
     "tests.src.unit.test_hacs_own_repository",
     "tests.src.unit.test_hacs_repo_registration",
@@ -290,18 +281,15 @@ module = [
     "tests.src.unit.test_helper_input_validation",
     "tests.src.unit.test_helper_response_shape",
     "tests.src.unit.test_history_helpers",
-    "tests.src.unit.test_history_summary",
     "tests.src.unit.test_http_transport_options",
     "tests.src.unit.test_image_info",
     "tests.src.unit.test_individual_fetch_settings",
     "tests.src.unit.test_integration_reconfigure",
-    "tests.src.unit.test_integration_ws_commands",
     "tests.src.unit.test_listen_sockets",
     "tests.src.unit.test_llm_api",
     "tests.src.unit.test_llm_api_call_exposure",
     "tests.src.unit.test_llm_api_probe",
     "tests.src.unit.test_llm_tool_metadata",
-    "tests.src.unit.test_mandatory_tool_warnings",
     "tests.src.unit.test_mcp_webhook",
     "tests.src.unit.test_oauth",
     "tests.src.unit.test_oauth_autoapprove",
@@ -311,7 +299,6 @@ module = [
     "tests.src.unit.test_oauth_ha_auth",
     "tests.src.unit.test_oauth_legacy_component",
     "tests.src.unit.test_oidc_compat",
-    "tests.src.unit.test_overview_repairs",
     "tests.src.unit.test_overview_system_info",
     "tests.src.unit.test_performance_parallelization",
     "tests.src.unit.test_read_only",
@@ -329,7 +316,6 @@ module = [
     "tests.src.unit.test_rest_client_scripts",
     "tests.src.unit.test_scene_fragment_matcher",
     "tests.src.unit.test_search_fields_projection",
-    "tests.src.unit.test_search_pagination",
     "tests.src.unit.test_search_related_graph",
     "tests.src.unit.test_search_time_budget_settings",
     "tests.src.unit.test_server_access_switch",
@@ -346,7 +332,6 @@ module = [
     "tests.src.unit.test_strict_bps",
     "tests.src.unit.test_supply_chain_workflow_shape",
     "tests.src.unit.test_template_deleted_recovery",
-    "tests.src.unit.test_template_generic_routing",
     "tests.src.unit.test_template_helper_backup",
     "tests.src.unit.test_template_restore_safety",
     "tests.src.unit.test_template_review_outcomes",
@@ -391,8 +376,6 @@ module = [
     "tests.src.unit.test_zone_tools_core_contract",
     "tests.src.unit.visibility.test_enforcement",
     "tests.src.unit.visibility.test_hidden_config_file_reads",
-    "tests.src.unit.visibility.test_overview_filter",
-    "tests.src.unit.visibility.test_smart_search_filter",
 ]
 ignore_errors = true
 
@@ -695,6 +678,28 @@ dev = [
     "python-semantic-release==10.7.0",
     # Provides `uv run hamcp-test-env` without shipping it in the ha-mcp wheel.
     "hamcp-test-env",
+    # The requirements of the Core integrations whose own handlers the unit
+    # tests run, as Core's test suite does: Thread and OTBR, Z-Wave JS, ZHA and
+    # KNX, plus usb, hassio, homeassistant_hardware and infrared, which those
+    # load. Only the device or bus below each library is replaced. Each pin
+    # equals the integration's manifest in the Core above;
+    # test_dev_integration_pins.py keeps them equal.
+    "python-otbr-api==3.1.0",
+    "pyroute2==0.9.6",
+    "zwave-js-server-python==0.74.0",
+    "zha==2.4.3",
+    "zha-quirks==2.4.1",
+    "aiousbwatcher==1.1.2",
+    "serialx==1.15.1",
+    "aiohasupervisor==0.8.1",
+    "universal-silabs-flasher==1.3.0",
+    "ha-silabs-firmware-client==0.4.0",
+    "pygbl==1.2.0",
+    "infrared-protocols==10.5.0",
+    "xknx==4.1.1",
+    "xknxproject==3.10.0",
+    "knx-frontend==2026.11.8.11926",
+    "knx-telegram-store[sqlite,postgres]==0.15.2",
 ]
 
 [tool.uv]

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/backup_entity_ids.py

@@ -6,12 +6,17 @@ own helpers are reached lazily so its tests can patch them in place.
 
 from __future__ import annotations
 
+import asyncio
 from contextlib import AbstractAsyncContextManager
 from typing import Any
 
 from ._vendor.websockets.exceptions import WebSocketException
+from .client.rest_client import HomeAssistantError
 from .utils.registry_update_lock import registry_update_locks
 
+# How long a restore waits for Core to register a recreated entry's entity.
+RECREATED_ENTITY_WAIT_S = 5.0
+
 
 def _manager() -> Any:
     from . import backup_manager
@@ -19,6 +24,23 @@ def _manager() -> Any:
     return backup_manager
 
 
+async def created_entity(client: Any, entry_id: str, unique_id: str) -> dict[str, Any]:
+    """Wait for the recreated entry's entity with ``unique_id``."""
+    async with asyncio.timeout(RECREATED_ENTITY_WAIT_S):
+        while True:
+            rows: list[dict[str, Any]] = [
+                row
+                for row in await _manager()._entity_registry_rows(client)
+                if row.get("config_entry_id") == entry_id
+                and row.get("unique_id") == unique_id
+            ]
+            if len(rows) > 1:
+                raise HomeAssistantError("Recreated entity mapping is ambiguous")
+            if rows:
+                return rows[0]
+            await asyncio.sleep(0.1)
+
+
 def entity_id_locks(*entity_ids: str) -> AbstractAsyncContextManager[None]:
     """Hold the registry lock of each entity ID, in a stable order."""
     lock = _manager().registry_update_lock
@@ -144,11 +166,11 @@ async def _restore_entity_id(
     """Rename one recreated entity to its saved ID/name and record it."""
     bm = _manager()
     unique_id = _recreated_unique_id(saved, original_entry_id, entry_id)
-    row = await bm._created_entity(client, entry_id, unique_id)
+    row = await created_entity(client, entry_id, unique_id)
     source, target = row["entity_id"], saved["entity_id"]
     locked_ids = {source, target}
     async with entity_id_locks(*locked_ids):
-        row = await bm._created_entity(client, entry_id, unique_id)
+        row = await created_entity(client, entry_id, unique_id)
         source = row["entity_id"]
         if source not in locked_ids:
             raise bm.BackupRestoreError(
@@ -185,7 +207,7 @@ async def _restore_entity_id(
                     ],
                     verification_status="unavailable",
                 ) from err
-        actual = await bm._created_entity(client, entry_id, unique_id)
+        actual = await created_entity(client, entry_id, unique_id)
         if actual["entity_id"] != target or actual.get("name") != saved.get("name"):
             raise bm.BackupRestoreError(
                 "Recreated entity identity did not match",

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/backup_manager.py

@@ -3107,23 +3107,6 @@ async def _check_entity_collision(
         )
 
 
-async def _created_entity(client: Any, entry_id: str, unique_id: str) -> dict[str, Any]:
-    """Wait for the recreated entry's entity with ``unique_id``."""
-    async with asyncio.timeout(5):
-        while True:
-            rows = [
-                row
-                for row in await _entity_registry_rows(client)
-                if row.get("config_entry_id") == entry_id
-                and row.get("unique_id") == unique_id
-            ]
-            if len(rows) > 1:
-                raise HomeAssistantError("Recreated entity mapping is ambiguous")
-            if rows:
-                return rows[0]
-            await asyncio.sleep(0.1)
-
-
 async def _recreate_flow_helper(
     client: Any, entry_id: str, snapshot: dict[str, Any], helper_type: str
 ) -> dict[str, Any]:

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/client/rest_client.py

@@ -6,7 +6,6 @@ import asyncio
 import json
 import logging
 import os
-import ssl
 import time
 from dataclasses import dataclass
 from typing import Any, NoReturn
@@ -26,24 +25,13 @@ from .error_log_journald import (
 )
 from .models import ErrorLogPage
 from .supervisor_client import make_supervisor_httpx_client
-
-
-def _is_ssl_error(exc: BaseException) -> bool:
-    """True if ``exc`` (or anything in its cause chain) is an SSL error.
-
-    httpx wraps ``ssl.SSLError`` inside ``httpx.ConnectError``; the only
-    reliable check is to walk ``__cause__`` / ``__context__``.
-    """
-    cur: BaseException | None = exc
-    while cur is not None:
-        if isinstance(cur, ssl.SSLError):
-            return True
-        cur = cur.__cause__ or cur.__context__
-    return False
-
+from .transport_errors import is_ssl_error, redirect_message
 
 logger = logging.getLogger(__name__)
 
+# How long past a render's own timeout the client waits for Core's verdict.
+RENDER_VERDICT_GRACE_S = 2.0
+
 # Transient gateway statuses from a reverse proxy / Supervisor ingress — HA Core
 # restarting or briefly overloaded behind it. Retried for SAFE METHODS ONLY.
 #
@@ -455,7 +443,7 @@ class HomeAssistantClient:
             HomeAssistantAuthError: 401 response.
             HomeAssistantAPIError: Non-2xx response (with status_code and
                 response_data set from JSON body when possible).
-            HomeAssistantConnectionError: Network, timeout, or transport error.
+            HomeAssistantConnectionError: Network, timeout, transport or redirect.
         """
         backoff = 0.5
         for attempt in range(1, _MAX_REQUEST_ATTEMPTS + 1):
@@ -469,6 +457,11 @@ class HomeAssistantClient:
                         else "Invalid authentication token"
                     )
 
+                if 300 <= response.status_code < 400:
+                    raise HomeAssistantConnectionError(
+                        redirect_message(self.base_url, response)
+                    )
+
                 if response.status_code >= 400:
                     message, error_data = self._error_message_from_response(response)
 
@@ -495,7 +488,7 @@ class HomeAssistantClient:
                 return response
 
             except httpx.ConnectError as e:
-                if _is_ssl_error(e) and self.verify_ssl:
+                if is_ssl_error(e) and self.verify_ssl:
                     raise HomeAssistantConnectionError(
                         f"TLS verification failed for {self.base_url}: {e}. "
                         "If this is a self-signed certificate or hostname "
@@ -755,11 +748,9 @@ class HomeAssistantClient:
                 domain, service, payload, return_response
             )
 
-        # When return_response is True, HA returns a dict with service_response key
+        # Core's {changed_states, service_response} envelope, or ``{}`` (non-JSON).
         if return_response:
-            if isinstance(result, dict):
-                return result
-            return {"service_response": result}
+            return result
 
         # Normal behavior: return list of affected states
         if isinstance(result, list):
@@ -2061,7 +2052,9 @@ class HomeAssistantClient:
 
         try:
             sub_id, queue = await ws_client.subscribe_command(
-                "render_template", wait_timeout=template_timeout + 2, **params
+                "render_template",
+                wait_timeout=template_timeout + RENDER_VERDICT_GRACE_S,
+                **params,
             )
         except HomeAssistantCommandError as e:
             # A rejection of the command itself: the render exceeded its
@@ -2076,7 +2069,7 @@ class HomeAssistantClient:
             }
         except TimeoutError:
             # Template-level, not transport-level: the wait budget here is the
-            # caller's own ``timeout`` (default 3s) plus two seconds, and a
+            # caller's own ``timeout`` (default 3s) plus ``RENDER_VERDICT_GRACE_S``, and a
             # template that is merely slow to render leaves the socket healthy.
             # Deliberately NOT treated as a dead transport, unlike the 30s
             # round-trip ``HomeAssistantCommandTimeout`` in ``send_command``.
@@ -2106,7 +2099,10 @@ class HomeAssistantClient:
 
         try:
             return await _read_render_verdict(
-                queue, template, template_timeout + 2, report_errors
+                queue,
+                template,
+                template_timeout + RENDER_VERDICT_GRACE_S,
+                report_errors,
             )
         finally:
             await ws_client.release_subscription(sub_id)

ha_mcp_dev-9.3.0.dev3519/src/ha_mcp/client/transport_errors.py

@@ -0,0 +1,30 @@
+"""Recognise HTTP transport outcomes that mean Home Assistant was not reached."""
+
+import ssl
+
+import httpx
+
+
+def is_ssl_error(exc: BaseException) -> bool:
+    """True if ``exc`` (or anything in its cause chain) is an SSL error.
+
+    httpx wraps ``ssl.SSLError`` inside ``httpx.ConnectError``; the only
+    reliable check is to walk ``__cause__`` / ``__context__``.
+    """
+    cur: BaseException | None = exc
+    while cur is not None:
+        if isinstance(cur, ssl.SSLError):
+            return True
+        cur = cur.__cause__ or cur.__context__
+    return False
+
+
+def redirect_message(base_url: str, response: httpx.Response) -> str:
+    """Explain a 3xx reply: redirects are not followed, so Home Assistant was
+    not reached (a write must not be replayed, nor the token sent elsewhere)."""
+    location = response.headers.get("location") or "(no location)"
+    return (
+        f"Home Assistant was not reached at {base_url}: HTTP "
+        f"{response.status_code} redirect to {location}. Set HOMEASSISTANT_URL "
+        "to the address Home Assistant answers on."
+    )

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/client/websocket_client.py

@@ -34,8 +34,8 @@ from .rest_client import (
     HomeAssistantCommandNotSent,
     HomeAssistantCommandTimeout,
     HomeAssistantConnectionError,
-    _is_ssl_error,
 )
+from .transport_errors import is_ssl_error
 from .websocket_state import WebSocketConnectionState
 
 logger = logging.getLogger(__name__)
@@ -270,7 +270,7 @@ class HomeAssistantWebSocketClient:
         except Exception as e:  # noqa: BLE001
             self._last_connect_error = f"{type(e).__name__}: {e}"
             self._last_connect_exception = e
-            if _is_ssl_error(e) and self.verify_ssl:
+            if is_ssl_error(e) and self.verify_ssl:
                 logger.error(
                     "WebSocket TLS verification failed for %s: %s. "
                     "If this is a self-signed certificate or hostname "

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/errors.py

@@ -37,7 +37,6 @@ class ErrorCode(StrEnum):
     # Connection errors
     CONNECTION_FAILED = "CONNECTION_FAILED"
     CONNECTION_TIMEOUT = "CONNECTION_TIMEOUT"
-    WEBSOCKET_DISCONNECTED = "WEBSOCKET_DISCONNECTED"
     WEBSOCKET_NOT_AUTHENTICATED = "WEBSOCKET_NOT_AUTHENTICATED"
 
     # Authentication errors
@@ -152,11 +151,6 @@ DEFAULT_SUGGESTIONS: dict[ErrorCode, list[str]] = {
         "Check network latency to Home Assistant",
         "Try increasing the timeout value if available",
     ],
-    ErrorCode.WEBSOCKET_DISCONNECTED: [
-        "WebSocket connection was lost",
-        "Check Home Assistant logs for errors",
-        "The operation may need to be retried",
-    ],
     ErrorCode.WEBSOCKET_NOT_AUTHENTICATED: [
         "WebSocket connection is not authenticated",
         "Verify the access token is valid",

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/tools/component_config_entries.py

@@ -55,7 +55,7 @@ WS_CONFIG_ENTRIES = "ha_mcp_tools/config_entries"
 class EntryUniqueId(NamedTuple):
     """A config entry's ``unique_id``, and whether it could be read at all."""
 
-    #: False when no component answered, or the component predates the field.
+    #: False when no component answered or its answer could not be trusted.
     known: bool
     #: The value when ``known``; always ``None`` when not.
     value: str | None
@@ -157,7 +157,7 @@ async def fetch_config_entry_unique_id(client: Any, entry_id: str) -> EntryUniqu
 
     Returns :data:`UNKNOWN_UNIQUE_ID` whenever the answer cannot be trusted —
     no ``config_entries`` capability, a downgraded component, a transport
-    failure, a malformed payload, or a row that predates the field. Never
+    failure or a malformed payload. Never
     raises: an unreadable ``unique_id`` degrades the anchor, and the caller
     decides what that means, rather than failing the whole reconfigure here.
     """
@@ -165,15 +165,6 @@ async def fetch_config_entry_unique_id(client: Any, entry_id: str) -> EntryUniqu
     if read is None or not read.rows:
         return UNKNOWN_UNIQUE_ID
     row = read.rows[0]
-    # Key presence is the capability probe: a component older than the field
-    # omits it entirely, which must not read as "this entry has no unique_id".
-    if "unique_id" not in row:
-        logger.debug(
-            "%s row for %s predates the unique_id field; unique_id unavailable",
-            WS_CONFIG_ENTRIES,
-            entry_id,
-        )
-        return UNKNOWN_UNIQUE_ID
     if row.get("entry_id") != entry_id:
         # Reading another entry's anchor would be worse than reading none.
         logger.debug(
@@ -183,7 +174,7 @@ async def fetch_config_entry_unique_id(client: Any, entry_id: str) -> EntryUniqu
             entry_id,
         )
         return UNKNOWN_UNIQUE_ID
-    value = row["unique_id"]
+    value = row.get("unique_id")
     if value is not None and not isinstance(value, str):
         # Malformed is unknown, NOT known-absent: silently turning junk into
         # "this entry has no unique_id" is the exact conflation this type

{ha_mcp_dev-9.3.0.dev3516 → ha_mcp_dev-9.3.0.dev3519}/src/ha_mcp/tools/device_enrichment.py

@@ -61,16 +61,11 @@ async def enrich_zwave_status(
             {"type": "zwave_js/node_status", "device_id": device_id}
         )
         if zwave_result.get("success"):
+            # Z-Wave JS resolves the node (a pre-provisioned device has none),
+            # so its node_id comes from this reply, passed through whole.
             node_data = zwave_result.get("result", {})
-            device_info["node_status"] = {
-                "node_id": node_data.get("node_id"),
-                "status": node_data.get("status"),
-                "is_routing": node_data.get("is_routing"),
-                "is_secure": node_data.get("is_secure"),
-                "highest_security_class": node_data.get("highest_security_class"),
-                "zwave_plus_version": node_data.get("zwave_plus_version"),
-                "is_controller_node": node_data.get("is_controller_node"),
-            }
+            device_info["node_id"] = node_data.get("node_id")
+            device_info["node_status"] = node_data
         else:
             warnings.append(
                 f"Z-Wave node status unavailable: {core_error_message(zwave_result.get('error') or 'request failed')}"