@posthog/mcp 0.10.6 → 0.10.8

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

@@ -12,6 +12,11 @@ export interface AnalyticsInjectableJsonSchema {
 export declare function hasAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
 export declare function canInjectAnalyticsParameter(schema: AnalyticsInjectableJsonSchema | undefined, parameterName: string): boolean;
 export declare function analyticsOwnsParameter(inputSchema: unknown, parameterName: string): boolean;
-export declare function getAnalyticsParameterOwnership(inputSchema: unknown): AnalyticsParameterOwnership;
-export declare function stripOwnedAnalyticsArguments(args: unknown, ownership: AnalyticsParameterOwnership): unknown;
+export declare function getAnalyticsParameterOwnership(inputSchema: unknown, outputSchema?: unknown): AnalyticsParameterOwnership;
+/**
+ * Removes the arguments we injected, leaving the host's own. Input-side only, so
+ * it takes just those two flags rather than the whole ownership record — callers
+ * that have no output-schema context should not have to invent a value for it.
+ */
+export declare function stripOwnedAnalyticsArguments(args: unknown, ownership: Pick<AnalyticsParameterOwnership, 'context' | 'conversationId'>): unknown;
 //# sourceMappingURL=analytics-parameters.d.ts.map

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

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

package/dist/extensions/analytics-parameters.js

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     stripOwnedAnalyticsArguments: ()=>stripOwnedAnalyticsArguments
 });
 const external_mcp_sdk_compat_js_namespaceObject = require("./mcp-sdk-compat.js");
