Merge branch 'pr-960' into addon-repo

Author: kingpanther13

homeassistant-addon-dev/config.yaml

@@ -10,6 +10,9 @@ arch:
 init: false
 startup: application
 boot: manual
+ingress: true
+ingress_port: 9583
+ingress_stream: true
 hassio_api: true
 hassio_role: default
 homeassistant_api: true
@@ -21,12 +24,18 @@ options:
   enable_skills_as_tools: false
   enable_tool_search: false
   enable_yaml_config_editing: false
+  tool_search_max_results: 5
+  disabled_tools: ""
+  pinned_tools: ""
 schema:
   backup_hint: list(strong|normal|weak|auto)
   secret_path: str?
   enable_skills: bool?
   enable_skills_as_tools: bool?
   enable_tool_search: bool?
   enable_yaml_config_editing: bool?
+  tool_search_max_results: int?
+  disabled_tools: str?
+  pinned_tools: str?
 ports:
   9583/tcp: 9583

homeassistant-addon-dev/translations/en.yaml

@@ -35,3 +35,22 @@ configuration:
       like homeassistant, http, and recorder are blocked. A backup is
       created before every edit. Use for YAML-only features that have no
       UI or API alternative. Requires restart to take effect.
+  tool_search_max_results:
+    name: Tool search max results
+    description: >-
+      Maximum number of tools returned by ha_search_tools when tool
+      search is enabled. Lower values (2-3) save context tokens but
+      may miss relevant tools. Range: 2-10. Requires restart.
+  disabled_tools:
+    name: Disabled tools (text fallback)
+    description: >-
+      Comma-separated tool names to disable. For a visual interface,
+      click "Open Web UI" on the addon info page. This field seeds the initial config
+      when the web UI hasn't been used yet. Requires restart.
+  pinned_tools:
+    name: Pinned tools (text fallback)
+    description: >-
+      Comma-separated tool names to pin (always visible in tool search).
+      For a visual interface, click "Open Web UI" on the addon info page. This field
+      seeds the initial config when the web UI hasn't been used yet.
+      Requires restart.

homeassistant-addon/start.py

@@ -110,6 +110,9 @@ def main() -> int:
     enable_skills_as_tools = False  # default
     enable_tool_search = False  # default
     enable_yaml_config_editing = False  # default
+    tool_search_max_results = 5  # default
+    disabled_tools_raw = ""  # default
+    pinned_tools_raw = ""  # default
 
     if config_file.exists():
         try:
@@ -125,6 +128,12 @@ def main() -> int:
             enable_tool_search = raw_tool_search if isinstance(raw_tool_search, bool) else False
             raw_yaml_config = config.get("enable_yaml_config_editing", False)
             enable_yaml_config_editing = raw_yaml_config if isinstance(raw_yaml_config, bool) else False
+            raw_max_results = config.get("tool_search_max_results", 5)
+            tool_search_max_results = raw_max_results if isinstance(raw_max_results, int) else 5
+            raw_disabled = config.get("disabled_tools", "")
+            disabled_tools_raw = raw_disabled if isinstance(raw_disabled, str) else ""
+            raw_pinned = config.get("pinned_tools", "")
+            pinned_tools_raw = raw_pinned if isinstance(raw_pinned, str) else ""
         except Exception as e:
             log_error(f"Failed to read config: {e}, using defaults")
 
@@ -140,6 +149,9 @@ def main() -> int:
     os.environ["ENABLE_SKILLS_AS_TOOLS"] = str(enable_skills_as_tools).lower()
     os.environ["ENABLE_TOOL_SEARCH"] = str(enable_tool_search).lower()
     os.environ["ENABLE_YAML_CONFIG_EDITING"] = str(enable_yaml_config_editing).lower()
+    os.environ["TOOL_SEARCH_MAX_RESULTS"] = str(tool_search_max_results)
+    os.environ["DISABLED_TOOLS"] = disabled_tools_raw
+    os.environ["PINNED_TOOLS"] = pinned_tools_raw
 
     # Validate Supervisor token
     supervisor_token = os.environ.get("SUPERVISOR_TOKEN")

src/ha_mcp/config.py

@@ -112,6 +112,15 @@ 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 (2-10).
+    tool_search_max_results: int = Field(5, alias="TOOL_SEARCH_MAX_RESULTS")
+
     @model_validator(mode="after")
     def _skills_dependency(self) -> "Settings":
         """Auto-enable skills (resources) when skills-as-tools is on.

src/ha_mcp/server.py

@@ -143,6 +143,10 @@ def _initialize_server(self) -> None:
         # Register bundled skills as MCP resources
         self._register_skills()
 
+        # Apply user-configured tool visibility (after all tools registered,
+        # before tool search transform wraps them)
+        self._apply_settings_ui()
+
         # Apply tool search transform (must come after all tools and
         # ResourcesAsTools are registered so it can wrap everything)
         self._apply_tool_search()
@@ -306,6 +310,23 @@ def _build_skill_block(self, skill_name: str, main_file: Path) -> str | None:
 
         return f"\n### Skill: {skill_name} ({uri})\n{description.strip()}"
 
+    def _apply_settings_ui(self) -> None:
+        """Register settings web UI and apply persisted tool visibility."""
+        from .settings_ui import (
+            apply_tool_visibility,
+            load_tool_config,
+            register_settings_routes,
+        )
+
+        register_settings_routes(self.mcp, self)
+
+        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)
@@ -419,8 +440,9 @@ def _apply_tool_search(self) -> None:
             )
             return
 
-        # Build the always_visible list
+        # Build the always_visible list: defaults + user-configured pins
         pinned = list(self._PINNED_TOOLS)
+        pinned.extend(getattr(self, "_user_pinned_tools", []))
 
         # Pin ResourcesAsTools and skill guidance tools if skills-as-tools is enabled
         if self.settings.enable_skills_as_tools: