feat: inject device area context for room-aware voice responses

custom_components/openclaw/conversation.py

@@ -13,6 +13,7 @@
 from homeassistant.components import conversation
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import area_registry as ar, device_registry as dr
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers import intent
 
@@ -138,17 +139,36 @@ async def async_process(
         )
         exposed_context = apply_context_policy(raw_context, max_chars, strategy)
         extra_system_prompt = getattr(user_input, "extra_system_prompt", None)
+
+        # Resolve the originating device's area for room-aware responses
+        device_area_context = self._resolve_device_area(user_input)
+
         system_prompt = "\n\n".join(
-            part for part in (exposed_context, extra_system_prompt) if part
+            part
+            for part in (device_area_context, exposed_context, extra_system_prompt)
+            if part
         ) or None
 
+        # Add device/area headers when available
+        device_id = getattr(user_input, "device_id", None)
+        if device_id or device_area_context:
+            voice_headers = dict(_VOICE_REQUEST_HEADERS)
+            if device_id:
+                voice_headers["x-openclaw-device-id"] = device_id
+            if device_area_context:
+                area_name = device_area_context.removeprefix("[Voice command from: ").removesuffix("]")
+                voice_headers["x-openclaw-area"] = area_name
+        else:
+            voice_headers = None
+
         try:
             full_response = await self._get_response(
                 client,
                 message,
                 conversation_id,
                 voice_agent_id,
                 system_prompt,
+                voice_headers,
             )
         except OpenClawApiError as err:
             _LOGGER.error("OpenClaw conversation error: %s", err)
@@ -165,6 +185,7 @@ async def async_process(
                             conversation_id,
                             voice_agent_id,
                             system_prompt,
+                            voice_headers,
                         )
                     except OpenClawApiError as retry_err:
                         return self._error_result(
@@ -227,6 +248,34 @@ def _resolve_conversation_id(self, user_input: conversation.ConversationInput) -
 
         return "assist_default"
 
+    def _resolve_device_area(
+        self, user_input: conversation.ConversationInput
+    ) -> str | None:
+        """Resolve the area name for the device that initiated the conversation.
+
+        Returns a short context string like '[Voice command from: Study]'
+        so the agent knows which room the user is in.
+        """
+        device_id = getattr(user_input, "device_id", None)
+        if not device_id:
+            return None
+
+        try:
+            dev_reg = dr.async_get(self.hass)
+            device_entry = dev_reg.async_get(device_id)
+            if not device_entry or not device_entry.area_id:
+                return None
+
+            area_reg = ar.async_get(self.hass)
+            area_entry = area_reg.async_get_area(device_entry.area_id)
+            if not area_entry:
+                return None
+
+            return f"[Voice command from: {area_entry.name}]"
+        except Exception:
+            _LOGGER.debug("Could not resolve area for device %s", device_id)
+            return None
+
     def _normalize_optional_text(self, value: Any) -> str | None:
         """Return a stripped string or None for blank values."""
         if not isinstance(value, str):
@@ -241,16 +290,18 @@ async def _get_response(
         conversation_id: str,
         agent_id: str | None = None,
         system_prompt: str | None = None,
+        extra_headers: dict[str, str] | None = None,
     ) -> str:
         """Get a response from OpenClaw, trying streaming first."""
+        headers = extra_headers or _VOICE_REQUEST_HEADERS
         # Try streaming (lower TTFB for voice pipeline)
         full_response = ""
         async for chunk in client.async_stream_message(
             message=message,
             session_id=conversation_id,
             system_prompt=system_prompt,
             agent_id=agent_id,
-            extra_headers=_VOICE_REQUEST_HEADERS,
+            extra_headers=headers,
         ):
             full_response += chunk
 
@@ -263,7 +314,7 @@ async def _get_response(
             session_id=conversation_id,
             system_prompt=system_prompt,
             agent_id=agent_id,
-            extra_headers=_VOICE_REQUEST_HEADERS,
+            extra_headers=headers,
         )
         extracted = self._extract_text_recursive(response)
         return extracted or ""