ha-mcp-dev 9.1.2.dev3399__tar.gz → 9.1.2.dev3405__tar.gz

{ha_mcp_dev-9.1.2.dev3399 → ha_mcp_dev-9.1.2.dev3405}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 9.1.2.dev3399
+Version: 9.1.2.dev3405
 Summary: Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants.
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-9.1.2.dev3399 → ha_mcp_dev-9.1.2.dev3405}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.1.2.dev3399"
+version = "9.1.2.dev3405"
 description = "Configure and automate Home Assistant with Claude, ChatGPT, and other AI assistants."
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{ha_mcp_dev-9.1.2.dev3399 → ha_mcp_dev-9.1.2.dev3405}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "9.1.2.dev3399"
+version = "9.1.2.dev3405"
 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
@@ -345,8 +345,13 @@ asyncio_default_test_loop_scope = "session"
 # stalls the run silently until the JOB timeout - observed as a 22-minute
 # hang in test_zone_search_discovery on the HAOS in-addon backend. 300s is
 # ~10x the slowest legitimate test (~30s deliberate-timeout tests). The signal
-# method interrupts only the hung test and raises inside the running coroutine,
-# so the failure traceback names the exact stuck await.
+# method fails the hung test and lets the run go on, where the thread method
+# would end the whole worker process with os._exit(). It calls pytest.fail() in
+# whatever frame runs when it fires. In an async test that awaits, that frame is
+# the event loop: the traceback ends in the loop's selector, not at the stuck
+# await. The test's task would stay pending on the session-scoped loop and
+# could resume while a later test runs; tests/src/timed_out_task.py cancels it
+# before the test ends, within a bound.
 timeout = 300
 timeout_method = "signal"
 # Bill the timeout to the TEST FUNCTION only. Session fixtures (container

{ha_mcp_dev-9.1.2.dev3399 → ha_mcp_dev-9.1.2.dev3405}/src/ha_mcp/tools/hacs_backend.py

