ha-mcp-dev 8.4.3.dev2605__tar.gz → 8.4.3.dev2608__tar.gz

{ha_mcp_dev-8.4.3.dev2605/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.4.3.dev2608}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.4.3.dev2605"
+version = "8.4.3.dev2608"
 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.4.3.dev2605 → ha_mcp_dev-8.4.3.dev2608}/src/ha_mcp/server.py

@@ -727,7 +727,8 @@ class HomeAssistantSmartMCPServer:
             "ha_config_get_automation), or `take_control_of_blueprint` "
             "to convert a blueprint-backed automation into an editable "
             "standalone one (the UI's Take control action). Omit "
-            "`identifier` to create a new automation.\n\n"
+            "`identifier` to create a new automation. Reusing an identifier targets "
+            "the same automation; changing its alias requires config_hash from a prior read.\n\n"
             "For schema details, examples, and native-vs-template "
             "guidance, see ha_get_skill_guide or your locally "
             "installed skills."

{ha_mcp_dev-8.4.3.dev2605 → ha_mcp_dev-8.4.3.dev2608}/src/ha_mcp/tools/tools_config_automations.py

@@ -543,8 +543,9 @@ class AutomationConfigTools:
         identifier: Annotated[
             str | None,
             Field(
-                description="Automation entity_id or unique_id for updates. "
-                "Required for python_transform. Omit to create new automation with generated unique_id.",
+                description="Target automation entity_id or HA config 'id' (unique_id). "
+                "Omit for creation with a generated ID. Values such as 'new' are literal IDs, not placeholders. "
+                "Required for python_transform.",
                 default=None,
             ),
         ] = None,
@@ -567,7 +568,8 @@ class AutomationConfigTools:
             Field(
                 description="Config hash from ha_config_get_automation for optimistic locking. "
                 "REQUIRED for python_transform (validates automation unchanged). "
-                "Optional for config updates (validates before full replacement if provided).",
+                "Required when a config update changes an existing automation's alias. "
+                "Otherwise optional for config updates (validates before full replacement if provided).",
             ),
         ] = None,
         take_control_of_blueprint: Annotated[
@@ -673,7 +675,11 @@ class AutomationConfigTools:
         - Add trigger: python_transform="config['triggers'].append({'trigger': 'state', 'entity_id': 'binary_sensor.motion', 'to': 'on'})"
         - Remove last action: python_transform="config['actions'].pop()"
 
-        Creates a new automation (if identifier omitted) or updates existing automation with provided configuration.
+        Omit identifier and config['id'] to create a new automation with a generated ID.
+        A previously unused raw ID can also create an automation with that specific ID.
+        Reusing an identifier targets the same automation, even if the alias changes.
+        To intentionally rename or replace it, first read it with ha_config_get_automation
+        and pass its config_hash. A changed alias without that hash is rejected before writing.
 
         AUTOMATION TYPES:
 
@@ -732,8 +738,10 @@ class AutomationConfigTools:
         })
 
         Update existing automation:
