Wait for startup to complete before running shutdown

If PrepareForShutdown fires while Supervisor is still starting up,
wait for startup to complete before running the graceful shutdown
sequence. This prevents shutting down partially initialized
containers and services.

The _startup_complete event is set automatically in set_state()
whenever state transitions to RUNNING. If SIGTERM arrives during
startup, core.stop() cancels the monitor task via host.unload(),
cleanly interrupting the wait.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: agners

supervisor/core.py

@@ -42,6 +42,7 @@ def __init__(self, coresys: CoreSys) -> None:
         self._state: CoreState = CoreState.INITIALIZE
         self.exit_code: int = 0
         self._shutdown_event: asyncio.Event = asyncio.Event()
+        self._startup_complete: asyncio.Event = asyncio.Event()
 
     @property
     def state(self) -> CoreState:
@@ -82,6 +83,9 @@ async def set_state(self, new_state: CoreState) -> None:
         self._state = new_state
         await self._write_run_state()
 
+        if self._state == CoreState.RUNNING:
+            self._startup_complete.set()
+
         # Don't attempt to notify anyone on CLOSE as we're about to stop the event loop
         if self._state != CoreState.CLOSE:
             self.sys_bus.fire_event(BusEvent.SUPERVISOR_STATE_CHANGE, self._state)
@@ -360,6 +364,12 @@ async def shutdown(self, *, remove_homeassistant_container: bool = False) -> Non
         Reentrant: if a shutdown is already in progress, subsequent calls
         await completion of the existing shutdown rather than starting a second one.
         """
+        if self.state in STARTING_STATES:
+            _LOGGER.debug(
+                "Shutdown requested while Supervisor is still starting up, waiting for startup to complete"
+            )
+            await self._startup_complete.wait()
+
         # Supervisor is already tearing down, no point running shutdown
         if self.state in (CoreState.STOPPING, CoreState.CLOSE):
             _LOGGER.warning("Ignoring shutdown request, Supervisor is already stopping")