Add dynamic loading of user-configured custom MCP servers and update documentation to reflect new capabilities

Author: TKassis

kady_agent/instructions/main_agent.md

@@ -29,6 +29,7 @@ Choose the lightest reliable path:
 
 - Prefer Parallel Search MCP (`web_search`, `web_fetch`) for open-web search and URL content retrieval.
 - Prefer Docling for document conversion, text extraction, and markdown export.
+- Users may install custom MCP tools (e.g. memory/knowledge-graph, filesystem, databases, specialized APIs) via the Settings panel. These tools appear alongside the built-in ones — use them directly whenever the request matches their capabilities instead of routing through `delegate_task`.
 - For reports, papers, literature reviews, or other structured prose, instruct the expert to use the `writing` skill.
 
 ## After tool use

kady_agent/mcps.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 from typing import List, Optional
@@ -12,6 +13,8 @@
     StreamableHTTPConnectionParams,
 )
 
+from .gemini_settings import load_custom_mcps
+
 logger = logging.getLogger(__name__)
 
 
@@ -43,6 +46,83 @@ async def close(self) -> None:
             pass
 
 
+def _make_toolset(name: str, spec: dict) -> ResilientMcpToolset | None:
+    """Create a ResilientMcpToolset from a custom MCP server spec.
+
+    Supports two formats (matching the Gemini CLI settings schema):
+      - HTTP:  ``{"httpUrl": "...", "headers": {...}}``
+      - Stdio: ``{"command": "...", "args": [...], "env": {...}}``
+    """
+    if "httpUrl" in spec:
+        params = StreamableHTTPConnectionParams(
+            url=spec["httpUrl"],
+            headers=spec.get("headers", {}),
+            timeout=spec.get("timeout", 120),
+        )
+    elif "command" in spec:
+        params = StdioConnectionParams(
+            server_params=StdioServerParameters(
+                command=spec["command"],
+                args=spec.get("args", []),
+                env=spec.get("env"),
+            ),
+            timeout=float(spec.get("timeout", 120)),
+        )
+    else:
+        logger.warning("Skipping custom MCP %r: no 'command' or 'httpUrl' key", name)
+        return None
+    return ResilientMcpToolset(McpToolset(connection_params=params), label=name)
+
+
+class DynamicCustomMcpToolset(BaseToolset):
+    """Reads ``user_config/custom_mcps.json`` on every agent turn and
+    lazily creates / caches MCP connections for each entry.
+
+    When the config file changes between turns the stale connections are
+    torn down and new ones are established automatically — no server
+    restart required.
+    """
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._toolsets: dict[str, ResilientMcpToolset] = {}
+        self._config_hash: str | None = None
+
+    async def get_tools(
+        self, readonly_context: Optional[ReadonlyContext] = None
+    ) -> List[BaseTool]:
+        config = load_custom_mcps()
+        new_hash = json.dumps(config, sort_keys=True)
+
+        if new_hash != self._config_hash:
+            await self._rebuild(config)
+            self._config_hash = new_hash
+
+        all_tools: List[BaseTool] = []
+        for ts in self._toolsets.values():
+            all_tools.extend(await ts.get_tools(readonly_context))
+        return all_tools
+
+    async def _rebuild(self, config: dict) -> None:
+        for ts in self._toolsets.values():
+            await ts.close()
+        self._toolsets.clear()
+
+        for name, spec in config.items():
+            ts = _make_toolset(name, spec)
+            if ts is not None:
+                self._toolsets[name] = ts
+
+    async def close(self) -> None:
+        for ts in self._toolsets.values():
+            await ts.close()
+        self._toolsets.clear()
+
+
+# ---------------------------------------------------------------------------
+# Built-in MCP servers
+# ---------------------------------------------------------------------------
+
 all_mcps: list[BaseToolset] = []
 
 if os.getenv("PARALLEL_API_KEY"):
@@ -71,3 +151,6 @@ async def close(self) -> None:
     label="Docling MCP",
 )
 all_mcps.append(docling_mcp)
+
+# User-configured custom MCP servers (loaded dynamically per-request)
+all_mcps.append(DynamicCustomMcpToolset())

web/src/components/settings-dialog.tsx

@@ -86,7 +86,7 @@ function McpServersPanel() {
 
       <div className="flex items-center justify-between">
         <p className="text-[11px] text-muted-foreground">
-          Changes apply to the next Gemini CLI invocation.
+          Changes apply to the next message.
         </p>
         <Button
           size="sm"