@posthog/mcp 0.10.5 → 0.10.6

package/dist/extensions/context-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/context-parameters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAEjG;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,qBAAqB,EAC3E,IAAI,EAAE,KAAK,EACX,0BAA0B,CAAC,EAAE,MAAM,EACnC,MAAM,GAAE,QAAc,GACrB,KAAK,CA6DP;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,qBAAqB,EAC5E,KAAK,EAAE,KAAK,EAAE,EACd,0BAA0B,CAAC,EAAE,MAAM,EACnC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAQT"}
+{"version":3,"file":"context-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/context-parameters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAEjG;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,qBAAqB,EAC3E,IAAI,EAAE,KAAK,EACX,0BAA0B,CAAC,EAAE,MAAM,EACnC,MAAM,GAAE,QAAc,GACrB,KAAK,CA6DP;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,qBAAqB,EAC5E,KAAK,EAAE,KAAK,EAAE,EACd,0BAA0B,CAAC,EAAE,MAAM,EACnC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAET"}

package/dist/extensions/context-parameters.js

@@ -70,10 +70,7 @@ function addContextParameterToTool(tool, contextDescriptionOverride, logger = ex
     return modifiedTool;
 }
 function addContextParameterToTools(tools, contextDescriptionOverride, logger = external_logger_js_namespaceObject.log) {
-    return tools.map((tool)=>{
-        if ('get_more_tools' === tool.name) return tool;
-        return addContextParameterToTool(tool, contextDescriptionOverride, logger);
-    });
+    return tools.map((tool)=>addContextParameterToTool(tool, contextDescriptionOverride, logger));
 }
 exports.addContextParameterToTool = __webpack_exports__.addContextParameterToTool;
 exports.addContextParameterToTools = __webpack_exports__.addContextParameterToTools;

package/dist/extensions/context-parameters.mjs

@@ -39,9 +39,6 @@ function addContextParameterToTool(tool, contextDescriptionOverride, logger = lo
     return modifiedTool;
 }
 function addContextParameterToTools(tools, contextDescriptionOverride, logger = log) {
-    return tools.map((tool)=>{
-        if ('get_more_tools' === tool.name) return tool;
-        return addContextParameterToTool(tool, contextDescriptionOverride, logger);
-    });
+    return tools.map((tool)=>addContextParameterToTool(tool, contextDescriptionOverride, logger));
 }
 export { addContextParameterToTool, addContextParameterToTools, getContextDescription, isContextEnabled };

package/dist/extensions/conversation-id.d.ts

@@ -7,7 +7,7 @@ export interface ConversationIdInjectableTool {
     [key: string]: unknown;
 }
 export declare function addConversationIdToTool<TTool extends ConversationIdInjectableTool>(tool: TTool, logger?: LoggerFn): TTool;
