Send startup complete after the startup healthcheck (#7326)

Home Assistant refreshes Supervisor issues when it receives the startup
complete event and removes repairs of issues which are no longer reported,
including their ignored state. The startup healthcheck ran as a background
task, so checks which only run in the running state (e.g. the pwned check)
had not raised their issues yet when that refresh happened. An ignored
repair got removed and raised again shortly after, without the ignored
state.

Wait for the startup healthcheck before sending startup complete. Bound
the wait by a timeout so a slow check or autofix cannot hold back startup
indefinitely.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: agners

supervisor/core.py

@@ -44,6 +44,7 @@
 _PORT_RESERVE_SERVICE: Final = "homeassistant-core-port-reserve.service"
 _PORT_RESERVE_TIMEOUT: Final = 10
 _TERMINAL_STATES: Final = {UnitActiveState.INACTIVE, UnitActiveState.FAILED}
+_STARTUP_HEALTHCHECK_TIMEOUT: Final = 30
 
 
 def _format_bind_address(host: str, port: int) -> str:
@@ -349,9 +350,21 @@ async def start(self) -> None:
 
             # Update Host/Device information
             self.sys_create_task(self.sys_host.reload())
-            self.sys_create_task(self.sys_resolution.healthcheck())
 
             await self.set_state(CoreState.RUNNING)
+
+            # Home Assistant refreshes issues on startup complete and removes
+            # repairs (and their ignored state) of issues not raised yet
+            healthcheck = self.sys_create_task(self.sys_resolution.healthcheck())
+            _, pending = await asyncio.wait(
+                {healthcheck}, timeout=_STARTUP_HEALTHCHECK_TIMEOUT
+            )
+            if pending:
+                _LOGGER.warning(
+                    "Healthcheck did not finish within %ds, completing startup",
+                    _STARTUP_HEALTHCHECK_TIMEOUT,
+                )
+
             self.sys_homeassistant.websocket.supervisor_update_event(
                 "supervisor", {ATTR_STARTUP: "complete"}
             )

tests/test_core.py

@@ -1002,3 +1002,49 @@ async def _failing_update() -> None:
     coresys.tasks.load.assert_awaited_once()
     coresys.homeassistant.core.start.assert_awaited_once()
     assert coresys.core.state == CoreState.RUNNING
+
+
+@pytest.mark.usefixtures("core_start_base_mocks")
+@pytest.mark.parametrize(
+    ("finish_healthcheck", "expected_order"),
+    [
+        pytest.param(
+            True,
+            ["healthcheck running", "healthcheck done", "startup complete"],
+            id="finished",
+        ),
+        pytest.param(
+            False, ["healthcheck running", "startup complete"], id="timed_out"
+        ),
+    ],
+)
+async def test_start_completes_after_healthcheck(
+    coresys: CoreSys, finish_healthcheck: bool, expected_order: list[str]
+) -> None:
+    """Test startup complete is sent once the healthcheck finished or timed out."""
+    order: list[str] = []
+    release = asyncio.Event()
+    if finish_healthcheck:
+        release.set()
+
+    async def mock_healthcheck() -> None:
+        order.append(f"healthcheck {coresys.core.state}")
+        await release.wait()
+        order.append("healthcheck done")
+
+    def mock_update_event(key: str, data: dict) -> None:
+        if data == {"startup": "complete"}:
+            order.append("startup complete")
+
+    coresys.homeassistant.websocket.supervisor_update_event.side_effect = (
+        mock_update_event
+    )
+    with (
+        patch.object(coresys.resolution, "healthcheck", new=mock_healthcheck),
+        patch("supervisor.core._STARTUP_HEALTHCHECK_TIMEOUT", 0.01),
+    ):
+        await coresys.core.start()
+        assert order == expected_order
+
+        release.set()
+        await asyncio.sleep(0)