@@ -5,6 +5,7 @@ integration and removes the ``hacs/*`` WebSocket commands. The HACS tools
 talk to whichever API the instance serves, Marketplace first.
 """
 
+import re
 from dataclasses import dataclass, field
 from typing import Any, NoReturn
 
@@ -76,6 +77,47 @@ _GATE_SUGGESTIONS = {
     ],
 }
 
+# Two store records claiming custom_components/ha_mcp_tools (#2993): the
+# Marketplace refuses to update either, and refuses to uninstall a record while
+# any HA-MCP config entry exists, disabled ones included. Both ways out were
+# checked on a live instance; neither can be driven through this server.
+DUPLICATE_RECORD_SUGGESTIONS = [
+    "A current HA-MCP integration files a repair for this under Settings > "
+    + "System > Repairs; its fix keeps homeassistant-ai/ha-mcp and marks the "
+    + "other record as not installed, with no change to entries or files. Ask "
+    + "the user to run it.",
+    "Without that repair: the store refuses to uninstall a record while any "
+    + "HA-MCP entry exists, disabled ones included, and this server cannot "
+    + "drive either route below. Ask the user before suggesting them.",
+    "Route 1 (no terminal): delete every HA-MCP entry under Settings > Devices "
+    + "& services, uninstall the duplicate record in the store, update the kept "
+    + "record, add the entries back and restart. An embedded server entry gets "
+    + "a new connect URL, so MCP clients reconnect.",
+    "Route 2 (keeps the entries): with Home Assistant Core stopped, set "
+    + '"installed": false on the duplicate record in '
+    + ".storage/marketplace.repositories (.storage/hacs.repositories on HACS), "
+    + "start Core, then update the kept record.",
+]
+# Core's ``integration_owned`` message: "The {domain} directory belongs to
+# {owner}." The store sends no error code for it, so the whole sentence is
+# matched, owner as ``owner/repo``, never a fragment of some other message.
+_OWNED_DIRECTORY = re.compile(
+    r"^(?:Command failed: )?The \S+ directory belongs to ([\w.-]+/[\w-][\w.-]*?)\.?$"
+)
+
+
+def _owned_directory_suggestions(owner: str) -> list[str]:
+    """The store refused an install because another installed record owns the
+    integration's directory: the owner is the record to install or update."""
+    return [
+        f"{owner} already provides this integration. Update or reinstall it "
+        f'there: ha_manage_hacs(action="download", repository_id="{owner}").',
+        "To switch repositories instead, uninstall the owner first; the store "
+        "refuses that while any of the integration's config entries exist, so "
+        "ask the user before deleting entries under Settings > Devices & "
+        "services.",
+    ]
+
 
 @dataclass(frozen=True)
 class StoreApi:
@@ -187,15 +229,37 @@ async def detect_store_api(ws_client: Any) -> StoreApi:
     return HACS_API  # unreachable: raise_tool_error always raises
 
 
+def is_owned_directory_refusal(err: HomeAssistantCommandError) -> bool:
+    """Whether the store refused because another installed record owns the
+    integration's directory."""
+    return _OWNED_DIRECTORY.match(str(err).strip()) is not None
+
+
 def raise_store_error(
-    err: HomeAssistantCommandError, context: dict[str, Any]
+    err: HomeAssistantCommandError,
+    context: dict[str, Any],
+    *,
+    installed_records: list[str] | None = None,
 ) -> NoReturn:
     """Raise a store command failure; a Marketplace gate names the UI step.
 
     The gates are told apart by Core's error code: their messages ("Connect a
-    GitHub account ...") would otherwise read as a connection failure.
+    GitHub account ...") would otherwise read as a connection failure. An
+    ownership refusal names the owner to update, unless the owner is one of
+    ha-mcp's own records and ``installed_records`` shows two of them
+    installed: then neither can be updated and the suggestions are the way
+    out of that. A refusal naming some other integration's owner keeps the
+    owner hint whatever ha-mcp's own records look like.
     """
-    if suggestions := _GATE_SUGGESTIONS.get(err.code or ""):
+    suggestions = _GATE_SUGGESTIONS.get(err.code or "")
+    if match := _OWNED_DIRECTORY.match(str(err).strip()):
+        owners = {r.lower() for r in installed_records or []}
+        if len(owners) > 1 and match[1].lower() in owners:
+            suggestions = DUPLICATE_RECORD_SUGGESTIONS
+            context = {**context, "installed": installed_records}
+        else:
+            suggestions = _owned_directory_suggestions(match[1])
+    if suggestions:
         raise_tool_error(
             create_error_response(
                 ErrorCode.SERVICE_CALL_FAILED,

ha_mcp_dev-9.1.2.dev3405/src/ha_mcp/tools/hacs_own_repository.py

@@ -0,0 +1,162 @@
+"""Keep ha-mcp's own integration on the one store repository that owns it.
+
+Two repositories carry the ``ha_mcp_tools`` component: the main repository,
+which the default catalog lists, and the legacy distribution mirror earlier
+installs came from. Both extract to ``custom_components/ha_mcp_tools``. The
+Marketplace (Home Assistant 2026.11+) refuses to install a repository whose
+integration another installed repository owns. HACS never checked, so a
+download of the second repository on Home Assistant 2026.10 or older left both
+records claiming the directory, and after the 2026.11 upgrade the Marketplace
+refuses to update either (#2993). The server's own install guidance names the
+main repository, so a download of either repository goes to the one that is
+installed.
+"""
+
+from __future__ import annotations
+
+import re
+from typing import Any
+
+from ..client.rest_client import HomeAssistantCommandError, HomeAssistantCommandTimeout
+from ..errors import ErrorCode, create_error_response
+from ..hacs_auto_refresh import CANDIDATE_REPO_FULL_NAMES
+from .hacs_backend import StoreApi, is_owned_directory_refusal
+from .helpers import raise_tool_error
+
+MAIN_REPOSITORY = "homeassistant-ai/ha-mcp"
+MIRROR_REPOSITORY = "homeassistant-ai/ha-mcp-integration"
+# The stores use the GitHub repository id, fixed for a repository's lifetime.
+OWN_REPOSITORY_IDS = {"1056618941": MAIN_REPOSITORY, "1289599380": MIRROR_REPOSITORY}
+
+# The two repositories tag releases alike, but not development builds:
+# publish-dev.yml tags the main repository ``v<next>.dev<N>`` while
+# sync-integration-mirror.yml tags the mirror ``v<next>-dev.<N>``.
+_MAIN_DEV_REF = re.compile(r"^(v?\d+\.\d+\.\d+)\.dev(\d+)$")
+_MIRROR_DEV_REF = re.compile(r"^(v?\d+\.\d+\.\d+)-dev\.(\d+)$")
+_RELEASE_REF = re.compile(r"^v?(\d+)\.(\d+)\.(\d+)")
+# From 9.0 both repositories tag a release with the server version; before
+# that the mirror carried the component's own numbers (v2.2.1 for 8.6.0).
+_SHARED_TAGS_SINCE = (9, 0, 0)
+
+
+def _tagged_alike(version: str) -> bool:
+    match = _RELEASE_REF.match(version)
+    if match is None:
+        return False
+    return tuple(int(p) for p in match.groups()) >= _SHARED_TAGS_SINCE
+
+
+def translate_version(version: str | None, target: str) -> str | None:
+    """The same release named the way ``target`` tags it."""
+    if not version:
+        return version
+    if target.lower() == MIRROR_REPOSITORY and (match := _MAIN_DEV_REF.match(version)):
+        return f"{match[1]}-dev.{match[2]}"
+    if target.lower() == MAIN_REPOSITORY and (match := _MIRROR_DEV_REF.match(version)):
+        return f"{match[1]}.dev{match[2]}"
+    return version
+
+
+def _own_name(repo: dict[str, Any]) -> str | None:
+    full_name = (repo.get("full_name") or "").lower()
+    if full_name in {n.lower() for n in CANDIDATE_REPO_FULL_NAMES}:
+        return full_name
+    return None
+
+
+async def installed_own_records(
+    ws_client: Any, api: StoreApi
+) -> list[dict[str, Any]] | None:
+    """The store's records for ha-mcp's own repositories that are installed,
+    or None when the store could not be asked."""
+    try:
+        response = await ws_client.send_command(api.command("list"))
+    except (HomeAssistantCommandError, HomeAssistantCommandTimeout):
+        return None
+    listed = response.get("result") if isinstance(response, dict) else None
+    repos = [dict(r) for r in (listed or []) if isinstance(r, dict)]
+    return [r for r in repos if _own_name(r) and r.get("installed")]
+
+
+async def ownership_refusal_records(
+    ws_client: Any, api: StoreApi, err: HomeAssistantCommandError
+) -> list[str] | None:
+    """For a store refusal, the installed own records' names, so the refusal
+    can be explained; None for any other error, with no store call."""
+    if not is_owned_directory_refusal(err):
+        return None
+    records = await installed_own_records(ws_client, api)
+    return [str(r.get("full_name")) for r in records or []]
+
+
+async def route_own_repository_download(
+    ws_client: Any, api: StoreApi, repository_id: str, version: str | None
+) -> tuple[str, str | None, str | None]:
+    """Return the repository and version to download, and a note when rerouted.
+
+    A repository that is not ha-mcp's own, by name or by id, passes through
+    with no store call, so a download stays one store command. For ha-mcp's
+    own, the installed one wins: a request for the other repository is
+    rerouted to it, so the mirror keeps updating from the mirror and the main
+    repository from the catalog, and a development ref is renamed the way the
+    target tags it. With two installed records the store decides: the
+    Marketplace refuses the download itself and that refusal is explained
+    where it is raised; HACS still downloads, with a warning.
+    """
+    wanted = repository_id.strip().lower()
+    wanted = OWN_REPOSITORY_IDS.get(wanted, wanted)
+    if wanted not in {n.lower() for n in CANDIDATE_REPO_FULL_NAMES}:
+        return repository_id, version, None
+
+    installed = await installed_own_records(ws_client, api)
+    if installed is None:
+        # The download itself reports the store's trouble, with its own context
+        return repository_id, version, None
+    if len(installed) > 1:
+        if api.is_marketplace:
+            # The Marketplace refuses this download itself; raise_store_error
+            # explains the refusal with the way out.
+            return repository_id, version, None
+        names = " and ".join(str(r.get("full_name")) for r in installed)
+        # HACS never checked ownership, so the download still works there and
+        # is the way to bring in the release whose repair keeps one listing.
+        note = (
+            f"{names} are both installed and both claim "
+            "custom_components/ha_mcp_tools. HACS still updates either, but the "
+            "Marketplace in Home Assistant 2026.11 will refuse to. After this "
+            "download restart Home Assistant and run the repair under Settings > "
+            f"System > Repairs, which keeps {MAIN_REPOSITORY}. If no repair "
+            "appears, the installed release predates it: update to a current "
+            "release or follow the manual route in the FAQ."
+        )
+        return repository_id, version, note
+    if not installed or _own_name(installed[0]) == wanted:
+        return repository_id, version, None
+    owner = str(installed[0].get("full_name"))
+    if version and not _tagged_alike(version):
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                f"{owner} owns custom_components/ha_mcp_tools, and releases "
+                f"before {'.'.join(map(str, _SHARED_TAGS_SINCE))} are tagged "
+                f"differently there, so {version} cannot be mapped to it.",
+                suggestions=[
+                    "Pick a version from the installed repository: "
+                    'ha_get_hacs_info(action="info", '
+                    f'repository_id="{owner}", include_releases=True), then '
+                    f'ha_manage_hacs(action="download", repository_id="{owner}", '
+                    'version="<one of its tags>").',
+                    "Or omit version to install its latest release.",
+                ],
+                context={"repository_id": repository_id, "version": version},
+            )
+        )
+    target_version = translate_version(version, owner)
+    note = (
+        f"{repository_id} was rerouted to {owner}, which already owns "
+        "custom_components/ha_mcp_tools; HA-MCP stays on the one listing it "
+        "was installed from."
+    )
+    if target_version != version:
+        note += f" The version was renamed from {version} to {target_version}."
+    return owner, target_version, note

{ha_mcp_dev-9.1.2.dev3399 → ha_mcp_dev-9.1.2.dev3405}/src/ha_mcp/tools/tools_hacs.py

@@ -29,6 +29,10 @@ from .hacs_backend import (
     fetch_releases,
     raise_store_error,
 )
+from .hacs_own_repository import (
+    ownership_refusal_records,
+    route_own_repository_download,
+)
 from .hacs_registration import (
     HACS_ADD_REGISTRATION_TIMEOUT,
     HACS_REFRESH_TIMEOUT,
@@ -557,6 +561,10 @@ class HacsTools:
         )
         ws_client, api = await self._get_hacs_client()
 
+        repository_id, version, reroute_note = await route_own_repository_download(
+            ws_client, api, repository_id, version
+        )
+
         # Resolve GitHub path to numeric ID if needed
         actual_id, repo_name = await _resolve_hacs_repo_id(
             ws_client, api, repository_id
@@ -589,6 +597,7 @@ class HacsTools:
                     "repository_id": repository_id,
                     "version": version,
                     "timeout_seconds": 60.0,
+                    **({"routing_note": reroute_note} if reroute_note else {}),
                 },
                 suggestions=[
                     "The download may still have completed on the HACS side — "
@@ -598,6 +607,7 @@ class HacsTools:
                 raise_error=True,
             )
         except HomeAssistantCommandError as cmd_err:
+            refusal = await ownership_refusal_records(ws_client, api, cmd_err)
             raise_store_error(
                 cmd_err,
                 {
@@ -605,7 +615,9 @@ class HacsTools:
                     "repository_id": repository_id,
                     "version": version,
                     "timeout_seconds": 60.0,
+                    **({"routing_note": reroute_note} if reroute_note else {}),
                 },
+                installed_records=refusal,
             )
 
         if not response.get("success"):
@@ -615,6 +627,7 @@ class HacsTools:
                     "command": api.command("install"),
                     "repository_id": repository_id,
                     "version": version,
+                    **({"routing_note": reroute_note} if reroute_note else {}),
                 },
                 raise_error=True,
             )
@@ -635,7 +648,8 @@ class HacsTools:
                 "data": result,
             },
         )
-        return {"success": True, **wrapped}
+        warnings = {"warnings": [reroute_note]} if reroute_note else {}
+        return {"success": True, **wrapped, **warnings}
 
     async def _hacs_remove(self, repository_id: str | None) -> dict[str, Any]:
         # Same up-front guard as ``_hacs_download``: an empty identifier