Merge branch 'master' into fix-mcp-routing-openai-strict

itkonen · web-flow · commit 45cef199c79f · 2026-05-15T17:11:03.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 - Bugfix: OpenAI Responses tool calls now opt out of strict schema normalization so optional tool parameters remain optional.
 - Bugfix: MCP tool calls now route to the selected server when multiple servers expose the same tool name.
+- Use a JSON-RPC `ping` (instead of `initialize`) for the OAuth auth-discovery probe, so the probe POST is never counted as a real handshake by servers or tests that track requests by method name.
+
+## 0.134.1
+
+- Support optional `clientName` config field for MCP servers to override the OAuth Dynamic Client Registration `client_name` (useful for servers that allowlist clients by name, e.g. Figma).
+
+## 0.134.0
+
+- Support including `AGENTS.md` files from parent directories of each workspace folder via new `includeParentAgentsFiles` config flag (disabled by default), ordered outermost parent first.
+- Replace custom stderr-print logger with Logback/SLF4J: timestamps, log levels, chat-id MDC context, third-party noise suppression (root at WARN, `eca` at INFO), and proper cross-thread context propagation in `future*`. #253
+- Fix MCP OAuth auto-discovery for servers that only return a 401 + `www-authenticate` challenge when probed with a valid JSON-RPC initialize request (e.g. Figma).
+- Mark MCP servers as failed when the initialize handshake returns no result, instead of silently appearing as running.
 
 ## 0.133.6
 
diff --git a/docs/config.json b/docs/config.json
@@ -194,6 +194,12 @@
       "maximum": 100,
       "default": 75
     },
+    "includeParentAgentsFiles": {
+      "type": "boolean",
+      "description": "When true, also include AGENTS.md files from each workspace folder's parent directories, ordered outermost parent first, then the workspace's own AGENTS.md.",
+      "markdownDescription": "When `true`, also include `AGENTS.md` files from each workspace folder's parent directories, ordered outermost parent first, then the workspace's own `AGENTS.md`.",
+      "default": false
+    },
     "index": {
       "type": "object",
       "description": "Indexing configuration for workspace files.",
@@ -1116,6 +1122,11 @@
           "maximum": 65535,
           "description": "Fixed port for the OAuth callback server. Required by providers like Slack that mandate pre-registered redirect URIs. When set, the callback uses HTTPS with a bundled localhost certificate. Register https://localhost:<port>/auth/callback as the redirect URI in your OAuth app.",
           "markdownDescription": "Fixed port for the OAuth callback server. Required by providers like Slack that mandate pre-registered redirect URIs. When set, the callback uses HTTPS with a bundled localhost certificate. Register `https://localhost:<port>/auth/callback` as the redirect URI in your OAuth app."
+        },
+        "clientName": {
+          "type": "string",
+          "description": "Override the client_name sent during OAuth Dynamic Client Registration. Required for servers that allowlist clients by name (e.g. Figma). Defaults to 'ECA (Editor Code Assistant)' when not set.",
+          "markdownDescription": "Override the `client_name` sent during OAuth Dynamic Client Registration. Required for servers that allowlist clients by name (e.g. Figma). Defaults to `ECA (Editor Code Assistant)` when not set."
         }
       },
       "additionalProperties": false
