ha-mcp-dev 9.3.0.dev3501__tar.gz → 9.3.0.dev3505__tar.gz

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.3.0.dev3501
+Version: 9.3.0.dev3505
 Summary: Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants.
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.3.0.dev3501"
+version = "9.3.0.dev3505"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 requires-python = ">=3.14,<3.15"
@@ -174,7 +174,6 @@ module = [
     "tests.src.unit.test_component_helper_collections",
     "tests.src.unit.test_component_helpers_list",
     "tests.src.unit.test_component_oauth_callbacks_ws",
-    "tests.src.unit.test_component_readapi_contract",
     "tests.src.unit.test_component_search_locations",
     "tests.src.unit.test_component_template_diagnose",
     "tests.src.unit.test_component_ws_phase2_async",

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.3.0.dev3501"
+version = "9.3.0.dev3505"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's
@@ -233,7 +233,6 @@ module = [
     "tests.src.unit.test_component_helper_collections",
     "tests.src.unit.test_component_helpers_list",
     "tests.src.unit.test_component_oauth_callbacks_ws",
-    "tests.src.unit.test_component_readapi_contract",
     "tests.src.unit.test_component_search_locations",
     "tests.src.unit.test_component_template_diagnose",
     "tests.src.unit.test_component_ws_phase2_async",

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/src/ha_mcp/settings_ui/locales/README.md

@@ -80,21 +80,21 @@ or constructed — needs no pipeline change.
   rejected when the catalog loads.
 - `messages`: interface labels, help text, notices, and runtime messages. Keys
   may be omitted — English is the per-key fallback at runtime — but see the
-  share limit below before leaving a catalog half-finished. Omitting is the
-  only way to say "not translated yet": a key that is present but blank is
-  rejected when the catalog loads, because the runtime resolves by key
-  presence, so an empty value would win over English and render as nothing.
+  share limit below before leaving a catalog half-finished. A key that is
+  present but blank is rejected when the catalog loads, because the runtime
+  resolves by key presence, so an empty value would win over English and render as nothing.
 - `tool_groups`: one entry per renderable MCP tool tag, keyed by the English
-  tag. Not optional, and exact: no key more and none fewer. Blank is rejected
-  here too, but dropping the key is not the escape hatch it is for `messages` —
-  the exact key set forbids that. A heading you have not translated yet keeps
-  the English tag as its value.
+  tag. Blank is rejected here too.
 - `tools`: `title` and `description` per tool, keyed by the stable MCP tool
-  name. The key set is not optional and exact in the same way; either field on
-  its own may be left out, but a missing one counts as untranslated against the
+  name. Either field on its own may be left out, but a missing one counts
+  as untranslated against the
   share limit below. Blank is rejected here too, for the same reason.
 
-Keep the keys and `{placeholders}` unchanged in every section.
+Keep the keys and `{placeholders}` unchanged in every section. Omitting is
+the only way to say "not translated yet": the sync fills missing keys and
+retranslates a present value only when its English changes. A new catalog
+may omit `tool_groups` or `tools`, or leave out entries it has not translated;
+the exact key sets are checked after the sync, not in PR CI.
 
 `messages` values carry two further rules, both enforced when the catalog
 loads rather than by a named test — breaking one raises a `ValueError` at
@@ -114,10 +114,6 @@ In PR CI (ungated — `tests/src/unit/test_locale_parity.py` unless another file
 is named):
 
 - Every surface carries the same set of language codes.
-- Settings UI `messages` may omit keys because English is the per-key
-  fallback, but a locale may not carry a key absent from `en.json`: nothing
-  can render it. `tool_groups` and `tools` must instead match the renderable
-  keys exactly.
 - Every decided `Decision` outcome (all but `pending`) and every
   `PredicateOp` operator has a word in every catalog, non-blank — and in every
   catalog but `en.json` not still spelled the way the backend does
@@ -156,6 +152,8 @@ In the post-merge `locale-sync.yml` workflow only (the same files, gated behind
 `LOCALE_COMPLETENESS_CHECKS=1` — a PR that changes English merges without
 these, and the daily sync owes them afterwards):
 
+- Settings UI `messages` may not carry a key absent from `en.json`: nothing
+  can render it.
 - `tool_groups` and `tools` name exactly the renderable groups and tools.
   The check parses the registered tool set from source rather than trusting
   generated `tools.json`, so a broken generator cannot validate its own stale

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/src/ha_mcp/tools/dashboard_edit_errors.py

@@ -11,6 +11,7 @@ from ..client.rest_client import HomeAssistantAuthError
 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 (
+    core_error_message,
     exception_to_structured_error,
     extract_tool_error_message,
     raise_tool_error,
@@ -168,7 +169,7 @@ def raise_known_dashboard_save_rejection(
         raise_dashboard_edit_error(url_path, code, message, False, action)
     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":
+    if code == "error" and core_error_message(message) == "Not supported":
         raise_dashboard_edit_error(
             url_path,
             "unsupported_mode",
@@ -178,8 +179,7 @@ def raise_known_dashboard_save_rejection(
         )
     if (
         code == "error"
-        and message.removeprefix("Command failed: ")
-        == "Saving not supported in recovery mode"
+        and core_error_message(message) == "Saving not supported in recovery mode"
     ):
         # LovelaceStorage checks recovery mode before changing its live config.
         raise_dashboard_edit_error(url_path, "recovery_mode", message, False, action)

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/src/ha_mcp/tools/device_enrichment.py

@@ -4,6 +4,7 @@ import logging
 from typing import Any
 
 from ..client.rest_client import HomeAssistantAPIError, HomeAssistantConnectionError
+from .helpers import core_error_message
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +32,7 @@ async def enrich_zha_metrics(
                 }
         else:
             warnings.append(
-                f"ZHA radio metrics unavailable: {zha_result.get('error') or 'request failed'}"
+                f"ZHA radio metrics unavailable: {core_error_message(zha_result.get('error') or 'request failed')}"
             )
     except (
         HomeAssistantConnectionError,
@@ -41,7 +42,7 @@ async def enrich_zha_metrics(
     ) as e:
         logger.warning(
             "Could not fetch ZHA radio metrics for device %s: %s",
-            device_info.get("device_id"),
+            device_info.get("id"),
             e,
         )
         warnings.append(f"ZHA radio metrics unavailable: {e}")
@@ -72,7 +73,7 @@ async def enrich_zwave_status(
             }
         else:
             warnings.append(
-                f"Z-Wave node status unavailable: {zwave_result.get('error') or 'request failed'}"
+                f"Z-Wave node status unavailable: {core_error_message(zwave_result.get('error') or 'request failed')}"
             )
     except (
         HomeAssistantConnectionError,
@@ -82,7 +83,7 @@ async def enrich_zwave_status(
     ) as e:
         logger.warning(
             "Could not fetch Z-Wave node status for device %s: %s",
-            device_info.get("device_id"),
+            device_info.get("id"),
             e,
         )
         warnings.append(f"Z-Wave node status unavailable: {e}")
@@ -117,7 +118,7 @@ async def enrich_matter_diagnostics(
             }
         else:
             warnings.append(
-                f"Matter node diagnostics unavailable: {result.get('error') or 'request failed'}"
+                f"Matter node diagnostics unavailable: {core_error_message(result.get('error') or 'request failed')}"
             )
     except (
         HomeAssistantConnectionError,
@@ -127,7 +128,7 @@ async def enrich_matter_diagnostics(
     ) as e:
         logger.warning(
             "Could not fetch Matter node diagnostics for device %s: %s",
-            device_info.get("device_id"),
+            device_info.get("id"),
             e,
         )
         warnings.append(f"Matter node diagnostics unavailable: {e}")

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/src/ha_mcp/tools/helpers.py

@@ -815,6 +815,33 @@ def ws_failure_code(result: dict[str, Any]) -> ErrorCode:
     return ErrorCode.SERVICE_CALL_FAILED
 
 
+def core_error_message(error: object) -> str:
+    """Core's error text without the ``Command failed:`` prefix the WebSocket
+    client puts on a refused command (a result's ``error`` or the raised
+    ``HomeAssistantCommandError``)."""
+    return str(error).removeprefix("Command failed: ")
+
+
+def raise_core_refusal(
+    what: str,
+    result: dict[str, Any],
+    context: dict[str, Any] | None = None,
+    suggestions: list[str] | None = None,
+    suffix: str = "",
+) -> NoReturn:
+    """Raise a failed WebSocket command as ``{what}: <error>{suffix}``, the
+    error without the client's prefix, coded by :func:`ws_failure_code` with
+    Core's own code kept as ``ha_error_code``."""
+    raise_tool_error(
+        create_error_response(
+            ws_failure_code(result),
+            f"{what}: {core_error_message(result.get('error', 'Unknown error'))}{suffix}",
+            suggestions=suggestions,
+            context={**(context or {}), "ha_error_code": result.get("error_code")},
+        )
+    )
+
+
 def clear_or_keep(value: str | None, param_name: str) -> str | None:
     """``clearable_value`` for params where None means "not passed": blank → ''."""
     return None if value is None else clearable_value(value, param_name) or ""

{ha_mcp_dev-9.3.0.dev3501 → ha_mcp_dev-9.3.0.dev3505}/src/ha_mcp/tools/tools_groups.py

@@ -22,6 +22,7 @@ from ..errors import ErrorCode, create_error_response
 from .auto_backup import with_auto_backup
 from .coercion import JSON_STRING_COERCION
 from .helpers import (
+    core_error_message,
     exception_to_structured_error,
     get_entity_state_or_none,
     log_tool_usage,
@@ -77,9 +78,7 @@ class GroupTools:
             )
         if result.get("success"):
             return
-        error = str(result.get("error", "Unknown error")).removeprefix(
-            "Command failed: "
-        )
+        error = core_error_message(result.get("error", "Unknown error"))
         error_code = result.get("error_code")
         code = ws_failure_code(result)
         suggestions: list[str] | None = None
@@ -96,7 +95,7 @@ class GroupTools:
             create_error_response(
                 code,
                 f"group.{service} failed: {error}",
-                context={"object_id": object_id},
+                context={"object_id": object_id, "ha_error_code": error_code},
                 suggestions=suggestions,
             )
         )