Fix cases when tool calls output nothing.

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Improve tool call result marking as error when not expected output.
+- Fix cases when tool calls output nothing.
 
 ## 0.12.4
 

src/eca/features/chat.clj

@@ -281,15 +281,11 @@
                                   :text (or message (ex-message exception))})
                   (finish-chat-prompt! :idle chat-ctx))})))
 
-(defn ^:private send-mcp-prompt! [{:keys [prompt args]} {:keys [db*] :as chat-ctx}]
+(defn ^:private send-mcp-prompt!
+  [{:keys [prompt args]}
+   {:keys [db*] :as chat-ctx}]
   (let [{:keys [arguments]} (first (filter #(= prompt (:name %)) (f.mcp/all-prompts @db*)))
-        i (atom -1)
-        args-vals (reduce
-                   (fn [a {:keys [name]}]
-                     (swap! i inc)
-                     (assoc a name (nth args @i)))
-                   {}
-                   arguments)
+        args-vals (zipmap (map :name arguments) args)
         {:keys [messages]} (f.mcp/get-prompt! prompt args-vals @db*)]
     (prompt-messages! messages false chat-ctx)))
 

src/eca/features/tools/util.clj

@@ -7,7 +7,7 @@
 (defn single-text-content [text & [error]]
   {:error (boolean error)
    :contents [{:type :text
-               :content text}]})
+               :text text}]})
 
 (defn workspace-roots-strs [db]
   (->> (:workspace-folders db)

test/eca/features/chat_test.clj

@@ -3,6 +3,7 @@
    [clojure.test :refer [deftest is testing]]
    [eca.features.chat :as f.chat]
    [eca.features.tools :as f.tools]
+   [eca.features.tools.mcp :as f.mcp]
    [eca.llm-api :as llm-api]
    [eca.test-helper :as h]
    [matcher-combinators.matchers :as m]
@@ -245,3 +246,23 @@ for allowed directories and then list files"
              {:role :assistant :content {:type :text :text "/foo/bar"}}
              {:role :system :content {:state :finished :type :progress}}]}
            (h/messages))))))
+
+(deftest send-mcp-prompt-test
+  (testing "Argument mapping for send-mcp-prompt! should map arg values to prompt argument names"
+    (let [test-arguments [{:name "foo"} {:name "bar"}]
+          prompt-args (atom nil)
+          test-chat-ctx {:db* (atom {})}
+          invoked? (atom nil)]
+      (with-redefs [f.mcp/all-prompts (fn [_]
+                                        [{:name "awesome-prompt" :arguments test-arguments}])
+                    f.mcp/get-prompt! (fn [_ args-map _]
+                                        (reset! prompt-args args-map)
+                                        {:messages [{:role :user :content "test"}]})
+                    f.chat/prompt-messages! (fn [messages _reason? ctx] (reset! invoked? [messages ctx]))]
+        (#'f.chat/send-mcp-prompt! {:prompt "awesome-prompt" :args [42 "yo"]} test-chat-ctx)
+        (is (match?
+             @prompt-args
+             {"foo" 42 "bar" "yo"}))
+        (is (match?
+             @invoked?
+             [[{:role :user :content "test"}] test-chat-ctx]))))))