Add mcp/updateServer to support change mcp commands/urls from client UI.

ericdallo · ericdallo · commit 6703b3bccb16 · 2026-03-13T21:32:33.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Delete chats older than 7 days on server startup.
 - Use human-readable workspace cache directory names (e.g. `my-project_a1b2c3d4`), with automatic migration from old hash-only format.
+- Show MCP server URL in the details page and allow editing command/args/url inline with `mcp/updateServer` endpoint.
+- Add `mcp/updateServer` to support change mcp commands/urls from client UI.
 
 ## 0.113.1
 
diff --git a/docs/protocol.md b/docs/protocol.md
@@ -2138,9 +2138,39 @@ interface MCPLogoutServerParams {
 }
 ```
 
-### Add MCP (↩️)
+### Update MCP Server (↩️)
 
-Soon
+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.
+
+_Request:_
+
+* method: `mcp/updateServer`
+* params: `MCPUpdateServerParams` defined as follows:
+
+```typescript
+interface MCPUpdateServerParams {
+    /**
+     * The MCP server name.
+     */
+    name: string;
+    /**
+     * The command to run (for stdio servers).
+     */
+    command?: string;
+    /**
+     * The command arguments (for stdio servers).
+     */
+    args?: string[];
+    /**
+     * The URL (for remote/HTTP servers).
+     */
+    url?: string;
+}
+```
+
+_Response:_
+
+* result: `{}`
 
 ## General features
 
diff --git a/src/eca/config.clj b/src/eca/config.clj
@@ -171,7 +171,7 @@
               :outputTruncation {:lines 2000 :sizeKb 50}}
    :variantsByModel {".*sonnet[-._]4[-._]6|opus[-._]4[-._][56]" {:variants anthropic-variants}
                      ".*gpt[-._]5(?:[-._](?:2|4)(?!\\d)|[-._]3[-._]codex)" {:variants openai-variants
-                                                                           :excludeProviders ["github-copilot"]}}
+                                                                            :excludeProviders ["github-copilot"]}}
    :mcpTimeoutSeconds 60
    :lspTimeoutSeconds 30
    :mcpServers {}
@@ -507,14 +507,14 @@
           (merge-config $ plugin-config))
         ;; Append plugin commands/rules (vector concat, not deep-merge replace)
         (cond->
-          (seq plugin-commands) (update :commands #(vec (concat % plugin-commands)))
-          (seq plugin-rules) (update :rules #(vec (concat % plugin-rules))))
+         (seq plugin-commands) (update :commands #(vec (concat % plugin-commands)))
+         (seq plugin-rules) (update :rules #(vec (concat % plugin-rules))))
         migrate-legacy-config
         ;; Merge markdown-defined agents (lowest priority — JSON config agents win)
         ;; Plugin agents merge at same level as markdown agents
         (as-> config
               (let [md-agent-configs (when-not pure-config?
-                                      (agents/all-md-agents (:workspace-folders db)))]
+                                       (agents/all-md-agents (:workspace-folders db)))]
                 (if (or (seq md-agent-configs) (seq plugin-agents))
                   (update config :agent (fn [existing]
                                           (merge md-agent-configs plugin-agents existing)))
@@ -622,3 +622,18 @@
         new-config-json (json/generate-string new-config {:pretty true})]
     (io/make-parents global-config-file)
     (spit global-config-file new-config-json)))
+
+(defn update-local-config!
+  "Deep-merges `config` into the local `.eca/config.json` for `workspace-root-uri`."
+  [workspace-root-uri config]
+  (let [config-dir (io/file (shared/uri->filename workspace-root-uri) ".eca")
+        config-file (io/file config-dir "config.json")
+        current-config (when (.exists config-file)
+                         (normalize-fields normalization-rules
+                                           (safe-read-json-string (slurp config-file) (var *local-config-error*))))
+        new-config (deep-merge (or current-config {})
+                               (normalize-fields normalization-rules config))
+        new-config (assoc new-config "$schema" config-schema-url)
+        new-config-json (json/generate-string new-config {:pretty true})]
+    (io/make-parents config-file)
+    (spit config-file new-config-json)))
diff --git a/src/eca/features/tools.clj b/src/eca/features/tools.clj
@@ -310,6 +310,16 @@
      metrics
      {:on-server-updated (partial notify-server-updated metrics messenger tool-status-fn)})))
 
+(defn update-server! [name server-fields db* messenger config metrics]
+  (let [tool-status-fn (make-tool-status-fn config nil)]
+    (f.mcp/update-server!
+     name
+     server-fields
+     db*
+     config
+     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)))]
diff --git a/src/eca/features/tools/mcp.clj b/src/eca/features/tools/mcp.clj
@@ -1,6 +1,10 @@
 (ns eca.features.tools.mcp
   (:require
+   [cheshire.core :as json]
+   [cheshire.factory :as json.factory]
+   [clojure.core.memoize :as memoize]
    [clojure.java.browse :as browse]
+   [clojure.java.io :as io]
    [clojure.string :as string]
    [eca.config :as config]
    [eca.db :as db]
@@ -421,24 +425,84 @@
                       (on-server-updated (->server name server-config :failed @db*)))})
         (browse/browse-url authorization-endpoint)))))
 
+(defn ^:private restart-server!
+  "Stop the server if running, then spawn a daemon thread to re-initialize it."
+  [name db* config metrics on-server-updated]
+  (when (get-in @db* [:mcp-clients name :client])
+    (stop-server! name db* config {:on-server-updated on-server-updated}))
+  (let [t (Thread.
+           (fn []
+             (try
+               (initialize-server! name db* config metrics on-server-updated)
+               (finally
+                 (deregister-init-thread! name)))))]
+    (.setName t (str "mcp-init-" name))
+    (.setDaemon t true)
+    (register-init-thread! name t)
+    (.start t)))
+
 (defn logout-server!
   "Logout from an MCP server by clearing stored OAuth credentials and restarting it."
   [name db* config metrics {:keys [on-server-updated]}]
   (when (get-in config [:mcpServers name])
     (swap! db* update :mcp-auth dissoc name)
     (db/update-global-cache! @db* metrics)
-    (when (get-in @db* [:mcp-clients name :client])
-      (stop-server! name db* config {:on-server-updated on-server-updated}))
-    (let [t (Thread.
-             (fn []
-               (try
-                 (initialize-server! name db* config metrics on-server-updated)
-                 (finally
-                   (deregister-init-thread! name)))))]
-      (.setName t (str "mcp-init-" name))
-      (.setDaemon t true)
-      (register-init-thread! name t)
-      (.start t))))
+    (restart-server! name db* config metrics on-server-updated)))
+
+(defn ^:private parse-json-with-comments [^String s]
+  (binding [json.factory/*json-factory* (json.factory/make-json-factory {:allow-comments true})]
+    (json/parse-string s)))
+
+(defn ^:private find-server-config-source
+  "Returns {:source :local :workspace-root-uri uri} or {:source :global}
+   indicating where the MCP server `server-name` is defined.
+   Checks local workspace configs first (highest priority), then global."
+  [server-name db]
+  (let [roots (:workspace-folders db)]
+    (or (some (fn [{:keys [uri]}]
+                (let [config-file (io/file (shared/uri->filename uri) ".eca" "config.json")]
+                  (when (.exists ^java.io.File config-file)
+                    (let [local-config (parse-json-with-comments (slurp config-file))]
+                      (when (get-in local-config ["mcpServers" server-name])
+                        {:source :local :workspace-root-uri uri})))))
+              roots)
+        (let [global-file (config/global-config-file)]
+          (when (.exists global-file)
+            (let [global-config (parse-json-with-comments (slurp global-file))]
+              (when (get-in global-config ["mcpServers" server-name])
+                {:source :global}))))
+        {:source :global})))
+
+(defn ^:private replace-server-in-config-file!
+  "Replace a single MCP server entry in a JSON config file using assoc-in
+   instead of deep-merge, so old keys (e.g. :command when switching to :url)
+   are removed. Note: comments in the original file are stripped since JSON
+   output cannot preserve them."
+  [^java.io.File config-file server-name new-server-config]
+  (let [raw (when (.exists config-file)
+              (parse-json-with-comments (slurp config-file)))
+        updated (assoc-in (or raw {}) ["mcpServers" server-name]
+                          (json/parse-string (json/generate-string new-server-config)))]
+    (io/make-parents config-file)
+    (spit config-file (json/generate-string updated {:pretty true}))))
+
+(defn update-server!
+  "Update an MCP server's connection config (command/args/url), persist to the
+   correct config file (local or global), clear the config cache, then restart."
+  [server-name server-fields db* config metrics {:keys [on-server-updated]}]
+  (let [db @db*
+        {:keys [source workspace-root-uri]} (find-server-config-source server-name db)
+        current-server-config (get-in config [:mcpServers server-name])
+        ;; Build clean server entry: preserve env/disabled/headers, replace connection fields
+        preserved-keys (select-keys current-server-config [:env :disabled :headers])
+        new-server-config (merge preserved-keys server-fields)
+        config-file (if (= source :local)
+                      (io/file (shared/uri->filename workspace-root-uri) ".eca" "config.json")
+                      (config/global-config-file))]
+    (replace-server-in-config-file! config-file server-name new-server-config)
+    (memoize/memo-clear! config/all)
+    (let [fresh-config (config/all @db*)]
+      (restart-server! server-name db* fresh-config metrics on-server-updated))))
 
 (defn all-tools [db]
   (into []
@@ -474,20 +538,20 @@
                                  nil)}
           call-future (future (pmc/call-tool mcp-client name arguments call-opts))
           result (if needs-reinit?*
-                   (loop [elapsed 0]
+                   (loop [elapsed (long 0)]
                      (cond
                        (realized? call-future)
                        (deref call-future)
 
                        @needs-reinit?*
                        (do (future-cancel call-future) nil)
 
-                       (>= elapsed tool-call-timeout-ms)
+                       (>= elapsed (long tool-call-timeout-ms))
                        (do (future-cancel call-future) nil)
 
                        :else
-                       (do (Thread/sleep reinit-poll-interval-ms)
-                           (recur (+ elapsed reinit-poll-interval-ms)))))
+                       (do (Thread/sleep (long reinit-poll-interval-ms))
+                           (recur (+ elapsed (long reinit-poll-interval-ms))))))
                    (deref call-future))]
       (if result
         {:error (:isError result)
diff --git a/src/eca/handlers.clj b/src/eca/handlers.clj
@@ -212,6 +212,16 @@
   (metrics/task metrics :eca/mcp-logout-server
     (f.tools/logout-server! (:name params) db* messenger config metrics)))
 
+(defn mcp-update-server [{:keys [db* messenger metrics config]} params]
+  (metrics/task metrics :eca/mcp-update-server
+    (let [server-name (:name params)
+          server-fields (cond-> {}
+                          (:command params) (assoc :command (:command params))
+                          (:args params) (assoc :args (:args params))
+                          (:url params) (assoc :url (:url params)))]
+      (f.tools/update-server! server-name server-fields 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*]
diff --git a/src/eca/server.clj b/src/eca/server.clj
@@ -89,6 +89,9 @@
 (defmethod jsonrpc.server/receive-notification "mcp/logoutServer" [_ components params]
   (handlers/mcp-logout-server (with-config components) params))
 
+(defmethod jsonrpc.server/receive-request "mcp/updateServer" [_ components params]
+  (handlers/mcp-update-server (with-config components) params))
+
 (defmethod jsonrpc.server/receive-notification "chat/selectedAgentChanged" [_ components params]
   (handlers/chat-selected-agent-changed (with-config components) params))
 
