ha-mcp-dev 7.12.3.dev1934__tar.gz → 7.12.3.dev1940__tar.gz

{ha_mcp_dev-7.12.3.dev1934/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.12.3.dev1940}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.12.3.dev1934
+Version: 7.12.3.dev1940
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -41,7 +41,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-87-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>
@@ -83,12 +83,13 @@ The recommended way to run ha-mcp is the **HA-MCP Custom Component**. It install
 
 **Connect URL.** The Configure screen gives you a Home Assistant webhook URL for remote clients — `https://<your-ha-domain>/api/webhook/<webhook-id>` through Nabu Casa or any reverse proxy already pointed at Home Assistant (locally, `http://<ha-host>:8123/api/webhook/<webhook-id>`). For clients on the same network, the server is also reachable directly at `http://<ha-ip>:9584/private_<random>`.
 
+- **Replaces other install methods:** the in-process server is a complete, standalone ha-mcp install — it takes the place of the add-on, Docker, and uvx/PyPI (stdio) methods. Run only one; do not run the in-process server alongside another install.
 - **Local only?** Turn off **Remote access via webhook** in the entry options — no webhook is registered at all, while the direct port and sidebar panel keep working.
 - **Settings panel:** while the server runs, an admin-only **HA-MCP** panel appears in the Home Assistant sidebar for managing tools, feature flags, backups, and themes.
 - **Optional authentication:** set **Webhook authentication** to `ha_auth` to require a Home Assistant account sign-in instead of using the secret URL as the credential.
 - **Manual install (no HACS):** copy `custom_components/ha_mcp_tools/` from this repository into your Home Assistant `config/custom_components/` directory, then restart and add the integration as above.
 
-The component's second entry type, **HA MCP Tools**, is only needed if you enable ha-mcp's opt-in file and YAML editing tools (feature flags, off by default) — skip it otherwise; you can add it later at any time.
+The component's second entry type, the **File & YAML services entry** (**HA-MCP File & YAML Tools**), is only needed if you enable ha-mcp's opt-in file and YAML editing tools (feature flags, off by default) — skip it otherwise; you can add it later at any time. It works with any server type (in-process, add-on, Docker, or stdio).
 
 [Full in-process server documentation →](docs/in-process-server.md) · [Setup Wizard for client-specific config →](https://homeassistant-ai.github.io/ha-mcp/setup/)
 
@@ -246,7 +247,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (87 tools)</b></summary>
+<summary><b>Complete Tool List (88 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -275,7 +276,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |
 | **Search & Discovery** | `ha_get_overview`, `ha_get_state`, `ha_search` |
 | **Service & Device Control** | `ha_bulk_control`, `ha_call_event`, `ha_call_service`, `ha_get_operation_status`, `ha_list_services` |
-| **System** | `ha_config_set_yaml` *(beta)*, `ha_manage_backup`, `ha_manage_custom_tool` *(beta)*, `ha_manage_theme`, `ha_manage_updates`, `ha_reload_core`, `ha_restart` |
+| **System** | `ha_config_get_yaml` *(beta)*, `ha_config_set_yaml` *(beta)*, `ha_manage_backup`, `ha_manage_custom_tool` *(beta)*, `ha_manage_theme`, `ha_manage_updates`, `ha_reload_core`, `ha_restart` |
 | **Todo Lists** | `ha_get_todo`, `ha_remove_todo_item`, `ha_set_todo_item` |
 | **Utilities** | `ha_eval_template`, `ha_install_mcp_tools` *(beta)*, `ha_report_issue` |
 | **Zones** | `ha_get_zone`, `ha_remove_zone`, `ha_set_zone` |
@@ -307,7 +308,7 @@ ha-mcp is a standalone server built for **configuring, building, and debugging**
 
 ## 🔌 Custom Component (ha_mcp_tools) — File & YAML Services
 
-The **HA-MCP Custom Component** also powers a set of privileged tools that standard Home Assistant APIs can't provide: file system access and YAML config editing. (The same component runs the full server in-process — that's the recommended install in the **Get Started** section at the top.) Its **HA MCP Tools** services entry enables the tools below.
+The **HA-MCP Custom Component** also powers a set of privileged tools that standard Home Assistant APIs can't provide: file system access and YAML config editing. (The same component runs the full server in-process — that's the recommended install in the **Get Started** section at the top.) Its **File & YAML services entry** (**HA-MCP File & YAML Tools**) enables the tools below.
 
 **Tools that require the component:**
 
