Merge branch 'master' into maint/fix-win-int-tests

Author: ericdallo

.cljfmt.edn

@@ -1 +1,2 @@
-{:extra-indents {task [[:inner 0]]}}
+{:extra-indents {task [[:inner 0]]
+                 future* [[:inner 0]]}}

AGENTS.md

@@ -25,17 +25,13 @@ Code Style
 - Unit tests that use file paths and uris should rely on `h/file-path` and `h/file-uri` to avoid windows issues with slashes.
 
 Secrets Management
-- `src/eca/secrets/netrc.clj` - Netrc format parser (multi-line format: machine/login/password/port keywords)
-- `src/eca/secrets/authinfo.clj` - Authinfo format parser (single-line format: space-separated key-value pairs)
 - `src/eca/secrets.clj` - Main secrets manager for credential file operations:
-  - File discovery and priority order (.authinfo.gpg → .netrc.gpg → .authinfo → _authinfo → .netrc → _netrc)
+  - File discovery and priority order (`:netrcFile <FILE>` config → .netrc → _netrc)
   - Cross-platform path construction using io/file (handles / vs \ separators automatically)
-  - GPG decryption with caching (5-second TTL) and timeout (30s, configurable via GPG_TIMEOUT env var)
   - keyRc format parsing: [login@]machine[:port] (named after Unix "rc" config file tradition)
   - Credential matching logic (exact login match when specified, first match otherwise)
   - Permission validation (Unix: warns if not 0600; Windows: skipped)
 - Authentication flow: config `key` → credential files `keyRc` → env var `keyEnv` → OAuth
-- Security: passwords never logged; GPG decryption via clojure.java.process; cache with short TTL; subprocess timeout protection
 
 Notes
 - CI runs: bb test and bb integration-test. Ensure these pass locally before PRs.

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## Unreleased
 
+## 0.75.1
+
+- Improve protocol for tool call output formatting for tools that output json.
+- Fix inconsistencies in `eca_read_file` not passing correct content to LLM when json.
+
+## 0.75.0
+
+- Improved file contexts: now use :lines-range
+- BREAKING ECA now only supports standard plain-text netrc as credential file reading. Drop authinfo and gpg decryption support. Users can choose to pass in their own provisioned netrc file from various secure source with `:netrcFile` in ECA config.
+
+## 0.74.0
+
+- Improved `eca_edit_file` to automatically handle whitespace and indentation differences in single-occurrence edits.
+- Fix contexts in user prompts (not system contexts) not parsing lines ranges properly.
+- Support non-stream providers on openai-chat API. #174
+
+## 0.73.5
+
+- Support use API keys even if subscription is logged. #175
+
+## 0.73.4
+
+- Fix tool call approval ignoring eca tools.
+
+## 0.73.3
+
+- Fix tool call approval ignoring configs for mcp servers.
+
 ## 0.73.2
 
 - Fix tool call approval thread lock.

docs/configuration.md

@@ -515,6 +515,7 @@ To configure, add your OTLP collector config via `:otlp` map following [otlp aut
             systemPromptFile?: string;
         };
         otlp?: {[key: string]: string};
