fix(backup): zone WS commands + e2e settle delay before edit

Two issues exposed by the new e2e full-loop tests:

1. ``_fetch_zone`` and ``_restore_zone`` were calling
   ``config/zone/list`` and ``config/zone/update`` WS commands. HA's
   actual zone API has no ``config/`` prefix — confirmed against
   ``tools_zones.py:71,280,296`` which use the bare ``zone/list``,
   ``zone/update``, ``zone/create``. The wrong commands surfaced as
   ``HomeAssistantCommandError: Command failed: Unknown command``
   in the auto-backup WARNING log on every zone edit, with capture
   silently skipped. Real PR bug, not just a test bug.

2. The new full-loop tests (helper, label, category, zone, area,
   group, dashboard_resource) did ``create → edit → expect capture``
   back-to-back. HA's WS-backed registries don't always have the
   freshly-created entity in the ``<x>/list`` response by the time
   the edit's decorator pre-fetch fires — fetch returns None, snapshot
   is skipped, and polling the backup file afterward can't recover.
   Add a fixed 2s ``await asyncio.sleep`` between create and edit so
   the registry has time to index the new entity. Automation's REST
   upsert path settles faster and doesn't need this (its existing
   ``test_full_loop`` was the only one passing).

Schedule's view-the-captured-config assertion still asserts on the
original nested structure since the snapshot is taken pre-edit.

Author: kingpanther13

src/ha_mcp/backup_manager.py

@@ -870,11 +870,12 @@ async def _restore_calendar_event(client: Any, entity_id: str, config: Any) -> A
     )
 
 
-# Zones — config/zone/{list,update}
+# Zones — zone/{list,update} (no ``config/`` prefix per HA's actual WS API;
+# matches ``tools_zones.py`` which is the authoritative usage).
 
 
 async def _fetch_zone(client: Any, entity_id: str) -> Any:
-    items = await _ws_send(client, {"type": "config/zone/list"})
+    items = await _ws_send(client, {"type": "zone/list"})
     if not isinstance(items, list):
         return None
     for item in items:
@@ -885,7 +886,7 @@ async def _fetch_zone(client: Any, entity_id: str) -> Any:
 
 async def _restore_zone(client: Any, entity_id: str, config: Any) -> Any:
     payload = {k: v for k, v in config.items() if k != "id"}
-    payload["type"] = "config/zone/update"
+    payload["type"] = "zone/update"
     payload["zone_id"] = config.get("id", entity_id)
     return await _ws_send(client, payload)
 

tests/src/e2e/workflows/auto_backup/test_capture_and_restore.py

@@ -13,6 +13,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 import uuid
 from typing import Any
@@ -49,6 +50,18 @@ def _backups_for(
     return [e for e in entries if e["domain"] == domain and e["entity_id"] == entity_id]
 
 
+# Fixed delay between create and edit to let HA's WS-backed registries
+# index the freshly-created entity before the decorator's pre-edit
+# fetch fires. The decorator is best-effort: if fetch returns None
+# (entity not in the registry list yet), the snapshot is silently
+# skipped — and polling the backup file afterwards can't recover that.
+# 2 s is the empirically-stable mark on HAOS testcontainer runners;
+# automation's REST upsert path settles faster and doesn't need this,
+# but every WS-backed domain (label, category, zone, area, helper,
+# dashboard_resource) does.
+_HA_PROPAGATION_SETTLE_SECONDS = 2.0
+
+
 async def _wait_for_backup(
     mcp_client, *, domain: str, entity_id: str, timeout: int = 15
 ) -> str:
@@ -267,6 +280,9 @@ async def test_input_boolean_full_loop(
             },
         )
         assert create.get("success") is not False
+        # Let HA index the new helper before the edit fires; otherwise the
+        # decorator's pre-edit fetch via ``input_boolean/list`` may miss it.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
         # Edit so capture fires (the create call may or may not capture
         # depending on whether helper_id is None — edit definitely does).
         edit = await safe_call_tool(
@@ -354,6 +370,9 @@ async def test_schedule_full_loop(
         }
         create = await safe_call_tool(mcp_client, "ha_config_set_helper", original)
         assert create.get("success") is not False
+        # Let HA index the new helper before the edit fires; the decorator's
+        # pre-edit fetch via ``schedule/list`` needs the entity present.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         # Edit — shrink Monday, split Tuesday, drop Wednesday entirely.
         # ``name`` is required by HA's schedule schema on every update
@@ -451,6 +470,8 @@ async def test_dashboard_full_loop(
         )
         if create.get("success") is False:
             pytest.skip(f"dashboard create unsupported on this HA: {create}")
+        # Let HA settle the new lovelace config before the edit fires.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
         # Edit so the decorator captures the pre-edit state.
         await safe_call_tool(
             mcp_client,
@@ -517,6 +538,8 @@ async def test_script_full_loop(
         )
         if create.get("success") is False:
             pytest.skip(f"script create unsupported: {create}")
+        # Settle so the decorator's pre-edit fetch finds the script.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
         # Edit triggers capture.
         await safe_call_tool(
             mcp_client,
@@ -583,6 +606,8 @@ async def test_scene_full_loop(
         )
         if create.get("success") is False:
             pytest.skip(f"scene create unsupported: {create}")
+        # Settle so the decorator's pre-edit fetch finds the scene.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
         await safe_call_tool(
             mcp_client,
             "ha_config_set_scene",
@@ -716,6 +741,8 @@ async def test_label_full_loop(
             pytest.skip(f"label create unsupported: {create}")
         label_id = create.get("data", {}).get("label_id") or create.get("label_id")
         assert label_id, f"label_id missing from create response: {create}"
+        # Settle so the decorator's pre-edit fetch finds the label.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         # Edit — change name + color so capture fires.
         edit = await safe_call_tool(
@@ -787,6 +814,8 @@ async def test_category_full_loop(
         cat_id = create.get("data", {}).get("category_id") or create.get("category_id")
         assert cat_id, f"category_id missing: {create}"
         composite = f"{scope}:{cat_id}"
+        # Settle so the decorator's pre-edit fetch finds the category.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         edit = await safe_call_tool(
             mcp_client,
@@ -859,6 +888,8 @@ async def test_zone_full_loop(
             pytest.skip(f"zone create unsupported: {create}")
         zone_id = create.get("data", {}).get("zone_id") or create.get("zone_id")
         assert zone_id, f"zone_id missing: {create}"
+        # Settle so the decorator's pre-edit fetch finds the zone.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         edit = await safe_call_tool(
             mcp_client,
@@ -926,6 +957,8 @@ async def test_area_full_loop(
         area_id = create.get("data", {}).get("area_id") or create.get("area_id")
         assert area_id, f"area_id missing: {create}"
         composite = f"area:{area_id}"
+        # Settle so the decorator's pre-edit fetch finds the area.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         edit = await safe_call_tool(
             mcp_client,
@@ -995,6 +1028,8 @@ async def test_group_full_loop(
         )
         if create.get("success") is False:
             pytest.skip(f"group create unsupported: {create}")
+        # Settle so the decorator's pre-edit fetch finds the group state.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         edit = await safe_call_tool(
             mcp_client,
@@ -1132,6 +1167,8 @@ async def test_dashboard_resource_full_loop(
             "resource_id"
         )
         assert resource_id, f"resource_id missing: {create}"
+        # Settle so the decorator's pre-edit fetch finds the resource.
+        await asyncio.sleep(_HA_PROPAGATION_SETTLE_SECONDS)
 
         # Edit — change the URL so capture fires.
         edit = await safe_call_tool(