ha-mcp-dev 9.0.1.dev3231__tar.gz → 9.0.1.dev3235__tar.gz

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.0.1.dev3231
+Version: 9.0.1.dev3235
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.0.1.dev3231"
+version = "9.0.1.dev3235"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.0.1.dev3231"
+version = "9.0.1.dev3235"
 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-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/backup_dashboards.py

@@ -70,6 +70,7 @@ async def fetch_dashboard(client: Any, entity_id: str) -> Any:
     """
     from ha_mcp._vendor.fastmcp.exceptions import ToolError
 
+    from .tools.dashboard_read_errors import UNKNOWN_CONFIG_PREFIX
     from .tools.tools_config_dashboards import (
         _component_dashboard_config,
         _get_dashboard_config_internal,
@@ -108,7 +109,7 @@ async def fetch_dashboard(client: Any, entity_id: str) -> Any:
             # url_path ("Unknown config specified", also the create path), or
             # a dashboard whose config was never saved, which keeps its row.
             msg = str(err).lower()
-            if "not_found" not in msg and "unknown config" not in msg:
+            if "not_found" not in msg and UNKNOWN_CONFIG_PREFIX.lower() not in msg:
                 raise
             config = None
             if row is None:
@@ -134,10 +135,12 @@ async def _save(client: Any, url_path: str, config: Any) -> Any:
 
 async def _saved(client: Any, url_path: str, config: Any) -> bool:
     """Write; ``False`` when Core has no dashboard at ``url_path``."""
+    from .tools.dashboard_read_errors import CONFIG_NOT_FOUND_CODE
+
     try:
         await _save(client, url_path, config)
     except HomeAssistantCommandError as err:
-        if err.code != "config_not_found":
+        if err.code != CONFIG_NOT_FOUND_CODE:
             raise
         return False
     return True

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/backup_manager.py

@@ -109,6 +109,7 @@ from .client.rest_client import (
     HomeAssistantConnectionError,
     HomeAssistantError,
 )
+from .storage_helper_types import SIMPLE_HELPER_TYPES
 from .utils.data_paths import get_data_dir
 from .utils.registry_update_lock import registry_update_lock
 
@@ -2730,20 +2731,7 @@ async def _restore_device(client: Any, entity_id: str, config: Any) -> Any:
 # endpoints (fetch: backup_helper_target.py). The decorator
 # constructs the domain key as ``helper_<type>`` so files group naturally.
 
-_HELPER_LIST_TYPES = {
-    "input_boolean",
-    "input_text",
-    "input_number",
-    "input_select",
-    "input_datetime",
-    "input_button",
-    "counter",
-    "timer",
-    "schedule",
-    "zone",
-    "person",
-    "tag",
-}
+_HELPER_LIST_TYPES = SIMPLE_HELPER_TYPES
 
 
 async def _restore_helper(

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/dashboard_screenshot/paths.py

@@ -12,13 +12,15 @@ from typing import Any, cast
 from ha_mcp._vendor.fastmcp.exceptions import ToolError
 
 from ..errors import ErrorCode, create_error_response
+from ..tools.dashboard_read_errors import (
+    CONFIG_NOT_FOUND_CODE,
+    NO_STORED_CONFIG_MESSAGES,
+    NO_STORED_CONFIG_NOTE,
+    UNKNOWN_CONFIG_PREFIX,
+)
 from ..tools.helpers import raise_tool_error
 from .capture import _normalize_dashboard_path
 
-_UNKNOWN_CONFIG_PREFIX = "Unknown config specified:"
-_NO_CONFIG_MESSAGES = frozenset(
-    {"No config found.", "Command failed: No config found."}
-)
 _JS_DECIMAL_NUMBER = re.compile(
     r"[+-]?(?:(?:\d+(?:\.\d*)?)|(?:\.\d+))(?:[eE][+-]?\d+)?\Z"
 )
@@ -264,8 +266,14 @@ def _fallback_view_target(
     )
 
 
-async def fetch_dashboard_render_config(client: Any, url_path: str) -> dict[str, Any]:
-    """Fetch a Lovelace dashboard config for stable view-path resolution."""
+async def fetch_dashboard_render_config(
+    client: Any, url_path: str
+) -> dict[str, Any] | None:
+    """Fetch a Lovelace dashboard config for stable view-path resolution.
+
+    ``None`` when Home Assistant holds no config for the dashboard, which the
+    frontend renders as its generated default view.
+    """
     base_path = dashboard_frontend_path(url_path)
     request: dict[str, Any] = {"type": "lovelace/config", "force": True}
     if base_path != "lovelace":
@@ -296,12 +304,13 @@ async def fetch_dashboard_render_config(client: Any, url_path: str) -> dict[str,
         else:
             error_code = ""
             message = str(error)
-        missing_dashboard = (
-            error_code == "config_not_found"
-            or message.startswith(
-                (_UNKNOWN_CONFIG_PREFIX, f"Command failed: {_UNKNOWN_CONFIG_PREFIX}")
+        if message in NO_STORED_CONFIG_MESSAGES:
+            return None
+        missing_dashboard = error_code == CONFIG_NOT_FOUND_CODE or message.startswith(
+            (
+                f"{UNKNOWN_CONFIG_PREFIX}:",
+                f"Command failed: {UNKNOWN_CONFIG_PREFIX}:",
             )
-            or message in _NO_CONFIG_MESSAGES
         )
         if missing_dashboard:
             raise_tool_error(
@@ -502,14 +511,14 @@ async def _resolve_legacy_dashboard_target(
         raw_view = parts[1] if len(parts) > 1 else None
         numeric_index = _numeric_view_index(raw_view) if raw_view is not None else None
         return DashboardRenderTarget(
-            url_path="lovelace",
+            url_path=dashboard_root,
             view_path=None,
             render_path=render_path,
             view_index=numeric_index,
             stable=False,
             warnings=(
-                "Legacy built-in Lovelace routes are accepted without a stored "
-                "dashboard config; the selected view cannot be verified.",
+                "Routes of a dashboard without a stored config are accepted; "
+                "the selected view cannot be verified.",
             ),
         )
     if len(parts) == 1:
@@ -667,6 +676,25 @@ async def resolve_dashboard_render_target(
             ),
         )
     config = await fetch_dashboard_render_config(client, url_path)
+    if config is None:
+        if view_path is not None:
+            raise_tool_error(
+                create_error_response(
+                    ErrorCode.VALIDATION_INVALID_PARAMETER,
+                    NO_STORED_CONFIG_NOTE,
+                    context={"url_path": url_path, "view_path": view_path},
+                    suggestions=["Omit view_path: there are no static views"],
+                )
+            )
+        base_path = dashboard_frontend_path(url_path)
+        return DashboardRenderTarget(
+            url_path=base_path,
+            view_path=None,
+            render_path=base_path,
+            view_index=None,
+            stable=False,
+            warnings=(NO_STORED_CONFIG_NOTE,),
+        )
     return resolve_dashboard_view(url_path, config, view_path)
 
 
@@ -718,7 +746,7 @@ async def _numeric_view_warning(
         return []
     if config is None:
         config = await fetch_dashboard_render_config(client, url_path)
-    views = config.get("views")
+    views = (config or {}).get("views")
     if not isinstance(views, list):
         return []
     view_index = index if matched_view_index is None else matched_view_index

ha_mcp_dev-9.0.1.dev3235/src/ha_mcp/storage_helper_types.py

@@ -0,0 +1,28 @@
+"""The storage-helper types the helper tools manage.
+
+Kept outside ``ha_mcp.tools`` so ``backup_manager`` can import it: importing the
+tools package from there would close the backup_manager -> tools -> auto_backup
+cycle. The component keeps the same list (``helper_collections.py``).
+"""
+
+from typing import Literal, get_args
+
+# Managed via {type}/create and {type}/update WebSocket APIs (not Config Entry
+# Flow). The helper tools' schemas spell them out as an enum. Any other value
+# must be a helper flow type Core lists, checked at call time (``helper_flows``),
+# except config_subentry and ha_config_list_helpers' "all".
+StorageHelperType = Literal[
+    "input_button",
+    "input_boolean",
+    "input_select",
+    "input_number",
+    "input_text",
+    "input_datetime",
+    "counter",
+    "timer",
+    "schedule",
+    "zone",
+    "person",
+    "tag",
+]
+SIMPLE_HELPER_TYPES: frozenset[str] = frozenset(get_args(StorageHelperType))

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/config_helpers/core_payload.py

@@ -10,7 +10,6 @@ module only adds what Core does not do itself.
 from __future__ import annotations
 
 import uuid
-from collections.abc import Collection
 from typing import Any
 
 from ...errors import ErrorCode, create_error_response
@@ -122,44 +121,3 @@ def _reject(helper_type: str, message: str, **context: Any) -> None:
             context=_simple_helper_error_context(helper_type, **context),
         )
     )
-
-
-def check_core_gaps(
-    helper_type: str, body: dict[str, Any], changed: Collection[str] | None = None
-) -> None:
-    """Reject the few unusable configurations Core accepts.
-
-    Core enforces every other rule this tool used to check by hand; these three
-    it stores as given, producing a counter or slider that cannot work. On an
-    update ``changed`` names the caller's fields: a range Core already stores
-    is judged only when one of its bounds or the step is among them, so a
-    rename or an icon change of such a helper is not refused.
-    """
-    if helper_type not in ("counter", "input_number"):
-        return
-    low_key, high_key = _RANGE_KEYS.get(helper_type, _DEFAULT_RANGE_KEYS)
-    if changed is not None and not {low_key, high_key, "step"} & set(changed):
-        return
-    low, high, step = body.get(low_key), body.get(high_key), body.get("step")
-    if helper_type == "counter":
-        if low is not None and high is not None and low >= high:
-            _reject(
-                helper_type,
-                f"counter {low_key} ({low}) must be less than {high_key} ({high}).",
-                **{low_key: low, high_key: high},
-            )
-        if step is not None and step <= 0:
-            _reject(helper_type, f"counter step must be > 0 (got {step}).", step=step)
-    if (
-        step is not None
-        and low is not None
-        and high is not None
-        and 0 < high - low < step
-    ):
-        _reject(
-            helper_type,
-            f"step ({step}) is larger than the range {low_key}..{high_key} "
-            f"({high - low}); the control could not reach any value in between.",
-            step=step,
-            **{low_key: low, high_key: high},
-        )

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/config_helpers/create.py

@@ -15,7 +15,6 @@ from ..config_write_helpers import apply_entity_category
 from ..helpers import raise_tool_error, ws_failure_code
 from ..ws_waiters import wait_for_entity_registered
 from .core_payload import (
-    check_core_gaps,
     with_create_defaults,
 )
 from .icon_route import collection_icon
@@ -35,7 +34,6 @@ def _build_create_message(
     if icon:
         message["icon"] = icon
     message.update(with_create_defaults(helper_type, fields))
-    check_core_gaps(helper_type, message)
     message["type"] = f"{helper_type}/create"  # never a field's
     return message
 

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/config_helpers/schemas.py

@@ -1,8 +1,9 @@
 """Helper type constants, per-type field schemas and the helper response shape."""
 
 from contextvars import ContextVar
-from typing import Any, Literal, TypedDict, get_args
+from typing import Any, TypedDict
 
+from ...storage_helper_types import SIMPLE_HELPER_TYPES, StorageHelperType
 from ..config_write_helpers import attach_skill_content
 
 __all__ = [
@@ -40,26 +41,6 @@ def _attach_helper_skill(response: dict[str, Any], MandatoryBPS: bool) -> None:
     )
 
 
-# Simple helper types — managed via {type}/create and {type}/update WebSocket APIs
-# (not Config Entry Flow). The helper tools' schemas spell them out as an enum.
-# Any other value must be a helper flow type Core lists, checked at call time
-# (``helper_flows``), except config_subentry and ha_config_list_helpers' "all".
-StorageHelperType = Literal[
-    "input_button",
-    "input_boolean",
-    "input_select",
-    "input_number",
-    "input_text",
-    "input_datetime",
-    "counter",
-    "timer",
-    "schedule",
-    "zone",
-    "person",
-    "tag",
-]
-SIMPLE_HELPER_TYPES: frozenset[str] = frozenset(get_args(StorageHelperType))
-
 # Stateful HA input helpers skip last-state restore when `initial` is stored in config
 # (including false/0). See input_boolean/input_number async_added_to_hass in HA core.
 _INITIAL_DISABLES_RESTORE_DESCRIPTION = (
@@ -197,9 +178,7 @@ SIMPLE_HELPER_SCHEMAS: dict[str, list[_HelperFieldSpec]] = {
             "name": "step",
             "required": False,
             "selector": {"number": {}},
-            "description": (
-                "Step/increment. Must be > 0 and ≤ (max-min). Default 1.0."
-            ),
+            "description": "Step/increment. Must be > 0. Default 1.0.",
         },
         {
             "name": "unit_of_measurement",
@@ -329,7 +308,7 @@ SIMPLE_HELPER_SCHEMAS: dict[str, list[_HelperFieldSpec]] = {
             "name": "step",
             "required": False,
             "selector": {"number": {}},
-            "description": "Increment. Must be > 0. Default 1.",
+            "description": "Whole-number increment, 0 or more. Default 1.",
         },
         {
             "name": "restore",
@@ -350,10 +329,7 @@ SIMPLE_HELPER_SCHEMAS: dict[str, list[_HelperFieldSpec]] = {
             "name": "duration",
             "required": False,
             "selector": {"text": {}},
-            "description": (
-                "Default duration as 'HH:MM:SS' or seconds. Default '00:00:00' "
-                "(timer must be started with explicit duration)."
-            ),
+            "description": "Default duration as 'HH:MM:SS' or seconds. Default '00:00:00'.",
         },
         {
             "name": "restore",
@@ -374,10 +350,7 @@ SIMPLE_HELPER_SCHEMAS: dict[str, list[_HelperFieldSpec]] = {
             "name": "monday",
             "required": False,
             "selector": {"object": {"multiple": True}},
-            "description": (
-                "List of {'from': 'HH:MM', 'to': 'HH:MM'} time ranges. At least "
-                "one day across monday–sunday must contain a non-empty range."
-            ),
+            "description": "List of {'from': 'HH:MM', 'to': 'HH:MM'} time ranges.",
         },
         {
             "name": "tuesday",

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/config_helpers/update.py

@@ -21,7 +21,7 @@ from ..component_helper_collections import (
 from ..config_write_helpers import apply_entity_category
 from ..helpers import raise_tool_error, ws_failure_code
 from ..ws_waiters import wait_for_entity_registered
-from .core_payload import check_core_gaps, merged_update
+from .core_payload import merged_update
 from .icon_route import collection_icon
 from .listing import listed_items
 from .registry import _ws_error_msg
@@ -74,7 +74,6 @@ async def _execute_legacy_update(
     stored = await _stored_item(client, helper_type, entity_id, unique_id)
     item_icon = await collection_icon(client, helper_type, "update", icon)
     body = merged_update(helper_type, stored, name, item_icon, fields, entity_id)
-    check_core_gaps(helper_type, body, changed=fields)
     result = await client.send_websocket_message(
         {**body, "type": f"{helper_type}/update", f"{helper_type}_id": unique_id}
     )
@@ -235,6 +234,16 @@ async def _execute_update_simple_helper(
                 context=_simple_helper_error_context(helper_type),
             )
         )
+    # As create does: Core's zone schema stores a blank name, which the zone
+    # and person dialogs refuse.
+    if name is not None and not name.strip():
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                "name cannot be blank. Omit it to keep the current name.",
+                context=_simple_helper_error_context(helper_type),
+            )
+        )
 
     warnings: list[str] = []
     native = await _update_via_component(
@@ -346,7 +355,6 @@ async def _update_via_component(
     entity_id = item.get("entity_id") or helper_id
     item_icon = await collection_icon(client, helper_type, "update", icon)
     body = merged_update(helper_type, item["item"], name, item_icon, fields, entity_id)
-    check_core_gaps(helper_type, body, changed=fields)
     registry = {
         key: value
         for key, value in (

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/dashboard_edit_errors.py

@@ -8,6 +8,7 @@ from typing import Any, NoReturn
 from ha_mcp._vendor.fastmcp.exceptions import ToolError
 
 from ..errors import ErrorCode, create_error_response, get_error_code, get_error_message
+from .dashboard_read_errors import CONFIG_NOT_FOUND_CODE
 from .helpers import extract_tool_error_message, raise_tool_error
 
 _MODE_SUGGESTIONS = [
@@ -115,7 +116,7 @@ def raise_dashboard_edit_fetch_error(
         data = None
     reason = (
         "not_found"
-        if isinstance(data, dict) and data.get("ha_error_code") == "config_not_found"
+        if isinstance(data, dict) and data.get("ha_error_code") == CONFIG_NOT_FOUND_CODE
         else "load_failed"
     )
     raise_dashboard_edit_error(
@@ -137,7 +138,7 @@ def raise_known_dashboard_save_rejection(
     message = get_error_message(response) or "Dashboard save rejected"
     if code in {"unauthorized", "invalid_format"}:
         raise_dashboard_edit_error(url_path, code, message, False, action)
-    if code == "config_not_found":
+    if code == CONFIG_NOT_FOUND_CODE:
         raise_dashboard_edit_error(url_path, "not_found", message, False, action)
     if code == "error" and message.removeprefix("Command failed: ") == "Not supported":
         raise_dashboard_edit_error(

ha_mcp_dev-9.0.1.dev3235/src/ha_mcp/tools/dashboard_read_errors.py

@@ -0,0 +1,123 @@
+"""What a failed dashboard read or lookup means.
+
+Core answers ``config_not_found`` for two causes
+(``homeassistant/components/lovelace/websocket.py``, ``_handle_errors``): an
+identifier it does not know ("Unknown config specified: <url_path>") and a
+dashboard it holds but has no config for ("No config found."), which the
+frontend shows as its generated default view. The second comes from Core's
+``ConfigNotFound`` (``lovelace/dashboard.py``): a storage dashboard with nothing
+saved, a YAML dashboard whose file is missing, or any storage dashboard in
+recovery mode. The code alone cannot tell the causes apart, so the message does.
+If HA rewords either string, the lazy resolve stops firing and an empty
+dashboard reads as a failure; re-verify them on major HA upgrades.
+"""
+
+from __future__ import annotations
+
+import json
+from typing import Any, NoReturn
+
+from ha_mcp._vendor.fastmcp.exceptions import ToolError
+
+from ..errors import ErrorCode, create_error_response
+from .helpers import extract_tool_error_message, raise_tool_error
+
+UNKNOWN_CONFIG_PREFIX = "Unknown config specified"
+# Bare (nested error shape) and with the "Command failed: " prefix that
+# ``send_websocket_message``'s flat envelope adds. Matched exactly, unlike the
+# unknown-identifier substring, so any other read failure stays a failure.
+NO_STORED_CONFIG_MESSAGES = frozenset(
+    {"No config found.", "Command failed: No config found."}
+)
+CONFIG_NOT_FOUND_CODE = "config_not_found"
+DASHBOARD_FETCH_FAILED_PREFIX = "Dashboard fetch failed: "
+
+NO_STORED_CONFIG_NOTE = (
+    "Home Assistant has no config for this dashboard (a storage dashboard with "
+    "nothing saved yet, a YAML dashboard whose file is missing, or recovery "
+    "mode), so the frontend shows its generated default view."
+)
+
+
+def is_unknown_dashboard(error_msg: str) -> bool:
+    """Whether Core rejected the identifier itself (the lazy-resolve trigger)."""
+    return UNKNOWN_CONFIG_PREFIX in error_msg
+
+
+def is_no_stored_config_error(exc: ToolError) -> bool:
+    """Whether ``_get_dashboard_config_internal``'s ToolError means no config."""
+    try:
+        error_data = json.loads(str(exc))
+    except (json.JSONDecodeError, TypeError):
+        return False
+    if (
+        not isinstance(error_data, dict)
+        or error_data.get("ha_error_code") != CONFIG_NOT_FOUND_CODE
+    ):
+        return False
+    message = extract_tool_error_message(exc).removeprefix(
+        DASHBOARD_FETCH_FAILED_PREFIX
+    )
+    return message in NO_STORED_CONFIG_MESSAGES
+
+
+def read_failure_code(error_msg: str) -> ErrorCode:
+    """RESOURCE_NOT_FOUND when Core names the identifier unknown (call after the
+    lazy resolve); otherwise SERVICE_CALL_FAILED."""
+    if is_unknown_dashboard(error_msg):
+        return ErrorCode.RESOURCE_NOT_FOUND
+    return ErrorCode.SERVICE_CALL_FAILED
+
+
+def raise_registry_read_error(*, action: str, url_path: str) -> NoReturn:
+    """Raise the shared user-facing error for an unreadable dashboard registry."""
+    raise_tool_error(
+        create_error_response(
+            ErrorCode.SERVICE_CALL_FAILED,
+            "Failed to read the Home Assistant dashboard registry",
+            suggestions=[
+                "Retry the operation",
+                "Check the Home Assistant connection and logs",
+                "Use ha_config_get_dashboard(list_only=True) to verify registry access",
+            ],
+            context={"action": action, "url_path": url_path},
+        )
+    )
+
+
+DASHBOARD_LIST_SUGGESTION = (
+    "Use ha_config_get_dashboard(list_only=True) to see available dashboards"
+)
+
+
+def raise_unresolved_delete(
+    url_path: str, dashboards: list[dict[str, Any]]
+) -> NoReturn:
+    """Raise the delete error for an identifier with no collection item."""
+    # YAML rows carry no collection id, so ``_resolve_dashboard`` skips them.
+    if any(
+        d.get("url_path") == url_path and d.get("mode") == "yaml" for d in dashboards
+    ):
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                f"Dashboard '{url_path}' is a YAML-mode dashboard",
+                details="It is defined in configuration.yaml; the "
+                "Home Assistant API cannot delete it.",
+                context={"action": "delete", "url_path": url_path},
+            )
+        )
+    available_ids = [d.get("url_path") for d in dashboards[:10] if d.get("url_path")]
+    raise_tool_error(
+        create_error_response(
+            ErrorCode.RESOURCE_NOT_FOUND,
+            f"Dashboard '{url_path}' not found",
+            details=f"No dashboard found with URL path or internal ID '{url_path}'.",
+            suggestions=[DASHBOARD_LIST_SUGGESTION],
+            context={
+                "action": "delete",
+                "url_path": url_path,
+                "available_dashboard_ids": available_ids,
+            },
+        )
+    )

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/entity_removal.py

