Fix error handling of MCP

Author: ericdallo

src/eca/features/tools/mcp.clj

@@ -107,17 +107,22 @@
                         (keep (fn [{:keys [client tools]}]
                                 (when (some #(= name (:name %)) tools)
                                   client)))
-                        first)
-        result (.callTool ^McpSyncClient mcp-client
-                          (McpSchema$CallToolRequest. name arguments))]
-    (logger/debug logger-tag "ToolCall result: " result)
-    {:contents (map (fn [content]
-                      (case (.type ^McpSchema$Content content)
-                        "text" {:type :text
-                                :error (.isError result)
-                                :content (.text ^McpSchema$TextContent content)}
-                        nil))
-                    (.content result))}))
+                        first)]
+    (try
+      (let [result (.callTool ^McpSyncClient mcp-client
+                              (McpSchema$CallToolRequest. name arguments))]
+        (logger/debug logger-tag "ToolCall result: " result)
+        {:contents (map (fn [content]
+                          (case (.type ^McpSchema$Content content)
+                            "text" {:type :text
+                                    :error (.isError result)
+                                    :content (.text ^McpSchema$TextContent content)}
+                            nil))
+                        (.content result))})
+      (catch Exception e
+        {:contents [{:type :text
+                     :error true
+                     :content (.getMessage e)}]}))))
 
 (defn shutdown! [db*]
   (doseq [[_name {:keys [_client]}] (:mcp-clients @db*)]

test/eca/features/tools_test.clj

@@ -23,18 +23,18 @@
                             {}))))
   (testing "Include enabled native tools"
     (is (match?
-         (m/embeds [{:name "list_directory"
+         (m/embeds [{:name "eca_list_directory"
                      :description string?
                      :parameters some?
                      :source :native}])
          (f.tools/all-tools {} {:nativeTools {:filesystem {:enabled true}}}))))
   (testing "Do not include disabled native tools"
     (is (match?
-         (m/embeds [(m/mismatch {:name "list_directory"})])
+         (m/embeds [(m/mismatch {:name "eca_list_directory"})])
          (f.tools/all-tools {} {:nativeTools {:filesystem {:enabled false}}}))))
   (testing "Replace special vars description"
     (is (match?
-         (m/embeds [{:name "list_directory"
+         (m/embeds [{:name "eca_list_directory"
                      :description (format "Only in %s" (h/file-path "/path/to/project/foo"))
                      :parameters some?
                      :source :native}])