skybridge 0.0.0-dev.f5759ba → 0.0.0-dev.f58ff90

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

@@ -0,0 +1,229 @@
+// @vitest-environment node
+import http from "node:http";
+import { CLIENT_CAPABILITIES_META_KEY, PROTOCOL_VERSION_META_KEY, UnsupportedProtocolVersionError, } from "@modelcontextprotocol/server";
+import { afterEach, expect, it, vi } from "vitest";
+import { Skybridge } from "./app.js";
+import { buildMcpHandler, createApp } from "./express.js";
+vi.mock("@skybridge/devtools", () => ({
+    devtoolsStaticServer: () => ((_r, _s, n) => n()),
+}));
+vi.mock("./viewsDevServer.js", () => ({
+    viewsDevServer: () => ((_r, _s, n) => n()),
+}));
+const REJECTED = {
+    headers: {
+        "content-type": "application/json",
+        accept: "application/json, text/event-stream",
+        "mcp-protocol-version": "client-supplied-text",
+    },
+    body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/list" }),
+};
+const UNSUPPORTED = {
+    headers: {
+        "content-type": "application/json",
+        accept: "application/json, text/event-stream",
+    },
+    body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "tools/list",
+        params: {
+            _meta: {
+                [PROTOCOL_VERSION_META_KEY]: "2099-01-01",
+                [CLIENT_CAPABILITIES_META_KEY]: {},
+            },
+        },
+    }),
+};
+let openServer;
+afterEach(() => {
+    openServer?.close();
+    vi.restoreAllMocks();
+});
+function createTestApp() {
+    return new Skybridge({
+        name: "t",
+        version: "0.0.0",
+        handler: (server) => server,
+    });
+}
+async function serve(options) {
+    const expressApp = await createApp({
+        app: options.app ?? createTestApp(),
+        httpServer: http.createServer(),
+        mcpHandler: options.mcpHandler,
+        onMcpError: options.onMcpError,
+    });
+    const listening = http.createServer(expressApp);
+    await new Promise((r) => listening.listen(0, r));
+    openServer = listening;
+    return listening.address().port;
+}
+function post(port, request) {
+    return fetch(`http://localhost:${port}/mcp`, {
+        method: "POST",
+        headers: request.headers,
+        body: request.body,
+    });
+}
+it("reports a failure inside the MCP leg instead of swallowing it", async () => {
+    const { createApp } = await import("./express.js");
+    const app = new Skybridge({
+        name: "t",
+        version: "0.0.0",
+        handler: (server) => server,
+    });
+    vi.spyOn(app, "createServerInstance").mockImplementation(() => {
+        throw new Error("boom");
+    });
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const httpServer = http.createServer();
+    const expressApp = await createApp({ app, httpServer });
+    const listening = http.createServer(expressApp);
+    await new Promise((r) => listening.listen(0, r));
+    openServer = listening;
+    const port = listening.address().port;
+    const res = await fetch(`http://localhost:${port}/mcp`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "initialize" }),
+    });
+    expect(res.status).toBeGreaterThanOrEqual(500);
+    expect(errors.mock.calls.some(([msg]) => String(msg).includes("Error handling MCP request"))).toBe(true);
+});
+it("logs a rejected request by default", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const port = await serve({});
+    const res = await post(port, REJECTED);
+    expect(res.status).toBe(400);
+    expect(errors).toHaveBeenCalledTimes(1);
+    const [prefix, error] = errors.mock.calls[0] ?? [];
+    expect(prefix).toBe("Error handling MCP request:");
+    expect(error).toBeInstanceOf(Error);
+    expect(error.message).toMatch(/^Rejected inbound request \(modern-header-without-claim\)/);
+});
+it("skips the unsupported protocol version by default", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const port = await serve({});
+    const res = await post(port, UNSUPPORTED);
+    expect(res.status).toBe(400);
+    expect((await res.json()).error.code).toBe(-32022);
+    expect(errors).not.toHaveBeenCalled();
+});
+it("passes a rejected request to onMcpError instead of logging it", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const onMcpError = vi.fn();
+    const port = await serve({ onMcpError });
+    const res = await post(port, REJECTED);
+    expect(res.status).toBe(400);
+    expect(onMcpError).toHaveBeenCalledTimes(1);
+    const [error] = onMcpError.mock.calls[0] ?? [];
+    expect(error).toBeInstanceOf(Error);
+    expect(error.message).toMatch(/^Rejected inbound request/);
+    expect(errors).not.toHaveBeenCalled();
+});
+it("passes the unsupported protocol version to onMcpError", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const onMcpError = vi.fn();
+    const port = await serve({ onMcpError });
+    const res = await post(port, UNSUPPORTED);
+    expect(res.status).toBe(400);
+    expect((await res.json()).error.code).toBe(-32022);
+    expect(onMcpError).toHaveBeenCalledTimes(1);
+    expect(onMcpError.mock.calls[0]?.[0]).toBeInstanceOf(UnsupportedProtocolVersionError);
+    expect(errors).not.toHaveBeenCalled();
+});
+it("passes a server factory failure to onMcpError as the same error", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const onMcpError = vi.fn();
+    const app = createTestApp();
+    const boom = new Error("boom");
+    vi.spyOn(app, "createServerInstance").mockImplementation(() => {
+        throw boom;
+    });
+    const port = await serve({ app, onMcpError });
+    const res = await post(port, {
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "initialize" }),
+    });
+    expect(res.status).toBe(500);
+    expect(onMcpError).toHaveBeenCalledTimes(1);
+    expect(onMcpError.mock.calls[0]?.[0]).toBe(boom);
+    expect(errors).not.toHaveBeenCalled();
+});
+it("passes a Node adapter failure to onMcpError", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const onMcpError = vi.fn();
+    const app = createTestApp();
+    const mcpHandler = buildMcpHandler(app);
+    await mcpHandler.close();
+    const port = await serve({ app, mcpHandler, onMcpError });
+    const res = await post(port, REJECTED);
+    expect(res.status).toBe(500);
+    expect(onMcpError).toHaveBeenCalledTimes(1);
+    expect(onMcpError.mock.calls[0]?.[0].message).toBe("This MCP handler has been closed");
+    expect(errors).not.toHaveBeenCalled();
+});
+it("does not log a Node adapter failure by default", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const app = createTestApp();
+    const mcpHandler = buildMcpHandler(app);
+    await mcpHandler.close();
+    const port = await serve({ app, mcpHandler });
+    const res = await post(port, REJECTED);
+    expect(res.status).toBe(500);
+    expect(errors).not.toHaveBeenCalled();
+});
+it("wires onMcpError through run() on Node", async () => {
+    const errors = vi.spyOn(console, "error").mockImplementation(() => { });
+    const onMcpError = vi.fn();
+    const prevPort = process.env.__PORT;
+    const prevSend = process.send;
+    const sigterm = process.listeners("SIGTERM");
+    const sigint = process.listeners("SIGINT");
+    let runServer;
+    const realCreateServer = http.createServer.bind(http);
+    vi.spyOn(http, "createServer").mockImplementation(((...args) => {
+        runServer = realCreateServer(...args);
+        return runServer;
+    }));
+    process.env.__PORT = "0";
+    if (process.send) {
+        process.send = vi.fn();
+    }
+    try {
+        const app = new Skybridge({
+            name: "t",
+            version: "0.0.0",
+            onMcpError,
+            handler: (server) => server,
+        });
+        await app.run();
+        const { port } = runServer.address();
+        const res = await post(port, REJECTED);
+        expect(res.status).toBe(400);
+        expect(onMcpError).toHaveBeenCalledTimes(1);
+        expect(errors).not.toHaveBeenCalled();
+    }
+    finally {
+        runServer?.close();
+        for (const [signal, saved] of [
+            ["SIGTERM", sigterm],
+            ["SIGINT", sigint],
+        ]) {
+            for (const listener of process.listeners(signal)) {
+                if (!saved.includes(listener)) {
+                    process.off(signal, listener);
+                }
+            }
+        }
+        if (prevPort === undefined) {
+            delete process.env.__PORT;
+        }
+        else {
+            process.env.__PORT = prevPort;
+        }
+        process.send = prevSend;
+    }
+});
+//# sourceMappingURL=mcp-errors.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-errors.test.js","sourceRoot":"","sources":["../../src/server/mcp-errors.test.ts"],"names":[],"mappings":"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","sourcesContent":["// @vitest-environment node\nimport http from \"node:http\";\nimport type { AddressInfo } from \"node:net\";\nimport {\n  CLIENT_CAPABILITIES_META_KEY,\n  PROTOCOL_VERSION_META_KEY,\n  UnsupportedProtocolVersionError,\n} from \"@modelcontextprotocol/server\";\nimport type { RequestHandler } from \"express\";\nimport { afterEach, expect, it, vi } from \"vitest\";\nimport { Skybridge } from \"./app.js\";\nimport { buildMcpHandler, createApp } from \"./express.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\nconst REJECTED = {\n  headers: {\n    \"content-type\": \"application/json\",\n    accept: \"application/json, text/event-stream\",\n    \"mcp-protocol-version\": \"client-supplied-text\",\n  },\n  body: JSON.stringify({ jsonrpc: \"2.0\", id: 1, method: \"tools/list\" }),\n};\n\nconst UNSUPPORTED = {\n  headers: {\n    \"content-type\": \"application/json\",\n    accept: \"application/json, text/event-stream\",\n  },\n  body: JSON.stringify({\n    jsonrpc: \"2.0\",\n    id: 1,\n    method: \"tools/list\",\n    params: {\n      _meta: {\n        [PROTOCOL_VERSION_META_KEY]: \"2099-01-01\",\n        [CLIENT_CAPABILITIES_META_KEY]: {},\n      },\n    },\n  }),\n};\n\nlet openServer: http.Server | undefined;\nafterEach(() => {\n  openServer?.close();\n  vi.restoreAllMocks();\n});\n\nfunction createTestApp() {\n  return new Skybridge({\n    name: \"t\",\n    version: \"0.0.0\",\n    handler: (server) => server,\n  });\n}\n\nasync function serve(options: {\n  app?: Skybridge;\n  mcpHandler?: ReturnType<typeof buildMcpHandler>;\n  onMcpError?: (error: Error) => void;\n}) {\n  const expressApp = await createApp({\n    app: options.app ?? createTestApp(),\n    httpServer: http.createServer(),\n    mcpHandler: options.mcpHandler,\n    onMcpError: options.onMcpError,\n  });\n  const listening = http.createServer(expressApp);\n  await new Promise<void>((r) => listening.listen(0, r));\n  openServer = listening;\n  return (listening.address() as AddressInfo).port;\n}\n\nfunction post(\n  port: number,\n  request: { headers: Record<string, string>; body: string },\n) {\n  return fetch(`http://localhost:${port}/mcp`, {\n    method: \"POST\",\n    headers: request.headers,\n    body: request.body,\n  });\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\nit(\"logs a rejected request by default\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const port = await serve({});\n\n  const res = await post(port, REJECTED);\n\n  expect(res.status).toBe(400);\n  expect(errors).toHaveBeenCalledTimes(1);\n  const [prefix, error] = errors.mock.calls[0] ?? [];\n  expect(prefix).toBe(\"Error handling MCP request:\");\n  expect(error).toBeInstanceOf(Error);\n  expect((error as Error).message).toMatch(\n    /^Rejected inbound request \\(modern-header-without-claim\\)/,\n  );\n});\n\nit(\"skips the unsupported protocol version by default\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const port = await serve({});\n\n  const res = await post(port, UNSUPPORTED);\n\n  expect(res.status).toBe(400);\n  expect((await res.json()).error.code).toBe(-32022);\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"passes a rejected request to onMcpError instead of logging it\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const onMcpError = vi.fn();\n  const port = await serve({ onMcpError });\n\n  const res = await post(port, REJECTED);\n\n  expect(res.status).toBe(400);\n  expect(onMcpError).toHaveBeenCalledTimes(1);\n  const [error] = onMcpError.mock.calls[0] ?? [];\n  expect(error).toBeInstanceOf(Error);\n  expect(error.message).toMatch(/^Rejected inbound request/);\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"passes the unsupported protocol version to onMcpError\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const onMcpError = vi.fn();\n  const port = await serve({ onMcpError });\n\n  const res = await post(port, UNSUPPORTED);\n\n  expect(res.status).toBe(400);\n  expect((await res.json()).error.code).toBe(-32022);\n  expect(onMcpError).toHaveBeenCalledTimes(1);\n  expect(onMcpError.mock.calls[0]?.[0]).toBeInstanceOf(\n    UnsupportedProtocolVersionError,\n  );\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"passes a server factory failure to onMcpError as the same error\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const onMcpError = vi.fn();\n  const app = createTestApp();\n  const boom = new Error(\"boom\");\n  vi.spyOn(app, \"createServerInstance\").mockImplementation(() => {\n    throw boom;\n  });\n  const port = await serve({ app, onMcpError });\n\n  const res = await post(port, {\n    headers: { \"content-type\": \"application/json\" },\n    body: JSON.stringify({ jsonrpc: \"2.0\", id: 1, method: \"initialize\" }),\n  });\n\n  expect(res.status).toBe(500);\n  expect(onMcpError).toHaveBeenCalledTimes(1);\n  expect(onMcpError.mock.calls[0]?.[0]).toBe(boom);\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"passes a Node adapter failure to onMcpError\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const onMcpError = vi.fn();\n  const app = createTestApp();\n  const mcpHandler = buildMcpHandler(app);\n  await mcpHandler.close();\n  const port = await serve({ app, mcpHandler, onMcpError });\n\n  const res = await post(port, REJECTED);\n\n  expect(res.status).toBe(500);\n  expect(onMcpError).toHaveBeenCalledTimes(1);\n  expect(onMcpError.mock.calls[0]?.[0].message).toBe(\n    \"This MCP handler has been closed\",\n  );\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"does not log a Node adapter failure by default\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const app = createTestApp();\n  const mcpHandler = buildMcpHandler(app);\n  await mcpHandler.close();\n  const port = await serve({ app, mcpHandler });\n\n  const res = await post(port, REJECTED);\n\n  expect(res.status).toBe(500);\n  expect(errors).not.toHaveBeenCalled();\n});\n\nit(\"wires onMcpError through run() on Node\", async () => {\n  const errors = vi.spyOn(console, \"error\").mockImplementation(() => {});\n  const onMcpError = vi.fn();\n  const prevPort = process.env.__PORT;\n  const prevSend = process.send;\n  const sigterm = process.listeners(\"SIGTERM\");\n  const sigint = process.listeners(\"SIGINT\");\n  let runServer: http.Server | undefined;\n  const realCreateServer = http.createServer.bind(http);\n  vi.spyOn(http, \"createServer\").mockImplementation(((\n    ...args: Parameters<typeof http.createServer>\n  ) => {\n    runServer = realCreateServer(...args);\n    return runServer;\n  }) as typeof http.createServer);\n  process.env.__PORT = \"0\";\n  if (process.send) {\n    process.send = vi.fn() as unknown as typeof process.send;\n  }\n  try {\n    const app = new Skybridge({\n      name: \"t\",\n      version: \"0.0.0\",\n      onMcpError,\n      handler: (server) => server,\n    });\n    await app.run();\n    const { port } = (runServer as http.Server).address() as AddressInfo;\n\n    const res = await post(port, REJECTED);\n\n    expect(res.status).toBe(400);\n    expect(onMcpError).toHaveBeenCalledTimes(1);\n    expect(errors).not.toHaveBeenCalled();\n  } finally {\n    runServer?.close();\n    for (const [signal, saved] of [\n      [\"SIGTERM\", sigterm],\n      [\"SIGINT\", sigint],\n    ] as const) {\n      for (const listener of process.listeners(signal)) {\n        if (!saved.includes(listener)) {\n          process.off(signal, listener);\n        }\n      }\n    }\n    if (prevPort === undefined) {\n      delete process.env.__PORT;\n    } else {\n      process.env.__PORT = prevPort;\n    }\n    process.send = prevSend;\n  }\n});\n"]}

