Merge branch 'master' into improve-approval

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 0.39.0
+
+- Fix session-tokens in usage notifications.
+- Support context limit on usage notifications.
+- Fix session/message tokens calculation.
+
+## 0.38.3
+
+- Fix anthropic token renew.
+
+## 0.38.2
+
 - Fix command prompts to allow args with spaces between quotes.
 - Fix anthropic token renew when expires.
 - Considerably improve toolCall approval / permissions config.

docs/models.md

@@ -232,25 +232,25 @@ 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:
+    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" } }
-          }
-        }
-      }
+    ```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" } }
+           }
+         }
+       }
+     }
     }
-   }
-   ```
+    ```

docs/protocol.md

@@ -543,6 +543,20 @@ interface UsageContent {
      * The cost of the whole chat session so far.
      */
     sessionCost?: string;
+    
+    /**
+     * Informations about limits.
+     */
+    limit: {
+        /**
+         * The context limit for this chat.
+         */
+        context: number;
+        /**
+         * The output limit for this chat.
+         */
+        output: number;
+    }
 }
 
 /**

resources/ECA_VERSION

@@ -1 +1 @@
-0.38.1
+0.39.0

src/eca/features/chat.clj

@@ -68,13 +68,15 @@
           total-input-tokens (get-in db [:chats chat-id :total-input-tokens] 0)
           total-input-cache-creation-tokens (get-in db [:chats chat-id :total-input-cache-creation-tokens] nil)
           total-input-cache-read-tokens (get-in db [:chats chat-id :total-input-cache-read-tokens] nil)
-          total-input-cache-tokens (or total-input-cache-creation-tokens 0)
-          total-output-tokens (get-in db [:chats chat-id :total-output-tokens] 0)]
+          total-input-cache-tokens (or total-input-cache-read-tokens 0)
+          total-output-tokens (get-in db [:chats chat-id :total-output-tokens] 0)
+          model-capabilities (get-in db [:models full-model])]
       (assoc-some {:message-output-tokens output-tokens
                    :message-input-tokens (+ input-tokens message-input-cache-tokens)
                    :session-tokens (+ total-input-tokens total-input-cache-tokens total-output-tokens)}
-                  :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)))))
+                  :limit (:limit model-capabilities)
+                  :message-cost (shared/tokens->cost input-tokens input-cache-creation-tokens input-cache-read-tokens output-tokens model-capabilities)
+                  :session-cost (shared/tokens->cost total-input-tokens total-input-cache-creation-tokens total-input-cache-read-tokens total-output-tokens model-capabilities)))))
 
 (defn ^:private tokenize-args [^String s]
   (if (string/blank? s)

src/eca/features/commands.clj

@@ -183,13 +183,14 @@
                     total-input-cache-creation-tokens (get-in db [:chats chat-id :total-input-cache-creation-tokens] nil)
                     total-input-cache-read-tokens (get-in db [:chats chat-id :total-input-cache-read-tokens] nil)
                     total-output-tokens (get-in db [:chats chat-id :total-output-tokens] 0)
+                    model-capabilities (get-in db [:models full-model])
                     text (multi-str (str "Total input tokens: " total-input-tokens)
                                     (when total-input-cache-creation-tokens
                                       (str "Total input cache creation tokens: " total-input-cache-creation-tokens))
                                     (when total-input-cache-read-tokens
                                       (str "Total input cache read tokens: " total-input-cache-read-tokens))
                                     (str "Total output tokens: " total-output-tokens)
-                                    (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)))]
+                                    (str "Total cost: $" (shared/tokens->cost total-input-tokens total-input-cache-creation-tokens total-input-cache-read-tokens total-output-tokens model-capabilities)))]
                 {:type :chat-messages
                  :chats {chat-id [{:role "system" :content [{:type :text :text text}]}]}})
       "config" {:type :chat-messages

src/eca/features/login.clj

@@ -54,4 +54,5 @@
   (login-step
    {:provider provider
     :step :login/renew-token
-    :db* db*}))
+    :db* db*})
+  (db/update-global-cache! @db*))

src/eca/models.clj

@@ -47,6 +47,8 @@
                         :web-search (contains? models-with-web-search-support (name model))
                         :tools (get model-config "tool_call")
                         :max-output-tokens (get-in model-config ["limit" "output"])}
+                       :limit {:context (get-in model-config ["limit" "context"])
+                               :output (get-in model-config ["limit" "output"])}
                        :input-token-cost (some-> (get-in model-config ["cost" "input"]) float (/ one-million))
                        :output-token-cost (some-> (get-in model-config ["cost" "output"]) float (/ one-million))
                        :input-cache-creation-token-cost (some-> (get-in model-config ["cost" "cache_write"]) float (/ one-million))

src/eca/shared.clj

@@ -73,9 +73,9 @@
 
 (defn multi-str [& strings] (string/join "\n" (remove nil? strings)))
 
-(defn tokens->cost [input-tokens input-cache-creation-tokens input-cache-read-tokens output-tokens full-model db]
+(defn tokens->cost [input-tokens input-cache-creation-tokens input-cache-read-tokens output-tokens model-capabilities]
   (when-let [{:keys [input-token-cost output-token-cost
-                     input-cache-creation-token-cost input-cache-read-token-cost]} (get-in db [:models full-model])]
+                     input-cache-creation-token-cost input-cache-read-token-cost]} model-capabilities]
     (when (and input-token-cost output-token-cost)
       (let [input-cost (* input-tokens input-token-cost)
             input-cost (if (and input-cache-creation-tokens input-cache-creation-token-cost)

test/eca/shared_test.clj

@@ -32,20 +32,19 @@
                  (shared/assoc-some {} :a 1 :b)))))
 
 (deftest tokens->cost-test
-  (let [db {:models {"provider/my-model" {:input-token-cost 0.01
-                                          :output-token-cost 0.02
-                                          :input-cache-creation-token-cost 0.005
-                                          :input-cache-read-token-cost 0.001}}}]
+  (let [model-capabilities {:input-token-cost 0.01
+                            :output-token-cost 0.02
+                            :input-cache-creation-token-cost 0.005
+                            :input-cache-read-token-cost 0.001}]
     (testing "basic input/output cost"
-      (is (= "0.70" (shared/tokens->cost 30 nil nil 20 "provider/my-model" db))))
+      (is (= "0.70" (shared/tokens->cost 30 nil nil 20 model-capabilities))))
     (testing "with cache creation tokens"
-      (is (= "0.75" (shared/tokens->cost 30 10 nil 20 "provider/my-model" db))))
+      (is (= "0.75" (shared/tokens->cost 30 10 nil 20 model-capabilities))))
     (testing "with cache read tokens"
-      (is (= "0.73" (shared/tokens->cost 30 nil 30 20 "provider/my-model" db))))
+      (is (= "0.73" (shared/tokens->cost 30 nil 30 20 model-capabilities))))
     (testing "with both cache creation and read tokens"
-      (is (= "0.78" (shared/tokens->cost 30 10 30 20 "provider/my-model" db))))
+      (is (= "0.78" (shared/tokens->cost 30 10 30 20 model-capabilities))))
     (testing "returns nil when model is missing from db"
-      (is (nil? (shared/tokens->cost 30 nil nil 20 "unknown" db))))
+      (is (nil? (shared/tokens->cost 30 nil nil 20 {}))))
     (testing "returns nil when mandatory costs are missing"
-      (is (nil? (shared/tokens->cost 30 nil nil 20 "my-model-missing"
-                                     {:models {"my-model-missing" {:input-token-cost 0.01}}}))))))
+      (is (nil? (shared/tokens->cost 30 nil nil 20 {:input-token-cost 0.01}))))))