ha-mcp-dev 7.14.2.dev2135__tar.gz → 7.14.2.dev2139__tar.gz

{ha_mcp_dev-7.14.2.dev2135/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.14.2.dev2139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.14.2.dev2135
+Version: 7.14.2.dev2139
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.14.2.dev2135 → ha_mcp_dev-7.14.2.dev2139}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.14.2.dev2135"
+version = "7.14.2.dev2139"
 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.14.2.dev2135 → ha_mcp_dev-7.14.2.dev2139}/src/ha_mcp/settings_ui/_i18n.py

@@ -9,12 +9,15 @@ from __future__ import annotations
 
 import json
 import re
+from collections import Counter
 from pathlib import Path
 from typing import Any
 
 DEFAULT_LOCALE = "en"
 LOCALE_COOKIE = "ha_mcp_locale"
 LOCALES_DIR = Path(__file__).parent / "locales"
+# The page whose tab buttons define the valid cross-panel link targets.
+_SETTINGS_HTML = Path(__file__).parent / "settings.html"
 
 _PLACEHOLDER_RE = re.compile(r"\{([a-zA-Z_][a-zA-Z0-9_]*)\}")
 
@@ -60,8 +63,14 @@ def _validate_tools(value: Any, *, context: str) -> dict[str, dict[str, str]]:
     return result
 
 
-def load_catalogs(directory: Path = LOCALES_DIR) -> dict[str, dict[str, Any]]:
-    """Load and validate every JSON translation catalog in ``directory``."""
+def load_catalogs(
+    directory: Path = LOCALES_DIR, settings_html: Path = _SETTINGS_HTML
+) -> dict[str, dict[str, Any]]:
+    """Load and validate every JSON translation catalog in ``directory``.
+
+    ``settings_html`` is the page whose tab buttons define the valid
+    cross-panel link targets; overridable so tests need not depend on the
+    shipped page's panel ids."""
     catalogs: dict[str, dict[str, Any]] = {}
     try:
         paths = sorted(directory.glob("*.json"))
@@ -113,6 +122,7 @@ def load_catalogs(directory: Path = LOCALES_DIR) -> dict[str, dict[str, Any]]:
         )
     _validate_placeholder_parity(catalogs)
     _validate_inline_markup(catalogs)
+    _validate_panel_links(catalogs, settings_html)
     return catalogs
 
 
@@ -164,6 +174,80 @@ _TAG_LIKE_RE = re.compile(r"</?[a-zA-Z][^>]*>")
 _ALLOWED_TAGS_RE = re.compile(
     r'</?code>|</?strong>|</a>|<a href="#" data-panel-link="[a-z][a-z-]*">'
 )
