ha-mcp-dev 7.5.0.dev549__tar.gz → 7.5.0.dev551__tar.gz

{ha_mcp_dev-7.5.0.dev549/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.5.0.dev551}/PKG-INFO

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

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

@@ -450,7 +450,9 @@ async def restore_backup(
                 "status": "Restore initiated - Home Assistant will restart",
                 "safety_backup_id": safety_backup_id,
                 "restore_database": restore_database,
-                "warning": "Home Assistant is restarting. Connection will be temporarily lost.",
+                "warnings": [
+                    "Home Assistant is restarting. Connection will be temporarily lost."
+                ],
                 "note": "A safety backup was created before restore. You can restore from it if needed.",
             }
         else:

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_addons.py

@@ -1272,7 +1272,7 @@ def _apply_array_ops(
                 and inspectable
                 and not any(field in it for it in inspectable)
             ):
-                entry["warning"] = (
+                entry.setdefault("warnings", []).append(
                     f"field {field!r} is not present on any item — "
                     "check for a typo in the field name"
                 )
@@ -2212,7 +2212,7 @@ def register_addon_tools(mcp: Any, client: HomeAssistantClient, **kwargs: Any) -
                     "submitted_fields": submitted_fields,
                 }
             if ignored_fields:
-                response["warning"] = (
+                response.setdefault("warnings", []).append(
                     f"{len(ignored_fields)} field(s) not in add-on schema were ignored "
                     f"before write: {ignored_fields}. Use ha_get_addon(slug) to see the "
                     "declared schema."

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_config_automations.py

@@ -231,6 +231,30 @@ def _normalize_config_for_roundtrip(config: dict[str, Any]) -> dict[str, Any]:
     return cast(dict[str, Any], normalized)
 
 
+def _strip_redundant_identifier_echo(
+    result: dict[str, Any],
+    *,
+    extra_excludes: tuple[str, ...] = (),
+) -> dict[str, Any]:
+    """Strip the redundant ``identifier`` echo from an upsert/delete response.
+
+    The canonical ``automation_id`` key (resolved entity_id, falling back to
+    input identifier or ``unique_id``) makes re-echoing the raw ``identifier``
+    redundant noise.
+
+    ``unique_id`` is intentionally retained — it's HA's internal identifier,
+    distinct from ``entity_id``/``automation_id``, and callers track it for
+    cleanup. Do not extend ``extra_excludes`` to ``"unique_id"``: that
+    regression broke E2E ``test_duplicate_automation_prevention`` at 5fe5338.
+
+    ``extra_excludes`` lets a call site drop additional internal keys the
+    spread shouldn't surface (e.g. ``"success"`` on the python_transform
+    branch, where the caller manages that key directly).
+    """
+    excluded = {"identifier", *extra_excludes}
+    return {k: v for k, v in result.items() if k not in excluded}
+
+
 class AutomationConfigTools:
     """Configuration management tools for Home Assistant automations."""
 
@@ -284,7 +308,9 @@ class AutomationConfigTools:
 
         The returned `config_hash` is stable across consecutive reads of an unchanged config — `compute_config_hash` documents the underlying contract.
 
-        The returned `automation_id` is the resolved entity_id (canonical form, e.g. `automation.morning_routine`) when the registry lookup succeeds, falling back to the input `identifier` otherwise.
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when the registry lookup
+        succeeds, falling back to the input `identifier` otherwise.
 
         EXAMPLES:
         - Get automation: ha_config_get_automation("automation.morning_routine")
@@ -406,6 +432,12 @@ class AutomationConfigTools:
         """
         Create or update a Home Assistant automation.
 
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when entity registration
+        succeeds, falling back to the input `identifier` (update path) or
+        the generated `unique_id` from the upsert response (fresh create
+        when no identifier was passed).
+
         Before reaching for ``ha_config_set_automation``, consider whether a
         dedicated tool fits the use case better:
 
@@ -666,12 +698,15 @@ class AutomationConfigTools:
                 response: dict[str, Any] = {
                     "success": True,
                     "action": "python_transform",
-                    "identifier": identifier,
+                    "automation_id": (
+                        entity_id or identifier or result.get("unique_id")
+                    ),
                     "config_hash": new_config_hash,
                     "python_expression": python_transform,
                     "message": f"Automation {identifier} updated via Python transform",
-                    # Merge upsert result, excluding "success" (we set it ourselves)
-                    **{k: v for k, v in result.items() if k != "success"},
+                    **_strip_redundant_identifier_echo(
+                        result, extra_excludes=("success",)
+                    ),
                 }
                 if bp_warnings:
                     response["best_practice_warnings"] = bp_warnings
@@ -761,9 +796,15 @@ class AutomationConfigTools:
 
             merge_validation_meta(result, validation_meta)
 
+            automation_id = entity_id or identifier or result.get("unique_id")
             return {
                 "success": True,
-                **result,
+                # automation_id omitted when all three fallbacks are falsy —
+                # the create path is unguarded by validate_identifier_not_empty,
+                # and surfacing automation_id=None would lie about resolvability.
+                # HA's upsert contract makes this branch unreachable in practice.
+                **({"automation_id": automation_id} if automation_id else {}),
+                **_strip_redundant_identifier_echo(result),
             }
 
         except ToolError:
@@ -1001,6 +1042,11 @@ class AutomationConfigTools:
         """
         Delete a Home Assistant automation.
 
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when the registry lookup
+        succeeded before the delete, falling back to the input
+        `identifier` otherwise.
+
         EXAMPLES:
         - Delete automation: ha_config_remove_automation("automation.old_automation")
         - Delete by unique_id: ha_config_remove_automation("my_unique_id")
@@ -1040,7 +1086,14 @@ class AutomationConfigTools:
                         f"Deletion confirmed but removal verification failed: {e}"
                     )
 
-            return {"success": True, "action": "delete", **result}
+            return {
+                "success": True,
+                "action": "delete",
+                "automation_id": (
+                    entity_id_for_wait or identifier or result.get("unique_id")
+                ),
+                **_strip_redundant_identifier_echo(result),
+            }
         except ToolError:
             raise
         except Exception as e:

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_energy.py

@@ -673,7 +673,7 @@ class EnergyTools:
             }
             if validate_warning is not None:
                 response["partial"] = True
