refactor: address PR #1398 KP13 second-pass review (3 items)

1. Narrow cleanup-loop exception in test_poll_cadence_measurement.py from
   `except Exception` to `except _POLLING_TRANSIENT_ERRORS` (the canonical
   tuple from wait_helpers.py). Programmer bugs (TypeError, AttributeError,
   KeyError, AssertionError) now propagate with their stack trace instead
   of being downgraded to a `logger.warning` line across 10 iterations.
   Aligns per-entity cleanup with the polling-helper pattern established
   for AGENTS.md "Exception handling in polling helpers" (#1266).

2. Lift the soft-failure warning prefix out of tools_config_automations.py
   as module-level `NOT_VERIFIED_WARNING_PREFIX` and import it in the test.
   The literal coupling becomes a compile-time edge instead of a runtime
   puzzle — rewording the source warning now breaks the test import,
   replacing the previous "9 samples + 0 not-verified != 10 attempts"
   indirect signal with a clear ModuleNotFoundError-style failure.

3. Replace the stale `session-scoped` label in the cleanup-block comment
   with `logging-only` (matches the commit-message framing for the
   ``cleanup_tracker`` fixture, which is function-scoped per its
   `@pytest.fixture` decorator in tests/src/e2e/conftest.py:1951).

Author: Patch76

src/ha_mcp/tools/tools_config_automations.py

@@ -53,6 +53,17 @@
 
 logger = logging.getLogger(__name__)
 
+# Distinctive prefix of the soft-failure warning emitted by
+# ``ha_config_set_automation`` when ``_poll_for_automation_entity``
+# exhausts ``_POLL_CADENCE`` without matching the new automation.
+# Exported so tests (e.g. ``test_poll_cadence_measurement.py``) can
+# detect a missed registration without hard-coding the literal —
+# rewording the warning becomes a compile-time coupling rather than
+# a silent test drift.
+NOT_VERIFIED_WARNING_PREFIX = (
+    "Automation was submitted to Home Assistant but the entity was not found"
+)
+
 
 def _normalize_automation_config(
     config: Any,
@@ -767,7 +778,7 @@ async def ha_config_set_automation(
             # If the client could not verify the entity was registered, warn but don't hard-fail.
             if result.get("entity_not_verified"):
                 result.setdefault("warnings", []).append(
-                    "Automation was submitted to Home Assistant but the entity was not found "
+                    f"{NOT_VERIFIED_WARNING_PREFIX} "
                     "after polling. The automation may still have been created -- check Home "
                     "Assistant logs and try reloading automations. Common causes: "
                     "automations.yaml vs automation.yaml filename mismatch, invalid config "

tests/src/e2e/workflows/automation/test_poll_cadence_measurement.py

@@ -25,24 +25,18 @@
 
 import pytest
 
+from ha_mcp.tools.tools_config_automations import NOT_VERIFIED_WARNING_PREFIX
+
 from ...conftest import record_poll_cadence_measurement
 from ...utilities.assertions import safe_call_tool
+from ...utilities.wait_helpers import _POLLING_TRANSIENT_ERRORS
 
 logger = logging.getLogger(__name__)
 
 # Captures the DEBUG line emitted by rest_client._poll_for_automation_entity
 # on every successful registration. Format owned by that function.
 _ELAPSED_RE = re.compile(r"entity-registration-elapsed:\s*([\d.]+)ms")
 
-# Distinctive substring of the soft-failure warning ``ha_config_set_automation``
-# emits when ``_poll_for_automation_entity`` exhausts ``_POLL_CADENCE`` without
-# matching the new automation. The tool pops ``entity_not_verified`` from the
-# response, so this warning is the only reliable signal that a registration
-# missed. Mirrors the literal in ``tools_config_automations.py``.
-_NOT_VERIFIED_WARNING_PREFIX = (
-    "Automation was submitted to Home Assistant but the entity was not found"
-)
-
 
 @pytest.mark.automation
 @pytest.mark.cleanup
@@ -100,7 +94,7 @@ async def test_poll_cadence_p50_worst(
                     warnings = create_data.get("warnings") or []
                     if any(
                         isinstance(w, str)
-                        and w.startswith(_NOT_VERIFIED_WARNING_PREFIX)
+                        and w.startswith(NOT_VERIFIED_WARNING_PREFIX)
                         for w in warnings
                     ):
                         not_verified_count += 1
@@ -194,19 +188,21 @@ async def test_poll_cadence_p50_worst(
             logger.info("VERDICT: %s", verdict)
             logger.info(sep)
         finally:
-            # The session-scoped ``cleanup_tracker`` fixture only logs what
+            # The logging-only ``cleanup_tracker`` fixture only logs what
             # it tracked; without an explicit delete here this test would
             # leak 10 automations into the next worker run on a loadscope
-            # split. Best-effort: per-entity remove, swallow individual
-            # failures so cleanup doesn't mask the real assertion outcome.
+            # split. Best-effort: per-entity remove, swallow only transient
+            # transport/HA errors so programmer bugs (TypeError, KeyError,
+            # AttributeError, AssertionError) propagate with their stack
+            # trace instead of being downgraded to a warning line.
             for ent_id in created_entity_ids:
                 try:
                     await safe_call_tool(
                         mcp_client,
                         "ha_config_remove_automation",
                         {"identifier": ent_id},
                     )
-                except Exception as cleanup_err:
+                except _POLLING_TRANSIENT_ERRORS as cleanup_err:
                     logger.warning(
                         "cleanup: failed to remove %s: %s", ent_id, cleanup_err
                     )