+        current = ha_config_get_automation(identifier="automation.morning_routine")
         ha_config_set_automation(
             identifier="automation.morning_routine",
+            config_hash=current["config_hash"],
             config={
                 "alias": "Updated Morning Routine",
                 "triggers": [{"trigger": "time", "at": "06:30:00"}],
@@ -900,15 +908,18 @@ class AutomationConfigTools:
             # (trigger -> triggers, action -> actions, condition -> conditions).
             config_dict = _normalize_automation_config(config_dict)
 
-            # Optional hash check for full config updates. When it runs it
-            # resolves ``identifier`` to the storage key — thread that through so
-            # the upsert doesn't re-resolve (issue #1813 Phase 0). Stays None on
-            # the no-hash update path (raw identifier resolved once, in upsert).
+            # Both the hash check and alias guard read the resolved storage key.
+            # Reuse it for the write to avoid a second entity-ID lookup (#1813).
+            # Creation and responses without an id retain the existing fallback.
             resolved_id: str | None = None
             if identifier and config_hash:
                 _, resolved_id = await self._fetch_and_verify_hash(
                     identifier, config_hash, "set"
                 )
+            elif identifier:
+                resolved_id = await self._guard_alias_replacement(
+                    identifier, config_dict
+                )
 
             self._validate_required_fields(config_dict, identifier)
             bp_warnings = _check_best_practices(config_dict)
@@ -1014,11 +1025,11 @@ class AutomationConfigTools:
         """Upsert, threading a pre-resolved unique_id when available.
 
         When ``resolved_id`` is set the caller already resolved ``identifier``
-        (via ``_fetch_and_verify_hash``); pass it with ``_resolved=True`` so the
+        (via the hash check or alias guard); pass it with ``_resolved=True`` so the
         REST client skips the redundant entity_id→unique_id lookup (issue #1813
         Phase 0). Otherwise fall back to the raw ``identifier`` and let the REST
-        client resolve — the create path (``identifier is None``) and the
-        no-hash update path both land here unchanged.
+        client resolve — creation and fetched configs without an id use this
+        fallback.
         """
         result: dict[str, Any]
         if resolved_id is not None:
@@ -1205,8 +1216,8 @@ class AutomationConfigTools:
         more: Home Assistant goes on counting the automation as a user of that
         blueprint until it is removed, so there is no release to wait for.
 
-        ``resolved_id`` (set only when the optional hash check pre-resolved
-        ``identifier``) is threaded to the upsert so it skips the redundant
+        ``resolved_id`` (set when the hash check or alias guard fetched an id)
+        is threaded to the upsert so it skips the redundant
         re-resolve; None falls back to resolving inside the REST client.
         """
         result = await self._upsert_automation(config_dict, identifier, resolved_id)
@@ -1309,6 +1320,44 @@ class AutomationConfigTools:
             and entry["entity_id"].startswith("automation.")
         ][:10]
 
+    async def _guard_alias_replacement(
+        self, identifier: str, config: dict[str, Any]
+    ) -> str | None:
+        """Require a prior read before replacing a differently named automation.
+
+        Return the fetched storage id for reuse by the write, when available.
+        This catches sequential ID reuse. The REST read and write are separate
+        requests, so it does not provide atomic protection against other writers.
+        """
+        if "alias" not in config:
+            return None  # Required-field validation supplies the actionable error.
+        try:
+            current = await self._client.get_automation_config(identifier)
+        except HomeAssistantAPIError as exc:
+            if exc.status_code == 404 and not identifier.startswith("automation."):
+                return None  # Preserve intentional creation with a caller-chosen ID.
+            # Entity-ID resolution also maps lookup failures to 404. Never retry
+            # those as creation: a recovered lookup could overwrite an unchecked target.
+            raise
+        if current.get("alias") != config["alias"]:
+            raise_tool_error(
+                create_error_response(
+                    ErrorCode.VALIDATION_INVALID_PARAMETER,
+                    f"Automation {identifier!r} already exists as {current.get('alias')!r}. "
+                    f"This write would replace it with {config['alias']!r}. Nothing was written.",
+                    context={"identifier": identifier, "parameter": "config_hash"},
+                    suggestions=[
+                        "Omit identifier and remove config['id'] to create a separate automation.",
+                        (
+                            "For an intentional rename or replacement, call ha_config_get_automation "
+                            "for this identifier, inspect its config, and resubmit with its config_hash."
+                        ),
+                    ],
+                )
+            )
+        raw_id = current.get("id")
+        return str(raw_id) if raw_id is not None else None
+
     async def _raise_automation_not_found(self, identifier: str) -> None:
         """Raise a structured RESOURCE_NOT_FOUND ToolError for a missing automation.
 

{ha_mcp_dev-8.4.3.dev2605 → ha_mcp_dev-8.4.3.dev2608/src/ha_mcp_dev.egg-info}/PKG-INFO

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