ha-mcp-dev 7.12.3.dev1949__tar.gz → 7.13.0.dev1955__tar.gz

{ha_mcp_dev-7.12.3.dev1949/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.13.0.dev1955}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.12.3.dev1949
+Version: 7.13.0.dev1955
 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.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.12.3.dev1949"
+version = "7.13.0.dev1955"
 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-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/client/rest_client.py

@@ -1453,7 +1453,10 @@ class HomeAssistantClient:
                             ],
                         }
 
-                logger.error(f"WebSocket message failed: {e}")
+                # Name the command in the log line: a bare "Command failed:
+                # Unknown command." is undiagnosable from a user's log
+                # (issue #1889 took a live reproduction to attribute).
+                logger.error(f"WebSocket message failed ({message.get('type')}): {e}")
                 return {"success": False, "error": str(e)}
 
         return {"success": False, "error": "WebSocket request failed"}

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/config.py

@@ -1440,10 +1440,12 @@ _settings: Settings | None = None
 # THROUGH THIS DICT — never
 # via os.environ — so the admin token can't be read from the shared HA process
 # environment. Applied onto the Settings singleton in ``get_global_settings``.
-_EMBEDDED_CONNECTION: dict[str, str] = {}
+_EMBEDDED_CONNECTION: dict[str, str | bool] = {}
 
 
-def set_embedded_connection(url: str, token: str) -> None:
+def set_embedded_connection(
+    url: str, token: str, verify_ssl: bool | None = None
+) -> None:
     """Register the in-process HA connection for embedded mode.
 
     Embedded-mode only: called by the ha_mcp_tools custom component's in-process
@@ -1459,9 +1461,20 @@ def set_embedded_connection(url: str, token: str) -> None:
     Registration therefore cannot assume it runs before the first build — the
     integration imports this function from the very package whose import
     creates the singleton.
+
+    ``verify_ssl`` lets the component disable certificate verification when it
+    derives an ``https://127.0.0.1`` loopback URL from Home Assistant's SSL
+    config (issue #1890): HA's certificate is issued for its hostname, never
+    for 127.0.0.1, so verification on the loopback connection can only fail.
+    ``None`` (the default, and what pre-#1890 components pass implicitly)
+    leaves ``Settings.verify_ssl`` alone.
     """
     _EMBEDDED_CONNECTION["url"] = url
     _EMBEDDED_CONNECTION["token"] = token
+    if verify_ssl is None:
+        _EMBEDDED_CONNECTION.pop("verify_ssl", None)
+    else:
+        _EMBEDDED_CONNECTION["verify_ssl"] = verify_ssl
     if _settings is not None:
         _apply_embedded_connection(_settings)
 
@@ -1764,7 +1777,7 @@ def _apply_backup_overrides(settings: "Settings") -> None:
 
 
 def _apply_embedded_connection(settings: "Settings") -> None:
-    """Apply the in-process embedded HA connection (url/token) if registered.
+    """Apply the in-process embedded HA connection (url/token/verify_ssl) if registered.
 
     No-op outside embedded mode. Plain ``setattr`` (``validate_assignment`` is off
     on ``Settings``, mirroring ``_apply_backup_overrides``), so the loopback URL