@@ -325,13 +326,13 @@ These tools also require beta feature flags. See **[Beta Features](docs/beta.md)
 
 ### Install
 
-Install the **HA MCP Tools** services entry from the same **HA-MCP Custom Component**:
+Install the **HA-MCP File & YAML Tools** entry from the same **HA-MCP Custom Component**:
 
 [![Open your Home Assistant instance and open a repository inside the Home Assistant Community Store.](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=homeassistant-ai&repository=ha-mcp-integration&category=integration)
 
 To add manually: open **HACS** > **Integrations** > three-dot menu > **Custom repositories** > add `https://github.com/homeassistant-ai/ha-mcp-integration` (category: Integration) > **Download**. Or copy `custom_components/ha_mcp_tools/` from this repository into your HA `config/custom_components/` directory.
 
-After installing, restart Home Assistant, then open **Settings** > **Devices & Services** > **Add Integration**, search for **HA-MCP Custom Component**, and add the **HA MCP Tools** services entry.
+After installing, restart Home Assistant, then open **Settings** > **Devices & Services** > **Add Integration**, search for **HA-MCP Custom Component**, and add the **HA-MCP File & YAML Tools** entry.
 
 To run the full ha-mcp server in-process through this same component, see the **Get Started** section at the top and the [full in-process server documentation →](docs/in-process-server.md).
 
@@ -477,7 +478,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 - **[@TomasDJo](https://github.com/TomasDJo)** — Category support for automations, scripts, and scenes.
 - **[@bzelch](https://github.com/bzelch)** — `python_transform` support for automations and scripts.
 - **[@gcormier](https://github.com/gcormier)** — Windows installer improvements: removed unused variable and fixed terminal closing after install.
-- **[@ekobres](https://github.com/ekobres)** — Feature flags for `HAMCP_ENABLE_FILESYSTEM_TOOLS` and `HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION` in the add-on config, with beta tagging in source and docs.
+- **[@ekobres](https://github.com/ekobres)** — Feature flags for `HAMCP_ENABLE_FILESYSTEM_TOOLS` and the (since removed) `HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION` in the add-on config, with beta tagging in source and docs.
 - **[@w3z315](https://github.com/w3z315)** — Financial support via [GitHub Sponsors](https://github.com/sponsors/julienld). Thank you! ☕
 - **[@griffinmartin](https://github.com/griffinmartin)** — Added OpenCode (by Anomaly) as a selectable AI client in the setup wizard, with both stdio and streamable HTTP support.
 - **[@hhopke](https://github.com/hhopke)** — Fixed addon API calls to route through HA Core ingress proxy instead of direct container connections, fixing `ha_manage_addon` proxy mode on addon installs.

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/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-87-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>
@@ -50,12 +50,13 @@ The recommended way to run ha-mcp is the **HA-MCP Custom Component**. It install
 
 **Connect URL.** The Configure screen gives you a Home Assistant webhook URL for remote clients — `https://<your-ha-domain>/api/webhook/<webhook-id>` through Nabu Casa or any reverse proxy already pointed at Home Assistant (locally, `http://<ha-host>:8123/api/webhook/<webhook-id>`). For clients on the same network, the server is also reachable directly at `http://<ha-ip>:9584/private_<random>`.
 
+- **Replaces other install methods:** the in-process server is a complete, standalone ha-mcp install — it takes the place of the add-on, Docker, and uvx/PyPI (stdio) methods. Run only one; do not run the in-process server alongside another install.
 - **Local only?** Turn off **Remote access via webhook** in the entry options — no webhook is registered at all, while the direct port and sidebar panel keep working.
 - **Settings panel:** while the server runs, an admin-only **HA-MCP** panel appears in the Home Assistant sidebar for managing tools, feature flags, backups, and themes.
 - **Optional authentication:** set **Webhook authentication** to `ha_auth` to require a Home Assistant account sign-in instead of using the secret URL as the credential.
 - **Manual install (no HACS):** copy `custom_components/ha_mcp_tools/` from this repository into your Home Assistant `config/custom_components/` directory, then restart and add the integration as above.
 
-The component's second entry type, **HA MCP Tools**, is only needed if you enable ha-mcp's opt-in file and YAML editing tools (feature flags, off by default) — skip it otherwise; you can add it later at any time.
+The component's second entry type, the **File & YAML services entry** (**HA-MCP File & YAML Tools**), is only needed if you enable ha-mcp's opt-in file and YAML editing tools (feature flags, off by default) — skip it otherwise; you can add it later at any time. It works with any server type (in-process, add-on, Docker, or stdio).
 
 [Full in-process server documentation →](docs/in-process-server.md) · [Setup Wizard for client-specific config →](https://homeassistant-ai.github.io/ha-mcp/setup/)
 
@@ -213,7 +214,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (87 tools)</b></summary>
+<summary><b>Complete Tool List (88 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -242,7 +243,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |
 | **Search & Discovery** | `ha_get_overview`, `ha_get_state`, `ha_search` |
 | **Service & Device Control** | `ha_bulk_control`, `ha_call_event`, `ha_call_service`, `ha_get_operation_status`, `ha_list_services` |
-| **System** | `ha_config_set_yaml` *(beta)*, `ha_manage_backup`, `ha_manage_custom_tool` *(beta)*, `ha_manage_theme`, `ha_manage_updates`, `ha_reload_core`, `ha_restart` |
+| **System** | `ha_config_get_yaml` *(beta)*, `ha_config_set_yaml` *(beta)*, `ha_manage_backup`, `ha_manage_custom_tool` *(beta)*, `ha_manage_theme`, `ha_manage_updates`, `ha_reload_core`, `ha_restart` |
 | **Todo Lists** | `ha_get_todo`, `ha_remove_todo_item`, `ha_set_todo_item` |
 | **Utilities** | `ha_eval_template`, `ha_install_mcp_tools` *(beta)*, `ha_report_issue` |
 | **Zones** | `ha_get_zone`, `ha_remove_zone`, `ha_set_zone` |
@@ -274,7 +275,7 @@ ha-mcp is a standalone server built for **configuring, building, and debugging**
 
 ## 🔌 Custom Component (ha_mcp_tools) — File & YAML Services
 
-The **HA-MCP Custom Component** also powers a set of privileged tools that standard Home Assistant APIs can't provide: file system access and YAML config editing. (The same component runs the full server in-process — that's the recommended install in the **Get Started** section at the top.) Its **HA MCP Tools** services entry enables the tools below.
+The **HA-MCP Custom Component** also powers a set of privileged tools that standard Home Assistant APIs can't provide: file system access and YAML config editing. (The same component runs the full server in-process — that's the recommended install in the **Get Started** section at the top.) Its **File & YAML services entry** (**HA-MCP File & YAML Tools**) enables the tools below.
 
 **Tools that require the component:**
 
@@ -292,13 +293,13 @@ These tools also require beta feature flags. See **[Beta Features](docs/beta.md)
 
 ### Install
 
-Install the **HA MCP Tools** services entry from the same **HA-MCP Custom Component**:
+Install the **HA-MCP File & YAML Tools** entry from the same **HA-MCP Custom Component**:
 
 [![Open your Home Assistant instance and open a repository inside the Home Assistant Community Store.](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=homeassistant-ai&repository=ha-mcp-integration&category=integration)
 
 To add manually: open **HACS** > **Integrations** > three-dot menu > **Custom repositories** > add `https://github.com/homeassistant-ai/ha-mcp-integration` (category: Integration) > **Download**. Or copy `custom_components/ha_mcp_tools/` from this repository into your HA `config/custom_components/` directory.
 
-After installing, restart Home Assistant, then open **Settings** > **Devices & Services** > **Add Integration**, search for **HA-MCP Custom Component**, and add the **HA MCP Tools** services entry.
+After installing, restart Home Assistant, then open **Settings** > **Devices & Services** > **Add Integration**, search for **HA-MCP Custom Component**, and add the **HA-MCP File & YAML Tools** entry.
 
 To run the full ha-mcp server in-process through this same component, see the **Get Started** section at the top and the [full in-process server documentation →](docs/in-process-server.md).
 
@@ -444,7 +445,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 - **[@TomasDJo](https://github.com/TomasDJo)** — Category support for automations, scripts, and scenes.
 - **[@bzelch](https://github.com/bzelch)** — `python_transform` support for automations and scripts.
 - **[@gcormier](https://github.com/gcormier)** — Windows installer improvements: removed unused variable and fixed terminal closing after install.
-- **[@ekobres](https://github.com/ekobres)** — Feature flags for `HAMCP_ENABLE_FILESYSTEM_TOOLS` and `HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION` in the add-on config, with beta tagging in source and docs.
+- **[@ekobres](https://github.com/ekobres)** — Feature flags for `HAMCP_ENABLE_FILESYSTEM_TOOLS` and the (since removed) `HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION` in the add-on config, with beta tagging in source and docs.
 - **[@w3z315](https://github.com/w3z315)** — Financial support via [GitHub Sponsors](https://github.com/sponsors/julienld). Thank you! ☕
 - **[@griffinmartin](https://github.com/griffinmartin)** — Added OpenCode (by Anomaly) as a selectable AI client in the setup wizard, with both stdio and streamable HTTP support.
 - **[@hhopke](https://github.com/hhopke)** — Fixed addon API calls to route through HA Core ingress proxy instead of direct container connections, fixing `ha_manage_addon` proxy mode on addon installs.

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.12.3.dev1934"
+version = "7.12.3.dev1940"
 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-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/config.py

@@ -257,14 +257,6 @@ class Settings(BaseSettings):
     # other gated capability.
     enable_filesystem_tools: bool = Field(False, alias="HAMCP_ENABLE_FILESYSTEM_TOOLS")
 
-    # Custom-component installer (``ha_install_mcp_tools``) — pulls the
-    # ``ha_mcp_tools`` integration into HACS. Same env-var-direct
-    # background as ``enable_filesystem_tools``; promoted for the same
-    # reason.
-    enable_custom_component_integration: bool = Field(
-        False, alias="HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION"
-    )
-
     # Dashboard screenshot mode — the ``ha_get_dashboard_screenshot`` tool
     # plus the ``include_screenshot`` / ``return_screenshot`` params on the
     # dashboard get/set tools. Renders responsive Lovelace images via a
@@ -356,15 +348,15 @@ class Settings(BaseSettings):
     )
 
     # Mirror the legacy ``os.getenv("FLAG", "").lower() in ("true", ...)``
-    # semantics for the two ex-direct-getenv flags: an empty env var
-    # value MUST be treated as False rather than raising
+    # semantics for the ex-direct-getenv ``enable_filesystem_tools`` flag (and
+    # its sibling toggles listed above): an empty env var value MUST be treated
+    # as False rather than raising
     # ``ValidationError``. Pydantic v2's bool parser raises on ``""``
     # which broke ``test_tools_filesystem.py::TestFeatureFlag::
     # test_disabled_with_empty_string`` after the migration; this
     # validator restores the contract callers rely on.
     @field_validator(
         "enable_filesystem_tools",
-        "enable_custom_component_integration",
         "enable_dashboard_screenshot",
         mode="before",
     )
@@ -693,11 +685,6 @@ FEATURE_FLAG_FIELDS: tuple[FeatureFlagField, ...] = (
     FeatureFlagField("enable_yaml_packages_scene", "ENABLE_YAML_PACKAGES_SCENE", bool),
     FeatureFlagField("enable_lite_docstrings", "ENABLE_LITE_DOCSTRINGS", bool),
     FeatureFlagField("enable_filesystem_tools", "HAMCP_ENABLE_FILESYSTEM_TOOLS", bool),
-    FeatureFlagField(
-        "enable_custom_component_integration",
-        "HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION",
-        bool,
-    ),
     # ``enable_code_mode`` lives in this tuple so the override file (and
     # the web UI Server Settings tab) can write the flag. Without this
     # entry, the UI save logic would have nowhere to land the value.
@@ -744,7 +731,6 @@ BETA_FEATURE_FIELDS: tuple[str, ...] = (
     "enable_yaml_packages_script",
     "enable_yaml_packages_scene",
     "enable_filesystem_tools",
-    "enable_custom_component_integration",
     "enable_code_mode",
     "enable_lite_docstrings",
     "enable_dashboard_screenshot",

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/settings_ui/_tools_meta.py

@@ -89,7 +89,7 @@ TRANSFORM_GENERATED_TOOLS: dict[str, ToolStub] = {}
 # won't appear in local_provider._list_tools(), so we inject stub entries
 # into the settings UI so users discover the tool exists and how to enable
 # it. Keep this dict in sync with the ``"beta"`` tag added to each tool's
-# source file (tools_yaml_config.py, tools_filesystem.py, tools_mcp_component.py,
+# source file (tools_yaml_config.py, tools_yaml_read.py, tools_filesystem.py,
 # tools_code.py) — a future rename or removal needs to land in both places.
 FEATURE_GATED_TOOLS: dict[str, ToolStub] = {
     "ha_config_set_yaml": {
@@ -99,6 +99,13 @@ FEATURE_GATED_TOOLS: dict[str, ToolStub] = {
         "disabled_by": "enable_yaml_config_editing",
         "destructiveHint": True,
     },
+    "ha_config_get_yaml": {
+        "title": "Read YAML Config Fragment",
+        "primary_tag": "System",
+        "description": "Read the YAML fragment under a key in a config file, or find which file defines it.",
+        "disabled_by": "enable_filesystem_tools",
+        "readOnlyHint": True,
+    },
     "ha_manage_custom_tool": {
         "title": "Custom Tool",
         "primary_tag": "System",
@@ -134,13 +141,6 @@ FEATURE_GATED_TOOLS: dict[str, ToolStub] = {
         "disabled_by": "enable_filesystem_tools",
         "destructiveHint": True,
     },
-    "ha_install_mcp_tools": {
-        "title": "Install MCP Tools Component",
-        "primary_tag": "Utilities",
-        "description": "Install the ha_mcp_tools custom component via HACS.",
-        "disabled_by": "enable_custom_component_integration",
-        "destructiveHint": True,
-    },
 }
 
 

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/settings_ui/settings.js

@@ -1616,10 +1616,6 @@ const FEATURE_META = {
     label: "Enable filesystem tools (beta)",
     help: "Sets HAMCP_ENABLE_FILESYSTEM_TOOLS=true. Enables direct file read/write access to your Home Assistant filesystem. WARNING: This gives the MCP server sensitive direct file access to your system. Only enable if you trust the AI assistant with file operations. Requires restart to take effect.",
   },
-  enable_custom_component_integration: {
-    label: "Enable custom component integration (beta)",
-    help: "Sets HAMCP_ENABLE_CUSTOM_COMPONENT_INTEGRATION=true. Enables the ha_install_mcp_tools installer tool, which can help install the ha_mcp_tools custom component. This setting does not control whether the MCP server loads or interacts with the custom component, and it is not required for filesystem tools to function. Only enable if you want to allow the AI assistant to use the installer tool. Requires restart to take effect.",
-  },
   enable_code_mode: {
     label: "Enable code-mode sandbox (beta)",
     help: "Beta feature, disabled by default. Enables ha_manage_custom_tool, a sandboxed Python interpreter (pydantic-monty) that lets AI assistants write/run/save/delete custom tools when no built-in tool covers the request. Sandbox cannot touch the filesystem or arbitrary network, but CAN call any registered MCP tool, hit the HA REST API, or send HA WebSocket commands, effectively 'do whatever existing tools allow you to do, in any combination'. Saved tools persist and are visible to any client that can connect to ha-mcp. See docs/beta.md for known limitations. Requires restart to take effect.",

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/tools/tools_bug_report.py

@@ -211,10 +211,9 @@ def _detect_platform() -> dict[str, str]:
 # ``enable_beta_features`` leads the list because it is the master gate: when
 # off it force-disables every beta sub-flag (filesystem tools, code mode, YAML
 # editing, ...) regardless of the sub-flag's own value, so a "missing tool"
-# report is meaningless without it. ``enable_filesystem_tools`` and
-# ``enable_custom_component_integration`` are the exact beta-gated tool families
-# from issue #1804 — surfacing them lets triage see at a glance whether the tool
-# the user couldn't find was even enabled server-side.
+# report is meaningless without it. ``enable_filesystem_tools`` is a beta-gated
+# tool family from issue #1804 — surfacing it lets triage see at a glance whether
+# the tool the user couldn't find was even enabled server-side.
 _CONFIG_TOGGLE_FIELDS: tuple[str, ...] = (
     "enable_beta_features",
     "enable_websocket",
@@ -223,7 +222,6 @@ _CONFIG_TOGGLE_FIELDS: tuple[str, ...] = (
     "tool_search_max_results",
     "enable_yaml_config_editing",
     "enable_filesystem_tools",
-    "enable_custom_component_integration",
     "enable_code_mode",
     "enabled_tool_modules",
 )

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/tools/tools_dev.py

@@ -126,7 +126,8 @@ async def find_server_config_entry(
 
     Probes each ``ha_mcp_tools`` entry's options flow: the server entry's
     flow is a form whose schema carries the ``pip_spec`` field; the tools
-    (services) entry's flow aborts immediately. Returns
+    (services) entry's flow is an informational form with no ``pip_spec``
+    field, so it never matches. Returns
     ``(entry_id, open_flow, current_options)`` with the options flow left
     OPEN (callers must submit or abort it), or ``None`` when no server
     entry exists. ``current_options`` maps schema field names to their current

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/tools/tools_filesystem.py

@@ -7,8 +7,10 @@ configuration directory, enabling AI assistants to:
 - List files in allowed directories
 - Write/delete files in restricted directories (www/, themes/, custom_templates/)
 
-**Dependency:** Requires the ha_mcp_tools custom component to be installed.
-The tools will gracefully fail with installation instructions if the component is not available.
+**Dependency:** Requires the ha_mcp_tools custom component, added in HA via its
+"HA-MCP File & YAML Tools" config entry (NOT the "HA-MCP Server" entry, which
+starts a redundant in-process server). The tools will gracefully fail with
+installation instructions if the component is not available.
 
 Feature Flag: Set HAMCP_ENABLE_FILESYSTEM_TOOLS=true to enable these tools.
 """
@@ -74,7 +76,14 @@ CALLER_TOKEN_BOOTSTRAP_SERVICE = "get_caller_token"
 # ENABLE_YAML_EDIT_CONFIRM, default on); a <0.11.0 component's strict
 # (PREVENT_EXTRA) schema rejects the unknown arg with a raw voluptuous
 # error — the gate surfaces an actionable "update" prompt instead.
-MIN_COMPONENT_VERSION = "0.11.0"
+# 1.1.0: the YAML fragment read (#1788) needs two component behaviours that a
+# <1.1.0 component reports no differently from a missing key. ``list_files``
+# only now honours the configured packages folder, so ha_config_get_yaml's
+# glob/discovery would otherwise come back "Path not allowed" instead of
+# enumerating packages; and ``include_parsed`` on ``read_file`` is a new arg
+# that an older strict (PREVENT_EXTRA) schema rejects with a raw voluptuous
+# error. The gate turns both into the actionable "update" prompt.
+MIN_COMPONENT_VERSION = "1.1.0"
 
 
 def _version_tuple(version: str) -> tuple[int, ...]:
@@ -134,7 +143,7 @@ def _raise_component_too_old(detail: str) -> NoReturn:
             f"This ha-mcp release requires >= {MIN_COMPONENT_VERSION}. "
             "Update via HACS and restart Home Assistant.",
             suggestions=[
-                "HACS → Integrations → HA MCP Tools → Update",
+                "HACS → Integrations → HA-MCP Custom Component → Update",
                 "Restart Home Assistant after update completes",
                 "Then retry the operation",
             ],
@@ -355,8 +364,17 @@ async def _assert_mcp_tools_available(client: Any) -> None:
         raise_tool_error(
             create_error_response(
                 ErrorCode.COMPONENT_NOT_INSTALLED,
-                f"The {MCP_TOOLS_DOMAIN} custom component is not installed. "
-                "Use ha_install_mcp_tools() to install it via HACS, then restart Home Assistant.",
+                f"The {MCP_TOOLS_DOMAIN} custom component is not installed.",
+                suggestions=[
+                    'Add the repository to HACS: ha_manage_hacs(action="add_repository",'
+                    + ' repository="homeassistant-ai/ha-mcp-integration", category="integration")',
+                    'Download the component: ha_manage_hacs(action="download",'
+                    + ' repository_id="homeassistant-ai/ha-mcp-integration")',
+                    "Restart Home Assistant (ha_restart) so the integration loads",
+                    'In HA, add the "HA-MCP Custom Component" integration and choose the'
+                    + ' "HA-MCP File & YAML Tools" entry — NOT "HA-MCP Server", which starts'
+                    + " a second in-process server this ha-mcp server does not need",
+                ],
             )
         )
 
@@ -511,6 +529,19 @@ class FilesystemTools:
                 ),
             ),
         ] = None,
+        yaml_path: Annotated[
+            str | None,
+            Field(
+                default=None,
+                description=(
+                    "Dotted YAML key path (e.g. 'alert2', 'mqtt.sensor'). When "
+                    "set, the response also carries 'subtree': the round-trip "
+                    "text of just that key's value. To look a key up across "
+                    "packages/*.yaml, or to get it as structured data, use "
+                    "ha_config_get_yaml instead."
+                ),
+            ),
+        ] = None,
     ) -> dict[str, Any]:
         """Read a file from the Home Assistant config directory.
 
@@ -541,6 +572,9 @@ class FilesystemTools:
         - size: File size in bytes
         - modified: Last modification timestamp
         - path: The file path that was read
+        - subtree: Round-trip text of the `yaml_path` key, when that arg is set
+          (null when the key is absent). Comments and HA tags (`!secret`,
+          `!include`) survive as written — a `!secret` is never resolved.
 
         **Example:**
         ```python
@@ -549,6 +583,9 @@ class FilesystemTools:
 
         # Read last 100 lines of log
         result = ha_read_file(path="home-assistant.log", tail_lines=100)
+
+        # Read just the alert2 block out of a package file
+        result = ha_read_file(path="packages/alert2.yaml", yaml_path="alert2")
         ```
         """
         try:
@@ -559,6 +596,8 @@ class FilesystemTools:
             service_data: dict[str, Any] = {"path": path}
             if tail_lines is not None:
                 service_data["tail_lines"] = tail_lines
+            if yaml_path is not None:
+                service_data["yaml_path"] = yaml_path
 
             # Call the custom component service
             result = await call_mcp_tools_service(

{ha_mcp_dev-7.12.3.dev1934 → ha_mcp_dev-7.12.3.dev1940}/src/ha_mcp/tools/tools_hacs.py

@@ -685,21 +685,10 @@ def _filter_and_score_repos(
 # load-bearing contract is this signal name, not where it's defined.
 HACS_REPOSITORY_SIGNAL = "hacs_dispatch_repository"
 
-# Wall-clock budget for ``wait_for_repo_registration``. Generous
-# because the constraint is "HACS finishes registration": adding a
-# fresh repo makes HACS clone/index it over the network, which on a
-# slow link (or a loaded HAOS E2E runner) can exceed 30 s — the prior
-# value, which flaked ``test_install_mcp_tools_*`` with "Could not
-# find repository ID after adding". The subscription nudges us the
-# instant registration lands, so the happy path returns in seconds and
-# this larger cap only ever costs wall-clock on a genuinely slow add.
-HACS_REPO_REGISTRATION_TIMEOUT = 60.0
-
-# Budget for the initial ``hacs/subscribe`` ack. Smaller than the
-# overall registration timeout so a slow subscribe doesn't consume
-# the whole budget before any ``queue.get()`` runs — subscribe acks
-# return in milliseconds in practice, so 10 s is generous and still
-# leaves 20 s of headroom for the queue wait.
+# Budget for the initial ``hacs/subscribe`` ack, separate from the
+# caller-supplied registration budget so a slow subscribe surfaces as
+# its own failure instead of silently consuming the wait — subscribe
+# acks return in milliseconds in practice, so 10 s is generous.
 HACS_SUBSCRIBE_TIMEOUT = 10.0
 
 # Backstop poll cadence inside ``wait_for_repo_registration`` —
@@ -720,11 +709,11 @@ HACS_ADD_REGISTRATION_TIMEOUT = 10.0
 
 # Wall-clock budget for ``_resolve_hacs_repo_id`` (the ``owner/repo`` lookup
 # behind read-only ``ha_get_hacs_info(action="info")`` and
-# ``ha_manage_hacs(action="download")``). Unlike ``ha_install_mcp_tools`` —
-# which adds a repo and then waits the full ``HACS_REPO_REGISTRATION_TIMEOUT``
-# for that fresh registration to land — a plain info/download lookup targets a
+# ``ha_manage_hacs(action="download")``). A plain info/download lookup targets a
 # repo that should ALREADY be in HACS's index: default repos always are, and
-# ``add_repository`` blocks until registration is confirmed before returning.
+# ``ha_manage_hacs(action="add_repository")`` blocks until registration is
+# confirmed before returning (within its own ``HACS_ADD_REGISTRATION_TIMEOUT``
+# budget).
 # So the post-subscribe sample resolves an existing repo instantly, and the
 # dispatch-signal wait only ever burns wall-clock when the repo is genuinely
 # absent. The old 30 s budget made every not-found lookup a 30 s stall (the
@@ -878,7 +867,7 @@ async def wait_for_repo_registration(
     ws_client: Any,
     full_name: str,
     *,
-    timeout: float = HACS_REPO_REGISTRATION_TIMEOUT,
+    timeout: float,
     backstop_poll_interval: float = HACS_REPO_BACKSTOP_POLL_INTERVAL,
 ) -> dict[str, Any] | None:
     """Wait for a HACS repo to register, using HACS' dispatch signal.
@@ -975,8 +964,7 @@ async def _resolve_hacs_repo_id(ws_client: Any, repository_id: str) -> tuple[str
     For GitHub-path identifiers, this uses the HACS dispatch-signal
     waiter so that a caller running immediately after
     ``ha_manage_hacs(action="add_repository")`` doesn't race against
-    HACS' internal registration — the same flake class that affected
-    ``ha_install_mcp_tools``.
+    HACS' internal registration.
     """
     if "/" not in repository_id:
         return repository_id, repository_id