ha-mcp-dev 9.1.0.dev3285__tar.gz → 9.1.0.dev3293__tar.gz

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.1.0.dev3285
+Version: 9.1.0.dev3293
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.1.0.dev3285"
+version = "9.1.0.dev3293"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.1.0.dev3285"
+version = "9.1.0.dev3293"
 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-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/backup_manager.py

@@ -2070,25 +2070,13 @@ async def _ws_send(client: Any, message: dict[str, Any]) -> Any:
 
 
 async def _fetch_automation(client: Any, entity_id: str) -> Any:
-    """Fetch an automation through the same path the get tool uses.
-
-    Applies ``_normalize_config_for_roundtrip`` so the snapshot matches
-    what ``ha_config_get_automation`` returns and round-trips cleanly
-    back through ``ha_config_set_automation`` on restore. Imported lazily
-    to keep the manager import-cycle-free.
-    """
-    # Lazy import to avoid backup_manager → tools → backup_manager cycle.
-    from .tools.tools_config_automations import _normalize_config_for_roundtrip
-
+    """Fetch the stored body verbatim."""
     try:
-        raw = await client.get_automation_config(entity_id)
+        return await client.get_automation_config(entity_id)
     except HomeAssistantError as err:
         if getattr(err, "status_code", None) == 404:
             return None
         raise
-    if not isinstance(raw, dict):
-        return raw
-    return _normalize_config_for_roundtrip(raw)
 
 
 async def _restore_automation(client: Any, entity_id: str, config: Any) -> Any:

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/client/rest_client.py

@@ -1377,40 +1377,44 @@ class HomeAssistantClient:
     # Automation Configuration Management
 
     async def _resolve_automation_id(self, identifier: str) -> str:
-        """Convert entity_id to unique_id if needed, or return unique_id as-is.
+        """Return the config id of ``identifier`` (an entity_id or a config id).
 
-        Args:
-            identifier: Either entity_id (automation.xxx) or unique_id
-
-        Returns:
-            The unique_id for configuration API
+        An entity_id resolves through the entity registry first, so a disabled
+        automation (no state) resolves too; the state's ``id`` attribute is the
+        fallback when the registry does not answer with a ``unique_id``.
 
         Raises:
             HomeAssistantAPIError: 404 if not found; other read failures propagate
         """
-        if identifier.startswith("automation."):
-            try:
-                state = await self.get_entity_state(identifier)
-                unique_id = state.get("attributes", {}).get("id")
-                if not unique_id:
-                    raise HomeAssistantAPIError(
-                        f"Automation {identifier} has no unique_id attribute",
-                        status_code=404,
-                    )
-                logger.debug(
-                    f"Converted entity_id {identifier} to unique_id {unique_id}"
-                )
-                return str(unique_id)
-            except HomeAssistantAPIError as e:
-                if e.status_code != 404:  # a failed read is not a missing one
-                    raise
-                raise HomeAssistantAPIError(
-                    f"Failed to resolve automation {identifier}: {str(e)}",
-                    status_code=404,
-                ) from e
-        else:
-            # Assume it's already a unique_id
+        if not identifier.startswith("automation."):
             return identifier
+        try:
+            entry = await self.send_websocket_message(
+                {"type": "config/entity_registry/get", "entity_id": identifier}
+            )
+        except HomeAssistantConnectionError as e:
+            logger.debug(f"Registry lookup for {identifier} failed: {e}")
+            entry = {}
+        if entry.get("success"):
+            unique_id = (entry.get("result") or {}).get("unique_id")
+            if unique_id:
+                return str(unique_id)
+        try:
+            state = await self.get_entity_state(identifier)
+        except HomeAssistantAPIError as e:
+            if e.status_code != 404:  # a failed read is not a missing one
+                raise
+            raise HomeAssistantAPIError(
+                f"Failed to resolve automation {identifier}: {str(e)}",
+                status_code=404,
+            ) from e
+        unique_id = state.get("attributes", {}).get("id")
+        if not unique_id:
+            raise HomeAssistantAPIError(
+                f"Automation {identifier} has no unique_id attribute",
+                status_code=404,
+            )
+        return str(unique_id)
 
     async def get_automation_config(self, identifier: str) -> dict[str, Any]:
         """Get automation configuration by unique_id or entity_id.
@@ -1446,19 +1450,19 @@ class HomeAssistantClient:
         identifier: str | None = None,
         *,
         _resolved: bool = False,
