Merge branch 'master' into fix/tool-call-stream-cpu

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - Improve CPU usage while streaming tool-call arguments by reusing the prompt's tool list.
 
+## 0.133.4
+
+- Bugfix: stop the infinite "Cannot run program 'kill'" liveness-probe log loop for sandboxed environments.
+
 ## 0.133.3
 
 - Add unit and integration tests covering parent↔subagent end-to-end communication so regressions like the v0.133.1 spawn-agent breakage are caught automatically.

resources/ECA_VERSION

@@ -1 +1 @@
-0.133.3
+0.133.4

src/eca/server.clj

@@ -13,9 +13,13 @@
    [eca.remote.server :as remote.server]
    [eca.shared :as shared :refer [assoc-some]]
    [jsonrpc4clj.io-server :as io-server]
-   [jsonrpc4clj.liveness-probe :as liveness-probe]
    [jsonrpc4clj.server :as jsonrpc.server]
-   [promesa.core :as p]))
+   [promesa.core :as p])
+  (:import
+   [java.lang ProcessHandle]
+   [java.util Optional]
+   [java.util.concurrent CompletableFuture]
+   [java.util.function BiConsumer]))
 
 (set! *warn-on-reflection* true)
 
@@ -56,9 +60,39 @@
        (catch Throwable e#
          (logger/error e# "[server] Error in async notification handler")))))
 
+(defn ^:private start-liveness-probe!
+  "Monitor parent process `ppid`; invoke `on-exit` once when the parent
+  disappears. Event-driven via `ProcessHandle.onExit` so we don't shell out
+  to `kill -0` (which loops forever when the binary is missing)."
+  [ppid on-exit]
+  (let [fire! (fn []
+                (try (on-exit)
+                     (catch Throwable t
+                       (logger/error t "[server] Liveness probe - on-exit threw"))))]
+    (try
+      (let [opt ^Optional (ProcessHandle/of (long ppid))]
+        (if (.isPresent opt)
+          (let [^ProcessHandle handle (.get opt)
+                ^CompletableFuture fut (.onExit handle)]
+            (.whenComplete fut
+                           (reify BiConsumer
+                             (accept [_ _result ex]
+                               (if (some? ex)
+                                 (logger/warn ex "[server] Liveness probe - failed waiting for parent" ppid "- monitor disabled")
+                                 (do
+                                   (logger/info "[server] Liveness probe - parent" ppid "exited - exiting server")
+                                   (fire!))))))
+            nil)
+          (do
+            (logger/info "[server] Liveness probe - parent" ppid "is not running - exiting server")
+            (fire!))))
+      (catch Throwable t
+        (logger/error t "[server] Liveness probe - failed to start; parent monitoring disabled")
+        nil))))
+
 (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)))
+    (start-liveness-probe! parent-process-id #(exit server)))
   (handlers/initialize components params))
 
 (defmethod jsonrpc.server/receive-notification "initialized" [_ components _params]

test/eca/server_test.clj

@@ -0,0 +1,53 @@
+(ns eca.server-test
+  (:require
+   [babashka.process :as p]
+   [clojure.test :refer [deftest is testing]]
+   [eca.server :as server]
+   [eca.test-helper :as h]))
+
+(defn ^:private spawn-blocking-process []
+  ;; Long-running child whose pid we own. `sleep 600` is fine on Linux/macOS;
+  ;; subprocess-based tests are skipped on Windows.
+  (p/process {:cmd ["sleep" "600"]
+              :shutdown p/destroy-tree}))
+
+(defn ^:private pid-of [proc]
+  (.pid ^java.lang.Process (:proc proc)))
+
+(deftest start-liveness-probe-with-missing-pid-test
+  (testing "an absent parent triggers on-exit at start"
+    (let [exited? (promise)]
+      (#'server/start-liveness-probe! Long/MAX_VALUE
+                                      #(deliver exited? true))
+      (is (= true (deref exited? 200 :timeout))
+          "on-exit must fire when the parent is not present"))))
+
+(deftest start-liveness-probe-survives-on-exit-throwing-test
+  (testing "an exception in on-exit does not propagate out of start!"
+    (is (nil? (#'server/start-liveness-probe! Long/MAX_VALUE
+                                              #(throw (ex-info "boom" {}))))
+        "start! must not raise even when on-exit throws")))
+
+(deftest start-liveness-probe-with-alive-parent-test
+  (when-not h/windows?
+    (testing "an alive parent does not trigger on-exit"
+      (let [proc (spawn-blocking-process)
+            exited? (promise)]
+        (try
+          (#'server/start-liveness-probe! (pid-of proc)
+                                          #(deliver exited? true))
+          (is (= :still-alive (deref exited? 100 :still-alive))
+              "on-exit must not fire while the parent is alive")
+          (finally
+            (p/destroy-tree proc)))))))
+
+(deftest start-liveness-probe-fires-when-parent-dies-test
+  (when-not h/windows?
+    (testing "killing the parent triggers on-exit"
+      (let [proc (spawn-blocking-process)
+            exited? (promise)]
+        (#'server/start-liveness-probe! (pid-of proc)
+                                        #(deliver exited? :fired))
+        (p/destroy-tree proc)
+        (is (= :fired (deref exited? 2000 :timeout))
+            "on-exit must fire shortly after the parent dies")))))