ha-mcp-dev 8.3.0.dev2463__tar.gz → 8.3.0.dev2465__tar.gz

{ha_mcp_dev-8.3.0.dev2463/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.3.0.dev2465}/PKG-INFO

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

{ha_mcp_dev-8.3.0.dev2463 → ha_mcp_dev-8.3.0.dev2465}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.3.0.dev2463"
+version = "8.3.0.dev2465"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's

{ha_mcp_dev-8.3.0.dev2463 → ha_mcp_dev-8.3.0.dev2465}/src/ha_mcp/client/websocket_client.py

@@ -672,6 +672,11 @@ class HomeAssistantWebSocketClient:
             # never-sent. Still cancel the pending future so it cannot leak.
             self.cancel_pending_response(message_id)
             raise
+        except BaseException:
+            # Cancellation mid-send: same leak potential as the response-wait
+            # clause below — drop the registered future before propagating.
+            self.cancel_pending_response(message_id)
+            raise
 
         # Wait for response outside the lock.
         try:
@@ -707,6 +712,15 @@ class HomeAssistantWebSocketClient:
         except Exception:
             self.cancel_pending_response(message_id)
             raise
+        except BaseException:
+            # Cancellation (or another BaseException) while awaiting the
+            # response: without this clause the registered future stays in
+            # _pending_requests until a response with this id arrives — which a
+            # hung handler never sends — leaking one entry per cancelled call
+            # (e.g. the ha_search dashboards leg cancelled on a component-leg
+            # failure, #2291).
+            self.cancel_pending_response(message_id)
+            raise
 
     async def send_command_with_event(
         self,

{ha_mcp_dev-8.3.0.dev2463 → ha_mcp_dev-8.3.0.dev2465}/src/ha_mcp/tools/component_api.py

@@ -102,6 +102,13 @@ class ComponentCaps:
     capabilities: frozenset[str]
     limits: dict[str, Any]
     timezone: str | None = None
+    # Whether the tools entry's filesystem/YAML HA services are registered.
+    # Additive ``info`` field (2.1.0, #2292): since the server entry also
+    # registers the WS surface (#2289), caps-present no longer implies those
+    # services exist; ``None`` means a component too old to report it (where
+    # the old implication still holds — only the tools entry registered
+    # ``info`` there).
+    tools_services: bool | None = None
 
 
 # Weak-keyed by client so the negotiated caps self-evict when the client is
@@ -218,6 +225,7 @@ def _parse_caps(response: Any) -> ComponentCaps | None:
     except (TypeError, ValueError):
         schema_version = 0
     raw_timezone = result.get("timezone")
+    raw_tools_services = result.get("tools_services")
     return ComponentCaps(
         schema_version=schema_version,
         component_version=str(result.get("component_version", "")),
@@ -226,6 +234,11 @@ def _parse_caps(response: Any) -> ComponentCaps | None:
         # Additive info field: a component too old to report it (or an unset
         # time_zone) leaves this None; a non-string value is ignored likewise.
         timezone=raw_timezone if isinstance(raw_timezone, str) else None,
+        # Additive info field (#2292): non-bool (including absent, on a
+        # pre-2.1.0 component) stays None.
+        tools_services=raw_tools_services
+        if isinstance(raw_tools_services, bool)
+        else None,
     )
 
 

{ha_mcp_dev-8.3.0.dev2463 → ha_mcp_dev-8.3.0.dev2465}/src/ha_mcp/tools/tools_filesystem.py

@@ -429,6 +429,14 @@ async def _assert_mcp_tools_available(client: Any) -> None:
     (``get_component_caps`` returns caps) obviously exists — reuse that shared
     cached probe and enforce ``MIN_COMPONENT_VERSION`` from
     ``caps.component_version`` (info shipped in 1.1.0, already past the floor).
+    Caps alone no longer prove the SERVICES exist, though: since 2.1.0 the
+    server entry also registers the WS surface (#2289), so ``info`` answers on
+    a server-entry-only install too. Such a component reports the additive
+    ``tools_services`` field (#2292); ``False`` raises the tools-entry error
+    below — after a live service-registry re-check, because the cached caps can
+    predate the user adding the tools entry mid-session. ``None`` (a pre-2.1.0
+    component) keeps the old implication, which was sound there — only the
+    tools entry registered ``info``.
     Legacy fallback: caps is None for a component in the 0.11.0-1.1.0 band
     (services, no info command) or an absent one, so fall back to the per-call
     ``get_services()`` existence probe. A no-services verdict raises the
@@ -445,6 +453,13 @@ async def _assert_mcp_tools_available(client: Any) -> None:
     caps = await get_component_caps(client)
     if caps is not None:
         _assert_caps_version_ok(caps)
+        # Caps are cached for the client's lifetime, so a ``False`` snapshot
+        # taken before the user added the tools entry would block these tools
+        # until a server restart. Service registration is dynamic — re-check
+        # the live service registry before raising, and only raise when it
+        # confirms the services are still absent.
+        if caps.tools_services is False and not await _is_mcp_tools_available(client):
+            _raise_tools_entry_not_set_up()
         return
     if not await _is_mcp_tools_available(client):
         _raise_tools_entry_not_set_up()