@posthog/mcp 0.13.0 → 0.14.0

package/README.md

@@ -150,19 +150,29 @@ instrument(server, posthog, {
 
 `intentFallback` is the third option: supply the intent yourself when the agent did not send one.
 
+Whatever the agent narrates, the SDK redacts structured personal identifiers — email addresses, phone
+numbers, IPv4/IPv6 addresses, Luhn-valid card numbers, and US SSNs — from `$mcp_intent` before it is
+sent. This is always on and needs no configuration. It is best-effort for those well-defined shapes,
+not for free-form personal data such as names or postal addresses, which a regex cannot catch without
+over-redacting ordinary prose. It also applies only to `$mcp_intent`: structured tool `arguments` and
+results are left as-is, because the same shapes are often legitimate data there. If you need a stronger
+guarantee, `context: false` and the `beforeSend` hook above remain the ways to drop the field entirely.
+
 ### What `$mcp_llm_model` records, and when it stays empty
 
-`captureModel` is **off** by default. Turn it on and the SDK adds a required `llm_model` parameter to
-every tool it advertises — including the `get_more_tools` virtual tool — asks the agent which model
-it runs as, and records the answer as `$mcp_llm_model` with `$mcp_llm_model_source = "self_reported"`.
+`captureModel` is **off** by default. Turn it on and the SDK records the best model id visible to the
+server as `$mcp_llm_model`. Recognized client metadata wins with source `client_metadata`. Otherwise,
+the SDK injects a required `llm_model` parameter and records the answer with source `self_reported`.
+
+MCP does not standardize or attest model identity. Client metadata and self-report are both
+unverified. Use the value to spot degradation across models, never for billing or access control.
+Missing, blank, and `unknown` values are recorded as nothing.
 
-The value is self-reported and unverified, exactly like `clientInfo` in the MCP spec. Use it to spot
-degradation across models ("does our MCP get worse on model X?"), never for billing or access
-control. An agent that answers `unknown` is recorded as nothing rather than as a model called
-"unknown".
+The recognized metadata path is Codex's `x-codex-turn-metadata.model` field inside request `_meta`.
+Other clients keep using self-report until they expose a stable model field.
 
-Unlike `context`, this option degrades to **silence** rather than to a kept argument. Both the strip
-and the capture require the SDK to have confirmed the parameter is its own:
+Unlike `context`, the self-report fallback degrades to **silence** rather than to a kept argument.
+Its capture and stripping require the SDK to have confirmed the parameter is its own:
 
 - `instrument(server)` on a high-level `McpServer` resolves ownership for your registered tools per
   request from the live tool registry, so those work even on a fresh instance.
@@ -190,13 +200,18 @@ const posthog = new PostHogMCP(process.env.POSTHOG_PROJECT_TOKEN, { captureModel
 
 const tools = posthog.prepareToolList(serverTools)
 const originalTool = serverTools.find((tool) => tool.name === toolName)
-const { args, llmModel, llmModelSource } = posthog.prepareToolCall(toolName, rawArgs, { originalTool })
+const { args, llmModel, llmModelSource } = posthog.prepareToolCall(toolName, rawArgs, {
+  originalTool,
+  requestMeta: request.params?._meta,
+})
 const result = await dispatch(toolName, args)
 
 posthog.captureToolCall({ toolName, llmModel, llmModelSource, isError: false })
 ```
 
 A persistent single-process dispatcher can omit `originalTool` after it has prepared its tool list.
+Pass `requestMeta` whenever the request supplies `_meta`; this enables recognized client metadata
+without changing the arguments sent to the tool.
 
 ### If you switched to `instrument(server.server)`
 

package/dist/extensions/constants.d.ts

@@ -1,5 +1,5 @@
 export declare const INACTIVITY_TIMEOUT_IN_MINUTES = 30;
-export declare const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = "Explain why you are calling this tool and how it fits into the user's overall goal. This parameter is used for analytics and user intent tracking. YOU MUST provide 15-25 words (count carefully). NEVER use first person ('I', 'we', 'you') - maintain third-person perspective. NEVER include sensitive information such as credentials, passwords, or personal data. Example (20 words): \"Searching across the organization's repositories to find all open issues related to performance complaints and latency issues for team prioritization.\"";
+export declare const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = "Explain in 15-25 words, in third person, why this tool is called and how it supports the user's goal. For analytics only. You MUST describe only the abstract purpose of the tool call. NEVER include, repeat, paraphrase, or infer personal, sensitive, or identifying information from the user request or tool results, including names, emails, phone numbers, IPs, IDs, or credentials. You MUST generalize specific entities into roles such as \"a user\", \"the customer\", or \"an account\". Example: \"Retrieving a customer's recent orders to investigate a billing issue and help support determine the appropriate resolution.\"";
 export declare const DEFAULT_MODEL_PARAMETER_DESCRIPTION = "The exact model identifier you (the assistant) are running as, taken from your system prompt or environment (e.g. \"claude-opus-4-8\", \"gpt-5.2\"). Used for analytics only. If you do not know your model identifier with certainty, pass \"unknown\" \u2014 never guess.";
 export declare const DEFAULT_CONVERSATION_ID_DESCRIPTION = "Echo the conversation_id from the server's previous response. The server provides it on the first call \u2014 never invent one, and do not issue parallel tool calls until you have it.";
 export declare const POSTHOG_MCP_ANALYTICS_SOURCE = "posthog_mcp_analytics";

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/extensions/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,6BAA6B,KAAK,CAAA;AAE/C,eAAO,MAAM,qCAAqC,2hBAAyhB,CAAA;AAE3kB,eAAO,MAAM,mCAAmC,gRAAqQ,CAAA;AAErT,eAAO,MAAM,mCAAmC,4LACsI,CAAA;AAEtL,eAAO,MAAM,4BAA4B,0BAA0B,CAAA;AAMnE,eAAO,MAAM,oBAAoB,qBAAqB,CAAA;AAItD,eAAO,MAAM,wBAAwB;;;;;;;;;;;;CAY3B,CAAA;AAEV,MAAM,MAAM,wBAAwB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,OAAO,wBAAwB,CAAC,CAAA;AAE/G,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B9B,CAAA;AAEV,MAAM,MAAM,2BAA2B,GAAG,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,OAAO,2BAA2B,CAAC,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/extensions/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,6BAA6B,KAAK,CAAA;AAE/C,eAAO,MAAM,qCAAqC,onBAA4mB,CAAA;AAE9pB,eAAO,MAAM,mCAAmC,gRAAqQ,CAAA;AAErT,eAAO,MAAM,mCAAmC,4LACsI,CAAA;AAEtL,eAAO,MAAM,4BAA4B,0BAA0B,CAAA;AAMnE,eAAO,MAAM,oBAAoB,qBAAqB,CAAA;AAItD,eAAO,MAAM,wBAAwB;;;;;;;;;;;;CAY3B,CAAA;AAEV,MAAM,MAAM,wBAAwB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,OAAO,wBAAwB,CAAC,CAAA;AAE/G,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B9B,CAAA;AAEV,MAAM,MAAM,2BAA2B,GAAG,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,OAAO,2BAA2B,CAAC,CAAA"}

package/dist/extensions/constants.js

@@ -28,7 +28,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 const INACTIVITY_TIMEOUT_IN_MINUTES = 30;
-const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = "Explain why you are calling this tool and how it fits into the user's overall goal. This parameter is used for analytics and user intent tracking. YOU MUST provide 15-25 words (count carefully). NEVER use first person ('I', 'we', 'you') - maintain third-person perspective. NEVER include sensitive information such as credentials, passwords, or personal data. Example (20 words): \"Searching across the organization's repositories to find all open issues related to performance complaints and latency issues for team prioritization.\"";
+const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = 'Explain in 15-25 words, in third person, why this tool is called and how it supports the user\'s goal. For analytics only. You MUST describe only the abstract purpose of the tool call. NEVER include, repeat, paraphrase, or infer personal, sensitive, or identifying information from the user request or tool results, including names, emails, phone numbers, IPs, IDs, or credentials. You MUST generalize specific entities into roles such as "a user", "the customer", or "an account". Example: "Retrieving a customer\'s recent orders to investigate a billing issue and help support determine the appropriate resolution."';
 const DEFAULT_MODEL_PARAMETER_DESCRIPTION = 'The exact model identifier you (the assistant) are running as, taken from your system prompt or environment (e.g. "claude-opus-4-8", "gpt-5.2"). Used for analytics only. If you do not know your model identifier with certainty, pass "unknown" — never guess.';
 const DEFAULT_CONVERSATION_ID_DESCRIPTION = "Echo the conversation_id from the server's previous response. The server provides it on the first call — never invent one, and do not issue parallel tool calls until you have it.";
 const POSTHOG_MCP_ANALYTICS_SOURCE = 'posthog_mcp_analytics';

package/dist/extensions/constants.mjs

@@ -1,5 +1,5 @@
 const INACTIVITY_TIMEOUT_IN_MINUTES = 30;
-const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = "Explain why you are calling this tool and how it fits into the user's overall goal. This parameter is used for analytics and user intent tracking. YOU MUST provide 15-25 words (count carefully). NEVER use first person ('I', 'we', 'you') - maintain third-person perspective. NEVER include sensitive information such as credentials, passwords, or personal data. Example (20 words): \"Searching across the organization's repositories to find all open issues related to performance complaints and latency issues for team prioritization.\"";
+const DEFAULT_CONTEXT_PARAMETER_DESCRIPTION = 'Explain in 15-25 words, in third person, why this tool is called and how it supports the user\'s goal. For analytics only. You MUST describe only the abstract purpose of the tool call. NEVER include, repeat, paraphrase, or infer personal, sensitive, or identifying information from the user request or tool results, including names, emails, phone numbers, IPs, IDs, or credentials. You MUST generalize specific entities into roles such as "a user", "the customer", or "an account". Example: "Retrieving a customer\'s recent orders to investigate a billing issue and help support determine the appropriate resolution."';
 const DEFAULT_MODEL_PARAMETER_DESCRIPTION = 'The exact model identifier you (the assistant) are running as, taken from your system prompt or environment (e.g. "claude-opus-4-8", "gpt-5.2"). Used for analytics only. If you do not know your model identifier with certainty, pass "unknown" — never guess.';
 const DEFAULT_CONVERSATION_ID_DESCRIPTION = "Echo the conversation_id from the server's previous response. The server provides it on the first call — never invent one, and do not issue parallel tool calls until you have it.";
 const POSTHOG_MCP_ANALYTICS_SOURCE = 'posthog_mcp_analytics';

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,EACV,2BAA2B,EAC3B,6BAA6B,EAC7B,uBAAuB,EACvB,gBAAgB,EAChB,cAAc,EACd,aAAa,EAId,MAAM,UAAU,CAAA;AAqBjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAIrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AASxC;;;;;;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,CA8DnF;AA+OD;;;;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;AAkBrB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,iBAAiB,EAClC,KAAK,EAAE,YAAY,GAClB,IAAI,CAGN;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI,CA0CvG;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,MAAM,GACf,2BAA2B,CAK7B;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAoB9B;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,EACrB,wBAAwB,EAAE,iBAAiB,EAC3C,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC,uBAAuB,CAAC,CAmElC;AAiGD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,SAAS,GAClD,IAAI,CASN;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGtE;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,SAAS,GAClD,IAAI,CAUN;AAuHD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,aAAa,EACrB,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,6BAA6B,GAAG,SAAS,EAChD,MAAM,EAAE,QAAQ,GACf,OAAO,CAAC,OAAO,CAAC,CA2ElB"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/extensions/instrumentation.ts"],"names":[],"mappings":"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"}

package/dist/extensions/instrumentation.js

@@ -123,7 +123,10 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         const requestAttribution = (0, external_internal_js_namespaceObject.withIdentity)(sessionInfo, identity);
         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, canCaptureContextIntent, extra));
-        if (ownership.llmModel) (0, external_model_parameters_js_namespaceObject.setEventModel)(event, (0, external_model_parameters_js_namespaceObject.getModelArgument)(request));
+        if ((0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(data.options.captureModel)) {
+            const resolvedModel = (0, external_model_parameters_js_namespaceObject.resolveModel)(request, ownership.llmModel);
+            (0, external_model_parameters_js_namespaceObject.setEventModel)(event, resolvedModel?.model, resolvedModel?.source);
+        }
         return {
             event,
             requestAttribution

package/dist/extensions/instrumentation.mjs

@@ -1,6 +1,6 @@
 import { getAnalyticsParameterOwnership, stripOwnedAnalyticsArguments } from "./analytics-parameters.mjs";
 import { addContextParameterToTools, getContextDescription, isContextEnabled } from "./context-parameters.mjs";
-import { addModelParameterToTools, getModelArgument, getModelDescription, isCaptureModelEnabled, setEventModel } from "./model-parameters.mjs";
+import { addModelParameterToTools, getModelDescription, isCaptureModelEnabled, resolveModel, setEventModel } from "./model-parameters.mjs";
 import { addConversationIdToTools, canInjectConversationIdPromptBack, injectConversationIdPromptBack, resolveConversationId } from "./conversation-id.mjs";
 import { stampClientIdentity } from "./client-identity.mjs";
 import { stampTransportIdentity } from "./transport-identity.mjs";
@@ -82,7 +82,10 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         const requestAttribution = withIdentity(sessionInfo, identity);
         await applyResolvedMetadata(event, data, request, extra);
         setEventIntent(event, await resolveToolCallIntent(data, request, canCaptureContextIntent, extra));
-        if (ownership.llmModel) setEventModel(event, getModelArgument(request));
+        if (isCaptureModelEnabled(data.options.captureModel)) {
+            const resolvedModel = resolveModel(request, ownership.llmModel);
+            setEventModel(event, resolvedModel?.model, resolvedModel?.source);
+        }
         return {
             event,
             requestAttribution

package/dist/extensions/mcp-payloads.d.ts

@@ -1,4 +1,14 @@
 type JsonRecord = Record<string, unknown>;
+/**
+ * Redacts structured personal identifiers (emails, IP addresses, credit-card
+ * numbers, US SSNs, and phone numbers) from a free-text string. Intended for the
+ * agent-narrated `$mcp_intent` value only — not for structured tool parameters or
+ * responses, where the same shapes are often legitimate data. Horizontal Unicode
+ * spaces are first normalized to an ASCII space so copy-pasted identifiers still
+ * match. Returns a new string; leaves the input's identifiers untouched when
+ * nothing matches.
+ */
+export declare function redactPii(value: string): string;
 export declare function sanitizeCapturedValue(value: unknown): unknown;
 export declare function buildCapturedMcpParameters(request: unknown): JsonRecord;
 export {};

package/dist/extensions/mcp-payloads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-payloads.d.ts","sourceRoot":"","sources":["../../src/extensions/mcp-payloads.ts"],"names":[],"mappings":"AAkBA,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAsCzC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CA0B7D;AA6BD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAiBvE"}
+{"version":3,"file":"mcp-payloads.d.ts","sourceRoot":"","sources":["../../src/extensions/mcp-payloads.ts"],"names":[],"mappings":"AAmEA,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAiGzC;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAU/C;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CA0B7D;AA6BD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAiBvE"}

package/dist/extensions/mcp-payloads.js

@@ -38,6 +38,15 @@ const BASE64_DATA_URL_PAYLOAD_PATTERN = /^[A-Za-z0-9+/_-]+={0,2}$/;
 const SIZE_GATE = 10240;
 const POSTHOG_TOKEN_PATTERN = /\bph[a-z]_[A-Za-z0-9_-]{20,}\b/g;
 const SENSITIVE_KEY_PATTERN = /^(authorization|cookie|set-cookie|x-api-key|api[-_]?key|api[-_]?token|access[-_]?token|refresh[-_]?token|token|password|secret|client[-_]?secret|private[-_]?key)$/i;
+const UNICODE_SPACE_PATTERN = /[\u00A0\u1680\u2000-\u200A\u202F\u205F\u3000]/g;
+const EMAIL_PATTERN = /[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{1,255}\.[A-Za-z]{2,24}/g;
+const IPV4_PATTERN = /\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b/g;
+const IPV6_PATTERN = /\b(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}\b|(?<![\w:])(?:[0-9A-Fa-f]{1,4}:){1,7}:(?![\w:])|(?<![\w:])(?:[0-9A-Fa-f]{1,4}:){1,6}:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4}){0,5}(?![\w])|(?<![\w:])::(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4}){0,6})(?![\w])/g;
+const US_SSN_PATTERN = /\b\d{3}[ .-]\d{2}[ .-]\d{4}\b/g;
+const CREDIT_CARD_CANDIDATE_PATTERN = /\b\d(?:[ ./-]?\d){12,}\b/g;
+const DIGIT_GROUP_PATTERN = /\d+/g;
+const PHONE_NANP_PATTERN = /(?<![\w+])(?:\+?1[ ./-]?)?(?:\(\d{3}\)[ ./-]?|\d{3}[ ./-])\d{3}[ ./-]\d{4}(?![\w])/g;
+const PHONE_INTL_PATTERN = /(?<!\w)\+\d{1,3}(?:[ ./()-]{0,2}\d){7,13}(?![\w])/g;
 function isRecord(value) {
     return !!value && 'object' == typeof value && !Array.isArray(value);
 }
@@ -59,6 +68,58 @@ function sanitizeString(value) {
     if (value.length >= SIZE_GATE && (BASE64_PATTERN.test(value) || isBase64DataUrl(value) || BASE64URL_SPECIFIC_CHAR_PATTERN.test(value) && BASE64URL_PATTERN.test(value))) return BINARY_REDACTED_VALUE;
     return value.replace(POSTHOG_TOKEN_PATTERN, REDACTED_VALUE);
 }
+function passesLuhn(digits) {
+    let sum = 0;
+    let double = false;
+    for(let index = digits.length - 1; index >= 0; index--){
+        let digit = digits.charCodeAt(index) - 48;
+        if (digit < 0 || digit > 9) return false;
+        if (double) {
+            digit *= 2;
+            if (digit > 9) digit -= 9;
+        }
+        sum += digit;
+        double = !double;
+    }
+    return sum % 10 === 0;
+}
+function redactCardInMatch(match) {
+    const groups = [];
+    for(let m = DIGIT_GROUP_PATTERN.exec(match); null !== m; m = DIGIT_GROUP_PATTERN.exec(match))groups.push({
+        digits: m[0],
+        start: m.index,
+        end: m.index + m[0].length
+    });
+    let output = '';
+    let cursor = 0;
+    let first = 0;
+    while(first < groups.length){
+        let digits = '';
+        let matchedLast = -1;
+        for(let last = first; last < groups.length; last++){
+            digits += groups[last].digits;
+            if (digits.length > 19) break;
+            if (digits.length >= 13 && passesLuhn(digits)) matchedLast = last;
+        }
+        if (matchedLast >= 0) {
+            output += match.slice(cursor, groups[first].start) + REDACTED_VALUE;
+            cursor = groups[matchedLast].end;
+            first = matchedLast + 1;
+        } else first++;
+    }
+    return output + match.slice(cursor);
+}
+function redactPii(value) {
+    let result = value.replace(UNICODE_SPACE_PATTERN, ' ');
+    result = result.replace(EMAIL_PATTERN, REDACTED_VALUE);
+    result = result.replace(IPV4_PATTERN, REDACTED_VALUE);
+    result = result.replace(IPV6_PATTERN, REDACTED_VALUE);
+    result = result.replace(CREDIT_CARD_CANDIDATE_PATTERN, redactCardInMatch);
+    result = result.replace(US_SSN_PATTERN, REDACTED_VALUE);
+    result = result.replace(PHONE_NANP_PATTERN, REDACTED_VALUE);
+    result = result.replace(PHONE_INTL_PATTERN, REDACTED_VALUE);
+    return result;
+}
 function sanitizeCapturedValue(value) {
     if (null == value) return value;
     if ('string' == typeof value) return sanitizeString(value);
@@ -98,12 +159,15 @@ function buildCapturedMcpParameters(request) {
 }
 __webpack_require__.d(__webpack_exports__, {
     buildCapturedMcpParameters: ()=>buildCapturedMcpParameters,
+    redactPii: ()=>redactPii,
     sanitizeCapturedValue: ()=>sanitizeCapturedValue
 });
 exports.buildCapturedMcpParameters = __webpack_exports__.buildCapturedMcpParameters;
+exports.redactPii = __webpack_exports__.redactPii;
 exports.sanitizeCapturedValue = __webpack_exports__.sanitizeCapturedValue;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "buildCapturedMcpParameters",
+    "redactPii",
     "sanitizeCapturedValue"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/extensions/mcp-payloads.mjs

@@ -9,6 +9,15 @@ const BASE64_DATA_URL_PAYLOAD_PATTERN = /^[A-Za-z0-9+/_-]+={0,2}$/;
 const SIZE_GATE = 10240;
 const POSTHOG_TOKEN_PATTERN = /\bph[a-z]_[A-Za-z0-9_-]{20,}\b/g;
 const SENSITIVE_KEY_PATTERN = /^(authorization|cookie|set-cookie|x-api-key|api[-_]?key|api[-_]?token|access[-_]?token|refresh[-_]?token|token|password|secret|client[-_]?secret|private[-_]?key)$/i;
+const UNICODE_SPACE_PATTERN = /[\u00A0\u1680\u2000-\u200A\u202F\u205F\u3000]/g;
+const EMAIL_PATTERN = /[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{1,255}\.[A-Za-z]{2,24}/g;
+const IPV4_PATTERN = /\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b/g;
+const IPV6_PATTERN = /\b(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}\b|(?<![\w:])(?:[0-9A-Fa-f]{1,4}:){1,7}:(?![\w:])|(?<![\w:])(?:[0-9A-Fa-f]{1,4}:){1,6}:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4}){0,5}(?![\w])|(?<![\w:])::(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4}){0,6})(?![\w])/g;
+const US_SSN_PATTERN = /\b\d{3}[ .-]\d{2}[ .-]\d{4}\b/g;
+const CREDIT_CARD_CANDIDATE_PATTERN = /\b\d(?:[ ./-]?\d){12,}\b/g;
+const DIGIT_GROUP_PATTERN = /\d+/g;
+const PHONE_NANP_PATTERN = /(?<![\w+])(?:\+?1[ ./-]?)?(?:\(\d{3}\)[ ./-]?|\d{3}[ ./-])\d{3}[ ./-]\d{4}(?![\w])/g;
+const PHONE_INTL_PATTERN = /(?<!\w)\+\d{1,3}(?:[ ./()-]{0,2}\d){7,13}(?![\w])/g;
 function isRecord(value) {
     return !!value && 'object' == typeof value && !Array.isArray(value);
 }
@@ -30,6 +39,58 @@ function sanitizeString(value) {
     if (value.length >= SIZE_GATE && (BASE64_PATTERN.test(value) || isBase64DataUrl(value) || BASE64URL_SPECIFIC_CHAR_PATTERN.test(value) && BASE64URL_PATTERN.test(value))) return BINARY_REDACTED_VALUE;
     return value.replace(POSTHOG_TOKEN_PATTERN, REDACTED_VALUE);
 }
+function passesLuhn(digits) {
+    let sum = 0;
+    let double = false;
+    for(let index = digits.length - 1; index >= 0; index--){
+        let digit = digits.charCodeAt(index) - 48;
+        if (digit < 0 || digit > 9) return false;
+        if (double) {
+            digit *= 2;
+            if (digit > 9) digit -= 9;
+        }
+        sum += digit;
+        double = !double;
+    }
+    return sum % 10 === 0;
+}
+function redactCardInMatch(match) {
+    const groups = [];
+    for(let m = DIGIT_GROUP_PATTERN.exec(match); null !== m; m = DIGIT_GROUP_PATTERN.exec(match))groups.push({
+        digits: m[0],
+        start: m.index,
+        end: m.index + m[0].length
+    });
+    let output = '';
+    let cursor = 0;
+    let first = 0;
+    while(first < groups.length){
+        let digits = '';
+        let matchedLast = -1;
+        for(let last = first; last < groups.length; last++){
+            digits += groups[last].digits;
+            if (digits.length > 19) break;
+            if (digits.length >= 13 && passesLuhn(digits)) matchedLast = last;
+        }
+        if (matchedLast >= 0) {
+            output += match.slice(cursor, groups[first].start) + REDACTED_VALUE;
+            cursor = groups[matchedLast].end;
+            first = matchedLast + 1;
+        } else first++;
+    }
+    return output + match.slice(cursor);
+}
+function redactPii(value) {
+    let result = value.replace(UNICODE_SPACE_PATTERN, ' ');
+    result = result.replace(EMAIL_PATTERN, REDACTED_VALUE);
+    result = result.replace(IPV4_PATTERN, REDACTED_VALUE);
+    result = result.replace(IPV6_PATTERN, REDACTED_VALUE);
+    result = result.replace(CREDIT_CARD_CANDIDATE_PATTERN, redactCardInMatch);
+    result = result.replace(US_SSN_PATTERN, REDACTED_VALUE);
+    result = result.replace(PHONE_NANP_PATTERN, REDACTED_VALUE);
+    result = result.replace(PHONE_INTL_PATTERN, REDACTED_VALUE);
+    return result;
+}
 function sanitizeCapturedValue(value) {
     if (null == value) return value;
     if ('string' == typeof value) return sanitizeString(value);
@@ -67,4 +128,4 @@ function buildCapturedMcpParameters(request) {
         request: capturedRequest
     };
 }
-export { buildCapturedMcpParameters, sanitizeCapturedValue };
+export { buildCapturedMcpParameters, redactPii, sanitizeCapturedValue };

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

@@ -1,22 +1,19 @@
-import type { MCPAnalyticsOptions, MCPRequestLike, McpEvent } from '../types';
+import type { MCPAnalyticsModelSource, MCPAnalyticsOptions, MCPRequestLike, McpEvent } from '../types';
 import { type AnalyticsInjectableJsonSchema } from './analytics-parameters';
 import { type LoggerFn } from './logger';
 /**
- * Self-reported model capture (`captureModel`).
+ * Model capture (`captureModel`).
  *
- * MCP keeps servers deliberately model-ignorant: the wire carries client
- * name/version and protocol version, never the LLM behind the client, and no
- * spec revision changes that. The one place the information exists on the
- * server side of the connection is the agent itself — harnesses inject the
- * model id into the system prompt, so the agent can state it the same way it
- * states its intent through the `context` parameter.
+ * MCP does not standardize model identity. Some clients expose it through
+ * vendor metadata, while other harnesses inject the model id into the system
+ * prompt so the agent can state it like intent through the `context` parameter.
  *
  * This module injects a required `llm_model` string parameter into every tool
  * (mirroring `context-parameters.ts`), strips it before the tool runs, and
- * captures it as `$mcp_llm_model` with `$mcp_llm_model_source = "self_reported"`.
- * The source property is deliberate: like `clientInfo` in the MCP spec, the
- * value is self-reported and unverified — right for degradation analytics
- * ("does our MCP get worse on model X?"), never for billing or security.
+ * captures the best available value as `$mcp_llm_model`. Client metadata wins
+ * over self-report, and `$mcp_llm_model_source` preserves that provenance.
+ * Both sources are unverified — right for degradation analytics ("does our MCP
+ * get worse on model X?"), never for billing or security.
  *
  * Reasoning effort is deliberately NOT captured: it never crosses the wire,
  * and models cannot reliably self-report it (harnesses apply it as a sampling
@@ -44,5 +41,15 @@ export declare function addModelParameterToTools<TTool extends ModelInjectableTo
  * not become a property value queries would group by.
  */
 export declare function getModelArgument(request: MCPRequestLike): string | undefined;
-export declare function setEventModel(event: McpEvent, model: string | undefined): void;
+export interface ResolvedModel {
+    model: string;
+    source: MCPAnalyticsModelSource;
+}
+/**
+ * Resolves model identity from sources visible to an MCP server. The Codex
+ * request metadata is host-generated and therefore more reliable than a model
+ * filling an injected argument, but remains unverified client input.
+ */
+export declare function resolveModel(request: MCPRequestLike, allowSelfReported: boolean): ResolvedModel | undefined;
+export declare function setEventModel(event: McpEvent, model: string | undefined, source?: MCPAnalyticsModelSource): void;
 //# sourceMappingURL=model-parameters.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"model-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/model-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC7E,OAAO,EAA+B,KAAK,6BAA6B,EAAE,MAAM,wBAAwB,CAAA;AAExG,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,OAAO,CAEhG;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,MAAM,GAAG,SAAS,CAEzG;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,mBAAmB,EACvE,IAAI,EAAE,KAAK,EACX,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,GAAE,QAAc,GACrB,KAAK,CAQP;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,mBAAmB,EACxE,KAAK,EAAE,KAAK,EAAE,EACd,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAET;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAE5E;AAaD,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO9E"}
+{"version":3,"file":"model-parameters.d.ts","sourceRoot":"","sources":["../../src/extensions/model-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACtG,OAAO,EAA+B,KAAK,6BAA6B,EAAE,MAAM,wBAAwB,CAAA;AAExG,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,6BAA6B,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,OAAO,CAEhG;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,MAAM,GAAG,SAAS,CAEzG;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,mBAAmB,EACvE,IAAI,EAAE,KAAK,EACX,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,GAAE,QAAc,GACrB,KAAK,CAQP;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,mBAAmB,EACxE,KAAK,EAAE,KAAK,EAAE,EACd,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAET;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAE5E;AAID,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,uBAAuB,CAAA;CAChC;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAiB3G;AAiBD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,GAAE,uBAAyC,GAChD,IAAI,CAON"}

package/dist/extensions/model-parameters.js

@@ -33,6 +33,7 @@ __webpack_require__.d(__webpack_exports__, {
     getModelArgument: ()=>getModelArgument,
     getModelDescription: ()=>getModelDescription,
     isCaptureModelEnabled: ()=>isCaptureModelEnabled,
+    resolveModel: ()=>resolveModel,
     setEventModel: ()=>setEventModel
 });
 const external_analytics_parameters_js_namespaceObject = require("./analytics-parameters.js");
@@ -53,23 +54,45 @@ function addModelParameterToTools(tools, modelDescriptionOverride, logger = exte
 function getModelArgument(request) {
     return normalizeModel(request.params?.arguments?.llm_model);
 }
+const CODEX_TURN_METADATA_KEY = 'x-codex-turn-metadata';
+function resolveModel(request, allowSelfReported) {
+    const codexMetadata = request.params?._meta?.[CODEX_TURN_METADATA_KEY];
+    if (isRecord(codexMetadata) && Object.prototype.hasOwnProperty.call(codexMetadata, 'model')) {
+        const model = normalizeModel(codexMetadata.model);
+        if (model) return {
+            model,
+            source: 'client_metadata'
+        };
+    }
+    if (allowSelfReported) {
+        const model = getModelArgument(request);
+        if (model) return {
+            model,
+            source: 'self_reported'
+        };
+    }
+}
+function isRecord(value) {
+    return 'object' == typeof value && null !== value && !Array.isArray(value);
+}
 function normalizeModel(model) {
     if ('string' != typeof model) return;
     const trimmed = model.trim();
     if (!trimmed || 'unknown' === trimmed.toLowerCase()) return;
     return trimmed;
 }
-function setEventModel(event, model) {
+function setEventModel(event, model, source = 'self_reported') {
     const normalizedModel = normalizeModel(model);
     if (!normalizedModel) return;
     event.llmModel = normalizedModel;
-    event.llmModelSource = 'self_reported';
+    event.llmModelSource = source;
 }
 exports.addModelParameterToTool = __webpack_exports__.addModelParameterToTool;
 exports.addModelParameterToTools = __webpack_exports__.addModelParameterToTools;
 exports.getModelArgument = __webpack_exports__.getModelArgument;
 exports.getModelDescription = __webpack_exports__.getModelDescription;
 exports.isCaptureModelEnabled = __webpack_exports__.isCaptureModelEnabled;
+exports.resolveModel = __webpack_exports__.resolveModel;
 exports.setEventModel = __webpack_exports__.setEventModel;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "addModelParameterToTool",
@@ -77,6 +100,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "getModelArgument",
     "getModelDescription",
     "isCaptureModelEnabled",
+    "resolveModel",
     "setEventModel"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/extensions/model-parameters.mjs

@@ -16,16 +16,37 @@ function addModelParameterToTools(tools, modelDescriptionOverride, logger = log)
 function getModelArgument(request) {
     return normalizeModel(request.params?.arguments?.llm_model);
 }
+const CODEX_TURN_METADATA_KEY = 'x-codex-turn-metadata';
+function resolveModel(request, allowSelfReported) {
+    const codexMetadata = request.params?._meta?.[CODEX_TURN_METADATA_KEY];
+    if (isRecord(codexMetadata) && Object.prototype.hasOwnProperty.call(codexMetadata, 'model')) {
+        const model = normalizeModel(codexMetadata.model);
+        if (model) return {
+            model,
+            source: 'client_metadata'
+        };
+    }
+    if (allowSelfReported) {
+        const model = getModelArgument(request);
+        if (model) return {
+            model,
+            source: 'self_reported'
+        };
+    }
+}
+function isRecord(value) {
+    return 'object' == typeof value && null !== value && !Array.isArray(value);
+}
 function normalizeModel(model) {
     if ('string' != typeof model) return;
     const trimmed = model.trim();
     if (!trimmed || 'unknown' === trimmed.toLowerCase()) return;
     return trimmed;
 }
-function setEventModel(event, model) {
+function setEventModel(event, model, source = 'self_reported') {
     const normalizedModel = normalizeModel(model);
     if (!normalizedModel) return;
     event.llmModel = normalizedModel;
-    event.llmModelSource = 'self_reported';
+    event.llmModelSource = source;
 }
-export { addModelParameterToTool, addModelParameterToTools, getModelArgument, getModelDescription, isCaptureModelEnabled, setEventModel };
+export { addModelParameterToTool, addModelParameterToTools, getModelArgument, getModelDescription, isCaptureModelEnabled, resolveModel, setEventModel };

package/dist/extensions/posthog-mcp.d.ts

@@ -14,8 +14,8 @@ export interface PostHogMCPOptions extends PostHogOptions {
      */
     missingCapabilityToolName?: string;
     /**
-     * Inject a required `llm_model` argument into advertised tools and capture
-     * the agent's self-reported value. Off by default.
+     * Capture the calling model from recognized client metadata, with an injected
+     * `llm_model` argument as fallback. Off by default.
      */
     captureModel?: MCPAnalyticsOptions['captureModel'];
 }
@@ -112,7 +112,7 @@ export declare class PostHogMCP extends PostHog {
      * @example
      * ```ts
      * const { intent, intentSource, llmModel, llmModelSource, args, isMissingCapability } =
-     *   posthog.prepareToolCall(name, rawArgs)
+     *   posthog.prepareToolCall(name, rawArgs, { requestMeta: request.params?._meta })
      * if (isMissingCapability) {
      *   posthog.captureMissingCapability({ context: intent, llmModel, llmModelSource, ...identity })
      *   return getMoreToolsResult()

package/dist/extensions/posthog-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"posthog-mcp.d.ts","sourceRoot":"","sources":["../../src/extensions/posthog-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAE3D,OAAO,KAAK,EACV,qBAAqB,EAErB,mBAAmB,EAGnB,4BAA4B,EAC5B,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,UAAU,CAAA;AAEjB,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAA;AAgB7B;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAA;CACnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,qBAAa,UAAW,SAAQ,OAAO;;gBASzB,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB;IAO3D,8FAA8F;IAC9F,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAqBhD,iEAAiE;IACjE,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAUpD;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,oBAAoB,GAAG,IAAI;IAclD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,eAAe,CAAC,KAAK,SAAS,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,GAAE,sBAA2B,GAAG,KAAK,EAAE;IAiCnH;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,GAAE,sBAA2B,GACnC,gBAAgB;IA0BnB;;;;OAIG;IACH,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,IAAI;CAsBnE"}
+{"version":3,"file":"posthog-mcp.d.ts","sourceRoot":"","sources":["../../src/extensions/posthog-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAE3D,OAAO,KAAK,EACV,qBAAqB,EAErB,mBAAmB,EAGnB,4BAA4B,EAC5B,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,UAAU,CAAA;AAEjB,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAA;AAgB7B;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAA;CACnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,qBAAa,UAAW,SAAQ,OAAO;;gBASzB,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB;IAO3D,8FAA8F;IAC9F,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAkBhD,iEAAiE;IACjE,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAUpD;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,oBAAoB,GAAG,IAAI;IAclD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,eAAe,CAAC,KAAK,SAAS,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,GAAE,sBAA2B,GAAG,KAAK,EAAE;IAiCnH;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,GAAE,sBAA2B,GACnC,gBAAgB;IA4BnB;;;;OAIG;IACH,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,IAAI;CAmBnE"}

package/dist/extensions/posthog-mcp.js

@@ -63,8 +63,7 @@ class PostHogMCP extends external_posthog_node_namespaceObject.PostHog {
         event.isError = data.isError;
         event.errorType = data.errorType;
         applyIntent(event, data.intent, data.intentSource);
-        (0, external_model_parameters_js_namespaceObject.setEventModel)(event, data.llmModel);
-        if (event.llmModel && data.llmModelSource) event.llmModelSource = data.llmModelSource;
+        (0, external_model_parameters_js_namespaceObject.setEventModel)(event, data.llmModel, data.llmModelSource);
         if (data.isError) event.error = (0, external_exceptions_js_namespaceObject.captureException)(data.error ?? `Tool ${data.toolName} returned an error`);
         this.#emit(event);
     }
@@ -115,17 +114,18 @@ class PostHogMCP extends external_posthog_node_namespaceObject.PostHog {
         const rawContext = args?.context;
         const intent = 'string' == typeof rawContext && rawContext.trim() ? rawContext.trim() : void 0;
         const ownsModel = (0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(this.#captureModel) && (options.originalTool ? (0, external_analytics_parameters_js_namespaceObject.analyticsOwnsParameter)(options.originalTool.inputSchema, 'llm_model') : true === this.#modelParameterOwnership.get(name));
-        const llmModel = ownsModel ? (0, external_model_parameters_js_namespaceObject.getModelArgument)({
+        const resolvedModel = (0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(this.#captureModel) ? (0, external_model_parameters_js_namespaceObject.resolveModel)({
             params: {
-                arguments: args
+                arguments: args,
+                _meta: options.requestMeta
             }
-        }) : void 0;
+        }, ownsModel) : void 0;
         const strippedArgs = stripContext(args);
         return {
             intent,
             intentSource: intent ? 'context_parameter' : void 0,
-            llmModel,
-            llmModelSource: llmModel ? 'self_reported' : void 0,
+            llmModel: resolvedModel?.model,
+            llmModelSource: resolvedModel?.source,
             args: ownsModel ? (0, external_analytics_parameters_js_namespaceObject.stripOwnedAnalyticsArguments)(strippedArgs, {
                 context: false,
                 conversationId: false,
@@ -139,8 +139,7 @@ class PostHogMCP extends external_posthog_node_namespaceObject.PostHog {
         event.resourceName = this.#missingCapabilityToolName;
         event.parameters = data.parameters;
         applyIntent(event, data.context, 'context_parameter');
-        (0, external_model_parameters_js_namespaceObject.setEventModel)(event, data.llmModel);
-        if (event.llmModel && data.llmModelSource) event.llmModelSource = data.llmModelSource;
+        (0, external_model_parameters_js_namespaceObject.setEventModel)(event, data.llmModel, data.llmModelSource);
         this.#emit(event);
     }
     #emit(event) {