@posthog/mcp 0.16.4 → 0.17.0

package/README.md

@@ -80,7 +80,7 @@ Protocol revision is a property of each **request**, not of the server: a v2 ser
 
 - **On `2026-07-28`** there is no `initialize` and no session header — the revision removed
   protocol-level sessions, and this SDK will not mint one. Session correlation therefore comes from
-  `enableConversationId`, which is **opt-in**. Without it every request is its own `$session_id`.
+  `enableConversationId`, which is **on by default**. Without it every request is its own `$session_id`.
   The `get_more_tools` and `send_feedback` virtual tools also use this handle, including calls handled
   by a fresh server instance.
 - **On `2025-11-25`**, the session id and the client's name and version are exchanged once at
@@ -160,9 +160,31 @@ over-redacting ordinary prose. It also applies only to `$mcp_intent`: structured
 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.
 
+### Defaults and opt-outs
+
+On fresh low-level instances, tools with an `outputSchema` deliver new handles through `content` only. Clients that consume only `structuredContent` will not echo those handles, so correlation is not guaranteed for that combination. Unknown ownership can also cause a prompt-back block to be appended for a schema that discovery would not extend; disable `enableConversationId` if that contract is unsuitable.
+
+A valid echoed conversation handle takes precedence over transport sessions. A request that already carries a transport session or a PostHog session token does not mint a new handle or append a prompt-back block. Requests carrying neither use the conversation fallback.
+
+Intent, model capture, conversation correlation, and exception capture are enabled by default.
+Missing-capability reporting and feedback collection remain disabled.
+
+```ts
+instrument(server, posthog, { captureModel: false, enableConversationId: false })
+```
+
+Model capture adds a required `llm_model` argument to compatible tool schemas. Dispatch never
+enforces it, so servers keep working; strict-schema clients see the new field. Set
+`captureModel: false` to leave schemas untouched. Conversation correlation adds an optional
+`conversation_id` argument and returns a handle in eligible tool results. Clients must echo that
+handle to group later calls; calls without it mint new handles. Set `enableConversationId: false`
+to retain transport-based session grouping and unchanged response content. Custom `PostHogMCP`
+dispatchers enable model capture by default, but continue to supply their own session IDs.
+The reasoning behind these defaults is in [ADR-0013](./docs/adr/0013-analytics-capture-is-on-by-default.md).
+
 ### What `$mcp_llm_model` records, and when it stays empty
 
-`captureModel` is **off** by default. Turn it on and the SDK records the best model id visible to the
+`captureModel` is **on** by default. 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`.
 
@@ -173,32 +195,32 @@ Missing, blank, and `unknown` values are recorded as nothing.
 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`, 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:
+Like `context`, self-report follows the ownership rule of ADR-0011: reading `llm_model` fails
+open where the SDK cannot tell who declared it, stripping it requires proof that the SDK did:
 
 - `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.
 - The `get_more_tools` virtual tool works on any instance and on either server type: the SDK writes
   that descriptor itself, so what it declares is known without a listing.
-- Instrumenting a low-level `Server` learns ownership of **your** tools while serving `tools/list`.
-  On a server that builds a fresh instance per HTTP request — `createMcpHandler`, or
-  `@rekog/mcp-nest` in its stateless mode — the instance handling a `tools/call` never served one,
-  so for those tools it neither strips `llm_model` nor records `$mcp_llm_model`. Nothing breaks and
-  no wrong value is stored; the property is simply absent while agents still pay a token for the
-  extra field.
+- Instrumenting a low-level `Server` learns ownership while serving `tools/list`. A fresh instance
+  that never served one — `createMcpHandler`, or `@rekog/mcp-nest` in its stateless mode — has no
+  answer, so it records `llm_model` as the self-reported model and strips nothing. A tool that
+  declares its own `llm_model` on such an instance is therefore recorded under `$mcp_llm_model`
+  until a listing says otherwise; `captureModel: false` or dropping the property in `beforeSend`
+  are the escapes. The SDK never replays your listing handler on the call path to find out.
 
 As with `context`, what matters is instance lifetime rather than statelessness: a transport-stateless
 server (`sessionIdGenerator: undefined`) that keeps one long-lived server object learns ownership
 from the first `tools/list` and keeps it.
 
-For a custom dispatcher, enable the same option on `PostHogMCP`. Its `prepareToolList()` helper
+For a custom dispatcher, `PostHogMCP` enables the same option by default. Its `prepareToolList()` helper
 injects the field and records ownership by tool name; `prepareToolCall()` returns `llmModel` and
 `llmModelSource` while removing the SDK-owned argument before dispatch. Pass both fields to
 `captureToolCall()`. Pass the original tool descriptor on each call so this also works when
 `tools/list` and `tools/call` reach different server replicas:
 
 ```ts
