Refactor providers config for better extends in the future

ericdallo · ericdallo · commit f2e4ed7d5070 · 2025-08-21T00:20:02.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Update copilot models
 - Drop uneeded `ollama useTools` and `ollama think` configs.
+- Refactor configs for config providers unification.
+  - `<provider>ApiKey` and `<providerApiUrl>` now live in `:providers "<provider>" :key`.
 
 ## 0.30.0
 
diff --git a/README.md b/README.md
@@ -70,8 +70,10 @@ To use ECA, you need to configure at least one model with your API key. See the
 
 ```json
 {
-  "openaiApiKey": "your-openai-api-key-here",
-  "anthropicApiKey": "your-anthropic-api-key-here"
+  "providers": {
+      "openai": {"key": "your-openai-api-key-here"},
+      "anthropic": {"key": "your-anthropic-api-key-here"}
+  }
 }
 ```
 
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -153,11 +153,10 @@ There are 3 possible ways to configure rules following this order of priority:
 
     ```typescript
     interface Config {
-        openaiApiKey?: string;
-        openaiApiUrl?: string;
-        anthropicApiKey?: string;
-        anthropicApiUrl?: string;
-        ollamaApiUrl: string;
+        providers: {[key: string]: {
+            url?: string;
+            key?: string; // when provider supports api key.
+        }};
         rules: [{path: string;}];
         commands: [{path: string;}];
         systemPromptTemplateFile?: string;
@@ -210,11 +209,14 @@ There are 3 possible ways to configure rules following this order of priority:
 
     ```javascript
     {
-      "openaiApiKey" : null,
-      "openaiApiUrl" : null,
-      "anthropicApiKey" : null,
-      "anthropicApiUrl" : null,
-      "ollamaApiUrl": "http://localhost:11434"
+      "providers": {
+          "openai": {"key": null,
+                    "url": "https://api.openai.com"},
+          "anthropic": {"key": null,
+                        "url": "https://api.anthropic.com"},
+          "github-copilot": {"url": "https://api.githubcopilot.com"},
+          "ollama": {"url": "http://localhost:11434"}
+      },
       "rules" : [],
       "commands" : [],
       "nativeTools": {"filesystem": {"enabled": true},
diff --git a/docs/features.md b/docs/features.md
@@ -79,8 +79,10 @@ Eca supports commands that usually are triggered via shash (`/`) in the chat, co
 The built-in commands are:
 
 `/init`: Create/update the AGENT.md file with details about the workspace for best LLM output quality.
+`/login`: Log into a provider. Ex: `/login github-copilot`
 `/costs`: Show costs about current session.
 `/resume`: Resume a chat from previous session of this workspace folder.
+`/config`: Show ECA config for troubleshooting.
 `/doctor`: Show information about ECA, useful for troubleshooting.
 `/repo-map-show`: Show the current repoMap context of the session.
 `/prompt-show`: Show the final prompt sent to LLM with all contexts and ECA details.
diff --git a/docs/models.md b/docs/models.md
@@ -27,8 +27,10 @@ Create a configuration file at `.eca/config.json` in your project root or at `~/
 
 ```javascript
 {
-  "openaiApiKey": "your-openai-api-key-here",
-  "anthropicApiKey": "your-anthropic-api-key-here"
+  "providers": {
+      "openai": {"key": "your-openai-api-key-here"},
+      "anthropic": {"key": "your-anthropic-api-key-here"}
+  }
 }
 ```
 
@@ -42,7 +44,9 @@ You can add new models or override existing ones in your configuration:
 
 ```javascript
 {
-  "openaiApiKey": "your-openai-api-key-here",
+  "providers": {
+      "openai": {"key": "your-openai-api-key-here"}
+  },
   "models": {
     "gpt-5": {},
     "claude-3-5-sonnet-20241022": {}
@@ -56,7 +60,9 @@ You can customize model parameters like temperature, reasoning effort, etc.:
 
 ```javascript
 {
-  "openaiApiKey": "your-openai-api-key-here",
+  "providers": {
+      "openai": {"key": "your-openai-api-key-here"}
+  },
   "models": {
     "gpt-5": {
       "extraPayload": {
diff --git a/integration-test/integration/chat/ollama_test.clj b/integration-test/integration/chat/ollama_test.clj
@@ -16,7 +16,7 @@
   (is (match?
        {:models (m/embeds ["ollama/qwen3"])}
        (eca/request! (fixture/initialize-request {:initializationOptions (merge fixture/default-init-options
-                                                                                {:ollamaApiUrl (str fixture/base-llm-mock-url "/ollama")})
+                                                                                {:providers {"ollama" {:url (str fixture/base-llm-mock-url "/ollama")}}})
                                                   :capabilities {:codeAssistant {:chat {}}}}))))
   (eca/notify! (fixture/initialized-notification))
   (let [chat-id* (atom nil)]
@@ -109,7 +109,7 @@
   (is (match?
        {:models (m/embeds ["ollama/qwen3"])}
        (eca/request! (fixture/initialize-request {:initializationOptions (merge fixture/default-init-options
-                                                                                {:ollamaApiUrl (str fixture/base-llm-mock-url "/ollama")})
+                                                                                {:providers {"ollama" {:url (str fixture/base-llm-mock-url "/ollama")}}})
                                                   :capabilities {:codeAssistant {:chat {}}}}))))
   (eca/notify! (fixture/initialized-notification))
   (let [chat-id* (atom nil)]
@@ -185,7 +185,7 @@
   (is (match?
        {:models (m/embeds ["ollama/qwen3"])}
        (eca/request! (fixture/initialize-request {:initializationOptions (merge fixture/default-init-options
-                                                                                {:ollamaApiUrl (str fixture/base-llm-mock-url "/ollama")})
+                                                                                {:providers {"ollama" {:url (str fixture/base-llm-mock-url "/ollama")}}})
                                                   :capabilities {:codeAssistant {:chat {}}}}))))
   (eca/notify! (fixture/initialized-notification))
   (let [chat-id* (atom nil)]
diff --git a/integration-test/integration/fixture.clj b/integration-test/integration/fixture.clj
@@ -8,12 +8,12 @@
   (str "http://localhost:" llm-mock.server/port))
 
 (def default-init-options {:pureConfig true
-                           :openaiApiUrl (str base-llm-mock-url "/openai")
-                           :openaiApiKey "foo"
-                           :anthropicApiUrl (str base-llm-mock-url "/anthropic")
-                           :anthropicApiKey "foo"
-                           :githubCopilotApiUrl (str base-llm-mock-url "/github-copilot")
-                           :githubCopilotApiKey "foo"})
+                           :providers {"openai" {:url (str base-llm-mock-url "/openai")
+                                                 :key "foo-key"}
+                                       "anthropic" {:url (str base-llm-mock-url "/anthropic")
+                                                    :key "foo-key"}
+                                       "github-copilot" {:url (str base-llm-mock-url "/github-copilot")
+                                                         :key "foo-key"}}})
 
 (defn initialize-request
   ([]
diff --git a/src/eca/config.clj b/src/eca/config.clj
@@ -6,6 +6,7 @@
   3. local config-file: searching from a local `.eca/config.json` file.
   4. `initializatonOptions` sent in `initialize` request."
   (:require
+   [camel-snake-kebab.core :as csk]
    [cheshire.core :as json]
    [cheshire.factory :as json.factory]
    [clojure.core.memoize :as memoize]
@@ -18,12 +19,12 @@
 (set! *warn-on-reflection* true)
 
 (def initial-config
-  {:openaiApiKey nil
-   :anthropicApiKey nil
-   :openaiApiUrl nil
-   :anthropicApiUrl nil
-   :githubCopilotApiUrl nil
-   :ollamaApiUrl nil
+  {:providers {"openai" {:key nil
+                         :url "https://api.openai.com"}
+               "anthropic" {:key nil
+                            :url "https://api.anthropic.com"}
+               "github-copilot" {:url "https://api.githubcopilot.com"}
+               "ollama" {:url "http://localhost:11434"}}
    :rules []
    :commands []
    :nativeTools {:filesystem {:enabled true}
@@ -114,11 +115,16 @@
 
 (def ollama-model-prefix "ollama/")
 
+(defn ^:private normalize-fields [config]
+  (-> config
+      (update-in [:providers] update-keys #(csk/->kebab-case (string/replace-first (str %) ":" "")))))
+
 (defn all [db]
   (let [initialization-config @initialization-config*
         pure-config? (:pureConfig initialization-config)]
-    (deep-merge initial-config
-                initialization-config
-                (when-not pure-config? (config-from-envvar))
-                (when-not pure-config? (config-from-global-file))
-                (when-not pure-config? (config-from-local-file (:workspace-folders db))))))
+    (normalize-fields
+     (deep-merge initial-config
+                 initialization-config
+                 (when-not pure-config? (config-from-envvar))
+                 (when-not pure-config? (config-from-global-file))
+                 (when-not pure-config? (config-from-local-file (:workspace-folders db)))))))
diff --git a/src/eca/features/commands.clj b/src/eca/features/commands.clj
@@ -2,6 +2,7 @@
   (:require
    [babashka.fs :as fs]
    [clojure.java.io :as io]
+   [clojure.pprint :as pprint]
    [clojure.string :as string]
    [eca.config :as config]
    [eca.features.index :as f.index]
@@ -88,6 +89,10 @@
                        :type :native
                        :description "Resume the chats from this session workspaces."
                        :arguments []}
+                      {:name "config"
+                       :type :native
+                       :description "Show ECA config for troubleshooting."
+                       :arguments []}
                       {:name "doctor"
                        :type :native
                        :description "Check ECA details for troubleshooting."
@@ -173,6 +178,8 @@
                                     (str "Total cost: $" (shared/tokens->cost total-input-tokens total-input-cache-creation-tokens total-input-cache-read-tokens total-output-tokens full-model db)))]
                 {:type :chat-messages
                  :chats {chat-id [{:role "system" :content [{:type :text :text text}]}]}})
+      "config" {:type :chat-messages
+                :chats {chat-id [{:role "system" :content [{:type :text :text (with-out-str (pprint/pprint config))}]}]}}
       "doctor" {:type :chat-messages
                 :chats {chat-id [{:role "system" :content [{:type :text :text (doctor-msg db config)}]}]}}
       "repo-map-show" {:type :chat-messages
diff --git a/src/eca/llm_api.clj b/src/eca/llm_api.clj
@@ -4,7 +4,6 @@
    [clojure.string :as string]
    [eca.config :as config]
    [eca.llm-providers.anthropic :as llm-providers.anthropic]
-   [eca.llm-providers.copilot :as llm-providers.copilot]
    [eca.llm-providers.ollama :as llm-providers.ollama]
    [eca.llm-providers.openai :as llm-providers.openai]
    [eca.llm-providers.openai-chat :as llm-providers.openai-chat]
@@ -32,36 +31,20 @@
           (string/join "\n" (subvec lines start end)))
         content))))
 
-(defn ^:private anthropic-api-key [config]
-  (or (:anthropicApiKey config)
-      (config/get-env "ANTHROPIC_API_KEY")))
+(defn ^:private provider-api-key [provider config]
+  (or (get-in config [:providers (name provider) :key])
+      (config/get-env (str (-> provider
+                               (string/replace "-" "_")
+                               string/upper-case) "_API_KEY"))))
 
-(defn ^:private anthropic-api-url [config]
-  (or (:anthropicApiUrl config)
-      (config/get-env "ANTHROPIC_API_URL")
-      llm-providers.anthropic/base-url))
-
-(defn ^:private openai-api-key [config]
-  (or (:openaiApiKey config)
-      (config/get-env "OPENAI_API_KEY")))
-
-(defn ^:private openai-api-url [config]
-  (or (:openaiApiUrl config)
-      (config/get-env "OPENAI_API_URL")
-      llm-providers.openai/base-url))
-
-(defn ^:private github-copilot-api-url [config]
-  (or (:githubCopilotApiUrl config)
-      (config/get-env "GITHUB_COPILOT_API_URL")
-      llm-providers.copilot/base-api-url))
-
-(defn ^:private ollama-api-url [config]
-  (or (:ollamaApiUrl config)
-      (config/get-env "OLLAMA_API_URL")
-      llm-providers.ollama/base-url))
+(defn ^:private provider-api-url [provider config]
+  (or (get-in config [:providers (name provider) :url])
+      (config/get-env (str (-> provider
+                               (string/replace "-" "_")
+                               string/upper-case) "_API_URL"))))
 
 (defn extra-models [config]
-  (let [ollama-api-url (ollama-api-url config)]
+  (let [ollama-api-url (provider-api-url "ollama" config)]
     (mapv
      (fn [{:keys [model] :as ollama-model}]
        (let [capabilities (llm-providers.ollama/model-capabilities {:api-url ollama-api-url :model model})]
@@ -86,9 +69,9 @@
                                                                       model))
                                                                   (:models db)))]
               [:custom-provider-default-model custom-provider-default-model])
-            (when (anthropic-api-key config)
+            (when (provider-api-key "anthropic" config)
               [:api-key-found "anthropic/claude-sonnet-4-20250514"])
-            (when (openai-api-key config)
+            (when (provider-api-key "openai" config)
               [:api-key-found "openai/gpt-5"])
             (when (get-in db [:auth "github-copilot" :api-key])
               [:api-key-found "github-copilot/gpt-4.1"])
@@ -133,6 +116,8 @@
                                      (map #(str (name k) "/" %) (:models v)))
                                    custom-providers))
         extra-payload (get-in config [:models (keyword model) :extraPayload])
+        provider-api-key (provider-api-key provider config)
+        provider-api-url (provider-api-url provider config)
         callbacks {:on-message-received on-message-received-wrapper
                    :on-error on-error-wrapper
                    :on-prepare-tool-call on-prepare-tool-call-wrapper
@@ -152,8 +137,8 @@
           :tools tools
           :web-search web-search
           :extra-payload extra-payload
-          :api-url (openai-api-url config)
-          :api-key (openai-api-key config)}
+          :api-url provider-api-url
+          :api-key provider-api-key}
          callbacks)
 
         (= "anthropic" provider)
@@ -167,8 +152,8 @@
           :tools tools
           :web-search web-search
           :extra-payload extra-payload
-          :api-url (anthropic-api-url config)
-          :api-key (anthropic-api-key config)}
+          :api-url provider-api-url
+          :api-key provider-api-key}
          callbacks)
 
         (= "github-copilot" provider)
@@ -181,7 +166,7 @@
           :past-messages past-messages
           :tools tools
           :extra-payload extra-payload
-          :api-url (github-copilot-api-url config)
+          :api-url provider-api-url
           :api-key (:api-token provider-auth)
           :extra-headers {"openai-intent" "conversation-panel"
                           "x-request-id" (str (random-uuid))
@@ -192,7 +177,7 @@
 
         (= "ollama" provider)
         (llm-providers.ollama/completion!
-         {:api-url (ollama-api-url config)
+         {:api-url provider-api-url
           :reason? (:reason? model-config)
           :model model
           :instructions instructions
diff --git a/src/eca/llm_providers/anthropic.clj b/src/eca/llm_providers/anthropic.clj
@@ -14,8 +14,6 @@
 
 (def ^:private messages-path "/v1/messages")
 
-(def base-url "https://api.anthropic.com")
-
 (defn ^:private ->tools [tools web-search]
   (cond->
    (mapv (fn [tool]
diff --git a/src/eca/llm_providers/copilot.clj b/src/eca/llm_providers/copilot.clj
@@ -4,8 +4,6 @@
    [eca.config :as config]
    [hato.client :as http]))
 
-(def base-api-url "https://api.githubcopilot.com")
-
 (def ^:private client-id "Iv1.b507a08c87ecfe98")
 
 (defn ^:private auth-headers []
diff --git a/src/eca/llm_providers/ollama.clj b/src/eca/llm_providers/ollama.clj
@@ -14,8 +14,6 @@
 (def ^:private list-models-url "%s/api/tags")
 (def ^:private show-model-url "%s/api/show")
 
-(def base-url "http://localhost:11434")
-
 (defn list-models [{:keys [api-url]}]
   (try
     (let [rid (llm-util/gen-rid)
diff --git a/src/eca/llm_providers/openai.clj b/src/eca/llm_providers/openai.clj
@@ -13,8 +13,6 @@
 
 (def ^:private responses-path "/v1/responses")
 
-(def base-url "https://api.openai.com")
-
 (defn ^:private base-completion-request! [{:keys [rid body api-url url-relative-path api-key on-error on-response]}]
   (let [url (str api-url (or url-relative-path responses-path))]
     (llm-util/log-request logger-tag rid url body)
diff --git a/test/eca/llm_api_test.clj b/test/eca/llm_api_test.clj
@@ -25,7 +25,7 @@
   (testing "Anthropic API key present in config"
     (with-redefs [config/get-env (constantly nil)]
       (let [db {:models {}}
-            config {:anthropicApiKey "something"}]
+            config {:providers {"anthropic" {:key "something"}}}]
         (is (= "anthropic/claude-sonnet-4-20250514" (llm-api/default-model db config))))))
 
   (testing "Anthropic API key present in ENV"
@@ -37,7 +37,7 @@
   (testing "OpenAI API key present in config"
     (with-redefs [config/get-env (constantly nil)]
       (let [db {:models {}}
-            config {:openaiApiKey "yes!"}]
+            config {:providers {"openai" {:key "yes!"}}}]
         (is (= "openai/gpt-5" (llm-api/default-model db config))))))
 
   (testing "OpenAI API key present in ENV"

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,10 @@ To use ECA, you need to configure at least one model with your API key. See the`
`70`	`70`
`71`	`71`	```json
`72`	`72`	`{`
`73`		`- "openaiApiKey": "your-openai-api-key-here",`
`74`		`- "anthropicApiKey": "your-anthropic-api-key-here"`
	`73`	`+ "providers": {`
	`74`	`+ "openai": {"key": "your-openai-api-key-here"},`
	`75`	`+ "anthropic": {"key": "your-anthropic-api-key-here"}`
	`76`	`+ }`
`75`	`77`	`}`
`76`	`78`	```
`77`	`79`