Merge branch 'IBM:main' into main

Author: shoummu1

.env.example

@@ -140,6 +140,18 @@ WEBSOCKET_PING_INTERVAL=30
 # SSE client retry timeout (milliseconds)
 SSE_RETRY_TIMEOUT=5000
 
+
+#####################################
+# Streamabe HTTP Transport Configuration
+#####################################
+
+# Set False to use stateless sessions without event store and True for stateful sessions
+USE_STATEFUL_SESSIONS=false
+
+# Set true for JSON responses, false for SSE streams
+JSON_RESPONSE_ENABLED=true
+
+
 #####################################
 # Federation
 #####################################

README.md

@@ -17,7 +17,7 @@
 [![Docker Image](https://img.shields.io/badge/docker-ghcr.io%2Fibm%2Fmcp--context--forge-blue)](https://github.com/ibm/mcp-context-forge/pkgs/container/mcp-context-forge) 
 
 
-ContextForge MCP Gateway is a feature-rich gateway & proxy that federates MCP and REST services - unifying discovery, auth, rate-limiting, observability, virtual servers, multi-transport protocols, and an optional Admin UI into one clean endpoint for your AI clients. It runs as a fully compliant MCP server, deployable via PyPI or Docker, and scales to multi-cluster environments on Kubernetes with Redis-backed federation and caching.
+ContextForge MCP Gateway is a feature-rich gateway, proxy and MCP Registry that federates MCP and REST services - unifying discovery, auth, rate-limiting, observability, virtual servers, multi-transport protocols, and an optional Admin UI into one clean endpoint for your AI clients. It runs as a fully compliant MCP server, deployable via PyPI or Docker, and scales to multi-cluster environments on Kubernetes with Redis-backed federation and caching.
 
 ![MCP Gateway](https://ibm.github.io/mcp-context-forge/images/mcpgateway.gif)
 ---
@@ -30,7 +30,7 @@ It supports:
 
 * Federation across multiple MCP and REST services
 * Virtualization of legacy APIs as MCP-compliant tools and servers
-* Transport over HTTP, JSON-RPC, WebSocket, SSE, and stdio
+* Transport over HTTP, JSON-RPC, WebSocket, SSE, stdio and streamable-HTTP
 * An Admin UI for real-time management and configuration
 * Built-in auth, observability, retries, and rate-limiting
 * Scalable deployments via Docker or PyPI, Redis-backed caching, and multi-cluster federation
@@ -51,7 +51,7 @@ For a list of upcoming features, check out the [ContextForge MCP Gateway Roadmap
 </details>
 
 <details>
-<summary><strong>🌐 Federation of Peer Gateways</strong></summary>
+<summary><strong>🌐 Federation of Peer Gateways (MCP Registry)</strong></summary>
 
 * Auto-discovers or configures peer gateways (via mDNS or manual)
 * Performs health checks and merges remote registries transparently
@@ -275,6 +275,8 @@ docker run -d --name mcpgateway \
   ghcr.io/ibm/mcp-context-forge:0.1.1
 ```
 
+Using `--network=host` allows Docker to access the local network, allowing you to add MCP servers running on your host. See [Docker Host network driver documentation](https://docs.docker.com/engine/network/drivers/host/) for more details.
+
 </details>
 
 ---
@@ -833,11 +835,13 @@ You can get started by copying the provided [.env.example](.env.example) to `.en
 
 ### Transport
 
-| Setting                   | Description            | Default | Options                         |
-| ------------------------- | ---------------------- | ------- | ------------------------------- |
-| `TRANSPORT_TYPE`          | Enabled transports     | `all`   | `http`,`ws`,`sse`,`stdio`,`all` |
-| `WEBSOCKET_PING_INTERVAL` | WebSocket ping (secs)  | `30`    | int > 0                         |
-| `SSE_RETRY_TIMEOUT`       | SSE retry timeout (ms) | `5000`  | int > 0                         |
+| Setting                   | Description                        | Default | Options                         |
+| ------------------------- | ---------------------------------- | ------- | ------------------------------- |
+| `TRANSPORT_TYPE`          | Enabled transports                 | `all`   | `http`,`ws`,`sse`,`stdio`,`all` |
+| `WEBSOCKET_PING_INTERVAL` | WebSocket ping (secs)              | `30`    | int > 0                         |
+| `SSE_RETRY_TIMEOUT`       | SSE retry timeout (ms)             | `5000`  | int > 0                         |
+| `USE_STATEFUL_SESSIONS`   | streamable http config             | `false` | bool                            |
+| `JSON_RESPONSE_ENABLED`   | json/sse streams (streamable http) | `true`  | bool                            |
 
 ### Federation
 
@@ -1717,7 +1721,7 @@ podman-prod          - Build production container image (using ubi-micro → scr
 podman-run           - Run the container on HTTP  (port 4444)
 podman-run-shell     - Run the container on HTTP  (port 4444) and start a shell
 podman-run-ssl       - Run the container on HTTPS (port 4444, self-signed)
-podman-run-ssl-host  - Run the container on HTTPS with --network-host (port 4444, self-signed)
+podman-run-ssl-host  - Run the container on HTTPS with --network=host (port 4444, self-signed)
 podman-stop          - Stop & remove the container
 podman-test          - Quick curl smoke-test against the container
 podman-logs          - Follow container logs (⌃C to quit)

mcpgateway/config.py

@@ -191,6 +191,10 @@ def _parse_federation_peers(cls, v):
     session_ttl: int = 3600
     message_ttl: int = 600
 
+    # streamable http transport
+    use_stateful_sessions: bool = False  # Set to False to use stateless sessions without event store
+    json_response_enabled: bool = True  # Enable JSON responses instead of SSE streams
+
     # Development
     dev_mode: bool = False
     reload: bool = False

mcpgateway/main.py

@@ -104,6 +104,10 @@
     ToolService,
 )
 from mcpgateway.transports.sse_transport import SSETransport
+from mcpgateway.transports.streamablehttp_transport import (
+    JWTAuthMiddlewareStreamableHttp,
+    SessionManagerWrapper,
+)
 from mcpgateway.types import (
     InitializeRequest,
     InitializeResult,
@@ -144,6 +148,9 @@
 sampling_handler = SamplingHandler()
 server_service = ServerService()
 
+# Initialize session manager for Streamable HTTP transport
+streamable_http_session = SessionManagerWrapper()
+
 
 # Initialize session registry
 session_registry = SessionRegistry(
@@ -190,24 +197,17 @@ async def lifespan(_app: FastAPI) -> AsyncIterator[None]:
         await logging_service.initialize()
         await sampling_handler.initialize()
         await resource_cache.initialize()
+        await streamable_http_session.start()
+
         logger.info("All services initialized successfully")
         yield
     except Exception as e:
         logger.error(f"Error during startup: {str(e)}")
         raise
     finally:
         logger.info("Shutting down MCP Gateway services")
-        for service in [
-            resource_cache,
-            sampling_handler,
-            logging_service,
-            completion_service,
-            root_service,
-            gateway_service,
-            prompt_service,
-            resource_service,
-            tool_service,
-        ]:
+        # await stop_streamablehttp()
+        for service in [resource_cache, sampling_handler, logging_service, completion_service, root_service, gateway_service, prompt_service, resource_service, tool_service, streamable_http_session]:
             try:
                 await service.shutdown()
             except Exception as e:
@@ -276,6 +276,9 @@ async def dispatch(self, request: Request, call_next):
 # Add custom DocsAuthMiddleware
 app.add_middleware(DocsAuthMiddleware)
 
+# Add streamable HTTP middleware for JWT auth
+app.add_middleware(JWTAuthMiddlewareStreamableHttp)
+
 # Set up Jinja2 templates and store in app state for later use
 templates = Jinja2Templates(directory=str(settings.templates_dir))
 app.state.templates = templates
@@ -2028,6 +2031,9 @@ async def readiness_check(db: Session = Depends(get_db)):
 else:
     logger.warning("Admin API routes not mounted - Admin API disabled via MCPGATEWAY_ADMIN_API_ENABLED=False")
 
+# Streamable http Mount
+app.mount("/mcp", app=streamable_http_session.handle_streamable_http)
+
 # Conditional static files mounting and root redirect
 if UI_ENABLED:
     # Mount static files for UI

mcpgateway/templates/admin.html

@@ -1214,7 +1214,7 @@ <h3 class="text-lg font-bold mb-4">Add New Prompt</h3>
       <!-- Gateways Panel -->
       <div id="gateways-panel" class="tab-panel hidden">
         <div class="flex justify-between items-center mb-4">
-          <h2 class="text-2xl font-bold">Federated Gateways (MCP)</h2>
+          <h2 class="text-2xl font-bold">Federated Gateways (MCP Registry)</h2>
           <p class="text-sm text-gray-600 mt-1">Gateways are where you register external MCP servers to federate their tools/resources/prompts into your environment.</p>
           <div class="flex items-center">
             <input