-                response["warning"] = validate_warning
+                response.setdefault("warnings", []).append(validate_warning)
             return response
 
         except ToolError:
@@ -953,14 +953,14 @@ class EnergyTools:
             }
             if post_save_errors:
                 response["post_save_validation_errors"] = post_save_errors
-                response["warning"] = (
+                response.setdefault("warnings", []).append(
                     f"Save succeeded, but the persisted config has "
                     f"{len(post_save_errors)} validation error(s). Review "
                     "and re-write if any relate to this change."
                 )
             elif post_save_validate_error is not None:
                 response["partial"] = True
-                response["warning"] = (
+                response.setdefault("warnings", []).append(
                     f"Save succeeded, but post-save energy/validate "
                     f"failed: {post_save_validate_error}. The persisted "
                     "config has not been re-validated."

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_entities.py

@@ -376,16 +376,27 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         _extract_ws_error(get_result),
                     )
                     device_rename_result = {
-                        "warning": "Entity registry lookup failed — could not determine device. Retry may succeed.",
+                        "warnings": [
+                            "Entity registry lookup failed — could not determine device. Retry may succeed."
+                        ],
+                        "lookup_failed": True,
                     }
 
             device_id = (
                 entity_entry.get("device_id") if not device_rename_result else None
             )
             if not device_id:
-                device_rename_result = {
-                    "warning": "Entity has no associated device — device rename skipped",
-                }
+                # Only fire the "no device" warning when the registry lookup
+                # succeeded — otherwise the L378 "lookup failed" warning
+                # already carries the more accurate signal, and a second
+                # "no associated device" claim would be unverified (we don't
+                # actually know what the registry says when the lookup failed).
+                if device_rename_result is None:
+                    device_rename_result = {
+                        "warnings": [
+                            "Entity has no associated device — device rename skipped"
+                        ],
+                    }
             else:
                 device_msg: dict[str, Any] = {
                     "type": "config/device_registry/update",
@@ -397,7 +408,9 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     device_rename_result = {"success": True, "device_id": device_id}
                 else:
                     device_rename_result = {
-                        "warning": f"Entity updated but device rename failed: {_extract_ws_error(device_result)}",
+                        "warnings": [
+                            f"Entity updated but device rename failed: {_extract_ws_error(device_result)}"
+                        ],
                         "device_id": device_id,
                     }
 
@@ -511,7 +524,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         # Include old_entity_id and rename warning when a rename was performed
         if new_entity_id is not None:
             response_data["old_entity_id"] = original_entity_id
-            response_data["warning"] = (
+            response_data.setdefault("warnings", []).append(
                 "Remember to update any automations, scripts, or dashboards "
                 "that reference the old entity_id"
             )
@@ -521,10 +534,14 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
         if device_rename_result is not None:
             response_data["device_rename"] = device_rename_result
-            # Only mark partial when device rename was attempted and failed
-            # (not when entity simply has no device)
-            if "warning" in device_rename_result and device_rename_result.get(
-                "device_id"
+            # Mark partial when a device rename was requested but didn't complete
+            # for an operational reason: WS-call failure (device_id present + warnings)
+            # or upstream registry lookup failure (lookup_failed marker). Not partial
+            # when the entity simply has no device — that's a no-op, not an incomplete
+            # operation.
+            if device_rename_result.get("warnings") and (
+                device_rename_result.get("device_id")
+                or device_rename_result.get("lookup_failed")
             ):
                 response_data["partial"] = True
 

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_integrations.py

@@ -1237,13 +1237,13 @@ class IntegrationTools:
                     if res is not True
                 ]
                 if not_removed:
-                    response["warning"] = (
+                    response.setdefault("warnings", []).append(
                         f"Deletion confirmed but the following entities "
                         f"are still present after the wait window: "
                         f"{not_removed}"
                     )
             if warnings:
-                response["warnings"] = warnings
+                response.setdefault("warnings", []).extend(warnings)
             return response
 
         except ToolError:
@@ -1388,7 +1388,7 @@ class IntegrationTools:
                             client, entity_id
                         )
                         if not removed:
-                            response["warning"] = (
+                            response.setdefault("warnings", []).append(
                                 f"Deletion confirmed but {entity_id} "
                                 "is still present after the wait window."
                             )
@@ -1531,7 +1531,7 @@ class IntegrationTools:
                         client, entity_id
                     )
                     if not removed:
-                        response["warning"] = (
+                        response.setdefault("warnings", []).append(
                             f"Deletion confirmed but {entity_id} "
                             "is still present after the wait window."
                         )

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_search.py

@@ -736,7 +736,7 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             # Add warning and partial flag if fallback was used
             if warning:
-                result["warning"] = warning
+                result.setdefault("warnings", []).append(warning)
                 result["partial"] = True
 
             return await add_timezone_metadata(client, result)

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_service.py

@@ -145,14 +145,14 @@ class ServiceTools:
                 f"did not respond within the timeout period. The operation is likely "
                 f"still running in the background."
             ),
-            "warning": (
+            "warnings": [
                 "Response timed out. This is normal for long-running services "
                 f"like updates or firmware installs. Use ha_get_state('{entity_id}') "
                 "to check the current status."
                 if entity_id
                 else "Response timed out. This is normal for long-running services. "
                 "The service was dispatched and may still be executing."
-            ),
+            ],
         }
 
     async def _capture_initial_state(self, entity_id: str | None) -> str | None:
@@ -186,11 +186,11 @@ class ServiceTools:
             if new_state:
                 response["verified_state"] = new_state.get("state")
             else:
-                response["warning"] = (
+                response.setdefault("warnings", []).append(
                     "Service executed but state change could not be verified within timeout."
                 )
         except Exception as e:
-            response["warning"] = (
+            response.setdefault("warnings", []).append(
                 f"Service executed but state verification failed: {e}"
             )
 
@@ -512,10 +512,10 @@ class ServiceTools:
                         f"Event {event_type} was dispatched but Home Assistant "
                         "did not respond within the timeout period."
                     ),
-                    "warning": (
+                    "warnings": [
                         "Response timed out. The event was dispatched and may still "
                         "have been delivered to subscribers."
-                    ),
+                    ],
                 }
             exception_to_structured_error(
                 error,

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551}/src/ha_mcp/tools/tools_system.py

@@ -186,10 +186,10 @@ class SystemTools:
                     "Home Assistant restart initiated. "
                     "The system will be unavailable for 1-5 minutes."
                 ),
-                "warning": (
+                "warnings": [
                     "Connection will be lost during restart. "
                     "Wait for Home Assistant to become available again."
-                ),
+                ],
             }
 
         except ToolError:
@@ -208,7 +208,7 @@ class SystemTools:
                         "Home Assistant restart initiated. "
                         "Connection was closed as expected during restart."
                     ),
-                    "warning": "Wait 1-5 minutes for Home Assistant to restart.",
+                    "warnings": ["Wait 1-5 minutes for Home Assistant to restart."],
                 }
 
             exception_to_structured_error(e)
@@ -299,12 +299,14 @@ class SystemTools:
                         if "not found" not in error_msg.lower():
                             errors.append(f"{reload_target}: {error_msg}")
 
-                return {
+                response: dict[str, Any] = {
                     "success": True,
                     "message": f"Reloaded {len(results)} components",
                     "reloaded": results,
-                    "warnings": errors if errors else None,
                 }
+                if errors:
+                    response["warnings"] = errors
+                return response
 
             else:
                 # Reload specific component

{ha_mcp_dev-7.5.0.dev549 → ha_mcp_dev-7.5.0.dev551/src/ha_mcp_dev.egg-info}/PKG-INFO

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