ha-mcp-dev 9.2.0.dev3474__tar.gz → 9.2.0.dev3482__tar.gz

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.2.0.dev3474
+Version: 9.2.0.dev3482
 Summary: Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants.
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien
@@ -72,7 +72,7 @@ Description-Content-Type: text/markdown
     <img src="https://img.shields.io/badge/tools-87-blue" alt="87 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>
+    <a href="LICENSE"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
     <br>
     <a href="https://github.com/homeassistant-ai/ha-mcp/commits/master"><img src="https://img.shields.io/github/commit-activity/m/homeassistant-ai/ha-mcp.svg" alt="Activity"></a>
     <a href="https://github.com/jlowin/fastmcp"><img src="https://img.shields.io/badge/Built%20with-FastMCP-purple" alt="Built with FastMCP"></a>

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/README.md

@@ -11,7 +11,7 @@
     <img src="https://img.shields.io/badge/tools-87-blue" alt="87 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>
+    <a href="LICENSE"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
     <br>
     <a href="https://github.com/homeassistant-ai/ha-mcp/commits/master"><img src="https://img.shields.io/github/commit-activity/m/homeassistant-ai/ha-mcp.svg" alt="Activity"></a>
     <a href="https://github.com/jlowin/fastmcp"><img src="https://img.shields.io/badge/Built%20with-FastMCP-purple" alt="Built with FastMCP"></a>

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.2.0.dev3474"
+version = "9.2.0.dev3482"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 requires-python = ">=3.13,<3.15"
@@ -132,7 +132,6 @@ module = [
     "tests.src.e2e.utilities.cleanup",
     "tests.src.e2e.workflows.auto_backup.test_capture_and_restore",
     "tests.src.unit._backup_snapshot_fakes",
-    "tests.src.unit._flow_walks",
     "tests.src.unit._js_harness",
     "tests.src.unit.policy.test_allow_list",
     "tests.src.unit.policy.test_evaluator",
@@ -217,9 +216,6 @@ module = [
     "tests.src.unit.test_extract_tools_field_info",
     "tests.src.unit.test_fast_checks_workflow_shape",
     "tests.src.unit.test_filesystem_doc_parity",
-    "tests.src.unit.test_flow_multistep",
-    "tests.src.unit.test_flow_name_injection",
-    "tests.src.unit.test_flow_options_preserve",
     "tests.src.unit.test_generate_locales",
     "tests.src.unit.test_get_state_fields_projection",
     "tests.src.unit.test_ha_bulk_control_component_routing",
@@ -250,11 +246,9 @@ module = [
     "tests.src.unit.test_helper_flows",
     "tests.src.unit.test_helper_input_validation",
     "tests.src.unit.test_helper_response_shape",
-    "tests.src.unit.test_helper_schema_inline",
     "tests.src.unit.test_history_helpers",
     "tests.src.unit.test_history_summary",
     "tests.src.unit.test_http_transport_options",
-    "tests.src.unit.test_identifier_validation_family",
     "tests.src.unit.test_image_info",
     "tests.src.unit.test_individual_fetch_settings",
     "tests.src.unit.test_integration_reconfigure",

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.2.0.dev3474"
+version = "9.2.0.dev3482"
 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
@@ -193,7 +193,6 @@ module = [
     "tests.src.e2e.utilities.cleanup",
     "tests.src.e2e.workflows.auto_backup.test_capture_and_restore",
     "tests.src.unit._backup_snapshot_fakes",
-    "tests.src.unit._flow_walks",
     "tests.src.unit._js_harness",
     "tests.src.unit.policy.test_allow_list",
     "tests.src.unit.policy.test_evaluator",
@@ -278,9 +277,6 @@ module = [
     "tests.src.unit.test_extract_tools_field_info",
     "tests.src.unit.test_fast_checks_workflow_shape",
     "tests.src.unit.test_filesystem_doc_parity",
-    "tests.src.unit.test_flow_multistep",
-    "tests.src.unit.test_flow_name_injection",
-    "tests.src.unit.test_flow_options_preserve",
     "tests.src.unit.test_generate_locales",
     "tests.src.unit.test_get_state_fields_projection",
     "tests.src.unit.test_ha_bulk_control_component_routing",
@@ -311,11 +307,9 @@ module = [
     "tests.src.unit.test_helper_flows",
     "tests.src.unit.test_helper_input_validation",
     "tests.src.unit.test_helper_response_shape",
-    "tests.src.unit.test_helper_schema_inline",
     "tests.src.unit.test_history_helpers",
     "tests.src.unit.test_history_summary",
     "tests.src.unit.test_http_transport_options",
-    "tests.src.unit.test_identifier_validation_family",
     "tests.src.unit.test_image_info",
     "tests.src.unit.test_individual_fetch_settings",
     "tests.src.unit.test_integration_reconfigure",

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/src/ha_mcp/backup_integrations.py

@@ -185,19 +185,18 @@ def _options_not_restored(
 async def _restore_options(
     client: Any, entity_id: str, config: Any, current_options: dict[str, Any]
 ) -> None:
-    from .tools.config_entry_flow import update_config_entry_options
+    from .tools.config_entry_flow import restore_config_entry_options
 
     bm = _manager()
     options = config["options"]
     await bm._apply_and_verify(
         f"{config.get('domain')} integration",
         partial(
-            update_config_entry_options,
+            restore_config_entry_options,
             client,
             entity_id,
             options,
             expected_domain=config.get("domain"),
-            keep_current_values=False,
             fixed_options=current_options,
         ),
         partial(

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/src/ha_mcp/backup_manager.py

@@ -2979,7 +2979,7 @@ async def _restore_flow_helper(
     none of its forms offers (fixed at creation, like a template's type) must
     still match the stored one, or the restore is refused unapplied.
     """
-    from .tools.config_entry_flow import update_config_entry_options
+    from .tools.config_entry_flow import restore_config_entry_options
 
     label = _flow_label(helper_type)
     snapshot = _flow_snapshot_for_restore(entity_id, config, helper_type)
@@ -3000,13 +3000,11 @@ async def _restore_flow_helper(
     return await _apply_and_verify(
         f"{label} helper",
         partial(
-            update_config_entry_options,
+            restore_config_entry_options,
             client,
             entry_id,
             options,
             expected_domain=helper_type,
-            noun="helper",
-            keep_current_values=False,
             fixed_options=current["options"],
         ),
         partial(
@@ -3130,7 +3128,7 @@ async def _recreate_flow_helper(
     client: Any, entry_id: str, snapshot: dict[str, Any], helper_type: str
 ) -> dict[str, Any]:
     """Create through the ordinary helper flow; never retry uncertain writes."""
-    from .tools.config_entry_flow import CreationFlowError, create_flow_helper
+    from .tools.config_entry_flow import CreationFlowError, recreate_flow_helper
 
     label = _flow_label(helper_type)
     snapshot = _flow_snapshot_for_restore(entry_id, snapshot, helper_type)
@@ -3150,8 +3148,8 @@ async def _recreate_flow_helper(
     try:
         # A menu-rooted creation flow is answered from the snapshot's options
         # (a template's template_type names its branch).
-        result = await create_flow_helper(
-            client, helper_type, dict(snapshot["options"]), complete_snapshot=True
+        result = await recreate_flow_helper(
+            client, helper_type, dict(snapshot["options"])
         )
     except CreationFlowError as err:
         _log_flow_helper_failure("create_entry", err)

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/src/ha_mcp/server_tool_text.py

@@ -296,8 +296,14 @@ LITE_DOCSTRINGS: dict[str, str] = {
         "flow-based types (template, group, utility_meter, "
         "derivative, statistics, trend, threshold, filter, "
         "switch_as_x, and others).\n\n"
-        "Field set is delivered as `data_schema` on the first "
-        "validation error — submit once and self-correct. For "
+        "A simple type is written in one call; Home Assistant "
+        "validates it and its error names any mistake. A flow-based type runs "
+        "Home Assistant's flow one step per call: a call without "
+        "`config` returns the form's fields and a `flow_id`, which "
+        "continues the flow with `config` (a form) or `menu_choice` "
+        "(a menu) until Home Assistant saves the helper. A `config` "
+        "list answers several forms in one call, one object per form "
+        "in order. For "
         "decision matrix and worked examples (which helper type "
         "for which use case), see ha_get_skill_guide or your "
         "locally installed skills."

{ha_mcp_dev-9.2.0.dev3474 → ha_mcp_dev-9.2.0.dev3482}/src/ha_mcp/tools/component_api.py

@@ -41,6 +41,7 @@ from ..client.rest_client import (
     HomeAssistantAdminRequiredError,
     HomeAssistantAuthError,
     HomeAssistantCommandError,
+    HomeAssistantCommandNotSent,
     HomeAssistantCommandTimeout,
     HomeAssistantConnectionError,
 )
@@ -617,3 +618,38 @@ def webhook_auth(info: InfoResult | None) -> str | None:
     """
     auth = info.get("webhook_auth") if info else None
     return auth if isinstance(auth, str) else None
+
+
+# Said wherever a response is poorer for want of a component command.
+COMPONENT_INSTALL_HINT = (
+    "Install or update the ha_mcp_tools component via HACS (the Marketplace "
+    "on Home Assistant 2026.11+) and restart Home Assistant."
+)
+
+
+async def component_serves(client: Any, capability: str) -> bool:
+    """Whether the installed component advertises ``capability``."""
+    return component_supports(await get_component_caps(client), capability)
+
+
+async def ask_component(
+    client: Any, command: str, **params: Any
+) -> dict[str, Any] | None:
+    """The component's reply to ``ha_mcp_tools/<command>``, a command whose
+    capability has its name. ``None`` when the component does not advertise
+    it, the command was not sent, or it was refused: the caller then works
+    from Core's own commands."""
+    if not await component_serves(client, command):
+        return None
+    try:
+        reply = await client.send_websocket_message(
+            {"type": f"ha_mcp_tools/{command}", **params}
+        )
+    except HomeAssistantCommandNotSent:
+        return None
+    if not reply.get("success"):
+        if reply.get("error_code") == UNKNOWN_COMMAND_CODE:
+            invalidate_caps(client)
+        return None
+    result = reply.get("result")
+    return result if isinstance(result, dict) else None

ha_mcp_dev-9.2.0.dev3482/src/ha_mcp/tools/component_flow.py

@@ -0,0 +1,78 @@
+"""What Core knows about a flow that its flow endpoints do not report, read
+through the ``ha_mcp_tools`` component.
+
+``flow_record`` is Core's record of a flow in progress (what it was started
+for). ``flow_outline`` is the steps Core declares for a schema-based flow,
+which is how a form after the first is known without answering the ones
+before it. Both return ``None`` when no component answers, and the caller
+then works from the step Core returns alone.
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from .component_api import ask_component
+
+
+async def flow_record(client: Any, manager: str, flow_id: str) -> dict[str, Any] | None:
+    """Core's record of ``flow_id`` in its ``config``, ``options`` or
+    ``subentries`` flow manager: ``found``, and when found the flow's
+    ``handler``, ``source``, ``entry_id`` and ``subentry_id``."""
+    return await ask_component(client, "flow_record", manager=manager, flow_id=flow_id)
+
+
+async def flow_outline(
+    client: Any, domain: str, flow: str
+) -> list[dict[str, Any]] | None:
+    """The steps Core declares for ``domain``'s ``config`` or ``options``
+    flow, in Core's order; ``None`` for a flow that is not declared as a
+    mapping of steps."""
+    result = await ask_component(client, "flow_outline", domain=domain, flow=flow)
+    steps = result.get("steps") if result and result.get("supported") else None
+    if not isinstance(steps, list):
+        return None
+    return [step for step in steps if isinstance(step, dict)]
+
+
+def steps_after(
+    steps: list[dict[str, Any]], step_id: str
+) -> list[tuple[dict[str, Any], bool]] | None:
+    """The steps Core may show after ``step_id``, each with whether it always
+    follows. Where Core picks the next step from the answers, every step not
+    yet passed is listed as a candidate: the declaration does not say which
+    of them the callback can return. A step Core passes without
+    showing a form is followed, not listed. ``None`` when the outline does not
+    hold ``step_id`` (a reconfigure step is not part of it).
+    """
+    by_id = {step.get("step_id"): step for step in steps}
+    current = by_id.get(step_id)
+    if current is None:
+        return None
+    later: list[tuple[dict[str, Any], bool]] = []
+    seen = {step_id}
+    while True:
+        if current.get("next_from_answers"):
+            later.extend(
+                (step, False)
+                for name, step in by_id.items()
+                if name not in seen and _shown(step)
+            )
+            break
+        current = by_id.get(current.get("next_step"))
+        if current is None or current["step_id"] in seen:
+            break
+        seen.add(current["step_id"])
+        if _shown(current):
+            later.append((current, True))
+    return later
+
+
+def _shown(step: dict[str, Any]) -> bool:
+    """Whether Core shows something at ``step``: a form step declared without
+    a schema is passed straight through."""
+    return (
+        step.get("type") != "form"
+        or step.get("data_schema") is not None
+        or bool(step.get("schema_from_answers"))
+    )