@posthog/mcp 0.10.3 → 0.10.5

package/dist/extensions/instrumentation.js

@@ -32,6 +32,7 @@ __webpack_require__.d(__webpack_exports__, {
     handleListToolsRequest: ()=>handleListToolsRequest,
     patchRequestHandlers: ()=>patchRequestHandlers
 });
+const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
 const external_context_parameters_js_namespaceObject = require("./context-parameters.js");
 const external_conversation_id_js_namespaceObject = require("./conversation-id.js");
 const external_client_identity_js_namespaceObject = require("./client-identity.js");
@@ -40,7 +41,6 @@ const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_exceptions_js_namespaceObject = require("./exceptions.js");
 const external_intent_js_namespaceObject = require("./intent.js");
 const external_internal_js_namespaceObject = require("./internal.js");
-const external_logger_js_namespaceObject = require("./logger.js");
 const external_mcp_payloads_js_namespaceObject = require("./mcp-payloads.js");
 const external_mcp_sdk_compat_js_namespaceObject = require("./mcp-sdk-compat.js");
 const external_session_js_namespaceObject = require("./session.js");
@@ -48,24 +48,45 @@ const external_session_token_js_namespaceObject = require("./session-token.js");
 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, eventType, explicitContextIntent, takeCapturedError } = params;
-    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(data.options.enableConversationId ?? false, request.params?.arguments, request.params?.name, (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options));
-    const downstreamRequest = conversation.conversationId ? (0, external_conversation_id_js_namespaceObject.cloneRequestWithoutConversationId)(request) : request;
+    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 downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
     const startTime = new Date();
-    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall);
+    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall);
     if (event && explicitContextIntent) (0, external_intent_js_namespaceObject.setExplicitContextIntent)(event, explicitContextIntent);
     let result;
     try {
         result = await execute(downstreamRequest);
     } catch (error) {
-        publishFailedToolEvent(server, event, error, startTime, conversation);
+        publishFailedToolEvent(server, event, error, startTime, conversation, data.logger);
         throw error;
     }
     const finalResult = applyConversationPromptBack(event, result, conversation);
-    publishSuccessfulToolEvent(server, event, finalResult, startTime, takeCapturedError);
+    publishSuccessfulToolEvent(server, event, finalResult, startTime, data.logger, takeCapturedError);
     return finalResult;
 }
-async function prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, eventType) {
+function getActiveAnalyticsParameterOwnership(data, toolName, override) {
+    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
+    };
+}
+function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
+    const args = request.params?.arguments;
+    const cleanedArgs = (0, external_analytics_parameters_js_namespaceObject.stripOwnedAnalyticsArguments)(args, ownership);
+    if (cleanedArgs === args || !request.params) return request;
+    return {
+        ...request,
+        params: {
+            ...request.params,
+            arguments: cleanedArgs
+        }
+    };
+}
+async function prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType) {
     try {
         const sessionId = (0, external_session_js_namespaceObject.getSessionId)(server, extra);
         await (0, external_internal_js_namespaceObject.handleIdentify)(server, data, sessionId, request, extra);
@@ -82,10 +103,10 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         };
         (0, external_client_identity_js_namespaceObject.stampMetaClientInfo)(event, request);
         await (0, external_tracing_helpers_js_namespaceObject.applyResolvedMetadata)(event, data, request, extra);
-        (0, external_intent_js_namespaceObject.setEventIntent)(event, await (0, external_intent_js_namespaceObject.resolveToolCallIntent)(data, request, extra));
+        (0, external_intent_js_namespaceObject.setEventIntent)(event, await (0, external_intent_js_namespaceObject.resolveToolCallIntent)(data, request, ownership.context, extra));
         return event;
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: PostHog MCP analytics instrumentation failed for tool ${request.params?.name}, the tool will still run - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics instrumentation failed for tool ${request.params?.name}, the tool will still run - ${error}`);
         return null;
     }
 }
@@ -95,7 +116,7 @@ function applyConversationPromptBack(event, result, conversation) {
     if (event) event.conversationId = void 0;
     return result;
 }
-function publishSuccessfulToolEvent(server, event, result, startTime, takeCapturedError) {
+function publishSuccessfulToolEvent(server, event, result, startTime, logger, takeCapturedError) {
     if (!event) return;
     try {
         if ((0, external_tracing_helpers_js_namespaceObject.isToolResultError)(result)) {
@@ -105,21 +126,21 @@ function publishSuccessfulToolEvent(server, event, result, startTime, takeCaptur
         } else event.isError = false;
         event.response = result;
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: PostHog MCP analytics failed to publish tool event - ${error}`);
+        logger(`Warning: PostHog MCP analytics failed to publish tool event - ${error}`);
     }
 }
