ha-mcp-dev 7.4.1.dev462__tar.gz → 7.4.1.dev464__tar.gz

{ha_mcp_dev-7.4.1.dev462/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev464}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev462
+Version: 7.4.1.dev464
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -38,7 +38,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-85-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-88-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -181,7 +181,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (85 tools)</b></summary>
+<summary><b>Complete Tool List (88 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -202,6 +202,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |
+| **Scenes** | `ha_config_get_scene`, `ha_config_remove_scene`, `ha_config_set_scene` |
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |
 | **Search & Discovery** | `ha_deep_search`, `ha_get_overview`, `ha_get_state`, `ha_search_entities` |
 | **Service & Device Control** | `ha_bulk_control`, `ha_call_service`, `ha_get_operation_status`, `ha_list_services` |

{ha_mcp_dev-7.4.1.dev462 → ha_mcp_dev-7.4.1.dev464}/README.md

@@ -8,7 +8,7 @@
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-85-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-88-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -151,7 +151,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (85 tools)</b></summary>
+<summary><b>Complete Tool List (88 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -172,6 +172,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |
+| **Scenes** | `ha_config_get_scene`, `ha_config_remove_scene`, `ha_config_set_scene` |
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |
 | **Search & Discovery** | `ha_deep_search`, `ha_get_overview`, `ha_get_state`, `ha_search_entities` |
 | **Service & Device Control** | `ha_bulk_control`, `ha_call_service`, `ha_get_operation_status`, `ha_list_services` |

{ha_mcp_dev-7.4.1.dev462 → ha_mcp_dev-7.4.1.dev464}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev462"
+version = "7.4.1.dev464"
 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.4.1.dev462 → ha_mcp_dev-7.4.1.dev464}/src/ha_mcp/tools/tools_config_automations.py

@@ -168,6 +168,38 @@ def _normalize_trigger_keys(triggers: list[dict[str, Any]]) -> list[dict[str, An
     return normalized_triggers
 
 
+def _action_contains_scene_create(action: Any) -> bool:
+    """True if the action — or any nested action under HA's wrapper keys —
+    invokes ``scene.create``.
+
+    Walks the standard wrappers: ``sequence``, ``parallel``, ``choose``
+    (with options' inner ``sequence``), ``default``, and the ``then``/
+    ``else`` siblings of ``if``. Returns True on the first hit, so a deep
+    misroute is caught before the upsert reaches HA.
+    """
+    if not isinstance(action, dict):
+        return False
+    # 'service:' is the legacy key, 'action:' the modern HA service-call
+    # key (HA 2024.8+). Both reach scene.create.
+    if "scene.create" in (action.get("service"), action.get("action")):
+        return True
+    # Wrappers whose value is a list of nested actions.
+    for nested_key in ("sequence", "parallel", "default", "then", "else"):
+        nested = action.get(nested_key)
+        if isinstance(nested, list):
+            for sub in nested:
+                if _action_contains_scene_create(sub):
+                    return True
+    # ``choose``: list of ``{conditions, sequence}`` options.
+    if isinstance(action.get("choose"), list):
+        for opt in action["choose"]:
+            if isinstance(opt, dict) and isinstance(opt.get("sequence"), list):
+                for sub in opt["sequence"]:
+                    if _action_contains_scene_create(sub):
+                        return True
+    return False
+
+
 def _normalize_config_for_roundtrip(config: dict[str, Any]) -> dict[str, Any]:
     """
     Normalize automation config from GET response for direct use in SET.
@@ -371,6 +403,17 @@ class AutomationConfigTools:
         """
         Create or update a Home Assistant automation.
 
+        Before reaching for ``ha_config_set_automation``, consider whether a
+        dedicated tool fits the use case better:
+
+        - State snapshot of one or more entities (capture-then-replay,
+          no trigger needed) -> ha_config_set_scene
+        - State-derived value that recomputes when its inputs change
+          (template sensor / binary sensor / number / select)
+          -> ha_config_set_helper(helper_type='template')
+        - Stateful counter / timer / schedule / boolean / etc.
+          -> ha_config_set_helper(helper_type='counter' | 'timer' | ...)
+
         PREFER NATIVE SOLUTIONS OVER TEMPLATES (read this before writing any `{{ ... }}`):
         Native triggers/conditions/actions are validated at config load, fail loudly, and
         do not bypass HA's schema. Templates fail silently at runtime and obscure intent.
@@ -824,6 +867,55 @@ class AutomationConfigTools:
                 missing_fields=missing_fields,
             ))
 
+        # Issue #1169: reject configs that wrap ``scene.create`` in an
+        # automation with no functional trigger. Models occasionally produce
+        # these when they want a state snapshot but pattern-match to
+        # ``ha_config_set_automation`` instead of ``ha_config_set_scene``.
+        # HA's REST endpoint accepts ``trigger: []`` (or ``null``/missing)
+        # and stores a never-firing automation — corruption marker, not a
+        # draft. Only the narrow misroute pattern is rejected so legitimate
+        # empty-trigger drafts paired with other actions still pass.
+        trigger_value = config_dict.get("trigger")
+        trigger_empty = trigger_value is None or (
+            isinstance(trigger_value, list) and not trigger_value
+        )
+        if trigger_empty:
+            actions_list = coerce_to_list(config_dict.get("action"))
+            # Walks the standard HA wrappers (``sequence`` / ``parallel`` /
+            # ``choose`` / ``if``-``then``/``else``) so a nested
+            # ``scene.create`` is caught alongside the top-level case.
+            scene_create_indices = [
+                i
+                for i, a in enumerate(actions_list)
+                if _action_contains_scene_create(a)
+            ]
+            if scene_create_indices:
+                raise_tool_error(create_error_response(
+                    code=ErrorCode.VALIDATION_INVALID_PARAMETER,
+                    message=(
+                        "Empty trigger paired with a scene.create action — "
+                        "this automation can never fire. For a state snapshot "
+                        "of one or more entities, use ha_config_set_scene "
+                        "directly instead of wrapping scene.create in an "
+                        "automation."
+                    ),
+                    suggestions=[
+                        "ha_config_set_scene(scene_id='...', config={'name': "
+                        "'...', 'entities': {'<entity_id>': {...}}}) creates "
+                        "a scene without a trigger.",
+                        "If the snapshot really should be the result of an "
+                        "event, add the trigger that should fire it and keep "
+                        "the automation.",
+                        "For a state-derived value that recomputes when its "
+                        "inputs change, use "
+                        "ha_config_set_helper(helper_type='template') instead.",
+                    ],
+                    context={
+                        "scene_create_action_indices": scene_create_indices,
+                        "identifier": identifier,
+                    },
+                ))
+
         # HA accepts conditions with 'platform' (trigger syntax) but then crashes
         # with an unhelpful 500 rather than a 400 validation error.
         for idx, cond in enumerate(coerce_to_list(config_dict.get("condition"))):

{ha_mcp_dev-7.4.1.dev462 → ha_mcp_dev-7.4.1.dev464}/src/ha_mcp/tools/tools_config_scenes.py

@@ -795,13 +795,19 @@ class ConfigSceneTools:
             # the python_transform branch — a phantom category must not
             # rewrite the scene before erroring.
             #
-            # Issue #1168 R7 blocker 22: gate on the user-facing ``category``
-            # param, not ``effective_category``. ``_validate_scene_config``
-            # promotes a metadata-embedded category into ``effective_category``
-            # when the user passed ``category=None``; validating that on
-            # every call costs a category-registry round-trip even when the
-            # user wasn't trying to change the category at all.
-            if category is not None and effective_category:
+            # Issue #1168 R8 (post-merge follow-up): gate on
+            # ``effective_category`` truthy, not on the user-facing
+            # ``category`` param. ``_validate_scene_config`` promotes a
+            # top-level ``config["category"]`` into ``effective_category``
+            # when the user passed ``category=None``; the R7 fix gated on
+            # ``category is not None`` to skip the WS round-trip when no
+            # category was supplied, but that left the dict-promoted path
+            # uncovered — a phantom category in ``config["category"]``
+            # would skip validation and reach ``apply_entity_category``,
+            # which attaches the phantom ID to the entity registry without
+            # checking it exists. Truthy check covers both sources and
+            # still skips the WS call when neither produces a category.
+            if effective_category:
                 await self._validate_category_id(effective_category)
 
             # Issue #1168 R3 blocker 7: when caller passes ``config_hash``,

{ha_mcp_dev-7.4.1.dev462 → ha_mcp_dev-7.4.1.dev464/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev462
+Version: 7.4.1.dev464
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -38,7 +38,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-85-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-88-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -181,7 +181,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (85 tools)</b></summary>
+<summary><b>Complete Tool List (88 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -202,6 +202,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |
+| **Scenes** | `ha_config_get_scene`, `ha_config_remove_scene`, `ha_config_set_scene` |
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |
 | **Search & Discovery** | `ha_deep_search`, `ha_get_overview`, `ha_get_state`, `ha_search_entities` |
 | **Service & Device Control** | `ha_bulk_control`, `ha_call_service`, `ha_get_operation_status`, `ha_list_services` |