Add mcp/listServers request

Author: ericdallo

CHANGELOG.md

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

docs/protocol.md

@@ -645,9 +645,75 @@ Soon
 
 Soon
 
+## Configuration
+
 ### List MCPs (↩️)
 
-Soon
+A client request listing configured MCP servers configured by server and its status.
+
+_Request:_ 
+
+* method: `mcp/listServers`
+* params: `ListMCPServersParams` defined as follows:
+
+```typescript
+interface ListMCPServersParams {}
+```
+
+_Response:_
+
+```typescript
+interface ListMCPServersResponse {
+    /**
+     * The list of servers.
+     */
+    servers: MCPServer[];
+}
+
+interface MCPServer {
+    /**
+     * The server name.
+     */
+    name: string;
+    
+    /**
+     * The command to start this server.
+     */
+    command: string;
+
+    /**
+     * The arguments to start this server.
+     */
+    args: string[];
+    
+    /**
+     * The status of the server.
+     */
+    status: 'running' | 'starting' | 'stopped' | 'disabled';
+    
+    /**
+     * The tools supported by this mcp server if not disabled.
+     */
+    tools?: MCPServerTool[];
+}
+
+interface MCPServerTool {
+    /**
+     * The MCP server tool name.
+     */
+    name: string;
+    
+    /**
+     * The MCP server tool description.
+     */
+    description: string;
+    
+    /**
+     * The MCP server tool parameters.
+     */
+    parameters: any; 
+}
+```
 
 ### Add MCP (↩️)
 

src/eca/config.clj

@@ -20,7 +20,7 @@
    :anthropicApiKey nil
    :rules []
    :mcpTimeoutSeconds 60
-   :mcpServers []
+   :mcpServers {}
    :ollama {:host "http://localhost"
             :port 11434
             :useTools false}

src/eca/features/chat.clj

@@ -69,7 +69,7 @@
                 :state :running
                 :text "Finding MCPs"}})
     (f.mcp/cache-tools! db*))
-  (f.mcp/list-tools @db*))
+  (f.mcp/all-tools @db*))
 
 (defn prompt
   [{:keys [message model behavior contexts chat-id request-id]}

src/eca/features/mcp.clj

@@ -67,10 +67,12 @@
                        (get server-config :disabled false))
           (let [transport (->transport server-config workspaces)
                 client (->client transport config)]
-            (swap! db* assoc-in [:mcp-clients name :client] client)
+            (swap! db* assoc-in [:mcp-clients name] {:client client
+                                                     :status :starting})
             (doseq [{:keys [name uri]} workspaces]
               (.addRoot client (McpSchema$Root. uri name)))
-            (.initialize client)))
+            (.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))))))
@@ -87,12 +89,12 @@
                       :mcp-name name
                       :mcp-client client
                       :description (.description tool-client)
-                      ;; We convert to json to then read so we have the clojrue map
+                      ;; We convert to json to then read so we have the clojure map
                       ;; TODO avoid this converting to clojure map directly
                       :parameters (json/parse-string (.writeValueAsString obj-mapper (.inputSchema tool-client)) true)}]
             (swap! db* assoc-in [:mcp-tools (:name tool)] tool)))))))
 
-(defn list-tools [db]
+(defn all-tools [db]
   (vals (:mcp-tools db)))
 
 (defn call-tool! [^String name ^Map arguments db]
@@ -114,3 +116,26 @@
   (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

@@ -64,3 +64,8 @@
   (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/server.clj

@@ -45,6 +45,9 @@
 (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

test/eca/features/mcp_test.clj

@@ -0,0 +1,37 @@
+(ns eca.features.mcp-test
+  (:require
+   [clojure.test :refer [deftest is testing]]
+   [eca.features.mcp :as f.mcp]
+   [matcher-combinators.test :refer [match?]]))
+
+(deftest all-servers-test
+  (testing "disabled servers"
+    (is (match? [{:name "clojureMCP"
+                  :command "clojure"
+                  :args ["-X:mcp" ":port" "7888"]
+                  :status :disabled}]
+                (f.mcp/all-servers
+                 {}
+                 {:mcpServers
+                  {:clojureMCP {:command "clojure"
+                                :args ["-X:mcp" ":port" "7888"]
+                                :disabled true}}}))))
+  (testing "running servers"
+    (is (match? [{:name "clojureMCP"
+                  :command "clojure"
+                  :args ["-X:mcp" ":port" "7888"]
+                  :status :running
+                  :tools [{:name "eval"
+                           :description "Evaluate Clojure code"
+                           :parameters {:type "object"
+                                        :properties {:code {:type "string"}}}}]}]
+                (f.mcp/all-servers
+                 {:mcp-clients {:clojureMCP {:status :running}}
+                  :mcp-tools {"eval" {:name "eval"
+                                      :mcp-name :clojureMCP
+                                      :description "Evaluate Clojure code"
+                                      :parameters {:type "object"
+                                                   :properties {:code {:type "string"}}}}}}
+                 {:mcpServers
+                  {:clojureMCP {:command "clojure"
+                                :args ["-X:mcp" ":port" "7888"]}}})))))