feat: header metadata support

src/mcpo/__init__.py

@@ -75,6 +75,9 @@ def main(
     log_level: Annotated[
         Optional[str], typer.Option("--log-level", help="Set log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)")
     ] = None,
+    client_header_forwarding: Annotated[
+        Optional[str], typer.Option("--client-header-forwarding", help="Config for header forwarding")
+    ] = None
 ):
     server_command = None
     if not config_path:
@@ -114,7 +117,7 @@ def main(
         # Set environment variables
         for key, value in env_dict.items():
             os.environ[key] = value
-    except Exception as e:
+    except Exception:
         pass
 
     # Whatever the prefix is, make sure it starts and ends with a /
@@ -152,6 +155,7 @@ def main(
             root_path=root_path,
             headers=headers,
             hot_reload=hot_reload,
+            client_header_forwarding=client_header_forwarding
         )
     )
 

src/mcpo/main.py

@@ -755,6 +755,7 @@ async def run(
 
     # MCP Config
     config_path = kwargs.get("config_path")
+    client_header_forwarding = kwargs.get("client_header_forwarding", None)
 
     # mcpo server
     name = kwargs.get("name") or "MCP OpenAPI Proxy"
@@ -844,6 +845,15 @@ def filter(self, record):
             logger.warning("Invalid JSON format for headers. Headers will be ignored.")
             headers = None
 
+    client_header_forwarding = kwargs.get("client_header_forwarding")
+    if client_header_forwarding and isinstance(client_header_forwarding, str):
+        try:
+            client_header_forwarding = json.loads(client_header_forwarding)
+            validate_client_header_forwarding_config("default", client_header_forwarding)
+        except json.JSONDecodeError:
+            logger.warning("Invalid JSON format for client header forwarding config. Client header forwarding config will be ignored.")
+            client_header_forwarding = None
+
     if server_type == "sse":
         logger.info(
             f"Configuring for a single SSE MCP Server with URL {server_command[0]}"
@@ -860,6 +870,7 @@ def filter(self, record):
         main_app.state.args = server_command[0]  # Expects URL as the first element
         main_app.state.api_dependency = api_dependency
         main_app.state.headers = headers
+        main_app.state.client_header_forwarding = client_header_forwarding
     elif server_command:  # This handles stdio
         logger.info(
             f"Configuring for a single Stdio MCP Server with command: {' '.join(server_command)}"

src/mcpo/utils/headers.py

@@ -1,6 +1,5 @@
 import logging
-import re
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Any
 from fastapi import Request
 
 logger = logging.getLogger(__name__)

src/mcpo/utils/main.py

@@ -283,12 +283,12 @@ def get_tool_handler(
     client_header_forwarding_config=None,
 ):
     async def call_tool_with_reconnect(
-        request: Request, arguments: Dict[str, Any]
+        request: Request, arguments: Dict[str, Any], meta: Dict[str, Any]
     ) -> CallToolResult:
         session_manager = getattr(request.app.state, "session_manager", None)
 
         async def _invoke(session):
-            return await session.call_tool(endpoint_name, arguments=arguments)
+            return await session.call_tool(endpoint_name, arguments=arguments, meta=meta)
 
         if session_manager:
             try:
@@ -349,7 +349,7 @@ async def tool(
 
             logger.info(f"Calling endpoint: {endpoint_name}, with args: {args}")
             try:
-                result = await call_tool_with_reconnect(request, args)
+                result = await call_tool_with_reconnect(request, args, meta)
 
                 if result.isError:
                     error_message = "Unknown tool execution error"
@@ -409,7 +409,7 @@ async def tool(request: Request):
 
         logger.info(f"Calling endpoint: {endpoint_name}, with no args")
         try:
-            result = await call_tool_with_reconnect(request, {})
+            result = await call_tool_with_reconnect(request, {}, meta)
 
             if result.isError:
                 error_message = "Unknown tool execution error"