ha-mcp-dev 8.3.0.dev2372__tar.gz → 8.3.0.dev2377__tar.gz

{ha_mcp_dev-8.3.0.dev2372/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.3.0.dev2377}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.3.0.dev2372
+Version: 8.3.0.dev2377
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-8.3.0.dev2372 → ha_mcp_dev-8.3.0.dev2377}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.3.0.dev2372"
+version = "8.3.0.dev2377"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's

{ha_mcp_dev-8.3.0.dev2372 → ha_mcp_dev-8.3.0.dev2377}/src/ha_mcp/settings_ui/__init__.py

@@ -20,7 +20,7 @@ from typing import TYPE_CHECKING, Any
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse, Response
 
-from .._version import is_running_in_addon
+from .._version import is_embedded, is_running_in_addon
 from ..transforms import DEFAULT_PINNED_TOOLS
 from ..utils.data_paths import get_data_dir
 from ._handlers_advanced import build_advanced_handlers
@@ -524,11 +524,11 @@ def _ingress_only(handler: _SettingsRoute) -> _SettingsRoute:
 
 
 # Mount prefix the settings UI is served under in long-lived HTTP transports
-# (Docker / standalone ha-mcp-web / OAuth / the add-on's secret-path mount).
-# Recorded by register_settings_routes so ha_get_overview can point users at
-# the settings page in modes that have no stdio sidecar URL file to surface
-# (issue #1458). Stays None in pure stdio mode, where the sidecar writes
-# ~/.ha-mcp/ui.url instead.
+# (Docker / standalone ha-mcp-web). Recorded by register_settings_routes so
+# ha_get_overview can point users at the settings page in modes that have no
+# managed UI entry point or stdio sidecar URL file to surface (issue #1458).
+# Stays None in managed HA deployments and pure stdio mode, where the sidebar /
+# ingress entry point or ~/.ha-mcp/ui.url already provides discovery.
 _http_settings_prefix: str | None = None
 
 
@@ -539,8 +539,8 @@ def get_http_settings_prefix() -> str | None:
     long-lived HTTP server *and* advertising is enabled. ``ha_get_overview``
     reads it to hint at the settings page when there is no stdio sidecar URL to
     hand the user. It is None when the mount is deliberately not advertised
-    (OAuth/OIDC dedicated-secret mode) — use :func:`is_http_settings_mounted`,
-    not this, to tell HTTP from the stdio sidecar.
+    (managed HA or OAuth/OIDC dedicated-secret mode) — use
+    :func:`is_http_settings_mounted`, not this, to tell HTTP from the sidecar.
     """
     return _http_settings_prefix
 
@@ -594,12 +594,18 @@ def register_settings_routes(
             non-add-on mode, the function logs a warning and registers
             nothing rather than expose the routes publicly.
         advertise_prefix: When True (default), record the secret-path mount in
-            ``_http_settings_prefix`` so ``ha_get_overview`` can hint at the
-            settings URL. OAuth/OIDC modes pass False: there the settings UI
-            sits under a *dedicated* secret path that must never be handed to
-            MCP clients (GHSA-mx64-982r-65vg), so the mount happens but the
-            prefix is not recorded.
+            ``_http_settings_prefix`` for unmanaged HTTP deployments so
+            ``ha_get_overview`` can hint at the settings URL. The managed app
+            (add-on) and embedded deployments never record it because Home Assistant
+            supplies their settings entry points. OAuth/OIDC callers pass False
+            because they use a dedicated settings secret.
     """
+    global _http_settings_mounted, _http_settings_prefix
+
+    # Never let a rejected or non-advertised registration inherit another
+    # server's credential-bearing hint.
+    _http_settings_prefix = None
+
     handlers = build_settings_handlers(server)
     secret_prefix = secret_path.rstrip("/") if secret_path else ""
     if secret_prefix and ("{" in secret_prefix or "}" in secret_prefix):
