skybridge 0.0.0-dev.81fd90a → 0.0.0-dev.8226541

package/dist/server/mcp-errors.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-errors.test.js","sourceRoot":"","sources":["../../src/server/mcp-errors.test.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,oBAAoB,EAAE,GAAG,EAAE,CACzB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,cAAc,EAAE,GAAG,EAAE,CACnB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AAEJ,IAAI,UAAmC,CAAC;AACxC,SAAS,CAAC,GAAG,EAAE;IACb,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,EAAE,CAAC,eAAe,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAC7E,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;QACxE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,UAAU,GAAG,SAAS,CAAC;IACvB,MAAM,IAAI,GAAI,SAAS,CAAC,OAAO,EAAuB,CAAC,IAAI,CAAC;IAE5D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,MAAM,EAAE;QACtD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;KACtE,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAC/B,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CACnD,CACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC,CAAC,CAAC","sourcesContent":["// @vitest-environment node\nimport http from \"node:http\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, expect, it, vi } from \"vitest\";\nimport { McpServer } from \"./server.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\n\nlet openServer: http.Server | undefined;\nafterEach(() => {\n  openServer?.close();\n  vi.restoreAllMocks();\n});\n\nit(\"reports a failure inside the MCP leg instead of swallowing it\", async () => {\n  const { createApp } = await import(\"./express.js\");\n  const server = new McpServer({ name: \"t\", version: \"0.0.0\" });\n  vi.spyOn(server, \"createStatelessServerInstance\").mockImplementation(() => {\n    throw new Error(\"boom\");\n  });\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n\n  const httpServer = http.createServer();\n  const app = await createApp({ mcpServer: server, httpServer });\n  const listening = http.createServer(app);\n  await new Promise<void>((r) => listening.listen(0, r));\n  openServer = listening;\n  const port = (listening.address() as { port: number }).port;\n\n  const res = await fetch(`http://localhost:${port}/mcp`, {\n    method: \"POST\",\n    headers: { \"content-type\": \"application/json\" },\n    body: JSON.stringify({ jsonrpc: \"2.0\", id: 1, method: \"initialize\" }),\n  });\n\n  expect(res.status).toBeGreaterThanOrEqual(500);\n  expect(\n    errors.mock.calls.some(([msg]) =>\n      String(msg).includes(\"Error handling MCP request\"),\n    ),\n  ).toBe(true);\n});\n"]}
+{"version":3,"file":"mcp-errors.test.js","sourceRoot":"","sources":["../../src/server/mcp-errors.test.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,oBAAoB,EAAE,GAAG,EAAE,CACzB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,cAAc,EAAE,GAAG,EAAE,CACnB,CAAC,CAAC,EAAW,EAAE,EAAW,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAmB;CACvE,CAAC,CAAC,CAAC;AAEJ,IAAI,UAAmC,CAAC;AACxC,SAAS,CAAC,GAAG,EAAE;IACb,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,EAAE,CAAC,eAAe,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAC7E,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;QAC5D,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,UAAU,GAAG,SAAS,CAAC;IACvB,MAAM,IAAI,GAAI,SAAS,CAAC,OAAO,EAAuB,CAAC,IAAI,CAAC;IAE5D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,MAAM,EAAE;QACtD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;KACtE,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAC/B,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CACnD,CACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC,CAAC,CAAC","sourcesContent":["// @vitest-environment node\nimport http from \"node:http\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, expect, it, vi } from \"vitest\";\nimport { Skybridge } from \"./app.js\";\n\nvi.mock(\"@skybridge/devtools\", () => ({\n  devtoolsStaticServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\nvi.mock(\"./viewsDevServer.js\", () => ({\n  viewsDevServer: () =>\n    ((_r: unknown, _s: unknown, n: () => void) => n()) as RequestHandler,\n}));\n\nlet openServer: http.Server | undefined;\nafterEach(() => {\n  openServer?.close();\n  vi.restoreAllMocks();\n});\n\nit(\"reports a failure inside the MCP leg instead of swallowing it\", async () => {\n  const { createApp } = await import(\"./express.js\");\n  const app = new Skybridge({\n    name: \"t\",\n    version: \"0.0.0\",\n    handler: (server) => server,\n  });\n  vi.spyOn(app, \"createServerInstance\").mockImplementation(() => {\n    throw new Error(\"boom\");\n  });\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n\n  const httpServer = http.createServer();\n  const expressApp = await createApp({ app, httpServer });\n  const listening = http.createServer(expressApp);\n  await new Promise<void>((r) => listening.listen(0, r));\n  openServer = listening;\n  const port = (listening.address() as { port: number }).port;\n\n  const res = await fetch(`http://localhost:${port}/mcp`, {\n    method: \"POST\",\n    headers: { \"content-type\": \"application/json\" },\n    body: JSON.stringify({ jsonrpc: \"2.0\", id: 1, method: \"initialize\" }),\n  });\n\n  expect(res.status).toBeGreaterThanOrEqual(500);\n  expect(\n    errors.mock.calls.some(([msg]) =>\n      String(msg).includes(\"Error handling MCP request\"),\n    ),\n  ).toBe(true);\n});\n"]}

package/dist/server/middleware.test.js

@@ -1,8 +1,8 @@
 import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { describe, expect, it, vi } from "vitest";
 import { z } from "zod";
+import { Skybridge } from "./app.js";
 import { buildMiddlewareChain, getHandlerMaps, getToolError, matchesFilter, } from "./middleware.js";
-import { McpServer } from "./server.js";
 // ---------------------------------------------------------------------------
 // matchesFilter
 // ---------------------------------------------------------------------------
@@ -207,29 +207,42 @@ describe("McpServer.mcpMiddleware()", () => {
         return new Client({ name: "test-client", version: "1.0.0" });
     }
     it("returns this for chaining", () => {
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        const result = server.mcpMiddleware(async (_req, _extra, next) => next());
-        expect(result).toBe(server);
+        new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                const result = server.mcpMiddleware(async (_req, _extra, next) => next());
+                expect(result).toBe(server);
+                return server;
+            },
+        });
     });
     it("intercepts tools/call and exposes request params", async () => {
         let capturedMethod = "";
         let capturedParams = {};
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({
-            name: "greet",
-            description: "greet",
-            inputSchema: { name: z.string() },
-        }, (args) => ({
-            content: [{ type: "text", text: `hi ${args.name}` }],
-        }));
-        server.mcpMiddleware("tools/call", async (request, _extra, next) => {
-            capturedMethod = request.method;
-            capturedParams = request.params;
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({
+                    name: "greet",
+                    description: "greet",
+                    inputSchema: { name: z.string() },
+                }, (args) => ({
+                    content: [{ type: "text", text: `hi ${args.name}` }],
+                }));
+                server.mcpMiddleware("tools/call", async (request, _extra, next) => {
+                    capturedMethod = request.method;
+                    capturedParams = request.params;
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         const result = await client.callTool({
             name: "greet",
@@ -242,59 +255,70 @@ describe("McpServer.mcpMiddleware()", () => {
         });
         expect(result.content).toEqual([{ type: "text", text: "hi World" }]);
         await client.close();
-        await server.close();
+        await instance.close();
     });
     it("array filter works", async () => {
         const matchedMethods = [];
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => ({
-            content: [{ type: "text", text: "ok" }],
-        }));
-        server.mcpMiddleware(["tools/call", "tools/list"], async (request, _extra, next) => {
-            matchedMethods.push(request.method);
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware(["tools/call", "tools/list"], async (request, _extra, next) => {
+                    matchedMethods.push(request.method);
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         await client.listTools();
         await client.callTool({ name: "t1" });
         expect(matchedMethods).toEqual(["tools/list", "tools/call"]);
         await client.close();
-        await server.close();
-    });
-    it("throws if registered after connect()", async () => {
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        const [_clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
-        expect(() => server.mcpMiddleware(async (_req, _extra, next) => next())).toThrow("Cannot register MCP middleware after run() or connect()");
-        await server.close();
-    });
-    it("throws when filter provided without handler", () => {
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        expect(() => 
-        // @ts-expect-error intentionally passing filter without handler
-        server.mcpMiddleware("tools/call")).toThrow("mcpMiddleware requires a handler function");
+        await instance.close();
+    });
+    it("throws when filter provided without handler", async () => {
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => 
+            // @ts-expect-error intentionally passing filter without handler
+            server.mcpMiddleware("tools/call"),
+        });
+        await expect(app.createServerInstance()).rejects.toThrow("mcpMiddleware requires a handler function");
     });
     it("catch-all middleware + filtered middleware stack correctly", async () => {
         const calls = [];
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => ({
-            content: [{ type: "text", text: "ok" }],
-        }));
-        server
-            .mcpMiddleware(async (request, _extra, next) => {
-            calls.push(`global:${request.method}`);
-            return next();
-        })
-            .mcpMiddleware("tools/call", async (_req, _extra, next) => {
-            calls.push("tools-only");
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server
+                    .mcpMiddleware(async (request, _extra, next) => {
+                    calls.push(`global:${request.method}`);
+                    return next();
+                })
+                    .mcpMiddleware("tools/call", async (_req, _extra, next) => {
+                    calls.push("tools-only");
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         await client.listTools();
         await client.callTool({ name: "t1" });
@@ -308,41 +332,55 @@ describe("McpServer.mcpMiddleware()", () => {
         const toolsCallIdx = calls.indexOf("global:tools/call");
         expect(calls[toolsCallIdx + 1]).toBe("tools-only");
         await client.close();
-        await server.close();
+        await instance.close();
     });
     it("notification middleware receives extra as undefined", async () => {
         let capturedExtra = "sentinel";
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => ({
-            content: [{ type: "text", text: "ok" }],
-        }));
-        server.mcpMiddleware("notification", async (_request, extra, next) => {
-            capturedExtra = extra;
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("notification", async (_request, extra, next) => {
+                    capturedExtra = extra;
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         // The client sends notifications/initialized automatically on connect.
         await client.listTools();
         expect(capturedExtra).toBeUndefined();
         await client.close();
-        await server.close();
+        await instance.close();
     });
     it("wildcard filter intercepts matching methods only", async () => {
         const matchedMethods = [];
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => ({
-            content: [{ type: "text", text: "ok" }],
-        }));
-        server.mcpMiddleware("tools/*", async (request, _extra, next) => {
-            matchedMethods.push(request.method);
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("tools/*", async (request, _extra, next) => {
+                    matchedMethods.push(request.method);
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         await client.listTools();
         await client.callTool({ name: "t1" });
@@ -352,30 +390,37 @@ describe("McpServer.mcpMiddleware()", () => {
         expect(matchedMethods).not.toContain("initialize");
         expect(matchedMethods).not.toContain("notifications/initialized");
         await client.close();
-        await server.close();
-    });
-    it("middleware can modify tool result via McpServer integration", async () => {
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({
-            name: "greet",
-            description: "greet",
-            inputSchema: { name: z.string() },
-        }, (args) => ({
-            content: [{ type: "text", text: `hi ${args.name}` }],
-        }));
-        server.mcpMiddleware("tools/call", async (_req, _extra, next) => {
-            const result = (await next());
-            return {
-                ...result,
-                content: [
-                    ...result.content,
-                    { type: "text", text: " (modified)" },
-                ],
-            };
+        await instance.close();
+    });
+    it("middleware can modify tool result via Skybridge integration", async () => {
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({
+                    name: "greet",
+                    description: "greet",
+                    inputSchema: { name: z.string() },
+                }, (args) => ({
+                    content: [{ type: "text", text: `hi ${args.name}` }],
+                }));
+                server.mcpMiddleware("tools/call", async (_req, _extra, next) => {
+                    const result = (await next());
+                    return {
+                        ...result,
+                        content: [
+                            ...result.content,
+                            { type: "text", text: " (modified)" },
+                        ],
+                    };
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         const result = await client.callTool({
             name: "greet",
@@ -386,53 +431,67 @@ describe("McpServer.mcpMiddleware()", () => {
             { type: "text", text: " (modified)" },
         ]);
         await client.close();
-        await server.close();
+        await instance.close();
     });
-    it("middleware can short-circuit via McpServer integration", async () => {
+    it("middleware can short-circuit via Skybridge integration", async () => {
         const handlerCalled = vi.fn();
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => {
-            handlerCalled();
-            return {
-                content: [{ type: "text", text: "original" }],
-            };
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => {
+                    handlerCalled();
+                    return {
+                        content: [{ type: "text", text: "original" }],
+                    };
+                });
+                server.mcpMiddleware("tools/call", async () => ({
+                    content: [{ type: "text", text: "short-circuited" }],
+                }));
+                return server;
+            },
         });
-        server.mcpMiddleware("tools/call", async () => ({
-            content: [{ type: "text", text: "short-circuited" }],
-        }));
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         const result = await client.callTool({ name: "t1" });
         expect(result.content).toEqual([{ type: "text", text: "short-circuited" }]);
         expect(handlerCalled).not.toHaveBeenCalled();
         await client.close();
-        await server.close();
+        await instance.close();
     });
     it("exposes a thrown tool error to middleware via getToolError", async () => {
         const schemaError = new Error("boom with schema");
         const schemalessError = new Error("boom without schema");
         let captured;
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({
-            name: "withSchema",
-            description: "withSchema",
-            inputSchema: { name: z.string() },
-        }, () => {
-            throw schemaError;
-        });
-        server.registerTool({ name: "withoutSchema", description: "withoutSchema" }, () => {
-            throw schemalessError;
-        });
-        server.mcpMiddleware("tools/call", async (_request, extra, next) => {
-            const result = await next();
-            captured = getToolError(extra);
-            return result;
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({
+                    name: "withSchema",
+                    description: "withSchema",
+                    inputSchema: { name: z.string() },
+                }, () => {
+                    throw schemaError;
+                });
+                server.registerTool({ name: "withoutSchema", description: "withoutSchema" }, () => {
+                    throw schemalessError;
+                });
+                server.mcpMiddleware("tools/call", async (_request, extra, next) => {
+                    const result = await next();
+                    captured = getToolError(extra);
+                    return result;
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         const withSchema = await client.callTool({
             name: "withSchema",
@@ -444,28 +503,35 @@ describe("McpServer.mcpMiddleware()", () => {
         expect(withoutSchema.isError).toBe(true);
         expect(captured).toBe(schemalessError);
         await client.close();
-        await server.close();
+        await instance.close();
     });
-    it("middleware can mutate tool call params via McpServer integration", async () => {
+    it("middleware can mutate tool call params via Skybridge integration", async () => {
         let receivedName = "";
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({
-            name: "greet",
-            description: "greet",
-            inputSchema: { name: z.string() },
-        }, (args) => {
-            receivedName = args.name;
-            return {
-                content: [{ type: "text", text: `hi ${args.name}` }],
-            };
-        });
-        server.mcpMiddleware("tools/call", async (request, _extra, next) => {
-            request.params.arguments = { name: "Overridden" };
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({
+                    name: "greet",
+                    description: "greet",
+                    inputSchema: { name: z.string() },
+                }, (args) => {
+                    receivedName = args.name;
+                    return {
+                        content: [{ type: "text", text: `hi ${args.name}` }],
+                    };
+                });
+                server.mcpMiddleware("tools/call", async (request, _extra, next) => {
+                    request.params.arguments = { name: "Overridden" };
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         await client.callTool({
             name: "greet",
@@ -473,21 +539,28 @@ describe("McpServer.mcpMiddleware()", () => {
         });
         expect(receivedName).toBe("Overridden");
         await client.close();
-        await server.close();
+        await instance.close();
     });
     it("category 'request' filter matches requests but not notifications", async () => {
         const matchedMethods = [];
-        const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool({ name: "t1", description: "t1" }, () => ({
-            content: [{ type: "text", text: "ok" }],
-        }));
-        server.mcpMiddleware("request", async (request, _extra, next) => {
-            matchedMethods.push(request.method);
-            return next();
+        const app = new Skybridge({
+            name: "test",
+            version: "1.0.0",
+            handler: (server) => {
+                server.registerTool({ name: "t1", description: "t1" }, () => ({
+                    content: [{ type: "text", text: "ok" }],
+                }));
+                server.mcpMiddleware("request", async (request, _extra, next) => {
+                    matchedMethods.push(request.method);
+                    return next();
+                });
+                return server;
+            },
         });
         const client = createClient();
         const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
-        await server.connect(serverTransport);
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
         await client.connect(clientTransport);
         await client.listTools();
         await client.callTool({ name: "t1" });
@@ -495,7 +568,7 @@ describe("McpServer.mcpMiddleware()", () => {
         expect(matchedMethods).toContain("tools/call");
         expect(matchedMethods).not.toContain("notifications/initialized");
         await client.close();
-        await server.close();
+        await instance.close();
     });
 });
 // ---------------------------------------------------------------------------