ha-mcp-dev 8.6.0.dev2934__tar.gz → 8.6.0.dev2941__tar.gz

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/PKG-INFO

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

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

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2934"
+version = "8.6.0.dev2941"
 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.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/errors.py

@@ -466,6 +466,7 @@ def create_validation_error(
     details: str | None = None,
     invalid_json: bool = False,
     context: dict[str, Any] | None = None,
+    suggestions: list[str] | None = None,
 ) -> dict[str, Any]:
     """Create a validation error response."""
     code = (
@@ -480,7 +481,11 @@ def create_validation_error(
     if parameter:
         final_context["parameter"] = parameter
     return create_error_response(
-        code, message, details, context=final_context if final_context else None
+        code,
+        message,
+        details,
+        suggestions=suggestions,
+        context=final_context if final_context else None,
     )
 
 

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/az.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Qoruyucu ehtiyat nüsxə: {name}. Əvvəlki vəziyyətə qayıtmaq üçün bu qoruyucu ehtiyat nüsxəni bərpa etməzdən əvvəl cari konfiqurasiyanı yoxlayın.",
     "backup.restore.reason.unsupported_form": "Home Assistant bu bərpa üçün uyğun forma təqdim etmədi.",
     "backup.restore.reason.unsupported_fields": "Anlıq nüsxənin bəzi sahələri cari forma tərəfindən qəbul edilmir.",
+    "backup.restore.reason.identity_changed": "Bəzi ehtiyat nüsxə sahələri heç bir bərpa forması tərəfindən təklif olunmur (onlar yaradılarkən təyin edilir) və onlar ehtiyat nüsxəsi yaradıldıqdan sonra dəyişdirilib.",
     "backup.restore.reason.validation_failed": "Home Assistant bərpa edilmiş konfiqurasiyanı etibarsız hesab edərək rədd etdi.",
     "backup.restore.reason.flow_aborted": "Home Assistant bərpa prosesini dayandırdı.",
     "backup.restore.fields": "Sahələr: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/cs.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Bezpečnostní záloha: {name}. Před obnovením této bezpečnostní zálohy za účelem obnovení předchozího stavu zkontrolujte aktuální konfiguraci.",
     "backup.restore.reason.unsupported_form": "Home Assistant neposkytl formulář vhodný pro toto obnovení.",
     "backup.restore.reason.unsupported_fields": "Některá pole snímku nejsou aktuálním formulářem akceptována.",
+    "backup.restore.reason.identity_changed": "Některá pole snímku nejsou v žádném formuláři pro obnovení k dispozici (jsou nastavena při vytvoření) a od vytvoření zálohy se změnila.",
     "backup.restore.reason.validation_failed": "Home Assistant odmítl obnovenou konfiguraci jako neplatnou.",
     "backup.restore.reason.flow_aborted": "Home Assistant přerušil proces obnovení.",
     "backup.restore.fields": "Pole: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/de.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Sicherheitsbackup: {name}. Überprüfe die aktuelle Konfiguration, bevor du dieses Sicherheitsbackup wiederherstellst, um den vorherigen Zustand wiederherzustellen.",
     "backup.restore.reason.unsupported_form": "Home Assistant hat kein für diese Wiederherstellung geeignetes Formular bereitgestellt.",
     "backup.restore.reason.unsupported_fields": "Einige Snapshot-Felder werden vom aktuellen Formular nicht akzeptiert.",
+    "backup.restore.reason.identity_changed": "Einige Snapshot-Felder werden von keinem Wiederherstellungsformular angeboten (sie werden bei der Erstellung festgelegt) und haben sich seit dem Backup geändert.",
     "backup.restore.reason.validation_failed": "Home Assistant hat die wiederhergestellte Konfiguration als ungültig abgelehnt.",
     "backup.restore.reason.flow_aborted": "Home Assistant hat den Wiederherstellungsvorgang abgebrochen.",
     "backup.restore.fields": "Felder: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/eo.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Sekureca sekurkopio: {name}. Inspektu la nunan agordon antaŭ restarigi ĉi tiun sekurecan sekurkopion por rekuperi la antaŭan staton.",
     "backup.restore.reason.unsupported_form": "Home Assistant ne provizis taŭgan formularon por ĉi tiu restarigo.",
     "backup.restore.reason.unsupported_fields": "Kelkaj kampoj de la momentfoto ne estas akceptitaj de la nuna formularo.",
+    "backup.restore.reason.identity_changed": "Iuj konservoskopaj kampoj ne estas ofertataj de iu ajn restaŭra formularo (ili estas agorditaj dum kreado), kaj ili ŝanĝiĝis ekde la sekurkopio.",
     "backup.restore.reason.validation_failed": "Home Assistant malakceptis la restarigitan agordon kiel malvalidan.",
     "backup.restore.reason.flow_aborted": "Home Assistant ĉesigis la restarigan fluon.",
     "backup.restore.fields": "Kampoj: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/es.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Copia de seguridad de seguridad: {name}. Inspecciona la configuración actual antes de restaurar esta copia para recuperar el estado anterior.",
     "backup.restore.reason.unsupported_form": "Home Assistant no proporcionó un formulario adecuado para esta restauración.",
     "backup.restore.reason.unsupported_fields": "El formulario actual no acepta algunos campos de la instantánea.",
+    "backup.restore.reason.identity_changed": "Algunos campos de la copia de seguridad no son ofrecidos por ningún formulario de restauración (se establecen en la creación) y han cambiado desde el respaldo.",
     "backup.restore.reason.validation_failed": "Home Assistant rechazó la configuración restaurada por no ser válida.",
     "backup.restore.reason.flow_aborted": "Home Assistant canceló el proceso de restauración.",
     "backup.restore.fields": "Campos: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/fr.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Sauvegarde de sécurité : {name}. Inspectez la configuration actuelle avant de restaurer cette sauvegarde de sécurité pour récupérer l'état précédent.",
     "backup.restore.reason.unsupported_form": "Home Assistant n'a pas fourni de formulaire adapté à cette restauration.",
     "backup.restore.reason.unsupported_fields": "Certains champs de l'instantané ne sont pas acceptés par le formulaire actuel.",
+    "backup.restore.reason.identity_changed": "Certains champs de l'instantané ne sont proposés par aucun formulaire de restauration (ils sont définis lors de la création) et ils ont changé depuis la sauvegarde.",
     "backup.restore.reason.validation_failed": "Home Assistant a rejeté la configuration restaurée car elle n'est pas valide.",
     "backup.restore.reason.flow_aborted": "Home Assistant a interrompu le processus de restauration.",
     "backup.restore.fields": "Champs : {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/it.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Backup di sicurezza: {name}. Ispeziona la configurazione corrente prima di ripristinare questo backup di sicurezza per recuperare lo stato precedente.",
     "backup.restore.reason.unsupported_form": "Home Assistant non ha fornito un modulo adatto per questo ripristino.",
     "backup.restore.reason.unsupported_fields": "Alcuni campi dello snapshot non sono accettati dal modulo corrente.",
+    "backup.restore.reason.identity_changed": "Alcuni campi dello snapshot non sono offerti da alcun modulo di ripristino (vengono impostati alla creazione) e sono cambiati rispetto al backup.",
     "backup.restore.reason.validation_failed": "Home Assistant ha rifiutato la configurazione ripristinata in quanto non valida.",
     "backup.restore.reason.flow_aborted": "Home Assistant ha interrotto il flusso di ripristino.",
     "backup.restore.fields": "Campi: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/ko.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "안전 백업: {name}. 이전 상태로 복구하기 위해 이 안전 백업을 복원하기 전에 현재 설정을 검토하세요.",
     "backup.restore.reason.unsupported_form": "Home Assistant가 이 복원에 적합한 양식을 제공하지 않았습니다.",
     "backup.restore.reason.unsupported_fields": "일부 스냅샷 필드가 현재 양식에서 허용되지 않습니다.",
+    "backup.restore.reason.identity_changed": "일부 스냅샷 필드는 복원 폼에서 제공되지 않으며(생성 시 설정됨) 백업 이후 변경되었습니다.",
     "backup.restore.reason.validation_failed": "Home Assistant가 복원된 설정이 잘못되었다고 거부했습니다.",
     "backup.restore.reason.flow_aborted": "Home Assistant가 복원 흐름을 중단했습니다.",
     "backup.restore.fields": "필드: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/nl.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Veiligheidsreservekopie: {name}. Inspecteer de huidige configuratie voordat je deze veiligheidsreservekopie terugzet om de vorige staat te herstellen.",
     "backup.restore.reason.unsupported_form": "Home Assistant heeft geen formulier geleverd dat geschikt is voor deze terugzetting.",
     "backup.restore.reason.unsupported_fields": "Sommige snapshotvelden worden niet geaccepteerd door het huidige formulier.",
+    "backup.restore.reason.identity_changed": "Sommige snapshotvelden worden door geen enkel herstelformulier aangeboden (deze worden ingesteld bij het aanmaken) en zijn gewijzigd sinds de backup.",
     "backup.restore.reason.validation_failed": "Home Assistant heeft de teruggezette configuratie afgewezen als ongeldig.",
     "backup.restore.reason.flow_aborted": "Home Assistant heeft het terugzetproces afgebroken.",
     "backup.restore.fields": "Velden: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/pl.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Kopia zapasowa zabezpieczająca: {name}. Sprawdź bieżącą konfigurację przed przywróceniem tej kopii zabezpieczającej, aby odzyskać poprzedni stan.",
     "backup.restore.reason.unsupported_form": "Home Assistant nie udostępnił formularza odpowiedniego do tego przywracania.",
     "backup.restore.reason.unsupported_fields": "Niektóre pola migawki nie są akceptowane przez bieżący formularz.",
+    "backup.restore.reason.identity_changed": "Niektóre pola kopii zapasowej nie są obsługiwane przez żaden formularz przywracania (są ustawiane podczas tworzenia) i uległy zmianie od czasu utworzenia kopii zapasowej.",
     "backup.restore.reason.validation_failed": "Home Assistant odrzucił przywróconą konfigurację jako nieprawidłową.",
     "backup.restore.reason.flow_aborted": "Home Assistant przerwał proces przywracania.",
     "backup.restore.fields": "Pola: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/ru.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Резервная копия безопасности: {name}. Проверьте текущую конфигурацию перед восстановлением этой резервной копии безопасности, чтобы вернуть предыдущее состояние.",
     "backup.restore.reason.unsupported_form": "Home Assistant не предоставил форму, подходящую для этого восстановления.",
     "backup.restore.reason.unsupported_fields": "Некоторые поля снимка не принимаются текущей формой.",
+    "backup.restore.reason.identity_changed": "Некоторые поля резервной копии не поддерживаются ни одной формой восстановления (они задаются при создании) и изменились с момента создания бэкапа.",
     "backup.restore.reason.validation_failed": "Home Assistant отклонил восстановленную конфигурацию как недействительную.",
     "backup.restore.reason.flow_aborted": "Home Assistant прервал процесс восстановления.",
     "backup.restore.fields": "Поля: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/sv.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "Säkerhetskopia: {name}. Inspektera den aktuella konfigurationen innan du återställer denna säkerhetskopia för att återställa det föregående tillståndet.",
     "backup.restore.reason.unsupported_form": "Home Assistant tillhandahöll inte ett formulär som passar för denna återställning.",
     "backup.restore.reason.unsupported_fields": "Vissa fält i ögonblicksbilden accepteras inte av det aktuella formuläret.",
+    "backup.restore.reason.identity_changed": "Vissa fält i ögonblicksbilden erbjuds inte av någon återställningsformulär (de ställs in vid skapandet), och de har ändrats sedan säkerhetskopieringen.",
     "backup.restore.reason.validation_failed": "Home Assistant avvisade den återställda konfigurationen som ogiltig.",
     "backup.restore.reason.flow_aborted": "Home Assistant avbröt återställningsflödet.",
     "backup.restore.fields": "Fält: {fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/zh-Hans.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "安全备份：{name}。在恢复此安全备份以恢复先前的状态之前，请检查当前配置。",
     "backup.restore.reason.unsupported_form": "Home Assistant 未提供适合此恢复的表单。",
     "backup.restore.reason.unsupported_fields": "当前表单不接受某些快照字段。",
+    "backup.restore.reason.identity_changed": "某些备份字段不由任何还原表单提供（它们在创建时设置），并且它们在备份后已更改。",
     "backup.restore.reason.validation_failed": "Home Assistant 拒绝了恢复的配置，因为其无效。",
     "backup.restore.reason.flow_aborted": "Home Assistant 中止了恢复流程。",
     "backup.restore.fields": "字段：{fields}",

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/settings_ui/locales/zh-Hant.json

@@ -303,6 +303,7 @@
     "backup.restore.safety": "安全備份：{name}。在還原此安全備份以恢復先前的狀態之前，請先檢查目前的設定。",
     "backup.restore.reason.unsupported_form": "Home Assistant 未提供適合此還原的表單。",
     "backup.restore.reason.unsupported_fields": "目前的表單不接受某些快照欄位。",
+    "backup.restore.reason.identity_changed": "某些快照欄位未由任何還原表單提供（它們是在建立時設定的），且自備份以來這些欄位已變更。",
     "backup.restore.reason.validation_failed": "Home Assistant 拒絕已還原的設定，因為設定無效。",
     "backup.restore.reason.flow_aborted": "Home Assistant 已中止還原流程。",
     "backup.restore.fields": "欄位：{fields}",

ha_mcp_dev-8.6.0.dev2941/src/ha_mcp/tools/config_write_errors.py

@@ -0,0 +1,185 @@
+"""Input-validation rejections for config writes (issue #2649).
+
+Kept out of tools_config_automations.py so that file stays under its
+module-size baseline. The helpers raise through ``raise_tool_error`` and
+carry no client or Home Assistant dependency.
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from ..errors import ErrorCode, create_error_response
+from .helpers import raise_tool_error
+
+# Guidance reused wherever the runtime-only ``enabled`` key folds into
+# another rejection.
+ENABLED_MISPLACED_GUIDANCE = (
+    "'enabled' is a runtime-only tool parameter, not a valid automation "
+    "config key — pass it to ha_config_set_automation as enabled=True/False "
+    "instead of putting it in config."
+)
+ENABLED_REMOVE_SUGGESTION = (
+    "Remove 'enabled' from config and pass enabled=True or False "
+    "to ha_config_set_automation"
+)
+ENABLED_UNCHANGED_SUGGESTION = (
+    "Use enabled=None to leave the current runtime state unchanged"
+)
+
+
+def config_has_enabled(config: Any) -> bool:
+    """Whether a config body carries the runtime-only ``enabled`` key."""
+    return isinstance(config, dict) and "enabled" in config
+
+
+def _missing_fields_shape(is_blueprint: bool) -> str:
+    """One-line expected config shape with copy-pasteable quoted keys."""
+    if is_blueprint:
+        return (
+            "config={'alias': 'My Automation', 'use_blueprint': "
+            "{'path': 'light.yaml', 'input': {...}}}"
+        )
+    return "config={'alias': 'My Automation', 'triggers': [...], 'actions': [...]}"
+
+
+def _missing_field_guidance(
+    missing_fields: list[str], is_blueprint: bool, source: str
+) -> tuple[str, list[str]]:
+    """Message and suggestions for missing required fields, worded by source.
+
+    For the ``config`` argument the guidance points inside ``config``; for a
+    ``python_transform`` the config came from a transform expression, so the
+    guidance points at the transform instead (telling it to send
+    ``config={...}`` would earn a write-modes rejection).
+    """
+    fields = ", ".join(missing_fields)
+    if source == "python_transform":
+        first = missing_fields[0]
+        return (
+            f"Missing required fields: {fields}. Add them in your "
+            f"python_transform expression, e.g. config['{first}'] = ... .",
+            [
+                "Set the missing field(s) on the transformed config, e.g. "
+                f"config['{first}'] = '...'."
+            ],
+        )
+    shape = _missing_fields_shape(is_blueprint)
+    return (
+        f"Missing required fields: {fields}. Required automation fields go "
+        f"inside `config`, e.g. {shape}.",
+        [f"Add the missing field(s) inside the `config` argument: {shape}."],
+    )
+
+
+def reject_sequence_misroute(
+    config_dict: dict[str, Any],
+    missing_fields: list[str],
+    identifier: str | None,
+    source: str = "config",
+) -> None:
+    """Raise when a 'sequence' key shows the config is really a script.
+
+    Returns silently when the config does not look script-shaped, so the
+    caller stays a one-liner. A runtime-only ``enabled`` key folds into the
+    same rejection instead of costing another round trip.
+    """
+    if not (
+        missing_fields
+        and "sequence" in config_dict
+        and ("triggers" in missing_fields or "actions" in missing_fields)
+    ):
+        return
+    context: dict[str, Any] = {"missing_fields": missing_fields}
+    if identifier:
+        context["identifier"] = identifier
+    message = f"Missing required fields: {', '.join(missing_fields)}"
+    if source == "python_transform":
+        automation_fix = (
+            "In the python_transform expression, replace 'sequence' with "
+            "'actions' and add 'triggers'."
+        )
+        if "alias" in missing_fields:
+            automation_fix += (
+                " Set 'alias' in the expression too, e.g. config['alias'] = '...'."
+            )
+    else:
+        automation_fix = (
+            "For an automation, replace 'sequence' with 'actions' and add 'triggers'."
+        )
+        if "alias" in missing_fields:
+            automation_fix += (
+                " Put 'alias' inside `config` too, e.g. "
+                f"{_missing_fields_shape(is_blueprint=False)}."
+            )
+    suggestions = [
+        "Did you mean ha_config_set_script? Scripts use 'sequence' directly.",
+        automation_fix,
+    ]
+    if config_has_enabled(config_dict):
+        context["invalid_key"] = "enabled"
+        message += f". {ENABLED_MISPLACED_GUIDANCE}"
+        suggestions.extend([ENABLED_REMOVE_SUGGESTION, ENABLED_UNCHANGED_SUGGESTION])
+    raise_tool_error(
+        create_error_response(
+            code=ErrorCode.CONFIG_MISSING_REQUIRED_FIELDS,
+            message=message,
+            details=(
+                "Config contains 'sequence', which belongs to scripts. "
+                "Automations use 'triggers' and 'actions'; scripts use 'sequence'."
+            ),
+            suggestions=suggestions,
+            context=context,
+        )
+    )
+
+
+def reject_invalid_config_inputs(
+    config_dict: dict[str, Any],
+    missing_fields: list[str],
+    identifier: str | None,
+    source: str = "config",
+) -> None:
+    """Raise the structured rejection for a config write's input violations.
+
+    A missing-field rejection says where the field goes and shows the
+    expected shape in one line; a runtime-only ``enabled`` key together with
+    missing required fields surfaces in ONE rejection instead of one round
+    trip each. Returns silently when the inputs are valid.
+    """
+    enabled_in_config = config_has_enabled(config_dict)
+    if not missing_fields and not enabled_in_config:
+        return
+    context: dict[str, Any] = {}
+    if identifier:
+        context["identifier"] = identifier
+    if missing_fields:
+        context["missing_fields"] = missing_fields
+        message, suggestions = _missing_field_guidance(
+            missing_fields, "use_blueprint" in config_dict, source
+        )
+        if enabled_in_config:
+            context["invalid_key"] = "enabled"
+            message = f"{message} {ENABLED_MISPLACED_GUIDANCE}"
+            suggestions = suggestions + [
+                ENABLED_REMOVE_SUGGESTION,
+                ENABLED_UNCHANGED_SUGGESTION,
+            ]
+        raise_tool_error(
+            create_error_response(
+                code=ErrorCode.CONFIG_MISSING_REQUIRED_FIELDS,
+                message=message,
+                details=f"Missing required fields: {', '.join(missing_fields)}",
+                suggestions=suggestions,
+                context=context or None,
+            )
+        )
+    raise_tool_error(
+        create_error_response(
+            ErrorCode.VALIDATION_INVALID_PARAMETER,
+            "'enabled' is a runtime-only tool parameter, not a valid "
+            "automation config key",
+            suggestions=[ENABLED_REMOVE_SUGGESTION, ENABLED_UNCHANGED_SUGGESTION],
+            context={"action": "set", "invalid_key": "enabled"},
+        )
+    )

{ha_mcp_dev-8.6.0.dev2934 → ha_mcp_dev-8.6.0.dev2941}/src/ha_mcp/tools/tools_config_automations.py

@@ -20,7 +20,6 @@ from ..client.rest_client import (
 )
 from ..errors import (
     ErrorCode,
-    create_config_error,
     create_error_response,
     create_validation_error,
 )
@@ -47,6 +46,10 @@ from .blueprint_substitute import (
 from .coercion import JSON_STRING_COERCION, coerce_to_list, parse_json_param
 from .component_config_reads import fetch_entity_lookup_via_component
 from .config_helpers.registry import validate_registry_ids
+from .config_write_errors import (
+    reject_invalid_config_inputs,
+    reject_sequence_misroute,
+)
 from .config_write_helpers import (
     apply_entity_category,
     attach_skill_content,
@@ -425,24 +428,6 @@ def _run_actions_once_reloaded(
 _STANDALONE_RUNTIME_ACTIONS = ("set_enabled", "run_actions")
 
 
-def _reject_enabled_in_config(config: Any) -> None:
-    """Reject the runtime-only ``enabled`` key in a stored config body."""
-    if isinstance(config, dict) and "enabled" in config:
-        raise_tool_error(
-            create_error_response(
-                ErrorCode.VALIDATION_INVALID_PARAMETER,
-                "'enabled' is a runtime-only tool parameter, not a valid "
-                "automation config key",
-                suggestions=[
-                    "Remove 'enabled' from config and pass enabled=True or False "
-                    + "to ha_config_set_automation",
-                    "Use enabled=None to leave the current runtime state unchanged",
-                ],
-                context={"action": "set", "invalid_key": "enabled"},
-            )
-        )
-
-
 async def _set_automation_enabled(client: Any, entity_id: str, enabled: bool) -> Any:
     """Set an automation's runtime enabled state through Home Assistant."""
     service = "turn_on" if enabled else "turn_off"
@@ -902,7 +887,6 @@ class AutomationConfigTools:
                 )
 
             config_dict = self._parse_and_validate_config(config)
-            _reject_enabled_in_config(config_dict)
 
             # Extract category before sending to HA REST API (which rejects unknown keys).
             # Parameter takes precedence over config dict value.
@@ -917,6 +901,13 @@ class AutomationConfigTools:
             # (trigger -> triggers, action -> actions, condition -> conditions).
             config_dict = _normalize_automation_config(config_dict)
 
+            # Purely local input checks run before the tool's own reads, so
+            # a malformed config rejects without spending the hash check's
+            # or the alias guard's GETs. (The auto-backup wrapper may take
+            # its pre-write snapshot first on updates; that read is outside
+            # this tool's control.)
+            self._validate_required_fields(config_dict, identifier)
+
             # 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.
@@ -930,7 +921,6 @@ class AutomationConfigTools:
                     identifier, config_dict
                 )
 
