skybridge 0.0.0-dev.fecd520 → 0.0.0-dev.fef24cf

package/dist/server/inferUtilityTypes.d.ts

@@ -1,12 +1,12 @@
 import type { McpServerTypes, ToolDef } from "./server.js";
 /**
- * Any tool registry shape (includes both widgets and regular tools).
+ * Any tool registry shape (includes both views and regular tools).
  * Used as a constraint for type parameters that accept tool registries.
  */
 export type AnyToolRegistry = Record<string, ToolDef>;
 /**
  * Extract the tool registry type from an McpServer instance.
- * This includes both widgets (registered via widget()) and regular tools (registered via registerTool()).
+ * This includes both views (registered via view()) and regular tools (registered via registerTool()).
  *
  * Uses the `$types` property pattern for cross-package type inference.
  * This works across package boundaries because TypeScript uses structural typing
@@ -24,7 +24,7 @@ export type InferTools<ServerType> = ServerType extends {
 type ExtractTool<ServerType, K extends ToolNames<ServerType>> = InferTools<ServerType>[K];
 /**
  * Get a union of all tool names from an McpServer instance.
- * This includes both widgets and regular tools.
+ * This includes both views and regular tools.
  *
  * @example
  * ```ts
@@ -34,7 +34,7 @@ type ExtractTool<ServerType, K extends ToolNames<ServerType>> = InferTools<Serve
  */
 export type ToolNames<ServerType> = keyof InferTools<ServerType> & string;
 /**
- * Get the input type for a specific tool (widget or regular tool).
+ * Get the input type for a specific tool (view or regular tool).
  *
  * @example
  * ```ts
@@ -43,7 +43,7 @@ export type ToolNames<ServerType> = keyof InferTools<ServerType> & string;
  */
 export type ToolInput<ServerType, ToolName extends ToolNames<ServerType>> = ExtractTool<ServerType, ToolName>["input"];
 /**
- * Get the output type for a specific tool (widget or regular tool).
+ * Get the output type for a specific tool (view or regular tool).
  *
  * @example
  * ```ts
@@ -52,7 +52,7 @@ export type ToolInput<ServerType, ToolName extends ToolNames<ServerType>> = Extr
  */
 export type ToolOutput<ServerType, ToolName extends ToolNames<ServerType>> = ExtractTool<ServerType, ToolName>["output"];
 /**
- * Get the responseMetadata type for a specific tool (widget or regular tool).
+ * Get the responseMetadata type for a specific tool (view or regular tool).
  * This is inferred from the `_meta` property of the tool callback's return value.
  *
  * @example

package/dist/server/inferUtilityTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"inferUtilityTypes.js","sourceRoot":"","sources":["../../src/server/inferUtilityTypes.ts"],"names":[],"mappings":""}
+{"version":3,"file":"inferUtilityTypes.js","sourceRoot":"","sources":["../../src/server/inferUtilityTypes.ts"],"names":[],"mappings":"","sourcesContent":["import type { McpServerTypes, ToolDef } from \"./server.js\";\n\n/**\n * Any tool registry shape (includes both views and regular tools).\n * Used as a constraint for type parameters that accept tool registries.\n */\nexport type AnyToolRegistry = Record<string, ToolDef>;\n\n/**\n * Extract the tool registry type from an McpServer instance.\n * This includes both views (registered via view()) and regular tools (registered via registerTool()).\n *\n * Uses the `$types` property pattern for cross-package type inference.\n * This works across package boundaries because TypeScript uses structural typing\n * on the shape of `$types`, rather than nominal typing on the McpServer class itself.\n *\n * @example\n * ```ts\n * type MyTools = InferTools<MyServer>;\n * // { \"search\": ToolDef<...>, \"calculate\": ToolDef<...> }\n * ```\n */\nexport type InferTools<ServerType> = ServerType extends {\n  $types: McpServerTypes<infer W>;\n}\n  ? W\n  : never;\ntype ExtractTool<\n  ServerType,\n  K extends ToolNames<ServerType>,\n> = InferTools<ServerType>[K];\n\n/**\n * Get a union of all tool names from an McpServer instance.\n * This includes both views and regular tools.\n *\n * @example\n * ```ts\n * type Names = ToolNames<MyServer>;\n * // \"search\" | \"calculate\" | \"details\"\n * ```\n */\nexport type ToolNames<ServerType> = keyof InferTools<ServerType> & string;\n\n/**\n * Get the input type for a specific tool (view or regular tool).\n *\n * @example\n * ```ts\n * type SearchInput = ToolInput<MyServer, \"search\">;\n * ```\n */\nexport type ToolInput<\n  ServerType,\n  ToolName extends ToolNames<ServerType>,\n> = ExtractTool<ServerType, ToolName>[\"input\"];\n\n/**\n * Get the output type for a specific tool (view or regular tool).\n *\n * @example\n * ```ts\n * type SearchOutput = ToolOutput<MyServer, \"search\">;\n * ```\n */\nexport type ToolOutput<\n  ServerType,\n  ToolName extends ToolNames<ServerType>,\n> = ExtractTool<ServerType, ToolName>[\"output\"];\n\n/**\n * Get the responseMetadata type for a specific tool (view or regular tool).\n * This is inferred from the `_meta` property of the tool callback's return value.\n *\n * @example\n * ```ts\n * type SearchMeta = ToolResponseMetadata<MyServer, \"search\">;\n * ```\n */\nexport type ToolResponseMetadata<\n  ServerType,\n  ToolName extends ToolNames<ServerType>,\n> = ExtractTool<ServerType, ToolName>[\"responseMetadata\"];\n"]}

