@posthog/mcp 0.10.3 → 0.10.4

package/dist/extensions/analytics-parameters.d.ts

@@ -1,4 +1,6 @@
+import type { AnalyticsParameterOwnership } from '../types';
 export interface AnalyticsInjectableJsonSchema {
+    $ref?: unknown;
     additionalProperties?: boolean;
     allOf?: unknown;
     anyOf?: unknown;
@@ -9,4 +11,7 @@ export interface AnalyticsInjectableJsonSchema {
 }
 export declare function hasAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
 export declare function canInjectAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
+export declare function analyticsOwnsParameter(inputSchema: unknown, parameterName: string): boolean;
+export declare function getAnalyticsParameterOwnership(inputSchema: unknown): AnalyticsParameterOwnership;
+export declare function stripOwnedAnalyticsArguments(args: unknown, ownership: AnalyticsParameterOwnership): unknown;
 //# sourceMappingURL=analytics-parameters.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"analytics-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/analytics-parameters.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,6BAA6B;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,6BAA6B,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,6BAA6B,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,GACpB,OAAO,CAET"}
+{"version":3,"file":"analytics-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/analytics-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAgB3D,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,6BAA6B,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,6BAA6B,GAAG,SAAS,EACjD,aAAa,EAAE,MAAM,GACpB,OAAO,CAIT;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAyB3F;AAED,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,2BAA2B,CAKhG;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,2BAA2B,GAAG,OAAO,CAW3G"}

package/dist/extensions/analytics-parameters.js

@@ -24,20 +24,74 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    hasAnalyticsParameter: ()=>hasAnalyticsParameter,
+    analyticsOwnsParameter: ()=>analyticsOwnsParameter,
+    getAnalyticsParameterOwnership: ()=>getAnalyticsParameterOwnership,
     canInjectAnalyticsParameter: ()=>canInjectAnalyticsParameter,
-    hasAnalyticsParameter: ()=>hasAnalyticsParameter
+    stripOwnedAnalyticsArguments: ()=>stripOwnedAnalyticsArguments
 });
+const external_mcp_sdk_compat_js_namespaceObject = require("./mcp-sdk-compat.js");
+const JSON_SCHEMA_KEYWORDS = [
+    '$defs',
+    '$ref',
+    'additionalProperties',
+    'allOf',
+    'anyOf',
+    'definitions',
+    'oneOf',
+    'properties',
+    'required',
+    'type'
+];
 function hasAnalyticsParameter(schema, parameterName) {
     return !!schema?.properties && Object.prototype.hasOwnProperty.call(schema.properties, parameterName);
 }
 function canInjectAnalyticsParameter(schema, parameterName) {
-    return !hasAnalyticsParameter(schema, parameterName) && !schema?.oneOf && !schema?.allOf && !schema?.anyOf;
+    return !hasAnalyticsParameter(schema, parameterName) && !schema?.$ref && !schema?.oneOf && !schema?.allOf && !schema?.anyOf;
 }
+function analyticsOwnsParameter(inputSchema, parameterName) {
+    if (!inputSchema || 'object' != typeof inputSchema) return canInjectAnalyticsParameter(void 0, parameterName);
+    if ((0, external_mcp_sdk_compat_js_namespaceObject.isZodRawShapeCompat)(inputSchema)) return canInjectAnalyticsParameter({
+        properties: inputSchema
+    }, parameterName);
+    const shape = (0, external_mcp_sdk_compat_js_namespaceObject.getObjectShape)(inputSchema);
+    if (shape) return canInjectAnalyticsParameter({
+        properties: shape
+    }, parameterName);
+    const schema = inputSchema;
+    if (JSON_SCHEMA_KEYWORDS.some((keyword)=>Object.prototype.hasOwnProperty.call(schema, keyword))) return canInjectAnalyticsParameter(schema, parameterName);
+    if ('_def' in schema || '_zod' in schema || '~standard' in schema) return canInjectAnalyticsParameter(void 0, parameterName);
+    return canInjectAnalyticsParameter(schema, parameterName);
+}
+function getAnalyticsParameterOwnership(inputSchema) {
+    return {
+        context: analyticsOwnsParameter(inputSchema, 'context'),
+        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id')
+    };
+}
+function stripOwnedAnalyticsArguments(args, ownership) {
+    let cleanedArgs = args;
+    if (ownership.context && cleanedArgs && 'object' == typeof cleanedArgs && 'context' in cleanedArgs) {
+        const { context: _context, ...rest } = cleanedArgs;
+        cleanedArgs = rest;
+    }
+    if (ownership.conversationId && cleanedArgs && 'object' == typeof cleanedArgs && 'conversation_id' in cleanedArgs) {
+        const { conversation_id: _conversationId, ...rest } = cleanedArgs;
+        cleanedArgs = rest;
+    }
+    return cleanedArgs;
+}
+exports.analyticsOwnsParameter = __webpack_exports__.analyticsOwnsParameter;
 exports.canInjectAnalyticsParameter = __webpack_exports__.canInjectAnalyticsParameter;
