Bump plumcp

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Improve OAuth callback error page to show error code, description, and error URI from the authorization server response.
+- Bump plumcp to 0.2.0-beta4, simplify MCP tool call error handling now that HTTP 400/404/500 are returned as JSON-RPC errors.
 
 ## 0.115.0
 

deps-lock.json

@@ -1053,24 +1053,24 @@
       "hash": "sha256-RLTLjpPU9rJiwE7Qdx1w3WbnbUXX/HVYIGcaYmVcVDk="
     },
     {
-      "mvn-path": "io/github/plumce/plumcp.core-json-cheshire/0.2.0-beta3/plumcp.core-json-cheshire-0.2.0-beta3.jar",
+      "mvn-path": "io/github/plumce/plumcp.core-json-cheshire/0.2.0-beta4/plumcp.core-json-cheshire-0.2.0-beta4.jar",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-zv+Trbz3BWVF2jWgADInlyjqsDsanbWKVYGOceV+WnM="
+      "hash": "sha256-Go75A0bKRlFzzrFYnYqOzZTvZMBIQUC0Up8o5hpKOME="
     },
     {
-      "mvn-path": "io/github/plumce/plumcp.core-json-cheshire/0.2.0-beta3/plumcp.core-json-cheshire-0.2.0-beta3.pom",
+      "mvn-path": "io/github/plumce/plumcp.core-json-cheshire/0.2.0-beta4/plumcp.core-json-cheshire-0.2.0-beta4.pom",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-w6nOMod07L7uKT2Vl+Ici/Oonq3CvGCCrJix3f0y7Cs="
+      "hash": "sha256-f9YSqBznPLeapNXmEAG0J0ao9j8lphA+AE074mw3Txw="
     },
     {
-      "mvn-path": "io/github/plumce/plumcp.core/0.2.0-beta3/plumcp.core-0.2.0-beta3.jar",
+      "mvn-path": "io/github/plumce/plumcp.core/0.2.0-beta4/plumcp.core-0.2.0-beta4.jar",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-M/6egOI3jY8hVnave6Cx12P5Hmd6M1J5QuZEszUx2nk="
+      "hash": "sha256-veMNSRikNa9wpbP4tq1aIyqbXybFMFjFj1pzmahd/h0="
     },
     {
-      "mvn-path": "io/github/plumce/plumcp.core/0.2.0-beta3/plumcp.core-0.2.0-beta3.pom",
+      "mvn-path": "io/github/plumce/plumcp.core/0.2.0-beta4/plumcp.core-0.2.0-beta4.pom",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-I6gSOKlouC7ZMoJYow4/XZEgwMeZYGLZwtj2oblpVoA="
+      "hash": "sha256-pdR9owenFET4Kz09C3GXWEqqvFet96OvKKIqy9bbF0A="
     },
     {
       "mvn-path": "io/methvin/directory-watcher/0.17.3/directory-watcher-0.17.3.jar",

deps.edn

@@ -3,7 +3,7 @@
         org.clojure/core.async {:mvn/version "1.8.741"}
         org.babashka/cli {:mvn/version "0.8.65"}
         com.github.clojure-lsp/jsonrpc4clj {:mvn/version "1.0.2"}
-        io.github.plumce/plumcp.core-json-cheshire {:mvn/version "0.2.0-beta3"}
+        io.github.plumce/plumcp.core-json-cheshire {:mvn/version "0.2.0-beta4"}
         org.yaml/snakeyaml {:mvn/version "2.4"} ;; used by eca.shared for YAML parsing
         borkdude/dynaload {:mvn/version "0.3.5"}
         selmer/selmer {:mvn/version "1.12.69"}

src/eca/features/tools/mcp.clj

@@ -534,48 +534,28 @@
   (swap! db* update :mcp-clients dissoc server-name)
   (initialize-server! server-name db* config metrics (constantly nil)))
 
