ha-mcp-dev 7.13.0.dev1994__tar.gz → 7.13.0.dev1999__tar.gz

{ha_mcp_dev-7.13.0.dev1994/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.13.0.dev1999}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.13.0.dev1994
+Version: 7.13.0.dev1999
 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.13.0.dev1994 → ha_mcp_dev-7.13.0.dev1999}/pyproject.toml

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

@@ -112,6 +112,7 @@ def load_catalogs(directory: Path = LOCALES_DIR) -> dict[str, dict[str, Any]]:
             f"The settings UI requires {DEFAULT_LOCALE}.json in {directory}"
         )
     _validate_placeholder_parity(catalogs)
+    _validate_inline_markup(catalogs)
     return catalogs
 
 
@@ -154,6 +155,39 @@ def _validate_placeholder_parity(catalogs: dict[str, dict[str, Any]]) -> None:
                     )
 
 
+# Anything that looks like an HTML tag in a catalog message. A bare "<" in
+# prose (e.g. "< 5") deliberately does not match — it renders fine escaped.
+_TAG_LIKE_RE = re.compile(r"</?[a-zA-Z][^>]*>")
+# The exact tag shapes settings.js::tHtml restores after escaping. Keep in
+# sync with the restore regexes there — any other spelling (case, spacing,
+# attribute order) survives escaping and shows the user literal markup text.
+_ALLOWED_TAGS_RE = re.compile(
+    r'</?code>|</?strong>|</a>|<a href="#" data-panel-link="[a-z][a-z-]*">'
+)
+
+
+def _validate_inline_markup(catalogs: dict[str, dict[str, Any]]) -> None:
+    """Reject catalog messages whose markup ``tHtml`` cannot restore.
+
+    ``settings.js::tHtml`` escapes every translated value and restores only
+    the exact allowlisted tag shapes, so a translation written with
+    ``<CODE>`` or ``<code >`` would silently render as literal escaped text.
+    Fail fast at load time instead, mirroring the placeholder-parity check.
+    Scoped to ``messages``: tool translations are plain text rendered through
+    ``escapeHtml`` and carry no markup contract.
+    """
+    for locale, catalog in catalogs.items():
+        for key, value in catalog["messages"].items():
+            for tag in _TAG_LIKE_RE.findall(value):
+                if _ALLOWED_TAGS_RE.fullmatch(tag) is None:
+                    raise ValueError(
+                        f"Locale {locale} message {key!r} contains inline "
+                        f"markup {tag!r} that the settings UI cannot render; "
+                        f"allowed: <code>, <strong>, </a>, and "
+                        f'<a href="#" data-panel-link="...">'
+                    )
+
+
 CATALOGS = load_catalogs()
 
 

{ha_mcp_dev-7.13.0.dev1994 → ha_mcp_dev-7.13.0.dev1999}/src/ha_mcp/settings_ui/settings.js

@@ -23,6 +23,27 @@ function t(key, params = {}, fallback = key) {
   return value;
 }
 
