ha-mcp-dev 7.5.0.dev515__tar.gz → 7.5.0.dev517__tar.gz

{ha_mcp_dev-7.5.0.dev515/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.5.0.dev517}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev515
+Version: 7.5.0.dev517
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -256,9 +256,9 @@ An MCP server can create automations, helpers, and dashboards, but it has no opi
 
 ### Bundled Skills (built-in)
 
-Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients, the same skills are also exposed as `ha_list_resources` / `ha_read_resource` tools. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
+Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients (claude.ai, etc.), the same skills are reachable through the polymorphic `ha_get_skill_guide` tool — call it with no args to list bundled skills, with a `skill` arg to list its files, or with `skill` + `file` to read content. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
 
-If you want to hide either tool from the catalog, disable it from the web settings UI like any other tool.
+`ha_get_skill_guide` is mandatory-pinned: the catalog always exposes it so tool-only clients never see a silently missing skill surface.
 
 Skills can still be installed manually for clients that prefer local skill files — see the [skills repo](https://github.com/homeassistant-ai/skills) for instructions.
 

{ha_mcp_dev-7.5.0.dev515 → ha_mcp_dev-7.5.0.dev517}/README.md

@@ -226,9 +226,9 @@ An MCP server can create automations, helpers, and dashboards, but it has no opi
 
 ### Bundled Skills (built-in)
 
-Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients, the same skills are also exposed as `ha_list_resources` / `ha_read_resource` tools. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
+Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients (claude.ai, etc.), the same skills are reachable through the polymorphic `ha_get_skill_guide` tool — call it with no args to list bundled skills, with a `skill` arg to list its files, or with `skill` + `file` to read content. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
 
-If you want to hide either tool from the catalog, disable it from the web settings UI like any other tool.
+`ha_get_skill_guide` is mandatory-pinned: the catalog always exposes it so tool-only clients never see a silently missing skill surface.
 
 Skills can still be installed manually for clients that prefer local skill files — see the [skills repo](https://github.com/homeassistant-ai/skills) for instructions.
 

{ha_mcp_dev-7.5.0.dev515 → ha_mcp_dev-7.5.0.dev517}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.5.0.dev515"
+version = "7.5.0.dev517"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.5.0.dev515 → ha_mcp_dev-7.5.0.dev517}/src/ha_mcp/tools/tools_config_helpers.py

@@ -867,6 +867,69 @@ def _validate_numeric_range(
             )
 
 
+def _validate_initial_in_options(
+    options: Any, initial: Any, helper_type: str = "input_select"
+) -> None:
+    """Reject ``initial`` values not in ``options``.
+
+    Called from both create and update branches with the resolved values —
+    caller-supplied on create, merged with the existing config on update.
+    ``initial=None`` is the unset case and passes through. The
+    ``isinstance(options, list)`` early-return mirrors the defensive shape
+    check in ``_validate_input_select_options`` below — both validators are
+    invariant gates, not type contracts; a future non-list caller is
+    silently skipped rather than raising a confusing ``TypeError`` on
+    ``initial not in options``.
+    """
+    if not isinstance(options, list) or initial is None:
+        return
+    if initial not in options:
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                f"initial={initial!r} must be one of options "
+                f"{options!r} for {helper_type}.",
+                context=_simple_helper_error_context(
+                    helper_type,
+                    initial=initial,
+                    options=options,
+                ),
+                suggestions=[
+                    "Pick an `initial` value that's in `options`.",
+                    "Or omit `initial` to use the default or existing value.",
+                ],
+            )
+        )
+
+
+def _validate_datetime_has_date_or_time(
+    has_date: bool | None, has_time: bool | None
+) -> None:
+    """Reject ``input_datetime`` payloads where both components are False.
+
+    Treats ``None`` as "not constrained" — only the explicit (False, False)
+    case is flagged, since that's what reaches HA as the broken-entity
+    payload. Both the create and update branches call this with the
+    resolved-after-merge ``has_date`` / ``has_time`` pair.
+    """
+    if has_date is False and has_time is False:
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                "At least one of has_date or has_time must be True for input_datetime",
+                context=_simple_helper_error_context(
+                    "input_datetime",
+                    has_date=has_date,
+                    has_time=has_time,
+                ),
+                suggestions=[
+                    "Set has_date=True to keep the date component.",
+                    "Set has_time=True to keep the time component.",
+                ],
+            )
+        )
+
+
 def _validate_input_select_options(options: Any) -> None:
     """Reject input_select option lists containing duplicates (Bug 17, issue #1150).
 
@@ -2398,28 +2461,12 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                             )
                         )
                     message["options"] = options
-                    # Bug 4a (issue #1150): if `initial` was passed but isn't
-                    # one of the options, reject explicitly instead of silently
-                    # dropping. The previous `if initial and initial in options`
-                    # check stripped invalid initials with `success: true`.
+                    # If `initial` was passed but isn't one of the options,
+                    # reject explicitly instead of silently dropping. Shared
+                    # with the update branch via the helper so the same
+                    # invariant fires on both code paths.
+                    _validate_initial_in_options(options, initial)
                     if initial is not None:
-                        if initial not in options:
-                            raise_tool_error(
-                                create_error_response(
-                                    ErrorCode.VALIDATION_INVALID_PARAMETER,
-                                    f"initial={initial!r} must be one of options "
-                                    f"{options!r} for input_select.",
-                                    context=_simple_helper_error_context(
-                                        helper_type,
-                                        initial=initial,
-                                        options=options,
-                                    ),
-                                    suggestions=[
-                                        "Pick an `initial` value that's in `options`.",
-                                        "Or omit `initial` so the entity starts unset.",
-                                    ],
-                                )
-                            )
                         message["initial"] = initial
 
                 elif helper_type == "input_number":
@@ -2477,15 +2524,12 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         message["has_date"] = has_date
                         message["has_time"] = has_time
 
-                    # Validate that at least one is True
-                    if not message["has_date"] and not message["has_time"]:
-                        raise_tool_error(
-                            create_error_response(
-                                ErrorCode.VALIDATION_INVALID_PARAMETER,
-                                "At least one of has_date or has_time must be True for input_datetime",
-                                context=_simple_helper_error_context(helper_type),
-                            )
-                        )
+                    # Validate that at least one is True — shared with the
+                    # update branch via the helper so the same invariant
+                    # fires on both code paths.
+                    _validate_datetime_has_date_or_time(
+                        message["has_date"], message["has_time"]
+                    )
 
                     if initial is not None:
                         message["initial"] = initial
@@ -3048,6 +3092,14 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                                 if initial is not None
                                 else existing.get("initial")
                             )
+                            # Parity with the create-branch guard. Resolves to
+                            # (new options, new initial) / (new options, old
+                            # initial) / (old options, new initial) — any
+                            # combination that excludes initial from the final
+                            # options list is caught.
+                            _validate_initial_in_options(
+                                update_msg["options"], initial_val
+                            )
                             if initial_val is not None:
                                 update_msg["initial"] = initial_val
 
@@ -3140,6 +3192,14 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                                 if has_time is not None
                                 else existing.get("has_time", False)
                             )
+                            # Parity with the create-branch guard. A merge
+                            # that resolves to (False, False) — caller
+                            # disabling the one component the existing entity
+                            # had — would otherwise write a broken-entity
+                            # payload and surface HA's cryptic generic error.
+                            _validate_datetime_has_date_or_time(
+                                update_msg["has_date"], update_msg["has_time"]
+                            )
                             initial_val = (
                                 initial
                                 if initial is not None

{ha_mcp_dev-7.5.0.dev515 → ha_mcp_dev-7.5.0.dev517/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev515
+Version: 7.5.0.dev517
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -256,9 +256,9 @@ An MCP server can create automations, helpers, and dashboards, but it has no opi
 
 ### Bundled Skills (built-in)
 
-Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients, the same skills are also exposed as `ha_list_resources` / `ha_read_resource` tools. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
+Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients (claude.ai, etc.), the same skills are reachable through the polymorphic `ha_get_skill_guide` tool — call it with no args to list bundled skills, with a `skill` arg to list its files, or with `skill` + `file` to read content. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
 
-If you want to hide either tool from the catalog, disable it from the web settings UI like any other tool.
+`ha_get_skill_guide` is mandatory-pinned: the catalog always exposes it so tool-only clients never see a silently missing skill surface.
 
 Skills can still be installed manually for clients that prefer local skill files — see the [skills repo](https://github.com/homeassistant-ai/skills) for instructions.