@apify/actors-mcp-server 0.12.1-beta.3 → 0.13.1-beta.0

package/dist/mcp/task_execution.js

@@ -1,4 +1,3 @@
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
 import log from '@apify/log';
 import { FAILURE_CATEGORY, TOOL_STATUS } from '../const.js';
 import { withReportProblemNudge } from '../tools/dev/report_problem.js';
@@ -49,14 +48,18 @@ export async function emitTaskStatusNotification(taskId, mcpSessionId, taskStore
  * @param params.apifyClient - ApifyClient configured with payment headers or the standard token
  * @param params.apifyToken - Apify API token
  * @param params.progressToken - Progress token for notifications
- * @param params.extra - Extra request handler context
  * @param params.mcpSessionId - MCP session ID for telemetry
  * @param params.actorName - Actor name, used for telemetry and error diagnostics
  * @param params.actorId - Actor ID, used for telemetry and error diagnostics
- * @param params.apifyMcpServer - The ActorsMcpServer instance (task store, server, tools, telemetry config)
+ * @param params.taskStore - Task store (legacy) for status/result persistence
+ * @param params.server - v1 SDK server (legacy) for task-status notifications and logging
+ * @param params.sendNotification - Progress-notification sink for the running tool
  */
+// TODO(#1156): collapse this flat param list (and its siblings in tool_call_engine.ts and
+// tool_dispatch.ts) into lifetime-scoped session/request context objects.
 export async function executeToolAndUpdateTask(params) {
-    const { taskId, tool, toolArgs, logSafeArgs, apifyClient, apifyToken, progressToken, extra, mcpSessionId, actorName, actorId, apifyMcpServer, clientContext, } = params;
+    const { taskId, tool, toolArgs, logSafeArgs, apifyClient, apifyToken, progressToken, mcpSessionId, actorName, actorId, clientContext, taskStore, server, tools, actorStore, paymentProvider, telemetryEnabled, telemetryEnv, transportType, sendNotification, } = params;
+    const emitLog = async (msg) => server.sendLoggingMessage(msg);
     let toolStatus = TOOL_STATUS.SUCCEEDED;
     // Always populate actor fields so they're tracked on both success and failure paths.
     let callDiagnostics = { ...buildActorFields(actorName, actorId) };
@@ -72,7 +75,8 @@ export async function executeToolAndUpdateTask(params) {
         toolName: getToolFullName(tool),
         mcpSessionId,
         apifyToken,
-        apifyMcpServer,
+        telemetryEnabled,
+        transportType,
         clientContext,
     });
     const finishTaskTracking = (status, diagnostics, result) => {
@@ -87,21 +91,21 @@ export async function executeToolAndUpdateTask(params) {
             callDiagnostics: diagnostics,
             args: toolArgs,
             result,
-            apifyMcpServer,
+            telemetryEnv,
         });
     };
     // Terminal step shared by every task outcome: store the result (expiry-tolerant),
     // emit the status notification, record telemetry.
     const completeTask = async (storeStatus, taskResult, status, diagnostics) => {
-        await storeTaskResultOrSkipIfExpired(apifyMcpServer.taskStore, tool.name, taskId, storeStatus, taskResult, mcpSessionId);
-        await emitTaskStatusNotification(taskId, mcpSessionId, apifyMcpServer.taskStore, apifyMcpServer.server);
+        await storeTaskResultOrSkipIfExpired(taskStore, tool.name, taskId, storeStatus, taskResult, mcpSessionId);
+        await emitTaskStatusNotification(taskId, mcpSessionId, taskStore, server);
         finishTaskTracking(status, diagnostics, taskResult);
     };
     // Once a task is cancelled the spec forbids writing a result; every storage path
     // must short-circuit here. `logSuffix` is concatenated after "Task was cancelled"
     // so we keep the existing log format and the existing telemetry status per path.
     const skipIfTaskCancelled = async (logSuffix, status, diagnostics) => {
-        if (!(await isTaskCancelled(taskId, mcpSessionId, apifyMcpServer.taskStore)))
+        if (!(await isTaskCancelled(taskId, mcpSessionId, taskStore)))
             return false;
         log.debug(`[executeToolAndUpdateTask] Task was cancelled${logSuffix}`, { taskId, mcpSessionId });
         finishTaskTracking(status, diagnostics);
@@ -112,13 +116,12 @@ export async function executeToolAndUpdateTask(params) {
     // Actor run stops instead of consuming compute until natural completion.
     // Per MCP tasks spec, request-level aborts (client disconnect,
     // notifications/cancelled for the original request ID) MUST NOT cancel
-    // the task — `extra.signal` is intentionally not chained here.
+    // the task — the request signal is intentionally not chained here.
     const cancelWatcher = createTaskCancellationWatcher({
         taskId,
         mcpSessionId,
-        taskStore: apifyMcpServer.taskStore,
+        taskStore,
     });
-    const taskExtra = { ...extra, signal: cancelWatcher.signal };
     try {
         log.debug('[executeToolAndUpdateTask] Updating task status to working', {
             taskId,
@@ -130,7 +133,7 @@ export async function executeToolAndUpdateTask(params) {
         // apart from a genuine store error.
         // noinspection ExceptionCaughtLocallyJS
         try {
-            await apifyMcpServer.taskStore.updateTaskStatus(taskId, 'working', undefined, mcpSessionId);
+            await taskStore.updateTaskStatus(taskId, 'working', undefined, mcpSessionId);
         }
         catch (err) {
             if (await skipIfTaskCancelled(' before execution started, skipping', TOOL_STATUS.ABORTED, {
@@ -139,34 +142,38 @@ export async function executeToolAndUpdateTask(params) {
                 return;
             throw err;
         }
-        await emitTaskStatusNotification(taskId, mcpSessionId, apifyMcpServer.taskStore, apifyMcpServer.server);
+        await emitTaskStatusNotification(taskId, mcpSessionId, taskStore, server);
         // Execute the tool and get the result
         let result = {};
         // Callback to propagate Actor run statusMessage into the task store and emit a push notification.
         // TODO(TC-3): cancel arriving while this is scheduled throws cancelled → working;
         // currently swallowed by progress.ts's tick catch — guard or catch explicitly.
         const onStatusMessage = async (message) => {
-            await apifyMcpServer.taskStore.updateTaskStatus(taskId, 'working', message, mcpSessionId);
-            await emitTaskStatusNotification(taskId, mcpSessionId, apifyMcpServer.taskStore, apifyMcpServer.server);
+            await taskStore.updateTaskStatus(taskId, 'working', message, mcpSessionId);
+            await emitTaskStatusNotification(taskId, mcpSessionId, taskStore, server);
         };
         // ACTOR_MCP never reads the tracker (matching the sync path, which passes null for it);
         // INTERNAL/ACTOR get one built from taskId + onStatusMessage, which dispatch consumes
         // and stops.
         const progressTracker = tool.type === TOOL_TYPE.ACTOR_MCP
             ? null
-            : createProgressTracker(progressToken, extra.sendNotification, taskId, onStatusMessage);
+            : createProgressTracker(progressToken, sendNotification, taskId, onStatusMessage);
         const dispatchResult = await dispatchToolCall({
             tool,
             toolArgs,
             logSafeArgs,
             apifyToken,
             apifyClient,
-            apifyMcpServer,
             mcpSessionId,
             progressToken,
             progressTracker,
             shouldForwardNotifications: false,
-            extra: taskExtra,
+            signal: cancelWatcher.signal,
+            sendNotification,
+            emitLog,
+            actorStore,
+            paymentProvider,
+            tools,
             actorName,
             actorId,
             taskMode: true,
@@ -182,7 +189,7 @@ export async function executeToolAndUpdateTask(params) {
         // synchronous CallTool path, which task-mode calls like call-actor bypass).
         result = withReportProblemNudge({
             result,
-            tools: apifyMcpServer.tools,
+            tools,
             failingToolName: tool.name,
             failureCategory: callDiagnostics.failure_category,
             failureHttpStatus: callDiagnostics.failure_http_status,
@@ -300,7 +307,7 @@ export async function executeToolAndUpdateTask(params) {
                         isError: true,
                         internalToolStatus: toolStatus,
                     },
-                    tools: apifyMcpServer.tools,
+                    tools,
                     failingToolName: tool.name,
                     failureCategory: callDiagnostics.failure_category,
                     failureHttpStatus: callDiagnostics.failure_http_status,
@@ -312,7 +319,7 @@ export async function executeToolAndUpdateTask(params) {
                 // Compile-time exhaustiveness guard (same `satisfies never` idiom as dispatchToolCall's
                 // default arm): a new TOOL_CALL_ERROR_KIND makes `errorResult` non-`never` here and fails
                 // to compile. Unreachable at runtime.
-                throw new McpError(ErrorCode.InvalidParams, `Unknown tool-call error kind "${errorResult.kind}"`);
+                throw new Error(`Unknown tool-call error kind "${errorResult.kind}"`);
         }
     }
     finally {

package/dist/mcp/task_execution.js.map

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

package/dist/mcp/tool_call_engine.d.ts

@@ -2,14 +2,12 @@
  * Shared tools/call spine: gate, resolve, prepare payment/validation context, then dispatch.
  * Returns neutral outcomes; the shell constructs protocol errors and side-channel notifications.
  */
-import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { Notification, Request } from '@modelcontextprotocol/sdk/types.js';
+import type { ServerNotification } from '@modelcontextprotocol/sdk/types.js';
 import type { ApifyClient } from '../apify_client.js';
-import type { PaymentMeta, RequestHeaders } from '../payments/types.js';
-import type { CallDiagnostics, ToolCallTelemetryProperties, ToolEntry, ToolStatus } from '../types.js';
+import type { PaymentMeta, PaymentProvider, RequestHeaders } from '../payments/types.js';
+import type { ActorStore, CallDiagnostics, ToolCallTelemetryProperties, ToolEntry, ToolStatus } from '../types.js';
 import type { buildPaymentRequiredResponse } from '../utils/payment_errors.js';
 import type { McpClientContext } from './client_context.js';
-import type { ActorsMcpServer } from './server.js';
 /** A pre-dispatch failure that the shell converts to v1's protocol-error sequence. */
 export type InvalidToolCall = {
     message: string;
@@ -48,9 +46,14 @@ export declare function buildPreflightFailureOutcome(standbyRejection: Record<st
     callDiagnostics: CallDiagnostics;
     result: Record<string, unknown> | ReturnType<typeof buildPaymentRequiredResponse>;
 };
+/**
+ * The tool a `tools/call` names, accepting a legacy alias or an Actor's full name. The single
+ * resolution rule: a shell that needs the tool before {@link prepareToolCall} returns (e.g. for its
+ * `outputSchema`) must resolve it the same way, or the two can disagree about which tool was called.
+ */
+export declare function resolveToolEntry(name: string, tools: Map<string, ToolEntry>): ToolEntry | undefined;
 /** Prepares a call; protocol errors are left to the shell. */
 export declare function prepareToolCall(params: {
-    apifyMcpServer: ActorsMcpServer;
     apifyToken: string;
     name: string;
     args: Record<string, unknown> | undefined;
@@ -60,20 +63,30 @@ export declare function prepareToolCall(params: {
     mcpSessionId: string | undefined;
     telemetryData: ToolCallTelemetryProperties | null;
     clientContext: McpClientContext | undefined;
-    extra?: RequestHandlerExtra<Request, Notification>;
+    tools: Map<string, ToolEntry>;
+    paymentProvider?: PaymentProvider;
+    allowUnauthMode?: boolean;
+    signal?: AbortSignal;
 }): Promise<PreparedCall | InvalidToolCall | PreparedCallError>;
 /** Runs pre-flight handling and dispatch, returning the exact wire payload. */
 export declare function executeSyncToolCall(prepared: PreparedCall, params: {
-    apifyMcpServer: ActorsMcpServer;
     apifyToken: string;
     toolName: string;
     mcpSessionId: string | undefined;
     progressToken: string | number | undefined;
-    extra: RequestHandlerExtra<Request, Notification>;
+    tools: Map<string, ToolEntry>;
+    actorStore?: ActorStore;
+    paymentProvider?: PaymentProvider;
+    signal: AbortSignal;
+    sendNotification: (notification: ServerNotification) => Promise<void>;
+    emitLog: (msg: {
+        level: string;
+        data?: unknown;
+    }) => Promise<void>;
 }): Promise<ToolCallOutcome>;
 /** Maps non-protocol errors to v1 tool results, including diagnostics and report-problem nudges. */
 export declare function classifyToolCallError(error: unknown, params: {
-    apifyMcpServer: ActorsMcpServer;
+    tools: Map<string, ToolEntry>;
     toolName: string;
     failingToolName: string;
     actorName: string | undefined;

package/dist/mcp/tool_call_engine.d.ts.map

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

package/dist/mcp/tool_call_engine.js

@@ -2,7 +2,6 @@
  * Shared tools/call spine: gate, resolve, prepare payment/validation context, then dispatch.
  * Returns neutral outcomes; the shell constructs protocol errors and side-channel notifications.
  */
-import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import dedent from 'dedent';
 import log from '@apify/log';
 import { ALLOWED_TASK_TOOL_EXECUTION_MODES, FAILURE_CATEGORY, HELPER_TOOLS, TOOL_STATUS } from '../const.js';
@@ -16,7 +15,7 @@ import { logHttpError } from '../utils/logging.js';
 import { respondOk } from '../utils/mcp.js';
 import { getRequestOriginForClient } from '../utils/mcp_clients.js';
 import { createProgressTracker } from '../utils/progress.js';
-import { extractAjvErrorDetails } from '../utils/tool_status.js';
+import { extractAjvErrorDetails, isMcpError } from '../utils/tool_status.js';
 import { buildActorFields, extractActorId, extractActorName, getToolFullName } from '../utils/tools.js';
 import { buildToolCallErrorResult, TOOL_CALL_ERROR_KIND } from './tool_call_error_mapper.js';
 import { dispatchToolCall } from './tool_dispatch.js';
@@ -32,13 +31,22 @@ export function buildPreflightFailureOutcome(standbyRejection, paymentRequiredRe
         result: (standbyRejection !== null && standbyRejection !== void 0 ? standbyRejection : paymentRequiredResult),
     };
 }
+/**
+ * The tool a `tools/call` names, accepting a legacy alias or an Actor's full name. The single
+ * resolution rule: a shell that needs the tool before {@link prepareToolCall} returns (e.g. for its
+ * `outputSchema`) must resolve it the same way, or the two can disagree about which tool was called.
+ */
+export function resolveToolEntry(name, tools) {
+    var _a;
+    const newName = (_a = legacyToolNameToNew(name)) !== null && _a !== void 0 ? _a : name;
+    return Array.from(tools.values()).find((tool) => tool.name === newName || getToolFullName(tool) === newName);
+}
 /** Prepares a call; protocol errors are left to the shell. */
 export async function prepareToolCall(params) {
-    var _a, _b, _c, _d, _e;
-    const { apifyMcpServer, apifyToken, name, meta, requestHeaders, isTaskRequest, telemetryData, clientContext } = params;
+    var _a, _b;
+    const { apifyToken, name, meta, requestHeaders, isTaskRequest, telemetryData, clientContext, tools, paymentProvider, allowUnauthMode, } = params;
     let { args } = params;
-    const { options, tools } = apifyMcpServer;
-    if (!apifyToken && !((_a = options.paymentProvider) === null || _a === void 0 ? void 0 : _a.allowsUnauthenticated) && !options.allowUnauthMode) {
+    if (!apifyToken && !(paymentProvider === null || paymentProvider === void 0 ? void 0 : paymentProvider.allowsUnauthenticated) && !allowUnauthMode) {
         return {
             message: dedent `
                 Apify API token is required but was not provided.
@@ -49,10 +57,9 @@ export async function prepareToolCall(params) {
             callDiagnostics: { failure_category: FAILURE_CATEGORY.AUTH },
         };
     }
-    const newName = (_b = legacyToolNameToNew(name)) !== null && _b !== void 0 ? _b : name;
-    const toolEntry = Array.from(tools.values()).find((t) => t.name === newName || getToolFullName(t) === newName);
+    const toolEntry = resolveToolEntry(name, tools);
     if (!toolEntry) {
-        const availableTools = apifyMcpServer.listToolNames();
+        const availableTools = Array.from(tools.keys());
         return {
             message: dedent `
                 Tool "${name}" was not found.
@@ -92,7 +99,7 @@ export async function prepareToolCall(params) {
         args = decodeDotPropertyNames(args);
         decodedArgs = args;
         const { toolArgsWithoutPayment: toolArgs, toolArgsRedacted: logSafeArgs, apifyClient, paymentRequiredResult, } = prepareToolCallContext({
-            provider: options.paymentProvider,
+            provider: paymentProvider,
             tool,
             args: args,
             apifyToken,
@@ -127,7 +134,7 @@ export async function prepareToolCall(params) {
                 decodedArgs,
             };
         }
-        const taskSupport = (_c = tool.execution) === null || _c === void 0 ? void 0 : _c.taskSupport;
+        const taskSupport = (_a = tool.execution) === null || _a === void 0 ? void 0 : _a.taskSupport;
         if (isTaskRequest && !ALLOWED_TASK_TOOL_EXECUTION_MODES.includes(taskSupport)) {
             return {
                 message: dedent `
@@ -144,7 +151,6 @@ export async function prepareToolCall(params) {
             };
         }
         // Standby Actors need a specific rejection instead of a generic 402 in both modes.
-        const { paymentProvider } = options;
         const isCallActorTool = tool.name === HELPER_TOOLS.ACTOR_CALL || tool.name === HELPER_TOOLS.ACTOR_CALL_WIDGET;
         const actorArg = toolArgs === null || toolArgs === void 0 ? void 0 : toolArgs.actor;
         const standbyRejection = paymentProvider && isCallActorTool && typeof actorArg === 'string' && actorArg.length > 0
@@ -169,15 +175,15 @@ export async function prepareToolCall(params) {
     }
     catch (error) {
         // Keep protocol errors as JSON-RPC errors; classify other failures with actor context.
-        if (error instanceof McpError)
+        if (isMcpError(error))
             throw error;
         const outcome = classifyToolCallError(error, {
-            apifyMcpServer,
+            tools,
             toolName: name,
             failingToolName: resolvedToolName,
             actorName,
             actorId,
-            isAborted: Boolean((_e = (_d = params.extra) === null || _d === void 0 ? void 0 : _d.signal) === null || _e === void 0 ? void 0 : _e.aborted),
+            isAborted: Boolean((_b = params.signal) === null || _b === void 0 ? void 0 : _b.aborted),
             mcpSessionId: params.mcpSessionId,
         });
         return { ...outcome, resolvedToolName, decodedArgs };
@@ -185,13 +191,12 @@ export async function prepareToolCall(params) {
 }
 /** Runs pre-flight handling and dispatch, returning the exact wire payload. */
 export async function executeSyncToolCall(prepared, params) {
-    var _a;
-    const { apifyMcpServer, apifyToken, toolName, mcpSessionId, progressToken, extra } = params;
+    const { apifyToken, toolName, mcpSessionId, progressToken, tools, actorStore, paymentProvider, signal, sendNotification, emitLog, } = params;
     const { tool, toolArgs, logSafeArgs, apifyClient, actorName, actorId, standbyRejection, paymentRequiredResult } = prepared;
     const resolvedToolName = getToolFullName(tool);
     const nudge = (result, callDiagnostics) => withReportProblemNudge({
         result,
-        tools: apifyMcpServer.tools,
+        tools,
         failingToolName: resolvedToolName,
         failureCategory: callDiagnostics.failure_category,
         failureHttpStatus: callDiagnostics.failure_http_status,
@@ -210,7 +215,7 @@ export async function executeSyncToolCall(prepared, params) {
     const progressTrackerOptIn = tool.type === TOOL_TYPE.ACTOR ||
         (tool.type === TOOL_TYPE.INTERNAL &&
             (tool.name === HELPER_TOOLS.ACTOR_CALL || tool.name === HELPER_TOOLS.ACTOR_RUNS_GET));
-    const progressTracker = progressTrackerOptIn ? createProgressTracker(progressToken, extra.sendNotification) : null;
+    const progressTracker = progressTrackerOptIn ? createProgressTracker(progressToken, sendNotification) : null;
     try {
         const dispatchResult = await dispatchToolCall({
             tool,
@@ -218,12 +223,16 @@ export async function executeSyncToolCall(prepared, params) {
             logSafeArgs,
             apifyToken,
             apifyClient,
-            apifyMcpServer,
             mcpSessionId,
             progressToken,
             progressTracker,
             shouldForwardNotifications: true,
-            extra,
+            signal,
+            sendNotification,
+            emitLog,
+            actorStore,
+            paymentProvider,
+            tools,
             actorName,
             actorId,
             taskMode: false,
@@ -236,25 +245,25 @@ export async function executeSyncToolCall(prepared, params) {
     }
     catch (error) {
         // Protocol errors stay JSON-RPC errors; a 402-coded McpError must not become a payment result.
-        if (error instanceof McpError)
+        if (isMcpError(error))
             throw error;
         return classifyToolCallError(error, {
-            apifyMcpServer,
+            tools,
             toolName,
             failingToolName: resolvedToolName,
             actorName,
             actorId,
-            isAborted: Boolean((_a = extra.signal) === null || _a === void 0 ? void 0 : _a.aborted),
+            isAborted: Boolean(signal.aborted),
             mcpSessionId,
         });
     }
 }
 /** Maps non-protocol errors to v1 tool results, including diagnostics and report-problem nudges. */
 export function classifyToolCallError(error, params) {
-    const { apifyMcpServer, toolName, failingToolName, actorName, actorId, isAborted, mcpSessionId } = params;
+    const { tools, toolName, failingToolName, actorName, actorId, isAborted, mcpSessionId } = params;
     const nudge = (result, callDiagnostics) => withReportProblemNudge({
         result,
-        tools: apifyMcpServer.tools,
+        tools,
         failingToolName,
         failureCategory: callDiagnostics.failure_category,
         failureHttpStatus: callDiagnostics.failure_http_status,

package/dist/mcp/tool_call_engine.js.map

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

package/dist/mcp/tool_call_telemetry.d.ts

@@ -1,11 +1,11 @@
-import type { CallDiagnostics, ToolCallTelemetryProperties, ToolStatus } from '../types.js';
+import type { CallDiagnostics, TelemetryEnv, ToolCallTelemetryProperties, ToolStatus, TransportType } from '../types.js';
 import type { McpClientContext } from './client_context.js';
-import type { ActorsMcpServer } from './server.js';
 type PrepareTelemetryDataParams = {
     toolName: string;
     mcpSessionId: string | undefined;
     apifyToken: string;
-    apifyMcpServer: ActorsMcpServer;
+    telemetryEnabled: boolean;
+    transportType?: TransportType;
     clientContext: McpClientContext | undefined;
 };
 /**
@@ -32,7 +32,7 @@ type LogToolCallAndTelemetryParams = {
     callDiagnostics?: CallDiagnostics;
     args?: Record<string, unknown>;
     result?: unknown;
-    apifyMcpServer: ActorsMcpServer;
+    telemetryEnv: TelemetryEnv;
 };
 export declare function logToolCallAndTelemetry(params: LogToolCallAndTelemetryParams): void;
 export {};

package/dist/mcp/tool_call_telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool_call_telemetry.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAM5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,KAAK,0BAA0B,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,eAAe,CAAC;IAChC,aAAa,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,0BAA0B,GACnC,OAAO,CAAC;IAAE,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA6BvF;AAED;;;;;GAKG;AACH,KAAK,6BAA6B,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAClD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAmDnF"}
+{"version":3,"file":"tool_call_telemetry.d.ts","sourceRoot":"","sources":["../../src/mcp/tool_call_telemetry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,eAAe,EACf,YAAY,EACZ,2BAA2B,EAC3B,UAAU,EACV,aAAa,EAChB,MAAM,aAAa,CAAC;AAMrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,KAAK,0BAA0B,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,0BAA0B,GACnC,OAAO,CAAC;IAAE,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA6BvF;AAED;;;;;GAKG;AACH,KAAK,6BAA6B,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAClD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;CAC9B,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAmDnF"}

package/dist/mcp/tool_call_telemetry.js

@@ -12,8 +12,8 @@ import { getPackageVersion } from '../utils/version.js';
  */
 export async function prepareTelemetryData(params) {
     var _a, _b;
-    const { toolName, mcpSessionId, apifyToken, apifyMcpServer, clientContext } = params;
-    if (!apifyMcpServer.telemetryEnabled) {
+    const { toolName, mcpSessionId, apifyToken, telemetryEnabled, transportType, clientContext } = params;
+    if (!telemetryEnabled) {
         return { telemetryData: null, userId: null };
     }
     // Get userId from cache or fetch from API
@@ -32,7 +32,7 @@ export async function prepareTelemetryData(params) {
         mcp_protocol_version: (clientContext === null || clientContext === void 0 ? void 0 : clientContext.protocolVersion) || '',
         mcp_client_capabilities: (clientContext === null || clientContext === void 0 ? void 0 : clientContext.capabilities) || null,
         mcp_session_id: mcpSessionId || '',
-        transport_type: apifyMcpServer.options.transportType || '',
+        transport_type: transportType || '',
         tool_name: toolName,
         tool_status: TOOL_STATUS.SUCCEEDED, // Will be updated in finally
         tool_exec_time_ms: 0, // Will be calculated in finally
@@ -72,13 +72,13 @@ export function logToolCallAndTelemetry(params) {
             // threads them back. Applied uniformly, last. See deriveResourceIds.
             ...deriveResourceIds(params.args, params.result),
         };
-        trackToolCall(params.userId, params.apifyMcpServer.telemetryEnv, finalizedTelemetryData);
+        trackToolCall(params.userId, params.telemetryEnv, finalizedTelemetryData);
         // A successful report-problem call also emits a dedicated feedback event carrying the
         // submission. A downstream Segment destination fans it out to Slack/GitHub.
         if (params.toolName === HELPER_TOOLS.PROBLEM_REPORT &&
             params.toolStatus === TOOL_STATUS.SUCCEEDED &&
             params.args) {
-            trackReportedProblem(params.userId, params.apifyMcpServer.telemetryEnv, buildReportedProblemProperties(finalizedTelemetryData, params.args));
+            trackReportedProblem(params.userId, params.telemetryEnv, buildReportedProblemProperties(finalizedTelemetryData, params.args));
         }
     }
 }

package/dist/mcp/tool_call_telemetry.js.map

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