ha-mcp-dev 7.4.1.dev465__tar.gz → 7.4.1.dev467__tar.gz

{ha_mcp_dev-7.4.1.dev465/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev467}/PKG-INFO

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

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev465"
+version = "7.4.1.dev467"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/_version.py

@@ -56,3 +56,14 @@ def is_running_in_addon() -> bool:
     users, who already see the dev/stable distinction in the HAOS add-on UI.
     """
     return bool(os.environ.get("SUPERVISOR_TOKEN"))
+
+
+def get_supervisor_base_url() -> str:
+    """Return the base URL for direct Supervisor REST calls.
+
+    Defaults to ``http://supervisor`` (the in-addon Supervisor hostname). The
+    ``SUPERVISOR_BASE_URL`` env var override exists so E2E tests can point the
+    direct-Supervisor httpx call sites at a local mock without /etc/hosts or
+    DNS hacks. Production add-ons leave it unset.
+    """
+    return os.environ.get("SUPERVISOR_BASE_URL", "http://supervisor")

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/client/rest_client.py

@@ -11,7 +11,7 @@ from typing import Any
 
 import httpx
 
-from .._version import is_running_in_addon
+from .._version import get_supervisor_base_url, is_running_in_addon
 from ..config import get_global_settings
 
 
@@ -41,7 +41,19 @@ class HomeAssistantConnectionError(HomeAssistantError):
 
 
 class HomeAssistantAuthError(HomeAssistantError):
-    """Authentication error with Home Assistant."""
+    """Authentication error with Home Assistant.
+
+    Sibling of ``HomeAssistantAPIError`` (not a subclass). The codebase has
+    18 ``except HomeAssistantAPIError`` sites (util_helpers polling,
+    tools_integrations registry lookups, etc.) that deliberately rely on
+    auth errors NOT matching so they can propagate to a paired
+    ``except (HomeAssistantConnectionError, HomeAssistantAuthError): raise``
+    block. Subclassing AuthError under APIError silently swallowed those
+    auth errors as part of the local "this entity is not registered yet"
+    polling logic. Sites that specifically need to catch both must list
+    them explicitly (see ``_get_supervisor_log`` and
+    ``_get_system_service_log`` in ``tools_utility.py``).
+    """
 
 
 class HomeAssistantAPIError(HomeAssistantError):
@@ -543,7 +555,7 @@ class HomeAssistantClient:
                 "(addon-mode gate fired but SUPERVISOR_TOKEN env var not set)"
             )
 
-        url = f"http://supervisor/{path}/logs"
+        url = f"{get_supervisor_base_url()}/{path}/logs"
         logger.debug("Fetching %s via Supervisor direct", url)
 
         try:
@@ -1301,7 +1313,6 @@ class HomeAssistantClient:
                 ) from e
             raise
 
-
     async def resolve_scene_id(self, identifier: str) -> str:
         """
         Resolve a scene identifier to its storage key via the entity registry.

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/settings_ui.py

@@ -19,7 +19,7 @@ import httpx
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse
 
-from ._version import is_running_in_addon
+from ._version import get_supervisor_base_url, is_running_in_addon
 from .errors import ErrorCode, create_error_response
 from .transforms import DEFAULT_PINNED_TOOLS
 from .utils.data_paths import get_data_dir
@@ -910,7 +910,7 @@ def register_settings_routes(
                 timeout=5.0, verify=server.settings.verify_ssl
             ) as client:
                 resp = await client.post(
-                    "http://supervisor/addons/self/restart",
+                    f"{get_supervisor_base_url()}/addons/self/restart",
                     headers={"Authorization": f"Bearer {token}"},
                 )
         except (httpx.ReadError, httpx.RemoteProtocolError):

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/tools/tools_bug_report.py

@@ -20,6 +20,7 @@ from pydantic import Field
 
 from ha_mcp import __version__
 
+from .._version import get_supervisor_base_url
 from ..config import Settings, get_global_settings
 from ..utils.usage_logger import (
     AVG_LOG_ENTRIES_PER_TOOL,
@@ -357,7 +358,7 @@ async def _fetch_addon_logs() -> str:
             timeout=10.0, verify=get_global_settings().verify_ssl
         ) as http_client:
             resp = await http_client.get(
-                "http://supervisor/addons/self/logs",
+                f"{get_supervisor_base_url()}/addons/self/logs",
                 headers={"Authorization": f"Bearer {token}"},
             )
             if resp.status_code != 200:

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -265,22 +265,37 @@ def _should_lazy_resolve(error_msg: str) -> bool:
     return _LAZY_RESOLVE_TRIGGER in error_msg
 
 
