homeassistant-ai
diff --git a/‎src/ha_mcp/tools/tools_groups.py‎
Lines changed: 43 additions & 0 deletions b/‎src/ha_mcp/tools/tools_groups.py‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎tests/src/e2e/workflows/groups/test_verification.py‎
Lines changed: 105 additions & 0 deletions b/‎tests/src/e2e/workflows/groups/test_verification.py‎
Lines changed: 105 additions & 0 deletions
@@ -13,6 +13,11 @@
 
 from ..errors import ErrorCode, create_error_response
 from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
+from .util_helpers import (
+    coerce_bool_param,
+    wait_for_entity_registered,
+    wait_for_entity_removed,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -133,6 +138,13 @@ async def ha_config_set_group(
                 default=None,
             ),
         ] = None,
+        wait: Annotated[
+            bool | str,
+            Field(
+                description="Wait for group to be queryable before returning. Default: True. Set to False for bulk operations.",
+                default=True,
+            ),
+        ] = True,
     ) -> dict[str, Any]:
         """
         Create or update a Home Assistant entity group.
@@ -225,12 +237,24 @@ async def ha_config_set_group(
             # Determine if this was a create or update based on fields provided
             is_create = entities is not None and name is None and add_entities is None and remove_entities is None
 
+            # Verify entity is queryable after creation/update
+            wait_bool = coerce_bool_param(wait, "wait", default=True)
+            result: dict[str, Any] = {}
+            if wait_bool:
+                try:
+                    registered = await wait_for_entity_registered(client, entity_id)
+                    if not registered:
+                        result["warning"] = f"Group created but {entity_id} not yet queryable. It may take a moment to become available."
+                except Exception as e:
+                    result["warning"] = f"Group created but verification failed: {e}"
+
             return {
                 "success": True,
                 "entity_id": entity_id,
                 "object_id": object_id,
                 "updated_fields": updated_fields,
                 "message": f"Successfully {'created' if is_create else 'updated'} group: {entity_id}",
+                **result,
             }
 
         except ToolError:
@@ -253,6 +277,13 @@ async def ha_config_remove_group(
                 description="Group identifier without 'group.' prefix (e.g., 'living_room_lights')"
             ),
         ],
+        wait: Annotated[
+            bool | str,
+            Field(
+                description="Wait for group to be fully removed before returning. Default: True.",
+                default=True,
+            ),
+        ] = True,
     ) -> dict[str, Any]:
         """
         Remove a Home Assistant entity group.
@@ -285,11 +316,23 @@ async def ha_config_remove_group(
 
             entity_id = f"group.{object_id}"
 
+            # Verify entity is removed
+            wait_bool = coerce_bool_param(wait, "wait", default=True)
+            result: dict[str, Any] = {}
+            if wait_bool:
+                try:
+                    removed = await wait_for_entity_removed(client, entity_id)
+                    if not removed:
+                        result["warning"] = f"Deletion confirmed by API but {entity_id} may still appear briefly."
+                except Exception as e:
+                    result["warning"] = f"Deletion confirmed but removal verification failed: {e}"
+
             return {
                 "success": True,
                 "entity_id": entity_id,
                 "object_id": object_id,
                 "message": f"Successfully removed group: {entity_id}",
+                **result,
             }
 
         except ToolError:
 
@@ -0,0 +1,105 @@
+"""
+Regression tests for group config tool post-operation verification.
+
+Verifies that group tools confirm entity state after service calls,
+preventing the false-success anti-pattern where the tool returns
+success before the entity is actually queryable.
+"""
+
+import logging
+
+import pytest
+
+from ...utilities.assertions import assert_mcp_success, safe_call_tool
+
+logger = logging.getLogger(__name__)
+
+
+@pytest.mark.group
+class TestGroupVerification:
+    """Verify that group operations confirm entity state."""
+
+    async def test_created_group_is_immediately_queryable(
+        self, mcp_client, cleanup_tracker
+    ):
+        """After ha_config_set_group succeeds, the entity must be queryable.
+
+        Regression test: before verification was added, the tool returned
+        success with a predicted entity_id that might not exist yet.
+        """
+        object_id = "test_e2e_verify_create"
+
+        result = await mcp_client.call_tool(
+            "ha_config_set_group",
+            {
+                "object_id": object_id,
+                "name": "Verification Test Group",
+                "entities": ["light.bed_light"],
+            },
+        )
+
+        data = assert_mcp_success(result, "Create group")
+        entity_id = data.get("entity_id")
+        assert entity_id == f"group.{object_id}"
+        cleanup_tracker.track("group", object_id)
+
+        # The entity must be queryable immediately after the tool returns
+        state_result = await mcp_client.call_tool(
+            "ha_get_state", {"entity_id": entity_id}
+        )
+        state_data = assert_mcp_success(state_result, "Get group state after create")
+        # Response may nest entity data under "data" key
+        inner = state_data.get("data", state_data)
+        assert inner.get("entity_id") == entity_id, (
+            f"Created group not queryable immediately after tool returned success: {state_data}"
+        )
+        logger.info(f"Group {entity_id} confirmed queryable after create")
+
+        # Cleanup
+        await mcp_client.call_tool(
+            "ha_config_remove_group", {"object_id": object_id}
+        )
+
+    async def test_removed_group_is_immediately_gone(
+        self, mcp_client, cleanup_tracker
+    ):
+        """After ha_config_remove_group succeeds, the entity must be gone.
+
+        Regression test: before verification was added, the tool returned
+        success but the entity could still be queryable briefly.
+        """
+        object_id = "test_e2e_verify_remove"
+
+        # Create a group first
+        result = await mcp_client.call_tool(
+            "ha_config_set_group",
+            {
+                "object_id": object_id,
+                "name": "Removal Verification Group",
+                "entities": ["light.bed_light"],
+            },
+        )
+        assert_mcp_success(result, "Create group for removal test")
+        cleanup_tracker.track("group", object_id)
+
+        # Remove it
+        remove_result = await mcp_client.call_tool(
+            "ha_config_remove_group", {"object_id": object_id}
+        )
+        assert_mcp_success(remove_result, "Remove group")
+
+        # The entity must NOT be queryable after the tool returns
+        entity_id = f"group.{object_id}"
+        state_data = await safe_call_tool(
+            mcp_client, "ha_get_state", {"entity_id": entity_id}
+        )
+        # Should either fail or return not_found
+        is_gone = (
+            not state_data.get("success")
+            or state_data.get("state") == "unavailable"
+            or "not found" in str(state_data).lower()
+        )
+        assert is_gone, (
+            f"Removed group still queryable after tool returned success: {state_data}"
+        )
+        logger.info(f"Group {entity_id} confirmed gone after remove")