@@ -9,9 +9,11 @@ item, so it gets no note.
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from typing import Any
 
-from ..client.rest_client import HomeAssistantError
+from ..client.rest_client import HomeAssistantConnectionError, HomeAssistantError
+from ..errors import ErrorCode
 from .config_helpers.listing import listed_items
 from .config_helpers.schemas import SIMPLE_HELPER_TYPES
 
@@ -73,3 +75,52 @@ async def remove_registry_entry(
         {"type": "config/entity_registry/remove", "entity_id": entity_id}
     )
     return result, notes
+
+
+async def remove_registry_entries(
+    client: Any, entity_ids: list[str], error_text: Callable[[dict[str, Any]], str]
+) -> dict[str, Any]:
+    """Remove each id in turn; each lands in ``removed``, ``skipped`` (Core's
+    not_found: already absent) or ``errors``. A lost connection stops the run
+    and lists the ids it never reached, which are safe to retry."""
+    removed: list[str] = []
+    skipped: list[str] = []
+    errors: list[dict[str, str]] = []
+    not_attempted: list[str] = []
+    for index, eid in enumerate(entity_ids):
+        try:
+            result = await client.send_websocket_message(
+                {"type": "config/entity_registry/remove", "entity_id": eid}
+            )
+        except HomeAssistantConnectionError as exc:
+            errors.append(
+                {
+                    "entity_id": eid,
+                    "code": ErrorCode.CONNECTION_FAILED.value,
+                    "message": str(exc),
+                }
+            )
+            not_attempted = list(entity_ids[index + 1 :])
+            break
+        if result.get("success"):
+            removed.append(eid)
+        elif result.get("error_code") == "not_found":
+            skipped.append(eid)
+        else:
+            errors.append(
+                {
+                    "entity_id": eid,
+                    "code": ErrorCode.SERVICE_CALL_FAILED.value,
+                    "message": error_text(result),
+                }
+            )
+    response: dict[str, Any] = {
+        "success": not errors,
+        "total": len(entity_ids),
+        "removed": removed,
+        "skipped": skipped,
+        "errors": errors,
+    }
+    if not_attempted:
+        response["not_attempted"] = not_attempted
+    return response