+# The tab a cross-panel link switches to. The allowlist above only accepts the
+# tag *shape*, so "outils" or "backup" passes it and then silently does
+# nothing: settings.js hands the value to activateTab, which no-ops on an
+# unknown panel. Read the real ids out of the page rather than restating them.
+# Matches the whole anchor, not a bare attribute: a message may legitimately
+# show `<code>data-panel-link="example"</code>` as literal help text, and that
+# is documentation, not navigation.
+_PANEL_LINK_RE = re.compile(r'<a href="#" data-panel-link="([a-z][a-z-]*)">')
+_PANEL_ID_RE = re.compile(r'data-panel="([a-z][a-z-]*)"')
+# Only a real tab button declares a panel. Scanning the whole page for the
+# attribute would let a future code sample or doc comment mentioning
+# `data-panel="example"` register a tab that does not exist — the same gap
+# between "textually present" and "functionally real" this module closes on
+# the link side.
+_TAB_BUTTON_RE = re.compile(r"<button\b[^>]*>")
+
+
+def _known_panels(settings_html: Path = _SETTINGS_HTML) -> set[str]:
+    """Panel ids declared by the settings page's own tab buttons."""
+    try:
+        markup = settings_html.read_text(encoding="utf-8")
+    except OSError as exc:  # pragma: no cover - packaging guard
+        raise ImportError(
+            f"settings.html missing at {settings_html}. It must ship in "
+            "package-data (wheel), MANIFEST.in (sdist), and the PyInstaller "
+            "datas (binary) -- this is a packaging bug, not a usage error."
+        ) from exc
+    return {
+        panel
+        for tag in _TAB_BUTTON_RE.findall(markup)
+        if 'role="tab"' in tag
+        for panel in _PANEL_ID_RE.findall(tag)
+    }
+
+
+def _validate_panel_links(
+    catalogs: dict[str, dict[str, Any]], settings_html: Path = _SETTINGS_HTML
+) -> None:
+    """Reject cross-panel links that point at a tab which does not exist.
+
+    A mistyped target is invisible to every other check: the tag shape is
+    allowlisted, the string carries no placeholders, and the visible link text
+    still reads correctly. The link just stops working, in that one language.
+
+    Scoped to ``messages`` for the same reason ``_validate_inline_markup`` is:
+    only those render through ``tHtml``, which restores the anchor. Tool names
+    and group labels go through ``escapeHtml``, so a link written there shows
+    as visible garbled markup rather than a dead link — wrong, but not silent.
+    """
+    panels = _known_panels(settings_html)
+    english_messages = catalogs[DEFAULT_LOCALE]["messages"]
+    for locale, catalog in catalogs.items():
+        for key, value in catalog["messages"].items():
+            targets = _PANEL_LINK_RE.findall(value)
+            unknown = sorted(set(targets) - panels)
+            if unknown:
+                raise ValueError(
+                    f"Locale {locale} message {key!r} links to panel(s) "
+                    f"{unknown}, which settings.html does not declare; "
+                    f"known panels: {sorted(panels)}"
+                )
+            source = english_messages.get(key)
+            if source is None or locale == DEFAULT_LOCALE:
+                continue
+            source_targets = _PANEL_LINK_RE.findall(source)
+            # Order-independent: a translation may reorder two links to suit
+            # its grammar and still point at the same tabs. Counter keeps the
+            # multiplicity check, so dropping one of a repeated pair fails.
+            if Counter(targets) != Counter(source_targets):
+                raise ValueError(
+                    f"Locale {locale} message {key!r} links to "
+                    f"{sorted(targets)}, but English links to "
+                    f"{sorted(source_targets)}"
+                )
 
 
 def _validate_inline_markup(catalogs: dict[str, dict[str, Any]]) -> None:

{ha_mcp_dev-7.14.2.dev2135 → ha_mcp_dev-7.14.2.dev2139}/src/ha_mcp/tools/helpers.py

@@ -526,9 +526,12 @@ def log_tool_usage(func: Any) -> Any:
             elif hasattr(result, "__len__"):
                 response_size = len(str(result).encode("utf-8"))
             return result
-        except Exception as e:
+        except BaseException as e:
+            # BaseException, not Exception: a cancelled tool call must not be
+            # recorded as a success. str() is empty on a bare CancelledError,
+            # so the class name stands in.
             success = False
-            error_message = str(e)
+            error_message = str(e) or type(e).__name__
             raise
         finally:
             execution_time_ms = (time.time() - start_time) * 1000

{ha_mcp_dev-7.14.2.dev2135 → ha_mcp_dev-7.14.2.dev2139}/src/ha_mcp/tools/smart_search/_deep.py

@@ -913,6 +913,9 @@ class DeepSearchMixin(SceneSearchMixin):
             return_exceptions=True,
         )
         for result in type_results:
+            if isinstance(result, BaseException) and not isinstance(result, Exception):
+                # Never swallow cancellation/shutdown into a failed-type count.
+                raise result
             if isinstance(result, tuple):
                 type_matches, type_failed = result
                 results.extend(type_matches)
@@ -1166,6 +1169,11 @@ class DeepSearchMixin(SceneSearchMixin):
             results: list[dict[str, Any]] = []
             failed_count = 1 if list_failed else 0
             for dash_result in dash_results:
+                if isinstance(dash_result, BaseException) and not isinstance(
+                    dash_result, Exception
+                ):
+                    # Never swallow cancellation/shutdown into a failure count.
+                    raise dash_result
                 if isinstance(dash_result, tuple):
                     dash_matches, dash_failed = dash_result
                     results.extend(dash_matches)
@@ -1491,6 +1499,9 @@ class DeepSearchMixin(SceneSearchMixin):
         out: list[dict[str, Any]] = []
         probe_failures = 0
         for item in scored:
+            if isinstance(item, BaseException) and not isinstance(item, Exception):
+                # Never swallow cancellation/shutdown into a probe-failure log.
+                raise item
             if isinstance(item, tuple):
                 result, probe_failed = item
                 if result is not None:

{ha_mcp_dev-7.14.2.dev2135 → ha_mcp_dev-7.14.2.dev2139/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.14.2.dev2135
+Version: 7.14.2.dev2139
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT