Prefix tool name with server to LLM: <server>__<toolname>.

Fixes #196

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Prefix tool name with server to LLM: <server>__<toolname>. #196
+
 ## 0.77.1
 
 - Fix token renew when using rewrite feature.

integration-test/integration/chat/anthropic_test.clj

@@ -211,7 +211,7 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})
         (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "I should call tool"})
-        (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca_directory_tree"})
+        (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca__eca_directory_tree"})
         (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
         (match-content chat-id "assistant" {:type "text" :text "I will list files"})
         (match-content chat-id "assistant" {:type "toolCallPrepare"
@@ -270,12 +270,12 @@
                          {:role "assistant"
                           :content [{:type "thinking"
                                      :signature "enc-123"
-                                     :thinking "I should call tool eca_directory_tree"}]}
+                                     :thinking "I should call tool eca__eca_directory_tree"}]}
                          {:role "assistant" :content [{:type "text" :text "I will list files"}]}
                          {:role "assistant"
                           :content [{:type "tool_use"
                                      :id "tool-1"
-                                     :name "eca_directory_tree"
+                                     :name "eca__eca_directory_tree"
                                      :input {:path (h/project-path->canon-path "resources")}}]}
                          {:role "user"
                           :content [{:type "tool_result"
@@ -285,6 +285,6 @@
                                                    " file2.md\n\n"
                                                    "0 directories, 2 files\n")}]}]
               :tools (m/embeds
-                      [{:name "eca_directory_tree"}])
+                      [{:name "eca__eca_directory_tree"}])
               :system (m/pred vector?)}
              (llm.mocks/get-req-body :tool-calling-0)))))))

integration-test/integration/chat/github_copilot_test.clj

@@ -199,7 +199,7 @@
           (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
           (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})
           (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "I should call tool"})
-          (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca_directory_tree"})
+          (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca__eca_directory_tree"})
           (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
           (match-content chat-id "assistant" {:type "text" :text "I will list files"})
           (match-content chat-id "assistant" {:type "toolCallPrepare"
@@ -266,19 +266,19 @@
                            {:role "assistant"
                             :content [{:type "thinking"
                                        :signature "enc-123"
-                                       :thinking "I should call tool eca_directory_tree"}]}
+                                       :thinking "I should call tool eca__eca_directory_tree"}]}
                            {:role "assistant" :content [{:type "text" :text "I will list files"}]}
                            {:role "assistant"
                             :content [{:type "tool_use"
                                        :id "tool-1"
-                                       :name "eca_directory_tree"
+                                       :name "eca__eca_directory_tree"
                                        :input {:path (h/project-path->canon-path "resources")}}]}
                            {:role "user"
                             :content [{:type "tool_result"
                                        :tool_use_id "tool-1"
                                        :content (str "[FILE] " (h/project-path->canon-path "resources/file1.md\n")
                                                      "[FILE] " (h/project-path->canon-path "resources/file2.md\n\n"))}]}]
                 :tools (m/embeds
-                        [{:name "eca_directory_tree"}])
+                        [{:name "eca__eca_directory_tree"}])
                 :system (m/pred vector?)}
                llm.mocks/*last-req-body*))))))

integration-test/integration/chat/google_test.clj

@@ -198,7 +198,7 @@
           (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
           (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})
           (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "I should call tool"})
-          (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca_directory_tree"})
+          (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " eca__eca_directory_tree"})
           (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
           (match-content chat-id "assistant" {:type "text" :text "I will list files"})
           (match-content chat-id "assistant" {:type "toolCallPrepare"
@@ -265,19 +265,19 @@
                            {:role "assistant"
                             :content [{:type "thinking"
                                        :signature "enc-123"
-                                       :thinking "I should call tool eca_directory_tree"}]}
+                                       :thinking "I should call tool eca__eca_directory_tree"}]}
                            {:role "assistant" :content [{:type "text" :text "I will list files"}]}
                            {:role "assistant"
                             :content [{:type "tool_use"
                                        :id "tool-1"
-                                       :name "eca_directory_tree"
+                                       :name "eca__eca_directory_tree"
                                        :input {:path (h/project-path->canon-path "resources")}}]}
                            {:role "user"
                             :content [{:type "tool_result"
                                        :tool_use_id "tool-1"
                                        :content (str "[FILE] " (h/project-path->canon-path "resources/file1.md\n")
                                                      "[FILE] " (h/project-path->canon-path "resources/file2.md\n\n"))}]}]
                 :tools (m/embeds
-                        [{:name "eca_directory_tree"}])
+                        [{:name "eca__eca_directory_tree"}])
                 :system (m/pred vector?)}
                llm.mocks/*last-req-body*))))))

integration-test/integration/chat/ollama_test.clj

@@ -252,13 +252,13 @@
                          {:role "assistant" :content "I will list files"}
                          {:role "assistant" :tool-calls [{:type "function"
                                                           :function {:id (m/pred string?)
-                                                                     :name "eca_directory_tree"
+                                                                     :name "eca__eca_directory_tree"
                                                                      :arguments {:path (h/project-path->canon-path "resources")}
                                                                      :summary "Listing file tree"
                                                                      :origin "native"}}]}
                          {:role "tool" :content (str (h/project-path->canon-path "resources") "\n"
                                                      " file1.md\n"
                                                      " file2.md\n\n"
                                                      "0 directories, 2 files\n")}]
-              :tools (m/embeds [{:type "function" :function {:name "eca_directory_tree"}}])}
+              :tools (m/embeds [{:type "function" :function {:name "eca__eca_directory_tree"}}])}
              (llm.mocks/get-req-body :tool-calling-0)))))))