@@ -627,7 +633,6 @@ def register_settings_routes(
     # Past this point at least one HTTP mount happens (add-on root and/or the
     # secret path). Record that so consumers can distinguish HTTP from the stdio
     # sidecar even when the prefix itself is not advertised (advertise_prefix=False).
-    global _http_settings_mounted
     _http_settings_mounted = True
 
     # Every route this function mounts except the add-on-only root mount is defined
@@ -705,10 +710,10 @@ def register_settings_routes(
         # need the same secret to reach the UI as they do for the MCP
         # endpoint.
         _mount(secret_prefix)
-        if advertise_prefix:
+        if advertise_prefix and not is_addon and not is_embedded():
             # Record the mount so ha_get_overview can point users at the
-            # settings page in HTTP transports that have no stdio sidecar URL
-            # file (#1458). Suppressed in OAuth/OIDC modes, where the dedicated
-            # secret path must not leak to MCP clients (GHSA-mx64-982r-65vg).
-            global _http_settings_prefix
+            # settings page in unmanaged HTTP transports that have no stdio
+            # sidecar URL file (#1458). The managed app (add-on) and embedded deployments
+            # already have Home Assistant settings entry points; OAuth/OIDC
+            # callers suppress their dedicated settings secret explicitly.
             _http_settings_prefix = secret_prefix

{ha_mcp_dev-8.3.0.dev2372 → ha_mcp_dev-8.3.0.dev2377}/src/ha_mcp/tools/tools_search.py

@@ -3396,7 +3396,7 @@ class SearchTools:
                     "tool_discovery, settings_url, settings_url_hint, "
                     "read_only_mode, read_only_mode_hint, ha_mcp_update. Note: "
                     "``settings_url`` (stdio mode), ``settings_url_hint`` "
-                    "(HTTP/Docker/OAuth mode), the ``read_only_mode`` / "
+                    "(standalone HTTP/Docker mode), the ``read_only_mode`` / "
                     "``read_only_mode_hint`` pair (only while Read Only Mode "
                     "is on), and ``ha_mcp_update`` (when an update check applies) "
                     "are emitted regardless of ``fields=`` projection so the "
@@ -3430,10 +3430,11 @@ class SearchTools:
         minimize the response) but only when the sidecar URL file
         actually exists.
 
-        In HTTP / Docker / OAuth modes there is no sidecar URL file and the
-        server can't know its externally reachable host, so the response
-        instead carries a ``settings_url_hint`` string telling the user where
-        the page is mounted and to read the full URL from the startup logs.
+        In standalone HTTP / Docker modes, when an HTTP settings prefix is
+        advertised, there is no sidecar URL file and the server can't know its
+        externally reachable host. The response instead carries a
+        ``settings_url_hint`` string telling the user where the page is mounted
+        and how to find or construct the full URL.
         Hand whichever of the two fields is present to the user.
 
         The response also carries an ``ha_mcp_update`` object
@@ -3512,7 +3513,7 @@ class SearchTools:
         if sidecar_url:
             projected["settings_url"] = sidecar_url
         else:
-            # No stdio sidecar URL file. In HTTP / Docker / OAuth modes hint at
+            # No stdio sidecar URL file. In standalone HTTP / Docker modes hint at
             # the page (and startup-log URL) instead of guessing a wrong absolute URL
             # when bound to 0.0.0.0 (issue #1458).
             from ..settings_ui import get_http_settings_prefix
@@ -3524,8 +3525,10 @@ class SearchTools:
                     "The settings page (enable/disable/pin tools, feature "
                     "flags, advanced settings, backups, tool-approval) is "
                     f"served at '{settings_path}' on this MCP server. Find the "
-                    "full URL in the ha-mcp startup logs, or append it to the "
-                    "base URL your client connects to."
+                    "full URL in the ha-mcp startup logs. For a direct connection, "
+                    "use the MCP endpoint's scheme, host, and port with this "
+                    "settings path (replace the endpoint path rather than "
+                    "appending to it)."
                 )
 
         # Surface Read Only Mode after projection so the flag survives any

{ha_mcp_dev-8.3.0.dev2372 → ha_mcp_dev-8.3.0.dev2377}/src/ha_mcp/visibility/enforcement.py

@@ -49,6 +49,7 @@ import logging
 import re
 import time
 from collections.abc import Callable
+from contextvars import ContextVar
 from typing import TYPE_CHECKING, Any, NoReturn
 
 from fastmcp.exceptions import ToolError
@@ -72,6 +73,10 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+_config_load_warning_emitted: ContextVar[bool | None] = ContextVar(
+    "visibility_config_load_warning_emitted", default=None
+)
+
 # The resolved hidden set is cached with a short TTL so a burst of tool calls
 # does not re-fetch the registry each time; a config edit invalidates it sooner
 # (the cache is keyed on the hide dimensions), so the ~30s window only applies to
@@ -353,6 +358,10 @@ class _VisibilityEnforcementBase(Middleware):
         loaded successfully — for the common non-enforce install that preserves
         availability, and for an enforce install it preserves the boundary.
         With no good load ever, fail CLOSED like PolicyMiddleware does.
+
+        Each half diagnoses a distinct config-load failure. A context-local
+        marker suppresses only the second traceback when both halves fail during
+        the same call.
         """
         config: VisibilityConfig | None
         try:
@@ -369,12 +378,15 @@ class _VisibilityEnforcementBase(Middleware):
                 )
             else:
                 outcome = "failing closed"
-            if tool_name != _REPORT_ISSUE_TOOL or emit_report_issue_diagnostic:
+            warning_emitted = _config_load_warning_emitted.get()
+            if warning_emitted is not True:
                 logger.warning(
                     "visibility enforce: config load failed; %s",
                     outcome,
                     exc_info=True,
                 )
+                if warning_emitted is not None:
+                    _config_load_warning_emitted.set(True)
         # ``ha_report_issue`` is an unconditional diagnostic escape hatch while
         # the toggle is off, not only a registry-failure fallback. A missing or
         # corrupt first config load follows that safe default; a last-known-good
@@ -423,6 +435,15 @@ class VisibilityInboundEnforcement(_VisibilityEnforcementBase):
 
     async def on_call_tool(
         self, context: MiddlewareContext, call_next: CallNext
+    ) -> Any:
+        token = _config_load_warning_emitted.set(False)
+        try:
+            return await self._on_call_tool(context, call_next)
+        finally:
+            _config_load_warning_emitted.reset(token)
+
+    async def _on_call_tool(
+        self, context: MiddlewareContext, call_next: CallNext
     ) -> Any:
         name = context.message.name
         args = context.message.arguments or {}

{ha_mcp_dev-8.3.0.dev2372 → ha_mcp_dev-8.3.0.dev2377/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.3.0.dev2372
+Version: 8.3.0.dev2377
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT