From 5999eb2cb6a0e3d290aa0c92be718b0ac58f9512 Mon Sep 17 00:00:00 2001
From: Shriniwas Ramesh Suram <82992833+Shriniwas410@users.noreply.github.com>
Date: Tue, 23 Jun 2026 13:50:21 -0400
Subject: [PATCH] fix(mcp): resolve os.environ/VAR references in static_headers
 loaded from DB

---
 litellm/proxy/_experimental/mcp_server/mcp_server_manager.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index 5e704b889ae..643f31df67d 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -1063,6 +1063,11 @@ class MCPServerManager:
         static_headers_dict = _deserialize_json_dict(
             getattr(mcp_server, "static_headers", None)
         )
+        if static_headers_dict:
+            static_headers_dict = {
+                k: get_secret(v) if isinstance(v, str) and v.startswith("os.environ/") else v
+                for k, v in static_headers_dict.items()
+            }
         env_vars_list = self._resolve_env_vars_list(
             mcp_server,
             env_vars_are_encrypted=(