+        wait_for_entity: bool = False,
     ) -> dict[str, Any]:
         """
         Create new automation or update existing one.
 
         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.
+            config: Automation configuration dictionary, sent as given
+            identifier: Optional automation entity_id or config id (None = create new)
+            _resolved: When True, ``identifier`` is already the config id (the
+                caller resolved it), so the entity_id lookup is skipped. The
+                #1404 config-id mismatch guard below still applies.
+            wait_for_entity: Poll for the entity the write registers, as a
+                creation does, and report it as ``entity_id``.
 
         Returns:
             Result with automation unique_id and status
@@ -1466,19 +1470,14 @@ class HomeAssistantClient:
         Raises:
             HomeAssistantAPIError: If configuration invalid or API error
         """
-        # Generate unique_id for new automation if not provided
         if identifier is None:
             unique_id = str(int(time.time() * 1000))
-            operation = "created"
-            logger.debug(f"Creating new automation with unique_id: {unique_id}")
         else:
             unique_id = (
                 identifier
                 if _resolved
                 else await self._resolve_automation_id(identifier)
             )
-            operation = "updated"
-            logger.debug(f"Updating automation with unique_id: {unique_id}")
 
         # Reject mismatch between resolved storage key and inner ``config["id"]``.
         # HA stores by the inner id field even though the URL carries one too —
@@ -1491,20 +1490,20 @@ class HomeAssistantClient:
                     "Cannot create automation with explicit config['id']="
                     f"{config_id!r}: Home Assistant stores by the inner id, "
                     "which would silently overwrite an existing automation. "
-                    "Omit 'id' from config to auto-generate, or pass identifier "
+                    "Omit 'id' from config to auto-generate, or pass entity_id "
                     "to update an existing automation.",
                     status_code=400,
                 )
             raise HomeAssistantAPIError(
-                f"Mismatched automation id: identifier={identifier!r} resolves "
-                f"to unique_id={unique_id!r}, but config['id']={config_id!r}. "
+                f"Mismatched automation id: the target's config id is "
+                f"{unique_id!r}, but config['id']={config_id!r}. "
                 "Refusing to write to prevent overwriting the wrong automation. "
-                f"Remove 'id' from config or set it to the resolved unique_id "
+                f"Remove 'id' from config or set it to the target's config id "
                 f"({unique_id!r}).",
                 status_code=400,
             )
 
-        # Add unique_id to config for updates
+        # Core stores by the body's id, so it carries the target's.
         if unique_id and "id" not in config:
             config = {**config, "id": unique_id}
 
@@ -1513,10 +1512,9 @@ class HomeAssistantClient:
                 "POST", f"/config/automation/config/{unique_id}", json=config
             )
 
-            # For new automations, query Home Assistant to get the actual entity_id that was assigned
             actual_entity_id = None
             entity_not_verified = False
-            if operation == "created":
+            if wait_for_entity:
                 actual_entity_id = await self._poll_for_automation_entity(unique_id)
                 if not actual_entity_id:
                     entity_not_verified = True
@@ -1525,7 +1523,6 @@ class HomeAssistantClient:
                 "unique_id": unique_id,
                 "entity_id": actual_entity_id,
                 "result": response.get("result", "ok"),
-                "operation": operation,
             }
             if entity_not_verified:
                 result["entity_not_verified"] = True
@@ -1533,7 +1530,9 @@ class HomeAssistantClient:
         except HomeAssistantAPIError as e:
             if e.status_code == 400:
                 raise HomeAssistantAPIError(
-                    f"Invalid automation configuration: {str(e)}", status_code=400
+                    f"Invalid automation configuration: {str(e)}",
+                    status_code=400,
+                    response_data=e.response_data,
                 ) from e
             raise
 
@@ -1610,27 +1609,11 @@ class HomeAssistantClient:
                 "operation": "deleted",
             }
         except HomeAssistantAPIError as e:
