homeassistant-ai
diff --git a/‎custom_components/ha_mcp_tools/config_flow.py‎
Lines changed: 25 additions & 0 deletions b/‎custom_components/ha_mcp_tools/config_flow.py‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎custom_components/ha_mcp_tools/const.py‎
Lines changed: 29 additions & 0 deletions b/‎custom_components/ha_mcp_tools/const.py‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎custom_components/ha_mcp_tools/embedded_setup.py‎
Lines changed: 18 additions & 1 deletion b/‎custom_components/ha_mcp_tools/embedded_setup.py‎
Lines changed: 18 additions & 1 deletion
@@ -48,6 +48,8 @@
     DEFAULT_AUTO_UPDATE,
     DEFAULT_BIND_HOST,
     DEFAULT_CHANNEL,
+    DEFAULT_ENABLE_LLM_API,
+    DEFAULT_LLM_API_EXPOSURE,
     DEFAULT_LOOPBACK_URL,
     DEFAULT_PIP_SPEC,
     DEFAULT_SERVER_PORT,
@@ -56,13 +58,19 @@
     DOMAIN,
     ENTRY_TYPE_SERVER,
     ENTRY_TYPE_TOOLS,
+    EXPOSURE_BOTH,
+    EXPOSURE_FULL,
+    EXPOSURE_TOOL_SEARCH,
+    LLM_API_DOCS_URL,
     OPT_AUTO_UPDATE,
     OPT_BIND_HOST,
     OPT_CHANNEL,
+    OPT_ENABLE_LLM_API,
     OPT_ENABLE_SIDEBAR_PANEL,
     OPT_ENABLE_STARTUP_NOTIFICATION,
     OPT_ENABLE_WEBHOOK,
     OPT_EXTERNAL_URL,
+    OPT_LLM_API_EXPOSURE,
     OPT_PIP_SPEC,
     OPT_REGENERATE_SECRETS,
     OPT_SECRET_PATH_OVERRIDE,
@@ -277,6 +285,22 @@ async def async_step_init(
                     OPT_ENABLE_SIDEBAR_PANEL,
                     default=bool(opts.get(OPT_ENABLE_SIDEBAR_PANEL, True)),
                 ): bool,
+                vol.Required(
+                    OPT_ENABLE_LLM_API,
+                    default=bool(opts.get(OPT_ENABLE_LLM_API, DEFAULT_ENABLE_LLM_API)),
+                ): bool,
+                vol.Required(
+                    OPT_LLM_API_EXPOSURE,
+                    default=str(
+                        opts.get(OPT_LLM_API_EXPOSURE, DEFAULT_LLM_API_EXPOSURE)
+                    ),
+                ): SelectSelector(
+                    SelectSelectorConfig(
+                        options=[EXPOSURE_TOOL_SEARCH, EXPOSURE_FULL, EXPOSURE_BOTH],
+                        translation_key="llm_api_exposure",
+                        mode=SelectSelectorMode.DROPDOWN,
+                    )
+                ),
                 vol.Optional(
                     OPT_EXTERNAL_URL,
                     default=opts.get(OPT_EXTERNAL_URL, ""),
@@ -312,6 +336,7 @@ async def async_step_init(
             description_placeholders={
                 "versions": await self._versions_hint(),
                 "connect_url": self._connect_url_hint(),
+                "llm_api_docs_url": LLM_API_DOCS_URL,
                 "panel_hint": panel_hint,
             },
         )
 
@@ -288,6 +288,23 @@ def channel_for_dist(dist: str) -> str:
 # server through Home Assistant; only the direct server port (+ the
 # admin-only sidebar panel, which proxies over loopback) remains.
 OPT_ENABLE_WEBHOOK = "enable_webhook"
+# Conversation-agent LLM API (#1745): when False, the toolset is not
+# registered as a Home Assistant LLM API, so it never appears in any
+# conversation agent's "Control Home Assistant" selector. On by default —
+# registering the API only makes it selectable; nothing is exposed until a
+# user picks it on an agent.
+OPT_ENABLE_LLM_API = "enable_llm_api"
+DEFAULT_ENABLE_LLM_API = True
+# Which exposure shape(s) the LLM API offers to conversation agents:
+# ``tool_search`` (default) registers a compact API — pinned tools plus
+# search/execute meta-tools — the shape context-limited models need; ``full``
+# registers the whole exposed catalog as one API; ``both`` registers the two
+# side by side so the choice is made per agent in HA's own selector.
+OPT_LLM_API_EXPOSURE = "llm_api_exposure"
+EXPOSURE_TOOL_SEARCH = "tool_search"
+EXPOSURE_FULL = "full"
+EXPOSURE_BOTH = "both"
+DEFAULT_LLM_API_EXPOSURE = EXPOSURE_TOOL_SEARCH
 # When False, the persistent notification created on every server bring-up is
 # suppressed; the connect URLs still reach the admin-only Home Assistant log.
 OPT_ENABLE_STARTUP_NOTIFICATION = "enable_startup_notification"
@@ -335,6 +352,9 @@ def channel_for_dist(dist: str) -> str:
 # finding on #1760). Bring-up pops it: notification on success, silent drop on
 # failure (the package/start repair issues cover that path).
 DATA_PENDING_UPDATE_NOTIFY = "pending_update_notify"
+# Unregister callback for the conversation-agent LLM API (#1745), stored by
+# the bring-up success path and invoked (idempotently) by teardown.
+DATA_LLM_API_UNSUB = "llm_api_unsub"
 
 # Webhook auth modes (mirrors the webhook-proxy add-on's default posture).
 WEBHOOK_AUTH_NONE = "none"  # secret webhook URL is the shared secret (default)
@@ -379,6 +399,15 @@ def channel_for_dist(dist: str) -> str:
     "?owner=homeassistant-ai&repository=ha-mcp-integration&category=integration"
 )
 