+exports.getAnalyticsParameterOwnership = __webpack_exports__.getAnalyticsParameterOwnership;
 exports.hasAnalyticsParameter = __webpack_exports__.hasAnalyticsParameter;
+exports.stripOwnedAnalyticsArguments = __webpack_exports__.stripOwnedAnalyticsArguments;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "analyticsOwnsParameter",
     "canInjectAnalyticsParameter",
-    "hasAnalyticsParameter"
+    "getAnalyticsParameterOwnership",
+    "hasAnalyticsParameter",
+    "stripOwnedAnalyticsArguments"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/extensions/analytics-parameters.mjs

@@ -1,7 +1,52 @@
+import { getObjectShape, isZodRawShapeCompat } from "./mcp-sdk-compat.mjs";
+const JSON_SCHEMA_KEYWORDS = [
+    '$defs',
+    '$ref',
+    'additionalProperties',
+    'allOf',
+    'anyOf',
+    'definitions',
+    'oneOf',
+    'properties',
+    'required',
+    'type'
+];
 function hasAnalyticsParameter(schema, parameterName) {
     return !!schema?.properties && Object.prototype.hasOwnProperty.call(schema.properties, parameterName);
 }
 function canInjectAnalyticsParameter(schema, parameterName) {
-    return !hasAnalyticsParameter(schema, parameterName) && !schema?.oneOf && !schema?.allOf && !schema?.anyOf;
+    return !hasAnalyticsParameter(schema, parameterName) && !schema?.$ref && !schema?.oneOf && !schema?.allOf && !schema?.anyOf;
 }
-export { canInjectAnalyticsParameter, hasAnalyticsParameter };
+function analyticsOwnsParameter(inputSchema, parameterName) {
+    if (!inputSchema || 'object' != typeof inputSchema) return canInjectAnalyticsParameter(void 0, parameterName);
+    if (isZodRawShapeCompat(inputSchema)) return canInjectAnalyticsParameter({
+        properties: inputSchema
+    }, parameterName);
+    const shape = getObjectShape(inputSchema);
+    if (shape) return canInjectAnalyticsParameter({
+        properties: shape
+    }, parameterName);
+    const schema = inputSchema;
+    if (JSON_SCHEMA_KEYWORDS.some((keyword)=>Object.prototype.hasOwnProperty.call(schema, keyword))) return canInjectAnalyticsParameter(schema, parameterName);
+    if ('_def' in schema || '_zod' in schema || '~standard' in schema) return canInjectAnalyticsParameter(void 0, parameterName);
+    return canInjectAnalyticsParameter(schema, parameterName);
+}
+function getAnalyticsParameterOwnership(inputSchema) {
+    return {
+        context: analyticsOwnsParameter(inputSchema, 'context'),
+        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id')
+    };
+}
+function stripOwnedAnalyticsArguments(args, ownership) {
+    let cleanedArgs = args;
+    if (ownership.context && cleanedArgs && 'object' == typeof cleanedArgs && 'context' in cleanedArgs) {
+        const { context: _context, ...rest } = cleanedArgs;
+        cleanedArgs = rest;
+    }
+    if (ownership.conversationId && cleanedArgs && 'object' == typeof cleanedArgs && 'conversation_id' in cleanedArgs) {
+        const { conversation_id: _conversationId, ...rest } = cleanedArgs;
+        cleanedArgs = rest;
+    }
+    return cleanedArgs;
+}
+export { analyticsOwnsParameter, canInjectAnalyticsParameter, getAnalyticsParameterOwnership, hasAnalyticsParameter, stripOwnedAnalyticsArguments };

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

