ha-mcp-dev 7.13.0.dev2005__tar.gz → 7.13.0.dev2009__tar.gz

{ha_mcp_dev-7.13.0.dev2005/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.13.0.dev2009}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.13.0.dev2005
+Version: 7.13.0.dev2009
 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.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.13.0.dev2005"
+version = "7.13.0.dev2009"
 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
@@ -178,21 +178,12 @@ ignore = [
 "src/ha_mcp/backup_manager.py" = ["C901"]
 "src/ha_mcp/tools/auto_backup.py" = ["C901"]
 "src/ha_mcp/tools/backup.py" = ["C901"]
-"src/ha_mcp/tools/radio/matter.py" = ["C901"]
-"src/ha_mcp/tools/radio/zigbee.py" = ["C901"]
-"src/ha_mcp/tools/radio/zwave.py" = ["C901"]
-"src/ha_mcp/tools/reference_validator.py" = ["C901"]
-"src/ha_mcp/tools/tools_areas.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_automations.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_scenes.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_scripts.py" = ["C901"]
 "src/ha_mcp/tools/tools_dev.py" = ["C901"]
-"src/ha_mcp/tools/tools_history.py" = ["C901"]
 "src/ha_mcp/tools/tools_integrations.py" = ["C901"]
 "src/ha_mcp/tools/tools_system.py" = ["C901"]
-"src/ha_mcp/tools/tools_zones.py" = ["C901"]
-"src/ha_mcp/transforms/categorized_search.py" = ["C901"]
-"src/ha_mcp/visibility/resolver.py" = ["C901"]
 "tests/src/e2e/conftest.py" = ["C901"]
 "tests/src/e2e/error_handling/test_network_errors.py" = ["C901"]
 "tests/src/e2e/policy/test_readonly_mode.py" = ["C901"]

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/client/rest_client.py

@@ -975,7 +975,11 @@ class HomeAssistantClient:
             raise
 
     async def upsert_automation_config(
-        self, config: dict[str, Any], identifier: str | None = None
+        self,
+        config: dict[str, Any],
+        identifier: str | None = None,
+        *,
+        _resolved: bool = False,
     ) -> dict[str, Any]:
         """
         Create new automation or update existing one.
@@ -983,6 +987,12 @@ class HomeAssistantClient:
         Args:
             config: Automation configuration dictionary
             identifier: Optional automation entity_id or unique_id (None = create new)
+            _resolved: When True, ``identifier`` is already the resolved unique_id
+                (the caller ran ``_resolve_automation_id``), so the redundant
+                entity_id→unique_id lookup is skipped. Ignored on the create path
+                (``identifier is None``). The #1404 config-id mismatch guard below
+                is unaffected — it still compares ``config['id']`` to the resolved
+                unique_id.
 
         Returns:
             Result with automation unique_id and status
@@ -996,7 +1006,11 @@ class HomeAssistantClient:
             operation = "created"
             logger.debug(f"Creating new automation with unique_id: {unique_id}")
         else:
-            unique_id = await self._resolve_automation_id(identifier)
+            unique_id = (
+                identifier
+                if _resolved
+                else await self._resolve_automation_id(identifier)
+            )
             operation = "updated"
             logger.debug(f"Updating automation with unique_id: {unique_id}")
 
@@ -1592,14 +1606,33 @@ class HomeAssistantClient:
             raise
 
     async def upsert_script_config(
-        self, config: dict[str, Any], script_id: str
+        self,
+        config: dict[str, Any],
+        script_id: str,
+        *,
+        resolved_id: str | None = None,
     ) -> dict[str, Any]:
-        """Create or update Home Assistant script configuration."""
-        resolved_id = await self._resolve_script_id(script_id)
+        """Create or update Home Assistant script configuration.
+
+        ``resolved_id``, when provided, is the already-resolved storage key used
+        as the write target (the caller ran :meth:`_resolve_script_id`),
+        skipping the redundant entity-registry lookup. ``script_id`` stays the
+        CALLER's identifier and is used only to default a missing ``alias`` — a
+        renamed script (whose storage key differs from the entity slug the
+        caller passed) keeps its caller-facing name rather than resetting the
+        user-visible alias to the stale storage key (#1935).
+        """
+        write_id = (
+            resolved_id
+            if resolved_id is not None
+            else await self._resolve_script_id(script_id)
+        )
         try:
-            endpoint = f"config/script/config/{resolved_id}"
+            endpoint = f"config/script/config/{write_id}"
 
-            # Validate required fields
+            # Default a missing alias from the CALLER's ``script_id`` (not
+            # ``write_id``) so a renamed script's user-visible name is preserved
+            # instead of being reset to the storage key.
             if "alias" not in config:
                 config["alias"] = script_id
 
@@ -1614,7 +1647,7 @@ class HomeAssistantClient:
 
             return {
                 "success": True,
-                "script_id": resolved_id,
+                "script_id": write_id,
                 "result": response.get("result", "ok"),
                 "operation": "created" if response.get("result") == "ok" else "updated",
             }
@@ -1722,22 +1755,39 @@ class HomeAssistantClient:
             raise
 
     async def upsert_scene_config(
-        self, config: dict[str, Any], scene_id: str, *, _resolved: bool = False
+        self,
+        config: dict[str, Any],
+        scene_id: str,
+        *,
+        resolved_id: str | None = None,
     ) -> dict[str, Any]:
         """Create or update Home Assistant scene configuration.
 
-        ``_resolved=True`` signals ``scene_id`` is already the resolved storage
-        key, skipping the redundant registry lookup (``resolve_scene_id`` is
-        idempotent, so the endpoint id is unchanged).
+        ``resolved_id``, when provided, is the already-resolved storage key used
+        as the write target (the caller ran :meth:`resolve_scene_id`), skipping
+        the redundant registry lookup. ``scene_id`` stays the CALLER's identifier
+        and is used only to default a missing ``name`` — a renamed scene (whose
+        storage key differs from the slug the caller passed) keeps its
+        caller-facing name rather than resetting to the stale storage key
+        (#1935, mirrors the script fix).
         """
-        resolved_id = scene_id if _resolved else await self.resolve_scene_id(scene_id)
+        write_id = (
+            resolved_id
+            if resolved_id is not None
+            else await self.resolve_scene_id(scene_id)
+        )
         try:
-            endpoint = f"config/scene/config/{resolved_id}"
-
-            # Default a name when missing — mirrors the script upsert behaviour
-            # so a bare config dict is still acceptable.
+            endpoint = f"config/scene/config/{write_id}"
+
+            # Default a name when missing from the CALLER's ``scene_id`` (not
+            # ``write_id``) — mirrors the script upsert behaviour so a bare
+            # config dict is acceptable, without resetting a renamed scene's
+            # name to the storage key. Strip the ``scene.`` prefix: a caller may
+            # pass the entity_id form (``resolve_scene_id`` accepts it), and HA
+            # derives the entity_id from the name slug — persisting the prefixed
+            # form would rename the scene and change its entity_id on a plain update.
             if "name" not in config:
-                config["name"] = scene_id
+                config["name"] = scene_id.removeprefix("scene.")
 
             # Validate required field. ``entities`` is a dict keyed by entity_id,
             # not a list — distinct from script ``sequence`` and automation ``action``.
@@ -1757,7 +1807,7 @@ class HomeAssistantClient:
             # activity should diff before/after via ``ha_config_get_scene``.
             return {
                 "success": True,
-                "scene_id": resolved_id,
+                "scene_id": write_id,
                 "result": response.get("result", "ok"),
             }
         except Exception as e:

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/tools/component_api.py

@@ -273,9 +273,17 @@ async def get_component_caps(client: Any) -> ComponentCaps | None:
         if not base_url or not token:
             # Not a credentialed HA client — no WS connection to negotiate over.
             return None
+        # Thread verify_ssl so a verify_ssl=False client keys (and can establish)
+        # its own pooled connection rather than failing the probe or colliding with
+        # a default-verification entry — otherwise EVERY component capability is
+        # silently unreachable on an HTTPS + verify_ssl=False install. ``None`` is
+        # the pool's settings default, so a client without the attr is unchanged.
+        verify_ssl = getattr(client, "verify_ssl", None)
 
         try:
-            ws = await get_websocket_client(url=base_url, token=token)
+            ws = await get_websocket_client(
+                url=base_url, token=token, verify_ssl=verify_ssl
+            )
             response = await ws.send_command(INFO_COMMAND)
         except HomeAssistantCommandError:
             # Old component (unknown_command) or an info handler bug: the

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/tools/radio/matter.py

@@ -145,6 +145,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         # Returns setup_pin_code, setup_manual_code, setup_qr_code.
         return ok("matter", "share_out", commissioning=commissioning)
 
+    return await _handle_matter_more(client, action, args, device_id)
+
+
+async def _handle_matter_more(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for the remaining Matter actions."""
     if action == "interview":
         result = await ws_call(
             client,

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/tools/radio/zigbee.py

@@ -272,6 +272,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
             long_running=True,
         )
 
+    return await _handle_zigbee_groups(client, action, args, device_id)
+
+
+async def _handle_zigbee_groups(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Zigbee group and binding actions."""
     # --- groups ------------------------------------------------------------ #
     if action == "group_add":
         group = await ws_call(
@@ -340,6 +347,14 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         )
         return ok("zigbee", "unbind", result=result)
 
+    return await _handle_zigbee_clusters(client, action, args, device_id)
+
+
+async def _handle_zigbee_clusters(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Zigbee cluster-write and network actions."""
+    cluster_type = args.get("cluster_type", "in")
     # --- cluster writes (service-only) ------------------------------------- #
     if action == "cluster_write":
         ieee = await _resolve_ieee(client, device_id)

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/tools/radio/zwave.py

@@ -174,6 +174,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         result = await client.call_service("zwave_js", "ping", {"device_id": device_id})
         return ok("zwave", "ping", result=result)
 
+    return await _handle_zwave_inclusion(client, action, args, device_id)
+
+
+async def _handle_zwave_inclusion(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Z-Wave inclusion/exclusion actions."""
     if action == "add":
         entry_id = await _zwave_entry_id(client)
         if not entry_id:
@@ -289,6 +296,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
             long_running=True,
         )
 
+    return await _handle_zwave_maintenance(client, action, args, device_id)
+
+
+async def _handle_zwave_maintenance(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Z-Wave node maintenance actions."""
     if action == "reinterview":
         result = await ws_call(
             client,

{ha_mcp_dev-7.13.0.dev2005 → ha_mcp_dev-7.13.0.dev2009}/src/ha_mcp/tools/reference_validator.py

@@ -69,6 +69,55 @@ class ValidationWarning(TypedDict):
     reason: str
 
 
+def _extract_service_ref(
+    sub_path: str,
+    value: str,
+    refs: list[ExtractedRef],
+    unvalidated_templates: list[int],
+) -> None:
+    """Record a service ref at *sub_path*, counting templates instead."""
+    if _is_template(value):
+        unvalidated_templates[0] += 1
+    else:
+        refs.append({"path": sub_path, "value": value, "kind": "service"})
+
+
+def _extract_entity_refs(
+    sub_path: str,
+    value: Any,
+    refs: list[ExtractedRef],
+    unvalidated_templates: list[int],
+) -> bool:
+    """Record entity ref(s) from a str or list *value*; return True if handled.
+
+    Returns False when *value* is neither a str nor a list so the caller can
+    keep recursing into it (an ``entity_id`` mapped to a nested structure).
+    """
+    if isinstance(value, str):
+        if _is_template(value):
+            unvalidated_templates[0] += 1
+        else:
+            refs.append({"path": sub_path, "value": value, "kind": "entity"})
+        return True
+    if isinstance(value, list):
+        for i, item in enumerate(value):
+            if not isinstance(item, str):
+                continue
+            item_path = f"{sub_path}[{i}]"
+            if _is_template(item):
+                unvalidated_templates[0] += 1
+            else:
+                refs.append(
+                    {
+                        "path": item_path,
+                        "value": item,
+                        "kind": "entity",
+                    }
+                )
+        return True
+    return False
+
+
 def extract_refs(config: Any) -> WalkerResult:
     """Pull every literal service/entity reference out of *config*.
 
@@ -97,43 +146,17 @@ def extract_refs(config: Any) -> WalkerResult:
                 sub_path = f"{path}.{key}" if path else key
 
                 if key in _SERVICE_KEYS and isinstance(value, str):
-                    if _is_template(value):
-                        unvalidated_templates[0] += 1
-                    else:
-                        refs.append(
-                            {"path": sub_path, "value": value, "kind": "service"}
-                        )
+                    _extract_service_ref(sub_path, value, refs, unvalidated_templates)
+                    continue
+
+                if key in _ENTITY_KEYS and _extract_entity_refs(
+                    sub_path, value, refs, unvalidated_templates
+                ):
                     continue
 
-                if key in _ENTITY_KEYS:
-                    if isinstance(value, str):
-                        if _is_template(value):
-                            unvalidated_templates[0] += 1
-                        else:
-                            refs.append(
-                                {"path": sub_path, "value": value, "kind": "entity"}
-                            )
-                        continue
-                    if isinstance(value, list):
-                        for i, item in enumerate(value):
-                            if not isinstance(item, str):
-                                continue
-                            item_path = f"{sub_path}[{i}]"
-                            if _is_template(item):
-                                unvalidated_templates[0] += 1
-                            else:
-                                refs.append(
-                                    {
-                                        "path": item_path,
-                                        "value": item,
-                                        "kind": "entity",
-                                    }
-                                )
-                        continue
-
-                # Neither a service nor an entity key: recurse so deeply
-                # nested action blocks (choose/if/parallel/repeat) still
-                # get walked.
+                # Neither a service nor an entity key (or an entity key whose
+                # value is neither str nor list): recurse so deeply nested
+                # action blocks (choose/if/parallel/repeat) still get walked.
                 _walk(value, sub_path)
 
         elif isinstance(node, list):