skybridge 0.0.0-dev.eb9ddab → 0.0.0-dev.ebe4332

package/dist/server/express.js

@@ -2,6 +2,16 @@ import path from "node:path";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import cors from "cors";
 import express from "express";
+function parseControlPort(raw) {
+    if (raw === undefined) {
+        return null;
+    }
+    const n = Number.parseInt(raw, 10);
+    if (!Number.isFinite(n) || n <= 0 || n >= 65536) {
+        return null;
+    }
+    return n;
+}
 function applyMiddlewares(app, middlewares) {
     for (const middleware of middlewares) {
         if (middleware.path) {
@@ -22,18 +32,25 @@ function defaultErrorHandler(err, _req, res, _next) {
         });
     }
 }
-export async function createApp({ mcpServer, httpServer, customMiddleware = [], errorMiddleware = [], }) {
-    const app = express();
-    app.use(express.json());
-    const env = process.env.NODE_ENV || "development";
-    applyMiddlewares(app, customMiddleware);
-    if (env !== "production") {
+export async function createApp({ mcpServer, httpServer, errorMiddleware = [], }) {
+    const app = mcpServer.express;
+    // Read `process.env.NODE_ENV` inline: wrangler/esbuild only substitute the literal expression,
+    // so a local const would defeat dead-code elimination of the dev-only imports below.
+    if (process.env.NODE_ENV !== "production") {
         const { devtoolsStaticServer } = await import("@skybridge/devtools");
         app.use(await devtoolsStaticServer());
-        const { widgetsDevServer } = await import("./widgetsDevServer.js");
-        app.use(await widgetsDevServer(httpServer));
+        const { viewsDevServer } = await import("./viewsDevServer.js");
+        app.use(await viewsDevServer(httpServer));
+        const controlPort = parseControlPort(process.env.__TUNNEL_CONTROL_PORT);
+        if (controlPort !== null) {
+            const { createTunnelProxyRouter } = await import("./tunnel-proxy-router.js");
+            app.use(createTunnelProxyRouter(controlPort));
+        }
+        else if (process.env.__TUNNEL_CONTROL_PORT !== undefined) {
+            console.warn(`Ignoring invalid __TUNNEL_CONTROL_PORT=${process.env.__TUNNEL_CONTROL_PORT}`);
+        }
     }
-    if (env === "production") {
+    else {
         const assetsPath = path.join(process.cwd(), "dist", "assets");
         app.use("/assets", cors());
         app.use("/assets", express.static(assetsPath));
@@ -59,11 +76,18 @@ const mcpMiddleware = (server) => {
         try {
             const transport = new StreamableHTTPServerTransport({
                 sessionIdGenerator: undefined,
+                // Respond with a single JSON body instead of SSE. Skybridge's stateless
+                // transport never streams server-initiated messages, so SSE adds no
+                // capability — and on workerd specifically, `cloudflare:node`'s http
+                // bridge silently drops chunked writes that happen after the request
+                // handler awaits, which manifests as a 200 with empty body for any
+                // async tools/call.
+                enableJsonResponse: true,
             });
             res.on("close", () => {
                 transport.close();
             });
-            await server.connect(transport);
+            await server.connectStatelessTransport(transport);
             // Express strips the mount path from req.url (e.g. "/mcp" becomes "/").
             // Restore it so the SDK builds the correct requestInfo.url.
             req.url = req.originalUrl;

package/dist/server/express.js.map

@@ -1 +1 @@
-{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/server/express.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/server/express.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,SAAS,gBAAgB,CAAC,GAAuB;IAC/C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,gBAAgB,CACvB,GAAoB,EACpB,WAGE;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACpB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAAY,EACZ,IAAqB,EACrB,GAAqB,EACrB,KAA2B;IAE3B,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,uBAAuB,EAAE;YACzD,EAAE,EAAE,IAAI;SACT,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,EAC9B,SAAS,EACT,UAAU,EACV,eAAe,GAAG,EAAE,GAQrB;IACC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC;IAE9B,+FAA+F;IAC/F,qFAAqF;IACrF,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC1C,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACrE,GAAG,CAAC,GAAG,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC/D,GAAG,CAAC,GAAG,CAAC,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1C,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACxE,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAC9C,0BAA0B,CAC3B,CAAC;YACF,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;YAC3D,OAAO,CAAC,IAAI,CACV,0CAA0C,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAC9E,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE9D,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;IAE1C,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAEvC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAErC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,MAAiB,EAA0B,EAAE;IAClE,OAAO,KAAK,EACV,GAAoB,EACpB,GAAqB,EACrB,IAA0B,EAC1B,EAAE;QACF,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1B,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,CACpB,IAAI,CAAC,SAAS,CAAC;gBACb,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,qBAAqB;iBAC/B;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC;gBAClD,kBAAkB,EAAE,SAAS;gBAC7B,wEAAwE;gBACxE,oEAAoE;gBACpE,qEAAqE;gBACrE,qEAAqE;gBACrE,mEAAmE;gBACnE,oBAAoB;gBACpB,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACnB,SAAS,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;YAClD,wEAAwE;YACxE,4DAA4D;YAC5D,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC;YAC1B,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type http from \"node:http\";\nimport path from \"node:path\";\nimport { StreamableHTTPServerTransport } from \"@modelcontextprotocol/sdk/server/streamableHttp.js\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport type { McpServer } from \"./server.js\";\n\nfunction parseControlPort(raw: string | undefined): number | null {\n  if (raw === undefined) {\n    return null;\n  }\n  const n = Number.parseInt(raw, 10);\n  if (!Number.isFinite(n) || n <= 0 || n >= 65536) {\n    return null;\n  }\n  return n;\n}\n\nfunction applyMiddlewares(\n  app: express.Express,\n  middlewares: Array<{\n    path?: string;\n    handlers: express.ErrorRequestHandler[];\n  }>,\n): void {\n  for (const middleware of middlewares) {\n    if (middleware.path) {\n      app.use(middleware.path, ...middleware.handlers);\n    } else {\n      app.use(...middleware.handlers);\n    }\n  }\n}\n\nfunction defaultErrorHandler(\n  err: unknown,\n  _req: express.Request,\n  res: express.Response,\n  _next: express.NextFunction,\n) {\n  console.error(\"Error handling MCP request:\", err);\n  if (!res.headersSent) {\n    res.status(500).json({\n      jsonrpc: \"2.0\",\n      error: { code: -32603, message: \"Internal server error\" },\n      id: null,\n    });\n  }\n}\n\nexport async function createApp({\n  mcpServer,\n  httpServer,\n  errorMiddleware = [],\n}: {\n  mcpServer: McpServer;\n  httpServer: http.Server;\n  errorMiddleware?: {\n    path?: string;\n    handlers: express.ErrorRequestHandler[];\n  }[];\n}): Promise<express.Express> {\n  const app = mcpServer.express;\n\n  // Read `process.env.NODE_ENV` inline: wrangler/esbuild only substitute the literal expression,\n  // so a local const would defeat dead-code elimination of the dev-only imports below.\n  if (process.env.NODE_ENV !== \"production\") {\n    const { devtoolsStaticServer } = await import(\"@skybridge/devtools\");\n    app.use(await devtoolsStaticServer());\n    const { viewsDevServer } = await import(\"./viewsDevServer.js\");\n    app.use(await viewsDevServer(httpServer));\n\n    const controlPort = parseControlPort(process.env.__TUNNEL_CONTROL_PORT);\n    if (controlPort !== null) {\n      const { createTunnelProxyRouter } = await import(\n        \"./tunnel-proxy-router.js\"\n      );\n      app.use(createTunnelProxyRouter(controlPort));\n    } else if (process.env.__TUNNEL_CONTROL_PORT !== undefined) {\n      console.warn(\n        `Ignoring invalid __TUNNEL_CONTROL_PORT=${process.env.__TUNNEL_CONTROL_PORT}`,\n      );\n    }\n  } else {\n    const assetsPath = path.join(process.cwd(), \"dist\", \"assets\");\n\n    app.use(\"/assets\", cors());\n    app.use(\"/assets\", express.static(assetsPath));\n  }\n\n  app.use(\"/mcp\", mcpMiddleware(mcpServer));\n\n  applyMiddlewares(app, errorMiddleware);\n\n  app.use(\"/mcp\", defaultErrorHandler);\n\n  return app;\n}\n\nconst mcpMiddleware = (server: McpServer): express.RequestHandler => {\n  return async (\n    req: express.Request,\n    res: express.Response,\n    next: express.NextFunction,\n  ) => {\n    if (req.method !== \"POST\") {\n      res.writeHead(405).end(\n        JSON.stringify({\n          jsonrpc: \"2.0\",\n          error: {\n            code: -32000,\n            message: \"Method not allowed.\",\n          },\n          id: null,\n        }),\n      );\n      return;\n    }\n\n    try {\n      const transport = new StreamableHTTPServerTransport({\n        sessionIdGenerator: undefined,\n        // Respond with a single JSON body instead of SSE. Skybridge's stateless\n        // transport never streams server-initiated messages, so SSE adds no\n        // capability — and on workerd specifically, `cloudflare:node`'s http\n        // bridge silently drops chunked writes that happen after the request\n        // handler awaits, which manifests as a 200 with empty body for any\n        // async tools/call.\n        enableJsonResponse: true,\n      });\n\n      res.on(\"close\", () => {\n        transport.close();\n      });\n\n      await server.connectStatelessTransport(transport);\n      // Express strips the mount path from req.url (e.g. \"/mcp\" becomes \"/\").\n      // Restore it so the SDK builds the correct requestInfo.url.\n      req.url = req.originalUrl;\n      await transport.handleRequest(req, res, req.body);\n    } catch (error) {\n      next(error);\n    }\n  };\n};\n"]}

package/dist/server/express.test.js

@@ -1,12 +1,12 @@
 import http from "node:http";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { McpServer } from "./server.js";
 vi.mock("@skybridge/devtools", () => ({
     devtoolsStaticServer: () => ((_req, _res, next) => next()),
 }));
-vi.mock("./widgetsDevServer.js", () => ({
-    widgetsDevServer: (_httpServer) => ((_req, _res, next) => next()),
+vi.mock("./viewsDevServer.js", () => ({
+    viewsDevServer: (_httpServer) => ((_req, _res, next) => next()),
 }));
-const fakeServer = {};
 async function listen(app) {
     const server = http.createServer(app);
     await new Promise((resolve) => server.listen(0, resolve));
@@ -25,6 +25,94 @@ async function postMcp(port) {
 async function postApi(port) {
     return fetch(`http://localhost:${port}/api/test`, { method: "POST" });
 }
+describe("McpServer.express", () => {
+    it("exposes a ready Express app immediately after construction", () => {
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        expect(server.express).toBeDefined();
+        expect(typeof server.express.use).toBe("function");
+        expect(typeof server.express.get).toBe("function");
+    });
+    it("server.express.get registers a route reachable alongside /mcp", async () => {
+        const { createApp } = await import("./express.js");
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.express.get("/health", (_req, res) => {
+            res.json({ status: "ok" });
+        });
+        const httpServer = http.createServer();
+        await createApp({ mcpServer: server, httpServer });
+        const { port, server: listening } = await listen(server.express);
+        openServer = listening;
+        const health = await fetch(`http://localhost:${port}/health`);
+        expect(health.status).toBe(200);
+        expect(await health.json()).toEqual({ status: "ok" });
+        // /mcp still works (POST returns 200/4xx, not 404)
+        const mcp = await postMcp(port);
+        expect(mcp.status).not.toBe(404);
+    });
+    it("server.use and server.express.use produce the same registration order", async () => {
+        const { createApp } = await import("./express.js");
+        const callsA = [];
+        const callsB = [];
+        const buildServer = () => new McpServer({ name: "t", version: "0.0.0" });
+        const sA = buildServer();
+        sA.use((_req, _res, next) => {
+            callsA.push("first");
+            next();
+        });
+        sA.express.use((_req, _res, next) => {
+            callsA.push("second");
+            next();
+        });
+        const sB = buildServer();
+        sB.express.use((_req, _res, next) => {
+            callsB.push("first");
+            next();
+        });
+        sB.use((_req, _res, next) => {
+            callsB.push("second");
+            next();
+        });
+        for (const s of [sA, sB]) {
+            s.express.get("/probe", (_req, res) => res.json({ ok: true }));
+            const httpServer = http.createServer();
+            await createApp({ mcpServer: s, httpServer });
+            const { port, server: listening } = await listen(s.express);
+            openServer = listening;
+            await fetch(`http://localhost:${port}/probe`);
+            listening.close();
+        }
+        expect(callsA).toEqual(["first", "second"]);
+        expect(callsB).toEqual(["first", "second"]);
+    });
+    it("useOnError still wraps thrown /mcp errors after the route is mounted", async () => {
+        const { createApp } = await import("./express.js");
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        // Register the error handler BEFORE createApp — useOnError should still
+        // apply it after /mcp, so /mcp errors hit it.
+        const seen = [];
+        server.useOnError((_err, _req, res, _next) => {
+            seen.push("useOnError");
+            res.status(503).json({ from: "useOnError" });
+        });
+        // Force the /mcp handler to throw so the error pipeline runs.
+        vi.spyOn(server, "connectStatelessTransport").mockRejectedValue(new Error("boom"));
+        const httpServer = http.createServer();
+        await createApp({
+            mcpServer: server,
+            httpServer,
+            // Mirror what run() does: forward the McpServer's useOnError handlers
+            // to createApp so they get applied after /mcp.
+            // biome-ignore lint/complexity/useLiteralKeys: test mirrors run() internals to verify useOnError ordering
+            errorMiddleware: server["customErrorMiddleware"],
+        });
+        const { port, server: listening } = await listen(server.express);
+        openServer = listening;
+        const res = await postMcp(port);
+        expect(seen).toEqual(["useOnError"]);
+        expect(res.status).toBe(503);
+        expect(await res.json()).toEqual({ from: "useOnError" });
+    });
+});
 describe("createApp", () => {
     it("runs global custom middleware before the /mcp handler", async () => {
         const { createApp } = await import("./express.js");
@@ -33,14 +121,12 @@ describe("createApp", () => {
             calls.push("custom");
             next();
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use(mw);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ handlers: [mw] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         await postMcp(port);
         expect(calls).toEqual(["custom"]);
     });
@@ -51,14 +137,12 @@ describe("createApp", () => {
             calls.push("auth");
             next();
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use("/mcp", mw);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ path: "/mcp", handlers: [mw] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         await postMcp(port);
         expect(calls).toEqual(["auth"]);
     });
@@ -69,14 +153,12 @@ describe("createApp", () => {
             calls.push("reject");
             res.status(401).json({ error: "Unauthorized" });
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use("/mcp", reject);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ path: "/mcp", handlers: [reject] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await postMcp(port);
         expect(calls).toEqual(["reject"]);
         expect(res.status).toBe(401);
@@ -93,14 +175,13 @@ describe("createApp", () => {
             calls.push("B");
             next();
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use(mwA);
+        server.use(mwB);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ handlers: [mwA] }, { handlers: [mwB] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         await postMcp(port);
         expect(calls).toEqual(["A", "B"]);
     });
@@ -111,14 +192,12 @@ describe("createApp", () => {
             calls.push("api");
             next();
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use("/api", apiMw);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ path: "/api", handlers: [apiMw] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         // Hit /mcp — the /api middleware should NOT fire
         await postMcp(port);
         expect(calls).toEqual([]);
@@ -130,14 +209,12 @@ describe("createApp", () => {
         router.get("/health", (_req, res) => {
             res.json({ status: "ok" });
         });
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use(router);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ handlers: [router] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await fetch(`http://localhost:${port}/health`);
         expect(res.status).toBe(200);
         expect(await res.json()).toEqual({ status: "ok" });
@@ -149,16 +226,12 @@ describe("createApp", () => {
         router.get("/data", (_req, res) => {
             res.json({ value: 42 });
         });
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use("/api", router);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [
-                { path: "/api", handlers: [router] },
-            ],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await fetch(`http://localhost:${port}/api/data`);
         expect(res.status).toBe(200);
         expect(await res.json()).toEqual({ value: 42 });
@@ -168,14 +241,12 @@ describe("createApp", () => {
         const throwing = () => {
             throw new Error("boom");
         };
+        const server = new McpServer({ name: "t", version: "0.0.0" });
+        server.use("/explode", throwing);
         const httpServer = http.createServer();
-        const app = await createApp({
-            mcpServer: fakeServer,
-            httpServer,
-            customMiddleware: [{ path: "/explode", handlers: [throwing] }],
-        });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer: server, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await fetch(`http://localhost:${port}/explode`);
         expect(res.status).toBe(500);
         // Server process did not crash — it still accepts connections
@@ -185,10 +256,15 @@ describe("createApp", () => {
     it("returns 500 JSON-RPC error when the MCP handler throws and no error middleware is registered", async () => {
         const { createApp } = await import("./express.js");
         const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        const mcpServer = new McpServer({ name: "t", version: "0.0.0" });
+        // Force the express-level error path: make connectStatelessTransport
+        // reject so the request handler hits its try/catch and calls next(error),
+        // which lands in the default /mcp error handler.
+        vi.spyOn(mcpServer, "connectStatelessTransport").mockRejectedValue(new Error("boom"));
         const httpServer = http.createServer();
-        const app = await createApp({ mcpServer: fakeServer, httpServer });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const app = await createApp({ mcpServer, httpServer });
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await postMcp(port);
         expect(res.status).toBe(500);
         expect(await res.json()).toEqual({
@@ -206,14 +282,16 @@ describe("createApp", () => {
             calls.push("error-handler");
             res.status(503).json({ custom: true });
         };
+        const mcpServer = new McpServer({ name: "t", version: "0.0.0" });
+        vi.spyOn(mcpServer, "connectStatelessTransport").mockRejectedValue(new Error("boom"));
         const httpServer = http.createServer();
         const app = await createApp({
-            mcpServer: fakeServer,
+            mcpServer,
             httpServer,
             errorMiddleware: [{ handlers: [errorHandler] }],
         });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const res = await postMcp(port);
         expect(calls).toEqual(["error-handler"]);
         expect(res.status).toBe(503);
@@ -229,15 +307,17 @@ describe("createApp", () => {
         const throwingApiRoute = (_req, _res, next) => {
             next(new Error("api error"));
         };
+        const mcpServer = new McpServer({ name: "t", version: "0.0.0" });
+        vi.spyOn(mcpServer, "connectStatelessTransport").mockRejectedValue(new Error("boom"));
+        mcpServer.use("/api/test", throwingApiRoute);
         const httpServer = http.createServer();
         const app = await createApp({
-            mcpServer: fakeServer,
+            mcpServer,
             httpServer,
-            customMiddleware: [{ path: "/api/test", handlers: [throwingApiRoute] }],
             errorMiddleware: [{ path: "/mcp", handlers: [mcpErrorHandler] }],
         });
-        const { port, server } = await listen(app);
-        openServer = server;
+        const { port, server: httpListening } = await listen(app);
+        openServer = httpListening;
         const mcpRes = await postMcp(port);
         expect(calls).toEqual(["mcp-error-handler"]);
         expect(mcpRes.status).toBe(503);
@@ -248,5 +328,103 @@ describe("createApp", () => {
         expect(apiRes.status).toBe(500);
         consoleSpy.mockRestore();
     });
+    it("handles concurrent /mcp requests without 'Already connected to a transport'", async () => {
+        const { createApp } = await import("./express.js");
+        const mcpServer = new McpServer({
+            name: "concurrent-test",
+            version: "0.0.0",
+        });
+        // Slow tool: keeps the underlying transport bound long enough to overlap
+        // with concurrent requests, exposing the shared-McpServer race.
+        mcpServer.registerTool({ name: "slow", description: "slow" }, async () => {
+            await new Promise((r) => setTimeout(r, 50));
+            return { content: [{ type: "text", text: "done" }] };
+        });
+        const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        const httpServer = http.createServer();
+        const app = await createApp({ mcpServer, httpServer });
+        const { port, server } = await listen(app);
+        openServer = server;
+        const callBody = (id) => JSON.stringify({
+            jsonrpc: "2.0",
+            method: "tools/call",
+            id,
+            params: { name: "slow", arguments: {} },
+        });
+        const N = 10;
+        const responses = await Promise.all(Array.from({ length: N }, (_, i) => fetch(`http://localhost:${port}/mcp`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json, text/event-stream",
+            },
+            body: callBody(i + 1),
+        })));
+        expect(responses.map((r) => r.status)).toEqual(Array(N).fill(200));
+        expect(consoleSpy).not.toHaveBeenCalledWith("Error handling MCP request:", expect.any(Error));
+        consoleSpy.mockRestore();
+    });
+});
+describe("createApp tunnel routes", () => {
+    it("proxies POST /__skybridge/tunnel to the cli control server in dev mode", async () => {
+        // Stand up a fake control listener that returns a known JSON body.
+        const control = http.createServer((_req, res) => {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end('{"status":"idle"}');
+        });
+        await new Promise((resolve) => control.listen(0, "127.0.0.1", resolve));
+        const controlAddr = control.address();
+        if (typeof controlAddr === "string" || controlAddr === null) {
+            control.close();
+            throw new Error("control server has no address");
+        }
+        const controlPort = controlAddr.port;
+        const prev = process.env.__TUNNEL_CONTROL_PORT;
+        process.env.__TUNNEL_CONTROL_PORT = String(controlPort);
+        try {
+            const { createApp } = await import("./express.js");
+            const mcpServer = new McpServer({ name: "t", version: "0.0.0" });
+            const httpServer = http.createServer();
+            const app = await createApp({ mcpServer, httpServer });
+            const { port, server } = await listen(app);
+            openServer = server;
+            const res = await fetch(`http://localhost:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(200);
+            expect(await res.json()).toEqual({ status: "idle" });
+        }
+        finally {
+            if (prev === undefined) {
+                delete process.env.__TUNNEL_CONTROL_PORT;
+            }
+            else {
+                process.env.__TUNNEL_CONTROL_PORT = prev;
+            }
+            await new Promise((resolve) => control.close(() => resolve()));
+        }
+    });
+    it("does not expose /__skybridge/tunnel in production mode", async () => {
+        const prevEnv = process.env.NODE_ENV;
+        process.env.NODE_ENV = "production";
+        try {
+            vi.resetModules();
+            const { createApp } = await import("./express.js");
+            const { McpServer: ReloadedMcpServer } = await import("./server.js");
+            const mcpServer = new ReloadedMcpServer({ name: "t", version: "0.0.0" });
+            const httpServer = http.createServer();
+            const app = await createApp({ mcpServer, httpServer });
+            const { port, server } = await listen(app);
+            openServer = server;
+            const res = await fetch(`http://localhost:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(404);
+        }
+        finally {
+            process.env.NODE_ENV = prevEnv;
+            vi.resetModules();
+        }
+    });
 });
 //# sourceMappingURL=express.test.js.map