{ha_mcp_dev-9.0.1.dev3231 → ha_mcp_dev-9.0.1.dev3235}/src/ha_mcp/tools/smart_search/_deep.py

@@ -11,6 +11,7 @@ from ha_mcp._vendor.fastmcp.exceptions import ToolError
 from ...client.rest_client import NON_ADMIN_TOKEN_WARNING, HomeAssistantAPIError
 from ...errors import get_error_code, get_error_message
 from ..component_api import component_supports, get_component_caps
+from ..dashboard_read_errors import CONFIG_NOT_FOUND_CODE, NO_STORED_CONFIG_MESSAGES
 from ..helper_flows import helper_flow_types
 from ..helpers import exception_to_structured_error, safe_progress
 from ..tools_config_dashboards import (
@@ -66,14 +67,6 @@ async def _scrub_results_for_enforce(
             results[category] = scrub_records(items, enforce_regex)
 
 
-# The ``lovelace/config`` messages meaning "this dashboard has no stored
-# config" — bare (nested error shape) and as ``send_websocket_message``'s
-# flat envelope prefixes it. Mirrors ``dashboard_screenshot/paths.py``.
-_NO_STORED_CONFIG_MESSAGES = frozenset(
-    {"No config found.", "Command failed: No config found."}
-)
-
-
 def _is_no_stored_config(resp: dict[str, Any]) -> bool:
     """True when a failed ``lovelace/config`` envelope means the dashboard
     has no stored config — an auto-generated dashboard that was never taken
@@ -95,9 +88,9 @@ def _is_no_stored_config(resp: dict[str, Any]) -> bool:
     same HA error.
     """
     code = resp.get("error_code") or get_error_code(resp)
-    if code != "config_not_found":
+    if code != CONFIG_NOT_FOUND_CODE:
         return False
-    return get_error_message(resp) in _NO_STORED_CONFIG_MESSAGES
+    return get_error_message(resp) in NO_STORED_CONFIG_MESSAGES
 
 
 async def _phase_finished(