add change suggested on code review

Author: nandoolle

deps.edn

@@ -95,7 +95,6 @@
    :exec-args {:port 7888 :shadow-build "app" :shadow-port 7889}}
 
   :nrepl {:extra-paths ["test" "dev"]
-          :extra-deps {nrepl/nrepl {:mvn/version "1.3.1"}}
           :main-opts ["-m" "nrepl.cmdline" "--port" "7888"]}
 
   :dkr-nrepl {:extra-paths ["test" "dev"]

src/clojure_mcp/agent/general_agent.clj

@@ -1,6 +1,7 @@
 (ns clojure-mcp.agent.general-agent
   "A generalized agent library with system prompts, context, tools, memory, and models."
   (:require [clojure.string :as string]
+            [clojure.set :as set]
             [taoensso.timbre :as log]
             [clojure.java.io :as io]
             [clojure-mcp.agent.langchain :as chain]
@@ -12,6 +13,10 @@
 (def DEFAULT-STATELESS-BUFFER 100)
 (def MIN-PERSISTENT-WINDOW 10)
 
+(def MEMORY-RESET-BUFFER
+  "Buffer size before triggering memory reset to prevent overflow."
+  15)
+
 (defn build-read-only-tools
   "Builds the read-only tools for agents.
    These tools are safe for exploration and analysis without modifying files.
@@ -138,7 +143,7 @@ Please use it to inform you as to which files should be investigated.\n=========
    
    Returns: The memory object (possibly reset)"
   [memory context memory-size]
-  (if (> (chain/memory-count memory) (- memory-size 15))
+  (if (> (chain/memory-count memory) (- memory-size MEMORY-RESET-BUFFER))
     (do
       (chain/memory-clear! memory)
       (initialize-memory-with-context! memory context))
@@ -258,5 +263,6 @@ Please use it to inform you as to which files should be investigated.\n=========
   [agent new-tools]
   (create-general-agent
    (-> agent
-       (select-keys [:system-prompt :context :model :memory-size])
+       (select-keys [:system-message :context :model :memory-size])
+       (set/rename-keys {:system-message :system-prompt})
        (assoc :tools (vec (concat (:tools agent) new-tools))))))

src/clojure_mcp/agent/langchain.clj

@@ -69,7 +69,8 @@
 ;; Tool conversion
 
 (defn- adapt-tool-fn
-  "Adapts clojure-mcp callback-style tool to langchain4clj return style."
+  "Adapts clojure-mcp callback-style tool to langchain4clj return style.
+   Includes a 5-minute timeout to prevent indefinite blocking."
   [callback-style-fn]
   (fn [args]
     (let [result-promise (promise)]
@@ -83,7 +84,10 @@
                     (if (sequential? result)
                       (string/join "\n\n" result)
                       (str result))))))
-      @result-promise)))
+      (let [result (deref result-promise 300000 ::timeout)]
+        (if (= result ::timeout)
+          "Tool Error: Execution timed out after 5 minutes"
+          result)))))
 
 (defn- registration-map->tool-map
   "Converts clojure-mcp tool registration map to langchain4clj tool map format."
@@ -127,13 +131,23 @@
 
 ;; Assistant creation
 
-(defn create-assistant-fn [{:keys [model memory tools system-message]}]
+(defn create-assistant-fn
+  "Creates an assistant function with the given configuration.
+   
+   Options:
+   - :model - The LLM model to use
+   - :memory - Chat memory instance
+   - :tools - Sequence of tool registration maps
+   - :system-message - System message for the assistant
+   - :max-iterations - Maximum tool iterations (default: 10)"
+  [{:keys [model memory tools system-message max-iterations]
+    :or {max-iterations 10}}]
   (assistant/create-assistant
    {:model model
     :memory memory
     :tools (when (seq tools) (convert-tools tools))
     :system-message system-message
-    :max-iterations 10}))
+    :max-iterations max-iterations}))
 
 ;; Message helpers
 
@@ -143,6 +157,4 @@
 (defn system-message [text]
   (messages/edn->message {:type :system :text text}))
 
-(defn user-message-with-contents [content-items]
-  (let [text (string/join "\n" (map #(.text %) content-items))]
-    (messages/edn->message {:type :user :text text})))
+

src/clojure_mcp/agent/langchain/chat_listener.clj

@@ -25,7 +25,7 @@
                      (on-response (assoc ctx :ctx (:raw-context ctx)))))
     :on-error (when on-error
                 (fn [ctx]
-                  (on-error ctx)))}))
+                  (on-error (assoc ctx :ctx (:raw-context ctx)))))}))
 
 (defn logging-listener
   "Create a listener that logs all events."