ha-mcp-dev 7.5.0.dev532__tar.gz → 7.5.0.dev534__tar.gz

{ha_mcp_dev-7.5.0.dev532/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.5.0.dev534}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev532
+Version: 7.5.0.dev534
 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.5.0.dev532 → ha_mcp_dev-7.5.0.dev534}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.5.0.dev532"
+version = "7.5.0.dev534"
 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.5.0.dev532 → ha_mcp_dev-7.5.0.dev534}/src/ha_mcp/tools/smart_search.py

@@ -22,6 +22,7 @@ from ..utils.fuzzy_search import (
     tokenize,
 )
 from .helpers import exception_to_structured_error, safe_info, safe_progress
+from .tools_config_dashboards import fetch_dashboards_list
 
 logger = logging.getLogger(__name__)
 
@@ -1773,14 +1774,9 @@ class SmartSearchTools:
             if "dashboard" in search_types:
                 try:
                     # List all storage-mode dashboards
-                    dash_list_resp = await self.client.send_websocket_message(
-                        {"type": "lovelace/dashboards/list"}
+                    dashboard_entries: list[dict[str, Any]] = (
+                        await fetch_dashboards_list(self.client) or []
                     )
-                    dashboard_entries: list[dict[str, Any]] = []
-                    if isinstance(dash_list_resp, dict) and dash_list_resp.get(
-                        "success"
-                    ):
-                        dashboard_entries = dash_list_resp.get("result", [])
 
                     # Build list of dashboards to search (include default)
                     dashboards_to_search: list[tuple[str, str]] = [

{ha_mcp_dev-7.5.0.dev532 → ha_mcp_dev-7.5.0.dev534}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -323,7 +323,7 @@ def _should_lazy_resolve(error_msg: str) -> bool:
     return _LAZY_RESOLVE_TRIGGER in error_msg
 
 
-async def _fetch_dashboards_list(
+async def fetch_dashboards_list(
     client: Any,
 ) -> list[dict[str, Any]] | None:
     """Fetch and normalise the lovelace/dashboards/list WebSocket response.
@@ -381,7 +381,7 @@ async def _resolve_dashboard(
       to the registry id before issuing the delete. Discards
       ``dashboards``.
     """
-    dashboards = await _fetch_dashboards_list(client)
+    dashboards = await fetch_dashboards_list(client)
     if dashboards is None:
         return None, None
 
@@ -598,7 +598,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
         try:
             # List mode
             if list_only:
-                dashboards = await _fetch_dashboards_list(client) or []
+                dashboards = await fetch_dashboards_list(client) or []
                 return {
                     "success": True,
                     "action": "list",
@@ -1249,9 +1249,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
             if pre_fetched_dashboards is not None:
                 existing_dashboards = pre_fetched_dashboards
             else:
-                existing_dashboards = (
-                    await _fetch_dashboards_list(client) or []
-                )
+                existing_dashboards = await fetch_dashboards_list(client) or []
             dashboard_exists = any(
                 d.get("url_path") == url_path for d in existing_dashboards
             )

{ha_mcp_dev-7.5.0.dev532 → ha_mcp_dev-7.5.0.dev534}/src/ha_mcp/tools/tools_config_scripts.py

@@ -96,6 +96,8 @@ class ConfigScriptTools:
 
         The returned `config_hash` is stable across consecutive reads of an unchanged config — `compute_config_hash` documents the underlying contract.
 
+        The returned `script_id` is the canonical storage key resolved by the REST client (matching what `ha_config_set_script` / `ha_config_remove_script` expect), falling back to the input identifier on the rare path where the REST envelope omits it.
+
         EXAMPLES:
         - Get script: ha_config_get_script("morning_routine")
         - Get script: ha_config_get_script("backup_script")
@@ -128,10 +130,26 @@ class ConfigScriptTools:
             if cat_id:
                 config_result["category"] = cat_id
 
+            # Issue #1334: return the canonical storage key from the
+            # rest_client envelope so callers can thread the result into
+            # subsequent ha_config_*_script calls without re-resolving.
+            # Falls back to the input when the rest_client response omits
+            # the key — a contract violation that we surface via warning
+            # rather than mask silently.
+            canonical_id = config_result.get("script_id")
+            if canonical_id is None:
+                logger.warning(
+                    "get_script_config envelope missing 'script_id' for "
+                    "input %r; falling back to caller input. This indicates "
+                    "a rest_client contract violation.",
+                    script_id,
+                )
+                canonical_id = script_id
+
             return {
                 "success": True,
                 "action": "get",
-                "script_id": script_id,
+                "script_id": canonical_id,
                 "config": config_result,
                 "config_hash": config_hash_value,
             }

{ha_mcp_dev-7.5.0.dev532 → ha_mcp_dev-7.5.0.dev534}/src/ha_mcp/tools/tools_yaml_config.py

@@ -20,6 +20,7 @@ from pydantic import Field
 from ..config import get_global_settings
 from ..errors import ErrorCode, create_error_response
 from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
+from .tools_config_dashboards import fetch_dashboards_list
 from .tools_filesystem import (
     MCP_TOOLS_DOMAIN,
     _assert_mcp_tools_available,
@@ -45,9 +46,7 @@ async def _check_storage_mode_dashboard_collision(
         return
     url_path = yaml_path[len(_LOVELACE_DASHBOARD_PREFIX):]
     try:
-        result = await client.send_websocket_message(
-            {"type": "lovelace/dashboards/list"}
-        )
+        dashboards = await fetch_dashboards_list(client)
     except Exception as exc:
         logger.warning(
             "lovelace/dashboards/list WS query failed (%s); skipping collision check",
@@ -55,18 +54,6 @@ async def _check_storage_mode_dashboard_collision(
         )
         return
 
-    if isinstance(result, dict) and "result" in result:
-        dashboards = result["result"]
-    elif isinstance(result, list):
-        dashboards = result
-    else:
-        logger.warning(
-            "lovelace/dashboards/list returned unexpected shape (%s); "
-            "skipping collision check",
-            type(result).__name__,
-        )
-        return
-
     for entry in dashboards or []:
         if (
             isinstance(entry, dict)

{ha_mcp_dev-7.5.0.dev532 → ha_mcp_dev-7.5.0.dev534/src/ha_mcp_dev.egg-info}/PKG-INFO

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