@@ -1773,10 +1786,13 @@ def _apply_embedded_connection(settings: "Settings") -> None:
     """
     url = _EMBEDDED_CONNECTION.get("url")
     token = _EMBEDDED_CONNECTION.get("token")
-    if url:
+    if isinstance(url, str) and url:
         settings.homeassistant_url = url.rstrip("/")
-    if token:
+    if isinstance(token, str) and token:
         settings.homeassistant_token = token
+    verify_ssl = _EMBEDDED_CONNECTION.get("verify_ssl")
+    if isinstance(verify_ssl, bool):
+        settings.verify_ssl = verify_ssl
 
 
 def get_global_settings() -> Settings:

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/smart_search/_config.py

@@ -15,7 +15,8 @@ BULK_REST_TIMEOUT = 5.0  # Timeout for bulk REST endpoint calls
 BULK_WEBSOCKET_TIMEOUT = 3.0  # Timeout for bulk WebSocket calls
 
 
-# Attempt-C (per-id fallback) tuning knobs. Sourced from the resolved
+# Attempt-C (per-id fallback; the letter predates the removal of the phantom
+# WS bulk tier in #1889 and is kept as a proper name) tuning knobs. Sourced from the resolved
 # Settings (issues #1538 / #1784) so the env var, the web Settings UI
 # override file, and the field defaults all flow through one precedence path
 # — and so add-on users (who cannot set raw env vars) can tune them from the

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/smart_search/_deep.py

@@ -319,7 +319,7 @@ class DeepSearchMixin(SceneSearchMixin):
         *,
         config_time_budget: float | None = None,
     ) -> tuple[list[dict[str, Any]], int, int, int, int]:
-        """Deep-search automations: 3-tier config fetch (REST bulk -> WS bulk -> individual).
+        """Deep-search automations: two-tier config fetch (REST bulk -> budgeted individual).
 
         Returns ``(matches, skipped_count, failed_count, yaml_skipped_count,
         timeout_count)``. ``skipped_count`` is non-zero only when bulk fetch
@@ -360,10 +360,9 @@ class DeepSearchMixin(SceneSearchMixin):
                 )
             )
 
-        # Phase 2: bulk fetch (Attempt A REST, Attempt B WebSocket)
+        # Phase 2: bulk fetch (REST)
         configs = await self._bulk_fetch_configs(
             "/config/automation/config",
-            ["config/automation/config/list", "automation/config/list"],
             lambda item: item.get("id"),
             BULK_REST_TIMEOUT,
             "Automation",
@@ -474,7 +473,7 @@ class DeepSearchMixin(SceneSearchMixin):
         *,
         config_time_budget: float | None = None,
     ) -> tuple[list[dict[str, Any]], int, int, int, int]:
-        """Deep-search scripts: same 3-tier strategy as automations.
+        """Deep-search scripts: same two-tier strategy as automations.
 
         Returns ``(matches, skipped_count, failed_count, yaml_skipped_count,
         timeout_count)``; semantics identical to ``_deep_search_automations``
@@ -500,7 +499,6 @@ class DeepSearchMixin(SceneSearchMixin):
         # Phase 2: bulk fetch
         configs = await self._bulk_fetch_configs(
             "/config/script/config",
-            ["config/script/config/list", "script/config/list"],
             lambda item: (
                 item.get("id") or item.get("alias", "").lower().replace(" ", "_")
             ),

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/smart_search/_entities.py

@@ -221,7 +221,16 @@ class EntitySearchMixin(_SearchBase):
                 if isinstance(entries_resp, dict) and entries_resp.get("success"):
                     for eid, entry in (entries_resp.get("result", {}) or {}).items():
                         if isinstance(entry, dict):
-                            aliases_map[eid] = entry.get("aliases", []) or []
+                            # String entries only: HA serializes the
+                            # COMPUTED_NAME alias sentinel ("the computed
+                            # entity name is an alias") as null over the
+                            # websocket API; ingesting it would put None in
+                            # every downstream alias string op.
+                            aliases_map[eid] = [
+                                a
+                                for a in (entry.get("aliases") or [])
+                                if isinstance(a, str)
+                            ]
                 else:
                     failed_chunks += 1
                     logger.warning(

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/smart_search/_fetch.py

@@ -1,4 +1,4 @@
-"""Shared 3-tier config fetching and entry scoring for deep search."""
+"""Shared two-tier config fetching (bulk REST, then budgeted per-id) for deep search."""
 
 import asyncio
 import logging
@@ -8,7 +8,7 @@ from typing import Any
 
 import httpx
 
-from ._config import BULK_WEBSOCKET_TIMEOUT, INDIVIDUAL_FETCH_BATCH_SIZE
+from ._config import INDIVIDUAL_FETCH_BATCH_SIZE
 from ._scoring import ScoringMixin
 
 logger = logging.getLogger(__name__)
@@ -35,7 +35,7 @@ def is_timeout_error(exc: BaseException) -> bool:
 
 
 class ConfigFetchMixin(ScoringMixin):
-    """REST/WebSocket bulk + budgeted individual config fetch, and scoring of fetched entries."""
+    """REST bulk + budgeted individual config fetch, and scoring of fetched entries."""
 
     @staticmethod
     def _index_configs(
@@ -53,17 +53,25 @@ class ConfigFetchMixin(ScoringMixin):
     async def _bulk_fetch_configs(
         self,
         rest_endpoint: str,
-        ws_types: list[str],
         id_of: Callable[[dict[str, Any]], str | None],
         rest_timeout: float,
         label: str,
     ) -> dict[str, dict[str, Any]] | None:
-        """Bulk-fetch all configs of one domain: REST endpoint, then WS list endpoints.
-
-        Returns ``{id: config}`` (possibly empty) on the first successful
-        attempt, or ``None`` when every attempt failed. An empty-but-successful
-        REST list returns ``{}`` (not ``None``) so the caller skips the
-        individual-fetch fallback exactly as it would for a populated response.
+        """Bulk-fetch all configs of one domain from its REST endpoint.
+
+        Returns ``{id: config}`` (possibly empty) on success, or ``None`` when
+        the fetch failed (the caller then falls back to budgeted individual
+        fetches). An empty-but-successful REST list returns ``{}`` (not
+        ``None``) so the caller skips the individual-fetch fallback exactly as
+        it would for a populated response.
+
+        There is deliberately NO WebSocket fallback here: the
+        ``config/<domain>/config/list`` and ``<domain>/config/list`` command
+        types this used to try have never existed in HA core, so every legacy
+        config search fired paired ``unknown_command`` rejections that
+        ``send_websocket_message`` logged as ERRORs — the recurring
+        "WebSocket message failed: Command failed: Unknown command." log spam
+        of issue #1889.
         """
         try:
             resp = await asyncio.wait_for(
@@ -74,17 +82,6 @@ class ConfigFetchMixin(ScoringMixin):
                 return self._index_configs(resp, id_of)
         except Exception as e:
             logger.debug(f"{label} REST bulk fetch failed: {e}")
-
-        for ws_type in ws_types:
-            try:
-                ws_resp = await asyncio.wait_for(
-                    self.client.send_websocket_message({"type": ws_type}),
-                    timeout=BULK_WEBSOCKET_TIMEOUT,
-                )
-                if isinstance(ws_resp, dict) and ws_resp.get("success"):
-                    return self._index_configs(ws_resp.get("result", []), id_of)
-            except Exception as e:
-                logger.debug(f"{label} WebSocket bulk fetch ({ws_type}) failed: {e}")
         return None
 
     async def _individual_fetch_budgeted(

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/smart_search/_scenes.py

@@ -212,7 +212,7 @@ class SceneSearchMixin(ConfigFetchMixin):
         config_time_budget: float | None = None,
         prefetched_registry: Any = None,
     ) -> tuple[list[dict[str, Any]], int, int, int, bool, int]:
-        """Deep-search scenes: 3-tier strategy plus registry-walk augmentation.
+        """Deep-search scenes: two-tier strategy plus registry-walk augmentation.
 
         Scenes have no listing primitive, so entities are enumerated from
         get_states() and configs fetched per id. Returns the scene results plus
@@ -239,7 +239,6 @@ class SceneSearchMixin(ConfigFetchMixin):
         # Phase 2: bulk fetch
         configs = await self._bulk_fetch_configs(
             "/config/scene/config",
-            ["config/scene/config/list", "scene/config/list"],
             lambda item: (
                 item.get("id") or item.get("name", "").lower().replace(" ", "_")
             ),

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955}/src/ha_mcp/tools/tools_blueprints.py

@@ -222,6 +222,68 @@ class BlueprintTools:
             )
             return None  # unreachable: exception_to_structured_error always raises
 
