Add ollama support for tools/mcp

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add built-in tools: filesystem
+- Add MCP/tool support for ollama models.
 
 ## 0.1.0
 

docs/capabilities.md

@@ -14,7 +14,7 @@ Provides access to filesystem under workspace root, listing and reading files an
 |-----------|-------------|---------------------|
 | OpenAI    | √           | X                   |
 | Anthropic | √           | X                   |
-| Ollama    | X           | X                   |
+| Ollama    | √           | X                   |
 
 ### OpenAI
 

docs/configuration.md

@@ -117,7 +117,7 @@ interface Config {
   "openaiApiKey" : null,
   "anthropicApiKey" : null,
   "rules" : [ ],
-  "built-in-tools": {"filesystem": {"enabled": true}},
+  "builtInTools": {"filesystem": {"enabled": true}},
   "mcpTimeoutSeconds" : 10,
   "mcpServers" : [ ],
   "ollama" : {

src/eca/config.clj

@@ -19,12 +19,12 @@
   {:openaiApiKey nil
    :anthropicApiKey nil
    :rules []
-   :built-in-tools {:filesystem {:enabled true}}
+   :builtInTools {:filesystem {:enabled true}}
    :mcpTimeoutSeconds 60
    :mcpServers {}
    :ollama {:host "http://localhost"
             :port 11434
-            :useTools false}
+            :useTools true}
    :chat {:welcomeMessage "Welcome to ECA! What you have in mind?\n\n"}
    :index {:ignoreFiles [{:type :gitignore}]}})
 

src/eca/features/tools.clj

@@ -11,7 +11,7 @@
 
 (defn built-in-definitions [config]
   (merge {}
-         (when (get-in config [:built-in-tools :filesystem :enabled])
+         (when (get-in config [:builtInTools :filesystem :enabled])
            f.tools.filesystem/definitions)))
 
 (defn all-tools [db config]

src/eca/features/tools/filesystem.clj

@@ -12,9 +12,9 @@
                :error (boolean error)}]})
 
 (defn ^:private not-allowed-path [path db]
-  (when-not (some #(fs/starts-with? path (shared/uri->filename (:uri %)))
+  (when (not-any? #(fs/starts-with? path (shared/uri->filename (:uri %)))
                   (:workspace-folders db))
-    (single-text-content "Access denied - path outside workspace root" :error)))
+    (single-text-content "Access denied - path outside workspace root, call list_allowed_dirs first" :error)))
 
 (defn ^:private list-allowed-directories [_arguments db]
   (single-text-content
@@ -23,7 +23,7 @@
                      (map (comp shared/uri->filename :uri) (:workspace-folders db))))))
 
 (defn ^:private list-directory [arguments db]
-  (let [path (get arguments "path")]
+  (let [path (fs/canonicalize (:path arguments))]
     (or (not-allowed-path path db)
         (single-text-content
          (reduce

src/eca/handlers.clj

@@ -10,17 +10,16 @@
 
 (set! *warn-on-reflection* true)
 
-(defn ^:private initialize-extra-models! [db*]
-  (let [config (config/all @db*)]
-    (when-let [ollama-models (seq (llm-api/extra-models config))]
-      (swap! db* update :models merge
-             (reduce
-              (fn [models {:keys [model]}]
-                (assoc models
-                       (str config/ollama-model-prefix model)
-                       {:mcp-tools (get-in config [:ollama :useTools] false)}))
-              {}
-              ollama-models)))))
+(defn ^:private initialize-extra-models! [db* config]
+  (when-let [ollama-models (seq (llm-api/extra-models config))]
+    (swap! db* update :models merge
+           (reduce
+            (fn [models {:keys [model]}]
+              (assoc models
+                     (str config/ollama-model-prefix model)
+                     {:mcp-tools (get-in config [:ollama :useTools] false)}))
+            {}
+            ollama-models))))
 
 (defn initialize [{:keys [db* messenger]} params]
   (logger/logging-task
@@ -31,7 +30,7 @@
           :client-capabilities (:capabilities params)
           :chat-behavior (or (-> params :initialization-options :chat-behavior) (:chat-behavior @db*)))
    (let [config (config/all @db*)]
-     (initialize-extra-models! db*)
+     (initialize-extra-models! db* config)
      (future
        (f.mcp/initialize-servers-async!
         {:on-server-updated (fn [server]

src/eca/llm_api.clj

@@ -4,7 +4,8 @@
    [eca.config :as config]
    [eca.llm-providers.anthropic :as llm-providers.anthropic]
    [eca.llm-providers.ollama :as llm-providers.ollama]
-   [eca.llm-providers.openai :as llm-providers.openai]))
+   [eca.llm-providers.openai :as llm-providers.openai]
+   [eca.logger :as logger]))
 
 (set! *warn-on-reflection* true)
 
@@ -30,6 +31,9 @@
                                         (reset! first-message-received* true)
                                         (apply on-first-message-received args))
                                       (apply on-message-received args))
+        on-error-wrapper (fn [& args]
+                           (apply logger/error args)
+                           (apply on-error args))
         tools (when (:mcp-tools model-config)
                 (mapv mcp-tool->llm-tool mcp-tools))
         web-search (:web-search model-config)]
@@ -46,7 +50,7 @@
         :web-search web-search
         :api-key (:openaiApiKey config)}
        {:on-message-received on-message-received-wrapper
-        :on-error on-error
+        :on-error on-error-wrapper
         :on-prepare-tool-call on-prepare-tool-call
         :on-tool-called on-tool-called
         :on-reason on-reason})
@@ -63,7 +67,7 @@
         :web-search web-search
         :api-key (:anthropicApiKey config)}
        {:on-message-received on-message-received-wrapper
-        :on-error on-error
+        :on-error on-error-wrapper
         :on-prepare-tool-call on-prepare-tool-call
         :on-tool-called on-tool-called})
 
@@ -77,7 +81,8 @@
         :tools tools
         :user-prompt user-prompt}
        {:on-message-received on-message-received-wrapper
-        :on-error on-error
+        :on-error on-error-wrapper
+        :on-prepare-tool-call on-prepare-tool-call
         :on-tool-called on-tool-called})
 
       :else