-function publishFailedToolEvent(server, event, error, startTime, conversation) {
+function publishFailedToolEvent(server, event, error, startTime, conversation, logger) {
     if (!event) return;
     try {
         if (conversation.minted) event.conversationId = void 0;
         event.isError = true;
         event.error = (0, external_exceptions_js_namespaceObject.captureException)(error);
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
     } catch (publishError) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
+        logger(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
     }
 }
 function patchRequestHandlers(server, patches) {
@@ -136,7 +157,7 @@ function patchRequestHandlers(server, patches) {
         return originalSetRequestHandler(requestSchema, (request, extra)=>patch(server, originalHandler, request, extra));
     };
 }
-async function handleListToolsRequest(server, originalListToolsHandler, request, extra) {
+async function handleListToolsRequest(server, originalListToolsHandler, request, extra, logger) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     const startTime = new Date();
     const event = {
@@ -147,19 +168,19 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
     };
     (0, external_client_identity_js_namespaceObject.stampMetaClientInfo)(event, request);
     if (data) await (0, external_tracing_helpers_js_namespaceObject.applyResolvedMetadata)(event, data, request, extra);
-    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event);
+    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger);
     if (!data) {
-        (0, external_logger_js_namespaceObject.log)('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
+        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 {
             tools
         };
     }
     if (0 === tools.length) {
-        (0, external_logger_js_namespaceObject.log)('Warning: No tools found in the original list. This is likely due to the tools not being registered before PostHog MCP analytics.instrument().');
+        data.logger('Warning: No tools found in the original list. This is likely due to the tools not being registered before PostHog MCP analytics.instrument().');
         event.error = (0, external_exceptions_js_namespaceObject.captureException)('No tools were sent to MCP client.');
         event.isError = true;
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
         return {
             tools
         };
@@ -170,23 +191,27 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
     event.listedToolNames = collectListedToolNames(tools);
     event.isError = false;
     event.duration = Date.now() - startTime.getTime();
-    (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
     return {
         tools
     };
 }
+function cacheToolAnalyticsParameterOwnership(cache, tools) {
+    for (const tool of tools)if (tool?.name) cache.set(tool.name, (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(tool.inputSchema));
+}
 function collectListedToolNames(tools) {
     if (!tools || 0 === tools.length) return;
     const names = tools.map((tool)=>tool?.name).filter((name)=>'string' == typeof name);
     return names.length > 0 ? names : void 0;
 }
-async function getTracedToolsList(server, originalListToolsHandler, request, extra, event) {
+async function getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger) {
     try {
         const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
         const originalResponse = await originalListToolsHandler(request, extra);
         let tools = originalResponse.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));
-        if (data?.options.enableConversationId) tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options));
+        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) {
             const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
             const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
@@ -198,11 +223,11 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
         }
         return tools;
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: Original list tools handler failed, this suggests an error PostHog MCP analytics did not cause - ${error}`);
+        logger(`Warning: Original list tools handler failed, this suggests an error PostHog MCP analytics did not cause - ${error}`);
         event.error = (0, external_exceptions_js_namespaceObject.captureException)(error);
         event.isError = true;
         event.duration = event.timestamp ? Date.now() - event.timestamp.getTime() : 0;
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
         throw error;
     }
 }
@@ -247,7 +272,7 @@ function mintStatelessSessionOnInitialize(server, data, request, extra) {
         (0, external_internal_js_namespaceObject.setServerTrackingData)(server, data);
         return sessionId;
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: PostHog MCP analytics failed to mint a stateless session id - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics failed to mint a stateless session id - ${error}`);
         return;
     }
 }
@@ -263,7 +288,7 @@ function upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiate
         });
         (0, external_session_token_js_namespaceObject.writeSessionIdToTransport)(transport, token);
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
     }
 }
 function readInitializeClientInfo(request) {
@@ -275,10 +300,10 @@ function readInitializeClientInfo(request) {
         version: 'string' == typeof version ? version : void 0
     };
 }