+    async def _save_blueprint(
+        self,
+        url: str,
+        domain: str,
+        path: str,
+        yaml_data: str,
+        overwrite: bool,
+    ) -> dict[str, Any]:
+        """Persist a validated blueprint via blueprint/save, raising on failure.
+
+        Returns the blueprint/save result payload (contains overrides_existing).
+        """
+        save_message: dict[str, Any] = {
+            "type": "blueprint/save",
+            "domain": domain,
+            "path": path,
+            "yaml": yaml_data,
+            "source_url": url,
+        }
+        # allow_override only exists on HA >= 2023.12 and the WS schema
+        # rejects unknown keys - only send it when actually overwriting
+        if overwrite:
+            save_message["allow_override"] = True
+
+        save_response = await self._client.send_websocket_message(save_message)
+
+        if not save_response.get("success"):
+            error = save_response.get("error", {})
+            save_error = (
+                error.get("message", str(error))
+                if isinstance(error, dict)
+                else str(error)
+            )
+
+            suggestions = [
+                "The blueprint was validated but could not be saved to disk",
+                "Use ha_get_blueprint() to check if it already exists",
+            ]
+
+            # Reachable despite the early exists check: a race between
+            # import and save, or an installed file that failed to load
+            # (core reports exists=false for those)
+            already_exists = "already exists" in save_error.lower()
+            if already_exists:
+                suggestions.insert(
+                    0,
+                    "A blueprint with this path already exists - pass overwrite=true to re-import it",
+                )
+
+            raise_tool_error(
+                create_error_response(
+                    ErrorCode.RESOURCE_ALREADY_EXISTS
+                    if already_exists
+                    else ErrorCode.SERVICE_CALL_FAILED,
+                    save_error,
+                    context={"url": url, "path": path},
+                    suggestions=suggestions,
+                )
+            )
+
+        return save_response.get("result") or {}
+
     @tool(
         name="ha_import_blueprint",
         tags={"Blueprints"},
@@ -240,17 +302,29 @@ class BlueprintTools:
                 description="URL to import blueprint from (GitHub, Home Assistant Community, or direct YAML URL)"
             ),
         ],