-            self._validate_required_fields(config_dict, identifier)
             bp_warnings = _check_best_practices(config_dict)
             validation_meta = await validate_config_references(
                 self._client, config_dict
@@ -1377,7 +1367,6 @@ class AutomationConfigTools:
             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)
         effective_category = category if category is not None else transform_category
 
@@ -1387,7 +1376,9 @@ class AutomationConfigTools:
         conflict_warnings = _detect_conflicting_root_keys(transformed_config)
 
         transformed_config = _normalize_automation_config(transformed_config)
-        self._validate_required_fields(transformed_config, identifier)
+        self._validate_required_fields(
+            transformed_config, identifier, source="python_transform"
+        )
         bp_warnings = _check_best_practices(transformed_config)
 
         # Issue #2159: reject an unknown category before the write, so a
@@ -1848,9 +1839,13 @@ class AutomationConfigTools:
 
     @staticmethod
     def _validate_required_fields(
-        config_dict: dict[str, Any], identifier: str | None
+        config_dict: dict[str, Any], identifier: str | None, source: str = "config"
     ) -> None:
-        """Validate required fields and prevent duplicate creation."""
+        """Validate required fields and prevent duplicate creation.
+
+        A missing required field and a misplaced runtime-only ``enabled`` key
+        surface in ONE rejection (issue #2649).
+        """
         if "use_blueprint" in config_dict:
             required_fields = ["alias"]
             # Strip empty triggers/actions/conditions arrays that would override blueprint
