Fix chat history for tool calls

Author: ericdallo

src/eca/config.clj

@@ -15,7 +15,7 @@
 
 (set! *warn-on-reflection* true)
 
-(def ^:private initial-config
+(def initial-config
   {:openaiApiKey nil
    :anthropicApiKey nil
    :rules []

src/eca/features/chat.clj

@@ -94,8 +94,12 @@
         user-prompt message
         all-tools (f.tools/all-tools @db* config)
         received-msgs* (atom "")
-        add-msg! (fn [msg]
-                   (swap! db* update-in [:chats chat-id :messages] (fnil conj []) msg))]
+        add-to-history! (fn [msg & [append-to-last?]]
+                          (if append-to-last?
+                            (swap! db* update-in [:chats chat-id :messages] (fn [messages msg]
+                                                                              (conj (pop messages)
+                                                                                    (update (last messages) :content str msg))) msg)
+                            (swap! db* update-in [:chats chat-id :messages] (fnil conj []) msg)))]
     (messenger/chat-content-received
      messenger
      {:chat-id chat-id
@@ -113,7 +117,7 @@
       :config config
       :tools all-tools
       :on-first-message-received (fn [_]
-                                   (add-msg! {:role "user" :content user-prompt})
+                                   (add-to-history! {:role "user" :content user-prompt})
                                    (messenger/chat-content-received
                                     messenger
                                     {:chat-id chat-id
@@ -142,7 +146,7 @@
                                                 :title (:title msg)
                                                 :url (:url msg)}})
                                :finish (do
-                                         (add-msg! {:role "assistant" :content @received-msgs*})
+                                         (add-to-history! {:role "assistant" :content @received-msgs*})
                                          (messenger/chat-content-received
                                           messenger
                                           {:chat-id chat-id
@@ -161,7 +165,7 @@
                                           :argumentText argument
                                           :id id
                                           :manual-approval false}}))
-      :on-tool-called (fn [{:keys [id name arguments]}]
+      :on-tool-called (fn [{:keys [id name arguments] :as tool-call}]
                         (messenger/chat-content-received
                          messenger
                          {:chat-id chat-id
@@ -173,6 +177,11 @@
                                     :id id
                                     :manual-approval false}})
                         (let [result (f.tools/call-tool! name arguments @db* config)]
+                          (when-not (string/blank? @received-msgs*)
+                            (add-to-history! {:role "assistant" :content @received-msgs*})
+                            (reset! received-msgs* ""))
+                          (add-to-history! {:role "tool_call" :content tool-call})
+                          (add-to-history! {:role "tool_call_output" :content (assoc tool-call :output result)})
                           (messenger/chat-content-received
                            messenger
                            {:chat-id chat-id
@@ -218,9 +227,9 @@
 
 (defn query-context
   [{:keys [query contexts chat-id]}
-   db*]
-  (let [config (config/all @db*)
-        all-subfiles-and-dirs (into []
+   db*
+   config]
+  (let [all-subfiles-and-dirs (into []
                                     (comp
                                      (map :uri)
                                      (map shared/uri->filename)

src/eca/handlers.clj

@@ -21,27 +21,26 @@
             {}
             ollama-models))))
 
-(defn initialize [{:keys [db* messenger]} params]
+(defn initialize [{:keys [db* messenger config]} params]
   (logger/logging-task
    :eca/initialize
    (swap! db* assoc
           :client-info (:client-info params)
           :workspace-folders (:workspace-folders params)
           :client-capabilities (:capabilities params)
           :chat-behavior (or (-> params :initialization-options :chat-behavior) (:chat-behavior @db*)))
-   (let [config (config/all @db*)]
-     (initialize-extra-models! db* config)
-     (future
-       (f.mcp/initialize-servers-async!
-        {:on-server-updated (fn [server]
-                              (messenger/mcp-server-updated messenger server))}
-        db*
-        config))
-     {:models (keys (:models @db*))
-      :chat-default-model (f.chat/default-model @db*)
-      :chat-behaviors (:chat-behaviors @db*)
-      :chat-default-behavior (:chat-default-behavior @db*)
-      :chat-welcome-message (:welcomeMessage (:chat config))})))
+   (initialize-extra-models! db* config)
+   (future
+     (f.mcp/initialize-servers-async!
+      {:on-server-updated (fn [server]
+                            (messenger/mcp-server-updated messenger server))}
+      db*
+      config))
+   {:models (keys (:models @db*))
+    :chat-default-model (f.chat/default-model @db*)
+    :chat-behaviors (:chat-behaviors @db*)
+    :chat-default-behavior (:chat-default-behavior @db*)
+    :chat-welcome-message (:welcomeMessage (:chat config))}))
 
 (defn shutdown [{:keys [db*]}]
   (logger/logging-task
@@ -50,13 +49,12 @@
    (reset! db* db/initial-db)
    nil))
 
-(defn chat-prompt [{:keys [messenger db*]} params]
+(defn chat-prompt [{:keys [messenger db* config]} params]
   (logger/logging-task
    :eca/chat-prompt
-   (let [config (config/all @db*)]
-     (f.chat/prompt params db* messenger config))))
+   (f.chat/prompt params db* messenger config)))
 
-(defn chat-query-context [{:keys [db*]} params]
+(defn chat-query-context [{:keys [db* config]} params]
   (logger/logging-task
    :eca/chat-query-context
-   (f.chat/query-context params db*)))
+   (f.chat/query-context params db* config)))

src/eca/llm_providers/anthropic.clj

@@ -57,13 +57,31 @@
      (fn [e]
        (on-error {:exception e})))))
 
+(defn ^:private ->messages-with-history [past-messages user-prompt]
+  (conj (mapv (fn [{:keys [role content] :as msg}]
+                (case role
+                  "tool_call" {:role "assistant"
+                               :content [{:type "tool_use"
+                                          :id (:id content)
+                                          :name (:name content)
+                                          :input (:arguments content)}]}
+
+                  "tool_call_output"
+                  {:role "user"
+                   :content [{:type "tool_result"
+                              :tool-use-id (:id content)
+                              :content (llm-util/stringfy-tool-result content)}]}
+                  msg))
+              past-messages)
+        {:role "user" :content user-prompt}))
+
 (defn completion!
   [{:keys [model user-prompt temperature context max-tokens
            api-key past-messages tools web-search]
     :or {max-tokens 1024
          temperature 1.0}}
    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
-  (let [messages (conj (vec past-messages) {:role "user" :content user-prompt})
+  (let [messages (->messages-with-history past-messages user-prompt)
         body {:model model
               :messages messages
               :max_tokens max-tokens

src/eca/llm_providers/ollama.clj

@@ -64,12 +64,21 @@
            :function (select-keys tool [:name :description :parameters])})
         tools))
 
+(defn ^:private ->messages-with-history [context past-messages user-prompt]
+  (concat
+   [{:role "system" :content context}]
+   (mapv (fn [{:keys [role content] :as msg}]
+           (case role
+             "tool_call" {:role "assistant" :tool-calls [{:type "function"
+                                                          :function content}]}
+             "tool_call_output" {:role "tool" :content (llm-util/stringfy-tool-result content)}
+             msg))
+         past-messages)
+   [{:role "user" :content user-prompt}]))
+
 (defn completion! [{:keys [model user-prompt context host port past-messages tools]}
                    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
-  (let [messages (concat
-                  [{:role "system" :content context}]
-                  past-messages
-                  [{:role "user" :content user-prompt}])
+  (let [messages (->messages-with-history context past-messages user-prompt)
         body {:model model
               :messages messages
               :think false

src/eca/llm_providers/openai.clj

@@ -47,10 +47,26 @@
      (fn [e]
        (on-error {:exception e})))))
 
+(defn ^:private ->input-with-history [past-messages user-prompt]
+  (conj (mapv (fn [{:keys [role content] :as msg}]
+                (case role
+                  "tool_call" {:type "function_call"
+                               :name (:name content)
+                               :call-id (:id content)
+                               :arguments (:arguments content)}
+                  "tool_call_output"
+                  {:type "function_call_output"
+                   :name (:name content)
+                   :call-id (:id content)
+                   :output (llm-util/stringfy-tool-result content)}
+                  msg))
+              past-messages)
+        {:role "user" :content user-prompt}))
+
 (defn completion! [{:keys [model user-prompt context temperature api-key past-messages tools web-search]
                     :or {temperature 1.0}}
                    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called on-reason]}]
-  (let [input (conj (vec past-messages) {:role "user" :content user-prompt})
+  (let [input (->input-with-history past-messages user-prompt)
         tools (cond-> tools
                 web-search (conj {:type "web_search_preview"}))
         body {:model model

src/eca/llm_util.clj

@@ -49,6 +49,12 @@
   []
   (str (rand-int 9999)))
 
+(defn stringfy-tool-result [result]
+  (reduce
+   #(str %1 (:content %2) "\n")
+   ""
+   (-> result :output :contents)))
+
 (defn log-request [tag rid url body]
   (logger/debug tag (format "[%s] Sending body: '%s', url: '%s'" rid body url)))
 

src/eca/server.clj

@@ -1,6 +1,7 @@
 (ns eca.server
   (:require
    [clojure.core.async :as async]
+   [eca.config :as config]
    [eca.db :as db]
    [eca.handlers :as handlers]
    [eca.logger :as logger]
@@ -25,25 +26,28 @@
    (shutdown-agents)
    (System/exit 0)))
 
+(defn ^:private with-config [components]
+  (assoc components :config (config/all @(:db* components))))
+
 (defmethod lsp.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)))
-  (handlers/initialize components params))
+  (handlers/initialize (with-config components) params))
 
 (defmethod lsp.server/receive-notification "initialized" [_ _components _params]
   (logger/info logger-tag "Initialized!"))
 
 (defmethod lsp.server/receive-request "shutdown" [_ components _params]
-  (handlers/shutdown components))
+  (handlers/shutdown (with-config components)))
 
 (defmethod lsp.server/receive-notification "exit" [_ {:keys [server]} _params]
   (exit server))
 
 (defmethod lsp.server/receive-request "chat/prompt" [_ components params]
-  (handlers/chat-prompt components params))
+  (handlers/chat-prompt (with-config components) params))
 
 (defmethod lsp.server/receive-request "chat/queryContext" [_ components params]
-  (handlers/chat-query-context components params))
+  (handlers/chat-query-context (with-config components) params))
 
 (defn ^:private monitor-server-logs [log-ch]
   ;; NOTE: if this were moved to `initialize`, after timbre has been configured,