skybridge 0.0.0-dev.98080a8 → 0.0.0-dev.980fb5d

package/dist/server/middleware.test-d.js

@@ -1,46 +1,69 @@
 import { expectTypeOf, test } from "vitest";
 const server = null;
-test("request category narrows extra to McpExtra", () => {
-    server.mcpMiddleware("request", (_request, extra, next) => {
+test("request category narrows extra and next() result", () => {
+    server.mcpMiddleware("request", async (_request, extra, next) => {
         expectTypeOf(extra).toEqualTypeOf();
-        extra.signal;
-        return next();
+        extra.mcpReq.signal;
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
+        return result;
     });
 });
-test("notification category narrows extra to undefined", () => {
-    server.mcpMiddleware("notification", (_request, extra, next) => {
+test("notification category narrows extra and next() result", () => {
+    server.mcpMiddleware("notification", async (_request, extra, next) => {
         expectTypeOf(extra).toEqualTypeOf();
         // @ts-expect-error extra is undefined, cannot access .signal
         extra.signal;
-        return next();
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
     });
 });
-test("exact method tools/call narrows params and extra", () => {
-    server.mcpMiddleware("tools/call", (request, extra, next) => {
+test("exact method tools/call narrows params, extra, and next() result", () => {
+    server.mcpMiddleware("tools/call", async (request, extra, next) => {
         expectTypeOf(request.params.name).toBeString();
         expectTypeOf(extra).toEqualTypeOf();
-        return next();
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
+        return result;
     });
 });
-test("exact method tools/list narrows extra to McpExtra", () => {
-    server.mcpMiddleware("tools/list", (_request, extra, next) => {
-        expectTypeOf(extra).toEqualTypeOf();
-        return next();
+test("exact method tools/list narrows next() to ListToolsResult", () => {
+    server.mcpMiddleware("tools/list", async (_request, _extra, next) => {
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
+        return result;
     });
 });
-test("exact notification method narrows extra to undefined", () => {
-    server.mcpMiddleware("notifications/initialized", (_request, extra, next) => {
+test("exact notification method narrows extra and next() result", () => {
+    server.mcpMiddleware("notifications/initialized", async (_request, extra, next) => {
         expectTypeOf(extra).toEqualTypeOf();
         // @ts-expect-error extra is undefined
         extra.signal;
-        return next();
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
     });
 });
-test("McpTypedMiddlewareFn narrows params and extra per method", () => {
-    expectTypeOf().toBeFunction();
+test("McpTypedMiddlewareFn narrows params, extra, and next() per method", () => {
     expectTypeOf().toBeString();
     expectTypeOf().toEqualTypeOf();
     expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+});
+test("McpResultFor maps methods to correct result types", () => {
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+});
+test("wildcard tools/* narrows next() to union of tools result types", () => {
+    server.mcpMiddleware("tools/*", async (_request, _extra, next) => {
+        const result = await next();
+        expectTypeOf(result).toEqualTypeOf();
+        return result;
+    });
+});
+test("McpResultFor resolves wildcards to union of matching result types", () => {
+    expectTypeOf().toEqualTypeOf();
 });
 test("catch-all middleware has no narrowing on extra or params", () => {
     server.mcpMiddleware((_request, extra, next) => {

package/dist/server/middleware.test-d.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.test-d.js","sourceRoot":"","sources":["../../src/server/middleware.test-d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAI5C,MAAM,MAAM,GAAG,IAA4B,CAAC;AAE5C,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACtD,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxD,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7D,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,6DAA6D;QAC7D,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1D,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QAC/C,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3D,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1E,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,sCAAsC;QACtC,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,YAAY,EAAsC,CAAC,YAAY,EAAE,CAAC;IAClE,YAAY,EAET,CAAC,UAAU,EAAE,CAAC;IACjB,YAAY,EAET,CAAC,aAAa,EAAY,CAAC;IAC9B,YAAY,EAET,CAAC,aAAa,EAAa,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7C,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAwB,CAAC;QAC1D,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,aAAa,EAA2B,CAAC;QACvE,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"middleware.test-d.js","sourceRoot":"","sources":["../../src/server/middleware.test-d.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CallToolResult,\n  ListToolsResult,\n  ServerResult,\n} from \"@modelcontextprotocol/server\";\nimport { expectTypeOf, test } from \"vitest\";\nimport type {\n  McpExtra,\n  McpResultFor,\n  McpTypedMiddlewareFn,\n} from \"./middleware.js\";\nimport type { McpServer } from \"./server.js\";\n\nconst server = null as unknown as McpServer;\n\ntest(\"request category narrows extra and next() result\", () => {\n  server.mcpMiddleware(\"request\", async (_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<McpExtra>();\n    extra.mcpReq.signal;\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ServerResult>();\n    return result;\n  });\n});\n\ntest(\"notification category narrows extra and next() result\", () => {\n  server.mcpMiddleware(\"notification\", async (_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<undefined>();\n    // @ts-expect-error extra is undefined, cannot access .signal\n    extra.signal;\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<undefined>();\n  });\n});\n\ntest(\"exact method tools/call narrows params, extra, and next() result\", () => {\n  server.mcpMiddleware(\"tools/call\", async (request, extra, next) => {\n    expectTypeOf(request.params.name).toBeString();\n    expectTypeOf(extra).toEqualTypeOf<McpExtra>();\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<CallToolResult>();\n    return result;\n  });\n});\n\ntest(\"exact method tools/list narrows next() to ListToolsResult\", () => {\n  server.mcpMiddleware(\"tools/list\", async (_request, _extra, next) => {\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ListToolsResult>();\n    return result;\n  });\n});\n\ntest(\"exact notification method narrows extra and next() result\", () => {\n  server.mcpMiddleware(\n    \"notifications/initialized\",\n    async (_request, extra, next) => {\n      expectTypeOf(extra).toEqualTypeOf<undefined>();\n      // @ts-expect-error extra is undefined\n      extra.signal;\n      const result = await next();\n      expectTypeOf(result).toEqualTypeOf<undefined>();\n    },\n  );\n});\n\ntest(\"McpTypedMiddlewareFn narrows params, extra, and next() per method\", () => {\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"tools/call\">>[0][\"params\"][\"name\"]\n  >().toBeString();\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"tools/call\">>[1]\n  >().toEqualTypeOf<McpExtra>();\n  expectTypeOf<\n    Parameters<McpTypedMiddlewareFn<\"notifications/initialized\">>[1]\n  >().toEqualTypeOf<undefined>();\n  expectTypeOf<\n    ReturnType<Parameters<McpTypedMiddlewareFn<\"tools/list\">>[2]>\n  >().toEqualTypeOf<Promise<ListToolsResult>>();\n  expectTypeOf<\n    ReturnType<Parameters<McpTypedMiddlewareFn<\"notifications/initialized\">>[2]>\n  >().toEqualTypeOf<Promise<undefined>>();\n});\n\ntest(\"McpResultFor maps methods to correct result types\", () => {\n  expectTypeOf<McpResultFor<\"tools/list\">>().toEqualTypeOf<ListToolsResult>();\n  expectTypeOf<McpResultFor<\"tools/call\">>().toEqualTypeOf<CallToolResult>();\n  expectTypeOf<\n    McpResultFor<\"notifications/initialized\">\n  >().toEqualTypeOf<undefined>();\n});\n\ntest(\"wildcard tools/* narrows next() to union of tools result types\", () => {\n  server.mcpMiddleware(\"tools/*\", async (_request, _extra, next) => {\n    const result = await next();\n    expectTypeOf(result).toEqualTypeOf<ListToolsResult | CallToolResult>();\n    return result;\n  });\n});\n\ntest(\"McpResultFor resolves wildcards to union of matching result types\", () => {\n  expectTypeOf<McpResultFor<\"tools/*\">>().toEqualTypeOf<\n    ListToolsResult | CallToolResult\n  >();\n});\n\ntest(\"catch-all middleware has no narrowing on extra or params\", () => {\n  server.mcpMiddleware((_request, extra, next) => {\n    expectTypeOf(extra).toEqualTypeOf<McpExtra | undefined>();\n    expectTypeOf(_request.params).toEqualTypeOf<Record<string, unknown>>();\n    return next();\n  });\n});\n"]}

package/dist/server/middleware.test.js

@@ -1,9 +1,8 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { describe, expect, it, vi } from "vitest";
 import { z } from "zod";
-import { buildMiddlewareChain, getHandlerMaps, matchesFilter, } from "./middleware.js";
-import { McpServer } from "./server.js";
+import { Skybridge } from "./app.js";
+import { buildMiddlewareChain, getHandlerMaps, getToolError, matchesFilter, } from "./middleware.js";
 // ---------------------------------------------------------------------------
 // matchesFilter
 // ---------------------------------------------------------------------------
@@ -208,28 +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("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("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();
+        await instance.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");
+    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("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,235 @@ 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("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 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();
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        expect(matchedMethods).toContain("tools/list");
+        expect(matchedMethods).toContain("tools/call");
+        // Should not match initialize or notifications
+        expect(matchedMethods).not.toContain("initialize");
+        expect(matchedMethods).not.toContain("notifications/initialized");
+        await client.close();
+        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();
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
+        await client.connect(clientTransport);
+        const result = await client.callTool({
+            name: "greet",
+            arguments: { name: "World" },
+        });
+        expect(result.content).toEqual([
+            { type: "text", text: "hi World" },
+            { type: "text", text: " (modified)" },
+        ]);
+        await client.close();
+        await instance.close();
+    });
+    it("middleware can short-circuit via Skybridge integration", async () => {
+        const handlerCalled = vi.fn();
+        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;
+            },
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        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 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 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();
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
+        await client.connect(clientTransport);
+        const withSchema = await client.callTool({
+            name: "withSchema",
+            arguments: { name: "World" },
+        });
+        expect(withSchema.isError).toBe(true);
+        expect(captured).toBe(schemaError);
+        const withoutSchema = await client.callTool({ name: "withoutSchema" });
+        expect(withoutSchema.isError).toBe(true);
+        expect(captured).toBe(schemalessError);
+        await client.close();
+        await instance.close();
+    });
+    it("middleware can mutate tool call params via Skybridge integration", async () => {
+        let receivedName = "";
+        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();
+        const instance = await app.createServerInstance();
+        await instance.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.callTool({
+            name: "greet",
+            arguments: { name: "Original" },
+        });
+        expect(receivedName).toBe("Overridden");
+        await client.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("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" });
@@ -350,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();
     });
 });
 // ---------------------------------------------------------------------------