@@ -1861,38 +1856,8 @@ class AutomationConfigTools:
             required_fields = ["alias", "triggers", "actions"]
 
         missing_fields = [f for f in required_fields if f not in config_dict]
-        if missing_fields:
-            # If the caller supplied a 'sequence' key, the config looks like a
-            # script — point them at ha_config_set_script instead of the generic
-            # missing-fields error.
-            if "sequence" in config_dict and (
-                "triggers" in missing_fields or "actions" in missing_fields
-            ):
-                context: dict[str, Any] = {"missing_fields": missing_fields}
-                if identifier:
-                    context["identifier"] = identifier
-                raise_tool_error(
-                    create_error_response(
-                        code=ErrorCode.CONFIG_MISSING_REQUIRED_FIELDS,
-                        message=f"Missing required fields: {', '.join(missing_fields)}",
-                        details=(
-                            "Config contains 'sequence', which belongs to scripts. "
-                            "Automations use 'triggers' and 'actions'; scripts use 'sequence'."
-                        ),
-                        suggestions=[
-                            "Did you mean ha_config_set_script? Scripts use 'sequence' directly.",
-                            "For an automation, replace 'sequence' with 'actions' and add 'triggers'.",
-                        ],
-                        context=context,
-                    )
-                )
-            raise_tool_error(
-                create_config_error(
-                    f"Missing required fields: {', '.join(missing_fields)}",
-                    identifier=identifier,
-                    missing_fields=missing_fields,
-                )
-            )
+        reject_sequence_misroute(config_dict, missing_fields, identifier, source)
+        reject_invalid_config_inputs(config_dict, missing_fields, identifier, source)
 
         # Issue #1169: see _check_scene_create_misroute
         AutomationConfigTools._check_scene_create_misroute(config_dict, identifier)