ha-mcp-dev 7.4.0.dev409__tar.gz → 7.4.0.dev410__tar.gz

{ha_mcp_dev-7.4.0.dev409/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.0.dev410}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.0.dev409
+Version: 7.4.0.dev410
 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.4.0.dev409 → ha_mcp_dev-7.4.0.dev410}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.0.dev409"
+version = "7.4.0.dev410"
 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.4.0.dev409 → ha_mcp_dev-7.4.0.dev410}/src/ha_mcp/__main__.py

@@ -733,8 +733,11 @@ def _run_http_server(transport: str, default_port: int = 8086) -> None:
         transport: Transport type (http or sse).
         default_port: Default port to use if MCP_PORT env var is not set.
     """
+    from ha_mcp.settings_ui import register_settings_routes
+
     port, path = _get_http_runtime(default_port)
     register_browser_landing(_get_mcp(), path)
+    register_settings_routes(_get_mcp(), _get_server(), secret_path=path)
 
     _run_entrypoint(
         _run_http_with_graceful_shutdown(transport, port, path),
@@ -871,6 +874,9 @@ async def _run_oauth_server(ha_url: str, base_url: str, port: int, path: str) ->
     logger.info("Server created with OAuthProxyClient")
     register_browser_landing(mcp, path)
 
+    from ha_mcp.settings_ui import register_settings_routes
+    register_settings_routes(mcp, _server, secret_path=path)
+
     tools = await mcp.list_tools()
     logger.info(
         f"Starting OAuth-enabled MCP server with {len(tools)} tools on {base_url}{path}"

{ha_mcp_dev-7.4.0.dev409 → ha_mcp_dev-7.4.0.dev410}/src/ha_mcp/config.py

@@ -110,6 +110,17 @@ class Settings(BaseSettings):
     # files. Disabled by default; only for YAML-only features with no UI/API path.
     enable_yaml_config_editing: bool = Field(False, alias="ENABLE_YAML_CONFIG_EDITING")
 
+    # Seed values for tool visibility (comma-separated tool names).
+    # Used as initial config when no tool_config.json exists.
+    # The web settings UI (/settings) is the primary interface for managing these.
+    disabled_tools: str = Field("", alias="DISABLED_TOOLS")
+    pinned_tools: str = Field("", alias="PINNED_TOOLS")
+
+    # Max results returned by ha_search_tools. Pydantic enforces the
+    # 2-10 range; the addon-dev schema also uses ``int(2,10)?`` so the
+    # supervisor UI rejects out-of-range values before they reach env vars.
+    tool_search_max_results: int = Field(5, ge=2, le=10, alias="TOOL_SEARCH_MAX_RESULTS")
+
     @model_validator(mode="after")
     def _skills_dependency(self) -> "Settings":
         """Auto-enable skills (resources) when skills-as-tools is on.

{ha_mcp_dev-7.4.0.dev409 → ha_mcp_dev-7.4.0.dev410}/src/ha_mcp/server.py

@@ -70,6 +70,8 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         self._device_tools: Any = None
         self._tools_registry: ToolsRegistry | None = None
         self._skill_tool_names: list[str] = []
+        # Populated by _apply_settings_visibility from tool_config.json on startup
+        self._user_pinned_tools: list[str] = []
 
         # Get server name/version from settings if no client provided
         if not self._client_provided:
@@ -143,6 +145,11 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         # Register bundled skills as MCP resources
         self._register_skills()
 
+        # Apply user-configured tool visibility (must come before keyword
+        # enrichment / tool search so disabled tools are excluded from
+        # search indexing too).
+        self._apply_settings_visibility()
+
         # Enrich tool descriptions with BM25 keyword boosts. Runs
         # unconditionally so Claude's native deferred-tool search
         # (claude.ai) benefits even when ENABLE_TOOL_SEARCH is off.
@@ -313,6 +320,25 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
 
         return f"\n### Skill: {skill_name} ({uri})\n{description.strip()}"
 
+    def _apply_settings_visibility(self) -> None:
+        """Apply persisted tool visibility from ``tool_config.json``.
+
+        Reads the saved enable/disable/pin state and applies it to the
+        FastMCP instance via ``apply_tool_visibility``. HTTP routes for
+        the settings UI are registered separately by entry-point callers
+        (start.py / main_web) so they can be mounted under the secret
+        path; that keeps the routes inert in stdio mode and behind the
+        same auth posture as the MCP endpoint in HTTP mode.
+        """
+        from .settings_ui import apply_tool_visibility, load_tool_config
+
+        config = load_tool_config(self.settings)
+        if config:
+            pinned = apply_tool_visibility(self.mcp, config, self.settings)
+            if pinned:
+                self._user_pinned_tools = list(pinned)
+            logger.info("Applied persisted tool config (%d entries)", len(config.get("tools", {})))
+
     # Tools pinned outside the search transform for individual permission gating.
     # These are always visible in list_tools() regardless of search transform.
     _PINNED_TOOLS: ClassVar[list[str]] = list(DEFAULT_PINNED_TOOLS)
@@ -487,8 +513,9 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
             )
             return
 
-        # Build the always_visible list
+        # Build the always_visible list: defaults + user-configured pins
         pinned = list(self._PINNED_TOOLS)
+        pinned.extend(self._user_pinned_tools)
 
         # Pin ResourcesAsTools and skill guidance tools if skills-as-tools is enabled
         if self.settings.enable_skills_as_tools:
@@ -513,12 +540,16 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         try:
             self.mcp.add_transform(
                 CategorizedSearchTransform(
-                    max_results=5,
+                    max_results=self.settings.tool_search_max_results,
                     always_visible=pinned,
                     search_tool_description=description,
                 )
             )
-            logger.info("Tool search transform applied (%d pinned tools)", len(pinned))
+            logger.info(
+                "Tool search transform applied (%d pinned tools, max_results=%d)",
+                len(pinned),
+                self.settings.tool_search_max_results,
+            )
         except Exception:
             logger.exception("Failed to apply tool search transform")