-const posthog = new PostHogMCP(process.env.POSTHOG_PROJECT_TOKEN, { captureModel: true })
+const posthog = new PostHogMCP(process.env.POSTHOG_PROJECT_TOKEN)
 
 const tools = posthog.prepareToolList(serverTools)
 const originalTool = serverTools.find((tool) => tool.name === toolName)

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

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/extensions/instrumentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/extensions/instrumentation.ts"],"names":[],"mappings":"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"}

package/dist/extensions/instrumentation.js

@@ -64,9 +64,9 @@ async function captureToolCall(params) {
     const resolvedEventType = eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall;
     const isVirtualAnalyticsTool = resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpMissingCapability || resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpFeedback;
     const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership, isVirtualAnalyticsTool);
-    const canCaptureContextIntent = !isVirtualAnalyticsTool && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && (ownership.context || !ownership.contextOwnershipKnown);
-    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(ownership.conversationId, request.params?.arguments);
-    const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
+    const canCaptureContextIntent = ownership.read.context;
+    const conversation = resolveToolConversation(ownership.read.conversationId, request.params?.arguments, extra);
+    const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership.strip);
     const startTime = new Date();
     const preparedEvent = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType, canCaptureContextIntent);
     if (preparedEvent && explicitContextIntent) (0, external_intent_js_namespaceObject.setExplicitContextIntent)(preparedEvent.event, explicitContextIntent);
@@ -86,15 +86,39 @@ async function captureToolCall(params) {
     publishSuccessfulToolEvent(server, preparedEvent, finalResult, startTime, data.logger, takeCapturedError, result);
     return finalResult;
 }
