@posthog/mcp 0.10.8 → 0.10.9

package/dist/extensions/instrument-lowlevel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-lowlevel.d.ts","sourceRoot":"","sources":["../../src/extensions/instrument-lowlevel.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAiD,aAAa,EAAE,MAAM,UAAU,CAAA;AAG5F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAkBxC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA0BtF"}
+{"version":3,"file":"instrument-lowlevel.d.ts","sourceRoot":"","sources":["../../src/extensions/instrument-lowlevel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAiD,aAAa,EAAE,MAAM,UAAU,CAAA;AAG5F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAmBxC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA0BtF"}

package/dist/extensions/instrument-lowlevel.js

@@ -26,7 +26,6 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     instrumentLowLevelServer: ()=>instrumentLowLevelServer
 });
-const types_js_namespaceObject = require("@modelcontextprotocol/sdk/types.js");
 const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_internal_js_namespaceObject = require("./internal.js");
 const external_tools_js_namespaceObject = require("./tools.js");
@@ -35,20 +34,22 @@ const external_tracing_helpers_js_namespaceObject = require("./tracing-helpers.j
 function instrumentLowLevelServer(server, logger) {
     try {
         const hadCallToolHandler = server._requestHandlers.has('tools/call');
+        const traceToolCall = (server, originalHandler, request, extra)=>handleToolCallRequest(server, originalHandler, request, extra, logger);
         const handlers = {
             initialize: (server, originalHandler, request, extra)=>(0, external_instrumentation_js_namespaceObject.handleInitializeRequest)(server, originalHandler, request, extra, logger),
             'tools/list': (server, originalHandler, request, extra)=>(0, external_instrumentation_js_namespaceObject.handleListToolsRequest)(server, originalHandler, request, extra, logger),
-            'tools/call': (server, originalHandler, request, extra)=>handleToolCallRequest(server, originalHandler, request, extra, logger)
+            'tools/call': traceToolCall
         };
         (0, external_instrumentation_js_namespaceObject.patchRequestHandlers)(server, handlers);
-        if (!hadCallToolHandler) server.setRequestHandler(types_js_namespaceObject.CallToolRequestSchema, async (request)=>{
-            throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
-        });
+        if (!hadCallToolHandler) (0, external_instrumentation_js_namespaceObject.registerFallbackRequestHandler)(server, 'tools/call', unknownToolHandler, traceToolCall);
     } catch (error) {
         logger(`Warning: Failed to setup tool call instrumentation - ${error}`);
         throw error;
     }
 }
+async function unknownToolHandler(request) {
+    throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
+}
 async function handleToolCallRequest(server, originalCallToolHandler, request, extra, logger) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     if (!data) {

package/dist/extensions/instrument-lowlevel.mjs

@@ -1,26 +1,27 @@
-import { CallToolRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { MCPAnalyticsEventType } from "./event-types.mjs";
 import { getServerTrackingData } from "./internal.mjs";
 import { handleReportMissing, resolveMissingCapabilityToolName } from "./tools.mjs";
-import { captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers } from "./instrumentation.mjs";
+import { captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers, registerFallbackRequestHandler } from "./instrumentation.mjs";
 import { getContextArgument } from "./tracing-helpers.mjs";
 function instrumentLowLevelServer(server, logger) {
     try {
         const hadCallToolHandler = server._requestHandlers.has('tools/call');
+        const traceToolCall = (server, originalHandler, request, extra)=>handleToolCallRequest(server, originalHandler, request, extra, logger);
         const handlers = {
             initialize: (server, originalHandler, request, extra)=>handleInitializeRequest(server, originalHandler, request, extra, logger),
             'tools/list': (server, originalHandler, request, extra)=>handleListToolsRequest(server, originalHandler, request, extra, logger),
-            'tools/call': (server, originalHandler, request, extra)=>handleToolCallRequest(server, originalHandler, request, extra, logger)
+            'tools/call': traceToolCall
         };
         patchRequestHandlers(server, handlers);
-        if (!hadCallToolHandler) server.setRequestHandler(CallToolRequestSchema, async (request)=>{
-            throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
-        });
+        if (!hadCallToolHandler) registerFallbackRequestHandler(server, 'tools/call', unknownToolHandler, traceToolCall);
     } catch (error) {
         logger(`Warning: Failed to setup tool call instrumentation - ${error}`);
         throw error;
     }
 }
+async function unknownToolHandler(request) {
+    throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
+}
 async function handleToolCallRequest(server, originalCallToolHandler, request, extra, logger) {
     const data = getServerTrackingData(server);
     if (!data) {

package/dist/extensions/instrumentation.d.ts

@@ -55,6 +55,28 @@ export declare function captureToolCall(params: TraceToolCallParams): Promise<un
  * supplies `request` and `extra` per call.
  */
 export type HandlerPatch = (server: MCPServerLike, originalHandler: MCPRequestHandler, request: MCPRequestLike, extra: CompatibleRequestHandlerExtra | undefined) => Promise<unknown>;
+/**
+ * Registers a synthetic fallback handler for `handlerName`, already wrapped in
+ * `patch`, by writing straight into `_requestHandlers` instead of going through
+ * `setRequestHandler`.
+ *
+ * Bypassing the SDK setter is deliberate, on three counts:
+ *
+ * - **Capability assertion.** `setRequestHandler` refuses a method the server
+ *   never declared a capability for, so instrumenting a low-level server built
+ *   without `capabilities.tools` used to throw `Server does not support tools`
+ *   and leave instrumentation half-applied. Our fallback is not a capability the
+ *   server offers — it exists only so a call for a tool nobody claims is still
+ *   captured — so the assertion has nothing to protect here.
+ * - **Schema validation.** The setter also wraps the handler in request/result
+ *   parsing, which a handler that can only ever throw `Unknown tool` never needs.
+ * - **Portability.** The setter's first argument is a Zod schema on SDK v1 and a
+ *   method string on v2; the map key is the same string on both, so this is the
+ *   one registration form that does not need to know which major it is talking
+ *   to — and it drops the last runtime `@modelcontextprotocol/sdk` import from
+ *   the shipped bundle.
+ */
+export declare function registerFallbackRequestHandler(server: MCPServerLike, handlerName: string, fallbackHandler: MCPRequestHandler, patch: HandlerPatch): void;
 export declare function patchRequestHandlers(server: MCPServerLike, patches: Record<string, HandlerPatch>): void;
 /**
  * Checks the server's raw listing for a real owner of a candidate virtual tool.

package/dist/extensions/instrumentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/extensions/instrumentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/extensions/instrumentation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AACzE,OAAO,KAAK,EACV,2BAA2B,EAC3B,6BAA6B,EAC7B,gBAAgB,EAChB,cAAc,EACd,aAAa,EAId,MAAM,UAAU,CAAA;AAajB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAIrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAQxC;;;;;;GAMG;AAEH,KAAK,iBAAiB,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,6BAA6B,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE7G,2EAA2E;AAC3E,KAAK,YAAY,GAAG,CAAC,iBAAiB,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE3E,UAAU,mBAAmB;IAC3B,MAAM,EAAE,aAAa,CAAA;IACrB,IAAI,EAAE,gBAAgB,CAAA;IACtB,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,CAAC,EAAE,6BAA6B,CAAA;IACrC,OAAO,EAAE,YAAY,CAAA;IACrB,2FAA2F;IAC3F,kBAAkB,CAAC,EAAE,2BAA2B,CAAA;IAChD;;;;OAIG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAA;IACjC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAA;CAClC;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmDnF;AAqND;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,MAAM,EAAE,aAAa,EACrB,eAAe,EAAE,iBAAiB,EAClC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,6BAA6B,GAAG,SAAS,KAC7C,OAAO,CAAC,OAAO,CAAC,CAAA;AAwBrB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,iBAAiB,EAClC,KAAK,EAAE,YAAY,GAClB,IAAI,CAGN;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI,CA2CvG;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAoB9B;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,EACrB,wBAAwB,EAAE,iBAAiB,EAC3C,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC,CAqD9C;AAqFD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CASnH;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGtE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CAUjH;AA+GD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,aAAa,EACrB,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC,OAAO,CAAC,CA2DlB"}

package/dist/extensions/instrumentation.js

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     readToolMetaCategory: ()=>readToolMetaCategory,
     cacheToolCategories: ()=>cacheToolCategories,
     handleListToolsRequest: ()=>handleListToolsRequest,
+    registerFallbackRequestHandler: ()=>registerFallbackRequestHandler,
     patchRequestHandlers: ()=>patchRequestHandlers
 });
 const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
@@ -174,6 +175,10 @@ function rememberOriginalRequestHandler(server, handlerName, originalHandler) {
     }
     handlers.set(handlerName, originalHandler);
 }
+function registerFallbackRequestHandler(server, handlerName, fallbackHandler, patch) {
+    rememberOriginalRequestHandler(server, handlerName, fallbackHandler);
+    server._requestHandlers.set(handlerName, (request, extra)=>patch(server, fallbackHandler, request, extra));
+}
 function patchRequestHandlers(server, patches) {
     for (const [handlerName, patch] of Object.entries(patches)){
         const originalHandler = server._requestHandlers.get(handlerName);
@@ -183,12 +188,11 @@ function patchRequestHandlers(server, patches) {
         }
     }
     const originalSetRequestHandler = server.setRequestHandler.bind(server);
-    server.setRequestHandler = (requestSchema, originalHandler)=>{
-        const shape = (0, external_mcp_sdk_compat_js_namespaceObject.getObjectShape)(requestSchema);
-        const handlerName = shape?.method ? (0, external_mcp_sdk_compat_js_namespaceObject.getLiteralValue)(shape.method) : void 0;
-        const patch = 'string' == typeof handlerName ? patches[handlerName] : void 0;
-        if (!patch || 'string' != typeof handlerName) return originalSetRequestHandler(requestSchema, originalHandler);
-        const result = originalSetRequestHandler(requestSchema, originalHandler);
+    server.setRequestHandler = (...args)=>{
+        const handlerName = (0, external_mcp_sdk_compat_js_namespaceObject.readRequestHandlerMethod)(args[0]);
+        const patch = void 0 !== handlerName && Object.prototype.hasOwnProperty.call(patches, handlerName) ? patches[handlerName] : void 0;
+        if (void 0 === handlerName || !patch) return originalSetRequestHandler(...args);
+        const result = originalSetRequestHandler(...args);
         const registeredHandler = server._requestHandlers.get(handlerName);
         if (registeredHandler) {
             rememberOriginalRequestHandler(server, handlerName, registeredHandler);
@@ -429,6 +433,7 @@ exports.handleListToolsRequest = __webpack_exports__.handleListToolsRequest;
 exports.isToolAdvertised = __webpack_exports__.isToolAdvertised;
 exports.patchRequestHandlers = __webpack_exports__.patchRequestHandlers;
 exports.readToolMetaCategory = __webpack_exports__.readToolMetaCategory;
+exports.registerFallbackRequestHandler = __webpack_exports__.registerFallbackRequestHandler;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "cacheToolCategories",
     "cacheToolDescriptions",
@@ -437,7 +442,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "handleListToolsRequest",
     "isToolAdvertised",
     "patchRequestHandlers",
-    "readToolMetaCategory"
+    "readToolMetaCategory",
+    "registerFallbackRequestHandler"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/extensions/instrumentation.mjs

@@ -9,7 +9,7 @@ import { captureException } from "./exceptions.mjs";
 import { resolveToolCallIntent, setEventIntent, setExplicitContextIntent } from "./intent.mjs";
 import { getServerTrackingData, handleIdentify, setServerTrackingData, withIdentity } from "./internal.mjs";
 import { buildCapturedMcpParameters } from "./mcp-payloads.mjs";
-import { getLiteralValue, getObjectShape } from "./mcp-sdk-compat.mjs";
+import { readRequestHandlerMethod } from "./mcp-sdk-compat.mjs";
 import { getSessionId, getSessionInfo, newSessionId } from "./session.mjs";
 import { encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from "./session-token.mjs";
 import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from "./tools.mjs";
@@ -139,6 +139,10 @@ function rememberOriginalRequestHandler(server, handlerName, originalHandler) {
     }
     handlers.set(handlerName, originalHandler);
 }
+function registerFallbackRequestHandler(server, handlerName, fallbackHandler, patch) {
+    rememberOriginalRequestHandler(server, handlerName, fallbackHandler);
+    server._requestHandlers.set(handlerName, (request, extra)=>patch(server, fallbackHandler, request, extra));
+}
 function patchRequestHandlers(server, patches) {
     for (const [handlerName, patch] of Object.entries(patches)){
         const originalHandler = server._requestHandlers.get(handlerName);
@@ -148,12 +152,11 @@ function patchRequestHandlers(server, patches) {
         }
     }
     const originalSetRequestHandler = server.setRequestHandler.bind(server);
-    server.setRequestHandler = (requestSchema, originalHandler)=>{
-        const shape = getObjectShape(requestSchema);
-        const handlerName = shape?.method ? getLiteralValue(shape.method) : void 0;
-        const patch = 'string' == typeof handlerName ? patches[handlerName] : void 0;
-        if (!patch || 'string' != typeof handlerName) return originalSetRequestHandler(requestSchema, originalHandler);
-        const result = originalSetRequestHandler(requestSchema, originalHandler);
+    server.setRequestHandler = (...args)=>{
+        const handlerName = readRequestHandlerMethod(args[0]);
+        const patch = void 0 !== handlerName && Object.prototype.hasOwnProperty.call(patches, handlerName) ? patches[handlerName] : void 0;
+        if (void 0 === handlerName || !patch) return originalSetRequestHandler(...args);
+        const result = originalSetRequestHandler(...args);
         const registeredHandler = server._requestHandlers.get(handlerName);
         if (registeredHandler) {
             rememberOriginalRequestHandler(server, handlerName, registeredHandler);
@@ -386,4 +389,4 @@ function readProtocolVersion(result, request) {
     const requested = request.params?.protocolVersion;
     return 'string' == typeof requested && requested.length > 0 ? requested : void 0;
 }
-export { cacheToolCategories, cacheToolDescriptions, captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers, readToolMetaCategory };
+export { cacheToolCategories, cacheToolDescriptions, captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers, readToolMetaCategory, registerFallbackRequestHandler };

package/dist/extensions/mcp-sdk-compat.d.ts

@@ -30,5 +30,15 @@ export declare function createWrappedTool(originalTool: RegisteredTool, wrappedF
 export declare function isZ4Schema(schema: unknown): boolean;
 export declare function isZodRawShapeCompat(schema: unknown): schema is Record<string, unknown>;
 export declare function getObjectShape(schema: unknown): Record<string, unknown> | undefined;
+/**
+ * Reads the method name a `setRequestHandler` registration is for.
+ *
+ * The two SDK majors disagree on what the first argument is: v1 passes the Zod
+ * schema for the request and carries the method as a literal on its shape, v2
+ * passes the method string itself. A registration we cannot name is one we
+ * cannot match against a patch — which is how a handler registered after
+ * `instrument()` on v2 ends up replacing our wrapper instead of being wrapped.
+ */
+export declare function readRequestHandlerMethod(requestSchema: unknown): string | undefined;
 export declare function getLiteralValue(schema: unknown): unknown;
 //# sourceMappingURL=mcp-sdk-compat.d.ts.map

package/dist/extensions/mcp-sdk-compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-sdk-compat.d.ts","sourceRoot":"","sources":["../../src/extensions/mcp-sdk-compat.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAK5D,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,SAAS,CAAA;AAEpD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,YAAY,CAQlE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,CAKxE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,cAAc,CAMrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,GAAG,cAAc,CAM7G;AAyBD,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAKnD;AAaD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEtF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CA6BnF;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAkCxD"}
+{"version":3,"file":"mcp-sdk-compat.d.ts","sourceRoot":"","sources":["../../src/extensions/mcp-sdk-compat.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAK5D,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,SAAS,CAAA;AAEpD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,YAAY,CAQlE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,CAKxE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,cAAc,CAMrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,GAAG,cAAc,CAM7G;AAyBD,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAKnD;AAaD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEtF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CA6BnF;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAOnF;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAkCxD"}

package/dist/extensions/mcp-sdk-compat.js

@@ -31,7 +31,8 @@ __webpack_require__.d(__webpack_exports__, {
     getToolFunctionKey: ()=>getToolFunctionKey,
     hasToolFunction: ()=>hasToolFunction,
     isZ4Schema: ()=>isZ4Schema,
-    isZodRawShapeCompat: ()=>isZodRawShapeCompat
+    isZodRawShapeCompat: ()=>isZodRawShapeCompat,
+    readRequestHandlerMethod: ()=>readRequestHandlerMethod
 });
 function getToolFunction(tool) {
     if ('handler' in tool && 'function' == typeof tool.handler) return tool.handler;
@@ -82,6 +83,12 @@ function getObjectShape(schema) {
     }
     return rawShape;
 }
+function readRequestHandlerMethod(requestSchema) {
+    if ('string' == typeof requestSchema) return requestSchema;
+    const shape = getObjectShape(requestSchema);
+    const method = shape?.method ? getLiteralValue(shape.method) : void 0;
+    return 'string' == typeof method ? method : void 0;
+}
 function getLiteralValue(schema) {
     if (!schema || 'object' != typeof schema) return;
     if (isZ4Schema(schema)) {
@@ -106,6 +113,7 @@ exports.getToolFunctionKey = __webpack_exports__.getToolFunctionKey;
 exports.hasToolFunction = __webpack_exports__.hasToolFunction;
 exports.isZ4Schema = __webpack_exports__.isZ4Schema;
 exports.isZodRawShapeCompat = __webpack_exports__.isZodRawShapeCompat;
+exports.readRequestHandlerMethod = __webpack_exports__.readRequestHandlerMethod;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createWrappedTool",
     "getLiteralValue",
@@ -114,7 +122,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "getToolFunctionKey",
     "hasToolFunction",
     "isZ4Schema",
-    "isZodRawShapeCompat"
+    "isZodRawShapeCompat",
+    "readRequestHandlerMethod"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/extensions/mcp-sdk-compat.mjs

@@ -47,6 +47,12 @@ function getObjectShape(schema) {
     }
     return rawShape;
 }
+function readRequestHandlerMethod(requestSchema) {
+    if ('string' == typeof requestSchema) return requestSchema;
+    const shape = getObjectShape(requestSchema);
+    const method = shape?.method ? getLiteralValue(shape.method) : void 0;
+    return 'string' == typeof method ? method : void 0;
+}
 function getLiteralValue(schema) {
     if (!schema || 'object' != typeof schema) return;
     if (isZ4Schema(schema)) {
@@ -63,4 +69,4 @@ function getLiteralValue(schema) {
     const directValue = schema.value;
     if (void 0 !== directValue) return directValue;
 }
-export { createWrappedTool, getLiteralValue, getObjectShape, getToolFunction, getToolFunctionKey, hasToolFunction, isZ4Schema, isZodRawShapeCompat };
+export { createWrappedTool, getLiteralValue, getObjectShape, getToolFunction, getToolFunctionKey, hasToolFunction, isZ4Schema, isZodRawShapeCompat, readRequestHandlerMethod };

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.10.8";
+export declare const version = "0.10.9";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -26,7 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     version: ()=>version
 });
-const version = '0.10.8';
+const version = '0.10.9';
 exports.version = __webpack_exports__.version;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "version"

package/dist/version.mjs

@@ -1,2 +1,2 @@
-const version = '0.10.8';
+const version = '0.10.9';
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/mcp",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "bugs": {
     "url": "https://github.com/PostHog/posthog-js/issues"
   },

package/src/extensions/instrument-lowlevel.ts

@@ -3,7 +3,6 @@
 // Copyright (c) 2025 AgentCat, Inc. (formerly MCPcat)
 // Licensed under the MIT License: https://github.com/agentcathq/agentcat-typescript-sdk/blob/main/LICENSE
 
-import { CallToolRequestSchema } from '@modelcontextprotocol/sdk/types.js'
 import type { CompatibleRequestHandlerExtra, MCPRequestLike, MCPServerLike } from '../types'
 import { MCPAnalyticsEventType } from './event-types'
 import { getServerTrackingData } from './internal'
@@ -13,6 +12,7 @@ import {
   handleInitializeRequest,
   handleListToolsRequest,
   patchRequestHandlers,
+  registerFallbackRequestHandler,
   captureToolCall,
   isToolAdvertised,
   type HandlerPatch,
@@ -34,23 +34,23 @@ export function instrumentLowLevelServer(server: MCPServerLike, logger: LoggerFn
   try {
     // Patch already existing handlers, and patch setRequestHandler to capture dynamically created handlers.
     const hadCallToolHandler = server._requestHandlers.has('tools/call')
+    const traceToolCall: HandlerPatch = (server, originalHandler, request, extra) =>
+      handleToolCallRequest(server, originalHandler, request, extra, logger)
     const handlers: Record<string, HandlerPatch> = {
       initialize: (server, originalHandler, request, extra) =>
         handleInitializeRequest(server, originalHandler, request, extra, logger),
       'tools/list': (server, originalHandler, request, extra) =>
         handleListToolsRequest(server, originalHandler, request, extra, logger),
-      'tools/call': (server, originalHandler, request, extra) =>
-        handleToolCallRequest(server, originalHandler, request, extra, logger),
+      'tools/call': traceToolCall,
     }
     patchRequestHandlers(server, handlers)
 
     if (!hadCallToolHandler) {
-      // Register a raw fallback through the patched setter so reportMissing works
-      // even before an application dispatcher is attached. A later registration
-      // replaces it and is wrapped by patchRequestHandlers.
-      server.setRequestHandler(CallToolRequestSchema, async (request) => {
-        throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`)
-      })
+      // Register a raw fallback so reportMissing works even before an application
+      // dispatcher is attached. A later registration replaces it and is wrapped by
+      // the patched setRequestHandler. Written into the handler map directly — see
+      // registerFallbackRequestHandler for why the SDK setter is the wrong door.
+      registerFallbackRequestHandler(server, 'tools/call', unknownToolHandler, traceToolCall)
     }
   } catch (error) {
     logger(`Warning: Failed to setup tool call instrumentation - ${error}`)
@@ -58,6 +58,11 @@ export function instrumentLowLevelServer(server: MCPServerLike, logger: LoggerFn
   }
 }
 
+/** Stands in for an application dispatcher that has not been attached yet. */
+async function unknownToolHandler(request: MCPRequestLike): Promise<never> {
+  throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`)
+}
+
 async function handleToolCallRequest(
   server: MCPServerLike,
   originalCallToolHandler: MCPRequestHandler | undefined,

package/src/extensions/instrumentation.ts

@@ -32,7 +32,7 @@ import { resolveToolCallIntent, setEventIntent, setExplicitContextIntent } from
 import { getServerTrackingData, handleIdentify, setServerTrackingData, withIdentity } from './internal'
 import type { LoggerFn } from './logger'
 import { buildCapturedMcpParameters } from './mcp-payloads'
-import { getLiteralValue, getObjectShape } from './mcp-sdk-compat'
+import { readRequestHandlerMethod } from './mcp-sdk-compat'
 import { getSessionId, getSessionInfo, newSessionId } from './session'
 import { encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from './session-token'
 import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from './tools'
@@ -386,6 +386,37 @@ function rememberOriginalRequestHandler(
   handlers.set(handlerName, originalHandler)
 }
 
+/**
+ * Registers a synthetic fallback handler for `handlerName`, already wrapped in
+ * `patch`, by writing straight into `_requestHandlers` instead of going through
+ * `setRequestHandler`.
+ *
+ * Bypassing the SDK setter is deliberate, on three counts:
+ *
+ * - **Capability assertion.** `setRequestHandler` refuses a method the server
+ *   never declared a capability for, so instrumenting a low-level server built
+ *   without `capabilities.tools` used to throw `Server does not support tools`
+ *   and leave instrumentation half-applied. Our fallback is not a capability the
+ *   server offers — it exists only so a call for a tool nobody claims is still
+ *   captured — so the assertion has nothing to protect here.
+ * - **Schema validation.** The setter also wraps the handler in request/result
+ *   parsing, which a handler that can only ever throw `Unknown tool` never needs.
+ * - **Portability.** The setter's first argument is a Zod schema on SDK v1 and a
+ *   method string on v2; the map key is the same string on both, so this is the
+ *   one registration form that does not need to know which major it is talking
+ *   to — and it drops the last runtime `@modelcontextprotocol/sdk` import from
+ *   the shipped bundle.
+ */
+export function registerFallbackRequestHandler(
+  server: MCPServerLike,
+  handlerName: string,
+  fallbackHandler: MCPRequestHandler,
+  patch: HandlerPatch
+): void {
+  rememberOriginalRequestHandler(server, handlerName, fallbackHandler)
+  server._requestHandlers.set(handlerName, (request, extra) => patch(server, fallbackHandler, request, extra))
+}
+
 export function patchRequestHandlers(server: MCPServerLike, patches: Record<string, HandlerPatch>): void {
   // Monkey patch existing handlers.
   for (const [handlerName, patch] of Object.entries(patches)) {
@@ -397,18 +428,31 @@ export function patchRequestHandlers(server: MCPServerLike, patches: Record<stri
   }
 
   // Monkey patch dynamically added handlers (registered after instrument()).
-  const originalSetRequestHandler = server.setRequestHandler.bind(server)
-  server.setRequestHandler = ((requestSchema: unknown, originalHandler: MCPRequestHandler) => {
-    const shape = getObjectShape(requestSchema)
-    const handlerName = shape?.method ? getLiteralValue(shape.method) : undefined
-    const patch = typeof handlerName === 'string' ? patches[handlerName] : undefined
-    if (!patch || typeof handlerName !== 'string') {
-      return originalSetRequestHandler(requestSchema, originalHandler)
+  //
+  // Variadic, and every argument is forwarded verbatim. The registration form is
+  // the SDK's business, not ours — only *that* a registration happened is ours.
+  // SDK v2 has a three-argument form for custom methods,
+  // `setRequestHandler(method, { params, result }, handler)`, and a two-parameter
+  // wrapper drops the handler: the SDK then sees the schemas object where the
+  // handler should be and throws `setRequestHandler: handler is required`, which
+  // takes down the host server rather than just our instrumentation.
+  const originalSetRequestHandler = server.setRequestHandler.bind(server) as (...args: unknown[]) => unknown
+  server.setRequestHandler = ((...args: unknown[]) => {
+    const handlerName = readRequestHandlerMethod(args[0])
+    // `hasOwnProperty`, not a bare index: `handlerName` is now an arbitrary
+    // caller-supplied string, and a custom method named `toString` would
+    // otherwise resolve to an inherited function and be treated as a patch.
+    const patch =
+      handlerName !== undefined && Object.prototype.hasOwnProperty.call(patches, handlerName)
+        ? patches[handlerName]
+        : undefined
+    if (handlerName === undefined || !patch) {
+      return originalSetRequestHandler(...args)
     }
 
     // Register first so the MCP SDK's request/result validation stays inside
     // our analytics wrapper, matching handlers that existed before instrument().
-    const result = originalSetRequestHandler(requestSchema, originalHandler)
+    const result = originalSetRequestHandler(...args)
     const registeredHandler = server._requestHandlers.get(handlerName)
     if (registeredHandler) {
       rememberOriginalRequestHandler(server, handlerName, registeredHandler)

package/src/extensions/mcp-sdk-compat.ts

@@ -143,6 +143,24 @@ export function getObjectShape(schema: unknown): Record<string, unknown> | undef
   return rawShape
 }
 
+/**
+ * Reads the method name a `setRequestHandler` registration is for.
+ *
+ * The two SDK majors disagree on what the first argument is: v1 passes the Zod
+ * schema for the request and carries the method as a literal on its shape, v2
+ * passes the method string itself. A registration we cannot name is one we
+ * cannot match against a patch — which is how a handler registered after
+ * `instrument()` on v2 ends up replacing our wrapper instead of being wrapped.
+ */
+export function readRequestHandlerMethod(requestSchema: unknown): string | undefined {
+  if (typeof requestSchema === 'string') {
+    return requestSchema
+  }
+  const shape = getObjectShape(requestSchema)
+  const method = shape?.method ? getLiteralValue(shape.method) : undefined
+  return typeof method === 'string' ? method : undefined
+}
+
 export function getLiteralValue(schema: unknown): unknown {
   if (!schema || typeof schema !== 'object') {
     return

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.10.8'
+export const version = '0.10.9'