Add mcp/serverUpdated server notification

Author: ericdallo

CHANGELOG.md

@@ -5,7 +5,7 @@
 - Allow comments on `json` configs.
 - Improve MCP tool call feedback.
 - Add support for env vars in mcp configs.
-- Add `mcp/listServers` request.
+- Add `mcp/serverUpdated` server notification.
 
 ## 0.0.4
 

docs/protocol.md

@@ -647,30 +647,21 @@ Soon
 
 ## Configuration
 
-### List MCPs (↩️)
+### MCP server updated (⬅️)
 
-A client request listing configured MCP servers configured by server and its status.
+A server notification about a configured MCP server status update.
+This is useful for clients present to user the list of configured MCPs,
+their status and available tools.
 
 _Request:_ 
 
-* method: `mcp/listServers`
-* params: `ListMCPServersParams` defined as follows:
-
-```typescript
-interface ListMCPServersParams {}
-```
+* method: `mcp/serverUpdated`
+* params: `MCPServerUpdatedParams` defined as follows:
 
 _Response:_
 
 ```typescript
-interface ListMCPServersResponse {
-    /**
-     * The list of servers.
-     */
-    servers: MCPServer[];
-}
-
-interface MCPServer {
+interface MCPServerUpdatedParams {
     /**
      * The server name.
      */
@@ -689,7 +680,7 @@ interface MCPServer {
     /**
      * The status of the server.
      */
-    status: 'running' | 'starting' | 'stopped' | 'disabled';
+    status: 'running' | 'starting' | 'stopped' | 'failed' | 'disabled';
 
     /**
      * The tools supported by this mcp server if not disabled.

src/eca/features/mcp.clj

@@ -59,23 +59,39 @@
                          (.build)))
       (.build)))
 
-(defn initialize! [{:keys [on-error]} db* config]
-  (let [workspaces (:workspace-folders @db*)]
+(defn ^:private ->full-server [mcp-name server-config db]
+  (let [tools (->> (vals (:mcp-tools db))
+                   (filterv #(= mcp-name (:mcp-name %)))
+                   (map (fn [mcp-tool]
+                          {:name (:name mcp-tool)
+                           :description (:description mcp-tool)
+                           :parameters (:parameters mcp-tool)})))]
+    (cond-> {:name (name mcp-name)
+             :command (:command server-config)
+             :args (:args server-config)}
+      (seq tools) (assoc :tools tools))))
+
+(defn initialize-servers-async! [{:keys [on-server-updated]} db* config]
+  (let [workspaces (:workspace-folders @db*)
+        db @db*]
     (doseq [[name server-config] (:mcpServers config)]
-      (try
-        (when-not (and (get-in @db* [:mcp-clients name])
-                       (get server-config :disabled false))
-          (let [transport (->transport server-config workspaces)
-                client (->client transport config)]
-            (swap! db* assoc-in [:mcp-clients name] {:client client
-                                                     :status :starting})
-            (doseq [{:keys [name uri]} workspaces]
-              (.addRoot client (McpSchema$Root. uri name)))
-            (.initialize client)
-            (swap! db* update-in [:mcp-clients name] dissoc :status)))
-        (catch Exception e
-          (logger/warn logger-tag (format "Could not initialize MCP server %s. Error: %s" name (.getMessage e)))
-          (on-error name e))))))
+      (let [full-server (->full-server name server-config db)]
+        (when-not (get-in db [:mcp-clients name])
+          (if (get server-config :disabled false)
+            (on-server-updated (assoc full-server :status :disabled))
+            (future
+              (try
+                (let [transport (->transport server-config workspaces)
+                      client (->client transport config)]
+                  (on-server-updated (assoc full-server :status :starting))
+                  (swap! db* assoc-in [:mcp-clients name] {:client client})
+                  (doseq [{:keys [name uri]} workspaces]
+                    (.addRoot client (McpSchema$Root. uri name)))
+                  (.initialize client)
+                  (on-server-updated (assoc full-server :status :running)))
+                (catch Exception e
+                  (logger/warn logger-tag (format "Could not initialize MCP server %s. Error: %s" name (.getMessage e)))
+                  (on-server-updated (assoc full-server :status :failed)))))))))))
 
 (defn tools-cached? [db]
   (boolean (:mcp-tools db)))
@@ -116,26 +132,3 @@
   (swap! db* assoc
          :mcp-clients {}
          :mcp-tools {}))
-
-(defn all-servers [db config]
-  (reduce
-   (fn [servers [name server]]
-     (let [{:keys [status client]} (get-in db [:mcp-clients name])
-           tools (->> (vals (:mcp-tools db))
-                      (filterv #(= name (:mcp-name %)))
-                      (map (fn [mcp-tool]
-                             {:name (:name mcp-tool)
-                              :description (:description mcp-tool)
-                              :parameters (:parameters mcp-tool)})))]
-       (conj servers (cond-> {:name (clojure.core/name name)
-                              :command (:command server)
-                              :args (:args server)
-                              :status (or status
-                                          (if client
-                                            (if (.isInitialized ^McpSyncClient client)
-                                              :running
-                                              :stopped)
-                                            :disabled))}
-                       (seq tools) (assoc :tools tools)))))
-   []
-   (:mcpServers config)))

src/eca/handlers.clj

@@ -32,15 +32,12 @@
           :chat-behavior (or (-> params :initialization-options :chat-behavior) (:chat-behavior @db*)))
    (let [config (config/all @db*)]
      (initialize-extra-models! db*)
-     ;; TODO initialize async with progress support
-     (f.mcp/initialize!
-      {:on-error (fn [mcp-server-name _exception]
-                   (messenger/showMessage
-                    messenger
-                    {:type :error
-                     :message (format "MCP server %s not initialized, set \"--log-level debug\" and check stderr logs for more details" mcp-server-name)}))}
-      db*
-      config)
+     (future
+       (f.mcp/initialize-servers-async!
+        {:on-server-updated (fn [server]
+                              (messenger/mcp-server-updated messenger server))}
+        db*
+        config))
      {:models (keys (:models @db*))
       :chat-default-model (f.chat/default-model @db*)
       :chat-behaviors (:chat-behaviors @db*)
@@ -64,8 +61,3 @@
   (logger/logging-task
    :eca/chat-query-context
    (f.chat/query-context params db*)))
-
-(defn mcp-list-servers [{:keys [db*]} _params]
-  (logger/logging-task
-   :eca/mcp-list-servers
-    {:servers (f.mcp/all-servers @db* (config/all @db*))}))

src/eca/messenger.clj

@@ -6,4 +6,5 @@
 
 (defprotocol IMessenger
   (chat-content-received [this data])
+  (mcp-server-updated [this params])
   (showMessage [this msg]))

src/eca/server.clj

@@ -45,9 +45,6 @@
 (defmethod lsp.server/receive-request "chat/queryContext" [_ components params]
   (handlers/chat-query-context components params))
 
-(defmethod lsp.server/receive-request "mcp/listServers" [_ components params]
-  (handlers/mcp-list-servers components params))
-
 (defn ^:private monitor-server-logs [log-ch]
   ;; NOTE: if this were moved to `initialize`, after timbre has been configured,
   ;; the server's startup logs and traces would appear in the regular log file
@@ -77,6 +74,9 @@
   (chat-content-received [_this content]
     (lsp.server/discarding-stdout
      (lsp.server/send-notification server "chat/contentReceived" content)))
+  (mcp-server-updated [_this params]
+    (lsp.server/discarding-stdout
+     (lsp.server/send-notification server "mcp/serverUpdated" params)))
   (showMessage [_this msg]
     (lsp.server/discarding-stdout
      (lsp.server/send-notification server "$/showMessage" msg))))