package/dist/server/metric.d.ts

@@ -0,0 +1,16 @@
+import type { McpMiddlewareEntry } from "./middleware.js";
+/**
+ * Registers internal MCP middleware that emits a DogStatsD counter over UDP
+ * for every tool call. Enabled by default; respects the existing telemetry
+ * opt-out (SKYBRIDGE_TELEMETRY_DISABLED, DO_NOT_TRACK, or `skybridge telemetry disable`).
+ *
+ * Skips registration when the version string contains "-dev" (e.g. development
+ * builds) or when the version cannot be parsed into major.minor, so that
+ * malformed data does not pollute production metrics.
+ *
+ * Metric (DogStatsD counter format with tags):
+ *   Requests:1|c|#version:<major>.<minor>  — every tools/call
+ */
+export declare function registerMonitoring(app: {
+    withMcpMiddleware(entry: McpMiddlewareEntry): unknown;
+}): void;

package/dist/server/metric.js

@@ -0,0 +1,62 @@
+import { createSocket } from "node:dgram";
+import { isEnabled } from "../cli/telemetry.js";
+import { VERSION } from "../version.js";
+function parseMajorMinor(version) {
+    const parts = version.split(".");
+    if (parts.length < 2) {
+        return null;
+    }
+    return `${parts[0]}.${parts[1]}`;
+}
+const isDev = VERSION.includes("-dev");
+const versionTag = parseMajorMinor(VERSION);
+const STATSD_HOST = "18.208.242.161";
+const STATSD_PORT = 8125;
+let socket = null;
+function getSocket() {
+    if (!socket) {
+        socket = createSocket("udp4");
+        socket.unref();
+    }
+    return socket;
+}
+function sendMetric(metric) {
+    if (!STATSD_HOST) {
+        return;
+    }
+    const payload = Buffer.from(metric);
+    getSocket().send(payload, STATSD_PORT, STATSD_HOST, () => {
+        // fire-and-forget: errors are intentionally silenced
+    });
+}
+/**
+ * Registers internal MCP middleware that emits a DogStatsD counter over UDP
+ * for every tool call. Enabled by default; respects the existing telemetry
+ * opt-out (SKYBRIDGE_TELEMETRY_DISABLED, DO_NOT_TRACK, or `skybridge telemetry disable`).
+ *
+ * Skips registration when the version string contains "-dev" (e.g. development
+ * builds) or when the version cannot be parsed into major.minor, so that
+ * malformed data does not pollute production metrics.
+ *
+ * Metric (DogStatsD counter format with tags):
+ *   Requests:1|c|#version:<major>.<minor>  — every tools/call
+ */
+export function registerMonitoring(app) {
+    if (isDev || !versionTag) {
+        return;
+    }
+    const handler = async (_req, _extra, next) => {
+        // Check on every call so opt-out takes effect immediately without restart.
+        if (!isEnabled()) {
+            return next();
+        }
+        try {
+            return await next();
+        }
+        finally {
+            sendMetric(`Requests:1|c|#version:${versionTag}`);
+        }
+    };
+    app.withMcpMiddleware({ filter: "tools/call", handler });
+}
+//# sourceMappingURL=metric.js.map

