Fix config for customTools

Author: ericdallo

docs/configuration.md

@@ -160,9 +160,9 @@ __The `manualApproval` setting was deprecated and replaced by the `approval` one
 
 ## Custom Tools
 
-You can define your own command-line tools that the LLM can use. These are configured via the `custom-tools` key in your `config.json`.
+You can define your own command-line tools that the LLM can use. These are configured via the `customTools` key in your `config.json`.
 
-The `custom-tools` value is an object where each key is the name of your tool. Each tool definition has the following properties:
+The `customTools` value is an object where each key is the name of your tool. Each tool definition has the following properties:
 
 -   `description`: A clear description of what the tool does. This is crucial for the LLM to decide when to use it.
 -   `command`: An array of strings representing the command and its static arguments.
@@ -176,7 +176,7 @@ Placeholders in the format `{{argument_name}}` within the `command` array will b
 
     ```javascript
     {
-      "custom-tools": {
+      "customTools": {
         "web-search": {
           "description": "Fetches the content of a URL and returns it in Markdown format.",
           "command": ["trafilatura", "--output-format=markdown", "-u", "{{url}}"],

src/eca/config.clj

@@ -202,6 +202,8 @@
                    [:toolCall :approval :ask :ANY :argsMatchers]
                    [:toolCall :approval :deny]
                    [:toolCall :approval :deny :ANY :argsMatchers]
+                   [:customTools]
+                   [:customTools :ANY :schema :properties]
                    [:mcpServers]]}
                  (deep-merge initialization-config
                              (when-not pure-config? (config-from-envvar))

src/eca/features/tools/custom.clj

@@ -27,17 +27,17 @@
   "Transforms a single custom tool from the config map into a full tool definition."
   [[tool-name tool-config]]
   (let [schema (:schema tool-config)]
-    {(name tool-name)
-     {:name (name tool-name)
+    {tool-name
+     {:name tool-name
       :description (:description tool-config)
       :parameters {:type "object"
-                   :properties (update-keys (:properties schema) keyword)
-                   :required (mapv keyword (:required schema))}
+                   :properties (:properties schema)
+                   :required (:required schema)}
       :handler (build-tool-fn tool-config)}}))
 
 (defn definitions
   "Loads all custom tools from the config."
   [config]
-  (->> (get config :custom-tools {})
+  (->> (get config :customTools {})
        (map custom-tool->tool-def)
        (apply merge)))

test/eca/features/tools/custom_test.clj

@@ -17,7 +17,7 @@
         (with-redefs [process/sh (fn [command-vec & _]
                                    (is (= ["find" "/tmp" "-name" "*.clj"] command-vec))
                                    {:out "mocked-output" :exit 0})]
-          (let [config {:custom-tools mock-custom-tools}
+          (let [config {:customTools mock-custom-tools}
                 custom-defs (f.tools.custom/definitions config)
                 custom-tool-def (get custom-defs "file-search")]
             (is (some? custom-tool-def) "The custom tool should be loaded.")
@@ -37,7 +37,7 @@
                                    ["git" "status"] {:out "On branch main" :exit 0}
                                    ["echo" "Hello World"] {:out "Hello World" :exit 0}
                                    (is false "Unexpected command received by mock p/sh")))]
-        (let [config {:custom-tools mock-custom-tools}
+        (let [config {:customTools mock-custom-tools}
               custom-defs (f.tools.custom/definitions config)
               git-status-handler (get-in custom-defs ["git-status" :handler])
               echo-handler (get-in custom-defs ["echo-message" :handler])]
@@ -48,7 +48,7 @@
 
   (testing "when the custom tools config is empty or missing"
     (testing "with an empty map"
-      (let [config {:custom-tools {}}
+      (let [config {:customTools {}}
             custom-defs (f.tools.custom/definitions config)]
         (is (empty? custom-defs) "No custom tools should be loaded.")))
     (testing "with the key missing from the config"