Improve tool call result marking as error when not expected output.

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Improve tool call result marking as error when not expected output.
+
 ## 0.12.4
 
 - Add chat command type.

src/eca/features/chat.clj

@@ -383,7 +383,8 @@
 (defn query-commands
   [{:keys [query chat-id]}
    db*]
-  (let [mcp-prompts (->> (f.mcp/all-prompts @db*)
+  (let [query (string/lower-case query)
+        mcp-prompts (->> (f.mcp/all-prompts @db*)
                          (mapv #(-> %
                                     (assoc :name (str (:server %) ":" (:name %))
                                            :type :mcpPrompt)
@@ -396,8 +397,8 @@
                          eca-commands)
         commands (if (string/blank? query)
                    commands
-                   (filter #(or (string/includes? (:name %) query)
-                                (string/includes? (:description %) query))
+                   (filter #(or (string/includes? (string/lower-case (:name %)) query)
+                                (string/includes? (string/lower-case (:description %)) query))
                            commands))]
     {:chat-id chat-id
      :commands commands}))

src/eca/features/tools/filesystem.clj

@@ -67,9 +67,9 @@
                                             pattern)))
                    []
                    (:workspace-folders db))]
-        (tools.util/single-text-content (if (seq paths)
-                                          (string/join "\n" paths)
-                                          "No matches found")))))
+        (if (seq paths)
+          (tools.util/single-text-content (string/join "\n" paths))
+          (tools.util/single-text-content "No matches found" :error)))))
 
 (defn ^:private run-ripgrep [path pattern include]
   (let [cmd (cond-> ["rg" "--files-with-matches" "--no-heading"]
@@ -159,9 +159,9 @@
                    (run-java-grep path pattern include))
                  (take max-results))]
         ;; TODO sort by modification time.
-        (tools.util/single-text-content (if (seq paths)
-                                          (string/join "\n" paths)
-                                          "No files found for given pattern")))))
+        (if (seq paths)
+          (tools.util/single-text-content (string/join "\n" paths))
+          (tools.util/single-text-content "No files found for given pattern" :error)))))
 
 (defn ^:private replace-in-file [arguments {:keys [db]}]
   (or (tools.util/invalid-arguments arguments (concat (path-validations db)
@@ -171,14 +171,13 @@
             new-content (get arguments "new_content")
             all? (boolean (get arguments "all_occurrences"))
             content (slurp path)]
-        (tools.util/single-text-content
-         (if (string/includes? content original-content)
-           (let [content (if all?
-                           (string/replace content original-content new-content)
-                           (string/replace-first content original-content new-content))]
-             (spit path content)
-             (format "Successfully replaced content in %s." path))
-           (format "Original content not found in %s" path))))))
+        (if (string/includes? content original-content)
+          (let [content (if all?
+                          (string/replace content original-content new-content)
+                          (string/replace-first content original-content new-content))]
+            (spit path content)
+            (tools.util/single-text-content (format "Successfully replaced content in %s." path)))
+          (tools.util/single-text-content (format "Original content not found in %s" path) :error)))))
 
 (defn ^:private move-file [arguments {:keys [db]}]
   (let [workspace-dirs (tools.util/workspace-roots-strs db)]

test/eca/features/tools/filesystem_test.clj

@@ -139,7 +139,7 @@
             {:db {:workspace-folders [{:uri (h/file-uri "file:///project/foo") :name "foo"}]}})))))
   (testing "no matches"
     (is (match?
-         {:error false
+         {:error true
           :contents [{:type :text
                       :content "No matches found"}]}
          (with-redefs [fs/exists? (constantly true)
@@ -203,7 +203,7 @@
             {:db {:workspace-folders [{:uri (h/file-uri "file:///project/foo") :name "foo"}]}})))))
   (testing "no files found"
     (is (match?
-         {:error false
+         {:error true
           :contents [{:type :text
                       :content "No files found for given pattern"}]}
          (with-redefs [fs/exists? (constantly true)
@@ -275,7 +275,7 @@
             {:db {:workspace-folders [{:uri (h/file-uri "file:///foo/bar/baz") :name "foo"}]}})))))
   (testing "original content not found"
     (is (match?
-         {:error false
+         {:error true
           :contents [{:type :text
                       :content (format "Original content not found in %s" (h/file-path "/project/foo/my-file.txt"))}]}
          (with-redefs [fs/exists? (constantly true)