Improve tools and fix tool call output for openai

Author: ericdallo

src/eca/features/chat.clj

@@ -50,8 +50,8 @@
 
 (defn ^:private behavior->behavior-str [behavior]
   (case behavior
-    "chat" "Help with code changes when applicable, answer questions, and provide explanations."
-    "agent" "Help with code changes when applicable but suggest you do the changes itself, answer questions, and provide explanations."))
+    "chat" "Help with code changes only if user requested/agreed, ask first before do changes, answer questions, and provide explanations."
+    "agent" "Help with code changes when applicable, suggesting you do the changes itself, answer questions, and provide explanations."))
 
 (defn default-model [db]
   (if-let [ollama-model (first (filter #(string/starts-with? % config/ollama-model-prefix) (vals (:models db))))]

src/eca/features/tools/filesystem.clj

@@ -60,24 +60,13 @@
   (or (invalid-arguments arguments (concat (path-validations db)
                                            [["pattern" #(not (string/blank? %)) "Invalid glob pattern '$pattern'"]]))
       (let [pattern (get arguments "pattern")
-            ;; Normalize pattern - if it doesn't contain wildcards, wrap with wildcards
-            normalized-pattern (if (string/includes? pattern "*")
-                                 pattern
-                                 (format "*%s*" pattern))
-            ;; Convert glob pattern to regex for case-insensitive matching
-            pattern-regex (-> normalized-pattern
-                              (string/replace "*" ".*")
-                              (string/replace "?" ".")
-                              (str "(?i)")  ; Case-insensitive flag
-                              re-pattern)
+            pattern (if (string/includes? pattern "*")
+                      pattern
+                      (format "**/*%s*/**" pattern))
             paths (reduce
                    (fn [paths {:keys [uri]}]
-                     (let [root-path (shared/uri->filename uri)]
-                       (concat paths
-                               (filter (fn [path]
-                                         (let [filename (fs/file-name path)]
-                                           (re-matches pattern-regex filename)))
-                                       (fs/glob root-path "**/*")))))
+                     (concat paths (fs/glob (shared/uri->filename uri)
+                                            pattern)))
                    []
                    (:workspace-folders db))]
         (single-text-content (if (seq paths)

src/eca/llm_providers/openai.clj

@@ -53,10 +53,9 @@
                   "tool_call" {:type "function_call"
                                :name (:name content)
                                :call_id (:id content)
-                               :arguments (:arguments content)}
+                               :arguments (json/generate-string (:arguments content))}
                   "tool_call_output"
                   {:type "function_call_output"
-                   :name (:name content)
                    :call_id (:id content)
                    :output (llm-util/stringfy-tool-result content)}
                   msg))

test/eca/features/tools/filesystem_test.clj

@@ -148,8 +148,7 @@
                                     (h/file-path "/project/foo/qux.txt"))}]}
          (with-redefs [fs/exists? (constantly true)
                        fs/glob (constantly [(fs/path (h/file-path "/project/foo/bar/baz.txt"))
-                                            (fs/path (h/file-path "/project/foo/qux.txt"))
-                                            (fs/path (h/file-path "/project/foo/bar/baz.clj"))])]
+                                            (fs/path (h/file-path "/project/foo/qux.txt"))])]
            ((get-in f.tools.filesystem/definitions ["search_files" :handler])
             {"path" (h/file-path "/project/foo")
              "pattern" ".txt"}

test/eca/llm_providers/openai_test.clj

@@ -25,7 +25,7 @@
           {:type "function_call"
            :call_id "call-1"
            :name "list_allowed_directories"
-           :arguments {}}
+           :arguments "{}"}
           {:type "function_call_output"
            :call_id "call-1"
            :output "Allowed directories: /foo/bar\n"}