Add tests

Author: ericdallo

src/eca/features/chat.clj

@@ -338,7 +338,7 @@
       (f.hooks/trigger-if-matches!
        :postToolCall
        {:chat-id (:chat-id chat-ctx)
-        :name (:name tool-call-state)
+        :tool-name (:name tool-call-state)
         :server (:server tool-call-state)
         :arguments (:arguments tool-call-state)}
        {:on-before-action (partial notify-before-hook-action! chat-ctx)
@@ -663,7 +663,7 @@
                                      @approved?* ;; wait for user respond before checking hook
                                      (f.hooks/trigger-if-matches! :preToolCall
                                                                   {:chat-id chat-id
-                                                                   :name name
+                                                                   :tool-name name
                                                                    :server server
                                                                    :arguments arguments}
                                                                   {:on-before-action (partial notify-before-hook-action! chat-ctx)

src/eca/features/hooks.clj

@@ -11,7 +11,7 @@
   (case type
     (:preToolCall :postToolCall)
     (re-matches (re-pattern (or (:matcher hook) ".*"))
-                (str (:server data) "__" (:name data)))
+                (str (:server data) "__" (:tool-name data)))
 
     true))
 
@@ -26,12 +26,18 @@
               (logger/info logger-tag (format "Running hook '%s' shell '%s' with input '%s'" name shell input))
               (let [{:keys [exit out err]} (p/sh {:dir cwd}
                                                  "bash" "-c" shell "--" input)]
-                [exit out err]))
+                [exit (not-empty out) (not-empty err)]))
     (logger/warn logger-tag (format "Unknown hook action %s for %s" (:type action) name))))
 
 (defn trigger-if-matches!
   "Run hook of specified type if matches any config for that type"
-  [type data {:keys [on-before-action on-after-action]} db config]
+  [type
+   data
+   {:keys [on-before-action on-after-action]
+    :or {on-before-action identity
+         on-after-action identity}}
+   db
+   config]
   (doseq [[name hook] (:hooks config)]
     (when (= type (keyword (:type hook)))
       (when (hook-matches? type data hook)

test/eca/features/hooks_test.clj

@@ -0,0 +1,92 @@
+(ns eca.features.hooks-test
+  (:require
+   [babashka.process :as p]
+   [clojure.test :refer [deftest is testing]]
+   [eca.features.hooks :as f.hooks]
+   [eca.test-helper :as h]
+   [matcher-combinators.test :refer [match?]]))
+
+(h/reset-components-before-test)
+
+(defn set-action-payload [a*]
+  (fn [p]
+    (reset! a* p)))
+
+(deftest trigger-if-matches!-test
+  (testing "prePrompt"
+    (h/reset-components!)
+    (h/config! {:hooks {"my-hook" {:type "prePrompt"
+                                   :actions [{:type "shell"
+                                              :shell "echo hey"}]}}})
+    (let [on-before-action* (atom nil)
+          on-after-action* (atom nil)]
+      (with-redefs [p/sh (constantly {:exit 0 :out "hey" :err nil})]
+        (f.hooks/trigger-if-matches!
+         :prePrompt
+         {:foo "1"}
+         {:on-before-action (set-action-payload on-before-action*)
+          :on-after-action (set-action-payload on-after-action*)}
+         (h/db)
+         (h/config)))
+      (is (match?
+           {:id string?
+            :name "my-hook"}
+           @on-before-action*))
+      (is (match?
+           {:id string?
+            :name "my-hook"
+            :status 0
+            :output "hey"
+            :error nil}
+           @on-after-action*))))
+  (testing "preToolCall does not matches"
+    (h/reset-components!)
+    (h/config! {:hooks {"my-hook" {:type "preToolCall"
+                                   :matcher "my-mcp__my.*"
+                                   :actions [{:type "shell"
+                                              :shell "echo hey"}]}}})
+    (let [on-before-action* (atom nil)
+          on-after-action* (atom nil)]
+      (with-redefs [p/sh (constantly {:exit 2 :out nil :err "stop!"})]
+        (f.hooks/trigger-if-matches!
+         :preToolCall
+         {:server "my-other-mcp"
+          :tool-name "my-tool"}
+         {:on-before-action (set-action-payload on-before-action*)
+          :on-after-action (set-action-payload on-after-action*)}
+         (h/db)
+         (h/config)))
+      (is (match?
+           nil
+           @on-before-action*))
+      (is (match?
+           nil
+           @on-after-action*))))
+  (testing "preToolCall matches"
+    (h/reset-components!)
+    (h/config! {:hooks {"my-hook" {:type "preToolCall"
+                                   :matcher "my-mcp__my.*"
+                                   :actions [{:type "shell"
+                                              :shell "echo hey"}]}}})
+    (let [on-before-action* (atom nil)
+          on-after-action* (atom nil)]
+      (with-redefs [p/sh (constantly {:exit 2 :out nil :err "stop!"})]
+        (f.hooks/trigger-if-matches!
+         :preToolCall
+         {:server "my-mcp"
+          :tool-name "my-tool"}
+         {:on-before-action (set-action-payload on-before-action*)
+          :on-after-action (set-action-payload on-after-action*)}
+         (h/db)
+         (h/config)))
+      (is (match?
+           {:id string?
+            :name "my-hook"}
+           @on-before-action*))
+      (is (match?
+           {:id string?
+            :name "my-hook"
+            :status 2
+            :output nil
+            :error "stop!"}
+           @on-after-action*)))))