package/dist/server/metric.d.ts

@@ -0,0 +1,14 @@
+import type { McpMiddlewareEntry } from "./middleware.js";
+/**
+ * Returns an internal MCP middleware entry 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`).
+ *
+ * Returns `null` 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 createMiddlewareEntry(): McpMiddlewareEntry | null;

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
+    });
+}
+/**
+ * Returns an internal MCP middleware entry 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`).
+ *
+ * Returns `null` 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 createMiddlewareEntry() {
+    if (isDev || !versionTag) {
+        return null;
+    }
+    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}`);
+        }
+    };
+    return { 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,qBAAqB;IACnC,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,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,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;AAC3C,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 * Returns an internal MCP middleware entry 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 * Returns `null` 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 createMiddlewareEntry(): McpMiddlewareEntry | null {\n  if (isDev || !versionTag) {\n    return null;\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  return { filter: \"tools/call\", handler };\n}\n"]}

package/dist/server/middleware.d.ts

@@ -1,6 +1,6 @@
 import type { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type { ClientNotification, ClientRequest, ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult, CancelTaskResult, ClientNotification, ClientRequest, CompleteResult, EmptyResult, GetPromptResult, GetTaskPayloadResult, GetTaskResult, InitializeResult, ListPromptsResult, ListResourcesResult, ListResourceTemplatesResult, ListTasksResult, ListToolsResult, ReadResourceResult, ServerNotification, ServerRequest, ServerResult } from "@modelcontextprotocol/sdk/types.js";
 /**
  * The `extra` context object provided by the MCP SDK to request handlers.
  */