+        netrcFile?: string;
     }
     ```
 
@@ -530,6 +531,7 @@ To configure, add your OTLP collector config via `:otlp` map following [otlp aut
           "ollama": {"url": "http://localhost:11434"}
       },
       "defaultModel": null, // let ECA decides the default model.
+      "netrcFile": null, // search ~/.netrc or ~/_netrc when null.
       "hooks": {},
       "rules" : [],
       "commands" : [],

docs/models.md

@@ -148,7 +148,9 @@ Only set this when your provider uses a different path or expects query paramete
 
 ### Credential File Authentication
 
-Use `keyRc` in your provider config to read credentials from `~/.authinfo(.gpg)` or `~/.netrc(.gpg)` without storing keys directly in config or env vars.
+ECA also supports standard plain-text .netrc file format for reading credentials.
+
+Use `keyRc` in your provider config to read credentials from `~/.netrc` without storing keys directly in config or env vars.
 
 Example:
 
@@ -163,13 +165,20 @@ Example:
 
 keyRc lookup specification format: `[login@]machine[:port]` (e.g., `api.openai.com`, `[email protected]`, `api.custom.com:8443`).
 
+ECA by default search .netrc file stored in user's home directory. You can also provide the path to the actual file to use with `:netrcFile` in ECA config.
+
+Tip for those wish to store their credentials encrypted with tools like gpg or age:
+
+```bash
+# via secure tempororay file
+gpg --batch -q -d ./netrc.gpg > /tmp/netrc.$$ && chmod 600 /tmp/netrc.$$ && ECA_CONFIG='{"netrcFile": "/tmp/netrc.$$"}' eca server && shred -u /tmp/netrc.$$
+```
+
 Further reading on credential file formats:
-- [Emacs authinfo documentation](https://www.gnu.org/software/emacs/manual/html_node/auth/Help-for-users.html)
 - [Curl Netrc documentation](https://everything.curl.dev/usingcurl/netrc)
 - [GNU Inetutils .netrc documentation](https://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-file.html)
 
 Notes:
-- Preferred files are GPG-encrypted (`~/.authinfo.gpg` / `~/.netrc.gpg`); plaintext variants are supported.
 - Authentication priority (short): `key` > `keyRc files` > `keyEnv` > OAuth.
 - All providers with API key auth can use credential files.
 

docs/protocol.md

@@ -984,7 +984,7 @@ interface ChatToolCallRejectedContent {
 
 type ToolCallOrigin = 'mcp' | 'native';
 
-type ToolCallDetails = FileChangeDetails;
+type ToolCallDetails = FileChangeDetails | JsonOutputsDetails;
 
 interface FileChangeDetails {
     type: 'fileChange';
@@ -1010,6 +1010,15 @@ interface FileChangeDetails {
      linesRemoved: number;
 }
 
+interface JsonOutputsDetails {
+    type: 'jsonOutputs';
+    
+    /**
+     * The list of json outputs of this tool call properly formatted.
+     */
+    jsons: string[];
+}
+
 /**
  * Extra information about a chat
  */

integration-test/integration/chat/anthropic_test.clj

@@ -30,6 +30,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "Tell me a joke!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock"})
@@ -99,7 +100,6 @@
                                          :lastMessageCost (m/pred string?)
                                          :sessionCost (m/pred string?)})
         (match-content chat-id "system" {:type "progress" :state "finished"})
-        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (is (match?
              {:messages [{:role "user" :content [{:type "text" :text "Tell me a joke!"}]}
                          {:role "assistant" :content [{:type "text" :text "Knock knock!"}]}
@@ -128,6 +128,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "hello!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})
@@ -141,7 +142,6 @@
                                          :lastMessageCost (m/pred string?)
                                          :sessionCost (m/pred string?)})
         (match-content chat-id "system" {:type "progress" :state "finished"})
-        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (is (match?
              {:messages [{:role "user" :content [{:type "text" :text "hello!"}]}]
               :system (m/pred vector?)}
@@ -206,6 +206,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "What files you see?\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})
@@ -264,7 +265,6 @@
         (match-content chat-id "assistant" {:type "text" :text "The files I see:\n"})
         (match-content chat-id "assistant" {:type "text" :text "file1\nfile2\n"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
-        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (is (match?
              {:messages [{:role "user" :content [{:type "text" :text "What files you see?"}]}
                          {:role "assistant"

integration-test/integration/chat/custom_provider_test.clj

@@ -46,6 +46,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "Tell me a joke!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock"})
@@ -158,6 +159,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "Tell me a joke!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock "})

integration-test/integration/chat/github_copilot_test.clj

@@ -31,6 +31,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "Tell me a joke!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock "})
@@ -62,7 +63,6 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Foo"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
-        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (is (match?
              {:input [{:role "user" :content [{:type "input_text" :text "Tell me a joke!"}]}
                       {:role "assistant" :content [{:type "output_text" :text "Knock knock!"}]}
@@ -123,6 +123,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "hello!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})

integration-test/integration/chat/google_test.clj

@@ -31,6 +31,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "Tell me a joke!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knoc"})
@@ -62,7 +63,6 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Foo"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
-        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (is (match?
              {:input [{:role "user" :content [{:type "input_text" :text "Tell me a joke!"}]}
                       {:role "assistant" :content [{:type "output_text" :text "Knock knock!"}]}
@@ -122,6 +122,7 @@
              resp))
 
         (match-content chat-id "user" {:type "text" :text "hello!\n"})
+        (match-content chat-id "system" {:type "metadata" :title "Some Cool Title"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "reasonStarted" :id (m/pred string?)})