ha-mcp-dev 8.5.0.dev2768__tar.gz → 8.5.0.dev2770__tar.gz

{ha_mcp_dev-8.5.0.dev2768/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.5.0.dev2770}/PKG-INFO

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

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

@@ -21,7 +21,7 @@ from typing import Any
 from ..errors import ErrorCode, create_error_response
 from ..redaction import carries_sentinel
 from .config_entry_flow_menu import _MENU_SELECTION_KEY_ORDER
-from .helpers import raise_tool_error
+from .helpers import raise_tool_error, reject_malformed_list_fields
 
 # Membership form of the canonical selection-key order — defined here, in the
 # module that checks membership on every form field, and imported onward by
@@ -645,6 +645,11 @@ def _consume_leaf_field(
     """
     if name in remaining_config:
         value = remaining_config.pop(name)
+        # ActionSelector stores values unvalidated; template platforms then fail setup.
+        if "action" in (field.get("selector") or {}):
+            reject_malformed_list_fields(
+                {name: value}, (name,), {"field": _section_path(path_prefix, name)}
+            )
         clearing = keep_current_values and value is None and _clears_by_omission(field)
         form_data[name] = _CLEARED if clearing else value
         _mark_consumed(consumed_config_keys, path_prefix, name)

ha_mcp_dev-8.5.0.dev2770/src/ha_mcp/tools/dashboard_list_checks.py

@@ -0,0 +1,145 @@
+"""List-shape checks for Lovelace dashboard configs and JSON Patch edits (issue #2548).
+
+Covers only the positions the frontend types as arrays: ``views``, view
+``cards`` / ``sections`` / ``badges``, section ``cards``, and the ``cards`` of
+core stack cards (also inside core wrapper cards).
+"""
+
+import re
+from typing import Any, Literal
+
+from .helpers import reject_malformed_list_fields
+from .util_helpers import loads_if_json_container_str
+
+# Core stack cards; custom cards may give ``cards`` any shape, so they are skipped.
+_STACK_CARD_TYPES = frozenset({"vertical-stack", "horizontal-stack", "grid"})
+# Core cards that wrap one card under ``card``.
+_CARD_WRAPPER_TYPES = frozenset({"conditional", "entity-filter"})
+
+
+def _items(value: Any) -> list[Any]:
+    return value if isinstance(value, list) else []
+
+
+def _collect_card_lists(card: Any, path: str, fields: dict[str, Any]) -> None:
+    if not isinstance(card, dict):
+        return
+    if card.get("type") in _CARD_WRAPPER_TYPES:
+        _collect_card_lists(card.get("card"), f"{path}.card", fields)
+    elif card.get("type") in _STACK_CARD_TYPES:
+        fields[f"{path}.cards"] = card.get("cards")
+        for i, child in enumerate(_items(card.get("cards"))):
+            _collect_card_lists(child, f"{path}.cards[{i}]", fields)
+
+
+def _collect_section_lists(section: Any, path: str, fields: dict[str, Any]) -> None:
+    if isinstance(section, dict):
+        fields[f"{path}.cards"] = section.get("cards")
+        for i, card in enumerate(_items(section.get("cards"))):
+            _collect_card_lists(card, f"{path}.cards[{i}]", fields)
+
+
+def _collect_view_lists(view: Any, path: str, fields: dict[str, Any]) -> None:
+    if not isinstance(view, dict):
+        return
+    for key in ("cards", "sections", "badges"):
+        fields[f"{path}.{key}"] = view.get(key)
+    for i, card in enumerate(_items(view.get("cards"))):
+        _collect_card_lists(card, f"{path}.cards[{i}]", fields)
+    for i, section in enumerate(_items(view.get("sections"))):
+        _collect_section_lists(section, f"{path}.sections[{i}]", fields)
+
+
+_LIST_ITEM_COLLECTORS = {
+    "views": _collect_view_lists,
+    "sections": _collect_section_lists,
+    "cards": _collect_card_lists,
+}
+
+
+def reject_malformed_dashboard_lists(
+    config: dict[str, Any],
+    url_path: str,
+    *,
+    source: Literal["config", "patch", "python_transform"] = "config",
+) -> None:
+    """Check the list positions the frontend types as arrays (issue #2548).
+
+    Home Assistant saves any value here, and the frontend calls ``.map`` on it.
+    """
+    views = config.get("views")
+    fields: dict[str, Any] = {"views": views}
+    for i, view in enumerate(_items(views)):
+        _collect_view_lists(view, f"views[{i}]", fields)
+    reject_malformed_list_fields(
+        fields, tuple(fields), {"url_path": url_path}, source=source
+    )
+
+
+def reject_malformed_dashboard_config(config: Any, url_path: str) -> None:
+    """Check a replacement config, whether it arrived as a dict or a JSON string."""
+    try:
+        parsed = loads_if_json_container_str(config)
+    except ValueError:
+        return  # Malformed JSON is reported by the tool's own config parse.
+    if isinstance(parsed, dict):
+        reject_malformed_dashboard_lists(parsed, url_path)
+
+
+# JSON Patch paths whose value has a known dashboard shape: a typed list, or one item of it.
+_PATCH_LIST_PATH = re.compile(
+    r"/(views)|/views/\d+/(cards|sections|badges)|/views/\d+/sections/\d+/(cards)"
+)
+# Paths inside a card: whether ``cards`` there is a core list depends on the card type.
+_PATCH_INSIDE_CARD_PATH = re.compile(r"/views/\d+/(?:sections/\d+/)?cards/\d+/.+")
+_PATCH_ITEM_PATH = re.compile(
+    r"/(views)/(?:\d+|-)|/views/\d+/(sections)/(?:\d+|-)"
+    r"|/views/\d+/(?:sections/\d+/)?(cards)/(?:\d+|-)"
+)
+
+
+def patch_writes_inside_card(patch: list[dict[str, Any]]) -> bool:
+    """Whether an add/replace inside a card could carry a list field.
+
+    Such ops need the stored config: only the parent card's type says whether
+    ``cards`` there is a core list. Scalar edits (an icon, a name) never do.
+    """
+    return any(
+        isinstance(op, dict)
+        and op.get("op") in ("add", "replace")
+        and _PATCH_INSIDE_CARD_PATH.fullmatch(path := str(op.get("path", "")))
+        and (
+            isinstance(op.get("value"), (dict, list))
+            or path.rsplit("/", 1)[-1] == "cards"
+        )
+        for op in patch
+    )
+
+
+def reject_malformed_dashboard_patch(
+    patch: list[dict[str, Any]], url_path: str
+) -> None:
+    """Apply the list check to add/replace values before the patch is applied."""
+    fields: dict[str, Any] = {}
+    for n, op in enumerate(patch):
+        if not isinstance(op, dict) or op.get("op") not in ("add", "replace"):
+            continue
+        path, value = str(op.get("path", "")), op.get("value")
+        label = f"patch[{n}].value ({path})"
+        if path == "" and isinstance(value, dict):
+            fields[f"{label}.views"] = value.get("views")
+            for i, view in enumerate(_items(value.get("views"))):
+                _collect_view_lists(view, f"{label}.views[{i}]", fields)
+        elif match := _PATCH_LIST_PATH.fullmatch(path):
+            kind = next(k for k in match.groups() if k)
+            fields[label] = value
+            collect = _LIST_ITEM_COLLECTORS.get(kind)
+            if collect is not None:
+                for i, item in enumerate(_items(value)):
+                    collect(item, f"{label}[{i}]", fields)
+        elif match := _PATCH_ITEM_PATH.fullmatch(path):
+            kind = next(k for k in match.groups() if k)
+            _LIST_ITEM_COLLECTORS[kind](value, label, fields)
+    reject_malformed_list_fields(
+        fields, tuple(fields), {"url_path": url_path, "action": "patch"}, source="patch"
+    )

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp/tools/helpers.py

@@ -68,8 +68,8 @@ def raise_tool_error(error_response: dict[str, Any]) -> NoReturn:
     )
 
 
-def extract_tool_error_message(te: ToolError) -> str:
-    """Extract a human-readable error message from a ToolError.
+def extract_tool_error_message(te: ToolError | str) -> str:
+    """Extract a human-readable error message from a ToolError or its logged text.
 
     Pairs with raise_tool_error() which serializes error dicts as JSON.
     Falls back to str(te) if the message is not valid JSON.
@@ -117,6 +117,53 @@ def extract_structured_error_reason(exc: BaseException) -> str | None:
     return message
 
 
+def reject_malformed_list_fields(
+    config: dict[str, Any],
+    list_keys: tuple[str, ...],
+    context: dict[str, Any],
+    *,
+    source: Literal["config", "patch", "python_transform"] = "config",
+) -> None:
+    """Reject list fields received as ``{"item": ...}`` or ``""`` (issue #2548).
+
+    Home Assistant either rejects these shapes with an error that does not name
+    them, or stores them and fails later, so the caller cannot tell what to fix.
+    """
+    received = {
+        k: '{"item": ...}' if isinstance(v, dict) and list(v) == ["item"] else '""'
+        for k in list_keys
+        if (v := config.get(k)) == "" or (isinstance(v, dict) and list(v) == ["item"])
+    }
+    if not received:
+        return
+    names = ", ".join(f"'{k}'" for k in received)
+    shapes = "; ".join(f"'{k}' as {shape}" for k, shape in received.items())
+    first = next(iter(received))
+    example = "[{...}, {...}]"
+    if re.fullmatch(r"\w+", first):
+        example = f'"{first}": {example}'
+    if source == "python_transform":
+        message = f"python_transform produced {shapes} instead of a list"
+        suggestions = [f"Assign {names} a list, e.g. {example}, or delete an empty one"]
+    else:
+        noun = "config" if source == "config" else "patch value"
+        message = f"Received {noun} {shapes} instead of a JSON array"
+        suggestions = [
+            f"Send {names} as a JSON array, e.g. {example}, or omit an empty one",
+            f"If it still arrives malformed, pass the whole {source} as one "
+            + "JSON-encoded string instead",
+            "If neither works, check the model or MCP client in use",
+        ]
+    raise_tool_error(
+        create_error_response(
+            ErrorCode.VALIDATION_INVALID_PARAMETER,
+            f"{message}; nothing was saved in Home Assistant",
+            suggestions=suggestions,
+            context={**context, "malformed_list_fields": received},
+        )
+    )
+
+
 def validate_identifier_not_empty(
     value: str | None,
     param_name: str,

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp/tools/tools_bug_report.py

@@ -38,7 +38,12 @@ from ..utils.usage_logger import (
     get_startup_logs,
 )
 from .component_api import get_component_caps
-from .helpers import log_tool_usage, raise_tool_error, register_tool_methods
+from .helpers import (
+    extract_tool_error_message,
+    log_tool_usage,
+    raise_tool_error,
+    register_tool_methods,
+)
 from .util_helpers import (
     ANSI_ESCAPE_RE,
     JSON_STRING_COERCION,
@@ -1413,7 +1418,10 @@ def _generate_bug_title(
         error_msg = log.get("error_message")
         if error_msg:
             tool_name = log.get("tool_name", "unknown")
-            title = f"{tool_name}: {error_msg}"
+            message = " ".join(
+                _sanitize_log_text(extract_tool_error_message(error_msg)).split()
+            )
+            title = f"{tool_name}: {message}"
             break
 
     if not title:

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp/tools/tools_config_automations.py

@@ -50,6 +50,7 @@ from .helpers import (
     log_tool_usage,
     raise_tool_error,
     register_tool_methods,
+    reject_malformed_list_fields,
     validate_identifier_not_empty,
 )
 from .reference_validator import validate_config_references
@@ -1371,6 +1372,12 @@ class AutomationConfigTools:
                 )
             )
 
+        reject_malformed_list_fields(
+            transformed_config,
+            ("triggers", "trigger", "conditions", "condition", "actions", "action"),
+            {"action": "python_transform", "identifier": identifier},
+            source="python_transform",
+        )
         # Pop category before sending to HA REST API (rejects unknown keys)
         _reject_enabled_in_config(transformed_config)
         transform_category = transformed_config.pop("category", None)
@@ -1770,6 +1777,11 @@ class AutomationConfigTools:
                     details=f"Received type: {type(parsed_config).__name__}",
                 )
             )
+        reject_malformed_list_fields(
+            parsed_config,
+            ("triggers", "trigger", "conditions", "condition", "actions", "action"),
+            {"parameter": "config"},
+        )
 
         return cast(dict[str, Any], parsed_config)
 

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -66,6 +66,12 @@ from .dashboard_edit_errors import (
     raise_dashboard_edit_fetch_error,
     raise_known_dashboard_save_rejection,
 )
+from .dashboard_list_checks import (
+    patch_writes_inside_card,
+    reject_malformed_dashboard_config,
+    reject_malformed_dashboard_lists,
+    reject_malformed_dashboard_patch,
+)
 from .helpers import (
     exception_to_structured_error,
     extract_tool_error_message,
@@ -3149,6 +3155,9 @@ class DashboardConfigTools:
             replacement_config=transformed_config,
             action="python_transform",
         )
+        reject_malformed_dashboard_lists(
+            transformed_config, url_path, source="python_transform"
+        )
         return transformed_config
 
     async def _save_dashboard_python_transform(
@@ -3261,6 +3270,17 @@ class DashboardConfigTools:
             "warnings": [warning] if warning else [],
         }
 
+    async def _reject_malformed_patched_dashboard(
+        self, url_path: str, patch: list[dict[str, Any]]
+    ) -> None:
+        """Check the patched config when an edit lands inside a card."""
+        current, _ = await _get_dashboard_config_internal(self._client, url_path)
+        try:
+            candidate = apply_dashboard_patch(current, patch)
+        except ValueError:
+            return  # An unapplicable patch is rejected by the edit itself.
+        reject_malformed_dashboard_lists(candidate, url_path, source="patch")
+
     async def _run_dashboard_patch(
         self,
         url_path: str,
@@ -3294,6 +3314,9 @@ class DashboardConfigTools:
                     context={"action": "patch", "url_path": url_path},
                 )
             )
+        reject_malformed_dashboard_patch(parsed_patch, url_path)
+        if patch_writes_inside_card(parsed_patch):
+            await self._reject_malformed_patched_dashboard(url_path, parsed_patch)
         result = await edit_dashboard_via_component(
             self._client,
             url_path,
@@ -3853,6 +3876,7 @@ class DashboardConfigTools:
         MandatoryBPS: bool,
     ) -> "dict[str, Any] | ToolResult":
         """Execute config-replacement mode (create-or-update) and return the tool response."""
+        reject_malformed_dashboard_config(config, url_path)
         (
             dashboard_exists,
             dashboard_id,

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp/tools/tools_config_scripts.py

@@ -45,6 +45,7 @@ from .helpers import (
     log_tool_usage,
     raise_tool_error,
     register_tool_methods,
+    reject_malformed_list_fields,
     validate_identifier_not_empty,
 )
 from .reference_validator import validate_config_references
@@ -444,6 +445,9 @@ class ConfigScriptTools:
             )
 
         config_dict = cast(dict[str, Any], parsed_config)
+        reject_malformed_list_fields(
+            config_dict, ("sequence",), {"script_id": script_id}
+        )
 
         # Extract category before sending to HA REST API (which rejects unknown keys).
         # Parameter takes precedence over config dict value.
@@ -921,6 +925,12 @@ class ConfigScriptTools:
                 )
             )
 
+        reject_malformed_list_fields(
+            transformed_config,
+            ("sequence",),
+            {"action": "python_transform", "script_id": script_id},
+            source="python_transform",
+        )
         # Validate transformed config
         if (
             "sequence" not in transformed_config

{ha_mcp_dev-8.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.5.0.dev2768
+Version: 8.5.0.dev2770
 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.5.0.dev2768 → ha_mcp_dev-8.5.0.dev2770}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -621,6 +621,7 @@ src/ha_mcp/tools/config_entry_identity.py
 src/ha_mcp/tools/config_entry_reconfigure.py
 src/ha_mcp/tools/config_entry_reload_watch.py
 src/ha_mcp/tools/dashboard_edit_errors.py
+src/ha_mcp/tools/dashboard_list_checks.py
 src/ha_mcp/tools/device_control.py
 src/ha_mcp/tools/entity_registration.py
 src/ha_mcp/tools/error_log_parsing.py