ha-mcp-dev 7.4.1.dev472__tar.gz → 7.4.1.dev474__tar.gz

{ha_mcp_dev-7.4.1.dev472/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev474}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev472"
+version = "7.4.1.dev474"
 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.dev472 → ha_mcp_dev-7.4.1.dev474}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -265,6 +265,32 @@ def _should_lazy_resolve(error_msg: str) -> bool:
     return _LAZY_RESOLVE_TRIGGER in error_msg
 
 
+async def _fetch_dashboards_list(
+    client: Any,
+) -> list[dict[str, Any]] | None:
+    """Fetch and normalise the lovelace/dashboards/list WebSocket response.
+
+    Returns the list of dashboard registry entries on success, or ``None``
+    when the response shape is unrecognised.  A warning is logged on
+    unexpected shapes so that future HA response-format changes surface at
+    every fetch site rather than silently degrading.
+
+    Callers decide how to handle ``None`` (e.g. fall through to ``[]`` or
+    propagate the failure).
+    """
+    result = await client.send_websocket_message({"type": "lovelace/dashboards/list"})
+    if isinstance(result, dict) and isinstance(result.get("result"), list):
+        return cast(list[dict[str, Any]], result["result"])
+    if isinstance(result, list):
+        return cast(list[dict[str, Any]], result)
+    logger.warning(
+        "lovelace/dashboards/list returned an unexpected shape (type=%s); "
+        "treating as no-match",
+        type(result).__name__,
+    )
+    return None
+
+
 async def _resolve_dashboard(
     client: Any, identifier: str
 ) -> tuple[dict[str, str] | None, list[dict[str, Any]] | None]:
@@ -297,21 +323,8 @@ async def _resolve_dashboard(
       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:
-        dashboards = result["result"]
-    elif isinstance(result, list):
-        dashboards = result
-    else:
-        # Neither dict-with-result nor list — either HA returned an error
-        # envelope (unknown shape) or the response format changed.
-        # Surface a warning so the next response-shape change isn't a
-        # silent "always no match" regression.
-        logger.warning(
-            "lovelace/dashboards/list returned an unexpected shape (type=%s); "
-            "treating as no-match",
-            type(result).__name__,
-        )
+    dashboards = await _fetch_dashboards_list(client)
+    if dashboards is None:
         return None, None
 
     for d in dashboards:
@@ -527,16 +540,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
         try:
             # List mode
             if list_only:
-                result = await client.send_websocket_message(
-                    {"type": "lovelace/dashboards/list"}
-                )
-                if isinstance(result, dict) and "result" in result:
-                    dashboards = result["result"]
-                elif isinstance(result, list):
-                    dashboards = result
-                else:
-                    dashboards = []
-
+                dashboards = await _fetch_dashboards_list(client) or []
                 return {
                     "success": True,
                     "action": "list",
@@ -1158,24 +1162,9 @@ 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:
-                result = await client.send_websocket_message(
-                    {"type": "lovelace/dashboards/list"}
+                existing_dashboards = (
+                    await _fetch_dashboards_list(client) or []
                 )
-                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
             )

{ha_mcp_dev-7.4.1.dev472 → ha_mcp_dev-7.4.1.dev474}/src/ha_mcp/tools/tools_config_scenes.py

@@ -23,6 +23,7 @@ from ..errors import ErrorCode, create_error_response
 from ..utils.config_hash import compute_config_hash
 from ..utils.python_sandbox import (
     PythonSandboxError,
+    format_sandbox_error,
     get_security_documentation,
     safe_execute,
 )
@@ -572,16 +573,12 @@ class ConfigSceneTools:
                 try:
                     transformed_config = safe_execute(python_transform, actual_config)
                 except PythonSandboxError as e:
+                    message, suggestions = format_sandbox_error(e, python_transform)
                     raise_tool_error(
                         create_error_response(
                             ErrorCode.VALIDATION_FAILED,
-                            str(e),
-                            suggestions=[
-                                "Check expression syntax",
-                                "Ensure only allowed operations are used",
-                                "See tool description for allowed operations",
-                                f"Expression: {python_transform[:100]}{'...' if len(python_transform) > 100 else ''}",
-                            ],
+                            message,
+                            suggestions=suggestions,
                             context={
                                 "action": "python_transform",
                                 "scene_id": resolved_id,
@@ -656,9 +653,9 @@ class ConfigSceneTools:
                 # is the in-place equivalent of ``del`` — normalise both
                 # by checking against ``(None, resolved_id)``, so only an
                 # explicit non-None mismatch triggers the reject.
-                if (
-                    "id" in transformed_config
-                    and transformed_config["id"] not in (None, resolved_id)
+                if "id" in transformed_config and transformed_config["id"] not in (
+                    None,
+                    resolved_id,
                 ):
                     raise_tool_error(
                         create_error_response(

{ha_mcp_dev-7.4.1.dev472 → ha_mcp_dev-7.4.1.dev474}/src/ha_mcp/utils/python_sandbox.py

@@ -472,6 +472,17 @@ def format_sandbox_error(
             "See tool description for allowed operations",
             f"Expression: {preview}",
         ]
+        # Agents commonly emit ``\"`` (intending a JSON-style quote escape)
+        # inside transforms. Outside Python string literals this is a
+        # line-continuation token followed by an unexpected character.
+        # Pinpoint the actual mistake so the agent fixes it on the first
+        # retry instead of guessing at "syntax".
+        if "line continuation character" in str(error):
+            suggestions.insert(
+                0,
+                'Remove the leading backslash before quotes — write "foo" '
+                'not \\"foo\\" in the Python source.',
+            )
     if variable_name != "config":
         suggestions = [
             f"Operate on the `{variable_name}` variable (in-place or reassign)",

{ha_mcp_dev-7.4.1.dev472 → ha_mcp_dev-7.4.1.dev474/src/ha_mcp_dev.egg-info}/PKG-INFO

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