-async function handleInitializeRequest(server, originalInitializeHandler, request, extra) {
+async function handleInitializeRequest(server, originalInitializeHandler, request, extra, logger) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     if (!data) {
-        (0, external_logger_js_namespaceObject.log)('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
+        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 originalInitializeHandler(request, extra);
     }
     const mintedSessionId = mintStatelessSessionOnInitialize(server, data, request, extra);
@@ -300,7 +325,7 @@ async function handleInitializeRequest(server, originalInitializeHandler, reques
     data.sessionInfo.protocolVersion = negotiatedProtocolVersion;
     (0, external_internal_js_namespaceObject.setServerTrackingData)(server, data);
     if (mintedSessionId) upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiatedProtocolVersion);
-    (0, external_capture_js_namespaceObject.captureEvent)(server, event);
+    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
     return result;
 }
 function readProtocolVersion(result, request) {

package/dist/extensions/instrumentation.mjs

@@ -1,12 +1,12 @@
+import { getAnalyticsParameterOwnership, stripOwnedAnalyticsArguments } from "./analytics-parameters.mjs";
 import { addContextParameterToTools, getContextDescription, isContextEnabled } from "./context-parameters.mjs";
-import { addConversationIdToTools, canInjectConversationIdPromptBack, cloneRequestWithoutConversationId, injectConversationIdPromptBack, resolveConversationId } from "./conversation-id.mjs";
+import { addConversationIdToTools, canInjectConversationIdPromptBack, injectConversationIdPromptBack, resolveConversationId } from "./conversation-id.mjs";
 import { stampMetaClientInfo } from "./client-identity.mjs";
 import { captureEvent } from "./capture.mjs";
 import { MCPAnalyticsEventType } from "./event-types.mjs";
 import { captureException } from "./exceptions.mjs";
 import { resolveToolCallIntent, setEventIntent, setExplicitContextIntent } from "./intent.mjs";
 import { getServerTrackingData, handleIdentify, setServerTrackingData } from "./internal.mjs";
-import { log } from "./logger.mjs";
 import { buildCapturedMcpParameters } from "./mcp-payloads.mjs";
 import { getLiteralValue, getObjectShape } from "./mcp-sdk-compat.mjs";
 import { getSessionId, newSessionId } from "./session.mjs";
@@ -14,24 +14,45 @@ import { encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from
 import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from "./tools.mjs";
 import { applyResolvedMetadata, isToolResultError } from "./tracing-helpers.mjs";
 async function captureToolCall(params) {
-    const { server, data, request, extra, execute, eventType, explicitContextIntent, takeCapturedError } = params;
-    const conversation = resolveConversationId(data.options.enableConversationId ?? false, request.params?.arguments, request.params?.name, resolveMissingCapabilityToolName(data.options));
-    const downstreamRequest = conversation.conversationId ? cloneRequestWithoutConversationId(request) : request;
+    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 downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
     const startTime = new Date();
-    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, eventType ?? MCPAnalyticsEventType.mcpToolsCall);
+    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType ?? MCPAnalyticsEventType.mcpToolsCall);
     if (event && explicitContextIntent) setExplicitContextIntent(event, explicitContextIntent);
     let result;
     try {
         result = await execute(downstreamRequest);
     } catch (error) {
-        publishFailedToolEvent(server, event, error, startTime, conversation);
+        publishFailedToolEvent(server, event, error, startTime, conversation, data.logger);
         throw error;
     }
     const finalResult = applyConversationPromptBack(event, result, conversation);
-    publishSuccessfulToolEvent(server, event, finalResult, startTime, takeCapturedError);
+    publishSuccessfulToolEvent(server, event, finalResult, startTime, data.logger, takeCapturedError);
     return finalResult;
 }
-async function prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, eventType) {
+function getActiveAnalyticsParameterOwnership(data, toolName, override) {
+    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
+    };
+}
+function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
+    const args = request.params?.arguments;
+    const cleanedArgs = stripOwnedAnalyticsArguments(args, ownership);
+    if (cleanedArgs === args || !request.params) return request;
+    return {
+        ...request,
+        params: {
+            ...request.params,
+            arguments: cleanedArgs
+        }
+    };
+}
+async function prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType) {
     try {
         const sessionId = getSessionId(server, extra);
         await handleIdentify(server, data, sessionId, request, extra);
@@ -48,10 +69,10 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         };
         stampMetaClientInfo(event, request);
         await applyResolvedMetadata(event, data, request, extra);
-        setEventIntent(event, await resolveToolCallIntent(data, request, extra));
+        setEventIntent(event, await resolveToolCallIntent(data, request, ownership.context, extra));
         return event;
     } catch (error) {
-        log(`Warning: PostHog MCP analytics instrumentation failed for tool ${request.params?.name}, the tool will still run - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics instrumentation failed for tool ${request.params?.name}, the tool will still run - ${error}`);
         return null;
     }
 }