@@ -14,7 +14,7 @@ export declare function getContextDescription(context: MCPAnalyticsOptions['cont
  *
  * Skips injection (with warning) for:
  * - Tools that already have a 'context' parameter
- * - Complex schemas (oneOf/allOf/anyOf) that can't safely have properties added
+ * - Complex schemas (oneOf/allOf/anyOf/$ref) that can't safely have properties added
  * - Schemas with additionalProperties: false
  */
 export declare function addContextParameterToTool<TTool extends ContextInjectableTool>(tool: TTool, contextDescriptionOverride?: string): TTool;

package/dist/extensions/context-parameters.js

@@ -46,7 +46,7 @@ function addContextParameterToTool(tool, contextDescriptionOverride) {
     const schema = modifiedTool.inputSchema;
     if (!(0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)(schema, 'context')) {
         if ((0, external_analytics_parameters_js_namespaceObject.hasAnalyticsParameter)(schema, 'context')) (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`);
-        else (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`);
+        else (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf/$ref). Skipping context injection.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

package/dist/extensions/context-parameters.mjs

@@ -14,7 +14,7 @@ function addContextParameterToTool(tool, contextDescriptionOverride) {
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
     if (!canInjectAnalyticsParameter(schema, 'context')) {
-        hasAnalyticsParameter(schema, 'context') ? log(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`) : log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`);
+        hasAnalyticsParameter(schema, 'context') ? log(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`) : log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf/$ref). Skipping context injection.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

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

@@ -28,12 +28,6 @@ export declare function resolveConversationId(enabled: boolean, args: unknown, t
  */
 export declare function canInjectConversationIdPromptBack(result: unknown): boolean;
 export declare function extractConversationId(args: unknown): string | undefined;
-export declare function cloneRequestWithoutConversationId<TRequest extends {
-    params?: {
-        arguments?: unknown;
-        [k: string]: unknown;
-    };
-}>(request: TRequest): TRequest;
 export declare function stripConversationId(args: unknown): unknown;
 export declare function buildConversationIdPromptBack(conversationId: string): {
     type: 'text';

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;AAK/B,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,EAAE,IAAI,EAAE,KAAK,GAAG,KAAK,CA0CtG;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,yBAAyB,GAAE,MAA4B,GACtD,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,iCAAiC,CAC/C,QAAQ,SAAS;IAAE,MAAM,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CAAE,EAC3E,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAe7B;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;AAK/B,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,EAAE,IAAI,EAAE,KAAK,GAAG,KAAK,CA0CtG;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,yBAAyB,GAAE,MAA4B,GACtD,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

@@ -27,11 +27,10 @@ __webpack_require__.d(__webpack_exports__, {
     CONVERSATION_ID_PARAM_NAME: ()=>CONVERSATION_ID_PARAM_NAME,
     resolveConversationId: ()=>resolveConversationId,
     buildConversationIdPromptBack: ()=>buildConversationIdPromptBack,
-    addConversationIdToTool: ()=>addConversationIdToTool,
+    injectConversationIdPromptBack: ()=>injectConversationIdPromptBack,
     addConversationIdToTools: ()=>addConversationIdToTools,
     extractConversationId: ()=>extractConversationId,
-    injectConversationIdPromptBack: ()=>injectConversationIdPromptBack,
-    cloneRequestWithoutConversationId: ()=>cloneRequestWithoutConversationId,
+    addConversationIdToTool: ()=>addConversationIdToTool,
     stripConversationId: ()=>stripConversationId,
     canInjectConversationIdPromptBack: ()=>canInjectConversationIdPromptBack
 });
@@ -49,7 +48,7 @@ function addConversationIdToTool(tool) {
     const schema = modifiedTool.inputSchema;
     if (!(0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)(schema, CONVERSATION_ID_PARAM_NAME)) {
         if ((0, external_analytics_parameters_js_namespaceObject.hasAnalyticsParameter)(schema, CONVERSATION_ID_PARAM_NAME)) (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`);
-        else (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`);
+        else (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf/$ref). Skipping conversation_id injection.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {
@@ -101,18 +100,6 @@ function extractConversationId(args) {
     const trimmed = value.trim();
     return trimmed.length > 0 ? trimmed : void 0;
 }
-function cloneRequestWithoutConversationId(request) {
-    if (!request.params || 'object' != typeof request.params) return request;
-    const args = request.params.arguments;
-    if (!(args && 'object' == typeof args)) return request;
-    return {
-        ...request,
-        params: {
-            ...request.params,
-            arguments: stripConversationId(args)
-        }
-    };
-}
 function stripConversationId(args) {
     if (!args || 'object' != typeof args || !(CONVERSATION_ID_PARAM_NAME in args)) return args;
     const { [CONVERSATION_ID_PARAM_NAME]: _omit, ...rest } = args;
@@ -140,7 +127,6 @@ exports.addConversationIdToTool = __webpack_exports__.addConversationIdToTool;
 exports.addConversationIdToTools = __webpack_exports__.addConversationIdToTools;
 exports.buildConversationIdPromptBack = __webpack_exports__.buildConversationIdPromptBack;
 exports.canInjectConversationIdPromptBack = __webpack_exports__.canInjectConversationIdPromptBack;
-exports.cloneRequestWithoutConversationId = __webpack_exports__.cloneRequestWithoutConversationId;
 exports.extractConversationId = __webpack_exports__.extractConversationId;
 exports.injectConversationIdPromptBack = __webpack_exports__.injectConversationIdPromptBack;
 exports.resolveConversationId = __webpack_exports__.resolveConversationId;
@@ -151,7 +137,6 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "addConversationIdToTools",
     "buildConversationIdPromptBack",
     "canInjectConversationIdPromptBack",
-    "cloneRequestWithoutConversationId",
     "extractConversationId",
     "injectConversationIdPromptBack",
     "resolveConversationId",

package/dist/extensions/conversation-id.mjs

@@ -11,7 +11,7 @@ function addConversationIdToTool(tool) {
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
     if (!canInjectAnalyticsParameter(schema, CONVERSATION_ID_PARAM_NAME)) {
-        hasAnalyticsParameter(schema, CONVERSATION_ID_PARAM_NAME) ? log(`WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`) : log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`);
+        hasAnalyticsParameter(schema, CONVERSATION_ID_PARAM_NAME) ? log(`WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`) : log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf/$ref). Skipping conversation_id injection.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {
@@ -63,18 +63,6 @@ function extractConversationId(args) {
     const trimmed = value.trim();
     return trimmed.length > 0 ? trimmed : void 0;
 }
-function cloneRequestWithoutConversationId(request) {
-    if (!request.params || 'object' != typeof request.params) return request;
-    const args = request.params.arguments;
-    if (!(args && 'object' == typeof args)) return request;
-    return {
-        ...request,
-        params: {
-            ...request.params,
-            arguments: stripConversationId(args)
-        }
-    };
-}
 function stripConversationId(args) {
     if (!args || 'object' != typeof args || !(CONVERSATION_ID_PARAM_NAME in args)) return args;
     const { [CONVERSATION_ID_PARAM_NAME]: _omit, ...rest } = args;
@@ -97,4 +85,4 @@ function injectConversationIdPromptBack(result, conversationId) {
         ]
     };
 }
-export { CONVERSATION_ID_PARAM_NAME, addConversationIdToTool, addConversationIdToTools, buildConversationIdPromptBack, canInjectConversationIdPromptBack, cloneRequestWithoutConversationId, extractConversationId, injectConversationIdPromptBack, resolveConversationId, stripConversationId };
+export { CONVERSATION_ID_PARAM_NAME, addConversationIdToTool, addConversationIdToTools, buildConversationIdPromptBack, canInjectConversationIdPromptBack, extractConversationId, injectConversationIdPromptBack, resolveConversationId, stripConversationId };

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;AAsSjB,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAwB9E"}
+{"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;AAoQjB,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CA6B9E"}

package/dist/extensions/instrument-highlevel.js

@@ -27,7 +27,6 @@ __webpack_require__.d(__webpack_exports__, {
     instrumentHighLevelServer: ()=>instrumentHighLevelServer
 });
 const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
-const external_conversation_id_js_namespaceObject = require("./conversation-id.js");
 const external_context_parameters_js_namespaceObject = require("./context-parameters.js");
 const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_internal_js_namespaceObject = require("./internal.js");
@@ -41,27 +40,6 @@ const MCP_ANALYTICS_PROCESSED = Symbol('__posthog_mcp_analytics_processed__');
 function isCallbackUpdate(value) {
     return !!value && 'object' == typeof value && 'callback' in value && 'function' == typeof value.callback;
 }
-function analyticsOwnsParameter(inputSchema, parameterName) {
-    if (!inputSchema || 'object' != typeof inputSchema) return (0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)(void 0, parameterName);
-    if ((0, external_mcp_sdk_compat_js_namespaceObject.isZodRawShapeCompat)(inputSchema)) return (0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)({
-        properties: inputSchema
-    }, parameterName);
-    const shape = (0, external_mcp_sdk_compat_js_namespaceObject.getObjectShape)(inputSchema);
-    if (shape) return (0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)({
-        properties: shape
-    }, parameterName);
-    const schema = inputSchema;
-    if ('_def' in schema || '_zod' in schema || '~standard' in schema) return (0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)(void 0, parameterName);
-    return (0, external_analytics_parameters_js_namespaceObject.canInjectAnalyticsParameter)(schema, parameterName);
-}
-function stripOwnedAnalyticsArguments(args, ownership) {
-    let cleanedArgs = args;
-    if (ownership.context && cleanedArgs && 'object' == typeof cleanedArgs && 'context' in cleanedArgs) {
-        const { context: _context, ...rest } = cleanedArgs;
-        cleanedArgs = rest;
-    }
-    return ownership.conversationId ? (0, external_conversation_id_js_namespaceObject.stripConversationId)(cleanedArgs) : cleanedArgs;
-}
 function addTracingToToolRegistry(tools, server) {
     return Object.fromEntries(Object.entries(tools).map(([name, tool])=>[
             name,
@@ -150,9 +128,9 @@ function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInpu
             extra = params[0];
         }
         const inputSchema = getCurrentInputSchema();
-        const cleanedArgs = stripOwnedAnalyticsArguments(args, {
-            context: toolName !== missingToolName && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(options?.context) && analyticsOwnsParameter(inputSchema, 'context'),
-            conversationId: toolName !== missingToolName && options?.enableConversationId === true && analyticsOwnsParameter(inputSchema, 'conversation_id')
+        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')
         });
         try {
             if (void 0 === cleanedArgs) {
@@ -172,7 +150,7 @@ function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInpu
     wrappedTool[MCP_ANALYTICS_PROCESSED] = true;
     return wrappedTool;
 }
-async function handleToolCallRequest(server, originalCallToolHandler, request, extra) {
+async function handleToolCallRequest(highLevelServer, server, originalCallToolHandler, request, extra) {
     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.');
@@ -192,12 +170,15 @@ async function handleToolCallRequest(server, originalCallToolHandler, request, e
                 })
         });
     }
+    const toolName = request.params?.name;
+    const registeredTool = toolName ? highLevelServer._registeredTools[toolName] : void 0;
     return await (0, external_instrumentation_js_namespaceObject.captureToolCall)({
         server,
         data,
         request,
         extra,
-        execute: ()=>originalCallToolHandler(request, extra),
+        execute: (downstreamRequest)=>originalCallToolHandler(downstreamRequest, extra),
+        parameterOwnership: registeredTool ? (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(registeredTool.inputSchema) : void 0,
         takeCapturedError: ()=>{
             const captured = extra?.__mcp_analytics_error;
             if (extra) extra.__mcp_analytics_error = void 0;
@@ -212,7 +193,7 @@ function instrumentHighLevelServer(server) {
         const handlers = {
             initialize: external_instrumentation_js_namespaceObject.handleInitializeRequest,
             'tools/list': external_instrumentation_js_namespaceObject.handleListToolsRequest,
-            'tools/call': handleToolCallRequest
+            'tools/call': (trackedServer, originalHandler, request, extra)=>handleToolCallRequest(server, trackedServer, originalHandler, request, extra)
         };
         (0, external_instrumentation_js_namespaceObject.patchRequestHandlers)(lowLevelServer, handlers);
         server._registeredTools = addTracingToToolRegistry(server._registeredTools, server);

package/dist/extensions/instrument-highlevel.mjs

@@ -1,10 +1,9 @@
-import { canInjectAnalyticsParameter } from "./analytics-parameters.mjs";
-import { stripConversationId } from "./conversation-id.mjs";
+import { analyticsOwnsParameter, getAnalyticsParameterOwnership, stripOwnedAnalyticsArguments } from "./analytics-parameters.mjs";
 import { isContextEnabled } from "./context-parameters.mjs";
 import { MCPAnalyticsEventType } from "./event-types.mjs";
 import { getServerTrackingData } from "./internal.mjs";
 import { log } from "./logger.mjs";
-import { createWrappedTool, getObjectShape, getToolFunction, hasToolFunction, isZodRawShapeCompat } from "./mcp-sdk-compat.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 { getContextArgument } from "./tracing-helpers.mjs";
@@ -13,27 +12,6 @@ const MCP_ANALYTICS_PROCESSED = Symbol('__posthog_mcp_analytics_processed__');
 function isCallbackUpdate(value) {
     return !!value && 'object' == typeof value && 'callback' in value && 'function' == typeof value.callback;
 }
-function analyticsOwnsParameter(inputSchema, parameterName) {
-    if (!inputSchema || 'object' != typeof inputSchema) return canInjectAnalyticsParameter(void 0, parameterName);
-    if (isZodRawShapeCompat(inputSchema)) return canInjectAnalyticsParameter({
-        properties: inputSchema
-    }, parameterName);
-    const shape = getObjectShape(inputSchema);
-    if (shape) return canInjectAnalyticsParameter({
-        properties: shape
-    }, parameterName);
-    const schema = inputSchema;
-    if ('_def' in schema || '_zod' in schema || '~standard' in schema) return canInjectAnalyticsParameter(void 0, parameterName);
-    return canInjectAnalyticsParameter(schema, parameterName);
-}
-function stripOwnedAnalyticsArguments(args, ownership) {
-    let cleanedArgs = args;
-    if (ownership.context && cleanedArgs && 'object' == typeof cleanedArgs && 'context' in cleanedArgs) {
-        const { context: _context, ...rest } = cleanedArgs;
-        cleanedArgs = rest;
-    }
-    return ownership.conversationId ? stripConversationId(cleanedArgs) : cleanedArgs;
-}
 function addTracingToToolRegistry(tools, server) {
     return Object.fromEntries(Object.entries(tools).map(([name, tool])=>[
             name,
@@ -144,7 +122,7 @@ function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInpu
     wrappedTool[MCP_ANALYTICS_PROCESSED] = true;
     return wrappedTool;
 }
-async function handleToolCallRequest(server, originalCallToolHandler, request, extra) {
+async function handleToolCallRequest(highLevelServer, server, originalCallToolHandler, request, extra) {
     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.');
@@ -164,12 +142,15 @@ async function handleToolCallRequest(server, originalCallToolHandler, request, e
                 })
         });
     }
+    const toolName = request.params?.name;
+    const registeredTool = toolName ? highLevelServer._registeredTools[toolName] : void 0;
     return await captureToolCall({
         server,
         data,
         request,
         extra,
-        execute: ()=>originalCallToolHandler(request, extra),
+        execute: (downstreamRequest)=>originalCallToolHandler(downstreamRequest, extra),
+        parameterOwnership: registeredTool ? getAnalyticsParameterOwnership(registeredTool.inputSchema) : void 0,
         takeCapturedError: ()=>{
             const captured = extra?.__mcp_analytics_error;
             if (extra) extra.__mcp_analytics_error = void 0;
@@ -184,7 +165,7 @@ function instrumentHighLevelServer(server) {
         const handlers = {
             initialize: handleInitializeRequest,
             'tools/list': handleListToolsRequest,
-            'tools/call': handleToolCallRequest
+            'tools/call': (trackedServer, originalHandler, request, extra)=>handleToolCallRequest(server, trackedServer, originalHandler, request, extra)
         };
         patchRequestHandlers(lowLevelServer, handlers);
         server._registeredTools = addTracingToToolRegistry(server._registeredTools, server);

package/dist/extensions/instrumentation.d.ts

@@ -1,5 +1,5 @@
 import type { ListToolsResult } from '@modelcontextprotocol/sdk/types.js';
-import type { CompatibleRequestHandlerExtra, MCPAnalyticsData, MCPRequestLike, MCPServerLike } from '../types';
+import type { AnalyticsParameterOwnership, CompatibleRequestHandlerExtra, MCPAnalyticsData, MCPRequestLike, MCPServerLike } from '../types';
 import { MCPAnalyticsEventType } from './event-types';
 /**
  * Single instrumentation core shared by the low-level (`Server`) and high-level
@@ -9,11 +9,7 @@ import { MCPAnalyticsEventType } from './event-types';
  * attribution, and event capture are defined exactly once.
  */
 type MCPRequestHandler = (request: MCPRequestLike, extra?: CompatibleRequestHandlerExtra) => Promise<unknown>;
-/**
- * Runs the underlying tool. Receives the request with the SDK-injected
- * `conversation_id` stripped; an adapter is free to ignore it (the high-level
- * path strips arguments inside the wrapped callback instead).
- */
+/** Runs the underlying tool with SDK-owned analytics arguments removed. */
 type ToolExecutor = (downstreamRequest: MCPRequestLike) => Promise<unknown>;
 interface TraceToolCallParams {
     server: MCPServerLike;
@@ -21,6 +17,8 @@ interface TraceToolCallParams {
     request: MCPRequestLike;
     extra?: CompatibleRequestHandlerExtra;
     execute: ToolExecutor;
+    /** Optional schema-derived ownership override for adapters with direct registry access. */
+    parameterOwnership?: AnalyticsParameterOwnership;
     /**
      * Event type to capture. Defaults to a tool call; the `get_more_tools` virtual
      * tool passes `mcpMissingCapability` so it records a capability gap rather than

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,6BAA6B,EAC7B,gBAAgB,EAChB,cAAc,EACd,aAAa,EAGd,MAAM,UAAU,CAAA;AAYjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAYrD;;;;;;GAMG;AAEH,KAAK,iBAAiB,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,6BAA6B,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE7G;;;;GAIG;AACH,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;;;;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,CAuCnF;AAoHD;;;;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,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC,CAyC9C;AAwDD,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,CAAC,EAAE,6BAA6B,GACpC,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;AAYrD;;;;;;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;AAqJD;;;;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,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC,CAyC9C;AAwED,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,CAAC,EAAE,6BAA6B,GACpC,OAAO,CAAC,OAAO,CAAC,CA0ClB"}

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");
@@ -48,11 +49,12 @@ 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 {
@@ -65,7 +67,27 @@ async function captureToolCall(params) {
     publishSuccessfulToolEvent(server, event, finalResult, startTime, 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,7 +104,7 @@ 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}`);
@@ -175,6 +197,9 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
         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);
@@ -185,6 +210,7 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
         const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
         const originalResponse = await originalListToolsHandler(request, extra);
         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));
         if (data?.options.enableConversationId) tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options));
         if (data?.options.reportMissing) {