@posthog/mcp 0.10.5 → 0.10.7

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/extensions/internal.d.ts

@@ -1,4 +1,4 @@
-import type { CompatibleRequestHandlerExtra, MCPAnalyticsData, MCPRequestLike, MCPServerLike, UserIdentity } from '../types';
+import type { CompatibleRequestHandlerExtra, MCPAnalyticsData, MCPRequestLike, MCPServerLike, SessionInfo, UserIdentity } from '../types';
 /**
  * Bounded LRU cache for session identities, capped at `maxSize` entries so a
  * long-lived server can't accumulate identities for unboundedly many sessions.
@@ -24,7 +24,8 @@ export declare function mergeIdentities(previous: UserIdentity | undefined, next
  * `$identify` event at most once per session: at `initialize`, when a
  * long-lived server first sees the identity, or when it materially changes.
  */
-export declare function handleIdentify(server: MCPServerLike, data: MCPAnalyticsData, sessionId: string, request: MCPRequestLike, extra?: CompatibleRequestHandlerExtra): Promise<void>;
+export declare function handleIdentify(server: MCPServerLike, data: MCPAnalyticsData, sessionId: string, request: MCPRequestLike, requestAttribution: SessionInfo, extra?: CompatibleRequestHandlerExtra): Promise<UserIdentity | undefined>;
+export declare function withIdentity(sessionInfo: SessionInfo, identity: UserIdentity | undefined): SessionInfo;
 /**
  * Resolves the `eventProperties` callback. Returns null when no callback is
  * configured, or when it returns nullish or throws — a throw never propagates

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

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/extensions/internal.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,cAAc,EACd,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAKjB;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkC;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,OAAO,SAAO;IAI1B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAWhD,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAapD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,IAAI,IAAI,MAAM;CAGf;AAID,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,GAAG,SAAS,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAEzF;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,OAAO,CA4B5E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAapG;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,IAAI,CAAC,CAkDf;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,cAAc,EACvB,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAUzC"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/extensions/internal.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,cAAc,EACd,aAAa,EAEb,WAAW,EACX,YAAY,EACb,MAAM,UAAU,CAAA;AAKjB;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkC;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,OAAO,SAAO;IAI1B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAWhD,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAapD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,IAAI,IAAI,MAAM;CAGf;AAID,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,GAAG,SAAS,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAEzF;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,OAAO,CA4B5E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAapG;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,kBAAkB,EAAE,WAAW,EAC/B,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAsDnC;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,SAAS,GAAG,WAAW,CAOtG;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,cAAc,EACvB,KAAK,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAUzC"}

package/dist/extensions/internal.js

@@ -26,11 +26,12 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeIdentities: ()=>mergeIdentities,
     areIdentitiesEqual: ()=>areIdentitiesEqual,
+    getServerTrackingData: ()=>getServerTrackingData,
+    setServerTrackingData: ()=>setServerTrackingData,
     resolveEventProperties: ()=>resolveEventProperties,
+    withIdentity: ()=>withIdentity,
     handleIdentify: ()=>handleIdentify,
-    getServerTrackingData: ()=>getServerTrackingData,
-    IdentityCache: ()=>IdentityCache,
-    setServerTrackingData: ()=>setServerTrackingData
+    IdentityCache: ()=>IdentityCache
 });
 const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_capture_js_namespaceObject = require("./capture.js");
@@ -94,8 +95,10 @@ function mergeIdentities(previous, next) {
         groups: next.groups ?? previous.groups
     };
 }
-async function handleIdentify(server, data, sessionId, request, extra) {
-    if (!data.options.identify) return;
+async function handleIdentify(server, data, sessionId, request, requestAttribution, extra) {
+    const identityBeforeRequest = data.identifiedSessions.get(sessionId);
+    const sessionSourceBeforeIdentify = data.sessionSource;
+    if (!data.options.identify) return identityBeforeRequest;
     const identifyEvent = {
         sessionId,
         resourceName: getRequestResourceName(request),
@@ -114,17 +117,28 @@ async function handleIdentify(server, data, sessionId, request, extra) {
             const mergedIdentity = mergeIdentities(previousIdentity, identityResult);
             const changed = void 0 !== previousIdentity && !areIdentitiesEqual(previousIdentity, mergedIdentity);
             const firstSeen = void 0 === previousIdentity;
-            const announcedAtInitialize = 'token' === data.sessionSource && 'initialize' !== request.method;
+            const announcedAtInitialize = 'token' === sessionSourceBeforeIdentify && 'initialize' !== request.method;
             const shouldPublish = changed || firstSeen && !announcedAtInitialize;
             data.identifiedSessions.set(sessionId, mergedIdentity);
             if (shouldPublish) {
                 data.logger(`Identified session ${sessionId}`);
-                (0, external_capture_js_namespaceObject.captureEvent)(server, identifyEvent, data.logger);
+                (0, external_capture_js_namespaceObject.captureEvent)(server, identifyEvent, data.logger, withIdentity(requestAttribution, mergedIdentity));
             }
-        } else data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
+            return mergedIdentity;
+        }
+        data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
     } catch (error) {
         data.logger(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
     }
+    return identityBeforeRequest;
+}
+function withIdentity(sessionInfo, identity) {
+    return {
+        ...sessionInfo,
+        identifyActorGivenId: identity?.distinctId,
+        identifyActorData: identity?.properties || {},
+        identifyActorGroups: identity?.groups
+    };
 }
 async function resolveEventProperties(data, request, extra) {
     if (!data.options.eventProperties) return null;
@@ -148,6 +162,7 @@ exports.handleIdentify = __webpack_exports__.handleIdentify;
 exports.mergeIdentities = __webpack_exports__.mergeIdentities;
 exports.resolveEventProperties = __webpack_exports__.resolveEventProperties;
 exports.setServerTrackingData = __webpack_exports__.setServerTrackingData;
+exports.withIdentity = __webpack_exports__.withIdentity;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "IdentityCache",
     "areIdentitiesEqual",
@@ -155,7 +170,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "handleIdentify",
     "mergeIdentities",
     "resolveEventProperties",
-    "setServerTrackingData"
+    "setServerTrackingData",
+    "withIdentity"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/extensions/internal.mjs

@@ -60,8 +60,10 @@ function mergeIdentities(previous, next) {
         groups: next.groups ?? previous.groups
     };
 }
-async function handleIdentify(server, data, sessionId, request, extra) {
-    if (!data.options.identify) return;
+async function handleIdentify(server, data, sessionId, request, requestAttribution, extra) {
+    const identityBeforeRequest = data.identifiedSessions.get(sessionId);
+    const sessionSourceBeforeIdentify = data.sessionSource;
+    if (!data.options.identify) return identityBeforeRequest;
     const identifyEvent = {
         sessionId,
         resourceName: getRequestResourceName(request),
@@ -80,17 +82,28 @@ async function handleIdentify(server, data, sessionId, request, extra) {
             const mergedIdentity = mergeIdentities(previousIdentity, identityResult);
             const changed = void 0 !== previousIdentity && !areIdentitiesEqual(previousIdentity, mergedIdentity);
             const firstSeen = void 0 === previousIdentity;
-            const announcedAtInitialize = 'token' === data.sessionSource && 'initialize' !== request.method;
+            const announcedAtInitialize = 'token' === sessionSourceBeforeIdentify && 'initialize' !== request.method;
             const shouldPublish = changed || firstSeen && !announcedAtInitialize;
             data.identifiedSessions.set(sessionId, mergedIdentity);
             if (shouldPublish) {
                 data.logger(`Identified session ${sessionId}`);
-                captureEvent(server, identifyEvent, data.logger);
+                captureEvent(server, identifyEvent, data.logger, withIdentity(requestAttribution, mergedIdentity));
             }
-        } else data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
+            return mergedIdentity;
+        }
+        data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
     } catch (error) {
         data.logger(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
     }
+    return identityBeforeRequest;
+}
+function withIdentity(sessionInfo, identity) {
+    return {
+        ...sessionInfo,
+        identifyActorGivenId: identity?.distinctId,
+        identifyActorData: identity?.properties || {},
+        identifyActorGroups: identity?.groups
+    };
 }
 async function resolveEventProperties(data, request, extra) {
     if (!data.options.eventProperties) return null;
@@ -107,4 +120,4 @@ function getRequestResourceName(request) {
     if (!params || 'object' != typeof params || !('name' in params)) return 'Unknown';
     return 'string' == typeof params.name ? params.name : 'Unknown';
 }
-export { IdentityCache, areIdentitiesEqual, getServerTrackingData, handleIdentify, mergeIdentities, resolveEventProperties, setServerTrackingData };
+export { IdentityCache, areIdentitiesEqual, getServerTrackingData, handleIdentify, mergeIdentities, resolveEventProperties, setServerTrackingData, withIdentity };

package/dist/extensions/session.js

@@ -90,7 +90,9 @@ function getSessionInfo(server, data, sessionId) {
     if (!data) return sessionInfo;
     data.sessionInfo = sessionInfo;
     (0, external_internal_js_namespaceObject.setServerTrackingData)(server, data);
-    return data.sessionInfo;
+    return {
+        ...sessionInfo
+    };
 }
 exports.deriveSessionIdFromMCPSession = __webpack_exports__.deriveSessionIdFromMCPSession;
 exports.getSessionId = __webpack_exports__.getSessionId;

package/dist/extensions/session.mjs

@@ -59,6 +59,8 @@ function getSessionInfo(server, data, sessionId) {
     if (!data) return sessionInfo;
     data.sessionInfo = sessionInfo;
     setServerTrackingData(server, data);
-    return data.sessionInfo;
+    return {
+        ...sessionInfo
+    };
 }
 export { deriveSessionIdFromMCPSession, getSessionId, getSessionInfo, newSessionId };

package/dist/version.d.ts

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

package/package.json

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

package/src/extensions/capture.ts

@@ -3,7 +3,7 @@
 // Copyright (c) 2025 AgentCat, Inc. (formerly MCPcat)
 // Licensed under the MIT License: https://github.com/agentcathq/agentcat-typescript-sdk/blob/main/LICENSE
 
-import type { MCPServerLike, McpEvent } from '../types'
+import type { MCPServerLike, McpEvent, SessionInfo } from '../types'
 import { MCPAnalyticsEventType } from './event-types'
 import { getServerTrackingData } from './internal'
 import type { LoggerFn } from './logger'
@@ -19,7 +19,12 @@ import { getSessionInfo } from './session'
  * Auto-capture callers (tool calls, listings, identify) intentionally ignore the
  * return value, keeping the tool path isolated from analytics latency/errors.
  */
