@posthog/mcp 0.10.2 → 0.10.3

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

@@ -0,0 +1,12 @@
+export interface AnalyticsInjectableJsonSchema {
+    additionalProperties?: boolean;
+    allOf?: unknown;
+    anyOf?: unknown;
+    oneOf?: unknown;
+    properties?: Record<string, unknown>;
+    required?: string[];
+    type?: string;
+}
+export declare function hasAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
+export declare function canInjectAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
+//# sourceMappingURL=analytics-parameters.d.ts.map

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

@@ -0,0 +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"}

package/dist/extensions/analytics-parameters.js

@@ -0,0 +1,44 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    canInjectAnalyticsParameter: ()=>canInjectAnalyticsParameter,
+    hasAnalyticsParameter: ()=>hasAnalyticsParameter
+});
+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;
+}
+exports.canInjectAnalyticsParameter = __webpack_exports__.canInjectAnalyticsParameter;
+exports.hasAnalyticsParameter = __webpack_exports__.hasAnalyticsParameter;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "canInjectAnalyticsParameter",
+    "hasAnalyticsParameter"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/extensions/analytics-parameters.mjs

@@ -0,0 +1,7 @@
+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;
+}
+export { canInjectAnalyticsParameter, hasAnalyticsParameter };

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

@@ -1,15 +1,7 @@
 import type { MCPAnalyticsOptions } from '../types';
-interface JsonSchema {
-    additionalProperties?: boolean;
-    allOf?: unknown;
-    anyOf?: unknown;
-    oneOf?: unknown;
-    properties?: Record<string, unknown>;
-    required?: string[];
-    type?: string;
-}
+import { type AnalyticsInjectableJsonSchema } from './analytics-parameters';
 export interface ContextInjectableTool {
-    inputSchema?: JsonSchema;
+    inputSchema?: AnalyticsInjectableJsonSchema;
     name?: string;
     [key: string]: unknown;
 }
@@ -27,5 +19,4 @@ export declare function getContextDescription(context: MCPAnalyticsOptions['cont
  */
 export declare function addContextParameterToTool<TTool extends ContextInjectableTool>(tool: TTool, contextDescriptionOverride?: string): TTool;
 export declare function addContextParameterToTools<TTool extends ContextInjectableTool>(tools: TTool[], contextDescriptionOverride?: string): TTool[];
-export {};
 //# sourceMappingURL=context-parameters.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"context-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/context-parameters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAInD,UAAU,UAAU;IAClB,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,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,UAAU,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAEjG;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,qBAAqB,EAC3E,IAAI,EAAE,KAAK,EACX,0BAA0B,CAAC,EAAE,MAAM,GAClC,KAAK,CAgEP;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,qBAAqB,EAC5E,KAAK,EAAE,KAAK,EAAE,EACd,0BAA0B,CAAC,EAAE,MAAM,GAClC,KAAK,EAAE,CAQT"}
+{"version":3,"file":"context-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/context-parameters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAI/B,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAEjG;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,qBAAqB,EAC3E,IAAI,EAAE,KAAK,EACX,0BAA0B,CAAC,EAAE,MAAM,GAClC,KAAK,CA6DP;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,qBAAqB,EAC5E,KAAK,EAAE,KAAK,EAAE,EACd,0BAA0B,CAAC,EAAE,MAAM,GAClC,KAAK,EAAE,CAQT"}

package/dist/extensions/context-parameters.js

@@ -29,6 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
     getContextDescription: ()=>getContextDescription,
     isContextEnabled: ()=>isContextEnabled
 });