diff --git a/docs/config/tools.md b/docs/config/tools.md
@@ -111,6 +111,26 @@ For MCP servers configuration, use the `mcpServers` config, examples:
     }
     ```
 
+=== "Advanced — DCR client name override"
+
+    Some OAuth-protected MCP servers allowlist clients during Dynamic Client
+    Registration (DCR) by `client_name`. If the server rejects ECA's default
+    registration with a 403, set `clientName` to a value the server accepts.
+
+    ```javascript title="~/.config/eca/config.json"
+    {
+      "mcpServers": {
+        "figma": {
+          "url": "https://mcp.figma.com/mcp",
+          "clientName": "Claude Code"
+        }
+      }
+    }
+    ```
+
+    The DCR attempt, its result and the chosen `client_name` are logged at
+    `info`/`warn` level so you can verify behavior in the ECA log.
+
 === "Disabling a MCP"
 
     Set `"disabled": true` to keep the configuration but prevent ECA from starting the server.
diff --git a/docs/features.md b/docs/features.md
@@ -111,6 +111,8 @@ So user can include those contexts in 3 different ways for different purposes:
 
 ECA will always include if found the `AGENTS.md` file as context, searching for both `/project-root/AGENTS.md` and `~/.config/eca/AGENTS.md`, it will recursively check for any `@some-file.md` mention as well.
 
+Set the config flag `includeParentAgentsFiles` to `true` to also include `AGENTS.md` files from each workspace's parent directories (up to the filesystem root). Files are emitted outermost parent first, then descending toward the workspace's own `AGENTS.md`, and duplicates across overlapping workspaces are skipped. The flag is disabled by default.
+
 You can ask ECA to create/update this file via `/init` command.
 you can check/debug what goes to final prompt with `/prompt-show` as well.
 
diff --git a/resources/ECA_VERSION b/resources/ECA_VERSION
@@ -1 +1 @@
-0.133.6
+0.134.1
diff --git a/resources/prompts/tools/git.md b/resources/prompts/tools/git.md
@@ -37,6 +37,8 @@ gh pr create --title "the pr title" --body "$(cat <<'EOF'
 [Testing checklist]
 
 🤖 Generated with [eca](https://eca.dev)
+
+Co-Authored-By: eca-agent <git@eca.dev>
 EOF
 )"
 </example>
diff --git a/src/eca/config.clj b/src/eca/config.clj
@@ -224,6 +224,7 @@
    :completion {:model "openai/gpt-4.1"}
    :netrcFile nil
    :autoCompactPercentage 75
+   :includeParentAgentsFiles false
    :plugins {"eca" {:source "https://github.com/editor-code-assistant/eca-plugins.git"}}
    :remote {:enabled false}
    :env "prod"})
diff --git a/src/eca/features/chat.clj b/src/eca/features/chat.clj
@@ -1185,7 +1185,7 @@
                                                                                       :state :running
                                                                                       :text "Parsing given context"}))
         refined-contexts (concat
-                          (f.context/agents-file-contexts db)
+                          (f.context/agents-file-contexts db config)
                           (f.context/raw-contexts->refined contexts db))
         {static-rules :static path-scoped-rules :path-scoped} (f.rules/all-rules config (:workspace-folders db) agent full-model)
         all-tools (f.tools/all-tools chat-id agent @db* config)
diff --git a/src/eca/features/context.clj b/src/eca/features/context.clj
@@ -55,24 +55,57 @@
                  nested-results))
        []))))
 
+(defn ^:private ancestor-paths
+  "Return all ancestor directories of `path` in outermost-first order.
+   Excludes `path` itself."
+  [path]
+  (loop [p (fs/parent path)
+         acc '()]
+    (if (nil? p)
+      (vec acc)
+      (recur (fs/parent p) (conj acc p)))))
+
+(defn ^:private safe-canonicalize
+  "Canonicalize `path`, falling back to a non-resolved `fs/path` if the
+   path does not exist (e.g. a stale workspace folder or test fixture)."
+  [path]
+  (try (fs/canonicalize path)
+       (catch Exception _ (fs/path path))))
+
 (defn agents-file-contexts
   "Search for AGENTS.md file both in workspaceRoot and global config dir.
+   When `:includeParentAgentsFiles` is true in `config`, also include
+   AGENTS.md files from each workspace's parent directories, ordered
+   outermost parent first, then the workspace's own AGENTS.md.
    Process any found @paths mentions recursively, supporting both relative and absolute paths.
    Deduplicates files to avoid reading the same file multiple times."
-  [db]
+  [db config]
   ;; TODO make it customizable by agent
-  (let [agent-file "AGENTS.md"
-        local-agent-files (keep (fn [{:keys [uri]}]
-                                  (let [agent-file (fs/path (shared/uri->filename uri) agent-file)]
-                                    (when (fs/readable? agent-file)
-                                      (fs/canonicalize agent-file))))
-                                (:workspace-folders db))
-        global-agent-file (let [agent-file (fs/path (shared/global-config-dir) agent-file)]
-                            (when (fs/readable? agent-file)
-                              (fs/canonicalize agent-file)))]
-    (->> (concat local-agent-files
-                 (when global-agent-file [global-agent-file]))
-         (mapcat #(parse-agents-file (str %))))))
+  (let [agent-file-name "AGENTS.md"
+        include-parents? (boolean (:includeParentAgentsFiles config))
+        readable-agent-file-in (fn [dir]
+                                 (let [p (fs/path dir agent-file-name)]
+                                   (when (fs/readable? p)
+                                     (str (fs/canonicalize p)))))
+        {:keys [paths seen]}
+        (reduce
+         (fn [{:keys [paths seen]} {:keys [uri]}]
+           (let [ws-path (safe-canonicalize (shared/uri->filename uri))
+                 candidate-dirs (cond-> []
+                                  include-parents? (into (ancestor-paths ws-path))
+                                  true (conj ws-path))
+                 new-paths (->> candidate-dirs
+                                (keep readable-agent-file-in)
+                                (remove seen))]
+             {:paths (into paths new-paths)
+              :seen (into seen new-paths)}))
+         {:paths [] :seen #{}}
+         (:workspace-folders db))
+        global-agent-file (readable-agent-file-in (shared/global-config-dir))
+        all-paths (cond-> paths
+                    (and global-agent-file (not (contains? seen global-agent-file)))
+                    (conj global-agent-file))]
+    (mapcat parse-agents-file all-paths)))
 
 (defn ^:private file->refined-context [path lines-range]
   (if (fs/readable? path)
diff --git a/src/eca/features/tools/mcp.clj b/src/eca/features/tools/mcp.clj
@@ -296,15 +296,16 @@
 (defn ^:private try-refresh-token!
   "Attempt to refresh an MCP server's OAuth token.
    Returns true if refresh succeeded, false otherwise."
-  [name db* url metrics {:keys [clientId clientSecret oauthPort]}]
+  [name db* url metrics {:keys [clientId clientSecret oauthPort clientName]}]
   (let [mcp-auth (get-in @db* [:mcp-auth name])
         {:keys [refresh-token]} mcp-auth]
     (when refresh-token
       (logger/info logger-tag (format "Attempting to refresh token for MCP server '%s'" name))
       (when-let [oauth-info (oauth/oauth-info (replace-env-vars url)
                                               (some-> clientId replace-env-vars)
                                               (some-> clientSecret replace-env-vars)
-                                              oauthPort)]
+                                              oauthPort
+                                              (some-> clientName replace-env-vars))]
         (when-let [new-tokens (oauth/refresh-token!
                                (:token-endpoint oauth-info)
                                (:client-id oauth-info)
@@ -367,7 +368,8 @@
                          (oauth/oauth-info (replace-env-vars url)
                                            (some-> (:clientId server-config) replace-env-vars)
                                            (some-> (:clientSecret server-config) replace-env-vars)
-                                           (:oauthPort server-config)))]
+                                           (:oauthPort server-config)
+                                           (some-> (:clientName server-config) replace-env-vars)))]
         (if oauth-info
           (initialize-mcp-oauth oauth-info
                                 name
@@ -387,6 +389,9 @@
                                                     {:on-tools-change on-tools-change
                                                      :pending-tools-refresh* pending-tools-refresh*})
                                    init-result (pmc/get-initialize-result client)
+                                   _ (when-not init-result
+                                       (throw (ex-info "MCP initialize returned no result"
+                                                       {:server name})))
                                    version (get-in init-result [:serverInfo :version])]
                                (swap! db* assoc-in [:mcp-clients name] (cond-> {:client client
                                                                                 :status :starting
diff --git a/src/eca/oauth.clj b/src/eca/oauth.clj
diff --git a/test/eca/features/context_test.clj b/test/eca/features/context_test.clj
diff --git a/test/eca/features/tools/agent_test.clj b/test/eca/features/tools/agent_test.clj