-(def ^:private reinit-poll-interval-ms 100)
 (def ^:private tool-call-timeout-ms 120000)
 
 (defn ^:private tool-call-error [msg]
   {:error true
    :contents [{:type :text :text msg}]})
 
 (defn ^:private do-call-tool
-  "Execute a tool call. When needs-reinit?* is provided (HTTP transport), runs
-   pmc/call-tool in a future and polls for transport errors (404/5xx) so we can
-   short-circuit instead of blocking until plumcp's internal timeout — the error
-   is set in a virtual thread that pmc/call-tool never joins."
-  [mcp-client name arguments needs-reinit?*]
+  "Execute a tool call. Delegates timeout handling to plumcp via :timeout-millis.
+   HTTP 400/404/500 errors are returned as JSON-RPC error responses by plumcp,
+   so no polling loop is needed."
+  [mcp-client name arguments]
   (locking mcp-client
-    (when needs-reinit?*
-      (reset! needs-reinit?* false))
     (let [error-msg* (atom nil)
-          call-opts {:on-error (fn [_id jsonrpc-error]
+          call-opts {:timeout-millis tool-call-timeout-ms
+                     :on-error (fn [_id jsonrpc-error]
                                  (let [msg (or (:message jsonrpc-error) "Unknown JSON-RPC error")]
                                    (logger/warn logger-tag "Error calling tool:" msg)
                                    (reset! error-msg* msg))
                                  nil)}
-          call-future (future (pmc/call-tool mcp-client name arguments call-opts))
           result (try
-                   (if needs-reinit?*
-                     (loop [elapsed (long 0)]
-                       (cond
-                         (realized? call-future)
-                         (deref call-future)
-
-                         @needs-reinit?*
-                         (do (future-cancel call-future) ::connection-lost)
-
-                         (>= elapsed (long tool-call-timeout-ms))
-                         (do (future-cancel call-future) ::timeout)
-
-                         :else
-                         (do (Thread/sleep (long reinit-poll-interval-ms))
-                             (recur (+ elapsed (long reinit-poll-interval-ms))))))
-                     (deref call-future))
+                   (pmc/call-tool mcp-client name arguments call-opts)
                    (catch Exception e
-                     (future-cancel call-future)
                      (if (transient-transport-error? e)
                        (do (logger/warn logger-tag (format "Transient transport error, retrying tool call: %s" (.getMessage e)))
                            ::retry)
@@ -585,12 +565,6 @@
         (= ::retry result)
         nil
 
-        (= ::timeout result)
-        (tool-call-error (format "MCP tool call timed out after %ds" (/ tool-call-timeout-ms 1000)))
-
-        (= ::connection-lost result)
-        (tool-call-error "MCP server connection lost during tool call")
-
         (::error-msg result)
         (tool-call-error (format "MCP server error: %s" (::error-msg result)))
 
@@ -604,8 +578,7 @@
 (defn ^:private reinit-and-call-tool! [server-name mcp-client db* config metrics name arguments]
   (reinitialize-server! server-name mcp-client db* config metrics)
   (if-let [new-client (get-in @db* [:mcp-clients server-name :client])]
-    (let [new-needs-reinit?* (get-in @db* [:mcp-clients server-name :needs-reinit?*])]
-      (do-call-tool new-client name arguments new-needs-reinit?*))
+    (do-call-tool new-client name arguments)
     (tool-call-error (format "Failed to re-initialize MCP server '%s'" server-name))))
 
 (defn call-tool! [name arguments {:keys [db db* config metrics]}]
@@ -618,13 +591,13 @@
     (if (and needs-reinit?* @needs-reinit?* db* config metrics)
       ;; Already flagged (e.g. GET stream 5xx) — reinit before attempting the call
       (reinit-and-call-tool! server-name mcp-client db* config metrics name arguments)
-      (let [result (do-call-tool mcp-client name arguments needs-reinit?*)]
+      (let [result (do-call-tool mcp-client name arguments)]
         (cond
           ;; nil = transient transport error, retry once
           (nil? result)
-          (do-call-tool mcp-client name arguments needs-reinit?*)
+          (do-call-tool mcp-client name arguments)
 
-          ;; Flagged during the call (e.g. POST 404) — reinit and retry
+          ;; Flagged during the call (e.g. GET stream 404/5xx) — reinit and retry
           (and (:error result) needs-reinit?* @needs-reinit?* db* config metrics)
           (reinit-and-call-tool! server-name mcp-client db* config metrics name arguments)