Fix custom tools output to return stderr when tool error.

Fixes #219

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix custom tools output to return stderr when tool error. #219
+
 ## 0.82.0
 
 - Support nested folder for rules and commands. #220

src/eca/features/tools/custom.clj

@@ -36,18 +36,17 @@
           err (some-> (:err result) string/trim)
           out (some-> (:out result) string/trim)]
       (logger/debug logger-tag "custom tool executed:" result)
-      (if (zero? exit)
-        (tools.util/single-text-content out)
-        {:error true
-         :contents (remove nil?
-                           (concat [{:type :text
-                                     :text (str "Exit code " exit)}]
-                                   (when-not (string/blank? err)
-                                     [{:type :text
-                                       :text (str "Stderr:\n" err)}])
-                                   (when-not (string/blank? out)
-                                     [{:type :text
-                                       :text (str "Stdout:\n" out)}])))}))))
+      {:error (not= 0 exit)
+       :contents (remove nil?
+                         (concat [(when (not= 0 exit)
+                                    {:type :text
+                                     :text (str "Exit code " exit)})]
+                                 (when-not (string/blank? err)
+                                   [{:type :text
+                                     :text (str "Stderr:\n" err)}])
+                                 (when-not (string/blank? out)
+                                   [{:type :text
+                                     :text (str "Stdout:\n" out)}])))})))
 
 (defn ^:private custom-tool->tool-def
   "Transforms a single custom tool from the config map into a full tool definition."

test/eca/features/tools/custom_test.clj

@@ -21,7 +21,7 @@
                 custom-tool-def (get custom-defs "file-search")]
             (is (some? custom-tool-def) "The custom tool should be loaded.")
             (let [result ((:handler custom-tool-def) {"directory" "/tmp" "pattern" "*.clj"} {})]
-              (is (= {:contents [{:text "mocked-output", :type :text}], :error false} result) "The tool should return the mocked shell output.")))))))
+              (is (= {:contents [{:text "Stdout:\nmocked-output", :type :text}], :error false} result) "The tool should return the mocked shell output.")))))))
 
   (testing "when multiple tools are configured"
     (let [mock-custom-tools {"git-status"
@@ -42,8 +42,8 @@
               echo-handler (get-in custom-defs ["echo-message" :handler])]
           (is (some? git-status-handler) "Git status tool should be loaded.")
           (is (some? echo-handler) "Echo message tool should be loaded.")
-          (is (= {:contents [{:text "On branch main", :type :text}], :error false} (git-status-handler {} {})))
-          (is (= {:contents [{:text "Hello World", :type :text}], :error false} (echo-handler {"message" "Hello World"} {})))))))
+          (is (= {:contents [{:text "Stdout:\nOn branch main", :type :text}], :error false} (git-status-handler {} {})))
+          (is (= {:contents [{:text "Stdout:\nHello World", :type :text}], :error false} (echo-handler {"message" "Hello World"} {})))))))
 
   (testing "when the custom tools config is empty or missing"
     (testing "with an empty map"