From 775b6c7be0ef1dbd710c1c75af72fd3e81453535 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 12:10:39 +0000
Subject: [PATCH] fix(a2a): apply agent static_headers on the /chat/completions
 bridge

---
 litellm/llms/a2a/chat/transformation.py       | 10 ++-
 .../a2a/chat/test_a2a_chat_transformation.py  | 70 +++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/litellm/llms/a2a/chat/transformation.py b/litellm/llms/a2a/chat/transformation.py
index 113c000f352..5c993d20cca 100644
--- a/litellm/llms/a2a/chat/transformation.py
+++ b/litellm/llms/a2a/chat/transformation.py
@@ -54,12 +54,12 @@ class A2AConfig(BaseConfig):
         # Extract agent name from model (e.g., "a2a/my-agent" -> "my-agent")
         agent_name = model.split("/", 1)[1] if "/" in model else None
 
-        # Only lookup if agent name exists and some config is missing
-        if not agent_name or (api_base is not None and api_key is not None and headers is not None):
+        if not agent_name:
             return api_base, api_key, headers
 
         # Try registry lookup (only available in proxy context)
         try:
+            from litellm.interactions.agents.utils import merge_agent_headers
             from litellm.proxy.agent_endpoints.agent_registry import (
                 global_agent_registry,
             )
@@ -84,6 +84,12 @@ class A2AConfig(BaseConfig):
                     for key, value in agent.litellm_params.items():
                         if key not in ["api_key", "api_base", "headers", "model"] and key not in optional_params:
                             optional_params[key] = value
+
+                if agent.static_headers:
+                    headers = merge_agent_headers(
+                        dynamic_headers=headers,
+                        static_headers=agent.static_headers,
+                    )
         except ImportError:
             pass  # Registry not available (not running in proxy context)
 
diff --git a/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py b/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py
index 2e11c68244c..de030f8ae2a 100644
--- a/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py
+++ b/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py
@@ -2,6 +2,8 @@
 
 from unittest.mock import MagicMock
 
+import pytest
+
 from litellm.llms.a2a.chat.transformation import A2AConfig
 from litellm.types.utils import ModelResponse
 
@@ -40,3 +42,71 @@ def test_transform_response_sets_usage():
     assert result.usage.prompt_tokens > 0
     assert result.usage.completion_tokens > 0
     assert result.usage.total_tokens == (result.usage.prompt_tokens + result.usage.completion_tokens)
+
+
+@pytest.fixture
+def registered_agent():
+    from litellm.proxy.agent_endpoints.agent_registry import global_agent_registry
+    from litellm.types.agents import AgentResponse
+
+    def _register(**kwargs) -> AgentResponse:
+        agent = AgentResponse(
+            agent_id="static-headers-agent-id",
+            agent_name="static-headers-agent",
+            agent_card_params={"url": "http://agent.example.com:9999"},
+            **kwargs,
+        )
+        global_agent_registry.register_agent(agent)
+        return agent
+
+    original = list(global_agent_registry.agent_list)
+    try:
+        yield _register
+    finally:
+        global_agent_registry.agent_list = original
+
+
+def test_resolve_agent_config_applies_static_headers(registered_agent):
+    """Regression for #32608: the /chat/completions bridge must forward an agent's
+    static_headers, consistent with the native /a2a/{agent_id} route."""
+    registered_agent(static_headers={"x-api-key": "secret-value"})
+
+    _, _, headers = A2AConfig.resolve_agent_config_from_registry(
+        model="a2a/static-headers-agent",
+        api_base=None,
+        api_key=None,
+        headers=None,
+        optional_params={},
+    )
+
+    assert headers == {"x-api-key": "secret-value"}
+
+
+def test_static_headers_win_over_request_headers_case_insensitive(registered_agent):
+    """static_headers must override a request-supplied header of the same name
+    (case-insensitively), mirroring merge_agent_headers on the native route."""
+    registered_agent(static_headers={"X-Api-Key": "admin-secret"})
+
+    _, _, headers = A2AConfig.resolve_agent_config_from_registry(
+        model="a2a/static-headers-agent",
+        api_base=None,
+        api_key=None,
+        headers={"x-api-key": "caller-supplied", "x-other": "keep-me"},
+        optional_params={},
+    )
+
+    assert headers == {"X-Api-Key": "admin-secret", "x-other": "keep-me"}
+
+
+def test_no_static_headers_leaves_request_headers_untouched(registered_agent):
+    registered_agent(litellm_params=None)
+
+    _, _, headers = A2AConfig.resolve_agent_config_from_registry(
+        model="a2a/static-headers-agent",
+        api_base=None,
+        api_key=None,
+        headers={"x-caller": "value"},
+        optional_params={},
+    )
+
+    assert headers == {"x-caller": "value"}