+const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
 const external_constants_js_namespaceObject = require("./constants.js");
 const external_logger_js_namespaceObject = require("./logger.js");
 function isContextEnabled(context) {
@@ -43,12 +44,9 @@ function addContextParameterToTool(tool, contextDescriptionOverride) {
     };
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
-    if (schema?.properties?.context) {
-        (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`);
-        return modifiedTool;
-    }
-    if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-        (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`);
+    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.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

package/dist/extensions/context-parameters.mjs

@@ -1,3 +1,4 @@
+import { canInjectAnalyticsParameter, hasAnalyticsParameter } from "./analytics-parameters.mjs";
 import { DEFAULT_CONTEXT_PARAMETER_DESCRIPTION } from "./constants.mjs";
 import { log } from "./logger.mjs";
 function isContextEnabled(context) {
@@ -12,12 +13,8 @@ function addContextParameterToTool(tool, contextDescriptionOverride) {
     };
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
-    if (schema?.properties?.context) {
-        log(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`);
-        return modifiedTool;
-    }
-    if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-        log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`);
+    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.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

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

@@ -1,15 +1,7 @@
+import { type AnalyticsInjectableJsonSchema } from './analytics-parameters';
 export declare const CONVERSATION_ID_PARAM_NAME = "conversation_id";
-interface JsonSchema {
-    additionalProperties?: boolean;
-    allOf?: unknown;
-    anyOf?: unknown;
-    oneOf?: unknown;
-    properties?: Record<string, unknown>;
-    required?: string[];
-    type?: string;
-}
 export interface ConversationIdInjectableTool {
-    inputSchema?: JsonSchema;
+    inputSchema?: AnalyticsInjectableJsonSchema;
     name?: string;
     [key: string]: unknown;
 }
@@ -48,5 +40,4 @@ export declare function buildConversationIdPromptBack(conversationId: string): {
     text: string;
 };
 export declare function injectConversationIdPromptBack(result: unknown, conversationId: string): unknown;
-export {};
 //# sourceMappingURL=conversation-id.d.ts.map

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":"AAUA,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAE3D,UAAU,UAAU;IAClB,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,MAAM,WAAW,4BAA4B;IAC3C,WAAW,CAAC,EAAE,UAAU,CAAA;IACxB,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,CA2CtG;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,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"}

package/dist/extensions/conversation-id.js

@@ -36,6 +36,7 @@ __webpack_require__.d(__webpack_exports__, {
     canInjectConversationIdPromptBack: ()=>canInjectConversationIdPromptBack
 });
 const core_namespaceObject = require("@posthog/core");
+const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
 const external_constants_js_namespaceObject = require("./constants.js");
 const external_logger_js_namespaceObject = require("./logger.js");
 const external_tools_js_namespaceObject = require("./tools.js");
@@ -46,12 +47,9 @@ function addConversationIdToTool(tool) {
     };
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
-    if (schema?.properties?.[CONVERSATION_ID_PARAM_NAME]) {
-        (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`);
-        return modifiedTool;
-    }
-    if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-        (0, external_logger_js_namespaceObject.log)(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`);
+    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.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

package/dist/extensions/conversation-id.mjs

@@ -1,4 +1,5 @@
 import { uuidv7 } from "@posthog/core";
+import { canInjectAnalyticsParameter, hasAnalyticsParameter } from "./analytics-parameters.mjs";
 import { DEFAULT_CONVERSATION_ID_DESCRIPTION } from "./constants.mjs";
 import { log } from "./logger.mjs";
 import { GET_MORE_TOOLS_NAME } from "./tools.mjs";
@@ -9,12 +10,8 @@ function addConversationIdToTool(tool) {
     };
     const toolName = tool.name || 'unknown';
     const schema = modifiedTool.inputSchema;
-    if (schema?.properties?.[CONVERSATION_ID_PARAM_NAME]) {
-        log(`WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`);
-        return modifiedTool;
-    }
-    if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-        log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`);
+    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.`);
         return modifiedTool;
     }
     if (!modifiedTool.inputSchema) modifiedTool.inputSchema = {

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

package/dist/extensions/instrument-highlevel.js

@@ -26,7 +26,9 @@ __webpack_require__.r(__webpack_exports__);
 __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");
 const external_logger_js_namespaceObject = require("./logger.js");
@@ -39,6 +41,27 @@ 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,
@@ -62,7 +85,8 @@ function setupListenerToRegisteredTools(server) {
                             (0, external_logger_js_namespaceObject.log)(`Tool ${String(property)} callback already wrapped, skipping proxy wrapping`);
                             return Reflect.set(target, property, value);
                         }
-                        const nextValue = addTracingToToolCallbackInternal(value, property, server);
+                        const getCurrentInputSchema = ()=>value.inputSchema;
+                        const nextValue = addTracingToToolCallbackInternal(value, property, server, getCurrentInputSchema);
                         if ('function' == typeof nextValue.update) {
                             const originalUpdate = nextValue.update;
                             nextValue.update = function(...updateArgs) {
@@ -71,7 +95,7 @@ function setupListenerToRegisteredTools(server) {
                                     if (isCallbackUpdate(updateObj)) {
                                         const wrappedTool = addTracingToToolCallbackInternal({
                                             callback: updateObj.callback
-                                        }, property, server);
+                                        }, property, server, getCurrentInputSchema);
                                         updateObj.callback = (0, external_mcp_sdk_compat_js_namespaceObject.getToolFunction)(wrappedTool);
                                     }
                                 }
@@ -103,9 +127,10 @@ function setupListenerToRegisteredTools(server) {
         (0, external_logger_js_namespaceObject.log)(`Warning: Failed to setup listener for registered tools - ${error}`);
     }
 }
-function addTracingToToolCallbackInternal(tool, toolName, server) {
+function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInputSchema = ()=>tool.inputSchema) {
     const originalCallback = (0, external_mcp_sdk_compat_js_namespaceObject.getToolFunction)(tool);
-    const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)((0, external_internal_js_namespaceObject.getServerTrackingData)(server.server)?.options);
+    const options = (0, external_internal_js_namespaceObject.getServerTrackingData)(server.server)?.options;
+    const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(options);
     if (wrappedCallbacks.has(originalCallback)) {
         (0, external_logger_js_namespaceObject.log)(`Tool ${toolName} callback already wrapped, skipping re-wrap`);
         return tool;
@@ -124,14 +149,11 @@ function addTracingToToolCallbackInternal(tool, toolName, server) {
             args = void 0;
             extra = params[0];
         }
-        const removeContextFromArgs = (input)=>{
-            if (input && 'object' == typeof input && 'context' in input) {
-                const { context: _context, ...rest } = input;
-                return rest;
-            }
-            return input;
-        };
-        const cleanedArgs = toolName === missingToolName ? args : (0, external_conversation_id_js_namespaceObject.stripConversationId)(removeContextFromArgs(args));
+        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')
+        });
         try {
             if (void 0 === cleanedArgs) {
                 const handler = originalCallback;

package/dist/extensions/instrument-highlevel.mjs

@@ -1,8 +1,10 @@
+import { canInjectAnalyticsParameter } from "./analytics-parameters.mjs";
 import { stripConversationId } from "./conversation-id.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, getToolFunction, hasToolFunction } from "./mcp-sdk-compat.mjs";
+import { createWrappedTool, getObjectShape, getToolFunction, hasToolFunction, isZodRawShapeCompat } 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";
@@ -11,6 +13,27 @@ 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,
@@ -34,7 +57,8 @@ function setupListenerToRegisteredTools(server) {
                             log(`Tool ${String(property)} callback already wrapped, skipping proxy wrapping`);
                             return Reflect.set(target, property, value);
                         }
-                        const nextValue = addTracingToToolCallbackInternal(value, property, server);
+                        const getCurrentInputSchema = ()=>value.inputSchema;
+                        const nextValue = addTracingToToolCallbackInternal(value, property, server, getCurrentInputSchema);
                         if ('function' == typeof nextValue.update) {
                             const originalUpdate = nextValue.update;
                             nextValue.update = function(...updateArgs) {
@@ -43,7 +67,7 @@ function setupListenerToRegisteredTools(server) {
                                     if (isCallbackUpdate(updateObj)) {
                                         const wrappedTool = addTracingToToolCallbackInternal({
                                             callback: updateObj.callback
-                                        }, property, server);
+                                        }, property, server, getCurrentInputSchema);
                                         updateObj.callback = getToolFunction(wrappedTool);
                                     }
                                 }
@@ -75,9 +99,10 @@ function setupListenerToRegisteredTools(server) {
         log(`Warning: Failed to setup listener for registered tools - ${error}`);
     }
 }
-function addTracingToToolCallbackInternal(tool, toolName, server) {
+function addTracingToToolCallbackInternal(tool, toolName, server, getCurrentInputSchema = ()=>tool.inputSchema) {
     const originalCallback = getToolFunction(tool);
-    const missingToolName = resolveMissingCapabilityToolName(getServerTrackingData(server.server)?.options);
+    const options = getServerTrackingData(server.server)?.options;
+    const missingToolName = resolveMissingCapabilityToolName(options);
     if (wrappedCallbacks.has(originalCallback)) {
         log(`Tool ${toolName} callback already wrapped, skipping re-wrap`);
         return tool;
@@ -96,14 +121,11 @@ function addTracingToToolCallbackInternal(tool, toolName, server) {
             args = void 0;
             extra = params[0];
         }
-        const removeContextFromArgs = (input)=>{
-            if (input && 'object' == typeof input && 'context' in input) {
-                const { context: _context, ...rest } = input;
-                return rest;
-            }
-            return input;
-        };
-        const cleanedArgs = toolName === missingToolName ? args : stripConversationId(removeContextFromArgs(args));
+        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')
+        });
         try {
             if (void 0 === cleanedArgs) {
                 const handler = originalCallback;

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

@@ -28,6 +28,7 @@ export declare function hasToolFunction(tool: unknown): tool is RegisteredTool;
  */
 export declare function createWrappedTool(originalTool: RegisteredTool, wrappedFunction: ToolCallback): RegisteredTool;
 export declare function isZ4Schema(schema: unknown): boolean;
+export declare function isZodRawShapeCompat(schema: unknown): schema is Record<string, unknown>;
 export declare function getObjectShape(schema: unknown): Record<string, unknown> | undefined;
 export declare function getLiteralValue(schema: unknown): unknown;
 //# sourceMappingURL=mcp-sdk-compat.d.ts.map

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

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

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

@@ -30,7 +30,8 @@ __webpack_require__.d(__webpack_exports__, {
     getToolFunction: ()=>getToolFunction,
     getToolFunctionKey: ()=>getToolFunctionKey,
     hasToolFunction: ()=>hasToolFunction,
-    isZ4Schema: ()=>isZ4Schema
+    isZ4Schema: ()=>isZ4Schema,
+    isZodRawShapeCompat: ()=>isZodRawShapeCompat
 });
 function getToolFunction(tool) {
     if ('handler' in tool && 'function' == typeof tool.handler) return tool.handler;
@@ -57,6 +58,12 @@ function isZ4Schema(schema) {
     if (!schema || 'object' != typeof schema) return false;
     return !!schema._zod;
 }
+function isZodTypeLike(value) {
+    return !!value && 'object' == typeof value && 'parse' in value && 'function' == typeof value.parse && 'safeParse' in value && 'function' == typeof value.safeParse;
+}
+function isZodRawShapeCompat(schema) {
+    return !!schema && 'object' == typeof schema && Object.values(schema).some(isZodTypeLike);
+}
 function getObjectShape(schema) {
     if (!schema || 'object' != typeof schema) return;
     let rawShape;
@@ -98,6 +105,7 @@ exports.getToolFunction = __webpack_exports__.getToolFunction;
 exports.getToolFunctionKey = __webpack_exports__.getToolFunctionKey;
 exports.hasToolFunction = __webpack_exports__.hasToolFunction;
 exports.isZ4Schema = __webpack_exports__.isZ4Schema;
+exports.isZodRawShapeCompat = __webpack_exports__.isZodRawShapeCompat;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createWrappedTool",
     "getLiteralValue",
@@ -105,7 +113,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "getToolFunction",
     "getToolFunctionKey",
     "hasToolFunction",
-    "isZ4Schema"
+    "isZ4Schema",
+    "isZodRawShapeCompat"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -23,6 +23,12 @@ function isZ4Schema(schema) {
     if (!schema || 'object' != typeof schema) return false;
     return !!schema._zod;
 }
+function isZodTypeLike(value) {
+    return !!value && 'object' == typeof value && 'parse' in value && 'function' == typeof value.parse && 'safeParse' in value && 'function' == typeof value.safeParse;
+}
+function isZodRawShapeCompat(schema) {
+    return !!schema && 'object' == typeof schema && Object.values(schema).some(isZodTypeLike);
+}
 function getObjectShape(schema) {
     if (!schema || 'object' != typeof schema) return;
     let rawShape;
@@ -57,4 +63,4 @@ function getLiteralValue(schema) {
     const directValue = schema.value;
     if (void 0 !== directValue) return directValue;
 }
-export { createWrappedTool, getLiteralValue, getObjectShape, getToolFunction, getToolFunctionKey, hasToolFunction, isZ4Schema };
+export { createWrappedTool, getLiteralValue, getObjectShape, getToolFunction, getToolFunctionKey, hasToolFunction, isZ4Schema, isZodRawShapeCompat };

package/dist/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/mcp",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "bugs": {
     "url": "https://github.com/PostHog/posthog-js/issues"
   },
@@ -28,7 +28,7 @@
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@posthog/core": "^1.46.1"
+    "@posthog/core": "^1.46.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.27.1",
@@ -39,7 +39,7 @@
     "@types/node": "^20.0.0",
     "jest": "29.7.0",
     "zod": "^3.25.0",
-    "posthog-node": "^5.47.2",
+    "posthog-node": "^5.47.4",
     "@posthog-tooling/tsconfig-base": "1.1.1"
   },
   "peerDependencies": {

package/src/extensions/analytics-parameters.ts

@@ -0,0 +1,23 @@
+export interface AnalyticsInjectableJsonSchema {
+  additionalProperties?: boolean
+  allOf?: unknown
+  anyOf?: unknown
+  oneOf?: unknown
+  properties?: Record<string, unknown>
+  required?: string[]
+  type?: string
+}
+
+export function hasAnalyticsParameter(
+  schema: AnalyticsInjectableJsonSchema | undefined,
+  parameterName: string
+): boolean {
+  return !!schema?.properties && Object.prototype.hasOwnProperty.call(schema.properties, parameterName)
+}
+
+export function canInjectAnalyticsParameter(
+  schema: AnalyticsInjectableJsonSchema | undefined,
+  parameterName: string
+): boolean {
+  return !hasAnalyticsParameter(schema, parameterName) && !schema?.oneOf && !schema?.allOf && !schema?.anyOf
+}

package/src/extensions/context-parameters.ts

@@ -4,21 +4,16 @@
 // Licensed under the MIT License: https://github.com/agentcathq/agentcat-typescript-sdk/blob/main/LICENSE
 
 import type { MCPAnalyticsOptions } from '../types'
+import {
+  canInjectAnalyticsParameter,
+  hasAnalyticsParameter,
+  type AnalyticsInjectableJsonSchema,
+} from './analytics-parameters'
 import { DEFAULT_CONTEXT_PARAMETER_DESCRIPTION } from './constants'
 import { log } from './logger'
 
-interface JsonSchema {
-  additionalProperties?: boolean
-  allOf?: unknown
-  anyOf?: unknown
-  oneOf?: unknown
-  properties?: Record<string, unknown>
-  required?: string[]
-  type?: string
-}
-
 export interface ContextInjectableTool {
-  inputSchema?: JsonSchema
+  inputSchema?: AnalyticsInjectableJsonSchema
   name?: string
   [key: string]: unknown
 }
@@ -48,17 +43,14 @@ export function addContextParameterToTool<TTool extends ContextInjectableTool>(
   // Create a shallow copy of the tool to avoid modifying the original
   const modifiedTool = { ...tool }
   const toolName = tool.name || 'unknown'
-  const schema = modifiedTool.inputSchema as JsonSchema | undefined
-
-  // Check if tool already has context parameter - skip to avoid collision
-  if (schema?.properties?.context) {
-    log(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`)
-    return modifiedTool
-  }
+  const schema = modifiedTool.inputSchema as AnalyticsInjectableJsonSchema | undefined
 
-  // Skip complex schemas that can't safely have properties added at root level
-  if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-    log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`)
+  if (!canInjectAnalyticsParameter(schema, 'context')) {
+    if (hasAnalyticsParameter(schema, 'context')) {
+      log(`WARN: Tool "${toolName}" already has 'context' parameter. Skipping context injection.`)
+    } else {
+      log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping context injection.`)
+    }
     return modifiedTool
   }
 
@@ -77,9 +69,9 @@ export function addContextParameterToTool<TTool extends ContextInjectableTool>(
   const contextDescription = contextDescriptionOverride || DEFAULT_CONTEXT_PARAMETER_DESCRIPTION
 
   // Deep copy the inputSchema to avoid mutations
-  modifiedTool.inputSchema = JSON.parse(JSON.stringify(modifiedTool.inputSchema)) as JsonSchema
+  modifiedTool.inputSchema = JSON.parse(JSON.stringify(modifiedTool.inputSchema)) as AnalyticsInjectableJsonSchema
 
-  const inputSchema = modifiedTool.inputSchema as JsonSchema
+  const inputSchema = modifiedTool.inputSchema as AnalyticsInjectableJsonSchema
 
   // Ensure properties object exists
   if (!inputSchema.properties) {

package/src/extensions/conversation-id.ts

@@ -4,24 +4,19 @@
 // Licensed under the MIT License: https://github.com/agentcathq/agentcat-typescript-sdk/blob/main/LICENSE
 
 import { uuidv7 } from '@posthog/core'
+import {
+  canInjectAnalyticsParameter,
+  hasAnalyticsParameter,
+  type AnalyticsInjectableJsonSchema,
+} from './analytics-parameters'
 import { DEFAULT_CONVERSATION_ID_DESCRIPTION } from './constants'
 import { log } from './logger'
 import { GET_MORE_TOOLS_NAME } from './tools'
 
 export const CONVERSATION_ID_PARAM_NAME = 'conversation_id'
 
-interface JsonSchema {
-  additionalProperties?: boolean
-  allOf?: unknown
-  anyOf?: unknown
-  oneOf?: unknown
-  properties?: Record<string, unknown>
-  required?: string[]
-  type?: string
-}
-
 export interface ConversationIdInjectableTool {
-  inputSchema?: JsonSchema
+  inputSchema?: AnalyticsInjectableJsonSchema
   name?: string
   [key: string]: unknown
 }
@@ -29,17 +24,16 @@ export interface ConversationIdInjectableTool {
 export function addConversationIdToTool<TTool extends ConversationIdInjectableTool>(tool: TTool): TTool {
   const modifiedTool = { ...tool }
   const toolName = tool.name || 'unknown'
-  const schema = modifiedTool.inputSchema as JsonSchema | undefined
-
-  if (schema?.properties?.[CONVERSATION_ID_PARAM_NAME]) {
-    log(
-      `WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`
-    )
-    return modifiedTool
-  }
-
-  if (schema?.oneOf || schema?.allOf || schema?.anyOf) {
-    log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`)
+  const schema = modifiedTool.inputSchema as AnalyticsInjectableJsonSchema | undefined
+
+  if (!canInjectAnalyticsParameter(schema, CONVERSATION_ID_PARAM_NAME)) {
+    if (hasAnalyticsParameter(schema, CONVERSATION_ID_PARAM_NAME)) {
+      log(
+        `WARN: Tool "${toolName}" already has '${CONVERSATION_ID_PARAM_NAME}' parameter. Skipping conversation_id injection.`
+      )
+    } else {
+      log(`WARN: Tool "${toolName}" has complex schema (oneOf/allOf/anyOf). Skipping conversation_id injection.`)
+    }
     return modifiedTool
   }
 
@@ -51,9 +45,9 @@ export function addConversationIdToTool<TTool extends ConversationIdInjectableTo
     }
   }
 
-  modifiedTool.inputSchema = JSON.parse(JSON.stringify(modifiedTool.inputSchema)) as JsonSchema
+  modifiedTool.inputSchema = JSON.parse(JSON.stringify(modifiedTool.inputSchema)) as AnalyticsInjectableJsonSchema
 
-  const inputSchema = modifiedTool.inputSchema as JsonSchema
+  const inputSchema = modifiedTool.inputSchema as AnalyticsInjectableJsonSchema
 
   if (!inputSchema.properties) {
     inputSchema.properties = {}

package/src/extensions/instrument-highlevel.ts

@@ -11,11 +11,19 @@ import type {
   RegisteredTool,
   ToolCallback,
 } from '../types'
+import { canInjectAnalyticsParameter } from './analytics-parameters'
 import { stripConversationId } from './conversation-id'
+import { isContextEnabled } from './context-parameters'
 import { MCPAnalyticsEventType } from './event-types'
 import { getServerTrackingData } from './internal'
 import { log } from './logger'
-import { createWrappedTool, getToolFunction, hasToolFunction } from './mcp-sdk-compat'
+import {
+  createWrappedTool,
+  getObjectShape,
+  getToolFunction,
+  hasToolFunction,
+  isZodRawShapeCompat,
+} from './mcp-sdk-compat'
 import { handleReportMissing, resolveMissingCapabilityToolName } from './tools'
 import {
   handleInitializeRequest,
@@ -44,6 +52,41 @@ function isCallbackUpdate(value: unknown): value is { callback: ToolCallback } {
   return !!value && typeof value === 'object' && 'callback' in value && typeof value.callback === 'function'
 }
 
+function analyticsOwnsParameter(inputSchema: unknown, parameterName: string): boolean {
+  if (!inputSchema || typeof inputSchema !== 'object') {
+    return canInjectAnalyticsParameter(undefined, parameterName)
+  }
+
+  if (isZodRawShapeCompat(inputSchema)) {
+    return canInjectAnalyticsParameter({ properties: inputSchema }, parameterName)
+  }
+
+  const shape = getObjectShape(inputSchema)
+  if (shape) {
+    return canInjectAnalyticsParameter({ properties: shape }, parameterName)
+  }
+
+  const schema = inputSchema as Record<string, unknown>
+  if ('_def' in schema || '_zod' in schema || '~standard' in schema) {
+    // The MCP SDK advertises non-object schemas as an empty object schema.
+    return canInjectAnalyticsParameter(undefined, parameterName)
+  }
+
+  return canInjectAnalyticsParameter(schema, parameterName)
+}
+
+function stripOwnedAnalyticsArguments(
+  args: unknown,
+  ownership: { context: boolean; conversationId: boolean }
+): unknown {
+  let cleanedArgs = args
+  if (ownership.context && cleanedArgs && typeof cleanedArgs === 'object' && 'context' in cleanedArgs) {
+    const { context: _context, ...rest } = cleanedArgs
+    cleanedArgs = rest
+  }
+  return ownership.conversationId ? stripConversationId(cleanedArgs) : cleanedArgs
+}
+
 function addTracingToToolRegistry(
   tools: Record<string, RegisteredTool>,
   server: HighLevelMCPServerLike
@@ -78,7 +121,10 @@ function setupListenerToRegisteredTools(server: HighLevelMCPServerLike): void {
               return Reflect.set(target, property, value)
             }
 
-            const nextValue = addTracingToToolCallbackInternal(value, property, server)
+            // The MCP SDK's registry copy is currently stale after update(), but keep this lookup lazy so
+            // ownership follows the current schema once the registry reflects live tool state.
+            const getCurrentInputSchema = () => value.inputSchema
+            const nextValue = addTracingToToolCallbackInternal(value, property, server, getCurrentInputSchema)
 
             if (typeof nextValue.update === 'function') {
               const originalUpdate = nextValue.update
@@ -89,7 +135,8 @@ function setupListenerToRegisteredTools(server: HighLevelMCPServerLike): void {
                     const wrappedTool = addTracingToToolCallbackInternal(
                       { callback: updateObj.callback },
                       property,
-                      server
+                      server,
+                      getCurrentInputSchema
                     )
                     updateObj.callback = getToolFunction(wrappedTool)
                   }
@@ -141,12 +188,12 @@ function setupListenerToRegisteredTools(server: HighLevelMCPServerLike): void {
 function addTracingToToolCallbackInternal(
   tool: RegisteredTool,
   toolName: string,
-  server: HighLevelMCPServerLike
+  server: HighLevelMCPServerLike,
+  getCurrentInputSchema: () => unknown = () => tool.inputSchema
 ): RegisteredTool {
   const originalCallback = getToolFunction(tool)
-  const missingToolName = resolveMissingCapabilityToolName(
-    getServerTrackingData(server.server as MCPServerLike)?.options
-  )
+  const options = getServerTrackingData(server.server as MCPServerLike)?.options
+  const missingToolName = resolveMissingCapabilityToolName(options)
 
   if (wrappedCallbacks.has(originalCallback)) {
     log(`Tool ${toolName} callback already wrapped, skipping re-wrap`)
@@ -170,15 +217,17 @@ function addTracingToToolCallbackInternal(
       extra = params[0] as CompatibleRequestHandlerExtra
     }
 
-    const removeContextFromArgs = (input: unknown): unknown => {
-      if (input && typeof input === 'object' && 'context' in input) {
-        const { context: _context, ...rest } = input
-        return rest
-      }
-      return input
-    }
-
-    const cleanedArgs = toolName === missingToolName ? args : stripConversationId(removeContextFromArgs(args))
+    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'),
+    })
 
     try {
       if (cleanedArgs === undefined) {

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

@@ -97,6 +97,21 @@ export function isZ4Schema(schema: unknown): boolean {
   return !!(schema as ZodV4Internal)._zod
 }
 
+function isZodTypeLike(value: unknown): boolean {
+  return (
+    !!value &&
+    typeof value === 'object' &&
+    'parse' in value &&
+    typeof value.parse === 'function' &&
+    'safeParse' in value &&
+    typeof value.safeParse === 'function'
+  )
+}
+
+export function isZodRawShapeCompat(schema: unknown): schema is Record<string, unknown> {
+  return !!schema && typeof schema === 'object' && Object.values(schema).some(isZodTypeLike)
+}
+
 export function getObjectShape(schema: unknown): Record<string, unknown> | undefined {
   if (!schema || typeof schema !== 'object') {
     return

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.10.2'
+export const version = '0.10.3'