Move defaultConfig from customProviders to root

Author: ericdallo

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Drop uneeded `ollama useTools` and `ollama think` configs.
 - Refactor configs for config providers unification.
   - `<provider>ApiKey` and `<providerApiUrl>` now live in `:providers "<provider>" :key`.
+  - Move `defaultModel` config from customProvider to root. 
 
 ## 0.30.0
 

docs/configuration.md

@@ -157,6 +157,7 @@ There are 3 possible ways to configure rules following this order of priority:
             url?: string;
             key?: string; // when provider supports api key.
         }};
+        defaultModel?: string;
         rules: [{path: string;}];
         commands: [{path: string;}];
         systemPromptTemplateFile?: string;
@@ -179,7 +180,6 @@ There are 3 possible ways to configure rules following this order of priority:
         customProviders: {[key: string]: {
             api: 'openai-responses' | 'openai-chat' | 'anthropic';
             models: string[];
-            defaultModel?: string;
             url?: string;
             urlEnv?: string;
             completionUrlRelativePath?: string;
@@ -217,6 +217,7 @@ There are 3 possible ways to configure rules following this order of priority:
           "github-copilot": {"url": "https://api.githubcopilot.com"},
           "ollama": {"url": "http://localhost:11434"}
       },
+      "defaultModel": nil, // let ECA decides the default model.
       "rules" : [],
       "commands" : [],
       "nativeTools": {"filesystem": {"enabled": true},

integration-test/integration/chat/custom_provider_test.clj

@@ -21,13 +21,13 @@
          (eca/request! (fixture/initialize-request
                         {:initializationOptions
                          (merge fixture/default-init-options
-                                {:customProviders
+                                {:defaultModel "foo-1"
+                                 :customProviders
                                  {"myProvider"
                                   {:api "openai-responses"
                                    :url (str "http://localhost:" llm-mock.server/port "/openai")
                                    :key "foobar"
-                                   :models ["foo-0" "foo-1"]
-                                   :defaultModel "foo-1"}}})
+                                   :models ["foo-0" "foo-1"]}}})
                          :capabilities {:codeAssistant {:chat {}}}})))))
   (eca/notify! (fixture/initialized-notification))
   (let [chat-id* (atom nil)]
@@ -144,13 +144,13 @@
          (eca/request! (fixture/initialize-request
                         {:initializationOptions
                          (merge fixture/default-init-options
-                                {:customProviders
+                                {:defaultModel "deepseek-coder"
+                                 :customProviders
                                  {"myProvider"
                                   {:api "openai-chat"
                                    :url (str "http://localhost:" llm-mock.server/port "/openai-chat")
                                    :key "foobar"
-                                   :models ["deepseek-chat" "deepseek-coder"]
-                                   :defaultModel "deepseek-coder"}}})
+                                   :models ["deepseek-chat" "deepseek-coder"]}}})
                          :capabilities {:codeAssistant {:chat {}}}})))))
   (eca/notify! (fixture/initialized-notification))
   (let [chat-id* (atom nil)]

integration-test/integration/initialize_test.clj

@@ -82,9 +82,9 @@
           :chatWelcomeMessage "Welcome to ECA!\n\nType '/' for commands\n\n"}
          (eca/request! (fixture/initialize-request
                         {:initializationOptions (merge fixture/default-init-options
-                                                       {:customProviders
+                                                       {:defaultModel "bar-2"
+                                                        :customProviders
                                                         {"myCustom" {:api "openai"
                                                                      :urlEnv "MY_CUSTOM_API_URL"
                                                                      :keyEnv "MY_CUSTOM_API_KEY"
-                                                                     :models ["foo-1" "bar-2"]
-                                                                     :defaultModel "bar-2"}}})}))))))
+                                                                     :models ["foo-1" "bar-2"]}}})}))))))

src/eca/config.clj

@@ -25,6 +25,7 @@
                             :url "https://api.anthropic.com"}
                "github-copilot" {:url "https://api.githubcopilot.com"}
                "ollama" {:url "http://localhost:11434"}}
+   :defaultModel nil
    :rules []
    :commands []
    :nativeTools {:filesystem {:enabled true}

src/eca/handlers.clj

@@ -21,7 +21,7 @@
     (swap! db* update :models merge eca-models)
     (when-let [custom-providers (seq (:customProviders config))]
       (let [models (reduce
-                    (fn [models [custom-provider {provider-models :models default-model :defaultModel}]]
+                    (fn [models [custom-provider {provider-models :models}]]
                       (reduce
                        (fn [m model]
                          (let [known-model (get all-models model)]
@@ -32,7 +32,7 @@
                                    :web-search (or (:web-search known-model) true)
                                    :max-output-tokens (:max-output-tokens known-model)
                                    :custom-provider? true
-                                   :default-model? (= model default-model)})))
+                                   :default-model? (= model (:defaultModel config))})))
                        models
                        provider-models))
                     {}