+        overwrite: Annotated[
+            bool,
+            Field(
+                description="Overwrite the blueprint if it is already installed (re-import). "
+                "Home Assistant reloads all automations/scripts using the blueprint.",
+                default=False,
+            ),
+        ] = False,
     ) -> dict[str, Any]:
         """
         Import a blueprint from a URL.
 
         Imports a blueprint from GitHub, Home Assistant Community forums,
-        or any direct URL to a blueprint YAML file.
+        or any direct URL to a blueprint YAML file. Set overwrite=true to
+        re-import a blueprint that is already installed (equivalent to the
+        UI's "Re-import blueprint" action) - Home Assistant then reloads all
+        automations/scripts that use it.
 
         EXAMPLES:
         - Import from GitHub: ha_import_blueprint("https://github.com/user/repo/blob/main/blueprint.yaml")
         - Import from HA Community: ha_import_blueprint("https://community.home-assistant.io/t/motion-light/123456")
         - Import direct YAML: ha_import_blueprint("https://example.com/my-blueprint.yaml")
+        - Re-import an installed blueprint: ha_import_blueprint("https://example.com/my-blueprint.yaml", overwrite=True)
 
         SUPPORTED SOURCES:
         - GitHub repository URLs (will be converted to raw URLs)
@@ -260,6 +334,7 @@ class BlueprintTools:
         RETURNS:
         - Import result with the blueprint path where it was saved
         - Blueprint metadata (name, domain, description)
+        - overrides_existing: true when an installed blueprint was overwritten
         - Error details if import fails
         """
         try:
@@ -328,43 +403,50 @@ class BlueprintTools:
             if not suggested_filename.endswith((".yaml", ".yml")):
                 suggested_filename = suggested_filename + ".yaml"
 
-            # Save the blueprint to disk (blueprint/import only validates)
-            save_response = await self._client.send_websocket_message(
-                {
-                    "type": "blueprint/save",
-                    "domain": domain,
-                    "path": suggested_filename,
-                    "yaml": raw_data,
-                    "source_url": url,
-                }
-            )
-
-            if not save_response.get("success"):
-                error = save_response.get("error", {})
-                save_error = (
-                    error.get("message", str(error))
-                    if isinstance(error, dict)
-                    else str(error)
+            # blueprint/save does not re-run these checks (currently the
+            # blueprint's min Home Assistant version) - without this gate an
+            # unsupported blueprint saves cleanly and reports success
+            validation_errors = result_data.get("validation_errors")
+            if validation_errors:
+                raise_tool_error(
+                    create_error_response(
+                        ErrorCode.VALIDATION_FAILED,
+                        "Blueprint failed validation: "
+                        + "; ".join(str(e) for e in validation_errors),
+                        context={"url": url, "validation_errors": validation_errors},
+                        suggestions=[
+                            "The blueprint is not compatible with this Home Assistant installation",
+                            "Update Home Assistant to satisfy the blueprint's minimum version requirement",
+                        ],
+                    )
                 )
 
-                suggestions = [
-                    "The blueprint was validated but could not be saved to disk",
-                    "Use ha_get_blueprint() to check if it already exists",
-                ]
-
-                if "already exists" in save_error.lower():
-                    suggestions.insert(0, "A blueprint with this path already exists")
-
+            # blueprint/import reports whether the target path is already
+            # installed - fail early with a re-import hint instead of letting
+            # blueprint/save reject the write
+            if result_data.get("exists") and not overwrite:
                 raise_tool_error(
                     create_error_response(
-                        ErrorCode.SERVICE_CALL_FAILED,
-                        save_error,
-                        context={"url": url, "path": suggested_filename},
-                        suggestions=suggestions,
+                        ErrorCode.RESOURCE_ALREADY_EXISTS,
+                        f"Blueprint already exists at '{suggested_filename}'. "
+                        "Pass overwrite=true to re-import it.",
+                        context={
+                            "url": url,
+                            "path": suggested_filename,
+                            "domain": domain,
+                        },
+                        suggestions=[
+                            "Call ha_import_blueprint with overwrite=true to update the installed blueprint",
+                            "Use ha_get_blueprint() to inspect the currently installed version",
+                        ],
                     )
                 )
 
-            save_result = save_response.get("result") or {}
+            # Save the blueprint to disk (blueprint/import only validates)
+            save_result = await self._save_blueprint(
+                url, domain, suggested_filename, raw_data, overwrite
+            )
+            overrides_existing = save_result.get("overrides_existing", False)
 
             return {
                 "success": True,
@@ -375,8 +457,12 @@ class BlueprintTools:
                     "name": blueprint_meta.get("name"),
                     "description": blueprint_meta.get("description"),
                 },
-                "overrides_existing": save_result.get("overrides_existing", False),
-                "message": "Blueprint imported successfully. Use ha_get_blueprint() to see all installed blueprints.",
+                "overrides_existing": overrides_existing,
+                "message": (
+                    "Blueprint re-imported successfully. Automations/scripts using it were reloaded."
+                    if overrides_existing
+                    else "Blueprint imported successfully. Use ha_get_blueprint() to see all installed blueprints."
+                ),
             }
 
         except ToolError:

{ha_mcp_dev-7.12.3.dev1949 → ha_mcp_dev-7.13.0.dev1955/src/ha_mcp_dev.egg-info}/PKG-INFO

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