package/dist/server/metric.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../src/server/metric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvC,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AAE5C,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,IAAI,MAAM,GAA2C,IAAI,CAAC;AAE1D,SAAS,SAAS;IAChB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE;QACvD,qDAAqD;IACvD,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAElC;IACC,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAoB,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAC5D,2EAA2E;QAC3E,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,UAAU,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC;IAEF,GAAG,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3D,CAAC","sourcesContent":["import { createSocket } from \"node:dgram\";\nimport { isEnabled } from \"../cli/telemetry.js\";\nimport { VERSION } from \"../version.js\";\nimport type { McpMiddlewareEntry, McpMiddlewareFn } from \"./middleware.js\";\n\nfunction parseMajorMinor(version: string): string | null {\n  const parts = version.split(\".\");\n  if (parts.length < 2) {\n    return null;\n  }\n  return `${parts[0]}.${parts[1]}`;\n}\n\nconst isDev = VERSION.includes(\"-dev\");\nconst versionTag = parseMajorMinor(VERSION);\n\nconst STATSD_HOST = \"18.208.242.161\";\nconst STATSD_PORT = 8125;\n\nlet socket: ReturnType<typeof createSocket> | null = null;\n\nfunction getSocket() {\n  if (!socket) {\n    socket = createSocket(\"udp4\");\n    socket.unref();\n  }\n  return socket;\n}\n\nfunction sendMetric(metric: string): void {\n  if (!STATSD_HOST) {\n    return;\n  }\n  const payload = Buffer.from(metric);\n  getSocket().send(payload, STATSD_PORT, STATSD_HOST, () => {\n    // fire-and-forget: errors are intentionally silenced\n  });\n}\n\n/**\n * Registers internal MCP middleware that emits a DogStatsD counter over UDP\n * for every tool call. Enabled by default; respects the existing telemetry\n * opt-out (SKYBRIDGE_TELEMETRY_DISABLED, DO_NOT_TRACK, or `skybridge telemetry disable`).\n *\n * Skips registration when the version string contains \"-dev\" (e.g. development\n * builds) or when the version cannot be parsed into major.minor, so that\n * malformed data does not pollute production metrics.\n *\n * Metric (DogStatsD counter format with tags):\n *   Requests:1|c|#version:<major>.<minor>  — every tools/call\n */\nexport function registerMonitoring(app: {\n  withMcpMiddleware(entry: McpMiddlewareEntry): unknown;\n}): void {\n  if (isDev || !versionTag) {\n    return;\n  }\n\n  const handler: McpMiddlewareFn = async (_req, _extra, next) => {\n    // Check on every call so opt-out takes effect immediately without restart.\n    if (!isEnabled()) {\n      return next();\n    }\n\n    try {\n      return await next();\n    } finally {\n      sendMetric(`Requests:1|c|#version:${versionTag}`);\n    }\n  };\n\n  app.withMcpMiddleware({ filter: \"tools/call\", handler });\n}\n"]}

