Fix some MCP prompts that didn't work.

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fix `chat/queryContext` to not return already added contexts
+- Fix some MCP prompts that didn't work.
 
 ## 0.26.1
 

src/eca/features/chat.clj

@@ -100,7 +100,6 @@
 
 (defn ^:private prompt-messages!
   [user-messages
-   reason?
    {:keys [db* config chat-id contexts behavior model] :as chat-ctx}]
   (when (seq contexts)
     (send-content! chat-ctx :system {:type :progress
@@ -133,7 +132,6 @@
       :past-messages past-messages
       :config config
       :tools all-tools
-      :reason? reason?
       :on-first-response-received (fn [& _]
                                     (assert-chat-not-stopped! chat-ctx)
                                     (doseq [message user-messages]
@@ -291,7 +289,7 @@
       (send-content! chat-ctx :system
                      {:type :text
                       :text error-message})
-      (prompt-messages! messages false chat-ctx))))
+      (prompt-messages! messages chat-ctx))))
 
 (defn ^:private message-content->chat-content [role message-content]
   (case role
@@ -332,7 +330,7 @@
                                           (:role message)
                                           (message-content->chat-content (:role message) (:content message)))))
                        (finish-chat-prompt! :idle chat-ctx))
-      :send-prompt (prompt-messages! [{:role "user" :content (:prompt result)}] true chat-ctx)
+      :send-prompt (prompt-messages! [{:role "user" :content (:prompt result)}] chat-ctx)
       nil)))
 
 (defn prompt
@@ -362,7 +360,7 @@
     (case (:type decision)
       :mcp-prompt (send-mcp-prompt! decision chat-ctx)
       :eca-command (handle-command! decision chat-ctx)
-      :prompt-message (prompt-messages! [{:role "user" :content [{:type :text :text message}]}] true chat-ctx))
+      :prompt-message (prompt-messages! [{:role "user" :content [{:type :text :text message}]}] chat-ctx))
     {:chat-id chat-id
      :model chosen-model
      :status :success}))

src/eca/llm_api.clj

@@ -80,7 +80,7 @@
          :type "function"))
 
 (defn complete!
-  [{:keys [model provider model-config instructions reason? user-messages config on-first-response-received
+  [{:keys [model provider model-config instructions user-messages config on-first-response-received
            on-message-received on-error on-prepare-tool-call on-tools-called on-reason on-usage-updated
            past-messages tools]}]
   (let [first-response-received* (atom false)
@@ -124,7 +124,7 @@
           :instructions instructions
           :user-messages user-messages
           :max-output-tokens max-output-tokens
-          :reason? (and reason? (:reason? model-config))
+          :reason? (:reason? model-config)
           :past-messages past-messages
           :tools tools
           :web-search web-search
@@ -139,7 +139,7 @@
           :instructions instructions
           :user-messages user-messages
           :max-output-tokens max-output-tokens
-          :reason? (and reason? (:reason? model-config))
+          :reason? (:reason? model-config)
           :past-messages past-messages
           :tools tools
           :web-search web-search
@@ -152,7 +152,7 @@
         (llm-providers.ollama/completion!
          {:host (-> config :ollama :host)
           :port (-> config :ollama :port)
-          :reason? (and reason? (:reason? model-config))
+          :reason? (:reason? model-config)
           :model (string/replace-first model config/ollama-model-prefix "")
           :instructions instructions
           :user-messages user-messages
@@ -176,7 +176,7 @@
             :instructions instructions
             :user-messages user-messages
             :max-output-tokens max-output-tokens
-            :reason? (and reason? (:reason? model-config))
+            :reason? (:reason? model-config)
             :past-messages past-messages
             :tools tools
             :extra-payload extra-payload

test/eca/features/chat_test.clj

@@ -258,7 +258,7 @@
                     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/prompt-messages! (fn [messages ctx] (reset! invoked? [messages ctx]))]
         (#'f.chat/send-mcp-prompt! {:prompt "awesome-prompt" :args [42 "yo"]} test-chat-ctx)
         (is (match?
              @prompt-args