skybridge 2.0.0-beta.dd3cba3 → 2.0.0

package/dist/server/express.js

@@ -3,28 +3,21 @@ import { toNodeHandler } from "@modelcontextprotocol/node";
 import { createMcpHandler, UnsupportedProtocolVersionError, } from "@modelcontextprotocol/server";
 import cors from "cors";
 import express from "express";
-const mcpHandlers = new WeakMap();
 /**
- * The memoized `/mcp` fetch handler for a {@link Skybridge} app: a `Request` →
- * `Response` function that builds a fresh MCP server per request. One handler
- * per app, shared by the Express middleware and the shutdown drain.
+ * The `/mcp` fetch handler for a {@link Skybridge} app: a `Request` →
+ * `Response` function that builds a fresh MCP server per request.
  *
  * @internal
  */
-export function getMcpHandler(skybridgeApp) {
-    let handler = mcpHandlers.get(skybridgeApp);
-    if (!handler) {
-        handler = createMcpHandler(() => skybridgeApp.createServerInstance(), {
-            onerror: (error) => {
-                if (error instanceof UnsupportedProtocolVersionError) {
-                    return;
-                }
-                console.error("Error handling MCP request:", error);
-            },
-        });
-        mcpHandlers.set(skybridgeApp, handler);
-    }
-    return handler;
+export function buildMcpHandler(skybridgeApp) {
+    return createMcpHandler(() => skybridgeApp.createServerInstance(), {
+        onerror: (error) => {
+            if (error instanceof UnsupportedProtocolVersionError) {
+                return;
+            }
+            console.error("Error handling MCP request:", error);
+        },
+    });
 }
 /**
  * Build the bare Express app a {@link Skybridge} instance owns: the instance
@@ -68,7 +61,8 @@ function defaultErrorHandler(err, _req, res, _next) {
         });
     }
 }
-export async function createApp({ app: skybridgeApp, httpServer, errorMiddleware = [], }) {
+export async function createApp({ app: skybridgeApp, httpServer, mcpHandler, errorMiddleware = [], }) {
+    await skybridgeApp.ready();
     const app = skybridgeApp.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.
@@ -91,13 +85,13 @@ export async function createApp({ app: skybridgeApp, httpServer, errorMiddleware
         app.use("/assets", cors());
         app.use("/assets", express.static(assetsPath));
     }
-    app.use("/mcp", mcpMiddleware(skybridgeApp));
+    app.use("/mcp", mcpMiddleware(mcpHandler ?? buildMcpHandler(skybridgeApp)));
     applyMiddlewares(app, errorMiddleware);
     app.use("/mcp", defaultErrorHandler);
     return app;
 }
-const mcpMiddleware = (skybridgeApp) => {
-    const handler = toNodeHandler(getMcpHandler(skybridgeApp));
+const mcpMiddleware = (mcpHandler) => {
+    const handler = toNodeHandler(mcpHandler);
     return async (req, res, next) => {
         try {
             // Express strips the mount path from req.url (e.g. "/mcp" becomes "/").

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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","sourcesContent":["import type http from \"node:http\";\nimport path from \"node:path\";\nimport { toNodeHandler } from \"@modelcontextprotocol/node\";\nimport {\n  createMcpHandler,\n  type McpHttpHandler,\n  UnsupportedProtocolVersionError,\n} from \"@modelcontextprotocol/server\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport type { Skybridge } from \"./app.js\";\nimport type { JsonOptions } from \"./server.js\";\n\ntype SkybridgeApp = Pick<Skybridge, \"express\" | \"createServerInstance\">;\n\nconst mcpHandlers = new WeakMap<SkybridgeApp, McpHttpHandler>();\n\n/**\n * The memoized `/mcp` fetch handler for a {@link Skybridge} app: a `Request` →\n * `Response` function that builds a fresh MCP server per request. One handler\n * per app, shared by the Express middleware and the shutdown drain.\n *\n * @internal\n */\nexport function getMcpHandler(skybridgeApp: SkybridgeApp): McpHttpHandler {\n  let handler = mcpHandlers.get(skybridgeApp);\n  if (!handler) {\n    handler = createMcpHandler(() => skybridgeApp.createServerInstance(), {\n      onerror: (error) => {\n        if (error instanceof UnsupportedProtocolVersionError) {\n          return;\n        }\n        console.error(\"Error handling MCP request:\", error);\n      },\n    });\n    mcpHandlers.set(skybridgeApp, handler);\n  }\n  return handler;\n}\n\n/**\n * Build the bare Express app a {@link Skybridge} instance owns: the instance\n * plus the built-in `express.json()` body parser, tuned by the `json` config\n * field.\n *\n * @internal\n */\nexport function createBaseApp(json?: JsonOptions): express.Express {\n  const app = express();\n  app.use(express.json(json));\n  return app;\n}\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  app: skybridgeApp,\n  httpServer,\n  errorMiddleware = [],\n}: {\n  app: SkybridgeApp;\n  httpServer: http.Server;\n  errorMiddleware?: {\n    path?: string;\n    handlers: express.ErrorRequestHandler[];\n  }[];\n}): Promise<express.Express> {\n  const app = skybridgeApp.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(skybridgeApp));\n\n  applyMiddlewares(app, errorMiddleware);\n\n  app.use(\"/mcp\", defaultErrorHandler);\n\n  return app;\n}\n\nconst mcpMiddleware = (skybridgeApp: SkybridgeApp): express.RequestHandler => {\n  const handler = toNodeHandler(getMcpHandler(skybridgeApp));\n\n  return async (\n    req: express.Request,\n    res: express.Response,\n    next: express.NextFunction,\n  ) => {\n    try {\n      // Express strips the mount path from req.url (e.g. \"/mcp\" becomes \"/\").\n      // Restore it so the SDK builds the correct request URL.\n      req.url = req.originalUrl;\n      await handler(req, res, req.body);\n    } catch (error) {\n      next(error);\n    }\n  };\n};\n"]}
+{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/server/express.ts"],"names":[],"mappings":"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","sourcesContent":["import type http from \"node:http\";\nimport path from \"node:path\";\nimport { toNodeHandler } from \"@modelcontextprotocol/node\";\nimport {\n  createMcpHandler,\n  type McpHttpHandler,\n  UnsupportedProtocolVersionError,\n} from \"@modelcontextprotocol/server\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport type { Skybridge } from \"./app.js\";\nimport type { JsonOptions } from \"./server.js\";\n\ntype SkybridgeApp = Pick<\n  Skybridge,\n  \"express\" | \"createServerInstance\" | \"ready\"\n>;\n\n/**\n * The `/mcp` fetch handler for a {@link Skybridge} app: a `Request` →\n * `Response` function that builds a fresh MCP server per request.\n *\n * @internal\n */\nexport function buildMcpHandler(skybridgeApp: SkybridgeApp): McpHttpHandler {\n  return createMcpHandler(() => skybridgeApp.createServerInstance(), {\n    onerror: (error) => {\n      if (error instanceof UnsupportedProtocolVersionError) {\n        return;\n      }\n      console.error(\"Error handling MCP request:\", error);\n    },\n  });\n}\n\n/**\n * Build the bare Express app a {@link Skybridge} instance owns: the instance\n * plus the built-in `express.json()` body parser, tuned by the `json` config\n * field.\n *\n * @internal\n */\nexport function createBaseApp(json?: JsonOptions): express.Express {\n  const app = express();\n  app.use(express.json(json));\n  return app;\n}\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  app: skybridgeApp,\n  httpServer,\n  mcpHandler,\n  errorMiddleware = [],\n}: {\n  app: SkybridgeApp;\n  httpServer: http.Server;\n  mcpHandler?: McpHttpHandler;\n  errorMiddleware?: {\n    path?: string;\n    handlers: express.ErrorRequestHandler[];\n  }[];\n}): Promise<express.Express> {\n  await skybridgeApp.ready();\n  const app = skybridgeApp.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(mcpHandler ?? buildMcpHandler(skybridgeApp)));\n\n  applyMiddlewares(app, errorMiddleware);\n\n  app.use(\"/mcp\", defaultErrorHandler);\n\n  return app;\n}\n\nconst mcpMiddleware = (mcpHandler: McpHttpHandler): express.RequestHandler => {\n  const handler = toNodeHandler(mcpHandler);\n\n  return async (\n    req: express.Request,\n    res: express.Response,\n    next: express.NextFunction,\n  ) => {\n    try {\n      // Express strips the mount path from req.url (e.g. \"/mcp\" becomes \"/\").\n      // Restore it so the SDK builds the correct request URL.\n      req.url = req.originalUrl;\n      await handler(req, res, req.body);\n    } catch (error) {\n      next(error);\n    }\n  };\n};\n"]}

package/dist/server/express.test.js

@@ -28,14 +28,22 @@ async function postApi(port) {
 }
 describe("Skybridge.express", () => {
     it("exposes a ready Express app immediately after construction", () => {
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         expect(app.express).toBeDefined();
         expect(typeof app.express.use).toBe("function");
         expect(typeof app.express.get).toBe("function");
     });
     it("app.express.get registers a route reachable alongside /mcp", async () => {
         const { createApp } = await import("./express.js");
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.express.get("/health", (_req, res) => {
             res.json({ status: "ok" });
         });
@@ -54,7 +62,11 @@ describe("Skybridge.express", () => {
         const { createApp } = await import("./express.js");
         const callsA = [];
         const callsB = [];
-        const buildApp = () => new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const buildApp = () => new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         const sA = buildApp();
         sA.use((_req, _res, next) => {
             callsA.push("first");
@@ -87,7 +99,11 @@ describe("Skybridge.express", () => {
     });
     it("useOnError still wraps thrown /mcp errors after the route is mounted", async () => {
         const { createApp } = await import("./express.js");
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         // Register the error handler BEFORE createApp — useOnError should still
         // apply it after /mcp, so /mcp errors hit it.
         const seen = [];
@@ -126,7 +142,12 @@ describe("Skybridge JSON body parser options", () => {
         });
     }
     it("forwards json options to express.json", async () => {
-        const app = new Skybridge({ name: "t", version: "0.0.0", json: { limit: "10mb" } }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            json: { limit: "10mb" },
+            handler: (server) => server,
+        });
         app.express.post("/echo", (req, res) => {
             res.json({ received: req.body.data.length });
         });
@@ -137,7 +158,11 @@ describe("Skybridge JSON body parser options", () => {
         expect(await res.json()).toEqual({ received: 200 * 1024 });
     });
     it("keeps the default 100kb limit when no options are passed", async () => {
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.express.post("/echo", (_req, res) => {
             res.json({ ok: true });
         });
@@ -155,7 +180,11 @@ describe("createApp", () => {
             calls.push("custom");
             next();
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use(mw);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -171,7 +200,11 @@ describe("createApp", () => {
             calls.push("auth");
             next();
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/mcp", mw);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -187,7 +220,11 @@ describe("createApp", () => {
             calls.push("reject");
             res.status(401).json({ error: "Unauthorized" });
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/mcp", reject);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -209,7 +246,11 @@ describe("createApp", () => {
             calls.push("B");
             next();
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use(mwA);
         app.use(mwB);
         const httpServer = http.createServer();
@@ -226,7 +267,11 @@ describe("createApp", () => {
             calls.push("api");
             next();
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/api", apiMw);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -243,7 +288,11 @@ describe("createApp", () => {
         router.get("/health", (_req, res) => {
             res.json({ status: "ok" });
         });
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use(router);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -260,7 +309,11 @@ describe("createApp", () => {
         router.get("/data", (_req, res) => {
             res.json({ value: 42 });
         });
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/api", router);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -275,7 +328,11 @@ describe("createApp", () => {
         const throwing = () => {
             throw new Error("boom");
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/explode", throwing);
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
@@ -290,7 +347,11 @@ 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 app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         // Force the express-level error path: make a /mcp middleware throw so the
         // error pipeline runs and lands in the default /mcp error handler.
         app.use("/mcp", () => {
@@ -317,7 +378,11 @@ describe("createApp", () => {
             calls.push("error-handler");
             res.status(503).json({ custom: true });
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/mcp", () => {
             throw new Error("boom");
         });
@@ -344,7 +409,11 @@ describe("createApp", () => {
         const throwingApiRoute = (_req, _res, next) => {
             next(new Error("api error"));
         };
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server,
+        });
         app.use("/mcp", () => {
             throw new Error("boom");
         });
@@ -371,10 +440,14 @@ describe("createApp", () => {
         const { createApp } = await import("./express.js");
         // Slow tool: keeps the underlying transport bound long enough to overlap
         // with concurrent requests, exposing the shared-McpServer race.
-        const app = new Skybridge({ name: "concurrent-test", version: "0.0.0" }, (server) => server.registerTool({ name: "slow", description: "slow" }, async () => {
-            await new Promise((r) => setTimeout(r, 50));
-            return { content: [{ type: "text", text: "done" }] };
-        }));
+        const app = new Skybridge({
+            name: "concurrent-test",
+            version: "0.0.0",
+            handler: (server) => server.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 expressApp = await createApp({ app, httpServer });
@@ -409,7 +482,11 @@ describe("createApp Vercel mode", () => {
         try {
             vi.resetModules();
             const { Skybridge: Reloaded } = await import("./app.js");
-            const app = new Reloaded({ name: "t", version: "0.0.0" }, (server) => server);
+            const app = new Reloaded({
+                name: "t",
+                version: "0.0.0",
+                handler: (server) => server,
+            });
             const result = await app.run();
             expect(typeof result).toBe("function");
             expect(result).toBe(app.express);
@@ -448,7 +525,11 @@ describe("createApp tunnel routes", () => {
         process.env.__TUNNEL_CONTROL_PORT = String(controlPort);
         try {
             const { createApp } = await import("./express.js");
-            const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server);
+            const app = new Skybridge({
+                name: "t",
+                version: "0.0.0",
+                handler: (server) => server,
+            });
             const httpServer = http.createServer();
             const expressApp = await createApp({ app, httpServer });
             const { port, server } = await listen(expressApp);
@@ -476,7 +557,11 @@ describe("createApp tunnel routes", () => {
             vi.resetModules();
             const { createApp } = await import("./express.js");
             const { Skybridge: ReloadedSkybridge } = await import("./app.js");
-            const app = new ReloadedSkybridge({ name: "t", version: "0.0.0" }, (server) => server);
+            const app = new ReloadedSkybridge({
+                name: "t",
+                version: "0.0.0",
+                handler: (server) => server,
+            });
             const httpServer = http.createServer();
             const expressApp = await createApp({ app, httpServer });
             const { port, server } = await listen(expressApp);
@@ -495,13 +580,17 @@ describe("createApp tunnel routes", () => {
 describe("createApp mount path", () => {
     it("serves /mcp with the mount path intact on the request URL", async () => {
         const { createApp } = await import("./express.js");
-        const app = new Skybridge({ name: "t", version: "0.0.0" }, (server) => server.registerTool({
-            name: "echo-url",
-            description: "Echoes the request URL.",
-            inputSchema: {},
-        }, (_args, extra) => ({
-            content: [{ type: "text", text: extra.http?.req?.url ?? "" }],
-        })));
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            handler: (server) => server.registerTool({
+                name: "echo-url",
+                description: "Echoes the request URL.",
+                inputSchema: {},
+            }, (_args, extra) => ({
+                content: [{ type: "text", text: extra.http?.req?.url ?? "" }],
+            })),
+        });
         const httpServer = http.createServer();
         const expressApp = await createApp({ app, httpServer });
         const { port, server } = await listen(expressApp);