+const external_output_instructions_js_namespaceObject = require("./output-instructions.js");
 const JSON_SCHEMA_KEYWORDS = [
     '$defs',
     '$ref',
@@ -63,10 +64,11 @@ function analyticsOwnsParameter(inputSchema, parameterName) {
     if ('_def' in schema || '_zod' in schema || '~standard' in schema) return canInjectAnalyticsParameter(void 0, parameterName);
     return canInjectAnalyticsParameter(schema, parameterName);
 }
-function getAnalyticsParameterOwnership(inputSchema) {
+function getAnalyticsParameterOwnership(inputSchema, outputSchema) {
     return {
         context: analyticsOwnsParameter(inputSchema, 'context'),
-        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id')
+        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id'),
+        outputInstructions: (0, external_output_instructions_js_namespaceObject.canDeclareOutputInstructions)(outputSchema)
     };
 }
 function stripOwnedAnalyticsArguments(args, ownership) {

package/dist/extensions/analytics-parameters.mjs

@@ -1,4 +1,5 @@
 import { getObjectShape, isZodRawShapeCompat } from "./mcp-sdk-compat.mjs";
+import { canDeclareOutputInstructions } from "./output-instructions.mjs";
 const JSON_SCHEMA_KEYWORDS = [
     '$defs',
     '$ref',
@@ -31,10 +32,11 @@ function analyticsOwnsParameter(inputSchema, parameterName) {
     if ('_def' in schema || '_zod' in schema || '~standard' in schema) return canInjectAnalyticsParameter(void 0, parameterName);
     return canInjectAnalyticsParameter(schema, parameterName);
 }
-function getAnalyticsParameterOwnership(inputSchema) {
+function getAnalyticsParameterOwnership(inputSchema, outputSchema) {
     return {
         context: analyticsOwnsParameter(inputSchema, 'context'),
-        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id')
+        conversationId: analyticsOwnsParameter(inputSchema, 'conversation_id'),
+        outputInstructions: canDeclareOutputInstructions(outputSchema)
     };
 }
 function stripOwnedAnalyticsArguments(args, ownership) {

package/dist/extensions/capture.d.ts

@@ -1,4 +1,4 @@
-import type { MCPServerLike, McpEvent } from '../types';
+import type { MCPServerLike, McpEvent, SessionInfo } from '../types';
 import type { LoggerFn } from './logger';
 /**
  * Materializes an `McpEvent` against the server's tracking data + session info,
@@ -10,5 +10,5 @@ import type { LoggerFn } from './logger';
  * Auto-capture callers (tool calls, listings, identify) intentionally ignore the
  * return value, keeping the tool path isolated from analytics latency/errors.
  */
-export declare function captureEvent(server: MCPServerLike, eventInput: McpEvent, logger: LoggerFn): Promise<void> | undefined;
+export declare function captureEvent(server: MCPServerLike, eventInput: McpEvent, logger: LoggerFn, requestAttribution?: SessionInfo): Promise<void> | undefined;
 //# sourceMappingURL=capture.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../src/extensions/capture.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAkErH"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../src/extensions/capture.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,QAAQ,EACpB,MAAM,EAAE,QAAQ,EAChB,kBAAkB,CAAC,EAAE,WAAW,GAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAoE3B"}

package/dist/extensions/capture.js

@@ -29,12 +29,12 @@ __webpack_require__.d(__webpack_exports__, {
 const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_internal_js_namespaceObject = require("./internal.js");
 const external_session_js_namespaceObject = require("./session.js");
-function captureEvent(server, eventInput, logger) {
+function captureEvent(server, eventInput, logger, requestAttribution) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     if (!data) return void logger('Warning: Server tracking data not found. Event will not be published.');
     const sink = data.sink;
     if (!sink) return;
-    const sessionInfo = (0, external_session_js_namespaceObject.getSessionInfo)(server, data, eventInput.sessionId);
+    const sessionInfo = requestAttribution ?? (0, external_session_js_namespaceObject.getSessionInfo)(server, data, eventInput.sessionId);
     const duration = eventInput.duration || (eventInput.timestamp ? Date.now() - eventInput.timestamp.getTime() : void 0);
     const fullEvent = {
         id: eventInput.id || '',

package/dist/extensions/capture.mjs

@@ -1,12 +1,12 @@
 import { MCPAnalyticsEventType } from "./event-types.mjs";
 import { getServerTrackingData } from "./internal.mjs";
 import { getSessionInfo } from "./session.mjs";
-function captureEvent(server, eventInput, logger) {
+function captureEvent(server, eventInput, logger, requestAttribution) {
     const data = getServerTrackingData(server);
     if (!data) return void logger('Warning: Server tracking data not found. Event will not be published.');
     const sink = data.sink;
     if (!sink) return;
-    const sessionInfo = getSessionInfo(server, data, eventInput.sessionId);
+    const sessionInfo = requestAttribution ?? getSessionInfo(server, data, eventInput.sessionId);
     const duration = eventInput.duration || (eventInput.timestamp ? Date.now() - eventInput.timestamp.getTime() : void 0);
     const fullEvent = {
         id: eventInput.id || '',

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

@@ -7,7 +7,13 @@ export interface ConversationIdInjectableTool {
     [key: string]: unknown;
 }
 export declare function addConversationIdToTool<TTool extends ConversationIdInjectableTool>(tool: TTool, logger?: LoggerFn): TTool;
-export declare function addConversationIdToTools<TTool extends ConversationIdInjectableTool>(tools: TTool[], missingCapabilityToolName?: string, skipMissingCapabilityTool?: boolean, logger?: LoggerFn): TTool[];
+/**
+ * Injects `conversation_id` across a tool listing, including the virtual
+ * `get_more_tools` tool. Its calls publish `$mcp_missing_capability`, and a
+ * capability gap is only meaningful next to the work that hit it — so it belongs
+ * in the same session as the surrounding tool calls.
+ */
+export declare function addConversationIdToTools<TTool extends ConversationIdInjectableTool>(tools: TTool[], logger?: LoggerFn): TTool[];
 export type ConversationIdResolution = {
     minted: false;
     conversationId: string | undefined;
@@ -17,15 +23,38 @@ export type ConversationIdResolution = {
 };
 /**
  * Decides which conversation_id to use for a tool call:
- *   - disabled or get_more_tools → none
- *   - agent supplied a value → use it
- *   - agent omitted → mint a UUID
+ *   - disabled → none
+ *   - agent echoed a handle we could have minted → use it
+ *   - anything else → mint a fresh one
+ *
+ * The shape check matters because this value becomes `$session_id`, and the
+ * derivation is deterministic so that two pods agree — which also means two
+ * *callers* sending the same string land in the same session. The strings agents
+ * invent are not random (`conv-1`, `1`, `session`), so trusting them verbatim
+ * would silently merge unrelated conversations, potentially across users.
+ *
+ * A compliant agent echoes the uuidv7 we minted and is unaffected. Anything else
+ * is treated exactly as if the handle were absent: mint, and prompt back. Shape
+ * rather than a registry of issued ids, because a per-request server has no
+ * memory of what it minted.
+ *
+ * This narrows the problem, it does not prove provenance: a caller supplying a
+ * well-formed uuidv7 is trusted, so two that pick the *same* one still merge. That
+ * residue is far smaller than the case it replaces — an agent ignoring the
+ * parameter description reaches for `conv-1` or `1`, not a conforming uuidv7 — and
+ * closing it needs a signed handle, i.e. a secret shared by every pod. Worth doing
+ * if this ever anchors something security-bearing; `$session_id` is an analytics
+ * grouping key, so it does not today.
  */
-export declare function resolveConversationId(enabled: boolean, args: unknown, toolName: string | undefined, missingCapabilityToolName?: string): ConversationIdResolution;
+export declare function resolveConversationId(enabled: boolean, args: unknown): ConversationIdResolution;
 /**
- * Predicate matching the same eligibility checks injectConversationIdPromptBack uses,
- * exposed so callers can pre-decide whether the prompt-back will actually land
- * (and clear event.conversationId if not, to avoid orphan ids in analytics).
+ * Whether the prompt-back can ride this result's `content`. The only requirement
+ * is an array to append to.
+ *
+ * Errored results included on purpose. A tool that fails on the first call of a
+ * conversation is exactly when the agent needs the session handle: without it the
+ * retry starts a fresh conversation, so the failure and its fix land in different
+ * sessions.
  */
 export declare function canInjectConversationIdPromptBack(result: unknown): boolean;
 export declare function extractConversationId(args: unknown): string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-id.d.ts","sourceRoot":"","sources":["../../src/extensions/conversation-id.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAG7C,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,EAChF,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,QAAc,GACrB,KAAK,CA4CP;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,yBAAyB,GAAE,MAA4B,EACvD,yBAAyB,UAAO,EAChC,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAOT;AAED,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,yBAAyB,GAAE,MAA4B,GACtD,wBAAwB,CAS1B;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAS1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUvE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAM1D;AAED,wBAAgB,6BAA6B,CAAC,cAAc,EAAE,MAAM,GAAG;IACrE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAKA;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAS/F"}
+{"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;AAE/B,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C,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,EAChF,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,QAAc,GACrB,KAAK,CA4CP;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,4BAA4B,EACjF,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,GAAE,QAAc,GACrB,KAAK,EAAE,CAET;AAQD,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;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,wBAAwB,CAa/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAK1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUvE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAM1D;AAED,wBAAgB,6BAA6B,CAAC,cAAc,EAAE,MAAM,GAAG;IACrE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAKA;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAS/F"}

package/dist/extensions/conversation-id.js

@@ -38,7 +38,6 @@ 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");
 const CONVERSATION_ID_PARAM_NAME = 'conversation_id';
 function addConversationIdToTool(tool, logger = external_logger_js_namespaceObject.log) {
     const modifiedTool = {
@@ -65,21 +64,19 @@ function addConversationIdToTool(tool, logger = external_logger_js_namespaceObje
     };
     return modifiedTool;
 }
-function addConversationIdToTools(tools, missingCapabilityToolName = external_tools_js_namespaceObject.GET_MORE_TOOLS_NAME, skipMissingCapabilityTool = true, logger = external_logger_js_namespaceObject.log) {
-    return tools.map((tool)=>{
-        if (skipMissingCapabilityTool && tool.name === missingCapabilityToolName) return tool;
-        return addConversationIdToTool(tool, logger);
-    });
+function addConversationIdToTools(tools, logger = external_logger_js_namespaceObject.log) {
+    return tools.map((tool)=>addConversationIdToTool(tool, logger));
 }
-function resolveConversationId(enabled, args, toolName, missingCapabilityToolName = external_tools_js_namespaceObject.GET_MORE_TOOLS_NAME) {
-    if (!enabled || toolName === missingCapabilityToolName) return {
+const MINTED_CONVERSATION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function resolveConversationId(enabled, args) {
+    if (!enabled) return {
         minted: false,
         conversationId: void 0
     };
     const supplied = extractConversationId(args);
-    if (supplied) return {
+    if (supplied && MINTED_CONVERSATION_ID.test(supplied)) return {
         minted: false,
-        conversationId: supplied
+        conversationId: supplied.toLowerCase()
     };
     return {
         minted: true,
@@ -88,9 +85,7 @@ function resolveConversationId(enabled, args, toolName, missingCapabilityToolNam
 }
 function canInjectConversationIdPromptBack(result) {
     if (!(result && 'object' == typeof result)) return false;
-    const resultObj = result;
-    if (true === resultObj.isError) return false;
-    return Array.isArray(resultObj.content);
+    return Array.isArray(result.content);
 }
 function extractConversationId(args) {
     if (!(args && 'object' == typeof args)) return;

package/dist/extensions/conversation-id.mjs

@@ -2,7 +2,6 @@ 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";
 const CONVERSATION_ID_PARAM_NAME = 'conversation_id';
 function addConversationIdToTool(tool, logger = log) {
     const modifiedTool = {
@@ -29,21 +28,19 @@ function addConversationIdToTool(tool, logger = log) {
     };
     return modifiedTool;
 }
-function addConversationIdToTools(tools, missingCapabilityToolName = GET_MORE_TOOLS_NAME, skipMissingCapabilityTool = true, logger = log) {
-    return tools.map((tool)=>{
-        if (skipMissingCapabilityTool && tool.name === missingCapabilityToolName) return tool;
-        return addConversationIdToTool(tool, logger);
-    });
+function addConversationIdToTools(tools, logger = log) {
+    return tools.map((tool)=>addConversationIdToTool(tool, logger));
 }
-function resolveConversationId(enabled, args, toolName, missingCapabilityToolName = GET_MORE_TOOLS_NAME) {
-    if (!enabled || toolName === missingCapabilityToolName) return {
+const MINTED_CONVERSATION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function resolveConversationId(enabled, args) {
+    if (!enabled) return {
         minted: false,
         conversationId: void 0
     };
     const supplied = extractConversationId(args);
-    if (supplied) return {
+    if (supplied && MINTED_CONVERSATION_ID.test(supplied)) return {
         minted: false,
-        conversationId: supplied
+        conversationId: supplied.toLowerCase()
     };
     return {
         minted: true,
@@ -52,9 +49,7 @@ function resolveConversationId(enabled, args, toolName, missingCapabilityToolNam
 }
 function canInjectConversationIdPromptBack(result) {
     if (!(result && 'object' == typeof result)) return false;
-    const resultObj = result;
-    if (true === resultObj.isError) return false;
-    return Array.isArray(resultObj.content);
+    return Array.isArray(result.content);
 }
 function extractConversationId(args) {
     if (!(args && 'object' == typeof args)) return;

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;AASjB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AA8PxC,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA2BhG"}
+{"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;AASjB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAgQxC,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CA2BhG"}

package/dist/extensions/instrument-highlevel.js

@@ -177,7 +177,7 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
         request,
         extra,
         execute: (downstreamRequest)=>originalCallToolHandler(downstreamRequest, extra),
-        parameterOwnership: registeredTool ? (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(registeredTool.inputSchema) : void 0,
+        parameterOwnership: registeredTool ? (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(registeredTool.inputSchema, registeredTool.outputSchema) : void 0,
         takeCapturedError: ()=>{
             const captured = extra?.__mcp_analytics_error;
             if (extra) extra.__mcp_analytics_error = void 0;

package/dist/extensions/instrument-highlevel.mjs

@@ -149,7 +149,7 @@ async function handleToolCallRequest(highLevelServer, server, originalCallToolHa
         request,
         extra,
         execute: (downstreamRequest)=>originalCallToolHandler(downstreamRequest, extra),
-        parameterOwnership: registeredTool ? getAnalyticsParameterOwnership(registeredTool.inputSchema) : void 0,
+        parameterOwnership: registeredTool ? getAnalyticsParameterOwnership(registeredTool.inputSchema, registeredTool.outputSchema) : void 0,
         takeCapturedError: ()=>{
             const captured = extra?.__mcp_analytics_error;
             if (extra) extra.__mcp_analytics_error = void 0;

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

@@ -37,6 +37,7 @@ const external_analytics_parameters_js_namespaceObject = require("./analytics-pa
 const external_context_parameters_js_namespaceObject = require("./context-parameters.js");
 const external_conversation_id_js_namespaceObject = require("./conversation-id.js");
 const external_client_identity_js_namespaceObject = require("./client-identity.js");
+const external_output_instructions_js_namespaceObject = require("./output-instructions.js");
 const external_capture_js_namespaceObject = require("./capture.js");
 const external_event_types_js_namespaceObject = require("./event-types.js");
 const external_exceptions_js_namespaceObject = require("./exceptions.js");
@@ -52,27 +53,29 @@ async function captureToolCall(params) {
     const { server, data, request, extra, execute, parameterOwnership, eventType, explicitContextIntent, takeCapturedError } = params;
     const resolvedEventType = eventType ?? external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsCall;
     const ownership = getActiveAnalyticsParameterOwnership(data, request.params?.name, parameterOwnership, resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpMissingCapability);
-    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(ownership.conversationId, request.params?.arguments, request.params?.name, resolvedEventType === external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpMissingCapability ? (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options) : '');
+    const conversation = (0, external_conversation_id_js_namespaceObject.resolveConversationId)(ownership.conversationId, request.params?.arguments);
     const downstreamRequest = cloneRequestWithoutOwnedAnalyticsArguments(request, ownership);
     const startTime = new Date();
-    const event = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType);
-    if (event && explicitContextIntent) (0, external_intent_js_namespaceObject.setExplicitContextIntent)(event, explicitContextIntent);
+    const preparedEvent = await prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, resolvedEventType);
+    if (preparedEvent && explicitContextIntent) (0, external_intent_js_namespaceObject.setExplicitContextIntent)(preparedEvent.event, explicitContextIntent);
     let result;
     try {
         result = await execute(downstreamRequest);
     } catch (error) {
-        publishFailedToolEvent(server, event, error, startTime, conversation, data.logger);
+        publishFailedToolEvent(server, preparedEvent, error, startTime, conversation, data.logger);
         throw error;
     }
-    const finalResult = applyConversationPromptBack(event, result, conversation);
-    publishSuccessfulToolEvent(server, event, finalResult, startTime, data.logger, takeCapturedError);
+    const finalResult = applyConversationInstructions(preparedEvent?.event ?? null, result, conversation, ownership);
+    publishSuccessfulToolEvent(server, preparedEvent, finalResult, startTime, data.logger, takeCapturedError);
     return finalResult;
 }
 function getActiveAnalyticsParameterOwnership(data, toolName, override, isMissingCapabilityTool) {
-    const ownership = override ?? (toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0);
+    const listed = toolName ? data.toolAnalyticsParameterOwnership.get(toolName) : void 0;
+    const ownership = override ?? listed;
     return {
         context: !isMissingCapabilityTool && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context) && ownership?.context === true,
-        conversationId: !isMissingCapabilityTool && true === data.options.enableConversationId && ownership?.conversationId === true
+        conversationId: true === data.options.enableConversationId && ownership?.conversationId === true,
+        outputInstructions: true === data.options.enableConversationId && listed?.outputInstructions === true
     };
 }
 function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
@@ -89,8 +92,10 @@ function cloneRequestWithoutOwnedAnalyticsArguments(request, ownership) {
 }
 async function prepareToolCallEvent(server, data, request, downstreamRequest, extra, startTime, conversation, ownership, eventType) {
     try {
-        const sessionId = (0, external_session_js_namespaceObject.getSessionId)(server, extra);
-        await (0, external_internal_js_namespaceObject.handleIdentify)(server, data, sessionId, request, extra);
+        const sessionId = (0, external_session_js_namespaceObject.getSessionId)(server, extra, conversation.conversationId);
+        const sessionInfo = (0, external_session_js_namespaceObject.getSessionInfo)(server, data, sessionId);
+        const identity = await (0, external_internal_js_namespaceObject.handleIdentify)(server, data, sessionId, request, sessionInfo, extra, !!conversation.conversationId);
+        const requestAttribution = (0, external_internal_js_namespaceObject.withIdentity)(sessionInfo, identity);
         const toolName = request.params?.name;
         const event = {
             sessionId,
@@ -105,20 +110,35 @@ async function prepareToolCallEvent(server, data, request, downstreamRequest, ex
         (0, external_client_identity_js_namespaceObject.stampMetaClientInfo)(event, request);
         await (0, external_tracing_helpers_js_namespaceObject.applyResolvedMetadata)(event, data, request, extra);
         (0, external_intent_js_namespaceObject.setEventIntent)(event, await (0, external_intent_js_namespaceObject.resolveToolCallIntent)(data, request, ownership.context, extra));
-        return event;
+        return {
+            event,
+            requestAttribution
+        };
     } catch (error) {
         data.logger(`Warning: PostHog MCP analytics instrumentation failed for tool ${request.params?.name}, the tool will still run - ${error}`);
         return null;
     }
 }
-function applyConversationPromptBack(event, result, conversation) {
-    if (!conversation.minted) return result;
-    if ((0, external_conversation_id_js_namespaceObject.canInjectConversationIdPromptBack)(result)) return (0, external_conversation_id_js_namespaceObject.injectConversationIdPromptBack)(result, conversation.conversationId);
-    if (event) event.conversationId = void 0;
-    return result;
+function applyConversationInstructions(event, result, conversation, ownership) {
+    const conversationId = conversation.conversationId;
+    if (!conversationId) return result;
+    let updated = result;
+    let delivered = false;
+    if (ownership.outputInstructions) {
+        const mirrored = (0, external_output_instructions_js_namespaceObject.mirrorInstructionsIntoStructuredContent)(updated, conversationId);
+        delivered = mirrored !== updated;
+        updated = mirrored;
+    }
+    if (conversation.minted && (0, external_conversation_id_js_namespaceObject.canInjectConversationIdPromptBack)(updated)) {
+        updated = (0, external_conversation_id_js_namespaceObject.injectConversationIdPromptBack)(updated, conversationId);
+        delivered = true;
+    }
+    if (!delivered && conversation.minted && event) event.conversationId = void 0;
+    return updated;
 }
-function publishSuccessfulToolEvent(server, event, result, startTime, logger, takeCapturedError) {
-    if (!event) return;
+function publishSuccessfulToolEvent(server, preparedEvent, result, startTime, logger, takeCapturedError) {
+    if (!preparedEvent) return;
+    const { event, requestAttribution } = preparedEvent;
     try {
         if ((0, external_tracing_helpers_js_namespaceObject.isToolResultError)(result)) {
             event.isError = true;
@@ -127,19 +147,20 @@ function publishSuccessfulToolEvent(server, event, result, startTime, logger, ta
         } else event.isError = false;
         event.response = result;
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger, requestAttribution);
     } catch (error) {
         logger(`Warning: PostHog MCP analytics failed to publish tool event - ${error}`);
     }
 }
-function publishFailedToolEvent(server, event, error, startTime, conversation, logger) {
-    if (!event) return;
+function publishFailedToolEvent(server, preparedEvent, error, startTime, conversation, logger) {
+    if (!preparedEvent) return;
+    const { event, requestAttribution } = preparedEvent;
     try {
         if (conversation.minted) event.conversationId = void 0;
         event.isError = true;
         event.error = (0, external_exceptions_js_namespaceObject.captureException)(error);
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger, requestAttribution);
     } catch (publishError) {
         logger(`Warning: PostHog MCP analytics failed to publish failed tool event - ${publishError}`);
     }
@@ -194,15 +215,17 @@ async function isToolAdvertised(server, toolName, extra, logger) {
 async function handleListToolsRequest(server, originalListToolsHandler, request, extra, logger) {
     const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
     const startTime = new Date();
+    const sessionId = (0, external_session_js_namespaceObject.getSessionId)(server, extra);
+    const requestAttribution = (0, external_session_js_namespaceObject.getSessionInfo)(server, data, sessionId);
     const event = {
-        sessionId: (0, external_session_js_namespaceObject.getSessionId)(server, extra),
+        sessionId,
         parameters: (0, external_mcp_payloads_js_namespaceObject.buildCapturedMcpParameters)(request),
         eventType: external_event_types_js_namespaceObject.MCPAnalyticsEventType.mcpToolsList,
         timestamp: startTime
     };
     (0, external_client_identity_js_namespaceObject.stampMetaClientInfo)(event, request);
     if (data) await (0, external_tracing_helpers_js_namespaceObject.applyResolvedMetadata)(event, data, request, extra);
-    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger);
+    const tools = await getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger, requestAttribution);
     if (!data) {
         logger('Warning: PostHog MCP analytics is unable to find server tracking data. Please ensure you have called instrument(server, options) before using tool calls.');
         return {
@@ -214,7 +237,7 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
         event.error = (0, external_exceptions_js_namespaceObject.captureException)('No tools were sent to MCP client.');
         event.isError = true;
         event.duration = Date.now() - startTime.getTime();
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger, requestAttribution);
         return {
             tools
         };
@@ -225,20 +248,20 @@ async function handleListToolsRequest(server, originalListToolsHandler, request,
     event.listedToolNames = collectListedToolNames(tools);
     event.isError = false;
     event.duration = Date.now() - startTime.getTime();
-    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
+    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger, requestAttribution);
     return {
         tools
     };
 }
 function cacheToolAnalyticsParameterOwnership(cache, tools) {
-    for (const tool of tools)if (tool?.name) cache.set(tool.name, (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(tool.inputSchema));
+    for (const tool of tools)if (tool?.name) cache.set(tool.name, (0, external_analytics_parameters_js_namespaceObject.getAnalyticsParameterOwnership)(tool.inputSchema, tool.outputSchema));
 }
 function collectListedToolNames(tools) {
     if (!tools || 0 === tools.length) return;
     const names = tools.map((tool)=>tool?.name).filter((name)=>'string' == typeof name);
     return names.length > 0 ? names : void 0;
 }
-async function getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger) {
+async function getTracedToolsList(server, originalListToolsHandler, request, extra, event, logger, requestAttribution) {
     try {
         const data = (0, external_internal_js_namespaceObject.getServerTrackingData)(server);
         const originalResponse = await originalListToolsHandler(request, extra);
@@ -249,16 +272,21 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
         if (data && (0, external_context_parameters_js_namespaceObject.isContextEnabled)(data.options.context)) tools = (0, external_context_parameters_js_namespaceObject.addContextParameterToTools)(tools, (0, external_context_parameters_js_namespaceObject.getContextDescription)(data.options.context), data.logger);
         if (data) {
             const missingToolName = (0, external_tools_js_namespaceObject.resolveMissingCapabilityToolName)(data.options);
-            let injectedMissingCapabilityTool = false;
             if (data.options.reportMissing) {
                 const alreadyPresent = tools.some((tool)=>tool?.name === missingToolName);
                 if (alreadyPresent) data.logger(`Warning: Cannot inject missing-capability tool "${missingToolName}" because a real tool already uses that name. The real tool will not be intercepted.`);
                 else {
-                    tools.push((0, external_tools_js_namespaceObject.getReportMissingToolDescriptor)(missingToolName));
-                    injectedMissingCapabilityTool = true;
+                    const virtualTool = (0, external_tools_js_namespaceObject.getReportMissingToolDescriptor)(missingToolName);
+                    tools.push(virtualTool);
+                    cacheToolAnalyticsParameterOwnership(data.toolAnalyticsParameterOwnership, [
+                        virtualTool
+                    ]);
                 }
             }
-            if (data.options.enableConversationId) tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, missingToolName, injectedMissingCapabilityTool, data.logger);
+            if (data.options.enableConversationId) {
+                tools = (0, external_conversation_id_js_namespaceObject.addConversationIdToTools)(tools, data.logger);
+                tools = (0, external_output_instructions_js_namespaceObject.addInstructionsToOutputSchemas)(tools, data.logger);
+            }
         }
         if (data) {
             cacheToolDescriptions(data.toolDescriptions, tools);
@@ -270,7 +298,7 @@ async function getTracedToolsList(server, originalListToolsHandler, request, ext
         event.error = (0, external_exceptions_js_namespaceObject.captureException)(error);
         event.isError = true;
         event.duration = event.timestamp ? Date.now() - event.timestamp.getTime() : 0;
-        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger);
+        (0, external_capture_js_namespaceObject.captureEvent)(server, event, logger, requestAttribution);
         throw error;
     }
 }
@@ -319,19 +347,19 @@ function mintStatelessSessionOnInitialize(server, data, request, extra) {
         return;
     }
 }
-function upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiatedProtocolVersion) {
+function upgradeMintedTokenToNegotiated(server, mintedSessionId, sessionInfo, negotiatedProtocolVersion, logger) {
     try {
         const transport = server.transport;
         if (!transport) return;
         const token = (0, external_session_token_js_namespaceObject.encodeSessionId)({
             sessionId: mintedSessionId,
-            clientName: data.sessionInfo.clientName,
-            clientVersion: data.sessionInfo.clientVersion,
+            clientName: sessionInfo.clientName,
+            clientVersion: sessionInfo.clientVersion,
             protocolVersion: negotiatedProtocolVersion
         });
         (0, external_session_token_js_namespaceObject.writeSessionIdToTransport)(transport, token);
     } catch (error) {
-        data.logger(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
+        logger(`Warning: PostHog MCP analytics failed to upgrade the stateless session token - ${error}`);
     }
 }
 function readInitializeClientInfo(request) {
@@ -351,7 +379,15 @@ async function handleInitializeRequest(server, originalInitializeHandler, reques
     }
     const mintedSessionId = mintStatelessSessionOnInitialize(server, data, request, extra);
     const sessionId = (0, external_session_js_namespaceObject.getSessionId)(server, extra);
-    await (0, external_internal_js_namespaceObject.handleIdentify)(server, data, sessionId, request, extra);
+    const sessionInfo = (0, external_session_js_namespaceObject.getSessionInfo)(server, data, sessionId);
+    const initializeClientInfo = readInitializeClientInfo(request);
+    const requestSessionInfo = {
+        ...sessionInfo,
+        clientName: initializeClientInfo?.name ?? sessionInfo.clientName,
+        clientVersion: initializeClientInfo?.version ?? sessionInfo.clientVersion
+    };
+    const identity = await (0, external_internal_js_namespaceObject.handleIdentify)(server, data, sessionId, request, requestSessionInfo, extra);
+    const requestAttribution = (0, external_internal_js_namespaceObject.withIdentity)(requestSessionInfo, identity);
     const event = {
         sessionId,
         resourceName: request.params?.name || 'Unknown Tool Name',
@@ -365,10 +401,18 @@ async function handleInitializeRequest(server, originalInitializeHandler, reques
     event.response = result;
     const negotiatedProtocolVersion = readProtocolVersion(result, request);
     event.protocolVersion = negotiatedProtocolVersion;
-    data.sessionInfo.protocolVersion = negotiatedProtocolVersion;
-    (0, external_internal_js_namespaceObject.setServerTrackingData)(server, data);
-    if (mintedSessionId) upgradeMintedTokenToNegotiated(server, data, mintedSessionId, negotiatedProtocolVersion);
-    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger);
+    if (data.sessionId === sessionId) {
+        data.sessionInfo = {
+            ...data.sessionInfo,
+            protocolVersion: negotiatedProtocolVersion
+        };
+        (0, external_internal_js_namespaceObject.setServerTrackingData)(server, data);
+    }
+    if (mintedSessionId) upgradeMintedTokenToNegotiated(server, mintedSessionId, requestSessionInfo, negotiatedProtocolVersion, data.logger);
+    (0, external_capture_js_namespaceObject.captureEvent)(server, event, data.logger, {
+        ...requestAttribution,
+        protocolVersion: negotiatedProtocolVersion
+    });
     return result;
 }
 function readProtocolVersion(result, request) {