Use jsonrpc4clj instead of lsp4clj.

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Use jsonrpc4clj instead of lsp4clj.
+
 ## 0.54.3
 
 - Avoid errors on multiple same MCP server calls in parallel.

bb.edn

@@ -2,7 +2,7 @@
  :deps {borkdude/gh-release-artifact {:git/url "https://github.com/borkdude/gh-release-artifact"
                                       :git/sha "4a9a74f0e50e897c45df8cc70684360eb30fce80"}
         nubank/matcher-combinators {:mvn/version "3.9.1"}
-        com.github.clojure-lsp/lsp4clj {:mvn/version "1.13.1"}
+        com.github.clojure-lsp/jsonrpc4clj {:mvn/version "1.0.2"}
         org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha"
                                  :git/sha "b6eb0f2208ab036c0a5d0e7235cb0b09d2feabb7"}}
  :min-bb-version "0.8.156"

deps-lock.json

@@ -581,14 +581,14 @@
       "hash": "sha256-LJtr0GODzbfGpqiiuZTVljWvRy9fmKb5XdFD9gFyG+M="
     },
     {
-      "mvn-path": "com/github/clojure-lsp/lsp4clj/1.13.1/lsp4clj-1.13.1.jar",
+      "mvn-path": "com/github/clojure-lsp/jsonrpc4clj/1.0.2/jsonrpc4clj-1.0.2.jar",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-mTdYK2aauuY1ZIfENWiReUEHCrTzhrnwwG/5OhbQ9oI="
+      "hash": "sha256-NFZy2vQz6tJWNC4ScwvO2vDnVx6USnQKODVqxB5AGgk="
     },
     {
-      "mvn-path": "com/github/clojure-lsp/lsp4clj/1.13.1/lsp4clj-1.13.1.pom",
+      "mvn-path": "com/github/clojure-lsp/jsonrpc4clj/1.0.2/jsonrpc4clj-1.0.2.pom",
       "mvn-repo": "https://repo.clojars.org/",
-      "hash": "sha256-/OcjA/xV4B0mO/fVwKgDI8M1sQZSuH2bZ3da+/ME720="
+      "hash": "sha256-8xL3N0pNBtDqUFrNCskBJiv4aHQSnFJyQ93H9Tj5plA="
     },
     {
       "mvn-path": "com/github/ericdallo/deps-bin/1.0.0/deps-bin-1.0.0.jar",

deps.edn

@@ -2,7 +2,7 @@
  :deps {org.clojure/clojure {:mvn/version "1.12.1"}
         org.clojure/core.async {:mvn/version "1.8.741"}
         org.babashka/cli {:mvn/version "0.8.65"}
-        com.github.clojure-lsp/lsp4clj {:mvn/version "1.13.1"}
+        com.github.clojure-lsp/jsonrpc4clj {:mvn/version "1.0.2"}
         io.modelcontextprotocol.sdk/mcp {:mvn/version "0.12.1"}
         borkdude/dynaload {:mvn/version "0.3.5"}
         babashka/fs {:mvn/version "0.5.26"}

docs/development.md

@@ -36,7 +36,7 @@ The ECA codebase follows a pragmatic **layered layout** that separates concerns
    ──└─ `util.clj`          | misc helpers shared by tools.
    `src/eca/messenger.clj`  | To send back to client requests/notifications over stdio.
    `src/eca/handlers.clj`   | Entrypoint for all features.
-   `src/eca/server.clj`     | stdio **entry point**; wires everything together via `lsp4clj`.
+   `src/eca/server.clj`     | stdio **entry point**; wires everything together via `jsonrpc4clj`.
    `src/eca/main.clj`       | The CLI interface.
    `src/eca/nrepl.clj`      | Starts an nREPL when `:debug` flag is passed.
 

integration-test/integration/client.clj

@@ -2,11 +2,11 @@
   (:require
    [clojure.core.async :as async]
    [clojure.string :as string]
-   [lsp4clj.coercer :as coercer]
-   [lsp4clj.io-chan :as lsp.io-chan]
-   [lsp4clj.lsp.requests :as lsp.requests]
-   [lsp4clj.lsp.responses :as lsp.responses]
-   [lsp4clj.protocols.endpoint :as protocols.endpoint])
+   [jsonrpc4clj.coercer :as coercer]
+   [jsonrpc4clj.io-chan :as jsonrpc.io-chan]
+   [jsonrpc4clj.requests :as jsonrpc.requests]
+   [jsonrpc4clj.responses :as jsonrpc.responses]
+   [jsonrpc4clj.protocols.endpoint :as protocols.endpoint])
   (:import
    [java.time LocalDateTime]
    [java.time.format DateTimeFormatter]))