-export declare function addConversationIdToTools<TTool extends ConversationIdInjectableTool>(tools: TTool[], missingCapabilityToolName?: string, logger?: LoggerFn): TTool[];
+export declare function addConversationIdToTools<TTool extends ConversationIdInjectableTool>(tools: TTool[], missingCapabilityToolName?: string, skipMissingCapabilityTool?: boolean, logger?: LoggerFn): TTool[];
 export type ConversationIdResolution = {
     minted: false;
     conversationId: string | undefined;

package/dist/extensions/conversation-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-id.d.ts","sourceRoot":"","sources":["../../src/extensions/conversation-id.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAG7C,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAE3D,MAAM,WAAW,4BAA4B;IAC3C,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,4BAA4B,EAChF,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,QAAc,GACrB,KAAK,CA4CP;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,yBAAyB,GAAE,MAA4B,EACvD,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAOT;AAED,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,yBAAyB,GAAE,MAA4B,GACtD,wBAAwB,CAS1B;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAS1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUvE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAM1D;AAED,wBAAgB,6BAA6B,CAAC,cAAc,EAAE,MAAM,GAAG;IACrE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAKA;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAS/F"}
+{"version":3,"file":"conversation-id.d.ts","sourceRoot":"","sources":["../../src/extensions/conversation-id.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAG7C,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAE3D,MAAM,WAAW,4BAA4B;IAC3C,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,4BAA4B,EAChF,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,QAAc,GACrB,KAAK,CA4CP;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,yBAAyB,GAAE,MAA4B,EACvD,yBAAyB,UAAO,EAChC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAOT;AAED,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,yBAAyB,GAAE,MAA4B,GACtD,wBAAwB,CAS1B;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAS1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUvE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAM1D;AAED,wBAAgB,6BAA6B,CAAC,cAAc,EAAE,MAAM,GAAG;IACrE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAKA;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAS/F"}

package/dist/extensions/conversation-id.js

@@ -65,9 +65,9 @@ function addConversationIdToTool(tool, logger = external_logger_js_namespaceObje
     };
     return modifiedTool;
 }
-function addConversationIdToTools(tools, missingCapabilityToolName = external_tools_js_namespaceObject.GET_MORE_TOOLS_NAME, logger = external_logger_js_namespaceObject.log) {
+function addConversationIdToTools(tools, missingCapabilityToolName = external_tools_js_namespaceObject.GET_MORE_TOOLS_NAME, skipMissingCapabilityTool = true, logger = external_logger_js_namespaceObject.log) {
     return tools.map((tool)=>{
-        if (tool.name === missingCapabilityToolName) return tool;
+        if (skipMissingCapabilityTool && tool.name === missingCapabilityToolName) return tool;
         return addConversationIdToTool(tool, logger);
     });
 }

package/dist/extensions/conversation-id.mjs

@@ -29,9 +29,9 @@ function addConversationIdToTool(tool, logger = log) {
     };
     return modifiedTool;
 }
-function addConversationIdToTools(tools, missingCapabilityToolName = GET_MORE_TOOLS_NAME, logger = log) {
+function addConversationIdToTools(tools, missingCapabilityToolName = GET_MORE_TOOLS_NAME, skipMissingCapabilityTool = true, logger = log) {
     return tools.map((tool)=>{
-        if (tool.name === missingCapabilityToolName) return tool;
+        if (skipMissingCapabilityTool && tool.name === missingCapabilityToolName) return tool;
         return addConversationIdToTool(tool, logger);
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"instrument-highlevel.d.ts","sourceRoot":"","sources":["../../src/extensions/instrument-highlevel.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,sBAAsB,EAIvB,MAAM,UAAU,CAAA;AASjB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAmQxC,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA2BhG"}
+{"version":3,"file":"instrument-highlevel.d.ts","sourceRoot":"","sources":["../../src/extensions/instrument-highlevel.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,sBAAsB,EAIvB,MAAM,UAAU,CAAA;AASjB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AA8PxC,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA2BhG"}

package/dist/extensions/instrument-highlevel.js

@@ -107,7 +107,6 @@ function setupListenerToRegisteredTools(server, logger) {
 function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInputSchema, logger) {
     const originalCallback = (0, external_mcp_sdk_compat_js_namespaceObject.getToolFunction)(tool);
     const options = (0, external_internal_js_namespaceObject.getServerTrackingData)(server.server)?.options;
-    const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(options);
     if (wrappedCallbacks.has(originalCallback)) {
         logger(`Tool ${toolName} callback already wrapped, skipping re-wrap`);
         return tool;
@@ -128,8 +127,8 @@ function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInpu
         }
         const inputSchema = getCurrentInputSchema();
         const cleanedArgs = (0, external_analytics_parameters_js_namespaceObject.stripOwnedAnalyticsArguments)(args, {
-            context: toolName !== missingToolName && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(options?.context) && (0, external_analytics_parameters_js_namespaceObject.analyticsOwnsParameter)(inputSchema, 'context'),
-            conversationId: toolName !== missingToolName && options?.enableConversationId === true && (0, external_analytics_parameters_js_namespaceObject.analyticsOwnsParameter)(inputSchema, 'conversation_id')
+            context: (0, external_context_parameters_js_namespaceObject.isContextEnabled)(options?.context) && (0, external_analytics_parameters_js_namespaceObject.analyticsOwnsParameter)(inputSchema, 'context'),
+            conversationId: options?.enableConversationId === true && (0, external_analytics_parameters_js_namespaceObject.analyticsOwnsParameter)(inputSchema, 'conversation_id')
         });
         try {
             if (void 0 === cleanedArgs) {
@@ -155,7 +154,9 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
         logger('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
         return await originalCallToolHandler(request, extra);
     }
-    if (request.params?.name === (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options)) {
+    const toolName = request.params?.name;
+    const isMissingCapabilityCandidate = data.options.reportMissing && toolName === (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
+    if (isMissingCapabilityCandidate && await (0, external_instrumentation_js_namespaceObject.isToolAdvertised)(server, toolName, extra, data.logger) === false) {
         const context = (0, external_tracing_helpers_js_namespaceObject.getContextArgument)(request) || '';
         return await (0, external_instrumentation_js_namespaceObject.captureToolCall)({
             server,
@@ -169,7 +170,6 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
                 }, data.logger)
         });
     }
-    const toolName = request.params?.name;
     const registeredTool = toolName ? highLevelServer._registeredTools[toolName] : void 0;
     return await (0, external_instrumentation_js_namespaceObject.captureToolCall)({
         server,

package/dist/extensions/instrument-highlevel.mjs

@@ -4,7 +4,7 @@ import { MCPAnalyticsEventType } from "./event-types.mjs";
 import { getServerTrackingData } from "./internal.mjs";
 import { createWrappedTool, getToolFunction, hasToolFunction } from "./mcp-sdk-compat.mjs";
 import { handleReportMissing, resolveMissingCapabilityToolName } from "./tools.mjs";
-import { captureToolCall, handleInitializeRequest, handleListToolsRequest, patchRequestHandlers, readToolMetaCategory } from "./instrumentation.mjs";
+import { captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers, readToolMetaCategory } from "./instrumentation.mjs";
 import { getContextArgument } from "./tracing-helpers.mjs";
 const wrappedCallbacks = new WeakMap();
 const MCP_ANALYTICS_PROCESSED = Symbol('__posthog_mcp_analytics_processed__');
@@ -79,7 +79,6 @@ function setupListenerToRegisteredTools(server, logger) {
 function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInputSchema, logger) {
     const originalCallback = getToolFunction(tool);
     const options = getServerTrackingData(server.server)?.options;
-    const missingToolName = resolveMissingCapabilityToolName(options);
     if (wrappedCallbacks.has(originalCallback)) {
         logger(`Tool ${toolName} callback already wrapped, skipping re-wrap`);
         return tool;
@@ -100,8 +99,8 @@ function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInpu
         }
         const inputSchema = getCurrentInputSchema();
         const cleanedArgs = stripOwnedAnalyticsArguments(args, {
-            context: toolName !== missingToolName && isContextEnabled(options?.context) && analyticsOwnsParameter(inputSchema, 'context'),
-            conversationId: toolName !== missingToolName && options?.enableConversationId === true && analyticsOwnsParameter(inputSchema, 'conversation_id')
+            context: isContextEnabled(options?.context) && analyticsOwnsParameter(inputSchema, 'context'),
+            conversationId: options?.enableConversationId === true && analyticsOwnsParameter(inputSchema, 'conversation_id')
         });
         try {
             if (void 0 === cleanedArgs) {
@@ -127,7 +126,9 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
         logger('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
         return await originalCallToolHandler(request, extra);
     }
-    if (request.params?.name === resolveMissingCapabilityToolName(data.options)) {
+    const toolName = request.params?.name;
+    const isMissingCapabilityCandidate = data.options.reportMissing && toolName === resolveMissingCapabilityToolName(data.options);
+    if (isMissingCapabilityCandidate && await isToolAdvertised(server, toolName, extra, data.logger) === false) {
         const context = getContextArgument(request) || '';
         return await captureToolCall({
             server,
@@ -141,7 +142,6 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
                 }, data.logger)
         });
     }
-    const toolName = request.params?.name;
     const registeredTool = toolName ? highLevelServer._registeredTools[toolName] : void 0;
     return await captureToolCall({
         server,

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;AAiBxC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CAoBtF"}
+{"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"}

package/dist/extensions/instrument-lowlevel.js

@@ -34,13 +34,16 @@ const external_instrumentation_js_namespaceObject = require("./instrumentation.j
 const external_tracing_helpers_js_namespaceObject = require("./tracing-helpers.js");
 function instrumentLowLevelServer(server, logger) {
     try {
+        const hadCallToolHandler = server._requestHandlers.has('tools/call');
         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/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)
         };
         (0, external_instrumentation_js_namespaceObject.patchRequestHandlers)(server, handlers);
-        const originalCallToolHandler = server._requestHandlers.get('tools/call');
-        server.setRequestHandler(types_js_namespaceObject.CallToolRequestSchema, async (request, extra)=>await handleToolCallRequest(server, originalCallToolHandler, request, extra, logger));
+        if (!hadCallToolHandler) server.setRequestHandler(types_js_namespaceObject.CallToolRequestSchema, async (request)=>{
+            throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
+        });
     } catch (error) {
         logger(`Warning: Failed to setup tool call instrumentation - ${error}`);
         throw error;
@@ -52,7 +55,9 @@ async function handleToolCallRequest(server, originalCallToolHandler, request, e
         logger('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
         return await originalCallToolHandler?.(request, extra);
     }
-    if (request.params?.name === (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options)) {
+    const toolName = request.params?.name;
+    const isMissingCapabilityCandidate = data.options.reportMissing && toolName === (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
+    if (isMissingCapabilityCandidate && await (0, external_instrumentation_js_namespaceObject.isToolAdvertised)(server, toolName, extra, data.logger) === false) {
         const context = (0, external_tracing_helpers_js_namespaceObject.getContextArgument)(request) || '';
         return await (0, external_instrumentation_js_namespaceObject.captureToolCall)({
             server,

package/dist/extensions/instrument-lowlevel.mjs

@@ -2,17 +2,20 @@ 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, patchRequestHandlers } from "./instrumentation.mjs";
+import { captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers } from "./instrumentation.mjs";
 import { getContextArgument } from "./tracing-helpers.mjs";
 function instrumentLowLevelServer(server, logger) {
     try {
+        const hadCallToolHandler = server._requestHandlers.has('tools/call');
         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/list': (server, originalHandler, request, extra)=>handleListToolsRequest(server, originalHandler, request, extra, logger),
+            'tools/call': (server, originalHandler, request, extra)=>handleToolCallRequest(server, originalHandler, request, extra, logger)
         };
         patchRequestHandlers(server, handlers);
-        const originalCallToolHandler = server._requestHandlers.get('tools/call');
-        server.setRequestHandler(CallToolRequestSchema, async (request, extra)=>await handleToolCallRequest(server, originalCallToolHandler, request, extra, logger));
+        if (!hadCallToolHandler) server.setRequestHandler(CallToolRequestSchema, async (request)=>{
+            throw new Error(`Unknown tool: ${request.params?.name || 'unknown'}`);
+        });
     } catch (error) {
         logger(`Warning: Failed to setup tool call instrumentation - ${error}`);
         throw error;
@@ -24,7 +27,9 @@ async function handleToolCallRequest(server, originalCallToolHandler, request, e
         logger('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
         return await originalCallToolHandler?.(request, extra);
     }
-    if (request.params?.name === resolveMissingCapabilityToolName(data.options)) {
+    const toolName = request.params?.name;
+    const isMissingCapabilityCandidate = data.options.reportMissing && toolName === resolveMissingCapabilityToolName(data.options);
+    if (isMissingCapabilityCandidate && await isToolAdvertised(server, toolName, extra, data.logger) === false) {
         const context = getContextArgument(request) || '';
         return await captureToolCall({
             server,

package/dist/extensions/instrumentation.d.ts

@@ -55,14 +55,14 @@ 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>;
+export declare function patchRequestHandlers(server: MCPServerLike, patches: Record<string, HandlerPatch>): void;
 /**
- * Applies the `patches` (keyed by method, e.g. `initialize`, `tools/list`) to the
- * handlers already registered, and patches `setRequestHandler` so matching
- * handlers registered later are patched too. The latter is what makes adapters
- * that register handlers post-construction work — e.g. `@rekog/mcp-nest` hands a
- * bare server to instrument() and only then registers its handlers.
+ * Checks the server's raw listing for a real owner of a candidate virtual tool.
+ * This does not depend on a previous client request and does not call the
+ * instrumented list wrapper, so it neither injects PostHog tools nor captures a
+ * synthetic tools/list event. `undefined` fails open to the real dispatcher.
  */
-export declare function patchRequestHandlers(server: MCPServerLike, patches: Record<string, HandlerPatch>): void;
+export declare function isToolAdvertised(server: MCPServerLike, toolName: string, extra: CompatibleRequestHandlerExtra | undefined, logger: LoggerFn): Promise<boolean | undefined>;
 /**
  * Captures each `tools/list` and injects the SDK-managed tools (context
  * parameter, conversation id, `get_more_tools`) into the returned list.

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

@@ -1 +1 @@
-{"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,EAGd,MAAM,UAAU,CAAA;AAYjB,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;AAuJD;;;;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;AAErB;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI,CAqBvG;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,CAyC9C;AAyED,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;AA8GD;;;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,CA0ClB"}
+{"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,EAGd,MAAM,UAAU,CAAA;AAYjB,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,CA0DnF;AAuJD;;;;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,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI,CA8BvG;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,CAyC9C;AAiFD,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;AA8GD;;;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,CA0ClB"}

package/dist/extensions/instrumentation.js

@@ -24,11 +24,12 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    readToolMetaCategory: ()=>readToolMetaCategory,
+    isToolAdvertised: ()=>isToolAdvertised,
     cacheToolDescriptions: ()=>cacheToolDescriptions,
-    cacheToolCategories: ()=>cacheToolCategories,
     handleInitializeRequest: ()=>handleInitializeRequest,
     captureToolCall: ()=>captureToolCall,
+    readToolMetaCategory: ()=>readToolMetaCategory,
+    cacheToolCategories: ()=>cacheToolCategories,
     handleListToolsRequest: ()=>handleListToolsRequest,
     patchRequestHandlers: ()=>patchRequestHandlers
 });
@@ -49,11 +50,12 @@ const external_tools_js_namespaceObject = require("./tools.js");
 const external_tracing_helpers_js_namespaceObject = require("./tracing-helpers.js");
 async function captureToolCall(params) {
     const { server, data, request, extra, execute, parameterOwnership, eventType, explicitContextIntent, takeCapturedError } = params;
-    const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership);
-    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(ownership.conversationId, request.params?.arguments, request.params?.name, (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options));
+    const resolvedEventType = eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall;
+    const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership, resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpMissingCapability);
+    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(ownership.conversationId, request.params?.arguments, request.params?.name, resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpMissingCapability ? (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options) : '');
     const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
     const startTime = new Date();
-    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall);
+    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType);
     if (event && explicitContextIntent) (0, external_intent_js_namespaceObject.setExplicitContextIntent)(event, explicitContextIntent);
     let result;
     try {
@@ -66,9 +68,8 @@ async function captureToolCall(params) {
     publishSuccessfulToolEvent(server, event, finalResult, startTime, data.logger, takeCapturedError);
     return finalResult;
 }
-function getActiveAnalyticsParameterOwnership(data, toolName, override) {
+function getActiveAnalyticsParameterOwnership(data, toolName, override, isMissingCapabilityTool) {
     const ownership = override ?? (toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0);
-    const isMissingCapabilityTool = toolName === (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
     return {
         context: !isMissingCapabilityTool && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && ownership?.context === true,
         conversationId: !isMissingCapabilityTool && true === data.options.enableConversationId && ownership?.conversationId === true
@@ -143,20 +144,53 @@ function publishFailedToolEvent(server, event, error, startTime, conversation, l
         logger(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
     }
 }
+const originalRequestHandlers = new WeakMap();
+function rememberOriginalRequestHandler(server, handlerName, originalHandler) {
+    let handlers = originalRequestHandlers.get(server);
+    if (!handlers) {
+        handlers = new Map();
+        originalRequestHandlers.set(server, handlers);
+    }
+    handlers.set(handlerName, originalHandler);
+}
 function patchRequestHandlers(server, patches) {
     for (const [handlerName, patch] of Object.entries(patches)){
         const originalHandler = server._requestHandlers.get(handlerName);
-        if (originalHandler) server._requestHandlers.set(handlerName, (request, extra)=>patch(server, originalHandler, request, extra));
+        if (originalHandler) {
+            rememberOriginalRequestHandler(server, handlerName, originalHandler);
+            server._requestHandlers.set(handlerName, (request, extra)=>patch(server, originalHandler, request, extra));
+        }
     }
     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) return originalSetRequestHandler(requestSchema, originalHandler);
-        return originalSetRequestHandler(requestSchema, (request, extra)=>patch(server, originalHandler, request, extra));
+        if (!patch || 'string' != typeof handlerName) return originalSetRequestHandler(requestSchema, originalHandler);
+        const result = originalSetRequestHandler(requestSchema, originalHandler);
+        const registeredHandler = server._requestHandlers.get(handlerName);
+        if (registeredHandler) {
+            rememberOriginalRequestHandler(server, handlerName, registeredHandler);
+            server._requestHandlers.set(handlerName, (request, extra)=>patch(server, registeredHandler, request, extra));
+        }
+        return result;
     };
 }
+async function isToolAdvertised(server, toolName, extra, logger) {
+    const listHandler = originalRequestHandlers.get(server)?.get('tools/list');
+    if (!listHandler || !server._requestHandlers.has('tools/list')) return;
+    try {
+        const response = await listHandler({
+            method: 'tools/list',
+            params: {}
+        }, extra);
+        if (!response || !Array.isArray(response.tools)) return;
+        return response.tools.some((tool)=>tool?.name === toolName);
+    } catch (error) {
+        logger(`Warning: PostHog MCP analytics could not determine whether "${toolName}" is advertised; delegating to the server - ${error}`);
+        return;
+    }
+}
 async function handleListToolsRequest(server, originalListToolsHandler, request, extra, logger) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     const startTime = new Date();
@@ -208,14 +242,23 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
     try {
         const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
         const originalResponse = await originalListToolsHandler(request, extra);
-        let tools = originalResponse.tools || [];
+        let tools = [
+            ...originalResponse.tools || []
+        ];
         if (data) cacheToolAnalyticsParameterOwnership(data.toolAnalyticsParameterOwnership, tools);
         if (data && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context)) tools = (0, external_context_parameters_js_namespaceObject.addContextParameterToTools)(tools, (0, external_context_parameters_js_namespaceObject.getContextDescription)(data.options.context), data.logger);
-        if (data?.options.enableConversationId) tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options), data.logger);
-        if (data?.options.reportMissing) {
+        if (data) {
             const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
-            const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
-            if (!alreadyPresent) tools.push((0, external_tools_js_namespaceObject.getReportMissingToolDescriptor)(missingToolName));
+            let injectedMissingCapabilityTool = false;
+            if (data.options.reportMissing) {
+                const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
+                if (alreadyPresent) data.logger(`Warning: Cannot inject missing-capability tool "${missingToolName}" because a real tool already uses that name. The real tool will not be intercepted.`);
+                else {
+                    tools.push((0, external_tools_js_namespaceObject.getReportMissingToolDescriptor)(missingToolName));
+                    injectedMissingCapabilityTool = true;
+                }
+            }
+            if (data.options.enableConversationId) tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, missingToolName, injectedMissingCapabilityTool, data.logger);
         }
         if (data) {
             cacheToolDescriptions(data.toolDescriptions, tools);
@@ -339,6 +382,7 @@ exports.cacheToolDescriptions = __webpack_exports__.cacheToolDescriptions;
 exports.captureToolCall = __webpack_exports__.captureToolCall;
 exports.handleInitializeRequest = __webpack_exports__.handleInitializeRequest;
 exports.handleListToolsRequest = __webpack_exports__.handleListToolsRequest;
+exports.isToolAdvertised = __webpack_exports__.isToolAdvertised;
 exports.patchRequestHandlers = __webpack_exports__.patchRequestHandlers;
 exports.readToolMetaCategory = __webpack_exports__.readToolMetaCategory;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
@@ -347,6 +391,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "captureToolCall",
     "handleInitializeRequest",
     "handleListToolsRequest",
+    "isToolAdvertised",
     "patchRequestHandlers",
     "readToolMetaCategory"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];

package/dist/extensions/instrumentation.mjs

@@ -15,11 +15,12 @@ import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from
 import { applyResolvedMetadata, isToolResultError } from "./tracing-helpers.mjs";
 async function captureToolCall(params) {
     const { server, data, request, extra, execute, parameterOwnership, eventType, explicitContextIntent, takeCapturedError } = params;
-    const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership);
-    const conversation = resolveConversationId(ownership.conversationId, request.params?.arguments, request.params?.name, resolveMissingCapabilityToolName(data.options));
+    const resolvedEventType = eventType ?? MCPAnalyticsEventType.mcpToolsCall;
+    const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership, resolvedEventType === MCPAnalyticsEventType.mcpMissingCapability);
+    const conversation = resolveConversationId(ownership.conversationId, request.params?.arguments, request.params?.name, resolvedEventType === MCPAnalyticsEventType.mcpMissingCapability ? resolveMissingCapabilityToolName(data.options) : '');
     const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
     const startTime = new Date();
-    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType ?? MCPAnalyticsEventType.mcpToolsCall);
+    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType);
     if (event && explicitContextIntent) setExplicitContextIntent(event, explicitContextIntent);
     let result;
     try {
@@ -32,9 +33,8 @@ async function captureToolCall(params) {
     publishSuccessfulToolEvent(server, event, finalResult, startTime, data.logger, takeCapturedError);
     return finalResult;
 }
-function getActiveAnalyticsParameterOwnership(data, toolName, override) {
+function getActiveAnalyticsParameterOwnership(data, toolName, override, isMissingCapabilityTool) {
     const ownership = override ?? (toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0);
-    const isMissingCapabilityTool = toolName === resolveMissingCapabilityToolName(data.options);
     return {
         context: !isMissingCapabilityTool && isContextEnabled(data.options.context) && ownership?.context === true,
         conversationId: !isMissingCapabilityTool && true === data.options.enableConversationId && ownership?.conversationId === true
@@ -109,20 +109,53 @@ function publishFailedToolEvent(server, event, error, startTime, conversation, l
         logger(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
     }
 }
+const originalRequestHandlers = new WeakMap();
+function rememberOriginalRequestHandler(server, handlerName, originalHandler) {
+    let handlers = originalRequestHandlers.get(server);
+    if (!handlers) {
+        handlers = new Map();
+        originalRequestHandlers.set(server, handlers);
+    }
+    handlers.set(handlerName, originalHandler);
+}
 function patchRequestHandlers(server, patches) {
     for (const [handlerName, patch] of Object.entries(patches)){
         const originalHandler = server._requestHandlers.get(handlerName);
-        if (originalHandler) server._requestHandlers.set(handlerName, (request, extra)=>patch(server, originalHandler, request, extra));
+        if (originalHandler) {
+            rememberOriginalRequestHandler(server, handlerName, originalHandler);
+            server._requestHandlers.set(handlerName, (request, extra)=>patch(server, originalHandler, request, extra));
+        }
     }
     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) return originalSetRequestHandler(requestSchema, originalHandler);
-        return originalSetRequestHandler(requestSchema, (request, extra)=>patch(server, originalHandler, request, extra));
+        if (!patch || 'string' != typeof handlerName) return originalSetRequestHandler(requestSchema, originalHandler);
+        const result = originalSetRequestHandler(requestSchema, originalHandler);
+        const registeredHandler = server._requestHandlers.get(handlerName);
+        if (registeredHandler) {
+            rememberOriginalRequestHandler(server, handlerName, registeredHandler);
+            server._requestHandlers.set(handlerName, (request, extra)=>patch(server, registeredHandler, request, extra));
+        }
+        return result;
     };
 }
+async function isToolAdvertised(server, toolName, extra, logger) {
+    const listHandler = originalRequestHandlers.get(server)?.get('tools/list');
+    if (!listHandler || !server._requestHandlers.has('tools/list')) return;
+    try {
+        const response = await listHandler({
+            method: 'tools/list',
+            params: {}
+        }, extra);
+        if (!response || !Array.isArray(response.tools)) return;
+        return response.tools.some((tool)=>tool?.name === toolName);
+    } catch (error) {
+        logger(`Warning: PostHog MCP analytics could not determine whether "${toolName}" is advertised; delegating to the server - ${error}`);
+        return;
+    }
+}
 async function handleListToolsRequest(server, originalListToolsHandler, request, extra, logger) {
     const data = getServerTrackingData(server);
     const startTime = new Date();
@@ -174,14 +207,23 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
     try {
         const data = getServerTrackingData(server);
         const originalResponse = await originalListToolsHandler(request, extra);
-        let tools = originalResponse.tools || [];
+        let tools = [
+            ...originalResponse.tools || []
+        ];
         if (data) cacheToolAnalyticsParameterOwnership(data.toolAnalyticsParameterOwnership, tools);
         if (data && isContextEnabled(data.options.context)) tools = addContextParameterToTools(tools, getContextDescription(data.options.context), data.logger);
-        if (data?.options.enableConversationId) tools = addConversationIdToTools(tools, resolveMissingCapabilityToolName(data.options), data.logger);
-        if (data?.options.reportMissing) {
+        if (data) {
             const missingToolName = resolveMissingCapabilityToolName(data.options);
-            const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
-            if (!alreadyPresent) tools.push(getReportMissingToolDescriptor(missingToolName));
+            let injectedMissingCapabilityTool = false;
+            if (data.options.reportMissing) {
+                const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
+                if (alreadyPresent) data.logger(`Warning: Cannot inject missing-capability tool "${missingToolName}" because a real tool already uses that name. The real tool will not be intercepted.`);
+                else {
+                    tools.push(getReportMissingToolDescriptor(missingToolName));
+                    injectedMissingCapabilityTool = true;
+                }
+            }
+            if (data.options.enableConversationId) tools = addConversationIdToTools(tools, missingToolName, injectedMissingCapabilityTool, data.logger);
         }
         if (data) {
             cacheToolDescriptions(data.toolDescriptions, tools);
@@ -300,4 +342,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, patchRequestHandlers, readToolMetaCategory };
+export { cacheToolCategories, cacheToolDescriptions, captureToolCall, handleInitializeRequest, handleListToolsRequest, isToolAdvertised, patchRequestHandlers, readToolMetaCategory };

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

@@ -1 +1 @@
-{"version":3,"file":"intent.d.ts","sourceRoot":"","sources":["../../src/extensions/intent.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,QAAQ,EACT,MAAM,UAAU,CAAA;AAGjB,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,wBAAwB,CAAA;CACjC;AAkCD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,cAAc,EACvB,oBAAoB,EAAE,OAAO,EAC7B,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAYhC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI,CAO3F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQ/E"}
+{"version":3,"file":"intent.d.ts","sourceRoot":"","sources":["../../src/extensions/intent.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,QAAQ,EACT,MAAM,UAAU,CAAA;AAGjB,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,wBAAwB,CAAA;CACjC;AAkCD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,cAAc,EACvB,oBAAoB,EAAE,OAAO,EAC7B,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAOhC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI,CAO3F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQ/E"}

package/dist/extensions/intent.js

@@ -53,7 +53,7 @@ async function runIntentFallback(data, request, extra) {
 }
 async function resolveToolCallIntent(data, request, analyticsOwnsContext, extra) {
     const contextArgument = getContextArgument(request);
-    if (analyticsOwnsContext && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && request.params?.name !== 'get_more_tools' && contextArgument) return {
+    if (analyticsOwnsContext && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && contextArgument) return {
         intent: contextArgument,
         source: 'context_parameter'
     };

package/dist/extensions/intent.mjs

@@ -23,7 +23,7 @@ async function runIntentFallback(data, request, extra) {
 }
 async function resolveToolCallIntent(data, request, analyticsOwnsContext, extra) {
     const contextArgument = getContextArgument(request);
-    if (analyticsOwnsContext && isContextEnabled(data.options.context) && request.params?.name !== 'get_more_tools' && contextArgument) return {
+    if (analyticsOwnsContext && isContextEnabled(data.options.context) && contextArgument) return {
         intent: contextArgument,
         source: 'context_parameter'
     };

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.10.5";
+export declare const version = "0.10.6";
 //# 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.5';
+const version = '0.10.6';
 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.5';
+const version = '0.10.6';
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/mcp",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "bugs": {
     "url": "https://github.com/PostHog/posthog-js/issues"
   },
@@ -39,8 +39,8 @@
     "@types/node": "^20.0.0",
     "jest": "29.7.0",
     "zod": "^3.25.0",
-    "@posthog-tooling/tsconfig-base": "1.1.1",
-    "posthog-node": "^5.47.8"
+    "posthog-node": "^5.47.8",
+    "@posthog-tooling/tsconfig-base": "1.1.1"
   },
   "peerDependencies": {
     "@modelcontextprotocol/sdk": ">=1.26.0",

package/src/extensions/context-parameters.ts

@@ -108,11 +108,5 @@ export function addContextParameterToTools<TTool extends ContextInjectableTool>(
   contextDescriptionOverride?: string,
   logger: LoggerFn = log
 ): TTool[] {
-  return tools.map((tool) => {
-    // Skip get_more_tools - it has its own special context parameter
-    if (tool.name === 'get_more_tools') {
-      return tool
-    }
-    return addContextParameterToTool(tool, contextDescriptionOverride, logger)
-  })
+  return tools.map((tool) => addContextParameterToTool(tool, contextDescriptionOverride, logger))
 }

package/src/extensions/conversation-id.ts

@@ -73,10 +73,11 @@ export function addConversationIdToTool<TTool extends ConversationIdInjectableTo
 export function addConversationIdToTools<TTool extends ConversationIdInjectableTool>(
   tools: TTool[],
   missingCapabilityToolName: string = GET_MORE_TOOLS_NAME,
+  skipMissingCapabilityTool = true,
   logger: LoggerFn = log
 ): TTool[] {
   return tools.map((tool) => {
-    if (tool.name === missingCapabilityToolName) {
+    if (skipMissingCapabilityTool && tool.name === missingCapabilityToolName) {
       return tool
     }
     return addConversationIdToTool(tool, logger)

package/src/extensions/instrument-highlevel.ts

@@ -27,6 +27,7 @@ import {
   handleListToolsRequest,
   patchRequestHandlers,
   captureToolCall,
+  isToolAdvertised,
   readToolMetaCategory,
   type HandlerPatch,
 } from './instrumentation'
@@ -162,8 +163,6 @@ function addTracingToToolCallbackInternal(
 ): RegisteredTool {
   const originalCallback = getToolFunction(tool)
   const options = getServerTrackingData(server.server as MCPServerLike)?.options
-  const missingToolName = resolveMissingCapabilityToolName(options)
-
   if (wrappedCallbacks.has(originalCallback)) {
     logger(`Tool ${toolName} callback already wrapped, skipping re-wrap`)
     return tool
@@ -188,16 +187,9 @@ function addTracingToToolCallbackInternal(
 
     const inputSchema = getCurrentInputSchema()
     const cleanedArgs = stripOwnedAnalyticsArguments(args, {
-      context:
-        toolName !== missingToolName &&
-        isContextEnabled(options?.context) &&
-        analyticsOwnsParameter(inputSchema, 'context'),
-      conversationId:
-        toolName !== missingToolName &&
-        options?.enableConversationId === true &&
-        analyticsOwnsParameter(inputSchema, 'conversation_id'),
+      context: isContextEnabled(options?.context) && analyticsOwnsParameter(inputSchema, 'context'),
+      conversationId: options?.enableConversationId === true && analyticsOwnsParameter(inputSchema, 'conversation_id'),
     })
-
     try {
       if (cleanedArgs === undefined) {
         const handler = originalCallback as (extra: CompatibleRequestHandlerExtra) => Promise<CallToolResult>
@@ -242,7 +234,11 @@ async function handleToolCallRequest(
     return await originalCallToolHandler(request, extra)
   }
 
-  if (request.params?.name === resolveMissingCapabilityToolName(data.options)) {
+  const toolName = request.params?.name
+  const isMissingCapabilityCandidate =
+    data.options.reportMissing && toolName === resolveMissingCapabilityToolName(data.options)
+
+  if (isMissingCapabilityCandidate && (await isToolAdvertised(server, toolName, extra, data.logger)) === false) {
     const context = getContextArgument(request) || ''
     return await captureToolCall({
       server,
@@ -255,7 +251,6 @@ async function handleToolCallRequest(
     })
   }
 
-  const toolName = request.params?.name
   const registeredTool = toolName ? highLevelServer._registeredTools[toolName] : undefined
 
   // Strip SDK-owned arguments before the MCP SDK validates the registered Zod

package/src/extensions/instrument-lowlevel.ts

@@ -14,6 +14,7 @@ import {
   handleListToolsRequest,
   patchRequestHandlers,
   captureToolCall,
+  isToolAdvertised,
   type HandlerPatch,
 } from './instrumentation'
 import { getContextArgument } from './tracing-helpers'
@@ -32,19 +33,25 @@ type MCPRequestExtra = Parameters<MCPRequestHandler>[1]
 export function instrumentLowLevelServer(server: MCPServerLike, logger: LoggerFn): void {
   try {
     // Patch already existing handlers, and patch setRequestHandler to capture dynamically created handlers.
+    const hadCallToolHandler = server._requestHandlers.has('tools/call')
     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),
     }
     patchRequestHandlers(server, handlers)
 
-    const originalCallToolHandler = server._requestHandlers.get('tools/call')
-    server.setRequestHandler(
-      CallToolRequestSchema,
-      async (request, extra) => await handleToolCallRequest(server, originalCallToolHandler, request, extra, logger)
-    )
+    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'}`)
+      })
+    }
   } catch (error) {
     logger(`Warning: Failed to setup tool call instrumentation - ${error}`)
     throw error
@@ -66,7 +73,11 @@ async function handleToolCallRequest(
     return await originalCallToolHandler?.(request, extra)
   }
 
-  if (request.params?.name === resolveMissingCapabilityToolName(data.options)) {
+  const toolName = request.params?.name
+  const isMissingCapabilityCandidate =
+    data.options.reportMissing && toolName === resolveMissingCapabilityToolName(data.options)
+
+  if (isMissingCapabilityCandidate && (await isToolAdvertised(server, toolName, extra, data.logger)) === false) {
     const context = getContextArgument(request) || ''
     return await captureToolCall({
       server,

package/src/extensions/instrumentation.ts

@@ -98,13 +98,20 @@ export async function captureToolCall(params: TraceToolCallParams): Promise<unkn
     explicitContextIntent,
     takeCapturedError,
   } = params
-
-  const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership)
+  const resolvedEventType = eventType ?? MCPAnalyticsEventType.mcpToolsCall
+  const ownership = getActiveAnalyticsParameterOwnership(
+    data,
+    request.params?.name,
+    parameterOwnership,
+    resolvedEventType === MCPAnalyticsEventType.mcpMissingCapability
+  )
   const conversation = resolveConversationId(
     ownership.conversationId,
     request.params?.arguments,
     request.params?.name,
-    resolveMissingCapabilityToolName(data.options)
+    resolvedEventType === MCPAnalyticsEventType.mcpMissingCapability
+      ? resolveMissingCapabilityToolName(data.options)
+      : ''
   )
   const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership)
 
@@ -120,7 +127,7 @@ export async function captureToolCall(params: TraceToolCallParams): Promise<unkn
     startTime,
     conversation,
     ownership,
-    eventType ?? MCPAnalyticsEventType.mcpToolsCall
+    resolvedEventType
   )
   if (event && explicitContextIntent) {
     setExplicitContextIntent(event, explicitContextIntent)
@@ -142,10 +149,10 @@ export async function captureToolCall(params: TraceToolCallParams): Promise<unkn
 function getActiveAnalyticsParameterOwnership(
   data: MCPAnalyticsData,
   toolName: string | undefined,
-  override?: AnalyticsParameterOwnership
+  override: AnalyticsParameterOwnership | undefined,
+  isMissingCapabilityTool: boolean
 ): AnalyticsParameterOwnership {
   const ownership = override ?? (toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : undefined)
-  const isMissingCapabilityTool = toolName === resolveMissingCapabilityToolName(data.options)
   return {
     context: !isMissingCapabilityTool && isContextEnabled(data.options.context) && ownership?.context === true,
     conversationId:
@@ -307,11 +314,27 @@ export type HandlerPatch = (
  * that register handlers post-construction work — e.g. `@rekog/mcp-nest` hands a
  * bare server to instrument() and only then registers its handlers.
  */
+const originalRequestHandlers = new WeakMap<MCPServerLike, Map<string, MCPRequestHandler>>()
+
+function rememberOriginalRequestHandler(
+  server: MCPServerLike,
+  handlerName: string,
+  originalHandler: MCPRequestHandler
+): void {
+  let handlers = originalRequestHandlers.get(server)
+  if (!handlers) {
+    handlers = new Map()
+    originalRequestHandlers.set(server, handlers)
+  }
+  handlers.set(handlerName, originalHandler)
+}
+
 export function patchRequestHandlers(server: MCPServerLike, patches: Record<string, HandlerPatch>): void {
   // Monkey patch existing handlers.
   for (const [handlerName, patch] of Object.entries(patches)) {
     const originalHandler = server._requestHandlers.get(handlerName)
     if (originalHandler) {
+      rememberOriginalRequestHandler(server, handlerName, originalHandler)
       server._requestHandlers.set(handlerName, (request, extra) => patch(server, originalHandler, request, extra))
     }
   }
@@ -322,14 +345,55 @@ export function patchRequestHandlers(server: MCPServerLike, patches: Record<stri
     const shape = getObjectShape(requestSchema)
     const handlerName = shape?.method ? getLiteralValue(shape.method) : undefined
     const patch = typeof handlerName === 'string' ? patches[handlerName] : undefined
-    if (!patch) {
+    if (!patch || typeof handlerName !== 'string') {
       return originalSetRequestHandler(requestSchema, originalHandler)
     }
 
-    return originalSetRequestHandler(requestSchema, (request, extra) => patch(server, originalHandler, request, extra))
+    // 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 registeredHandler = server._requestHandlers.get(handlerName)
+    if (registeredHandler) {
+      rememberOriginalRequestHandler(server, handlerName, registeredHandler)
+      server._requestHandlers.set(handlerName, (request, extra) => patch(server, registeredHandler, request, extra))
+    }
+    return result
   }) as MCPServerLike['setRequestHandler']
 }
 
+/**
+ * Checks the server's raw listing for a real owner of a candidate virtual tool.
+ * This does not depend on a previous client request and does not call the
+ * instrumented list wrapper, so it neither injects PostHog tools nor captures a
+ * synthetic tools/list event. `undefined` fails open to the real dispatcher.
+ */
+export async function isToolAdvertised(
+  server: MCPServerLike,
+  toolName: string,
+  extra: CompatibleRequestHandlerExtra | undefined,
+  logger: LoggerFn
+): Promise<boolean | undefined> {
+  const listHandler = originalRequestHandlers.get(server)?.get('tools/list')
+  if (!listHandler || !server._requestHandlers.has('tools/list')) {
+    return undefined
+  }
+
+  try {
+    const response = (await listHandler({ method: 'tools/list', params: {} }, extra)) as ListToolsResult
+    if (!response || !Array.isArray(response.tools)) {
+      return undefined
+    }
+    // Match the page the current list instrumentation can expose. Pagination
+    // passthrough is handled separately from missing-capability ownership.
+    return response.tools.some((tool) => tool?.name === toolName)
+  } catch (error) {
+    logger(
+      `Warning: PostHog MCP analytics could not determine whether "${toolName}" is advertised; delegating to the server - ${error}`
+    )
+    return undefined
+  }
+}
+
 /**
  * Captures each `tools/list` and injects the SDK-managed tools (context
  * parameter, conversation id, `get_more_tools`) into the returned list.
@@ -414,25 +478,33 @@ async function getTracedToolsList(
   try {
     const data = getServerTrackingData(server)
     const originalResponse = (await originalListToolsHandler(request, extra)) as ListToolsResult
-    let tools = originalResponse.tools || []
+    // Injection must not mutate arrays reused or frozen by the server.
+    let tools = [...(originalResponse.tools || [])]
 
     if (data) {
       cacheToolAnalyticsParameterOwnership(data.toolAnalyticsParameterOwnership, tools)
     }
-
     if (data && isContextEnabled(data.options.context)) {
       tools = addContextParameterToTools(tools, getContextDescription(data.options.context), data.logger)
     }
 
-    if (data?.options.enableConversationId) {
-      tools = addConversationIdToTools(tools, resolveMissingCapabilityToolName(data.options), data.logger)
-    }
-
-    if (data?.options.reportMissing) {
+    if (data) {
       const missingToolName = resolveMissingCapabilityToolName(data.options)
-      const alreadyPresent = tools.some((tool) => tool?.name === missingToolName)
-      if (!alreadyPresent) {
-        tools.push(getReportMissingToolDescriptor(missingToolName))
+      let injectedMissingCapabilityTool = false
+      if (data.options.reportMissing) {
+        const alreadyPresent = tools.some((tool) => tool?.name === missingToolName)
+        if (alreadyPresent) {
+          data.logger(
+            `Warning: Cannot inject missing-capability tool "${missingToolName}" because a real tool already uses that name. The real tool will not be intercepted.`
+          )
+        } else {
+          tools.push(getReportMissingToolDescriptor(missingToolName))
+          injectedMissingCapabilityTool = true
+        }
+      }
+
+      if (data.options.enableConversationId) {
+        tools = addConversationIdToTools(tools, missingToolName, injectedMissingCapabilityTool, data.logger)
       }
     }
 

package/src/extensions/intent.ts

@@ -56,12 +56,7 @@ export async function resolveToolCallIntent(
   extra?: CompatibleRequestHandlerExtra
 ): Promise<ResolvedIntent | null> {
   const contextArgument = getContextArgument(request)
-  if (
-    analyticsOwnsContext &&
-    isContextEnabled(data.options.context) &&
-    request.params?.name !== 'get_more_tools' &&
-    contextArgument
-  ) {
+  if (analyticsOwnsContext && isContextEnabled(data.options.context) && contextArgument) {
     return { intent: contextArgument, source: 'context_parameter' }
   }
 

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.10.5'
+export const version = '0.10.6'