Refactor config.clj

Author: ericdallo

src/eca/config.clj

@@ -184,13 +184,14 @@
   "walk through config parsing dynamic string contents if value is a string."
   [config cwd]
   (walk/postwalk
-    (fn [x]
-      (if (string? x)
-        (parse-dynamic-string x cwd config)
-        x))
-    config))
+   (fn [x]
+     (if (string? x)
+       (parse-dynamic-string x cwd config)
+       x))
+   config))
 
-(def initial-config (memoize #(parse-dynamic-string-values initial-config* nil)))
+(defn initial-config []
+  (parse-dynamic-string-values initial-config* (io/file ".")))
 
 (def ^:private fallback-behavior "agent")
 
@@ -216,13 +217,11 @@
       (alter-var-root config-dyn-var (constantly true))
       (logger/warn logger-tag "Error parsing config json:" (.getMessage e)))))
 
-(defn ^:private config-from-envvar* []
+(defn ^:private config-from-envvar []
   (some-> (System/getenv "ECA_CONFIG")
           (safe-read-json-string (var *env-var-config-error*))
           (parse-dynamic-string-values (io/file "."))))
 
-(def ^:private config-from-envvar (memoize config-from-envvar*))
-
 (defn ^:private config-from-custom* []
   (when-some [path @custom-config-file-path*]
     (let [config-file (io/file path)]
@@ -240,15 +239,13 @@
 (defn global-config-file ^File []
   (io/file (global-config-dir) "config.json"))
 
-(defn ^:private config-from-global-file* []
+(defn ^:private config-from-global-file []
   (let [config-file (global-config-file)]
     (when (.exists config-file)
       (some-> (safe-read-json-string (slurp config-file) (var *global-config-error*))
               (parse-dynamic-string-values (global-config-dir))))))
 
-(def ^:private config-from-global-file (memoize/ttl config-from-global-file* :ttl/threshold ttl-cache-config-ms))
-
-(defn ^:private config-from-local-file* [roots]
+(defn ^:private config-from-local-file [roots]
   (reduce
    (fn [final-config {:keys [uri]}]
      (merge
@@ -261,8 +258,6 @@
    {}
    roots))
 
-(def ^:private config-from-local-file (memoize/ttl config-from-local-file* :ttl/threshold ttl-cache-config-ms))
-
 (def initialization-config* (atom {}))
 
 (defn ^:private deep-merge [& maps]
@@ -324,7 +319,7 @@
                           :else m*))]
     (normalize-map [] m)))
 
-(def ^:private eca-config-normalization-rules
+(def ^:private normalization-rules
   {:kebab-case
    [[:providers]]
    :stringfy
@@ -349,22 +344,23 @@
     [:behavior :ANY :toolCall :approval :deny :ANY :argsMatchers]
     [:otlp]]})
 
-(defn ^:private config-from-custom-or-default-location [pure-config? db]
-  (if-some [config-from-custom (config-from-custom)]
-    (when-not pure-config? config-from-custom)
-    (deep-merge
-     (when-not pure-config? (config-from-global-file))
-     (when-not pure-config? (config-from-local-file (:workspace-folders db))))))
-
-(defn all [db]
+(defn ^:private all* [db]
   (let [initialization-config @initialization-config*
-        pure-config? (:pureConfig initialization-config)]
-    (deep-merge (initial-config)
-                (normalize-fields
-                 eca-config-normalization-rules
-                 (deep-merge initialization-config
-                             (when-not pure-config? (config-from-envvar))
-                             (config-from-custom-or-default-location pure-config? db))))))
+        pure-config? (:pureConfig initialization-config)
+        merge-config (fn [c1 c2]
+                       (deep-merge c1 (normalize-fields normalization-rules c2)))]
+    (as-> {} $
+      (merge-config $ (initial-config))
+      (merge-config $ initialization-config)
+      (merge-config $ (when-not pure-config?
+                        (config-from-envvar)))
+      (if-let [custom-config (config-from-custom)]
+        (merge-config $ (when-not pure-config? custom-config))
+        (-> $
+            (merge-config (when-not pure-config? (config-from-global-file)))
+            (merge-config (when-not pure-config? (config-from-local-file (:workspace-folders db)))))))))
+
+(def all (memoize/ttl all* :ttl/threshold ttl-cache-config-ms))
 
 (defn validation-error []
   (cond
@@ -440,9 +436,9 @@
 
 (defn update-global-config! [config]
   (let [global-config-file (global-config-file)
-        current-config (normalize-fields eca-config-normalization-rules (config-from-global-file))
+        current-config (normalize-fields normalization-rules (config-from-global-file))
         new-config (deep-merge current-config
-                               (normalize-fields eca-config-normalization-rules config))
+                               (normalize-fields normalization-rules config))
         new-config-json (json/generate-string new-config {:pretty true})]
     (io/make-parents global-config-file)
     (spit global-config-file new-config-json)))

test/eca/config_test.clj

@@ -18,15 +18,15 @@
          {:pureConfig true
           :providers {"github-copilot" {:key nil
                                         :models {"gpt-5" {}}}}}
-         (config/all {}))))
+         (#'config/all* {}))))
   (testing "deep merging initializationOptions with initial config"
     (reset! config/initialization-config* {:pureConfig true
                                            :providers {"githubCopilot" {:key "123"}}})
     (is (match?
          {:pureConfig true
           :providers {"github-copilot" {:key "123"
                                         :models {"gpt-5" {}}}}}
-         (config/all {}))))
+         (#'config/all* {}))))
   (testing "providers and models are updated correctly"
     (reset! config/initialization-config* {:pureConfig true
                                            :providers {"customProvider" {:key "123"
@@ -37,7 +37,7 @@
           :providers {"custom-provider" {:key "123"
                                          :models {"gpt-5" {}}}
                       "openrouter" {:models {"openai/o4-mini" {}}}}}
-         (config/all {})))))
+         (#'config/all* {})))))
 
 (deftest deep-merge-test
   (testing "basic merge"

test/eca/handlers_test.clj

@@ -28,7 +28,7 @@
                                             :models {"gpt-5" {:a 1}
                                                      "gpt-5-mini" {}}
                                             :url string?}}}
-             (config/all @db*)))))))
+             (#'config/all* @db*)))))))
 
 (deftest chat-selected-behavior-changed-test
   (testing "Switching to behavior with defaultModel updates model"

test/eca/test_helper.clj

@@ -40,7 +40,7 @@
   {:db* (atom db/initial-db)
    :messenger (->TestMessenger (atom {}) (atom []))
    :metrics (metrics/->NoopMetrics)
-   :config (config/initial-config)})
+   :config config/initial-config})
 
 (def components* (atom (make-components)))
 (defn components [] @components*)