-            if e.status_code == 404:
-                raise HomeAssistantAPIError(
-                    f"Automation not found: {identifier} (unique_id: {unique_id})",
-                    status_code=404,
-                ) from e
-            elif e.status_code == 405:
-                raise HomeAssistantAPIError(
-                    f"Cannot delete automation '{identifier}': The HTTP DELETE method is blocked. "
-                    f"This typically occurs when running ha-mcp as a Home Assistant add-on, because "
-                    f"the Supervisor ingress proxy only allows GET and POST requests. "
-                    f"WORKAROUNDS: "
-                    f"(1) Use ha-mcp via pip, Docker, or as an external MCP server instead of the add-on. "
-                    f"(2) Use a long-lived access token to connect directly to Home Assistant's API. "
-                    f"(3) As a fallback, disable the automation and rename it with a 'DELETE_' prefix "
-                    f"(e.g., 'DELETE_{identifier}') so you can identify and manually delete it later "
-                    f"via the Home Assistant UI (Settings > Automations & Scenes).",
-                    status_code=405,
-                ) from e
-            raise
-        except Exception as e:
-            if "404" in str(e):
+            # Core's DELETE answers a missing id with 400, not 404.
+            if (
+                e.status_code == 400
+                and (e.response_data or {}).get("message") == "Resource not found"
+            ):
                 raise HomeAssistantAPIError(
                     f"Automation not found: {identifier} (unique_id: {unique_id})",
                     status_code=404,

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/server_tool_text.py

@@ -213,10 +213,10 @@ SEARCH_KEYWORDS: dict[str, str] = {
 LITE_DOCSTRINGS: dict[str, str] = {
     "ha_config_get_automation": (
         "Get a Home Assistant automation configuration by "
-        "entity_id or unique_id. Returns the full config "
-        "(trigger, condition, action, mode) plus a stable "
-        "config_hash for use with python_transform on "
-        "ha_config_set_automation.\n\n"
+        "entity_id or config id. Returns the stored config "
+        "plus a stable config_hash for use with python_transform on "
+        "ha_config_set_automation, the registry entry, and Home "
+        "Assistant's validation status.\n\n"
         "For schema and field-level details, see "
         "ha_get_skill_guide."
     ),
@@ -224,14 +224,14 @@ LITE_DOCSTRINGS: dict[str, str] = {
         "Create or update a Home Assistant automation.\n\n"
         "Supports three modes: full `config` replacement, surgical "
         "`python_transform` on an existing automation (requires "
-        "`identifier` and `config_hash` from "
+        "`entity_id` and `config_hash` from "
         "ha_config_get_automation), or `take_control_of_blueprint` "
         "to convert a blueprint-backed automation into an editable "
         "standalone one (the UI's Take control action). Omit "
-        "`identifier` to create a new automation. Reusing an identifier targets "
+        "`entity_id` to create a new automation. Reusing an entity_id targets "
         "the same automation; changing its alias requires config_hash from a prior read. "
         "`enabled` turns it on or off and `run_actions` runs it now, with a "
-        "write or alone with `identifier`.\n\n"
+        "write or alone with `entity_id`.\n\n"
         "For schema details, examples, and native-vs-template "
         "guidance, see ha_get_skill_guide or your locally "
         "installed skills."

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/az.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Avtomatlaşdırmanın konfiqurasiyasını al",
-      "description": "Home Assistant avtomatlaşdırma konfiqurasiyasını əldə edin."
+      "description": "Home Assistant avtomatlaşdırmasının yadda saxlanılan konfiqurasiyasını əldə edin."
     },
     "ha_config_get_calendar_events": {
       "title": "Təqvim hadisələrini al",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/cs.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "Získat konfiguraci automatizace",
-      "description": "Získá konfiguraci automatizace v Home Assistant."
+      "description": "Získat uloženou konfiguraci automatizace v Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Získat události kalendáře",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/de.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Automatisierung abrufen",
-      "description": "Rufe die Home-Assistant-Automatisierungskonfiguration ab."
+      "description": "Rufe die gespeicherte Konfiguration einer Home Assistant Automatisierung ab."
     },
     "ha_config_get_calendar_events": {
       "title": "Kalenderereignisse abrufen",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/eo.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "Akiri Aŭtomatigan Agordon",
-      "description": "Akiri la agordon de aŭtomatigo de Home Assistant."
+      "description": "Akiri la konservitan agordon de Home Assistant aŭtomatigo."
     },
     "ha_config_get_calendar_events": {
       "title": "Akiri Kalendarajn Eventojn",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/es.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Obtener configuración de automatización",
-      "description": "Obtiene la configuración de una automatización de Home Assistant."
+      "description": "Obtiene la configuración guardada de una automatización de Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Obtener eventos de calendario",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/fr.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Obtenir l'automatisation",
-      "description": "Récupère la configuration d'une automatisation Home Assistant."
+      "description": "Obtenir la configuration enregistrée d'une automatisation Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Obtenir les événements du calendrier",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/it.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Ottieni la configurazione di un'automazione",
-      "description": "Ottieni la configurazione di un'automazione di Home Assistant."
+      "description": "Ottieni la configurazione memorizzata di un'automazione di Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Ottieni gli eventi del calendario",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/ko.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "자동화 설정 조회",
-      "description": "Home Assistant 자동화 구성을 가져옵니다."
+      "description": "Home Assistant 자동화의 저장된 설정을 가져옵니다."
     },
     "ha_config_get_calendar_events": {
       "title": "캘린더 일정 조회",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/nl.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "Haal Automatisering Config op",
-      "description": "Haal de Home Assistant-automatiseringsconfiguratie op."
+      "description": "Haal de opgeslagen configuratie van een Home Assistant-automatisering op."
     },
     "ha_config_get_calendar_events": {
       "title": "Haal Kalendergebeurtenissen op",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/pl.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "Pobierz konfigurację automatyzacji",
-      "description": "Pobierz konfigurację automatyzacji Home Assistant."
+      "description": "Pobierz zapisaną konfigurację automatyzacji Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Pobierz wydarzenia z kalendarza",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/ru.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "Получить автоматизацию",
-      "description": "Получить конфигурацию автоматизации Home Assistant."
+      "description": "Получить сохраненную конфигурацию автоматизации Home Assistant."
     },
     "ha_config_get_calendar_events": {
       "title": "Получить события календаря",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/sv.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "Hämta Automatiseringskonfiguration",
-      "description": "Hämta konfiguration för Home Assistant-automatisering."
+      "description": "Hämta en Home Assistant-automations lagrade konfiguration."
     },
     "ha_config_get_calendar_events": {
       "title": "Hämta Kalenderhändelser",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/zh-Hans.json

@@ -605,7 +605,7 @@
     },
     "ha_config_get_automation": {
       "title": "获取自动化配置",
-      "description": "获取 Home Assistant 自动化配置。"
+      "description": "获取 Home Assistant 自动化存储的配置。"
     },
     "ha_config_get_calendar_events": {
       "title": "获取日历事件",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/settings_ui/locales/zh-Hant.json

@@ -574,7 +574,7 @@
     },
     "ha_config_get_automation": {
       "title": "取得自動化設定",
-      "description": "取得 Home Assistant 自動化設定。"
+      "description": "取得 Home Assistant 自動化的儲存設定。"
     },
     "ha_config_get_calendar_events": {
       "title": "取得行事曆活動",

{ha_mcp_dev-9.1.0.dev3285 → ha_mcp_dev-9.1.0.dev3293}/src/ha_mcp/tools/auto_backup.py

@@ -108,13 +108,13 @@ def automation_backup_target(kw: dict[str, Any]) -> str:
     """Resolve the actual storage target for an automation write.
 
     HA's automation storage uses the body's ``id`` field as the primary
-    key (#1404). When the caller passes both ``identifier`` and a
+    key (#1404). When the caller passes both ``entity_id`` and a
     ``config.id`` that differ, HA writes to ``config.id`` — the
     snapshot must capture *that* entity, not the user-provided
-    ``identifier`` whose target is left untouched.
+    ``entity_id`` whose target is left untouched.
 
     Returns ``str(config["id"])`` when present, else
-    ``str(identifier or "")``. Empty string skips capture (matches the
+    ``str(entity_id or "")``. Empty string skips capture (matches the
     create path where there's nothing to back up yet).
 
     ``config`` accepts dict or JSON-string per the tool signature; both
@@ -130,7 +130,7 @@ def automation_backup_target(kw: dict[str, Any]) -> str:
         config_id = config.get("id")
         if config_id:
             return str(config_id)
-    # Return the identifier UNCHANGED — do NOT strip the ``automation.``
+    # Return the entity_id UNCHANGED — do NOT strip the ``automation.``
     # prefix. Capture and restore resolve the target through
     # ``client.get_automation_config`` -> ``_resolve_automation_id``, which
     # converts an entity_id ("automation.<slug>") to the real numeric
@@ -142,8 +142,8 @@ def automation_backup_target(kw: dict[str, Any]) -> str:
     # would POST to the wrong key and create a stray automation). The
     # doubled domain segment in the snapshot filename
     # ("automation.automation.<slug>.<ts>.yaml") is purely cosmetic and is
-    # exactly what the remove path (id_param="identifier") already produces.
-    return _resolve_str(kw.get("identifier"))
+    # exactly what the remove path (id_param="entity_id") already produces.
+    return _resolve_str(kw.get("entity_id"))
 
 
 def with_auto_backup(