-export function captureEvent(server: MCPServerLike, eventInput: McpEvent, logger: LoggerFn): Promise<void> | undefined {
+export function captureEvent(
+  server: MCPServerLike,
+  eventInput: McpEvent,
+  logger: LoggerFn,
+  requestAttribution?: SessionInfo
+): Promise<void> | undefined {
   const data = getServerTrackingData(server)
   if (!data) {
     logger('Warning: Server tracking data not found. Event will not be published.')
@@ -31,7 +36,10 @@ export function captureEvent(server: MCPServerLike, eventInput: McpEvent, logger
     return
   }
 
-  const sessionInfo = getSessionInfo(server, data, eventInput.sessionId)
+  // Instrumented request paths pass an immutable snapshot resolved before any
+  // user callback or handler can yield to a concurrent request. Custom capture
+  // has no request context, so it intentionally falls back to current state.
+  const sessionInfo = requestAttribution ?? getSessionInfo(server, data, eventInput.sessionId)
 
   const duration =
     eventInput.duration || (eventInput.timestamp ? Date.now() - eventInput.timestamp.getTime() : undefined)
@@ -48,9 +56,8 @@ export function captureEvent(server: MCPServerLike, eventInput: McpEvent, logger
     sdkVersion: sessionInfo.sdkVersion,
     serverName: sessionInfo.serverName,
     serverVersion: sessionInfo.serverVersion,
-    // Prefer identity the event captured for *this* request (from `_meta`, see
-    // stampMetaClientInfo) over the server-wide sessionInfo, so a concurrent
-    // request from another client can't misattribute this one.
+    // Prefer client metadata stamped onto this event from the request's `_meta`
+    // over sessionInfo, so concurrent stateless requests stay isolated.
     clientName: eventInput.clientName ?? sessionInfo.clientName,
     clientVersion: eventInput.clientVersion ?? sessionInfo.clientVersion,
     identifyActorGivenId: sessionInfo.identifyActorGivenId,

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,