[pull] dev from home-assistant:dev

Dockerfile.dev

@@ -52,6 +52,9 @@ RUN --mount=type=bind,source=requirements.txt,target=requirements.txt \
     --mount=type=bind,source=requirements_test_pre_commit.txt,target=requirements_test_pre_commit.txt \
     uv pip install -r requirements.txt -r requirements_test.txt
 
+# Claude Code native install
+RUN curl -fsSL https://claude.ai/install.sh | bash
+
 WORKDIR /workspaces
 
 # Set the default shell to bash instead of sh

homeassistant/components/conversation/__init__.py

@@ -335,20 +335,18 @@ def _get_config_intents(config: ConfigType, hass_config_path: str) -> dict[str,
     """Return config intents."""
     intents = config.get(DOMAIN, {}).get("intents", {})
     return {
-        "intents": {
-            intent_name: {
-                "data": [
-                    {
-                        "sentences": sentences,
-                        "metadata": {
-                            METADATA_CUSTOM_SENTENCE: True,
-                            METADATA_CUSTOM_FILE: hass_config_path,
-                        },
-                    }
-                ]
-            }
-            for intent_name, sentences in intents.items()
+        intent_name: {
+            "data": [
+                {
+                    "sentences": sentences,
+                    "metadata": {
+                        METADATA_CUSTOM_SENTENCE: True,
+                        METADATA_CUSTOM_FILE: hass_config_path,
+                    },
+                }
+            ]
         }
+        for intent_name, sentences in intents.items()
     }
 
 

homeassistant/components/conversation/agent_manager.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 import dataclasses
 import logging
 from typing import TYPE_CHECKING, Any
@@ -18,7 +19,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, intent, singleton
 
-from .const import DATA_COMPONENT, HOME_ASSISTANT_AGENT
+from .const import DATA_COMPONENT, HOME_ASSISTANT_AGENT, IntentSource
 from .entity import ConversationEntity
 from .models import (
     AbstractConversationAgent,
@@ -34,9 +35,11 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+TRIGGER_INTENT_NAME_PREFIX = "HassSentenceTrigger"
+
 if TYPE_CHECKING:
     from .default_agent import DefaultAgent
-    from .trigger import TriggerDetails
+    from .trigger import TRIGGER_CALLBACK_TYPE
 
 
 @singleton.singleton("conversation_agent")
@@ -139,6 +142,10 @@ async def async_converse(
         return result
 
 
+type IntentSourceConfig = dict[str, dict[str, Any]]
+type IntentsCallback = Callable[[dict[IntentSource, IntentSourceConfig]], None]
+
+
 class AgentManager:
     """Class to manage conversation agents."""
 
@@ -147,8 +154,13 @@ def __init__(self, hass: HomeAssistant) -> None:
         self.hass = hass
         self._agents: dict[str, AbstractConversationAgent] = {}
         self.default_agent: DefaultAgent | None = None
-        self.config_intents: dict[str, Any] = {}
-        self.triggers_details: list[TriggerDetails] = []
+        self._intents: dict[IntentSource, IntentSourceConfig] = {
+            IntentSource.CONFIG: {"intents": {}},
+            IntentSource.TRIGGER: {"intents": {}},
+        }
+        self._intents_subscribers: list[IntentsCallback] = []
+        self._trigger_callbacks: dict[int, TRIGGER_CALLBACK_TYPE] = {}
+        self._trigger_callback_counter: int = 0
 
     @callback
     def async_get_agent(self, agent_id: str) -> AbstractConversationAgent | None:
@@ -200,27 +212,75 @@ def async_unset_agent(self, agent_id: str) -> None:
 
     async def async_setup_default_agent(self, agent: DefaultAgent) -> None:
         """Set up the default agent."""
-        agent.update_config_intents(self.config_intents)
-        agent.update_triggers(self.triggers_details)
         self.default_agent = agent
 
+    @callback
+    def subscribe_intents(self, subscriber: IntentsCallback) -> CALLBACK_TYPE:
+        """Subscribe to intents updates.
+
+        The subscriber callback is called immediately with all intent sources
+        and whenever intents are updated (only with the changed source).
+        """
+        subscriber(self._intents)
+        self._intents_subscribers.append(subscriber)
+
+        @callback
+        def unsubscribe() -> None:
+            """Unsubscribe from intents updates."""
+            self._intents_subscribers.remove(subscriber)
+
+        return unsubscribe
+
+    def _notify_intents_subscribers(self, source: IntentSource) -> None:
+        """Notify all intents subscribers of a change to a specific source."""
+        update = {source: self._intents[source]}
+        for subscriber in self._intents_subscribers:
+            subscriber(update)
+
     def update_config_intents(self, intents: dict[str, Any]) -> None:
         """Update config intents."""
-        self.config_intents = intents
-        if self.default_agent is not None:
-            self.default_agent.update_config_intents(intents)
+        self._intents[IntentSource.CONFIG]["intents"] = intents
+        self._notify_intents_subscribers(IntentSource.CONFIG)
 
-    def register_trigger(self, trigger_details: TriggerDetails) -> CALLBACK_TYPE:
+    def register_trigger(
+        self, sentences: list[str], trigger_callback: TRIGGER_CALLBACK_TYPE
+    ) -> CALLBACK_TYPE:
         """Register a trigger."""
-        self.triggers_details.append(trigger_details)
-        if self.default_agent is not None:
-            self.default_agent.update_triggers(self.triggers_details)
+        trigger_id = self._trigger_callback_counter
+        self._trigger_callback_counter += 1
+        trigger_intent_name = f"{TRIGGER_INTENT_NAME_PREFIX}{trigger_id}"
+
+        trigger_intents = self._intents[IntentSource.TRIGGER]
+        trigger_intents["intents"][trigger_intent_name] = {
+            "data": [{"sentences": sentences}]
+        }
+        self._trigger_callbacks[trigger_id] = trigger_callback
+        self._notify_intents_subscribers(IntentSource.TRIGGER)
 
         @callback
         def unregister_trigger() -> None:
             """Unregister the trigger."""
-            self.triggers_details.remove(trigger_details)
-            if self.default_agent is not None:
-                self.default_agent.update_triggers(self.triggers_details)
+            del trigger_intents["intents"][trigger_intent_name]
+            del self._trigger_callbacks[trigger_id]
+            self._notify_intents_subscribers(IntentSource.TRIGGER)
 
         return unregister_trigger
+
+    @property
+    def trigger_sentences(self) -> list[str]:
+        """Get all trigger sentences."""
+        sentences: list[str] = []
+        trigger_intents = self._intents[IntentSource.TRIGGER]
+        for trigger_intent in trigger_intents.get("intents", {}).values():
+            for data in trigger_intent.get("data", []):
+                sentences.extend(data.get("sentences", []))
+        return sentences
+
+    def get_trigger_callback(
+        self, trigger_intent_name: str
+    ) -> TRIGGER_CALLBACK_TYPE | None:
+        """Get the callback for a trigger from its intent name."""
+        if not trigger_intent_name.startswith(TRIGGER_INTENT_NAME_PREFIX):
+            return None
+        trigger_id = int(trigger_intent_name[len(TRIGGER_INTENT_NAME_PREFIX) :])
+        return self._trigger_callbacks.get(trigger_id)

homeassistant/components/conversation/const.py

@@ -36,6 +36,13 @@ class ConversationEntityFeature(IntFlag):
 METADATA_CUSTOM_FILE = "hass_custom_file"
 
 
+class IntentSource(StrEnum):
+    """Source of intents."""
+
+    CONFIG = "config"
+    TRIGGER = "trigger"
+
+
 class ChatLogEventType(StrEnum):
     """Chat log event type."""
 

homeassistant/components/conversation/default_agent.py

@@ -76,18 +76,18 @@
 from homeassistant.util import language as language_util
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
-from .agent_manager import get_agent_manager
+from .agent_manager import IntentSourceConfig, get_agent_manager
 from .chat_log import AssistantContent, ChatLog, ToolResultContent
 from .const import (
     DOMAIN,
     METADATA_CUSTOM_FILE,
     METADATA_CUSTOM_SENTENCE,
     ConversationEntityFeature,
+    IntentSource,
 )
 from .entity import ConversationEntity
 from .models import ConversationInput, ConversationResult
 from .trace import ConversationTraceEventType, async_conversation_trace_append
-from .trigger import TriggerDetails
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -126,7 +126,7 @@ class SentenceTriggerResult:
 
     sentence: str
     sentence_template: str | None
-    matched_triggers: dict[int, RecognizeResult]
+    matched_triggers: dict[str, RecognizeResult]
 
 
 class IntentMatchingStage(Enum):
@@ -236,15 +236,19 @@ class DefaultAgent(ConversationEntity):
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the default agent."""
         self.hass = hass
+
         self._lang_intents: dict[str, LanguageIntents | object] = {}
         self._load_intents_lock = asyncio.Lock()
 
         # Intents from common conversation config
-        self._config_intents: dict[str, Any] = {}
+        self._config_intents_config: IntentSourceConfig = {}
 
-        # Sentences that will trigger a callback (skipping intent recognition)
-        self._triggers_details: list[TriggerDetails] = []
+        # Intents from conversation triggers
         self._trigger_intents: Intents | None = None
+        self._trigger_intents_config: IntentSourceConfig = {}
+
+        # Subscription to intents updates
+        self._unsub_intents: Callable[[], None] | None = None
 
         # Slot lists for entities, areas, etc.
         self._slot_lists: dict[str, SlotList] | None = None
@@ -261,6 +265,33 @@ def __init__(self, hass: HomeAssistant) -> None:
         self.fuzzy_matching = True
         self._fuzzy_config: FuzzyConfig | None = None
 
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to intents updates when added to hass."""
+        self._unsub_intents = get_agent_manager(self.hass).subscribe_intents(
+            self._update_intents
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe from intents updates when removed from hass."""
+        if self._unsub_intents is not None:
+            self._unsub_intents()
+            self._unsub_intents = None
+
+    @callback
+    def _update_intents(
+        self, intents_update: dict[IntentSource, IntentSourceConfig]
+    ) -> None:
+        """Handle intents update from agent_manager subscription."""
+        if IntentSource.CONFIG in intents_update:
+            self._config_intents_config = intents_update[IntentSource.CONFIG]
+            # Intents have changed, so we must clear the cache
+            self._intent_cache.clear()
+
+        if IntentSource.TRIGGER in intents_update:
+            self._trigger_intents_config = intents_update[IntentSource.TRIGGER]
+            # Force rebuild on next use
+            self._trigger_intents = None
+
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
@@ -1059,14 +1090,6 @@ async def async_reload(self, language: str | None = None) -> None:
         # Intents have changed, so we must clear the cache
         self._intent_cache.clear()
 
-    @callback
-    def update_config_intents(self, intents: dict[str, Any]) -> None:
-        """Update config intents."""
-        self._config_intents = intents
-
-        # Intents have changed, so we must clear the cache
-        self._intent_cache.clear()
-
     async def async_prepare(self, language: str | None = None) -> None:
         """Load intents for a language."""
         if language is None:
@@ -1193,7 +1216,7 @@ def _load_intents(self, language: str) -> LanguageIntents | None:
 
         merge_dict(
             intents_dict,
-            self._config_intents,
+            self._config_intents_config,
         )
 
         if not intents_dict:
@@ -1461,27 +1484,12 @@ def _get_error_text(
 
         return response_template.async_render(response_args)
 
-    @callback
-    def update_triggers(self, triggers_details: list[TriggerDetails]) -> None:
-        """Update triggers."""
-        self._triggers_details = triggers_details
-
-        # Force rebuild on next use
-        self._trigger_intents = None
-
     def _rebuild_trigger_intents(self) -> None:
-        """Rebuild the HassIL intents object from the current trigger sentences."""
+        """Rebuild the HassIL intents object from the trigger intents dict."""
         intents_dict = {
             "language": self.hass.config.language,
-            "intents": {
-                # Use trigger data index as a virtual intent name for HassIL.
-                # This works because the intents are rebuilt on every
-                # register/unregister.
-                str(trigger_id): {"data": [{"sentences": trigger_details.sentences}]}
-                for trigger_id, trigger_details in enumerate(self._triggers_details)
-            },
+            **self._trigger_intents_config,
         }
-
         trigger_intents = Intents.from_dict(intents_dict)
 
         # Assume slot list references are wildcards
@@ -1496,7 +1504,7 @@ def _rebuild_trigger_intents(self) -> None:
 
         self._trigger_intents = trigger_intents
 
-        _LOGGER.debug("Rebuilt trigger intents: %s", intents_dict)
+        _LOGGER.debug("Rebuilt trigger intents: %s", self._trigger_intents_config)
 
     async def async_recognize_sentence_trigger(
         self, user_input: ConversationInput
@@ -1506,7 +1514,7 @@ async def async_recognize_sentence_trigger(
         Calls the registered callbacks if there's a match and returns a sentence
         trigger result.
         """
-        if not self._triggers_details:
+        if not self._trigger_intents_config.get("intents"):
             # No triggers registered
             return None
 
@@ -1516,18 +1524,18 @@ async def async_recognize_sentence_trigger(
 
         assert self._trigger_intents is not None
 
-        matched_triggers: dict[int, RecognizeResult] = {}
+        matched_triggers: dict[str, RecognizeResult] = {}
         matched_template: str | None = None
         for result in recognize_all(user_input.text, self._trigger_intents):
             if result.intent_sentence is not None:
                 matched_template = result.intent_sentence.text
 
-            trigger_id = int(result.intent.name)
-            if trigger_id in matched_triggers:
+            trigger_intent_name = result.intent.name
+            if trigger_intent_name in matched_triggers:
                 # Already matched a sentence from this trigger
                 break
 
-            matched_triggers[trigger_id] = result
+            matched_triggers[trigger_intent_name] = result
 
         if not matched_triggers:
             # Sentence did not match any trigger sentences
@@ -1551,10 +1559,14 @@ async def _handle_trigger_result(
         chat_log: ChatLog,
     ) -> str:
         """Run sentence trigger callbacks and return response text."""
+        manager = get_agent_manager(self.hass)
+
         # Gather callback responses in parallel
         trigger_callbacks = [
-            self._triggers_details[trigger_id].callback(user_input, trigger_result)
-            for trigger_id, trigger_result in result.matched_triggers.items()
+            trigger_callback(user_input, trigger_result)
+            for trigger_intent_name, trigger_result in result.matched_triggers.items()
+            if (trigger_callback := manager.get_trigger_callback(trigger_intent_name))
+            is not None
         ]
 
         tool_input = llm.ToolInput(