Merge branch 'master' into improve-eca__task-usage-after-compact

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - Update the compact prompt to read the active eca__task list after compacting.
 
+## 0.120.0
+
+- Add `mcp/disableServer` and `mcp/enableServer` notifications to toggle MCP servers from the client, persisting the `disabled` flag in config.json.
+
 ## 0.119.0
 
 - Add `/fork` command to clone current chat into a new chat with the same history and settings, and `chat/opened` server notification.

docs/protocol.md

@@ -2174,6 +2174,44 @@ interface MCPLogoutServerParams {
 }
 ```
 
+### Disable MCP server (➡️)
+
+A client notification to disable an MCP server. Persists `disabled: true` in the config file,
+stops the server if running, and sends `tool/serverUpdated` with status `disabled`.
+
+_Notification:_
+
+* method: `mcp/disableServer`
+* params: `MCPDisableServerParams` defined as follows:
+
+```typescript
+interface MCPDisableServerParams {
+    /**
+     * The MCP server name.
+     */
+    name: string;
+}
+```
+
+### Enable MCP server (➡️)
+
+A client notification to enable a disabled MCP server. Removes the `disabled` flag from the config file,
+starts the server, and sends `tool/serverUpdated` with the new status.
+
+_Notification:_
+
+* method: `mcp/enableServer`
+* params: `MCPEnableServerParams` defined as follows:
+
+```typescript
+interface MCPEnableServerParams {
+    /**
+     * The MCP server name.
+     */
+    name: string;
+}
+```
+
 ### Update MCP Server (↩️)
 
 Updates an MCP server's connection configuration (command/args or url), persists the change to the appropriate config file (local or global), and restarts the server.

resources/ECA_VERSION

@@ -1 +1 @@
-0.119.0
+0.120.0

src/eca/features/tools.clj

@@ -332,6 +332,22 @@
      metrics
      {:on-server-updated (partial notify-server-updated metrics messenger tool-status-fn)})))
 
+(defn disable-server! [name db* messenger config metrics]
+  (let [tool-status-fn (make-tool-status-fn config nil)]
+    (f.mcp/disable-server!
+     name
+     db*
+     config
+     {:on-server-updated (partial notify-server-updated metrics messenger tool-status-fn)})))
+
+(defn enable-server! [name db* messenger config metrics]
+  (let [tool-status-fn (make-tool-status-fn config nil)]
+    (f.mcp/enable-server!
+     name
+     db*
+     metrics
+     {:on-server-updated (partial notify-server-updated metrics messenger tool-status-fn)})))
+
 (defn tool-call-summary [all-tools full-name args config db]
   (when-let [summary-fn (:summary-fn (first (filter #(= full-name (:full-name %))
                                                     all-tools)))]

src/eca/features/tools/mcp.clj

@@ -20,7 +20,8 @@
    [plumcp.core.client.stdio-client-transport :as psct]
    [plumcp.core.protocol :as pp]
    [plumcp.core.schema.schema-defs :as psd]
-   [plumcp.core.support.http-client :as phc])
+   [plumcp.core.support.http-client :as phc]
+   [rewrite-json.core :as rj])
   (:import
    [java.io IOException]))
 
@@ -346,9 +347,9 @@
                                    init-result (pmc/get-initialize-result client)
                                    version (get-in init-result [:serverInfo :version])]
                                (swap! db* assoc-in [:mcp-clients name] (cond-> {:client client
-                                                                                                :status :starting
-                                                                                                :needs-reinit?* needs-reinit?*}
-                                                                                http-client (assoc :http-client http-client)))
+                                                                                :status :starting
+                                                                                :needs-reinit?* needs-reinit?*}
+                                                                         http-client (assoc :http-client http-client)))
                                (swap! db* assoc-in [:mcp-clients name :version] version)
                                (swap! db* assoc-in [:mcp-clients name :instructions] (:instructions init-result))
                                (swap! db* assoc-in [:mcp-clients name :tools] (list-server-tools client))
@@ -565,6 +566,45 @@
     (let [fresh-config (config/all @db*)]
       (restart-server! server-name db* fresh-config metrics on-server-updated))))
 
+(defn ^:private update-config-file!
+  "Apply rewrite-json edits to a config file, preserving comments and formatting.
+   `edit-fn` receives a parsed rj root node and returns the modified root."
+  [^java.io.File config-file edit-fn]
+  (let [raw (if (.exists config-file) (slurp config-file) "{}")
+        root (edit-fn (rj/parse-string raw))]
+    (io/make-parents config-file)
+    (spit config-file (rj/to-string root))))
+
+(defn ^:private resolve-config-file [server-name db]
+  (let [{:keys [source workspace-root-uri]} (find-server-config-source server-name db)]
+    (if (= source :local)
+      (io/file (shared/uri->filename workspace-root-uri) ".eca" "config.json")
+      (config/global-config-file))))
+
+(defn disable-server!
+  "Disable an MCP server: persist disabled=true in config, stop if running, notify."
+  [server-name db* config {:keys [on-server-updated]}]
+  (let [db @db*
+        config-file (resolve-config-file server-name db)
+        server-config (get-in config [:mcpServers server-name])]
+    (update-config-file! config-file
+                         #(rj/assoc-in % ["mcpServers" server-name "disabled"] true))
+    (memoize/memo-clear! config/all)
+    (when (get-in db [:mcp-clients server-name :client])
+      (stop-server! server-name db* config {:on-server-updated on-server-updated}))
+    (on-server-updated (->server server-name server-config :disabled @db*))))
+
+(defn enable-server!
+  "Enable an MCP server: remove disabled from config, start the server, notify."
+  [server-name db* metrics {:keys [on-server-updated]}]
+  (let [db @db*
+        config-file (resolve-config-file server-name db)]
+    (update-config-file! config-file
+                         #(rj/dissoc-in % ["mcpServers" server-name "disabled"]))
+    (memoize/memo-clear! config/all)
+    (let [fresh-config (config/all @db*)]
+      (start-server! server-name db* fresh-config metrics {:on-server-updated on-server-updated}))))
+
 (defn all-tools [db]
   (into []
         (mapcat (fn [[name {:keys [tools version]}]]
@@ -721,22 +761,22 @@
     (let [clients (vals (:mcp-clients @db*))
           latch (java.util.concurrent.CountDownLatch. (count clients))
           threads (doall
-                    (map (fn [{:keys [client http-client]}]
-                           (doto (Thread.
-                                   (fn []
-                                     (try
-                                       (if http-client
+                   (map (fn [{:keys [client http-client]}]
+                          (doto (Thread.
+                                 (fn []
+                                   (try
+                                     (if http-client
                                          ;; HTTP: force-stop (the DELETE in disconnect! always
                                          ;; times out because the server is slow to respond)
-                                         (pp/stop! http-client)
+                                       (pp/stop! http-client)
                                          ;; stdio: graceful disconnect
-                                         (pmc/disconnect! client))
-                                       (catch Exception _)
-                                       (finally
-                                         (.countDown latch)))))
-                             (.setDaemon true)
-                             (.start)))
-                         clients))]
+                                       (pmc/disconnect! client))
+                                     (catch Exception _)
+                                     (finally
+                                       (.countDown latch)))))
+                            (.setDaemon true)
+                            (.start)))
+                        clients))]
       (when-not (.await latch disconnect-timeout-ms java.util.concurrent.TimeUnit/MILLISECONDS)
         (logger/warn logger-tag "Some MCP servers did not disconnect within timeout, forcing stop")
         (doseq [^Thread t threads]

src/eca/features/tools/util.clj

@@ -5,7 +5,6 @@
    [clojure.java.io :as io]
    [clojure.java.shell :as shell]
    [clojure.string :as string]
-   [clojure.string :as str]
    [eca.cache :as cache]
    [eca.logger :as logger]
    [eca.shared :as shared]))
@@ -206,4 +205,4 @@
 
 (defn normalize-optional-string
   [value]
-  (some-> value str/trim not-empty))
+  (some-> value string/trim not-empty))

src/eca/handlers.clj

@@ -246,6 +246,14 @@
       (f.tools/update-server! server-name server-fields db* messenger config metrics)
       {})))
 
+(defn mcp-disable-server [{:keys [db* messenger metrics config]} params]
+  (metrics/task metrics :eca/mcp-disable-server
+    (f.tools/disable-server! (:name params) db* messenger config metrics)))
+
+(defn mcp-enable-server [{:keys [db* messenger metrics config]} params]
+  (metrics/task metrics :eca/mcp-enable-server
+    (f.tools/enable-server! (:name params) db* messenger config metrics)))
+
 (defn ^:private update-agent-model-and-variants!
   "Updates the selected model and variants based on agent configuration."
   [agent-config config messenger db*]

src/eca/remote/handlers.clj

@@ -271,6 +271,16 @@
     (handlers/mcp-logout-server (assoc components :config config) {:name server-name})
     (no-content)))
 
+(defn handle-mcp-disable [{:keys [db*] :as components} _request server-name]
+  (let [config (config/all @db*)]
+    (handlers/mcp-disable-server (assoc components :config config) {:name server-name})
+    (no-content)))
+
+(defn handle-mcp-enable [{:keys [db*] :as components} _request server-name]
+  (let [config (config/all @db*)]
+    (handlers/mcp-enable-server (assoc components :config config) {:name server-name})
+    (no-content)))
+
 (deftype SSEBody [db* sse-connections*]
   ring.protocols/StreamableResponseBody
   (write-body-to-stream [_ _response os]

src/eca/remote/routes.clj

@@ -85,6 +85,8 @@
                   "stop"    [handlers/handle-mcp-stop components request server-name]
                   "connect" [handlers/handle-mcp-connect components request server-name]
                   "logout"  [handlers/handle-mcp-logout components request server-name]
+                  "disable" [handlers/handle-mcp-disable components request server-name]
+                  "enable"  [handlers/handle-mcp-enable components request server-name]
                   nil)))
 
             nil))))))

src/eca/server.clj

@@ -96,6 +96,12 @@
 (defmethod jsonrpc.server/receive-notification "mcp/logoutServer" [_ components params]
   (handlers/mcp-logout-server (with-config components) params))
 
+(defmethod jsonrpc.server/receive-notification "mcp/disableServer" [_ components params]
+  (handlers/mcp-disable-server (with-config components) params))
+
+(defmethod jsonrpc.server/receive-notification "mcp/enableServer" [_ components params]
+  (handlers/mcp-enable-server (with-config components) params))
+
 (defmethod jsonrpc.server/receive-request "mcp/updateServer" [_ components params]
   (handlers/mcp-update-server (with-config components) params))