@@ -19,7 +19,12 @@ export type McpMiddlewareFn = (request: {
  * MCP methods the server handles (incoming from client).
  */
 export type McpMethodString = ClientRequest["method"] | ClientNotification["method"];
-/** Extract params type for a specific MCP method from SDK unions. */
+/**
+ * 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 {
@@ -29,17 +34,53 @@ export type McpRequestParams<M extends string> = Extract<ClientRequest, {
 }> extends {
     params: infer P;
 } ? P : Record<string, unknown>;
-/** Resolve extra type: McpExtra for requests, undefined for notifications. */
+/**
+ * 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> = M extends ClientRequest["method"] ? McpExtra : M extends ClientNotification["method"] ? undefined : McpExtra | undefined;
-/** Typed middleware fn for a specific method — narrows both params and extra. */
+/** 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> = (request: {
     method: M;
     params: McpRequestParams<M>;
-}, extra: McpExtraFor<M>, next: () => Promise<unknown>) => Promise<unknown> | unknown;
+}, extra: McpExtraFor<M>, 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"`). */
-type McpWildcard = ToWildcard<McpMethodString>;
+export type McpWildcard = ToWildcard<McpMethodString>;
 /** Category keywords matching all requests or all notifications. */
 type McpCategory = "request" | "notification";
 /**

package/dist/server/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"AAkGA;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,GAAG,GAAW,MAAM,CAAC;IAE3B,IACE,CAAC,CAAC,kBAAkB,IAAI,GAAG,IAAI,GAAG,CAAC,gBAAgB,YAAY,GAAG,CAAC;QACnE,CAAC,CACC,uBAAuB,IAAI,GAAG,IAAI,GAAG,CAAC,qBAAqB,YAAY,GAAG,CAC3E,EACD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,6FAA6F,CAC9F,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,GAAG,CAAC,gBAA8B;QACnD,oBAAoB,EAAE,GAAG,CAAC,qBAAmC;KAC9D,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,MAAc,EACd,MAAc,EACd,cAAuB;IAEvB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,CAAC,cAAc,CAAC;IACzB,CAAC;IACD,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB;QAC3D,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,KAAK,MAAM,CAAC;AAC3B,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAc,EACd,MAAkC,EAClC,cAAuB;IAEvB,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC7B,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAC/C,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAc,EACd,cAAuB,EACvB,eAAyD,EACzD,OAA6B;IAE7B,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1C,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CACvD,CAAC;IAEF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,GAAG,IAAe,EAAE,EAAE;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAwC,CAAC;QAClE,4DAA4D;QAC5D,iEAAiE;QACjE,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC,CAAc,CAAC;QACjE,MAAM,UAAU,GAAG;YACjB,MAAM;YACN,MAAM,EAAG,UAAU,EAAE,MAAkC,IAAI,EAAE;SAC9D,CAAC;QAEF,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,MAAM,YAAY,GAAG,GAAqB,EAAE;YAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;gBACxC,CAAC;gBACD,OAAO,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,UAAU,GAAG,KAAK,CAAC;YAEvB,MAAM,IAAI,GAAG,GAAqB,EAAE;gBAClC,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CACb,mDAAmD,MAAM,GAAG,CAC7D,CAAC;gBACJ,CAAC;gBACD,UAAU,GAAG,IAAI,CAAC;gBAClB,OAAO,YAAY,EAAE,CAAC;YACxB,CAAC,CAAC;YAEF,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC;QAEF,OAAO,YAAY,EAAE,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
+{"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"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"middleware.test-d.js","sourceRoot":"","sources":["../../src/server/middleware.test-d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAI5C,MAAM,MAAM,GAAG,IAA4B,CAAC;AAE5C,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACtD,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxD,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7D,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,6DAA6D;QAC7D,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1D,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QAC/C,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3D,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAY,CAAC;QAC9C,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1E,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAa,CAAC;QAC/C,sCAAsC;QACtC,KAAK,CAAC,MAAM,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,YAAY,EAAsC,CAAC,YAAY,EAAE,CAAC;IAClE,YAAY,EAET,CAAC,UAAU,EAAE,CAAC;IACjB,YAAY,EAET,CAAC,aAAa,EAAY,CAAC;IAC9B,YAAY,EAET,CAAC,aAAa,EAAa,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7C,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAwB,CAAC;QAC1D,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,aAAa,EAA2B,CAAC;QACvE,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"middleware.test-d.js","sourceRoot":"","sources":["../../src/server/middleware.test-d.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CallToolResult,\n  ListToolsResult,\n  ServerResult,\n} from \"@modelcontextprotocol/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"]}

package/dist/server/middleware.test.js

@@ -216,7 +216,8 @@ describe("McpServer.mcpMiddleware()", () => {
         let capturedMethod = "";
         let capturedParams = {};
         const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool("greet", {
+        server.registerTool({
+            name: "greet",
             description: "greet",
             inputSchema: { name: z.string() },
         }, (args) => ({
@@ -247,7 +248,7 @@ describe("McpServer.mcpMiddleware()", () => {
     it("array filter works", async () => {
         const matchedMethods = [];
         const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool("t1", { description: "t1" }, () => ({
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
             content: [{ type: "text", text: "ok" }],
         }));
         server.mcpMiddleware(["tools/call", "tools/list"], async (request, _extra, next) => {
@@ -280,7 +281,7 @@ describe("McpServer.mcpMiddleware()", () => {
     it("catch-all middleware + filtered middleware stack correctly", async () => {
         const calls = [];
         const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool("t1", { description: "t1" }, () => ({
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
             content: [{ type: "text", text: "ok" }],
         }));
         server
@@ -313,7 +314,7 @@ describe("McpServer.mcpMiddleware()", () => {
     it("notification middleware receives extra as undefined", async () => {
         let capturedExtra = "sentinel";
         const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool("t1", { description: "t1" }, () => ({
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
             content: [{ type: "text", text: "ok" }],
         }));
         server.mcpMiddleware("notification", async (_request, extra, next) => {
@@ -330,10 +331,119 @@ describe("McpServer.mcpMiddleware()", () => {
         await client.close();
         await server.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 client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.listTools();
+        await client.callTool({ name: "t1" });
+        expect(matchedMethods).toContain("tools/list");
+        expect(matchedMethods).toContain("tools/call");
+        // Should not match initialize or notifications
+        expect(matchedMethods).not.toContain("initialize");
+        expect(matchedMethods).not.toContain("notifications/initialized");
+        await client.close();
+        await 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)" },
+                ],
+            };
+        });
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const result = await client.callTool({
+            name: "greet",
+            arguments: { name: "World" },
+        });
+        expect(result.content).toEqual([
+            { type: "text", text: "hi World" },
+            { type: "text", text: " (modified)" },
+        ]);
+        await client.close();
+        await server.close();
+    });
+    it("middleware can short-circuit via McpServer 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" }],
+            };
+        });
+        server.mcpMiddleware("tools/call", async () => ({
+            content: [{ type: "text", text: "short-circuited" }],
+        }));
+        const client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.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();
+    });
+    it("middleware can mutate tool call params via McpServer 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 client = createClient();
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        await client.callTool({
+            name: "greet",
+            arguments: { name: "Original" },
+        });
+        expect(receivedName).toBe("Overridden");
+        await client.close();
+        await server.close();
+    });
     it("category 'request' filter matches requests but not notifications", async () => {
         const matchedMethods = [];
         const server = new McpServer({ name: "test", version: "1.0.0" });
-        server.registerTool("t1", { description: "t1" }, () => ({
+        server.registerTool({ name: "t1", description: "t1" }, () => ({
             content: [{ type: "text", text: "ok" }],
         }));
         server.mcpMiddleware("request", async (request, _extra, next) => {