From bef557f3ed971cf338941cf75cac51ea546bd389 Mon Sep 17 00:00:00 2001
From: yucheng <yucheng@berri.ai>
Date: Sat, 26 Sep 2026 08:34:38 +0000
Subject: [PATCH] fix(mcp): resolve the BYOK credential before keying the
 listed-tools slot

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../mcp_server/mcp_server_manager.py          | 13 ++++++--
 .../mcp_server/test_mcp_server_manager.py     | 31 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index 6de4be72e23..b1f52bd5bcc 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -4401,9 +4401,16 @@ class MCPServerManager:
         verbose_logger.info("_get_tools_from_server for %s...", server.name)
 
         client = None
+        # tools/call resolves the BYOK credential before keying its listed-tools slot; resolve the
+        # same value here or a stored-credential server would list into a slot the call never reads.
+        resolved_mcp_auth_header: Final = (
+            mcp_auth_header
+            if not server.is_byok or isinstance(mcp_auth_header, dict)
+            else await _resolve_byok_mcp_auth_header(server, user_api_key_auth, mcp_auth_header)
+        )
         listed_caller: Final = ListedToolsCaller(
             user_api_key_auth=user_api_key_auth,
-            mcp_auth_header=mcp_auth_header,
+            mcp_auth_header=resolved_mcp_auth_header,
             raw_headers=raw_headers,
             oauth2_headers=oauth2_headers,
         )
@@ -4449,7 +4456,7 @@ class MCPServerManager:
                 if (
                     get_mcp_jwt_signer() is not None
                     and not has_static_authorization
-                    and not mcp_auth_header
+                    and not resolved_mcp_auth_header
                     and not has_extra_authorization
                 ):
                     extra_headers = await inject_mcp_jwt_headers_for_upstream(
@@ -4472,7 +4479,7 @@ class MCPServerManager:
 
             client = await self._create_mcp_client(
                 server=server,
-                mcp_auth_header=mcp_auth_header,
+                mcp_auth_header=resolved_mcp_auth_header,
                 extra_headers=extra_headers,
                 stdio_env=stdio_env,
                 subject_token=subject_token,
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
index c016a63acd6..368f0d09e3c 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
@@ -7037,6 +7037,37 @@ class TestMCPServerManager:
         listed = manager.get_listed_tool(server, "turn", other)
         assert listed is not None and listed.description == "everyone"
 
+    @pytest.mark.asyncio
+    async def test_byok_stored_credential_lists_into_the_slot_tools_call_reads(self):
+        from litellm.proxy._experimental.mcp_server.byok_credential_cache import (
+            byok_credential_cache_key,
+            cache_byok_credential,
+        )
+        from litellm.proxy._experimental.mcp_server.operations import byok_credential_cache
+
+        manager = MCPServerManager()
+        server = MCPServer(
+            server_id="byok-catalog",
+            name="byok_catalog",
+            transport=MCPTransport.http,
+            url="http://byok-catalog",
+            is_byok=True,
+        )
+        user = UserAPIKeyAuth(api_key="sk-litellm", user_id="byok-user")
+        manager._create_mcp_client = AsyncMock(return_value=AsyncMock())
+        manager._fetch_tools_with_timeout = AsyncMock(
+            return_value=[MCPTool(name="turn", description="stored cred catalog", inputSchema={})]
+        )
+        cache_byok_credential("byok-user", "byok-catalog", "stored-secret")
+        try:
+            await manager._get_tools_from_server(server=server, user_api_key_auth=user)
+        finally:
+            byok_credential_cache.delete_cache(byok_credential_cache_key("byok-user", "byok-catalog"))
+
+        call_side = ListedToolsCaller(user_api_key_auth=user, mcp_auth_header="stored-secret")
+        listed = manager.get_listed_tool(server, "turn", call_side)
+        assert listed is not None and listed.description == "stored cred catalog"
+
     @pytest.mark.parametrize(
         ("signer", "static_headers", "shared"),
         [