From 7319637bd57020f9dce5aab2982349aa6eaefe66 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Tue, 25 Mar 2025 13:30:44 -0500
Subject: [PATCH] Set responding state in assist satellite start_conversation
 (#141388)

* Set responding state in async_start_conversation

* Check idle state
---
 homeassistant/components/assist_satellite/entity.py | 3 +++
 tests/components/assist_satellite/test_entity.py    | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/homeassistant/components/assist_satellite/entity.py b/homeassistant/components/assist_satellite/entity.py
index 33b9e904246..450e6cadbc9 100644
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -262,6 +262,8 @@ class AssistSatelliteEntity(entity.Entity):
             raise SatelliteBusyError
 
         self._is_announcing = True
+        self._set_state(AssistSatelliteState.RESPONDING)
+
         # Provide our start info to the LLM so it understands context of incoming message
         if extra_system_prompt is not None:
             self._extra_system_prompt = extra_system_prompt
@@ -291,6 +293,7 @@ class AssistSatelliteEntity(entity.Entity):
             raise
         finally:
             self._is_announcing = False
+            self._set_state(AssistSatelliteState.IDLE)
 
     async def async_start_conversation(
         self, start_announcement: AssistSatelliteAnnouncement
diff --git a/tests/components/assist_satellite/test_entity.py b/tests/components/assist_satellite/test_entity.py
index fcc3c5b98b5..b9f6da6f96c 100644
--- a/tests/components/assist_satellite/test_entity.py
+++ b/tests/components/assist_satellite/test_entity.py
@@ -594,6 +594,13 @@ async def test_start_conversation(
     expected_params: tuple[str, str],
 ) -> None:
     """Test starting a conversation on a device."""
+    original_start_conversation = entity.async_start_conversation
+
+    async def async_start_conversation(start_announcement):
+        # Verify state change
+        assert entity.state == AssistSatelliteState.RESPONDING
+        await original_start_conversation(start_announcement)
+
     await async_update_pipeline(
         hass,
         async_get_pipeline(hass),
@@ -620,6 +627,7 @@ async def test_start_conversation(
                 mime_type="audio/mp3",
             ),
         ),
+        patch.object(entity, "async_start_conversation", new=async_start_conversation),
     ):
         await hass.services.async_call(
             "assist_satellite",
@@ -628,6 +636,7 @@ async def test_start_conversation(
             target={"entity_id": "assist_satellite.test_entity"},
             blocking=True,
         )
+        assert entity.state == AssistSatelliteState.IDLE
 
     assert entity.start_conversations[0] == expected_params