Merge branch 'master' into fix/issue-1370-yaml-cache

Author: kingpanther13

README.md

@@ -353,6 +353,13 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 - **[@w3z315](https://github.com/w3z315)** — Financial support via [GitHub Sponsors](https://github.com/sponsors/julienld). Thank you! ☕
 - **[@griffinmartin](https://github.com/griffinmartin)** — Added OpenCode (by Anomaly) as a selectable AI client in the setup wizard, with both stdio and streamable HTTP support.
 - **[@hhopke](https://github.com/hhopke)** — Fixed addon API calls to route through HA Core ingress proxy instead of direct container connections, fixing `ha_manage_addon` proxy mode on addon installs.
+- **[@tomwilkie](https://github.com/tomwilkie)** — JMESPath middleware exploration (#1147) whose review-time token-measurement data informed the design of #1199 and #1225.
+- **[@SealKan](https://github.com/SealKan)** — `fields=`/`attribute_keys=` projection on six read-heavy tools (#1225), `ha_call_event` tool (#1239), and dashboards-list helper refactor (#1207).
+- **[@KarelTestSpecial](https://github.com/KarelTestSpecial)** — Cached YAML instance to prevent CPU spikes during bulk edits (#1371).
+- **[@corgan2222](https://github.com/corgan2222)** — HA brand assets for custom integration (#1317).
+- **[@drseanwing](https://github.com/drseanwing)** — Progress emission via FastMCP `Context` in long-running tools (#1124); tool-discovery / categorized-search docs (#1123).
+- **[@fnordpig](https://github.com/fnordpig)** — Config subentry support (#1393) and Assist pipeline management tool (#1392).
+- **[@paul43210](https://github.com/paul43210)** — `array_patch` mode in `ha_manage_addon` for atomic GET-modify-POST (#1063).
 
 ---
 

tests/src/e2e/haos_only/test_manage_addon_modes.py

@@ -45,14 +45,29 @@
 
 from __future__ import annotations
 
+import asyncio
+import logging
+import time
 from typing import Any
 
 import pytest
 
 from ..utilities.assertions import parse_mcp_result, safe_call_tool
+from ..utilities.wait_helpers import _POLLING_TRANSIENT_ERRORS
+
+logger = logging.getLogger(__name__)
 
 pytestmark = [pytest.mark.haos_only]
 
+# Tests that assert strictly on ``status_code`` (with no fall-back error
+# branch) need the addon's container to have reached Supervisor's
+# ``started`` state — the bake installs every addon with ``start=True``,
+# but the container can take tens of seconds to leave its transient boot
+# phase, which is enough to flake the strict assertion. Timeout sized
+# for cache-cold runners; 2s poll matches sibling lifecycle helpers.
+_ADDON_RUNNING_TIMEOUT_S = 120.0
+_ADDON_RUNNING_POLL_S = 2.0
+
 
 # Display names as they appear in build_image.py's ADDONS tuple — slugs
 # are looked up dynamically below to survive the SHA-derived slug prefix.
@@ -88,6 +103,53 @@ async def _resolve_slug(mcp_client: Any, display_name: str) -> str:
     )
 
 
+async def _wait_addon_running(
+    mcp_client: Any,
+    slug: str,
+    timeout: float = _ADDON_RUNNING_TIMEOUT_S,
+) -> None:
+    """Block until ``ha_get_addon(slug=...)`` reports ``state=started``.
+
+    Use this before any test that asserts on the HTTP/WS contract of an
+    addon (rather than tolerating an addon-not-running structured
+    error). When Supervisor reports the addon as anything other than
+    ``started``, ``ha_manage_addon`` raises ``ToolError`` from its
+    running-state guard (``tools_addons.py`` "Verify add-on is running");
+    the JSON-encoded error payload carries the observed transient state.
+    The bake installs addons with ``start=True``, but their containers
+    can take tens of seconds to reach ``started`` — long enough to
+    flake any strict-shape assertion on the proxy path. Mirrors
+    ``_wait_for_state`` in ``test_addon_lifecycle.py`` (same private-
+    sibling convention as ``_resolve_slug``).
+
+    Transient errors from ``ha_get_addon`` are caught via the project's
+    canonical ``_POLLING_TRANSIENT_ERRORS`` tuple (see
+    ``tests/src/e2e/utilities/wait_helpers.py``) — the same discipline
+    every other polling helper in the suite uses. Bugs (``TypeError`` /
+    ``AttributeError`` / ``KeyError`` / ``AssertionError``) propagate.
+    The deadline still fires; transient errors can't mask a wedged
+    addon forever.
+    """
+    deadline = time.monotonic() + timeout
+    last_state: str | None = None
+    while True:
+        try:
+            detail_raw = await mcp_client.call_tool("ha_get_addon", {"slug": slug})
+            detail = parse_mcp_result(detail_raw).get("addon") or {}
+            last_state = detail.get("state")
+        except _POLLING_TRANSIENT_ERRORS as e:
+            logger.debug(f"⚠️ Transient error polling addon {slug!r}: {e}")
+            last_state = f"<transient: {str(e)[:60]}>"
+        if last_state == "started":
+            return
+        if time.monotonic() >= deadline:
+            pytest.fail(
+                f"Addon {slug!r} did not reach state=started within "
+                f"{timeout:.0f}s (last state: {last_state!r})"
+            )
+        await asyncio.sleep(_ADDON_RUNNING_POLL_S)
+
+
 # ---------------------------------------------------------------------------
 # Config mode — options / boot / auto_update / watchdog round-trips
 # ---------------------------------------------------------------------------
@@ -234,6 +296,9 @@ async def test_proxy_http_request_headers_pass_through(mcp_client: Any) -> None:
     invalid", which proves the value crossed the wire.
     """
     slug = await _resolve_slug(mcp_client, NODERED_NAME)
+    # Strict assertion on ``status_code`` below requires the addon to
+    # actually answer HTTP; wait it out (see ``_wait_addon_running``).
+    await _wait_addon_running(mcp_client, slug)
     without = await safe_call_tool(
         mcp_client,
         "ha_manage_addon",