-async def _resolve_dashboard(client: Any, identifier: str) -> dict[str, str] | None:
+async def _resolve_dashboard(
+    client: Any, identifier: str
+) -> tuple[dict[str, str] | None, list[dict[str, Any]] | None]:
     """Resolve a dashboard identifier (url_path or internal id) to both forms.
 
-    Calls ``lovelace/dashboards/list`` and returns
-    ``{"url_path": ..., "id": ...}`` when the identifier matches either field
-    on a registry entry that has both fields populated; otherwise returns
-    ``None``. Always pays the round-trip when called.
+    Calls ``lovelace/dashboards/list`` and returns a 2-tuple
+    ``(match, dashboards)``:
 
-    Two call sites:
+    - ``match`` is ``{"url_path": ..., "id": ...}`` when the identifier
+      matches either field on a registry entry that has both fields
+      populated; otherwise ``None``.
+    - ``dashboards`` is the raw list as returned by HA when the
+      response shape is recognised (dict-with-``result`` or bare list);
+      ``None`` when the shape was unexpected and a warning was logged.
+
+    Returning ``dashboards`` alongside ``match`` lets callers reuse the
+    list for follow-on checks (existence, id lookup) instead of paying
+    a second ``lovelace/dashboards/list`` round-trip.
+
+    Three call sites:
     - **Lazy fallback** (``_lazy_resolve_and_retry``): only invoked after
       ``lovelace/config`` rejected the identifier with
       ``_LAZY_RESOLVE_TRIGGER`` — the round-trip is gated by the caller.
+      Discards ``dashboards``.
     - **Eager pre-resolve** (``ha_config_set_dashboard``): invoked before
       hyphen validation so callers may pass either form; gated on a
       cheap heuristic ("no hyphen, not 'lovelace'") rather than an error
-      from HA.
+      from HA. Reuses ``dashboards`` for the existence-check below.
+    - **Delete** (``ha_config_delete_dashboard``): resolves either form
+      to the registry id before issuing the delete. Discards
+      ``dashboards``.
     """
     result = await client.send_websocket_message({"type": "lovelace/dashboards/list"})
     if isinstance(result, dict) and "result" in result:
@@ -297,7 +312,7 @@ async def _resolve_dashboard(client: Any, identifier: str) -> dict[str, str] | N
             "treating as no-match",
             type(result).__name__,
         )
-        return None
+        return None, None
 
     for d in dashboards:
         if d.get("id") == identifier or d.get("url_path") == identifier:
@@ -309,8 +324,8 @@ async def _resolve_dashboard(client: Any, identifier: str) -> dict[str, str] | N
                 # would be silently used by callers (e.g.
                 # ``delete_dashboard`` would forward ``resolved_id=""``).
                 continue
-            return {"url_path": url_path, "id": entry_id}
-    return None
+            return {"url_path": url_path, "id": entry_id}, dashboards
+    return None, dashboards
 
 
 @overload