+# Usage guide for the conversation-agent LLM API option (#1745). Injected into
+# the options form as a description placeholder — hassfest forbids literal
+# URLs inside strings.json.
+LLM_API_DOCS_URL = (
+    "https://github.com/homeassistant-ai/ha-mcp/blob/master/docs/"
+    "in-process-server.md"
+    "#chat-with-the-toolset-from-home-assistant-conversation-agents--voice"
+)
+
 # Repair-issue ids surfaced when server bring-up fails.
 ISSUE_PACKAGE_FAILED = "server_package_install_failed"
 ISSUE_START_FAILED = "server_start_failed"
 
@@ -39,6 +39,7 @@
     DATA_WEBHOOK_ID,
     DEFAULT_AUTO_UPDATE,
     DEFAULT_BIND_HOST,
+    DEFAULT_ENABLE_LLM_API,
     DEFAULT_PIP_SPEC,
     DEFAULT_SERVER_PORT,
     DOMAIN,
@@ -49,6 +50,7 @@
     ISSUE_UPDATE_HELD,
     OPT_AUTO_UPDATE,
     OPT_BIND_HOST,
+    OPT_ENABLE_LLM_API,
     OPT_ENABLE_SIDEBAR_PANEL,
     OPT_ENABLE_STARTUP_NOTIFICATION,
     OPT_ENABLE_WEBHOOK,
@@ -60,6 +62,7 @@
     channel_for_dist,
 )
 from .embedded_server import EmbeddedServerError, EmbeddedServerManager
+from .llm_api import async_register_llm_api, async_unregister_llm_api
 from .mcp_webhook import async_register_webhook, async_unregister_webhook
 
 if TYPE_CHECKING:
@@ -125,6 +128,18 @@ async def async_bring_up_server(hass: HomeAssistant, entry: ConfigEntry) -> None
                 "(direct port + sidebar panel)"
             )
         _surface_connect_urls(hass, entry, auth_mode, webhook_enabled=webhook_enabled)
+        # Conversation-agent LLM API (#1745), gated on its option (default on).
+        # Advisory: registration failures are contained inside (logged, feature
+        # absent) — the running server must never be taken down by them.
+        if bool(entry.options.get(OPT_ENABLE_LLM_API, DEFAULT_ENABLE_LLM_API)):
+            await async_register_llm_api(
+                hass, entry, port=manager.port, secret_path=secret_path
+            )
+        else:
+            _LOGGER.info(
+                "Conversation-agent LLM API disabled by option - the toolset "
+                "will not be offered to Home Assistant conversation agents"
+            )
         await _async_finish_update_cycle(hass)
     except asyncio.CancelledError:
         # Unloaded mid-bring-up: undo whatever partial state exists, then let the
@@ -153,12 +168,14 @@ async def async_bring_up_server(hass: HomeAssistant, entry: ConfigEntry) -> None
 
 
 async def async_teardown_server(hass: HomeAssistant) -> None:
-    """Unregister the webhook and stop the server thread (reload-safe, idempotent).
+    """Unregister the LLM API + webhook and stop the server thread (reload-safe,
+    idempotent).
 
     Does NOT revoke the provisioned token — a reload must keep it. The ha_auth
     discovery views stay bound (aiohttp can't unregister them until HA restarts);
     they 404 while the entry is not live.
     """
+    async_unregister_llm_api(hass)
     await async_unregister_webhook(hass)
     manager = hass.data.get(DOMAIN, {}).pop(DATA_MANAGER, None)
     if isinstance(manager, EmbeddedServerManager):