@@ -61,7 +82,7 @@ function applyConversationPromptBack(event, result, conversation) {
     if (event) event.conversationId = void 0;
     return result;
 }
-function publishSuccessfulToolEvent(server, event, result, startTime, takeCapturedError) {
+function publishSuccessfulToolEvent(server, event, result, startTime, logger, takeCapturedError) {
     if (!event) return;
     try {
         if (isToolResultError(result)) {
@@ -71,21 +92,21 @@ function publishSuccessfulToolEvent(server, event, result, startTime, takeCaptur
         } else event.isError = false;
         event.response = result;
         event.duration = Date.now() - startTime.getTime();
-        captureEvent(server, event);
+        captureEvent(server, event, logger);
     } catch (error) {
-        log(`Warning: PostHog MCP analytics failed to publish tool event - ${error}`);
+        logger(`Warning: PostHog MCP analytics failed to publish tool event - ${error}`);
     }
 }
-function publishFailedToolEvent(server, event, error, startTime, conversation) {
+function publishFailedToolEvent(server, event, error, startTime, conversation, logger) {
     if (!event) return;
     try {
         if (conversation.minted) event.conversationId = void 0;
         event.isError = true;
         event.error = captureException(error);
         event.duration = Date.now() - startTime.getTime();
-        captureEvent(server, event);
+        captureEvent(server, event, logger);
     } catch (publishError) {
-        log(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
+        logger(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
     }
 }
 function patchRequestHandlers(server, patches) {
@@ -102,7 +123,7 @@ function patchRequestHandlers(server, patches) {
         return originalSetRequestHandler(requestSchema, (request, extra)=>patch(server, originalHandler, request, extra));
     };
 }
-async function handleListToolsRequest(server, originalListToolsHandler, request, extra) {
+async function handleListToolsRequest(server, originalListToolsHandler, request, extra, logger) {
     const data = getServerTrackingData(server);
     const startTime = new Date();
     const event = {
@@ -113,19 +134,19 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
     };
     stampMetaClientInfo(event, request);
     if (data) await applyResolvedMetadata(event, data, request, extra);
-    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event);
+    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger);
     if (!data) {
-        log('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
+        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 {
             tools
         };
     }
     if (0 === tools.length) {
-        log('Warning: No tools found in the original list. This is likely due to the tools not being registered before PostHog MCP analytics.instrument().');
+        data.logger('Warning: No tools found in the original list. This is likely due to the tools not being registered before PostHog MCP analytics.instrument().');
         event.error = captureException('No tools were sent to MCP client.');
         event.isError = true;
         event.duration = Date.now() - startTime.getTime();
-        captureEvent(server, event);
+        captureEvent(server, event, data.logger);
         return {
             tools
         };
@@ -136,23 +157,27 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
     event.listedToolNames = collectListedToolNames(tools);
     event.isError = false;
     event.duration = Date.now() - startTime.getTime();
-    captureEvent(server, event);
+    captureEvent(server, event, data.logger);
     return {
         tools
     };
 }
+function cacheToolAnalyticsParameterOwnership(cache, tools) {
+    for (const tool of tools)if (tool?.name) cache.set(tool.name, getAnalyticsParameterOwnership(tool.inputSchema));
+}
 function collectListedToolNames(tools) {
     if (!tools || 0 === tools.length) return;
     const names = tools.map((tool)=>tool?.name).filter((name)=>'string' == typeof name);
     return names.length > 0 ? names : void 0;
 }
-async function getTracedToolsList(server, originalListToolsHandler, request, extra, event) {
+async function getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger) {
     try {
         const data = getServerTrackingData(server);
         const originalResponse = await originalListToolsHandler(request, extra);
         let tools = originalResponse.tools || [];
-        if (data && isContextEnabled(data.options.context)) tools = addContextParameterToTools(tools, getContextDescription(data.options.context));
-        if (data?.options.enableConversationId) tools = addConversationIdToTools(tools, resolveMissingCapabilityToolName(data.options));
+        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) {
             const missingToolName = resolveMissingCapabilityToolName(data.options);
             const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
@@ -164,11 +189,11 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
         }
         return tools;
     } catch (error) {
-        log(`Warning: Original list tools handler failed, this suggests an error PostHog MCP analytics did not cause - ${error}`);
+        logger(`Warning: Original list tools handler failed, this suggests an error PostHog MCP analytics did not cause - ${error}`);
         event.error = captureException(error);
         event.isError = true;
         event.duration = event.timestamp ? Date.now() - event.timestamp.getTime() : 0;
-        captureEvent(server, event);
+        captureEvent(server, event, logger);
         throw error;
     }
 }
@@ -213,7 +238,7 @@ function mintStatelessSessionOnInitialize(server, data, request, extra) {
         setServerTrackingData(server, data);
         return sessionId;
     } catch (error) {
-        log(`Warning: PostHog MCP analytics failed to mint a stateless session id - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics failed to mint a stateless session id - ${error}`);
         return;
     }
 }
@@ -229,7 +254,7 @@ function upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiate
         });
         writeSessionIdToTransport(transport, token);
     } catch (error) {
-        log(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
+        data.logger(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
     }
 }
 function readInitializeClientInfo(request) {
@@ -241,10 +266,10 @@ function readInitializeClientInfo(request) {
         version: 'string' == typeof version ? version : void 0
     };
 }
-async function handleInitializeRequest(server, originalInitializeHandler, request, extra) {
+async function handleInitializeRequest(server, originalInitializeHandler, request, extra, logger) {
     const data = getServerTrackingData(server);
     if (!data) {
-        log('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
+        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 originalInitializeHandler(request, extra);
     }
     const mintedSessionId = mintStatelessSessionOnInitialize(server, data, request, extra);
@@ -266,7 +291,7 @@ async function handleInitializeRequest(server, originalInitializeHandler, reques
     data.sessionInfo.protocolVersion = negotiatedProtocolVersion;
     setServerTrackingData(server, data);
     if (mintedSessionId) upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiatedProtocolVersion);
-    captureEvent(server, event);
+    captureEvent(server, event, data.logger);
     return result;
 }
 function readProtocolVersion(result, request) {

package/dist/extensions/intent.d.ts

@@ -3,7 +3,7 @@ interface ResolvedIntent {
     intent: string;
     source: MCPAnalyticsIntentSource;
 }
-export declare function resolveToolCallIntent(data: MCPAnalyticsData, request: MCPRequestLike, extra?: CompatibleRequestHandlerExtra): Promise<ResolvedIntent | null>;
+export declare function resolveToolCallIntent(data: MCPAnalyticsData, request: MCPRequestLike, analyticsOwnsContext: boolean, extra?: CompatibleRequestHandlerExtra): Promise<ResolvedIntent | null>;
 export declare function setEventIntent(event: McpEvent, resolvedIntent: ResolvedIntent | null): void;
 export declare function setExplicitContextIntent(event: McpEvent, context: string): void;
 export {};

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;AAIjB,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,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"}
+{"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"}

package/dist/extensions/intent.js

@@ -29,7 +29,6 @@ __webpack_require__.d(__webpack_exports__, {
     setEventIntent: ()=>setEventIntent
 });
 const external_context_parameters_js_namespaceObject = require("./context-parameters.js");
-const external_logger_js_namespaceObject = require("./logger.js");
 function getContextArgument(request) {
     const context = request.params?.arguments?.context;
     return 'string' == typeof context && context.trim() ? context : void 0;
@@ -48,13 +47,13 @@ async function runIntentFallback(data, request, extra) {
             source: 'inferred'
         } : null;
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`intentFallback callback error: ${error}`);
+        data.logger(`intentFallback callback error: ${error}`);
         return null;
     }
 }
-async function resolveToolCallIntent(data, request, extra) {
+async function resolveToolCallIntent(data, request, analyticsOwnsContext, extra) {
     const contextArgument = getContextArgument(request);
-    if ((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) && request.params?.name !== 'get_more_tools' && contextArgument) return {
         intent: contextArgument,
         source: 'context_parameter'
     };

package/dist/extensions/intent.mjs

@@ -1,5 +1,4 @@
 import { isContextEnabled } from "./context-parameters.mjs";
-import { log } from "./logger.mjs";
 function getContextArgument(request) {
     const context = request.params?.arguments?.context;
     return 'string' == typeof context && context.trim() ? context : void 0;
@@ -18,13 +17,13 @@ async function runIntentFallback(data, request, extra) {
             source: 'inferred'
         } : null;
     } catch (error) {
-        log(`intentFallback callback error: ${error}`);
+        data.logger(`intentFallback callback error: ${error}`);
         return null;
     }
 }
-async function resolveToolCallIntent(data, request, extra) {
+async function resolveToolCallIntent(data, request, analyticsOwnsContext, extra) {
     const contextArgument = getContextArgument(request);
-    if (isContextEnabled(data.options.context) && request.params?.name !== 'get_more_tools' && contextArgument) return {
+    if (analyticsOwnsContext && isContextEnabled(data.options.context) && request.params?.name !== 'get_more_tools' && contextArgument) return {
         intent: contextArgument,
         source: 'context_parameter'
     };

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;AAMjB;;;;;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,CAgDf;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,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"}

package/dist/extensions/internal.js

@@ -33,7 +33,6 @@ __webpack_require__.d(__webpack_exports__, {
     setServerTrackingData: ()=>setServerTrackingData
 });
 const external_event_types_js_namespaceObject = require("./event-types.js");
-const external_logger_js_namespaceObject = require("./logger.js");
 const external_capture_js_namespaceObject = require("./capture.js");
 const external_client_identity_js_namespaceObject = require("./client-identity.js");
 class IdentityCache {
@@ -119,12 +118,12 @@ async function handleIdentify(server, data, sessionId, request, extra) {
             const shouldPublish = changed || firstSeen && !announcedAtInitialize;
             data.identifiedSessions.set(sessionId, mergedIdentity);
             if (shouldPublish) {
-                (0, external_logger_js_namespaceObject.log)(`Identified session ${sessionId} with identity: ${JSON.stringify(mergedIdentity)}`);
-                (0, external_capture_js_namespaceObject.captureEvent)(server, identifyEvent);
+                data.logger(`Identified session ${sessionId}`);
+                (0, external_capture_js_namespaceObject.captureEvent)(server, identifyEvent, data.logger);
             }
-        } else (0, external_logger_js_namespaceObject.log)(`Warning: Supplied identify function returned null for session ${sessionId}`);
+        } else data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
     } catch (error) {
-        (0, external_logger_js_namespaceObject.log)(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
+        data.logger(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
     }
 }
 async function resolveEventProperties(data, request, extra) {
@@ -132,7 +131,7 @@ async function resolveEventProperties(data, request, extra) {
     try {
         return await data.options.eventProperties(request, extra) ?? null;
     } catch (e) {
-        (0, external_logger_js_namespaceObject.log)(`eventProperties callback error: ${e}`);
+        data.logger(`eventProperties callback error: ${e}`);
         return null;
     }
 }

package/dist/extensions/internal.mjs

@@ -1,5 +1,4 @@
 import { MCPAnalyticsEventType } from "./event-types.mjs";
-import { log } from "./logger.mjs";
 import { captureEvent } from "./capture.mjs";
 import { stampMetaClientInfo } from "./client-identity.mjs";
 class IdentityCache {
@@ -85,12 +84,12 @@ async function handleIdentify(server, data, sessionId, request, extra) {
             const shouldPublish = changed || firstSeen && !announcedAtInitialize;
             data.identifiedSessions.set(sessionId, mergedIdentity);
             if (shouldPublish) {
-                log(`Identified session ${sessionId} with identity: ${JSON.stringify(mergedIdentity)}`);
-                captureEvent(server, identifyEvent);
+                data.logger(`Identified session ${sessionId}`);
+                captureEvent(server, identifyEvent, data.logger);
             }
-        } else log(`Warning: Supplied identify function returned null for session ${sessionId}`);
+        } else data.logger(`Warning: Supplied identify function returned null for session ${sessionId}`);
     } catch (error) {
-        log(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
+        data.logger(`Error: User supplied identify function threw an error while identifying session ${sessionId} - ${error}`);
     }
 }
 async function resolveEventProperties(data, request, extra) {
@@ -98,7 +97,7 @@ async function resolveEventProperties(data, request, extra) {
     try {
         return await data.options.eventProperties(request, extra) ?? null;
     } catch (e) {
-        log(`eventProperties callback error: ${e}`);
+        data.logger(`eventProperties callback error: ${e}`);
         return null;
     }
 }