+function resolveToolConversation(enabled, args, extra) {
+    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(enabled, args);
+    if (!conversation.minted) return conversation;
+    const carriedSession = extra?.sessionId || (0, external_session_token_js_namespaceObject.decodeSessionId)((0, external_session_token_js_namespaceObject.readMcpSessionHeader)((0, external_request_headers_js_namespaceObject.getRequestHeaders)(extra)));
+    return carriedSession ? {
+        minted: false,
+        conversationId: void 0
+    } : conversation;
+}
 function getActiveAnalyticsParameterOwnership(data, toolName, override, isVirtualAnalyticsTool) {
     const listed = toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0;
     const ownership = override ?? listed;
+    const enabled = {
+        context: !isVirtualAnalyticsTool && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context),
+        conversationId: true === data.options.enableConversationId,
+        llmModel: (0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(data.options.captureModel)
+    };
+    return {
+        strip: enabledArgumentOwnership(enabled, ownership, false),
+        read: enabledArgumentOwnership(enabled, ownership, true),
+        outputInstructions: enabled.conversationId && listed?.outputInstructions === true
+    };
+}
+function enabledArgumentOwnership(enabled, ownership, whenUnknown) {
+    const resolved = ownership ?? {
+        context: whenUnknown,
+        conversationId: whenUnknown,
+        llmModel: whenUnknown
+    };
     return {
-        contextOwnershipKnown: void 0 !== ownership,
-        context: !isVirtualAnalyticsTool && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && ownership?.context === true,
-        conversationId: true === data.options.enableConversationId && ownership?.conversationId === true,
-        llmModel: (0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(data.options.captureModel) && ownership?.llmModel === true,
-        outputInstructions: true === data.options.enableConversationId && listed?.outputInstructions === true
+        context: enabled.context && resolved.context,
+        conversationId: enabled.conversationId && resolved.conversationId,
+        llmModel: enabled.llmModel && resolved.llmModel
     };
 }
 function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
@@ -131,7 +155,7 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         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 ((0, external_model_parameters_js_namespaceObject.isCaptureModelEnabled)(data.options.captureModel)) {
-            const resolvedModel = (0, external_model_parameters_js_namespaceObject.resolveModel)(request, ownership.llmModel);
+            const resolvedModel = (0, external_model_parameters_js_namespaceObject.resolveModel)(request, ownership.read.llmModel);
             (0, external_model_parameters_js_namespaceObject.setEventModel)(event, resolvedModel?.model, resolvedModel?.source);
         }
         return {

package/dist/extensions/instrumentation.mjs

@@ -14,7 +14,7 @@ import { buildCapturedMcpParameters } from "./mcp-payloads.mjs";
 import { readRequestHandlerMethod } from "./mcp-sdk-compat.mjs";
 import { getRequestHeaders } from "./request-headers.mjs";
 import { getSessionId, getSessionInfo, isModernEraRequest, newSessionId } from "./session.mjs";
-import { encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from "./session-token.mjs";
+import { decodeSessionId, encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from "./session-token.mjs";
 import { SEND_FEEDBACK_TOOL_NAME, getFeedbackToolDescriptor, resolveCollectFeedbackOptions } from "./feedback.mjs";
 import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from "./tools.mjs";
 import { applyResolvedMetadata, isToolResultError } from "./tracing-helpers.mjs";
@@ -23,9 +23,9 @@ async function captureToolCall(params) {
     const resolvedEventType = eventType ?? MCPAnalyticsEventType.mcpToolsCall;
     const isVirtualAnalyticsTool = resolvedEventType === MCPAnalyticsEventType.mcpMissingCapability || resolvedEventType === MCPAnalyticsEventType.mcpFeedback;
     const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership, isVirtualAnalyticsTool);
-    const canCaptureContextIntent = !isVirtualAnalyticsTool && isContextEnabled(data.options.context) && (ownership.context || !ownership.contextOwnershipKnown);
-    const conversation = resolveConversationId(ownership.conversationId, request.params?.arguments);
-    const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
+    const canCaptureContextIntent = ownership.read.context;
+    const conversation = resolveToolConversation(ownership.read.conversationId, request.params?.arguments, extra);
+    const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership.strip);
     const startTime = new Date();
     const preparedEvent = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType, canCaptureContextIntent);
     if (preparedEvent && explicitContextIntent) setExplicitContextIntent(preparedEvent.event, explicitContextIntent);
@@ -45,15 +45,39 @@ async function captureToolCall(params) {
     publishSuccessfulToolEvent(server, preparedEvent, finalResult, startTime, data.logger, takeCapturedError, result);
     return finalResult;
 }
+function resolveToolConversation(enabled, args, extra) {
+    const conversation = resolveConversationId(enabled, args);
+    if (!conversation.minted) return conversation;
+    const carriedSession = extra?.sessionId || decodeSessionId(readMcpSessionHeader(getRequestHeaders(extra)));
+    return carriedSession ? {
+        minted: false,
+        conversationId: void 0
+    } : conversation;
+}
 function getActiveAnalyticsParameterOwnership(data, toolName, override, isVirtualAnalyticsTool) {
     const listed = toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0;
     const ownership = override ?? listed;
+    const enabled = {
+        context: !isVirtualAnalyticsTool && isContextEnabled(data.options.context),
+        conversationId: true === data.options.enableConversationId,
+        llmModel: isCaptureModelEnabled(data.options.captureModel)
+    };
+    return {
+        strip: enabledArgumentOwnership(enabled, ownership, false),
+        read: enabledArgumentOwnership(enabled, ownership, true),
+        outputInstructions: enabled.conversationId && listed?.outputInstructions === true
+    };
+}
+function enabledArgumentOwnership(enabled, ownership, whenUnknown) {
+    const resolved = ownership ?? {
+        context: whenUnknown,
+        conversationId: whenUnknown,
+        llmModel: whenUnknown
+    };
     return {
-        contextOwnershipKnown: void 0 !== ownership,
-        context: !isVirtualAnalyticsTool && isContextEnabled(data.options.context) && ownership?.context === true,
-        conversationId: true === data.options.enableConversationId && ownership?.conversationId === true,
-        llmModel: isCaptureModelEnabled(data.options.captureModel) && ownership?.llmModel === true,
-        outputInstructions: true === data.options.enableConversationId && listed?.outputInstructions === true
+        context: enabled.context && resolved.context,
+        conversationId: enabled.conversationId && resolved.conversationId,
+        llmModel: enabled.llmModel && resolved.llmModel
     };
 }
 function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
@@ -90,7 +114,7 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         await applyResolvedMetadata(event, data, request, extra);
         setEventIntent(event, await resolveToolCallIntent(data, request, canCaptureContextIntent, extra));
         if (isCaptureModelEnabled(data.options.captureModel)) {
-            const resolvedModel = resolveModel(request, ownership.llmModel);
+            const resolvedModel = resolveModel(request, ownership.read.llmModel);
             setEventModel(event, resolvedModel?.model, resolvedModel?.source);
         }
         return {

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

@@ -24,7 +24,7 @@ export interface ModelInjectableTool {
     name?: string;
     [key: string]: unknown;
 }
-/** Unlike `context`, model capture is opt-in: off unless explicitly enabled. */
+/** Model capture is enabled unless explicitly disabled. */
 export declare function isCaptureModelEnabled(captureModel: MCPAnalyticsOptions['captureModel']): boolean;
 export declare function getModelDescription(captureModel: MCPAnalyticsOptions['captureModel']): string | undefined;
 /**

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,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"}
+{"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,2DAA2D;AAC3D,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,OAAO,CAIhG;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

@@ -40,7 +40,7 @@ const external_analytics_parameters_js_namespaceObject = require("./analytics-pa
 const external_constants_js_namespaceObject = require("./constants.js");
 const external_logger_js_namespaceObject = require("./logger.js");
 function isCaptureModelEnabled(captureModel) {
-    return true === captureModel || 'object' == typeof captureModel && null !== captureModel;
+    return void 0 === captureModel || true === captureModel || 'object' == typeof captureModel && null !== captureModel;
 }
 function getModelDescription(captureModel) {
     return 'object' == typeof captureModel && null !== captureModel ? captureModel.description : void 0;

package/dist/extensions/model-parameters.mjs

@@ -2,7 +2,7 @@ import { addAnalyticsParameterToTool } from "./analytics-parameters.mjs";
 import { DEFAULT_MODEL_PARAMETER_DESCRIPTION } from "./constants.mjs";
 import { log } from "./logger.mjs";
 function isCaptureModelEnabled(captureModel) {
-    return true === captureModel || 'object' == typeof captureModel && null !== captureModel;
+    return void 0 === captureModel || true === captureModel || 'object' == typeof captureModel && null !== captureModel;
 }
 function getModelDescription(captureModel) {
     return 'object' == typeof captureModel && null !== captureModel ? captureModel.description : void 0;

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

@@ -26,7 +26,7 @@ export interface PostHogMCPOptions extends PostHogOptions {
     collectFeedback?: CollectFeedbackConfig;
     /**
      * Capture the calling model from recognized client metadata, with an injected
-     * `llm_model` argument as fallback. Off by default.
+     * `llm_model` argument as fallback. On by default; `false` disables it.
      */
     captureModel?: MCPAnalyticsOptions['captureModel'];
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAQ3C,OAAO,EAAE,6BAA6B,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAIlG,OAAO,KAAK,EAGV,YAAY,EAEZ,mBAAmB,EAGpB,MAAM,SAAS,CAAA;AAEhB;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iBAAS,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,mBAAwB,GAAG,YAAY,CA4CtG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAS,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAKjH;AAwFD,OAAO,EAAE,6BAA6B,EAAE,YAAY,EAAE,CAAA;AAItD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,KAAK,mBAAmB,GACzB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,wBAAwB,CAAA;AAG/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAI/C,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAC3D,YAAY,EACV,mBAAmB,EACnB,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,EAChB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,4BAA4B,EAC5B,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,GACb,MAAM,SAAS,CAAA;AAChB,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAQ3C,OAAO,EAAE,6BAA6B,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAIlG,OAAO,KAAK,EAGV,YAAY,EAEZ,mBAAmB,EAGpB,MAAM,SAAS,CAAA;AAEhB;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iBAAS,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,mBAAwB,GAAG,YAAY,CA4CtG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAS,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAKjH;AA4FD,OAAO,EAAE,6BAA6B,EAAE,YAAY,EAAE,CAAA;AAItD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,KAAK,mBAAmB,GACzB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,wBAAwB,CAAA;AAG/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAI/C,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAC3D,YAAY,EACV,mBAAmB,EACnB,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,EAChB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,4BAA4B,EAC5B,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,GACb,MAAM,SAAS,CAAA;AAChB,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAA"}

package/dist/index.js

@@ -106,7 +106,8 @@ function getLowLevelServer(server) {
 const DEFAULT_OPTIONS = {
     reportMissing: false,
     collectFeedback: false,
-    enableConversationId: false
+    enableConversationId: true,
+    captureModel: true
 };
 function buildTrackingData(lowLevelServer, options, sink, logger) {
     return {
@@ -121,7 +122,7 @@ function buildTrackingData(lowLevelServer, options, sink, logger) {
         sessionInfo: (0, session_js_namespaceObject.getSessionInfo)(lowLevelServer, void 0),
         options: {
             ...DEFAULT_OPTIONS,
-            ...options
+            ...Object.fromEntries(Object.entries(options).filter(([, value])=>void 0 !== value))
         },
         sessionSource: 'generated'
     };

package/dist/index.mjs

@@ -52,7 +52,8 @@ function getLowLevelServer(server) {
 const DEFAULT_OPTIONS = {
     reportMissing: false,
     collectFeedback: false,
-    enableConversationId: false
+    enableConversationId: true,
+    captureModel: true
 };
 function buildTrackingData(lowLevelServer, options, sink, logger) {
     return {
@@ -67,7 +68,7 @@ function buildTrackingData(lowLevelServer, options, sink, logger) {
         sessionInfo: getSessionInfo(lowLevelServer, void 0),
         options: {
             ...DEFAULT_OPTIONS,
-            ...options
+            ...Object.fromEntries(Object.entries(options).filter(([, value])=>void 0 !== value))
         },
         sessionSource: 'generated'
     };

package/dist/types.d.ts

@@ -110,7 +110,7 @@ export interface MCPAnalyticsOptions {
      */
     missingCapabilityToolName?: string;
     /**
-     * Opt in to session correlation for the MCP **2026-07-28** revision, which removed
+     * Enable session correlation for the MCP **2026-07-28** revision, which removed
      * protocol-level sessions: no `initialize`, no `mcp-session-id` header, and a fresh
      * server instance per HTTP request. With none of those left to anchor on, the only
      * thing that can carry a session across calls is the agent itself.
@@ -120,7 +120,7 @@ export interface MCPAnalyticsOptions {
      * that handle — so calls correlate across reconnects, restarts, and per-request
      * instances.
      *
-     * Off by default, and fully inert when off: no parameter is injected, no schema is
+     * On by default, and fully inert when disabled: no parameter is injected, no schema is
      * touched, no prompt-back is appended, and `$session_id` resolves exactly as it did
      * before (the request's own session id, else this instance's).
      */
@@ -136,7 +136,7 @@ export interface MCPAnalyticsOptions {
     /**
      * Capture the calling model as `$mcp_llm_model`. Recognized client metadata
      * takes precedence, with an injected `llm_model` parameter as the fallback.
-     * Off by default.
+     * On by default; set to `false` to disable capture.
      *
      * MCP does not standardize model identity. Some clients expose it through
      * vendor metadata; other harnesses inject it into the agent's system prompt

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.16.4";
+export declare const version = "0.17.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -27,7 +27,7 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-const version = '0.16.4';
+const version = '0.17.0';
 __webpack_require__.d(__webpack_exports__, {}, {
     version: version
 });

package/dist/version.mjs

@@ -1,2 +1,2 @@
-const version = '0.16.4';
+const version = '0.17.0';
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/mcp",
-  "version": "0.16.4",
+  "version": "0.17.0",
   "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.54.3"
+    "@posthog/core": "^1.54.4"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.27.1",
@@ -52,8 +52,8 @@
     "zod4": "npm:zod@^4.4.3",
     "@vitest/coverage-v8": "^1.6.1",
     "vitest": "^1.6.1",
-    "@posthog-tooling/tsconfig-base": "1.1.1",
-    "posthog-node": "^5.52.4"
+    "posthog-node": "^5.52.4",
+    "@posthog-tooling/tsconfig-base": "1.1.1"
   },
   "peerDependencies": {
     "@modelcontextprotocol/sdk": ">=1.26.0",

package/src/extensions/instrumentation.ts

@@ -44,7 +44,7 @@ import { buildCapturedMcpParameters } from './mcp-payloads'
 import { readRequestHandlerMethod } from './mcp-sdk-compat'
 import { getRequestHeaders } from './request-headers'
 import { getSessionId, getSessionInfo, isModernEraRequest, newSessionId } from './session'
-import { encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from './session-token'
+import { decodeSessionId, encodeSessionId, readMcpSessionHeader, writeSessionIdToTransport } from './session-token'
 import { getFeedbackToolDescriptor, resolveCollectFeedbackOptions, SEND_FEEDBACK_TOOL_NAME } from './feedback'
 import { getReportMissingToolDescriptor, resolveMissingCapabilityToolName } from './tools'
 import { applyResolvedMetadata, isToolResultError } from './tracing-helpers'
@@ -141,13 +141,11 @@ export async function captureToolCall(params: TraceToolCallParams): Promise<unkn
   // Reading the argument and removing it are separate questions: deleting one the
   // application declared costs the customer their call, so the strip below still
   // requires positive ownership, while reading it when ownership is unresolved
-  // costs at worst a mislabelled property. ADR-0011.
-  const canCaptureContextIntent =
-    !isVirtualAnalyticsTool &&
-    isContextEnabled(data.options.context) &&
-    (ownership.context || !ownership.contextOwnershipKnown)
-  const conversation = resolveConversationId(ownership.conversationId, request.params?.arguments)
-  const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership)
+  // can mislabel a property. Conversation minting also writes a prompt-back;
+  // that separate tradeoff and its carried-session guard are recorded in ADR-0013.
+  const canCaptureContextIntent = ownership.read.context
+  const conversation = resolveToolConversation(ownership.read.conversationId, request.params?.arguments, extra)
+  const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership.strip)
 
   // Prepare the event in isolation: if identity/metadata/intent resolution
   // throws, we drop instrumentation for this call but still run the tool.
@@ -189,17 +187,36 @@ export async function captureToolCall(params: TraceToolCallParams): Promise<unkn
   return finalResult
 }
 
+function resolveToolConversation(
+  enabled: boolean,
+  args: unknown,
+  extra?: CompatibleRequestHandlerExtra
+): ConversationIdResolution {
+  const conversation = resolveConversationId(enabled, args)
+  // Echoed handles span reconnects; a new handle must not replace a session
+  // already carried by this request or add a needless prompt-back to its result.
+  if (!conversation.minted) return conversation
+  const carriedSession = extra?.sessionId || decodeSessionId(readMcpSessionHeader(getRequestHeaders(extra)))
+  return carriedSession ? { minted: false, conversationId: undefined } : conversation
+}
+
 interface PreparedToolEvent {
   event: McpEvent
   requestAttribution: SessionInfo
 }
 
 /**
- * Ownership for one request, plus whether it could be resolved at all — "no
- * answer" must not read the same as "the application owns it".
+ * Ownership for one request. The `strip` flags gate stripping and require
+ * positive ownership; `read` gates capture and additionally fails open where
+ * ownership could not be resolved — "no answer" must not read the same as "the
+ * application owns it". ADR-0011.
  */
-interface ActiveAnalyticsParameterOwnership extends AnalyticsParameterOwnership {
-  contextOwnershipKnown: boolean
+type ArgumentOwnership = Pick<AnalyticsParameterOwnership, 'context' | 'conversationId' | 'llmModel'>
+
+interface ActiveAnalyticsParameterOwnership {
+  strip: ArgumentOwnership
+  read: ArgumentOwnership
+  outputInstructions: boolean
 }
 
 function getActiveAnalyticsParameterOwnership(
@@ -210,11 +227,14 @@ function getActiveAnalyticsParameterOwnership(
 ): ActiveAnalyticsParameterOwnership {
   const listed = toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : undefined
   const ownership = override ?? listed
+  const enabled = {
+    context: !isVirtualAnalyticsTool && isContextEnabled(data.options.context),
+    conversationId: data.options.enableConversationId === true,
+    llmModel: isCaptureModelEnabled(data.options.captureModel),
+  }
   return {
-    contextOwnershipKnown: ownership !== undefined,
-    context: !isVirtualAnalyticsTool && isContextEnabled(data.options.context) && ownership?.context === true,
-    conversationId: data.options.enableConversationId === true && ownership?.conversationId === true,
-    llmModel: isCaptureModelEnabled(data.options.captureModel) && ownership?.llmModel === true,
+    strip: enabledArgumentOwnership(enabled, ownership, false),
+    read: enabledArgumentOwnership(enabled, ownership, true),
     // Deliberately read off `listed`, never the override: only the advertised
     // JSON Schema can say whether `tools/list` declared `_mcp_instructions` (an
     // override is built from the live registry, which holds Zod on the
@@ -222,13 +242,26 @@ function getActiveAnalyticsParameterOwnership(
     // and fails closed — writing an undeclared key fails the customer's entire
     // tool result under `additionalProperties: false`. See ADR-0004 for the
     // per-request-instance gap this leaves and the planned fix.
-    outputInstructions: data.options.enableConversationId === true && listed?.outputInstructions === true,
+    outputInstructions: enabled.conversationId && listed?.outputInstructions === true,
+  }
+}
+
+function enabledArgumentOwnership(
+  enabled: ArgumentOwnership,
+  ownership: ArgumentOwnership | undefined,
+  whenUnknown: boolean
+): ArgumentOwnership {
+  const resolved = ownership ?? { context: whenUnknown, conversationId: whenUnknown, llmModel: whenUnknown }
+  return {
+    context: enabled.context && resolved.context,
+    conversationId: enabled.conversationId && resolved.conversationId,
+    llmModel: enabled.llmModel && resolved.llmModel,
   }
 }
 
 function cloneRequestWithoutOwnedAnalyticsArguments(
   request: MCPRequestLike,
-  ownership: AnalyticsParameterOwnership
+  ownership: ArgumentOwnership
 ): MCPRequestLike {
   const args = request.params?.arguments
   const cleanedArgs = stripOwnedAnalyticsArguments(args, ownership)
@@ -252,7 +285,7 @@ async function prepareToolCallEvent(
   extra: CompatibleRequestHandlerExtra | undefined,
   startTime: Date,
   conversation: ConversationIdResolution,
-  ownership: AnalyticsParameterOwnership,
+  ownership: ActiveAnalyticsParameterOwnership,
   eventType: MCPAnalyticsEventType,
   canCaptureContextIntent: boolean
 ): Promise<PreparedToolEvent | null> {
@@ -300,9 +333,9 @@ async function prepareToolCallEvent(
     await applyResolvedMetadata(event, data, request, extra)
     setEventIntent(event, await resolveToolCallIntent(data, request, canCaptureContextIntent, extra))
     // Client metadata does not collide with an application's tool arguments.
-    // Self-report still requires positive ownership before we read `llm_model`.
+    // Self-report reads `llm_model` under the same fail-open rule as `context`.
     if (isCaptureModelEnabled(data.options.captureModel)) {
-      const resolvedModel = resolveModel(request, ownership.llmModel)
+      const resolvedModel = resolveModel(request, ownership.read.llmModel)
       setEventModel(event, resolvedModel?.model, resolvedModel?.source)
     }
     return { event, requestAttribution }
@@ -328,7 +361,7 @@ function applyConversationInstructions(
   event: McpEvent | null,
   result: unknown,
   conversation: ConversationIdResolution,
-  ownership: AnalyticsParameterOwnership
+  ownership: Pick<AnalyticsParameterOwnership, 'outputInstructions'>
 ): unknown {
   const conversationId = conversation.conversationId
   if (!conversationId) {

package/src/extensions/model-parameters.ts

@@ -28,9 +28,11 @@ export interface ModelInjectableTool {
   [key: string]: unknown
 }
 
-/** Unlike `context`, model capture is opt-in: off unless explicitly enabled. */
+/** Model capture is enabled unless explicitly disabled. */
 export function isCaptureModelEnabled(captureModel: MCPAnalyticsOptions['captureModel']): boolean {
-  return captureModel === true || (typeof captureModel === 'object' && captureModel !== null)
+  return (
+    captureModel === undefined || captureModel === true || (typeof captureModel === 'object' && captureModel !== null)
+  )
 }
 
 export function getModelDescription(captureModel: MCPAnalyticsOptions['captureModel']): string | undefined {

package/src/extensions/posthog-mcp.ts

@@ -71,7 +71,7 @@ export interface PostHogMCPOptions extends PostHogOptions {
   collectFeedback?: CollectFeedbackConfig
   /**
    * Capture the calling model from recognized client metadata, with an injected
-   * `llm_model` argument as fallback. Off by default.
+   * `llm_model` argument as fallback. On by default; `false` disables it.
    */
   captureModel?: MCPAnalyticsOptions['captureModel']
 }

package/src/index.ts

@@ -142,7 +142,8 @@ function getLowLevelServer(server: MCPServerLike | HighLevelMCPServerLike): MCPS
 const DEFAULT_OPTIONS = {
   reportMissing: false,
   collectFeedback: false,
-  enableConversationId: false,
+  enableConversationId: true,
+  captureModel: true,
 } satisfies Partial<MCPAnalyticsOptions>
 
 function buildTrackingData(
@@ -161,7 +162,10 @@ function buildTrackingData(
     toolCategories: new Map<string, string>(),
     toolDescriptions: new Map<string, string>(),
     sessionInfo: getSessionInfo(lowLevelServer, undefined),
-    options: { ...DEFAULT_OPTIONS, ...options },
+    options: {
+      ...DEFAULT_OPTIONS,
+      ...Object.fromEntries(Object.entries(options).filter(([, value]) => value !== undefined)),
+    },
     sessionSource: 'generated',
   }
 }

package/src/types.ts

@@ -122,7 +122,7 @@ export interface MCPAnalyticsOptions {
    */
   missingCapabilityToolName?: string
   /**
-   * Opt in to session correlation for the MCP **2026-07-28** revision, which removed
+   * Enable session correlation for the MCP **2026-07-28** revision, which removed
    * protocol-level sessions: no `initialize`, no `mcp-session-id` header, and a fresh
    * server instance per HTTP request. With none of those left to anchor on, the only
    * thing that can carry a session across calls is the agent itself.
@@ -132,7 +132,7 @@ export interface MCPAnalyticsOptions {
    * that handle — so calls correlate across reconnects, restarts, and per-request
    * instances.
    *
-   * Off by default, and fully inert when off: no parameter is injected, no schema is
+   * On by default, and fully inert when disabled: no parameter is injected, no schema is
    * touched, no prompt-back is appended, and `$session_id` resolves exactly as it did
    * before (the request's own session id, else this instance's).
    */
@@ -148,7 +148,7 @@ export interface MCPAnalyticsOptions {
   /**
    * Capture the calling model as `$mcp_llm_model`. Recognized client metadata
    * takes precedence, with an injected `llm_model` parameter as the fallback.
-   * Off by default.
+   * On by default; set to `false` to disable capture.
    *
    * MCP does not standardize model identity. Some clients expose it through
    * vendor metadata; other harnesses inject it into the agent's system prompt

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.16.4'
+export const version = '0.17.0'