src/eca/llm_providers/ollama.clj

@@ -66,22 +66,48 @@
         tools))
 
 (defn completion! [{:keys [model user-prompt context host port past-messages tools]}
-                   {:keys [on-message-received on-error _on-tool-called]}]
+                   {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
   (let [messages (if (empty? past-messages)
                    [{:role "user" :content (->message-with-context context user-prompt)}]
                    (conj past-messages {:role "user" :content user-prompt}))
         body {:model model
               :messages messages
+              :think false
               :tools (->tools tools)
               :stream true}
         url (format chat-url (base-url host port))
         on-response-fn (fn handle-response [event data]
                          (llm-util/log-response logger-tag event data)
                          (let [{:keys [message done_reason]} data]
-                           (on-message-received
-                            (cond-> {}
-                              message (assoc :type :text :text (:content message))
-                              done_reason (assoc :type :finish :finish-reason done_reason)))))]
+                           (cond
+                             (seq (:tool_calls message))
+                             (let [function (:function (first (seq (:tool_calls message))))
+                                   id (str (random-uuid))
+                                   _ (on-prepare-tool-call {:id id
+                                                            :name (:name function)
+                                                            :argumentsText ""})
+                                   response (on-tool-called {:id id
+                                                             :name (:name function)
+                                                             :arguments (:arguments function)})]
+                               (base-completion-request!
+                                {:url url
+                                 :body (assoc body :messages (concat messages
+                                                                     [message]
+                                                                     (mapv
+                                                                      (fn [{:keys [_type content]}]
+                                                                        {:role "tool"
+                                                                         :content content})
+                                                                      (:contents response))))
+                                 :on-error on-error
+                                 :on-response handle-response}))
+
+                             done_reason
+                             (on-message-received {:type :finish
+                                                   :finish-reason done_reason})
+
+                             message
+                             (on-message-received {:type :text
+                                                   :text (:content message)}))))]
     (base-completion-request!
      {:url url
       :body body

src/eca/logger.clj

@@ -15,12 +15,15 @@
     (binding [*out* *err*]
       (apply println args))))
 
-(defn info [& args]
-  (apply stderr-print :info args))
+(defn error [& args]
+  (apply stderr-print :error args))
 
 (defn warn [& args]
   (apply stderr-print :warn args))
 
+(defn info [& args]
+  (apply stderr-print :info args))
+
 (defn debug [& args]
   (apply stderr-print :debug args))