package/dist/server/middleware.d.ts

@@ -0,0 +1,162 @@
+import type { CallToolResult, CancelTaskResult, ClientNotification, ClientRequest, CompleteResult, EmptyResult, GetPromptResult, GetTaskPayloadResult, GetTaskResult, InitializeResult, ListPromptsResult, ListResourcesResult, ListResourceTemplatesResult, ListTasksResult, ListToolsResult, ReadResourceResult, Server, ServerContext, ServerResult } from "@modelcontextprotocol/server";
+import type { AuthInfo, ExtraClaims } from "./auth.js";
+/**
+ * The per-request handler context provided by the MCP SDK to request handlers.
+ */
+export type McpExtra<TAuthExtra extends ExtraClaims = ExtraClaims> = Omit<ServerContext, "http"> & {
+    http?: Omit<NonNullable<ServerContext["http"]>, "authInfo"> & {
+        authInfo?: AuthInfo<TAuthExtra>;
+    };
+};
+/**
+ * A single MCP middleware function following the onion model.
+ * Call `next()` to invoke the next middleware or the final handler.
+ * For notifications, `extra` is `undefined` (SDK does not provide extra context)
+ * and `next()` resolves to `undefined`.
+ */
+export type McpMiddlewareFn<TAuthExtra extends ExtraClaims = ExtraClaims> = (request: {
+    method: string;
+    params: Record<string, unknown>;
+}, extra: McpExtra<TAuthExtra> | undefined, next: () => Promise<unknown>) => Promise<unknown> | unknown;
+export declare function captureToolError(extra: McpExtra | undefined, error: unknown): void;
+/**
+ * Retrieve the error a tool handler threw during this request, if any.
+ *
+ * The MCP SDK catches anything a tool handler throws and turns it into an
+ * `isError` tool result, so `await next()` in middleware resolves normally and
+ * the original `Error` — stack, `cause` — is lost. Skybridge stores it on
+ * `extra` (never serialized to the client) so observability middleware can
+ * report it:
+ *
+ * ```ts
+ * server.mcpMiddleware("tools/call", async (request, extra, next) => {
+ *   const result = await next();
+ *   const error = getToolError(extra);
+ *   if (error) {
+ *     Sentry.captureException(error);
+ *   }
+ *   return result;
+ * });
+ * ```
+ */
+export declare function getToolError(extra: McpExtra | undefined): unknown;
+/**
+ * MCP methods the server handles (incoming from client).
+ */
+export type McpMethodString = ClientRequest["method"] | ClientNotification["method"];
+/**
+ * Resolve the `params` type for a specific MCP method (request or notification)
+ * from the SDK's typed unions. Falls back to `Record<string, unknown>` for
+ * unknown methods. Used by {@link McpTypedMiddlewareFn} to narrow the request
+ * shape in typed middleware.
+ */
+export type McpRequestParams<M extends string> = Extract<ClientRequest, {
+    method: M;
+}> extends {
+    params: infer P;
+} ? P : Extract<ClientNotification, {
+    method: M;
+}> extends {
+    params: infer P;
+} ? P : Record<string, unknown>;
+/**
+ * Resolve the `extra` arg type for a specific MCP method: {@link McpExtra} for
+ * request methods, `undefined` for notification methods (the SDK does not
+ * pass extra context for notifications).
+ */
+export type McpExtraFor<M extends string, TAuthExtra extends ExtraClaims = ExtraClaims> = M extends ClientRequest["method"] ? McpExtra<TAuthExtra> : M extends ClientNotification["method"] ? undefined : McpExtra<TAuthExtra> | undefined;
+/** Maps each MCP request method to its SDK result type. */
+interface McpResultMap {
+    ping: EmptyResult;
+    initialize: InitializeResult;
+    "tools/list": ListToolsResult;
+    "tools/call": CallToolResult;
+    "resources/list": ListResourcesResult;
+    "resources/templates/list": ListResourceTemplatesResult;
+    "resources/read": ReadResourceResult;
+    "resources/subscribe": EmptyResult;
+    "resources/unsubscribe": EmptyResult;
+    "prompts/list": ListPromptsResult;
+    "prompts/get": GetPromptResult;
+    "completion/complete": CompleteResult;
+    "logging/setLevel": EmptyResult;
+    "tasks/get": GetTaskResult;
+    "tasks/result": GetTaskPayloadResult;
+    "tasks/list": ListTasksResult;
+    "tasks/cancel": CancelTaskResult;
+}
+/**
+ * Map an MCP method string to its corresponding result type.
+ * For request methods, resolves to the specific SDK result type.
+ * For wildcard patterns (e.g. `"tools/*"`), resolves to the union of matching result types.
+ * For notification methods, resolves to `undefined`.
+ * For unknown/unmatched methods, falls back to `ServerResult`.
+ */
+export type McpResultFor<M extends string> = M extends keyof McpResultMap ? McpResultMap[M] : M extends `${infer Prefix}/*` ? [McpResultMap[keyof McpResultMap & `${Prefix}/${string}`]] extends [never] ? M extends ToWildcard<ClientNotification["method"]> ? undefined : ServerResult : McpResultMap[keyof McpResultMap & `${Prefix}/${string}`] : M extends ClientNotification["method"] ? undefined : ServerResult;
+/**
+ * Typed middleware function for a specific method. Narrows `request.params`
+ * via {@link McpRequestParams}, `extra` via {@link McpExtraFor}, and the
+ * resolved value of `next()` via {@link McpResultFor}.
+ */
+export type McpTypedMiddlewareFn<M extends string, TAuthExtra extends ExtraClaims = ExtraClaims> = (request: {
+    method: M;
+    params: McpRequestParams<M>;
+}, extra: McpExtraFor<M, TAuthExtra>, next: () => Promise<McpResultFor<M>>) => Promise<unknown> | unknown;
+/** Extracts `"prefix/*"` from `"prefix/anything"` — distributive over unions. */
+type ToWildcard<T extends string> = T extends `${infer Prefix}/${string}` ? `${Prefix}/*` : never;
+/** Wildcard prefixes derived from method strings (e.g. `"tools/*"` from `"tools/call"`). */
+export type McpWildcard = ToWildcard<McpMethodString>;
+/** Category keywords matching all requests or all notifications. */
+type McpCategory = "request" | "notification";
+/**
+ * A single filter pattern for MCP middleware:
+ * - Exact method: `"tools/call"`
+ * - Wildcard: `"tools/*"`
+ * - Category: `"request"` | `"notification"`
+ * - Escape hatch: arbitrary string via `string & {}`
+ */
+type McpMiddlewareFilterPattern = McpMethodString | McpWildcard | McpCategory | (string & {});
+/**
+ * Filter determining which MCP methods a middleware applies to.
+ * A single pattern or an array of patterns (OR logic).
+ */
+export type McpMiddlewareFilter = McpMiddlewareFilterPattern | McpMiddlewareFilterPattern[];
+/**
+ * Internal entry stored for each registered middleware.
+ * `filter: null` means catch-all (matches everything).
+ */
+export type McpMiddlewareEntry = {
+    filter: McpMiddlewareFilter | null;
+    handler: McpMiddlewareFn;
+};
+type HandlerMap = Map<string, (...args: unknown[]) => Promise<unknown>>;
+/**
+ * Extract the TS-private `_requestHandlers` and `_notificationHandlers` maps
+ * from the SDK's `Server` (extends `Protocol`). These are runtime-accessible
+ * but declared `private` in TypeScript.
+ *
+ * Validates with `instanceof Map` so an incompatible SDK version fails fast
+ * instead of silently breaking.
+ */
+export declare function getHandlerMaps(server: Server): {
+    requestHandlers: HandlerMap;
+    notificationHandlers: HandlerMap;
+};
+/**
+ * Check if a single filter pattern matches a given method.
+ *
+ * - Exact: `"tools/call"` matches only `"tools/call"`
+ * - Wildcard: `"tools/*"` matches any method starting with `"tools/"`
+ * - Category `"request"`: matches when `isNotification` is false
+ * - Category `"notification"`: matches when `isNotification` is true
+ */
+export declare function matchesFilter(method: string, filter: string, isNotification: boolean): boolean;
+/**
+ * Build an onion-model middleware chain for a specific method.
+ *
+ * Filters `entries` to those matching `method`, then composes them
+ * so the first registered middleware is the outermost layer.
+ * `next()` is guarded against multiple calls within a single middleware.
+ */
+export declare function buildMiddlewareChain(method: string, isNotification: boolean, originalHandler: (...args: unknown[]) => Promise<unknown>, entries: McpMiddlewareEntry[]): (...args: unknown[]) => Promise<unknown>;
+export {};