@@ -376,7 +391,7 @@ async def _lazy_resolve_and_retry(
         return url_path, response
 
     try:
-        resolved = await _resolve_dashboard(client, url_path)
+        resolved, _ = await _resolve_dashboard(client, url_path)
     except Exception as resolver_exc:
         # Resolver itself raised (timeout, network blip, etc.). Don't let
         # this exception escape and replace the original HA error with
@@ -941,12 +956,18 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
             # ``resolved_from`` on the success response so callers can
             # detect this redirect.
             pre_resolved_from: str | None = None
+            # When the pre-resolver fires and finds a match, ``_resolve_dashboard``
+            # has already fetched ``lovelace/dashboards/list``. Capture that list
+            # so the existence-check site below can reuse it instead of paying
+            # a second round-trip.
+            pre_fetched_dashboards: list[dict[str, Any]] | None = None
             if "-" not in url_path and url_path != "lovelace":
-                resolved = await _resolve_dashboard(client, url_path)
+                resolved, dashboards = await _resolve_dashboard(client, url_path)
                 if resolved is not None and resolved["url_path"]:
                     original_url_path = url_path
                     url_path = resolved["url_path"]
                     pre_resolved_from = original_url_path
+                    pre_fetched_dashboards = dashboards
                     logger.info(
                         "ha_config_set_dashboard pre-resolver mapped %r -> %r",
                         original_url_path,
@@ -1129,16 +1150,32 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                     transform_result["resolved_from"] = pre_resolved_from
                 return transform_result
 
-            # Check if dashboard exists
-            result = await client.send_websocket_message(
-                {"type": "lovelace/dashboards/list"}
-            )
-            if isinstance(result, dict) and "result" in result:
-                existing_dashboards = result["result"]
-            elif isinstance(result, list):
-                existing_dashboards = result
+            # Check if dashboard exists. When the pre-resolver fired
+            # and matched (internal-id branch), reuse its already-fetched
+            # ``lovelace/dashboards/list`` response to skip a redundant
+            # round-trip — the matched dashboard is guaranteed present in
+            # that list.
+            if pre_fetched_dashboards is not None:
+                existing_dashboards = pre_fetched_dashboards
             else:
-                existing_dashboards = []
+                result = await client.send_websocket_message(
+                    {"type": "lovelace/dashboards/list"}
+                )
+                if isinstance(result, dict) and "result" in result:
+                    existing_dashboards = result["result"]
+                elif isinstance(result, list):
+                    existing_dashboards = result
+                else:
+                    # Mirror the warning emitted by ``_resolve_dashboard`` on
+                    # the same response-shape failure, so a future HA shape
+                    # change shows up at every fetch site rather than going
+                    # silent on this one.
+                    logger.warning(
+                        "lovelace/dashboards/list returned an unexpected shape "
+                        "(type=%s); treating as no-match",
+                        type(result).__name__,
+                    )
+                    existing_dashboards = []
             dashboard_exists = any(
                 d.get("url_path") == url_path for d in existing_dashboards
             )
@@ -1407,7 +1444,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
         Note: The default dashboard cannot be deleted via this method.
         """
         try:
-            resolved = await _resolve_dashboard(client, url_path)
+            resolved, _ = await _resolve_dashboard(client, url_path)
             if resolved is None:
                 raise_tool_error(
                     create_resource_not_found_error(

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467}/src/ha_mcp/tools/tools_utility.py

@@ -12,7 +12,11 @@ from typing import Any, Literal
 
 from fastmcp.exceptions import ToolError
 
-from ..client.rest_client import HomeAssistantAPIError, HomeAssistantConnectionError
+from ..client.rest_client import (
+    HomeAssistantAPIError,
+    HomeAssistantAuthError,
+    HomeAssistantConnectionError,
+)
 from ..errors import ErrorCode, create_error_response
 from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
 from .util_helpers import (
@@ -755,6 +759,19 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
         except ToolError:
             raise
+        except HomeAssistantAuthError as e:
+            # Listed before HomeAssistantAPIError because AuthError is a sibling,
+            # not a subclass — without this explicit clause the 401 from
+            # _supervisor_logs_get propagates raw to FastMCP and surfaces
+            # without a structured `code` field.
+            exception_to_structured_error(
+                e,
+                context={"source": "supervisor", "slug": slug},
+                suggestions=[
+                    "Verify SUPERVISOR_TOKEN is set correctly inside the add-on",
+                    "Reinstall the add-on if the token may have rotated",
+                ],
+            )
         except HomeAssistantAPIError as e:
             status = getattr(e, "status_code", None)
             if status == 400:
@@ -857,6 +874,19 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
         except ToolError:
             raise
+        except HomeAssistantAuthError as e:
+            # Listed before HomeAssistantAPIError because AuthError is a sibling,
+            # not a subclass — without this explicit clause the 401 from
+            # _supervisor_logs_get propagates raw to FastMCP and surfaces
+            # without a structured `code` field.
+            exception_to_structured_error(
+                e,
+                context={"source": "system_service", "slug": service},
+                suggestions=[
+                    "Verify SUPERVISOR_TOKEN is set correctly inside the add-on",
+                    "Reinstall the add-on if the token may have rotated",
+                ],
+            )
         except HomeAssistantAPIError as e:
             status = getattr(e, "status_code", None)
             if status == 403:

{ha_mcp_dev-7.4.1.dev465 → ha_mcp_dev-7.4.1.dev467/src/ha_mcp_dev.egg-info}/PKG-INFO

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