+// Translation for HTML contexts (innerHTML sinks). Catalog strings are data,
+// not markup: the whole value is HTML-escaped first, then only the allowlist
+// of inline formatting tags the catalogs use (<code>, <strong>, and the
+// internal tab links) is restored, so a translated string can never
+// contribute any other markup. Placeholders are substituted AFTER escaping:
+// params are trusted HTML fragments built by the caller (escape any dynamic
+// text inside them with escapeHtml at the call site).
+function tHtml(key, params = {}, fallback = key) {
+  const raw = Object.prototype.hasOwnProperty.call(I18N_PAYLOAD.messages || {}, key)
+    ? I18N_PAYLOAD.messages[key]
+    : fallback;
+  let value = escapeHtml(raw)
+    .replace(/&lt;(\/?)(code|strong)&gt;/g, '<$1$2>')
+    .replace(/&lt;a href=&quot;#&quot; data-panel-link=&quot;([a-z][a-z-]*)&quot;&gt;/g, '<a href="#" data-panel-link="$1">')
+    .replace(/&lt;\/a&gt;/g, '</a>');
+  Object.keys(params).forEach(name => {
+    value = value.replaceAll(`{${name}}`, String(params[name]));
+  });
+  return value;
+}
+
 function localizeMeta(section, field, meta) {
   return {
     ...meta,
@@ -76,7 +97,14 @@ function applyStaticTranslations(root = document) {
     el.textContent = t(el.dataset.i18n, {}, el.textContent);
   });
   root.querySelectorAll('[data-i18n-html]').forEach(el => {
-    el.innerHTML = t(el.dataset.i18nHtml, {}, el.innerHTML);
+    // Rewrite only from the catalog: the server-rendered markup already is
+    // the English copy, and routing it back through the escape+allowlist
+    // pipeline would depend on attribute serialization being round-trip
+    // stable, which it is not guaranteed to be.
+    const key = el.dataset.i18nHtml;
+    if (Object.prototype.hasOwnProperty.call(I18N_PAYLOAD.messages || {}, key)) {
+      el.innerHTML = tHtml(key);
+    }
   });
   for (const attribute of ['placeholder', 'title', 'aria-label']) {
     const dataName = `i18n${attribute.split('-').map(part => part[0].toUpperCase() + part.slice(1)).join('')}`;
@@ -908,17 +936,17 @@ function render() {
       else badges += `<span class="badge unknown">${escapeHtml(category) || '?'}</span>`;
 
       const gatedNote = disabledBy
-        ? `<div class="disabled-by-note">${tr(
+        ? `<div class="disabled-by-note">${tHtml(
             'tools.notes.beta_disabled',
             {setting: `<code>${escapeHtml(disabledBy)}</code>`},
-            `Beta. Set <code>${escapeHtml(disabledBy)}</code> in the dev App (add-on) config or the matching env var (see docs/beta.md).`
+            'Beta. Set {setting} in the dev App (add-on) config or the matching env var (see docs/beta.md).'
           )}</div>`
         : '';
       const envPinnedNote = isEnvPinned
-        ? `<div class="feature-locked-note">${tr(
+        ? `<div class="feature-locked-note">${tHtml(
             'tools.notes.env_pinned',
             {variable: `<code>${escapeHtml(envPinVar)}</code>`},
-            `env-pinned via <code>${envPinVar}</code>. Unset the env var to edit here.`
+            'Pinned by {variable}. Unset the environment variable to edit here.'
           )}</div>`
         : '';
       const bpsLockedNote = isBpsLocked
@@ -1277,10 +1305,10 @@ const BACKUP_FIELD_LABELS = {
 };
 
 const BACKUP_ORIGIN_LABELS = {
-  addon: t('backup.origins.addon', {}, 'Synced to Supervisor. Restart required after save.'),
+  addon: escapeHtml(t('backup.origins.addon', {}, 'Synced to Supervisor. Restart required after save.')),
   env: null,  // banner generated dynamically with the env var name
-  file: t('backup.origins.file', {}, 'Persisted locally; takes effect immediately.'),
-  default: t('backup.origins.default', {}, 'Using default; first save creates a local override file.'),
+  file: escapeHtml(t('backup.origins.file', {}, 'Persisted locally; takes effect immediately.')),
+  default: escapeHtml(t('backup.origins.default', {}, 'Using default; first save creates a local override file.')),
 };
 
 async function loadBackupConfig() {
@@ -1476,8 +1504,8 @@ function renderFsCustomPathsSubForm(parentEl, masterOn, fsOn) {
       : '.storage, secrets.yaml';
   info.innerHTML =
     `<div class="feature-name">${escapeHtml(t('filesystem.custom.title', {}, 'Custom filesystem directories (advanced)'))}</div>` +
-    `<div class="feature-help">${t('filesystem.custom.help', {}, 'Extra directories (one per line) that the file tools may READ and WRITE, either relative to your config dir or an absolute allowed HAOS sibling volume. Each entry grants both read and write. Applies immediately; no restart needed.')}</div>` +
-    `<div class="feature-help">${t('filesystem.custom.blocked', {paths: `<code>${escapeHtml(denyList)}</code>`}, `Always blocked (cannot be added): <code>${escapeHtml(denyList)}</code>, path traversal (<code>..</code>), and any absolute path outside the HAOS sibling volumes.`)}</div>`;
+    `<div class="feature-help">${tHtml('filesystem.custom.help', {}, 'Extra directories (one per line) that the file tools may READ and WRITE, either relative to your config dir or an absolute allowed HAOS sibling volume. Each entry grants both read and write. Applies immediately; no restart needed.')}</div>` +
+    `<div class="feature-help">${tHtml('filesystem.custom.blocked', {paths: `<code>${escapeHtml(denyList)}</code>`}, 'Always blocked (cannot be added): {paths}, path traversal (<code>..</code>), and any absolute path outside the HAOS sibling volumes.')}</div>`;
 
   const control = document.createElement('div');
   control.className = 'feature-control';
@@ -1922,19 +1950,19 @@ const ORIGIN_INFO_NOTE = {
 function envLockedNoteHtml(envVar, fieldName) {
   const envVarTag = `<code>${escapeHtml(envVar)}</code>`;
   if (!IS_ADDON_MODE) {
-    return t('origins.env_var_unset', {variable: envVarTag}, `Set via env var ${envVarTag}; unset it to edit here.`);
+    return tHtml('origins.env_var_unset', {variable: envVarTag}, 'Set via env var {variable}; unset it to edit here.');
   }
   if (fieldName === 'enable_beta_features') {
-    return t(
+    return tHtml(
       'origins.beta_legacy_bridge',
       {variable: envVarTag},
-      `Auto-enabled in App (add-on) mode (legacy bridge; your options.json predates the master toggle schema entry). Set <code>enable_beta_features</code> explicitly in the App (add-on) Configuration tab to take direct control. (env: ${envVarTag})`
+      'Auto-enabled in App (add-on) mode (legacy bridge; your options.json predates the master toggle schema entry). Set <code>enable_beta_features</code> explicitly in the App (add-on) Configuration tab to take direct control. (env: {variable})'
     );
   }
-  return t(
+  return tHtml(
     'origins.addon_runtime',
     {variable: envVarTag},
-    `Set by the App (add-on) runtime environment, managed by Home Assistant Supervisor; cannot be changed from this web UI. (env: ${envVarTag})`
+    'Set by the App (add-on) runtime environment, managed by Home Assistant Supervisor; cannot be changed from this web UI. (env: {variable})'
   );
 }
 
@@ -2035,7 +2063,7 @@ function renderFeatureFlags(flags) {
         `${escapeHtml(ORIGIN_INFO_NOTE[f.origin])}</div>`
       : '';
     info.innerHTML =
-      `<div class="feature-name" id="label-feature-${fieldName}">${escapeHtml(meta.label)}</div>` +
+      `<div class="feature-name" id="label-feature-${escapeHtml(fieldName)}">${escapeHtml(meta.label)}</div>` +
       `<div class="feature-help">${escapeHtml(meta.help)}</div>` +
       lockedNote + infoNote;
 
@@ -2209,7 +2237,7 @@ function renderSubFlagRows(flags, parentEl, subFieldNames, { cssClass, lockedByG
         `${escapeHtml(ORIGIN_INFO_NOTE[f.origin])}</div>`
       : '';
     info.innerHTML =
-      `<div class="feature-name" id="label-feature-${fieldName}">${escapeHtml(meta.label)}</div>` +
+      `<div class="feature-name" id="label-feature-${escapeHtml(fieldName)}">${escapeHtml(meta.label)}</div>` +
       `<div class="feature-help">${escapeHtml(meta.help)}</div>` +
       lockedNote + infoNote;
 
@@ -2275,7 +2303,7 @@ function renderCodeModeSubRows(parentEl, masterOn, codeModeOn) {
     let lockedNote = '';
     if (f.field === 'code_mode_saved_tools_path') {
       if (IS_ADDON_MODE) {
-        lockedNote = `<div class="feature-locked-note">${t(
+        lockedNote = `<div class="feature-locked-note">${tHtml(
           'advanced.code_mode_saved_tools_path.addon_locked',
           {},
           'Hardcoded to <code>/data/saved_tools.json</code> in App (add-on) mode and cannot be changed (fixed here so saved tools survive App (add-on) updates).'
@@ -2295,7 +2323,7 @@ function renderCodeModeSubRows(parentEl, masterOn, codeModeOn) {
         `<div class="feature-locked-note">${envLockedNoteHtml(f.env_var, f.field)}</div>`;
     }
     info.innerHTML =
-      `<div class="feature-name" id="label-feature-${f.field}">${escapeHtml(meta.label)}</div>` +
+      `<div class="feature-name" id="label-feature-${escapeHtml(f.field)}">${escapeHtml(meta.label)}</div>` +
       `<div class="feature-help">${escapeHtml(meta.help)}</div>` +
       lockedNote;
 
@@ -2472,7 +2500,7 @@ function renderPolicyCards(policy) {
   // see/edit them all.
   const byTool = {};
   rules.forEach((r, idx) => {
-    const key = r.tool_name + '' + idx;
+    const key = r.tool_name + '\0' + idx;
     byTool[key] = {tool_name: r.tool_name, rule: r, originalIndex: idx};
   });
   Object.keys(byTool).forEach(key => {

{ha_mcp_dev-7.13.0.dev1994 → ha_mcp_dev-7.13.0.dev1999}/src/ha_mcp/tools/tools_labels.py

@@ -31,6 +31,73 @@ class LabelTools:
     def __init__(self, client: Any) -> None:
         self._client = client
 
+    async def _list_labels(
+        self, context: dict[str, Any] | None = None
+    ) -> list[dict[str, Any]]:
+        """Return all labels from the registry (shared by get/set).
+
+        Raises ToolError (SERVICE_CALL_FAILED) if the list call fails or returns
+        an unexpected non-list envelope — a degraded response must not collapse
+        to an empty registry, or callers would confidently report a real label
+        as missing (mirrors ``backup_manager._require_list``).
+        """
+        result = await self._client.send_websocket_message(
+            {"type": "config/label_registry/list"}
+        )
+        if not result.get("success"):
+            raise_tool_error(
+                create_error_response(
+                    ErrorCode.SERVICE_CALL_FAILED,
+                    result.get("error", "Failed to get labels"),
+                    context=context,
+                )
+            )
+        # No ``[]`` default: a success envelope that omits ``result`` (or sends
+        # a non-list) is a degraded response, not an empty registry — defaulting
+        # would let callers confidently report a real label as missing.
+        labels = result.get("result")
+        if not isinstance(labels, list):
+            raise_tool_error(
+                create_error_response(
+                    ErrorCode.SERVICE_CALL_FAILED,
+                    "Label registry returned a missing or non-list result",
+                    context=context,
+                )
+            )
+        return labels
+
+    async def _require_existing_label(self, label_id: str, name: str) -> None:
+        """Raise RESOURCE_NOT_FOUND if ``label_id`` is not in the registry.
+
+        Enforces the strict update-only contract (issue #1860): update of an
+        unknown id yields an opaque "Unknown error", and create cannot honor a
+        caller-supplied id (HA derives it from the name), so an unknown id is a
+        clear error with a create hint rather than a silently divergent upsert.
+        """
+        existing = await self._list_labels(context={"name": name, "label_id": label_id})
+        if any(lbl.get("label_id") == label_id for lbl in existing):
+            return
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.RESOURCE_NOT_FOUND,
+                f"Label not found: {label_id}",
+                context={
+                    "name": name,
+                    "label_id": label_id,
+                    "available_label_ids": [
+                        lbl.get("label_id") for lbl in existing[:10]
+                    ],
+                },
+                suggestions=[
+                    "To create a new label, omit label_id — Home Assistant "
+                    + "derives the id from the name (e.g. 'vendor:tapo' becomes "
+                    + "'vendor_tapo')",
+                    "To update an existing label, pass its exact current "
+                    + "label_id (list all with ha_config_get_label())",
+                ],
+            )
+        )
+
     @tool(
         name="ha_config_get_label",
         tags={"Labels & Categories"},
@@ -82,22 +149,7 @@ class LabelTools:
                     ],
                     context={"action": "get"},
                 )
-            message: dict[str, Any] = {
-                "type": "config/label_registry/list",
-            }
-
-            result = await self._client.send_websocket_message(message)
-
-            if not result.get("success"):
-                raise_tool_error(
-                    create_error_response(
-                        ErrorCode.SERVICE_CALL_FAILED,
-                        result.get("error", "Failed to get labels"),
-                        context={"label_id": label_id},
-                    )
-                )
-
-            labels = result.get("result", [])
+            labels = await self._list_labels(context={"label_id": label_id})
 
             if label_id is None:
                 return {
@@ -223,6 +275,13 @@ class LabelTools:
                     ],
                     context={"action": "set", "name": name},
                 )
+                # Strict update-only contract (issue #1860): routing to
+                # label_registry/update with an unknown id returns an opaque
+                # "Unknown error", and label_registry/create cannot honor a
+                # caller-supplied id (HA derives it from the name). Verify the
+                # id exists up front and return actionable guidance instead of
+                # dispatching an update that fails cryptically.
+                await self._require_existing_label(label_id, name)
             action = "update" if label_id else "create"
 
             message: dict[str, Any] = {
@@ -254,6 +313,13 @@ class LabelTools:
                     "message": f"Successfully {action_past} label: {name}",
                 }
             else:
+                # The unknown-id case is caught up front by
+                # _require_existing_label. This substring match only catches HA
+                # error texts containing "not found"/"doesn't exist"; HA's label
+                # update does NOT emit those for an unknown/deleted id (it
+                # surfaces "Unknown error"), so it is a best-effort guard for
+                # other/future phrasings only — the check-then-update delete race
+                # is not handled here and still surfaces as SERVICE_CALL_FAILED.
                 error_str = str(result.get("error", "")).lower()
                 if "not found" in error_str or "doesn't exist" in error_str:
                     raise_tool_error(

{ha_mcp_dev-7.13.0.dev1994 → ha_mcp_dev-7.13.0.dev1999/src/ha_mcp_dev.egg-info}/PKG-INFO

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