package/dist/server/middleware.js

@@ -0,0 +1,126 @@
+const TOOL_ERROR = Symbol.for("skybridge.toolError");
+function toolErrorSlot(extra) {
+    return extra;
+}
+export function captureToolError(extra, error) {
+    const slot = toolErrorSlot(extra);
+    if (slot) {
+        slot[TOOL_ERROR] = error;
+    }
+}
+/**
+ * Retrieve the error a tool handler threw during this request, if any.
+ *
+ * The MCP SDK catches anything a tool handler throws and turns it into an
+ * `isError` tool result, so `await next()` in middleware resolves normally and
+ * the original `Error` — stack, `cause` — is lost. Skybridge stores it on
+ * `extra` (never serialized to the client) so observability middleware can
+ * report it:
+ *
+ * ```ts
+ * server.mcpMiddleware("tools/call", async (request, extra, next) => {
+ *   const result = await next();
+ *   const error = getToolError(extra);
+ *   if (error) {
+ *     Sentry.captureException(error);
+ *   }
+ *   return result;
+ * });
+ * ```
+ */
+export function getToolError(extra) {
+    return toolErrorSlot(extra)?.[TOOL_ERROR];
+}
+/**
+ * Extract the TS-private `_requestHandlers` and `_notificationHandlers` maps
+ * from the SDK's `Server` (extends `Protocol`). These are runtime-accessible
+ * but declared `private` in TypeScript.
+ *
+ * Validates with `instanceof Map` so an incompatible SDK version fails fast
+ * instead of silently breaking.
+ */
+export function getHandlerMaps(server) {
+    const obj = server;
+    if (!("_requestHandlers" in obj && obj._requestHandlers instanceof Map) ||
+        !("_notificationHandlers" in obj && obj._notificationHandlers instanceof Map)) {
+        throw new Error("Incompatible MCP SDK version: expected _requestHandlers and _notificationHandlers on Server");
+    }
+    return {
+        requestHandlers: obj._requestHandlers,
+        notificationHandlers: obj._notificationHandlers,
+    };
+}
+/**
+ * Check if a single filter pattern matches a given method.
+ *
+ * - Exact: `"tools/call"` matches only `"tools/call"`
+ * - Wildcard: `"tools/*"` matches any method starting with `"tools/"`
+ * - Category `"request"`: matches when `isNotification` is false
+ * - Category `"notification"`: matches when `isNotification` is true
+ */
+export function matchesFilter(method, filter, isNotification) {
+    if (filter === "request") {
+        return !isNotification;
+    }
+    if (filter === "notification") {
+        return isNotification;
+    }
+    if (filter.endsWith("/*")) {
+        const prefix = filter.slice(0, -1); // "tools/*" → "tools/"
+        return method.startsWith(prefix);
+    }
+    return method === filter;
+}
+function matchesAnyFilter(method, filter, isNotification) {
+    if (filter === null) {
+        return true;
+    }
+    if (typeof filter === "string") {
+        return matchesFilter(method, filter, isNotification);
+    }
+    return filter.some((pattern) => matchesFilter(method, pattern, isNotification));
+}
+/**
+ * Build an onion-model middleware chain for a specific method.
+ *
+ * Filters `entries` to those matching `method`, then composes them
+ * so the first registered middleware is the outermost layer.
+ * `next()` is guarded against multiple calls within a single middleware.
+ */
+export function buildMiddlewareChain(method, isNotification, originalHandler, entries) {
+    const applicable = entries.filter((entry) => matchesAnyFilter(method, entry.filter, isNotification));
+    if (applicable.length === 0) {
+        return originalHandler;
+    }
+    return (...args) => {
+        const rawRequest = args[0];
+        // SDK calls request handlers as handler(request, extra) but
+        // notification handlers as handler(notification) — no extra arg.
+        const extra = isNotification ? undefined : args[1];
+        const mcpRequest = {
+            method,
+            params: rawRequest?.params ?? {},
+        };
+        let index = 0;
+        const executeLayer = () => {
+            const entry = applicable[index++];
+            if (!entry) {
+                if (rawRequest) {
+                    rawRequest.params = mcpRequest.params;
+                }
+                return originalHandler(...args);
+            }
+            let nextCalled = false;
+            const next = () => {
+                if (nextCalled) {
+                    throw new Error(`next() called multiple times in middleware for "${method}"`);
+                }
+                nextCalled = true;
+                return executeLayer();
+            };
+            return Promise.resolve(entry.handler(mcpRequest, extra, next));
+        };
+        return executeLayer();
+    };
+}
+//# sourceMappingURL=middleware.js.map