Merge branch 'master' into improve-approval

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix command prompts to allow args with spaces between quotes.
+- Fix anthropic token renew when expires.
 - Considerably improve toolCall approval / permissions config.
   - Now with thave multiple optiosn to ask or allow tool calls, check config section.
 

docs/models.md

@@ -230,3 +230,27 @@ Only set this when your provider uses a different path or expects query paramete
     }
     ```
 
+=== "Same model with different settings"
+
+   For now, you can create different providers with same model names to achieve that:
+   
+   ```javascript
+   {
+    "providers": {
+      "openai": {
+        "api": "openai-responses",
+        "models": { "gpt-5": {} }
+      },
+      "openai-high": {
+        "api": "openai-responses",
+        "url": "https://api.openai.com",
+        "keyEnv": "OPENAI_API_KEY",
+        "models": {
+          "gpt-5": {
+            "extraPayload": { "reasoning": { "effort": "high" } }
+          }
+        }
+      }
+    }
+   }
+   ```

src/eca/features/chat.clj

@@ -76,27 +76,29 @@
                   :message-cost (shared/tokens->cost input-tokens input-cache-creation-tokens input-cache-read-tokens output-tokens full-model db)
                   :session-cost (shared/tokens->cost total-input-tokens total-input-cache-creation-tokens total-input-cache-read-tokens total-output-tokens full-model db)))))
 
-(defn ^:private message->decision [message]
-  (let [slash? (string/starts-with? message "/")
-        mcp-prompt? (string/includes? (first (string/split message #" ")) ":")]
-    (cond
-      (and slash? mcp-prompt?)
-      (let [command (subs message 1)
-            parts (string/split command #" ")
-            [server] (string/split command #":")]
-        {:type :mcp-prompt
-         :server server
-         :prompt (second (string/split (first parts) #":"))
-         :args (vec (rest parts))})
+(defn ^:private tokenize-args [^String s]
+  (if (string/blank? s)
+    []
+    (->> (re-seq #"\s*\"([^\"]*)\"|\s*([^\s]+)" s)
+         (map (fn [[_ quoted unquoted]] (or quoted unquoted)))
+         (vec))))
 
-      slash?
+(defn ^:private message->decision [message]
+  (let [slash? (string/starts-with? message "/")]
+    (if slash?
       (let [command (subs message 1)
-            parts (string/split command #" ")]
-        {:type :eca-command
-         :command (first parts)
-         :args (vec (rest parts))})
-
-      :else
+            tokens (let [toks (tokenize-args command)] (if (seq toks) toks [""]))
+            first-token (first tokens)
+            args (vec (rest tokens))]
+        (if (and first-token (string/includes? first-token ":"))
+          (let [[server prompt] (string/split first-token #":" 2)]
+            {:type :mcp-prompt
+             :server server
+             :prompt prompt
+             :args args})
+          {:type :eca-command
+           :command first-token
+           :args args}))
       {:type :prompt-message
        :message message})))
 
@@ -230,15 +232,15 @@
                                                                                                              :origin origin)})
                                                   (send-content! chat-ctx :assistant
                                                                  (assoc-some
-                                                                   {:type :toolCalled
-                                                                    :origin origin
-                                                                    :name name
-                                                                    :arguments arguments
-                                                                    :error (:error result)
-                                                                    :id id
-                                                                    :outputs (:contents result)}
-                                                                   :details details
-                                                                   :summary summary))))
+                                                                  {:type :toolCalled
+                                                                   :origin origin
+                                                                   :name name
+                                                                   :arguments arguments
+                                                                   :error (:error result)
+                                                                   :id id
+                                                                   :outputs (:contents result)}
+                                                                  :details details
+                                                                  :summary summary))))
                                               (do
                                                 (add-to-history! {:role "tool_call" :content tool-call})
                                                 (add-to-history! {:role "tool_call_output"

src/eca/llm_providers/anthropic.clj

@@ -251,6 +251,7 @@
                                url
                                {:headers {"Content-Type" "application/json"}
                                 :body (json/generate-string body)
+                                :throw-exceptions? false
                                 :as :json})]
     (if (= 200 status)
       {:refresh-token (:refresh_token body)
@@ -341,8 +342,8 @@
     (send-msg! (format "Invalid API key '%s'" input))))
 
 (defmethod f.login/login-step ["anthropic" :login/renew-token] [{:keys [db* provider]}]
-  (let [{:keys [access-token refresh-token expires-at]} (get-in @db* [:auth provider])
-        {:keys []} (oauth-refresh refresh-token)]
+  (let [{:keys [refresh-token]} (get-in @db* [:auth provider])
+        {:keys [refresh-token access-token expires-at]} (oauth-refresh refresh-token)]
     (swap! db* update-in [:auth provider] merge {:step :login/done
                                                  :type :auth/oauth
                                                  :refresh-token refresh-token

test/eca/features/chat_test.clj

@@ -268,3 +268,36 @@
         (is (match?
              @invoked?
              [[{:role :user :content "test"}] test-chat-ctx]))))))
+
+(deftest message->decision-test
+  (testing "plain prompt message"
+    (is (= {:type :prompt-message
+            :message "Hello world"}
+           (#'f.chat/message->decision "Hello world"))))
+  (testing "ECA command without args"
+    (is (= {:type :eca-command
+            :command "help"
+            :args []}
+           (#'f.chat/message->decision "/help"))))
+  (testing "ECA command with args"
+    (is (= {:type :eca-command
+            :command "search"
+            :args ["foo" "bar"]}
+           (#'f.chat/message->decision "/search foo bar"))))
+  (testing "ECA command with args with spaces in quotes"
+    (is (= {:type :eca-command
+            :command "search"
+            :args ["foo bar" "baz" "qux bla blow"]}
+           (#'f.chat/message->decision "/search \"foo bar\" baz \"qux bla blow\""))))
+  (testing "MCP prompt without args"
+    (is (= {:type :mcp-prompt
+            :server "server"
+            :prompt "prompt"
+            :args []}
+           (#'f.chat/message->decision "/server:prompt"))))
+  (testing "MCP prompt with args"
+    (is (= {:type :mcp-prompt
+            :server "server"
+            :prompt "prompt"
+            :args ["arg1" "arg2"]}
+           (#'f.chat/message->decision "/server:prompt arg1 arg2")))))