Fix origin for tool calls

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add support for global rules.
+- Fix origin field of tool calls.
 
 ## 0.3.1
 

src/eca/features/chat.clj

@@ -195,6 +195,7 @@
                           :request-id request-id
                           :role :assistant
                           :content {:type :toolCallRun
+                                    :origin (:origin (first (filter #(= name (:name %)) all-tools)))
                                     :name name
                                     :arguments arguments
                                     :id id

src/eca/features/rules.clj

@@ -56,9 +56,10 @@
 (defn ^:private system-rules []
   [{:name "ECA System"
     :type :system
-    :content (str "You are an expert AI coding tool called ECA (Editor Code Assistant)."
-                  "Your behavior is to '<behavior>'."
-                  "The chat is markdown mode.")}])
+    :content (str "You are an expert AI coding tool called ECA (Editor Code Assistant). "
+                  "Your behavior is to '<behavior>'. "
+                  "The chat is markdown mode. "
+                  "When responding code blocks, pay attention to use valid markdown languages following Github markdown.")}])
 
 (defn all [config roots variables]
   (mapv (fn [rule]

src/eca/features/tools.clj

@@ -39,8 +39,8 @@
                             (vals (native-definitions db config))))
         mcp-tools (f.mcp/all-tools db)]
     (concat
-     (mapv #(assoc % :source :native) native-tools)
-     (mapv #(assoc % :source :mcp) mcp-tools))))
+     (mapv #(assoc % :origin :native) native-tools)
+     (mapv #(assoc % :origin :mcp) mcp-tools))))
 
 (defn call-tool! [^String name ^Map arguments db config]
   (logger/info logger-tag (format "Calling tool '%s' with args '%s'" name arguments))

test/eca/features/rules_test.clj

@@ -13,9 +13,10 @@
     (testing "system rule replacement"
       (let [rules    (f.rules/all {} [] vars)
             sys-rule (first (filter #(= :system (:type %)) rules))]
-        (is (= (str "You are an expert AI coding tool called ECA (Editor Code Assistant)."
-                    "Your behavior is to 'MY-BEHAVIOR'."
-                    "The chat is markdown mode.")
+        (is (= (str "You are an expert AI coding tool called ECA (Editor Code Assistant). "
+                    "Your behavior is to 'MY-BEHAVIOR'. "
+                    "The chat is markdown mode. "
+                    "When responding code blocks, pay attention to use valid markdown languages following Github markdown.")
                (:content sys-rule)))))
 
     (testing "absolute config rule"

test/eca/features/tools_test.clj

@@ -14,7 +14,7 @@
                      :description "eval code"
                      :parameters {"type" "object"
                                   :properties {"code" {:type "string"}}}
-                     :source :mcp}])
+                     :origin :mcp}])
          (f.tools/all-tools {:mcp-clients {:clojureMCP
                                            {:tools [{:name "eval"
                                                      :description "eval code"
@@ -26,7 +26,7 @@
          (m/embeds [{:name "eca_list_directory"
                      :description string?
                      :parameters some?
-                     :source :native}])
+                     :origin :native}])
          (f.tools/all-tools {} {:nativeTools {:filesystem {:enabled true}}}))))
   (testing "Do not include disabled native tools"
     (is (match?
@@ -37,7 +37,7 @@
          (m/embeds [{:name "eca_list_directory"
                      :description (format "Only in %s" (h/file-path "/path/to/project/foo"))
                      :parameters some?
-                     :source :native}])
+                     :origin :native}])
          (with-redefs [f.tools.filesystem/definitions {"eca_list_directory" {:description "Only in $workspaceRoots"
                                                                              :parameters {}}}]
            (f.tools/all-tools {:workspace-folders [{:name "foo" :uri (h/file-uri "file:///path/to/project/foo")}]}