Bump langchain4j to 1.12.2 and add new model configurations

- Update langchain4j deps from 1.8.0 to 1.12.2
- Add Anthropic models: claude-opus-4-6, claude-sonnet-4-6, claude-haiku-4-5
- Add OpenAI models: gpt-5-pro, gpt-5-codex, gpt-5.1 variants, gpt-5.2,
  gpt-5.4, o1-pro, and codex variants
- Add model alias resolution for short names (sonnet, opus, haiku, flash,
  codex, etc.) usable from CLI and config
- Replace removed CLAUDE_3_5_HAIKU_20241022 enum with CLAUDE_HAIKU_4_5_20251001
- Update tests and documentation for 44 total built-in models

Author: Bruce Hauman

deps.edn

@@ -25,10 +25,10 @@
         org.apache.tika/tika-core {:mvn/version "3.2.0"}
         io.modelcontextprotocol.sdk/mcp {:mvn/version "0.17.2"}
 
-        dev.langchain4j/langchain4j {:mvn/version "1.8.0"}
-        dev.langchain4j/langchain4j-open-ai {:mvn/version "1.8.0"}
-        dev.langchain4j/langchain4j-anthropic {:mvn/version "1.8.0"}
-        dev.langchain4j/langchain4j-google-ai-gemini {:mvn/version "1.8.0"}
+        dev.langchain4j/langchain4j {:mvn/version "1.12.2"}
+        dev.langchain4j/langchain4j-open-ai {:mvn/version "1.12.2"}
+        dev.langchain4j/langchain4j-anthropic {:mvn/version "1.12.2"}
+        dev.langchain4j/langchain4j-google-ai-gemini {:mvn/version "1.12.2"}
 
         com.taoensso/timbre {:mvn/version "6.8.0"}
 

doc/model-configuration.md

@@ -230,14 +230,16 @@ If a model key is not found in your custom configuration, the system automatical
 
 ## Built-in Models
 
-The system includes 21 pre-configured models that can be used without configuration:
+The system includes 44 pre-configured models that can be used without configuration:
 
 ### OpenAI
 - `:openai/gpt-4o`
-- `:openai/gpt-4-1`
-- `:openai/gpt-4-1-mini`
-- `:openai/gpt-4-1-nano`
-- `:openai/o1`, `:openai/o1-mini`
+- `:openai/gpt-4-1`, `:openai/gpt-4-1-mini`, `:openai/gpt-4-1-nano`
+- `:openai/gpt-5`, `:openai/gpt-5-mini`, `:openai/gpt-5-nano`, `:openai/gpt-5-pro`, `:openai/gpt-5-codex`
+- `:openai/gpt-5-1`, `:openai/gpt-5-1-codex`, `:openai/gpt-5-1-codex-max`, `:openai/gpt-5-1-codex-mini`
+- `:openai/gpt-5-2`, `:openai/gpt-5-2-pro`, `:openai/gpt-5-2-codex`
+- `:openai/gpt-5-4`, `:openai/gpt-5-4-pro`
+- `:openai/o1`, `:openai/o1-mini`, `:openai/o1-pro`
 - `:openai/o3`, `:openai/o3-mini`, `:openai/o3-pro`
 - `:openai/o4-mini`, `:openai/o4-mini-reasoning`
 
@@ -249,11 +251,13 @@ The system includes 21 pre-configured models that can be used without configurat
 - `:google/gemini-2-5-pro-reasoning`
 
 ### Anthropic
-- `:anthropic/claude-opus-4`
-- `:anthropic/claude-opus-4-reasoning`
-- `:anthropic/claude-3-5-haiku`
-- `:anthropic/claude-sonnet-4`
-- `:anthropic/claude-sonnet-4-reasoning`
+- `:anthropic/claude-opus-4-6`, `:anthropic/claude-opus-4-6-reasoning`
+- `:anthropic/claude-sonnet-4-6`, `:anthropic/claude-sonnet-4-6-reasoning`
+- `:anthropic/claude-opus-4-1`, `:anthropic/claude-opus-4-1-reasoning`
+- `:anthropic/claude-opus-4`, `:anthropic/claude-opus-4-reasoning`
+- `:anthropic/claude-sonnet-4-5`, `:anthropic/claude-sonnet-4-5-reasoning`
+- `:anthropic/claude-sonnet-4`, `:anthropic/claude-sonnet-4-reasoning`
+- `:anthropic/claude-haiku-4-5`
 
 ## API Keys
 

src/clojure_mcp/agent/langchain/model.clj

@@ -55,17 +55,72 @@
 
    :openai/gpt-5
    (merge model-base
-          {:model-name "gpt-5-2025-08-07"
+          {:model-name "gpt-5"
            :thinking {:effort :medium}})
 
    :openai/gpt-5-mini
    (merge model-base
-          {:model-name "gpt-5-mini-2025-08-07"
+          {:model-name "gpt-5-mini"
            :thinking {:effort :medium}})
 
    :openai/gpt-5-nano
    (merge model-base
-          {:model-name "gpt-5-nano-2025-08-07"
+          {:model-name "gpt-5-nano"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-pro
+   (merge model-base
+          {:model-name "gpt-5-pro"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-codex
+   (merge model-base
+          {:model-name "gpt-5-codex"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-1
+   (merge model-base
+          {:model-name "gpt-5.1"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-1-codex
+   (merge model-base
+          {:model-name "gpt-5.1-codex"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-1-codex-max
+   (merge model-base
+          {:model-name "gpt-5.1-codex-max"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-1-codex-mini
+   (merge model-base
+          {:model-name "gpt-5.1-codex-mini"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-2
+   (merge model-base
+          {:model-name "gpt-5.2"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-2-pro
+   (merge model-base
+          {:model-name "gpt-5.2-pro"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-2-codex
+   (merge model-base
+          {:model-name "gpt-5.2-codex"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-4
+   (merge model-base
+          {:model-name "gpt-5.4"
+           :thinking {:effort :medium}})
+
+   :openai/gpt-5-4-pro
+   (merge model-base
+          {:model-name "gpt-5.4-pro"
            :thinking {:effort :medium}})
 
    :openai/o1
@@ -78,6 +133,11 @@
           {:model-name "o1-mini"
            :thinking {:effort :medium}})
 
+   :openai/o1-pro
+   (merge reasoning-model-base
+          {:model-name "o1-pro"
+           :thinking {:effort :medium}})
+
    :openai/o3
    (merge reasoning-model-base
           {:model-name "o3"
@@ -90,7 +150,7 @@
 
    :openai/o3-pro
    (merge reasoning-model-base
-          {:model-name "o3-pro-2025-06-10"
+          {:model-name "o3-pro"
            :thinking {:effort :medium}})
 
    :openai/o4-mini
@@ -146,10 +206,30 @@
            :thinking (merge thinking-base
                             {:budget-tokens 4096})})
 
-   :anthropic/claude-3-5-haiku
+   :anthropic/claude-opus-4-6
+   (merge model-base
+          {:model-name AnthropicChatModelName/CLAUDE_OPUS_4_6})
+
+   :anthropic/claude-opus-4-6-reasoning
+   (merge reasoning-model-base
+          {:model-name AnthropicChatModelName/CLAUDE_OPUS_4_6
+           :thinking (merge thinking-base
+                            {:budget-tokens 4096})})
+
+   :anthropic/claude-sonnet-4-6
+   (merge model-base
+          {:model-name AnthropicChatModelName/CLAUDE_SONNET_4_6})
+
+   :anthropic/claude-sonnet-4-6-reasoning
+   (merge reasoning-model-base
+          {:model-name AnthropicChatModelName/CLAUDE_SONNET_4_6
+           :thinking (merge thinking-base
+                            {:budget-tokens 4096})})
+
+   :anthropic/claude-haiku-4-5
    (merge model-base
-          {:model-name AnthropicChatModelName/CLAUDE_3_5_HAIKU_20241022
-           :max-tokens 2048}) ; Haiku has lower default max tokens
+          {:model-name AnthropicChatModelName/CLAUDE_HAIKU_4_5_20251001
+           :max-tokens 2048})
 
    :anthropic/claude-sonnet-4
    (merge model-base
@@ -171,6 +251,51 @@
            :thinking (merge thinking-base
                             {:budget-tokens 4096})})})
 
+(def model-aliases
+  "Short aliases for commonly used models. Aliases are unnamespaced keywords
+   that resolve to full model keys."
+  {;; Anthropic aliases
+   :sonnet    :anthropic/claude-sonnet-4-6
+   :opus      :anthropic/claude-opus-4-6
+   :haiku     :anthropic/claude-haiku-4-5
+   :sonnet-4-6 :anthropic/claude-sonnet-4-6
+   :opus-4-6  :anthropic/claude-opus-4-6
+   :sonnet-4-5 :anthropic/claude-sonnet-4-5
+   :opus-4-1  :anthropic/claude-opus-4-1
+   :opus-4    :anthropic/claude-opus-4
+   :sonnet-4  :anthropic/claude-sonnet-4
+   ;; Anthropic reasoning aliases
+   :sonnet-reasoning  :anthropic/claude-sonnet-4-6-reasoning
+   :opus-reasoning    :anthropic/claude-opus-4-6-reasoning
+   ;; Google aliases
+   :flash     :google/gemini-2-5-flash
+   :flash-lite :google/gemini-2-5-flash-lite
+   :gemini-pro :google/gemini-2-5-pro
+   :flash-reasoning  :google/gemini-2-5-flash-reasoning
+   :gemini-pro-reasoning :google/gemini-2-5-pro-reasoning
+   ;; OpenAI aliases
+   :gpt-5-4   :openai/gpt-5-4
+   :gpt-5-4-pro :openai/gpt-5-4-pro
+   :gpt-5-2   :openai/gpt-5-2
+   :gpt-5-1   :openai/gpt-5-1
+   :gpt-5     :openai/gpt-5
+   :o4-mini   :openai/o4-mini
+   :o3        :openai/o3
+   :o3-pro    :openai/o3-pro
+   ;; Codex aliases
+   :codex     :openai/gpt-5-4-pro
+   :gpt-5-1-codex :openai/gpt-5-1-codex
+   :gpt-5-1-codex-max :openai/gpt-5-1-codex-max
+   :gpt-5-2-codex :openai/gpt-5-2-codex})
+
+(defn resolve-model-alias
+  "Resolves a model key, checking aliases for unnamespaced keywords.
+   Returns the resolved key (which may be the same as the input)."
+  [model-key]
+  (if (and (keyword? model-key) (nil? (namespace model-key)))
+    (get model-aliases model-key model-key)
+    model-key))
+
 (defn get-provider [model-key]
   (-> model-key namespace keyword))
 
@@ -405,7 +530,8 @@
   ([model-key config-overrides]
    (create-model-builder model-key config-overrides {:validate? true}))
   ([model-key config-overrides {:keys [validate?] :or {validate? true}}]
-   (let [;; Resolve env refs in config overrides
+   (let [model-key (resolve-model-alias model-key)
+         ;; Resolve env refs in config overrides
          resolved-overrides (resolve-env-refs config-overrides)
          base-config (merge-with-defaults model-key resolved-overrides)
          config (-> base-config
@@ -499,7 +625,8 @@
   ([nrepl-client-map model-key config-overrides]
    (create-model-builder-from-config nrepl-client-map model-key config-overrides {:validate? true}))
   ([nrepl-client-map model-key config-overrides {:keys [validate?] :or {validate? true} :as _options}]
-   (let [user-models (config/get-models nrepl-client-map)
+   (let [model-key (resolve-model-alias model-key)
+         user-models (config/get-models nrepl-client-map)
          ;; Look in user config first, then defaults
          base-config (or (get user-models model-key)
                          (get default-configs model-key))

test/clojure_mcp/agent/langchain/model_test.clj

@@ -20,8 +20,23 @@
       (is (contains? (set models) :openai/gpt-4-1))
       (is (contains? (set models) :openai/gpt-4-1-mini))
       (is (contains? (set models) :openai/gpt-4-1-nano))
+      (is (contains? (set models) :openai/gpt-5))
+      (is (contains? (set models) :openai/gpt-5-mini))
+      (is (contains? (set models) :openai/gpt-5-nano))
+      (is (contains? (set models) :openai/gpt-5-pro))
+      (is (contains? (set models) :openai/gpt-5-codex))
+      (is (contains? (set models) :openai/gpt-5-1))
+      (is (contains? (set models) :openai/gpt-5-1-codex))
+      (is (contains? (set models) :openai/gpt-5-1-codex-max))
+      (is (contains? (set models) :openai/gpt-5-1-codex-mini))
+      (is (contains? (set models) :openai/gpt-5-2))
+      (is (contains? (set models) :openai/gpt-5-2-pro))
+      (is (contains? (set models) :openai/gpt-5-2-codex))
+      (is (contains? (set models) :openai/gpt-5-4))
+      (is (contains? (set models) :openai/gpt-5-4-pro))
       (is (contains? (set models) :openai/o1))
       (is (contains? (set models) :openai/o1-mini))
+      (is (contains? (set models) :openai/o1-pro))
       (is (contains? (set models) :openai/o3))
       (is (contains? (set models) :openai/o3-mini))
       (is (contains? (set models) :openai/o3-pro))
@@ -36,10 +51,18 @@
       ;; Anthropic models
       (is (contains? (set models) :anthropic/claude-opus-4))
       (is (contains? (set models) :anthropic/claude-opus-4-reasoning))
-      (is (contains? (set models) :anthropic/claude-3-5-haiku))
+      (is (contains? (set models) :anthropic/claude-opus-4-1))
+      (is (contains? (set models) :anthropic/claude-opus-4-1-reasoning))
+      (is (contains? (set models) :anthropic/claude-opus-4-6))
+      (is (contains? (set models) :anthropic/claude-opus-4-6-reasoning))
       (is (contains? (set models) :anthropic/claude-sonnet-4))
       (is (contains? (set models) :anthropic/claude-sonnet-4-reasoning))
-      (is (= 28 (count models))))))
+      (is (contains? (set models) :anthropic/claude-sonnet-4-5))
+      (is (contains? (set models) :anthropic/claude-sonnet-4-5-reasoning))
+      (is (contains? (set models) :anthropic/claude-sonnet-4-6))
+      (is (contains? (set models) :anthropic/claude-sonnet-4-6-reasoning))
+      (is (contains? (set models) :anthropic/claude-haiku-4-5))
+      (is (= 44 (count models))))))
 
 (deftest test-get-provider
   (testing "Provider extraction from model keys"
@@ -96,7 +119,7 @@
 
   (testing "New Anthropic models"
     (let [opus (model/create-model-builder :anthropic/claude-opus-4 {})
-          haiku (model/create-model-builder :anthropic/claude-3-5-haiku {})]
+          haiku (model/create-model-builder :anthropic/claude-haiku-4-5 {})]
       (is (instance? AnthropicChatModel$AnthropicChatModelBuilder opus))
       (is (instance? AnthropicChatModel$AnthropicChatModelBuilder haiku))))
 
@@ -107,7 +130,7 @@
       (is (= :medium (get-in o3-pro-config [:thinking :effort])))))
 
   (testing "Haiku has lower max tokens"
-    (let [haiku-config (model/merge-with-defaults :anthropic/claude-3-5-haiku {})]
+    (let [haiku-config (model/merge-with-defaults :anthropic/claude-haiku-4-5 {})]
       (is (= 2048 (:max-tokens haiku-config)))))
 
   (testing "Opus reasoning has budget tokens configured"