@@ -78,7 +78,6 @@
     (let [pipeline (async/pipeline-blocking
                     1 ;; no parallelism preserves server message order
                     output
-                     ;; TODO: return error until initialize request is received? https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize
                      ;; `keep` means we do not reply to responses and notifications
                     (keep #(receive-message this context %))
                     input)]
@@ -103,7 +102,7 @@
   (log [this color msg params]
     (async/put! log-ch (format-log this color msg params)))
   (send-request [this method body]
-    (let [req (lsp.requests/request (swap! request-id inc) method body)
+    (let [req (jsonrpc.requests/request (swap! request-id inc) method body)
           p (promise)
           start-ns (System/nanoTime)]
       (protocols.endpoint/log this :cyan "sending request:" req)
@@ -114,7 +113,7 @@
       (async/>!! output req)
       p))
   (send-notification [this method body]
-    (let [notif (lsp.requests/notification method body)]
+    (let [notif (jsonrpc.requests/notification method body)]
       (protocols.endpoint/log this :blue "sending notification:" notif)
       (async/>!! output notif)))
   (receive-response [this {:keys [id] :as resp}]
@@ -130,7 +129,7 @@
     (protocols.endpoint/log this :magenta "received request:" req)
     (swap! received-requests conj req)
     (when-let [mock-resp (get @mock-responses (keyword method))]
-      (let [resp (lsp.responses/response id mock-resp)]
+      (let [resp (jsonrpc.responses/response id mock-resp)]
         (protocols.endpoint/log this :magenta "sending mock response:" resp)
         resp)))
   (receive-notification [this _ notif]
@@ -147,8 +146,8 @@
 (defn client [server-in server-out]
   (map->Client
    {:client-id (swap! client-id inc)
-    :input (lsp.io-chan/input-stream->input-chan server-out {:keyword-function keyword})
-    :output (lsp.io-chan/output-stream->output-chan server-in)
+    :input (jsonrpc.io-chan/input-stream->input-chan server-out {:keyword-function keyword})
+    :output (jsonrpc.io-chan/output-stream->output-chan server-in)
     :log-ch (async/chan (async/sliding-buffer 20))
     :join (promise)
     :request-id (atom 0)

src/eca/server.clj

@@ -8,9 +8,9 @@
    [eca.messenger :as messenger]
    [eca.nrepl :as nrepl]
    [eca.shared :as shared :refer [assoc-some]]
-   [lsp4clj.io-server :as io-server]
-   [lsp4clj.liveness-probe :as liveness-probe]
-   [lsp4clj.server :as lsp.server]))
+   [jsonrpc4clj.io-server :as io-server]
+   [jsonrpc4clj.liveness-probe :as liveness-probe]
+   [jsonrpc4clj.server :as jsonrpc.server]))
 
 (set! *warn-on-reflection* true)
 
@@ -21,55 +21,55 @@
 (defn ^:private exit [server]
   (logger/logging-task
    :eca/exit
-   (lsp.server/shutdown server) ;; blocks, waiting up to 10s for previously received messages to be processed
+   (jsonrpc.server/shutdown server) ;; blocks, waiting up to 10s for previously received messages to be processed
    (shutdown-agents)
    (System/exit 0)))
 
 (defn ^:private with-config [components]
   (assoc components :config (config/all @(:db* components))))
 
-(defmethod lsp.server/receive-request "initialize" [_ {:keys [server] :as components} params]
+(defmethod jsonrpc.server/receive-request "initialize" [_ {:keys [server] :as components} params]
   (when-let [parent-process-id (:process-id params)]
     (liveness-probe/start! parent-process-id log-wrapper-fn #(exit server)))
   (handlers/initialize components params))
 
-(defmethod lsp.server/receive-notification "initialized" [_ components _params]
+(defmethod jsonrpc.server/receive-notification "initialized" [_ components _params]
   (handlers/initialized (with-config components)))
 
-(defmethod lsp.server/receive-request "shutdown" [_ components _params]
+(defmethod jsonrpc.server/receive-request "shutdown" [_ components _params]
   (handlers/shutdown (with-config components)))
 
-(defmethod lsp.server/receive-notification "exit" [_ {:keys [server]} _params]
+(defmethod jsonrpc.server/receive-notification "exit" [_ {:keys [server]} _params]
   (exit server))
 
-(defmethod lsp.server/receive-request "chat/prompt" [_ components params]
+(defmethod jsonrpc.server/receive-request "chat/prompt" [_ components params]
   (handlers/chat-prompt (with-config components) params))
 
-(defmethod lsp.server/receive-request "chat/queryContext" [_ components params]
+(defmethod jsonrpc.server/receive-request "chat/queryContext" [_ components params]
   (handlers/chat-query-context (with-config components) params))
 
-(defmethod lsp.server/receive-request "chat/queryCommands" [_ components params]
+(defmethod jsonrpc.server/receive-request "chat/queryCommands" [_ components params]
   (handlers/chat-query-commands (with-config components) params))
 
-(defmethod lsp.server/receive-notification "chat/toolCallApprove" [_ components params]
+(defmethod jsonrpc.server/receive-notification "chat/toolCallApprove" [_ components params]
   (handlers/chat-tool-call-approve (with-config components) params))
 
-(defmethod lsp.server/receive-notification "chat/toolCallReject" [_ components params]
+(defmethod jsonrpc.server/receive-notification "chat/toolCallReject" [_ components params]
   (handlers/chat-tool-call-reject (with-config components) params))
 
-(defmethod lsp.server/receive-notification "chat/promptStop" [_ components params]
+(defmethod jsonrpc.server/receive-notification "chat/promptStop" [_ components params]
   (handlers/chat-prompt-stop (with-config components) params))
 
-(defmethod lsp.server/receive-request "chat/delete" [_ components params]
+(defmethod jsonrpc.server/receive-request "chat/delete" [_ components params]
   (handlers/chat-delete (with-config components) params))
 
-(defmethod lsp.server/receive-notification "mcp/stopServer" [_ components params]
+(defmethod jsonrpc.server/receive-notification "mcp/stopServer" [_ components params]
   (handlers/mcp-stop-server (with-config components) params))
 
-(defmethod lsp.server/receive-notification "mcp/startServer" [_ components params]
+(defmethod jsonrpc.server/receive-notification "mcp/startServer" [_ components params]
   (handlers/mcp-start-server (with-config components) params))
 
-(defmethod lsp.server/receive-notification "chat/selectedBehaviorChanged" [_ components params]
+(defmethod jsonrpc.server/receive-notification "chat/selectedBehaviorChanged" [_ components params]
   (handlers/chat-selected-behavior-changed (with-config components) params))
 
 (defn ^:private monitor-server-logs [log-ch]
@@ -99,20 +99,20 @@
   messenger/IMessenger
 
   (chat-content-received [_this content]
-    (lsp.server/discarding-stdout
-     (lsp.server/send-notification server "chat/contentReceived" content)))
+    (jsonrpc.server/discarding-stdout
+     (jsonrpc.server/send-notification server "chat/contentReceived" content)))
   (config-updated [_this params]
-    (lsp.server/discarding-stdout
-     (lsp.server/send-notification server "config/updated" params)))
+    (jsonrpc.server/discarding-stdout
+     (jsonrpc.server/send-notification server "config/updated" params)))
   (tool-server-updated [_this params]
-    (lsp.server/discarding-stdout
-     (lsp.server/send-notification server "tool/serverUpdated" params)))
+    (jsonrpc.server/discarding-stdout
+     (jsonrpc.server/send-notification server "tool/serverUpdated" params)))
   (showMessage [_this msg]
-    (lsp.server/discarding-stdout
-     (lsp.server/send-notification server "$/showMessage" msg)))
+    (jsonrpc.server/discarding-stdout
+     (jsonrpc.server/send-notification server "$/showMessage" msg)))
   (editor-diagnostics [_this uri]
-    (lsp.server/discarding-stdout
-     (lsp.server/send-request server "editor/getDiagnostics" (assoc-some {} :uri uri)))))
+    (jsonrpc.server/discarding-stdout
+     (jsonrpc.server/send-request server "editor/getDiagnostics" (assoc-some {} :uri uri)))))
 
 (defn start-server! [server]
   (let [db* (atom db/initial-db)
@@ -122,10 +122,10 @@
     (logger/info "[server]" "Starting server...")
     (monitor-server-logs (:log-ch server))
     (setup-dev-environment db* components)
-    (lsp.server/start server components)))
+    (jsonrpc.server/start server components)))
 
 (defn run-io-server! [verbose?]
-  (lsp.server/discarding-stdout
+  (jsonrpc.server/discarding-stdout
    (let [log-ch (async/chan (async/sliding-buffer 20))
          server (io-server/stdio-server {:log-ch log-ch
                                          :trace-ch log-ch