skybridge 0.0.0-dev.b9f65be → 0.0.0-dev.b9f85b3

package/dist/server/middleware.js

@@ -1,3 +1,36 @@
+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

package/dist/server/middleware.js.map

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

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

@@ -3,7 +3,7 @@ const server = null;
 test("request category narrows extra and next() result", () => {
     server.mcpMiddleware("request", async (_request, extra, next) => {
         expectTypeOf(extra).toEqualTypeOf();
-        extra.signal;
+        extra.mcpReq.signal;
         const result = await next();
         expectTypeOf(result).toEqualTypeOf();
         return result;

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":"AAKA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAQ5C,MAAM,MAAM,GAAG,IAA4B,CAAC;AAE5C,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC9D,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,KAAK,CAAC,MAAM,CAAC;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAgB,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACnE,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,6DAA6D;QAC7D,KAAK,CAAC,MAAM,CAAC;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAa,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kEAAkE,EAAE,GAAG,EAAE;IAC5E,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAChE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QAC/C,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAkB,CAAC;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;IACrE,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAmB,CAAC;QACtD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;IACrE,MAAM,CAAC,aAAa,CAClB,2BAA2B,EAC3B,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC9B,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,sCAAsC;QACtC,KAAK,CAAC,MAAM,CAAC;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAa,CAAC;IAClD,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC7E,YAAY,EAET,CAAC,UAAU,EAAE,CAAC;IACjB,YAAY,EAET,CAAC,aAAa,EAAY,CAAC;IAC9B,YAAY,EAET,CAAC,aAAa,EAAa,CAAC;IAC/B,YAAY,EAET,CAAC,aAAa,EAA4B,CAAC;IAC9C,YAAY,EAET,CAAC,aAAa,EAAsB,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,YAAY,EAA8B,CAAC,aAAa,EAAmB,CAAC;IAC5E,YAAY,EAA8B,CAAC,aAAa,EAAkB,CAAC;IAC3E,YAAY,EAET,CAAC,aAAa,EAAa,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC1E,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAoC,CAAC;QACvE,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC7E,YAAY,EAA2B,CAAC,aAAa,EAElD,CAAC;AACN,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","sourcesContent":["import type {\n  CallToolResult,\n  ListToolsResult,\n  ServerResult,\n} from \"@modelcontextprotocol/sdk/types.js\";\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.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"]}
+{"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,29 +207,34 @@ 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" }, (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" }, (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",
@@ -243,59 +247,57 @@ 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" }, (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(() => 
+        expect(() => new Skybridge({ name: "test", version: "1.0.0" }, (server) => 
         // @ts-expect-error intentionally passing filter without handler
-        server.mcpMiddleware("tools/call")).toThrow("mcpMiddleware requires a handler function");
+        server.mcpMiddleware("tools/call"))).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" }, (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" });
@@ -309,41 +311,47 @@ 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" }, (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" }, (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" });
@@ -353,30 +361,33 @@ 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" }, (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",
@@ -387,50 +398,95 @@ 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" }, (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 app = new Skybridge({ name: "test", version: "1.0.0" }, (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 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" }, (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",
@@ -438,21 +494,24 @@ 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" }, (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" });
@@ -460,7 +519,7 @@ describe("McpServer.mcpMiddleware()", () => {
         expect(matchedMethods).toContain("tools/call");
         expect(matchedMethods).not.toContain("notifications/initialized");
         await client.close();
-        await server.close();
+        await instance.close();
     });
 });
 // ---------------------------------------------------------------------------