fix(component): align external package with channel

Author: kingpanther13

custom_components/ha_mcp_tools/embedded_server.py

@@ -861,7 +861,7 @@ async def _async_externally_managed_package_version(self) -> str:
         calls Home Assistant's requirements manager, UV, or the config-entry
         marker writers used by manual and automatic installs.
         """
-        installed_version: str | None = await self._hass.async_add_executor_job(
+        importable_version: str | None = await self._hass.async_add_executor_job(
             _installed_ha_mcp_version
         )
         stable_version: str | None = await self._hass.async_add_executor_job(
@@ -870,12 +870,22 @@ async def _async_externally_managed_package_version(self) -> str:
         dev_version: str | None = await self._hass.async_add_executor_job(
             _installed_dist_version, DIST_NAME_DEV
         )
+        target_dist = dist_for_channel(self._channel)
+        target_version = (
+            stable_version if target_dist == DIST_NAME_STABLE else dev_version
+        )
+        other_dist = (
+            DIST_NAME_DEV if target_dist == DIST_NAME_STABLE else DIST_NAME_STABLE
+        )
+        other_version = (
+            dev_version if target_dist == DIST_NAME_STABLE else stable_version
+        )
 
-        if installed_version is None:
+        if importable_version is None:
             raise EmbeddedServerError(
                 "Home Assistant was started with skip_pip enabled, so HA-MCP "
                 "will not install the externally managed server package. Use "
-                "the system package manager to install ha-mcp "
+                f"the system package manager to install {target_dist} "
                 f"{MIN_EMBEDDED_SERVER_VERSION} or newer, then reload this "
                 "integration.",
                 kind="package",
@@ -892,9 +902,20 @@ async def _async_externally_managed_package_version(self) -> str:
                 kind="package",
             )
 
-        if not _is_compatible_embedded_version(installed_version):
+        if target_version is None:
             raise EmbeddedServerError(
-                f"The externally managed ha-mcp {installed_version} is "
+                f"The configured {self._channel} channel expects {target_dist}, "
+                f"but only {other_dist} {other_version} is installed while "
+                "skip_pip is enabled. Use the system package manager to install "
+                f"{target_dist} {MIN_EMBEDDED_SERVER_VERSION} or newer, or "
+                f"change the HA-MCP release channel to match {other_dist}, then "
+                "reload this integration.",
+                kind="package",
+            )
+
+        if not _is_compatible_embedded_version(target_version):
+            raise EmbeddedServerError(
+                f"The externally managed {target_dist} {target_version} is "
                 "incompatible while skip_pip is enabled; this in-process "
                 f"component requires {MIN_EMBEDDED_SERVER_VERSION} or newer. "
                 "Upgrade it with the system package manager, then reload this "
@@ -903,11 +924,13 @@ async def _async_externally_managed_package_version(self) -> str:
             )
 
         _LOGGER.info(
-            "HA-MCP externally managed server package ready (version %s; "
-            "skip_pip enabled)",
-            installed_version,
+            "HA-MCP externally managed %s package ready (version %s; "
+            "skip_pip enabled, channel %s)",
+            target_dist,
+            target_version,
+            self._channel,
         )
-        return installed_version
+        return target_version
 
     async def _async_remove_legacy_target(
         self, target_dist: str, installed_version: str | None

tests/src/unit/test_embedded_server.py

@@ -447,6 +447,39 @@ async def test_skip_pip_uses_compatible_externally_managed_package(
         assert version == "7.12.1"
         assert entry.data == data
 
+    @pytest.mark.parametrize(
+        ("channel", "installed_dist", "installed_version", "expected_dist"),
+        [
+            (
+                CHANNEL_STABLE,
+                DIST_NAME_DEV,
+                "7.12.1.dev1",
+                DIST_NAME_STABLE,
+            ),
+            (CHANNEL_DEV, DIST_NAME_STABLE, "7.12.1", DIST_NAME_DEV),
+        ],
+    )
+    async def test_skip_pip_rejects_package_from_other_channel(
+        self,
+        tmp_path,
+        monkeypatch,
+        channel,
+        installed_dist,
+        installed_version,
+        expected_dist,
+    ):
+        mgr, hass, _entry = _manager(tmp_path, options={OPT_CHANNEL: channel})
+        hass.config.skip_pip = True
+        versions = {installed_dist: installed_version}
+        monkeypatch.setattr(es, "_installed_ha_mcp_version", lambda: installed_version)
+        monkeypatch.setattr(es, "_installed_dist_version", versions.get)
+
+        with pytest.raises(
+            es.EmbeddedServerError,
+            match=rf"configured {channel} channel expects {expected_dist}.*{installed_dist}",
+        ):
+            await mgr._async_ensure_package()
+
     async def test_skip_pip_reports_missing_externally_managed_package(
         self, tmp_path, monkeypatch
     ):