feat(mcp): expose client options in streamableHTTPApp

Author: stainless-app[bot]

packages/mcp-server/src/http.ts

@@ -6,14 +6,20 @@ import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/
 import express from 'express';
 import { fromError } from 'zod-validation-error/v3';
 import { McpOptions, parseQueryOptions } from './options';
-import { initMcpServer, newMcpServer } from './server';
+import { ClientOptions, initMcpServer, newMcpServer } from './server';
 import { parseAuthHeaders } from './headers';
 
-const newServer = (
-  defaultMcpOptions: McpOptions,
-  req: express.Request,
-  res: express.Response,
-): McpServer | null => {
+const newServer = ({
+  clientOptions,
+  mcpOptions: defaultMcpOptions,
+  req,
+  res,
+}: {
+  clientOptions: ClientOptions;
+  mcpOptions: McpOptions;
+  req: express.Request;
+  res: express.Response;
+}): McpServer | null => {
   const server = newMcpServer();
 
   let mcpOptions: McpOptions;
@@ -35,10 +41,8 @@ const newServer = (
     initMcpServer({
       server: server,
       clientOptions: {
+        ...clientOptions,
         ...authOptions,
-        defaultHeaders: {
-          'X-Stainless-MCP': 'true',
-        },
       },
       mcpOptions,
     });
@@ -56,17 +60,19 @@ const newServer = (
   return server;
 };
 
-const post = (defaultOptions: McpOptions) => async (req: express.Request, res: express.Response) => {
-  const server = newServer(defaultOptions, req, res);
-  // If we return null, we already set the authorization error.
-  if (server === null) return;
-  const transport = new StreamableHTTPServerTransport({
-    // Stateless server
-    sessionIdGenerator: undefined,
-  });
-  await server.connect(transport);
-  await transport.handleRequest(req, res, req.body);
-};
+const post =
+  (options: { clientOptions: ClientOptions; mcpOptions: McpOptions }) =>
+  async (req: express.Request, res: express.Response) => {
+    const server = newServer({ ...options, req, res });
+    // If we return null, we already set the authorization error.
+    if (server === null) return;
+    const transport = new StreamableHTTPServerTransport({
+      // Stateless server
+      sessionIdGenerator: undefined,
+    });
+    await server.connect(transport);
+    await transport.handleRequest(req, res, req.body);
+  };
 
 const get = async (req: express.Request, res: express.Response) => {
   res.status(405).json({
@@ -88,20 +94,26 @@ const del = async (req: express.Request, res: express.Response) => {
   });
 };
 
-export const streamableHTTPApp = (options: McpOptions): express.Express => {
+export const streamableHTTPApp = ({
+  clientOptions = {},
+  mcpOptions = {},
+}: {
+  clientOptions?: ClientOptions;
+  mcpOptions?: McpOptions;
+}): express.Express => {
   const app = express();
   app.set('query parser', 'extended');
   app.use(express.json());
 
   app.get('/', get);
-  app.post('/', post(options));
+  app.post('/', post({ clientOptions, mcpOptions }));
   app.delete('/', del);
 
   return app;
 };
 
 export const launchStreamableHTTPServer = async (options: McpOptions, port: number | string | undefined) => {
-  const app = streamableHTTPApp(options);
+  const app = streamableHTTPApp({ mcpOptions: options });
   const server = app.listen(port);
   const address = server.address();