@apify/actors-mcp-server 0.11.7-beta.0 → 0.11.7-beta.10

package/dist/mcp/tool_dispatch.js

@@ -0,0 +1,208 @@
+import { CallToolResultSchema, ErrorCode, McpError, ServerNotificationSchema, } from '@modelcontextprotocol/sdk/types.js';
+import dedent from 'dedent';
+import log from '@apify/log';
+import { FAILURE_CATEGORY, TOOL_STATUS } from '../const.js';
+import { actorExecutor } from '../tools/actors/actor_executor.js';
+import { TOOL_TYPE } from '../types.js';
+import { remoteMcpFailureDetail } from '../utils/apify_errors.js';
+import { logHttpError } from '../utils/logging.js';
+import { respondErrorNoTelemetry } from '../utils/mcp.js';
+import { applyToolTelemetry, classifyFailureCategory, getToolStatusFromError } from '../utils/tool_status.js';
+import { buildActorFields } from '../utils/tools.js';
+import { connectMCPClient } from './client.js';
+import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC } from './const.js';
+/**
+ * Runs a validated tool call through the single tool-type dispatch switch and returns the raw
+ * result plus derived telemetry. The exhaustive switch turns a future 4th TOOL_TYPE into a compile
+ * error (same `satisfies never` idiom as getToolFullName) instead of a silent runtime fall-through.
+ * Both the sync `CallToolRequestSchema` handler and `executeToolAndUpdateTask` call this after their
+ * own pre-dispatch validation and keep their own try/catch + buildToolCallErrorResult around it.
+ * INTERNAL and ACTOR execution errors propagate to the caller's catch; the ACTOR_MCP case keeps its
+ * own inner catch and returns a soft-fail result instead of throwing.
+ *
+ * `extractToolTelemetry` (via `applyToolTelemetry`) runs once here, in the INTERNAL and ACTOR
+ * cases, and strips `toolTelemetry` in place, so callers must not re-strip. ACTOR_MCP sets
+ * telemetry manually instead. The caller constructs `progressTracker`; dispatch consumes it and stops
+ * it in the branch `finally`. The abort source is `extra.signal`: the request signal for sync; the
+ * task caller passes a `taskExtra` whose `signal` is the cancel watcher's, so a client disconnect
+ * never cancels a task. `shouldForwardNotifications` gates only the ACTOR_MCP raw-notification
+ * forwarder (true for sync, false for task, whose originating request is already answered).
+ * `taskMode` is a passthrough to `tool.call` / `executeActorTool`, never a dispatch selector.
+ */
+export async function dispatchToolCall(params) {
+    var _a, _b, _c, _d;
+    const { tool, toolArgs, logSafeArgs, apifyToken, apifyClient, apifyMcpServer, mcpSessionId, progressToken, progressTracker, shouldForwardNotifications, extra, actorName, actorId, taskMode, logContext, } = params;
+    let result = {};
+    let toolStatus = TOOL_STATUS.SUCCEEDED;
+    // Always populate actor fields so they're tracked on both success and failure paths.
+    let callDiagnostics = { ...buildActorFields(actorName, actorId) };
+    switch (tool.type) {
+        case TOOL_TYPE.INTERNAL: {
+            try {
+                log.info(`Calling internal tool${(_a = logContext === null || logContext === void 0 ? void 0 : logContext.messageSuffix) !== null && _a !== void 0 ? _a : ''}`, {
+                    ...logContext === null || logContext === void 0 ? void 0 : logContext.fields,
+                    toolName: tool.name,
+                    mcpSessionId,
+                    input: logSafeArgs,
+                });
+                const res = (await tool.call({
+                    args: toolArgs,
+                    extra,
+                    apifyMcpServer,
+                    mcpServer: apifyMcpServer.server,
+                    apifyToken,
+                    apifyClient,
+                    progressTracker,
+                    mcpSessionId,
+                    taskMode,
+                }));
+                // Extract diagnostics and strip internal fields from res before returning to client.
+                ({ toolStatus, callDiagnostics } = applyToolTelemetry(res, actorName, actorId, callDiagnostics));
+                result = res;
+            }
+            finally {
+                progressTracker === null || progressTracker === void 0 ? void 0 : progressTracker.stop();
+            }
+            break;
+        }
+        case TOOL_TYPE.ACTOR_MCP: {
+            // This case never throws: connect/exec failures resolve to a soft-fail `result`
+            // (isError body) below instead. As a task, that means the outer completeTask
+            // stores it via the 'completed' path (isError body) — deliberately matching sync's
+            // own soft-fail semantics, unlike ACTOR/INTERNAL, whose thrown errors land in the
+            // task caller's 'failed' path.
+            let client = null;
+            try {
+                client = await connectMCPClient(tool.serverUrl, apifyToken, mcpSessionId);
+                if (!client) {
+                    const msg = dedent `
+                        Failed to connect to MCP server at "${tool.serverUrl}".
+                        Please verify the server URL is correct and accessible, and ensure you have a valid Apify token with appropriate permissions.
+                    `;
+                    log.softFail(msg, { mcpSessionId, failureCategory: FAILURE_CATEGORY.INTERNAL_ERROR });
+                    await apifyMcpServer.server.sendLoggingMessage({ level: 'error', data: msg });
+                    toolStatus = TOOL_STATUS.SOFT_FAIL;
+                    callDiagnostics = { ...callDiagnostics, failure_category: FAILURE_CATEGORY.INTERNAL_ERROR };
+                    result = respondErrorNoTelemetry(msg);
+                    break;
+                }
+                // Only set up notification handlers if progressToken is provided by the client.
+                // Gated off for tasks (shouldForwardNotifications=false): the originating request is
+                // already answered, so forwarding against its progressToken would misroute.
+                if (shouldForwardNotifications && progressToken !== undefined && progressToken !== null) {
+                    // Set up notification handlers for the client
+                    for (const schema of ServerNotificationSchema.options) {
+                        const method = schema.shape.method.value;
+                        // Forward notifications from the proxy client to the server
+                        client.setNotificationHandler(schema, async (notification) => {
+                            log.debug('Sending MCP notification', {
+                                method,
+                                mcpSessionId,
+                                notification,
+                            });
+                            await extra.sendNotification(notification);
+                        });
+                    }
+                }
+                log.info(`Calling Actor-MCP${(_b = logContext === null || logContext === void 0 ? void 0 : logContext.messageSuffix) !== null && _b !== void 0 ? _b : ''}`, {
+                    ...logContext === null || logContext === void 0 ? void 0 : logContext.fields,
+                    toolName: tool.name,
+                    actorMcpToolName: tool.originToolName,
+                    actorId: tool.actorId,
+                    mcpSessionId,
+                    input: logSafeArgs,
+                });
+                const res = await client.callTool({
+                    name: tool.originToolName,
+                    arguments: toolArgs,
+                    // Without forwarding there is no route back for remote progress — don't
+                    // hand the remote a token nobody listens to.
+                    ...(shouldForwardNotifications ? { _meta: { progressToken } } : {}),
+                }, CallToolResultSchema, {
+                    timeout: EXTERNAL_TOOL_CALL_TIMEOUT_MSEC,
+                });
+                // TODO: actor-mcp responses are opaque — isError could be a user input problem
+                // (e.g. invalid query) or a genuine server failure. We can't distinguish without
+                // parsing the error text. Defaulting to INTERNAL_ERROR for now; revisit when
+                // actor-mcp gets deeper telemetry treatment.
+                if ('isError' in res && res.isError) {
+                    toolStatus = TOOL_STATUS.SOFT_FAIL;
+                    callDiagnostics = {
+                        failure_category: FAILURE_CATEGORY.INTERNAL_ERROR,
+                        ...buildActorFields(actorName, actorId),
+                    };
+                }
+                result = { ...res };
+            }
+            catch (error) {
+                toolStatus = getToolStatusFromError(error, Boolean((_c = extra.signal) === null || _c === void 0 ? void 0 : _c.aborted));
+                const failureDetail = error instanceof Error ? error.message.slice(0, 200) : String(error).slice(0, 200);
+                callDiagnostics = {
+                    failure_category: classifyFailureCategory(error),
+                    failure_detail: failureDetail,
+                    ...buildActorFields(actorName, actorId),
+                };
+                logHttpError(error, `Failed to call MCP tool '${tool.originToolName}' on Actor '${tool.actorId}'`, {
+                    actorId: tool.actorId,
+                    toolName: tool.originToolName,
+                    failureCategory: callDiagnostics.failure_category,
+                });
+                result = respondErrorNoTelemetry(`Failed to call MCP tool '${tool.originToolName}' on Actor '${tool.actorId}': ${remoteMcpFailureDetail(error)}`);
+            }
+            finally {
+                if (client)
+                    await client.close();
+            }
+            break;
+        }
+        case TOOL_TYPE.ACTOR: {
+            try {
+                log.info(`Calling Actor${(_d = logContext === null || logContext === void 0 ? void 0 : logContext.messageSuffix) !== null && _d !== void 0 ? _d : ''}`, {
+                    ...logContext === null || logContext === void 0 ? void 0 : logContext.fields,
+                    toolName: tool.name,
+                    actorName: tool.actorFullName,
+                    mcpSessionId,
+                    input: logSafeArgs,
+                });
+                const executorResult = await actorExecutor.executeActorTool({
+                    actorFullName: tool.actorFullName,
+                    input: toolArgs,
+                    apifyClient,
+                    callOptions: { memory: tool.memoryMbytes },
+                    progressTracker,
+                    abortSignal: extra.signal,
+                    mcpSessionId,
+                    datasetItemsSchema: tool.datasetItemsSchema,
+                    taskMode,
+                });
+                if (!executorResult) {
+                    toolStatus = TOOL_STATUS.ABORTED;
+                    // Receivers of cancellation notifications SHOULD NOT send a response for the cancelled request
+                    // https://modelcontextprotocol.io/specification/2025-06-18/basic/utilities/cancellation#behavior-requirements
+                    result = {};
+                    break;
+                }
+                // Mirror the INTERNAL branch: read the telemetry the executor embedded on error
+                // results (e.g. respondUserError → SOFT_FAIL/INVALID_INPUT), strip it from the wire,
+                // and set failure_category so the report-problem nudge picks the softer variant.
+                ({ toolStatus, callDiagnostics } = applyToolTelemetry(executorResult, actorName, actorId, callDiagnostics));
+                result = executorResult;
+            }
+            finally {
+                if (progressTracker) {
+                    progressTracker.stop();
+                }
+            }
+            break;
+        }
+        default:
+            // Exhaustiveness guard mirroring getToolFullName: a new TOOL_TYPE member makes `tool`
+            // non-`never` here and fails `satisfies never` at compile time. Unreachable at runtime —
+            // ToolEntry is a closed 3-way union. Unlike the pre-extraction fall-through (which also
+            // listed available tools, called log.softFail, and sent a logging message before
+            // throwing), this just throws InvalidParams with no side effects.
+            throw new McpError(ErrorCode.InvalidParams, `Unknown tool type "${tool.type}"`);
+    }
+    return { result, toolStatus, callDiagnostics };
+}
+//# sourceMappingURL=tool_dispatch.js.map

package/dist/mcp/tool_dispatch.js.map

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

package/dist/payments/const.d.ts

@@ -1,5 +1,6 @@
 import { type HelperToolName } from '../const.js';
 export declare const PAYMENT_PROTOCOL_HEADER = "x-apify-payment-protocol";
+export declare const SKYFIRE_PAY_ID_KEY = "skyfire-pay-id";
 export declare const SKYFIRE_TOOL_INSTRUCTIONS: string;
 export declare const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = "Skyfire PAY JWT token used for billing purposes. This must be the JWT token string returned by the create-pay-token tool (starts with \"ey\"), NOT a token ID or UUID.";
 export declare const SKYFIRE_README_CONTENT: string;

package/dist/payments/const.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../../src/payments/const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEhE,eAAO,MAAM,uBAAuB,6BAA6B,CAAC;AAKlE,eAAO,MAAM,yBAAyB,QAAi2B,CAAC;AAEx4B,eAAO,MAAM,mCAAmC,2KAAyK,CAAC;AAE1N,eAAO,MAAM,sBAAsB,QAAs8B,CAAC;AAE1+B;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAWhC,CAAC"}
+{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../../src/payments/const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEhE,eAAO,MAAM,uBAAuB,6BAA6B,CAAC;AAKlE,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AAEnD,eAAO,MAAM,yBAAyB,QAAi2B,CAAC;AAEx4B,eAAO,MAAM,mCAAmC,2KAAyK,CAAC;AAE1N,eAAO,MAAM,sBAAsB,QAAs8B,CAAC;AAE1+B;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAWhC,CAAC"}

package/dist/payments/const.js

@@ -2,6 +2,7 @@ import { HELPER_TOOLS } from '../const.js';
 export const PAYMENT_PROTOCOL_HEADER = 'x-apify-payment-protocol';
 const SKYFIRE_MIN_CHARGE_USD = 5.0;
 const SKYFIRE_SELLER_ID = process.env.SKYFIRE_SELLER_SERVICE_ID;
+export const SKYFIRE_PAY_ID_KEY = 'skyfire-pay-id';
 export const SKYFIRE_TOOL_INSTRUCTIONS = `To run the Actor, you need to provide a Skyfire PAY JWT token in the \`skyfire-pay-id\` input property. You first need to create the Skyfire PAY token by calling the \`create-pay-token\` tool from the Skyfire MCP server and then provide the created JWT token in the \`skyfire-pay-id\` input property when calling Actor tool. IMPORTANT: The value you pass to \`skyfire-pay-id\` must be the JWT token string itself (it starts with "ey"), NOT an ID or UUID. The Skyfire PAY token is used for billing purposes and needs to be charged with at least ${SKYFIRE_MIN_CHARGE_USD} USD.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When retrieving Actor output using the \`get-dataset-items\` tool, you also need to provide the same Skyfire PAY JWT token (starting with "ey") in the \`skyfire-pay-id\` input property.`;
 export const SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION = `Skyfire PAY JWT token used for billing purposes. This must be the JWT token string returned by the create-pay-token tool (starts with "ey"), NOT a token ID or UUID.`;
 export const SKYFIRE_README_CONTENT = `The Apify MCP Server allows clients to interact with Apify Actors, storage, and documentation. Before running any Apify Actor, you need to set up a Skyfire PAY token for billing purposes. To set up the PAY token you need to use the create-pay-token tool from the Skyfire MCP server. The PAY token must be charged with a minimum of ${SKYFIRE_MIN_CHARGE_USD} USD to be valid.${SKYFIRE_SELLER_ID ? ` The Skyfire seller ID for Apify MCP server is "${SKYFIRE_SELLER_ID}".` : ''} When running an Actor using the call-actor tool, you must provide the Skyfire PAY JWT token in the \`skyfire-pay-id\` input property. IMPORTANT: The value for \`skyfire-pay-id\` must be the actual JWT token string (starting with "ey") returned by the create-pay-token tool, NOT a token ID or UUID. Similarly, when retrieving Actor output using the get-dataset-items tool, you must also provide the same Skyfire PAY JWT token (starting with "ey") in the \`skyfire-pay-id\` input property.`;

package/dist/payments/const.js.map

@@ -1 +1 @@
-{"version":3,"file":"const.js","sourceRoot":"","sources":["../../src/payments/const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,aAAa,CAAC;AAEhE,MAAM,CAAC,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAElE,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;AAEhE,MAAM,CAAC,MAAM,yBAAyB,GAAG,miBAAmiB,sBAAsB,QAAQ,iBAAiB,CAAC,CAAC,CAAC,mDAAmD,iBAAiB,IAAI,CAAC,CAAC,CAAC,EAAE,4LAA4L,CAAC;AAEx4B,MAAM,CAAC,MAAM,mCAAmC,GAAG,sKAAsK,CAAC;AAE1N,MAAM,CAAC,MAAM,sBAAsB,GAAG,8UAA8U,sBAAsB,oBAAoB,iBAAiB,CAAC,CAAC,CAAC,mDAAmD,iBAAiB,IAAI,CAAC,CAAC,CAAC,EAAE,0eAA0e,CAAC;AAE1+B;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAiB;IACzD,YAAY,CAAC,UAAU;IACvB,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,gBAAgB;IAC7B,YAAY,CAAC,WAAW;IACxB,YAAY,CAAC,iBAAiB;IAC9B,YAAY,CAAC,kBAAkB;IAC/B,YAAY,CAAC,mBAAmB;IAChC,YAAY,CAAC,wBAAwB;IACrC,YAAY,CAAC,0BAA0B;CAC1C,CAAC,CAAC"}
+{"version":3,"file":"const.js","sourceRoot":"","sources":["../../src/payments/const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,aAAa,CAAC;AAEhE,MAAM,CAAC,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAElE,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;AAEhE,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,yBAAyB,GAAG,miBAAmiB,sBAAsB,QAAQ,iBAAiB,CAAC,CAAC,CAAC,mDAAmD,iBAAiB,IAAI,CAAC,CAAC,CAAC,EAAE,4LAA4L,CAAC;AAEx4B,MAAM,CAAC,MAAM,mCAAmC,GAAG,sKAAsK,CAAC;AAE1N,MAAM,CAAC,MAAM,sBAAsB,GAAG,8UAA8U,sBAAsB,oBAAoB,iBAAiB,CAAC,CAAC,CAAC,mDAAmD,iBAAiB,IAAI,CAAC,CAAC,CAAC,EAAE,0eAA0e,CAAC;AAE1+B;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAiB;IACzD,YAAY,CAAC,UAAU;IACvB,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,gBAAgB;IAC7B,YAAY,CAAC,WAAW;IACxB,YAAY,CAAC,iBAAiB;IAC9B,YAAY,CAAC,kBAAkB;IAC/B,YAAY,CAAC,mBAAmB;IAChC,YAAY,CAAC,wBAAwB;IACrC,YAAY,CAAC,0BAA0B;CAC1C,CAAC,CAAC"}

package/dist/payments/skyfire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skyfire.d.ts","sourceRoot":"","sources":["../../src/payments/skyfire.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAS7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlE;;;;;GAKG;AACH,qBAAa,sBAAuB,YAAW,eAAe;IAC1D,QAAQ,CAAC,EAAE,EAAG,SAAS,CAAU;IACjC,QAAQ,CAAC,qBAAqB,QAAQ;WAEzB,MAAM,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAItD,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS;IAwB9C,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI;IAO7D,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;IAWhE,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAK3E,aAAa,IAAI,MAAM,GAAG,IAAI;IAI9B,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO;CAO3C"}
+{"version":3,"file":"skyfire.d.ts","sourceRoot":"","sources":["../../src/payments/skyfire.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAU7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElE;;;;;GAKG;AACH,qBAAa,sBAAuB,YAAW,eAAe;IAC1D,QAAQ,CAAC,EAAE,EAAG,SAAS,CAAU;IACjC,QAAQ,CAAC,qBAAqB,QAAQ;WAEzB,MAAM,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAItD,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS;IAwB9C,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI;IAO7D,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;IAWhE,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAK3E,aAAa,IAAI,MAAM,GAAG,IAAI;IAI9B,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO;CAO3C"}

package/dist/payments/skyfire.js

@@ -1,7 +1,6 @@
 import { redactSkyfirePayId } from '../utils/logging.js';
 import { cloneToolEntry } from '../utils/tools.js';
-import { PAYMENT_PROTOCOL_HEADER, SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION, SKYFIRE_README_CONTENT, SKYFIRE_TOOL_INSTRUCTIONS, } from './const.js';
-const SKYFIRE_PAY_ID_KEY = 'skyfire-pay-id';
+import { PAYMENT_PROTOCOL_HEADER, SKYFIRE_PAY_ID_KEY, SKYFIRE_PAY_ID_PROPERTY_DESCRIPTION, SKYFIRE_README_CONTENT, SKYFIRE_TOOL_INSTRUCTIONS, } from './const.js';
 /**
  * Skyfire payment provider.
  *
@@ -70,10 +69,10 @@ export class SkyfirePaymentProvider {
         return SKYFIRE_README_CONTENT;
     }
     redactForLogging(args) {
-        // TODO: redactSkyfirePayId is still exported and used directly by the internal MCP server repo.
-        // Once the internal repo migrates to using `paymentProvider.redactForLogging()`, we should
-        // remove the standalone function and centralize the redaction logic entirely inside this provider
-        // to make it more maintainable.
+        // TODO: redactSkyfirePayId is still used directly by other in-repo callers
+        // (e.g. tools/actors/actor_executor.ts). Once those callers migrate to
+        // `paymentProvider.redactForLogging()`, remove the standalone function and
+        // centralize the redaction logic entirely inside this provider.
         return redactSkyfirePayId(args);
     }
 }

package/dist/payments/skyfire.js.map

@@ -1 +1 @@
-{"version":3,"file":"skyfire.js","sourceRoot":"","sources":["../../src/payments/skyfire.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACH,uBAAuB,EACvB,mCAAmC,EACnC,sBAAsB,EACtB,yBAAyB,GAC5B,MAAM,YAAY,CAAC;AAGpB,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,sBAAsB;IAAnC;QACa;;;;mBAAK,SAAkB;WAAC;QACxB;;;;mBAAwB,IAAI;WAAC;IAgE1C,CAAC;IA9DG,MAAM,CAAC,KAAK,CAAC,MAAM;QACf,OAAO,IAAI,sBAAsB,EAAE,CAAC;IACxC,CAAC;IAED,kBAAkB,CAAC,IAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAEvC,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEpC,0DAA0D;QAC1D,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAChF,MAAM,CAAC,WAAW,IAAI,OAAO,yBAAyB,EAAE,CAAC;QAC7D,CAAC;QAED,0DAA0D;QAC1D,IAAI,MAAM,CAAC,WAAW,IAAI,YAAY,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,UAAqC,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC7B,KAAK,CAAC,kBAAkB,CAAC,GAAG;oBACxB,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,mCAAmC;iBACnD,CAAC;YACN,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,eAAe,CAAC,IAA6B;QACzC,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,qBAAqB,kBAAkB,yFAAyF,kBAAkB,IAAI,CAAC;QAClK,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,IAA6B;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO;gBACH,CAAC,kBAAkB,CAAC,EAAE,KAAK;gBAC3B,CAAC,uBAAuB,CAAC,EAAE,SAAS;aACvC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,mBAAmB,CAAC,IAA6B;QAC7C,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,aAAa;QACT,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,gBAAgB,CAAC,IAAa;QAC1B,gGAAgG;QAChG,2FAA2F;QAC3F,kGAAkG;QAClG,gCAAgC;QAChC,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;CACJ"}
+{"version":3,"file":"skyfire.js","sourceRoot":"","sources":["../../src/payments/skyfire.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,mCAAmC,EACnC,sBAAsB,EACtB,yBAAyB,GAC5B,MAAM,YAAY,CAAC;AAGpB;;;;;GAKG;AACH,MAAM,OAAO,sBAAsB;IAAnC;QACa;;;;mBAAK,SAAkB;WAAC;QACxB;;;;mBAAwB,IAAI;WAAC;IAgE1C,CAAC;IA9DG,MAAM,CAAC,KAAK,CAAC,MAAM;QACf,OAAO,IAAI,sBAAsB,EAAE,CAAC;IACxC,CAAC;IAED,kBAAkB,CAAC,IAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAEvC,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEpC,0DAA0D;QAC1D,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAChF,MAAM,CAAC,WAAW,IAAI,OAAO,yBAAyB,EAAE,CAAC;QAC7D,CAAC;QAED,0DAA0D;QAC1D,IAAI,MAAM,CAAC,WAAW,IAAI,YAAY,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,UAAqC,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC7B,KAAK,CAAC,kBAAkB,CAAC,GAAG;oBACxB,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,mCAAmC;iBACnD,CAAC;YACN,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,eAAe,CAAC,IAA6B;QACzC,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,qBAAqB,kBAAkB,yFAAyF,kBAAkB,IAAI,CAAC;QAClK,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,IAA6B;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO;gBACH,CAAC,kBAAkB,CAAC,EAAE,KAAK;gBAC3B,CAAC,uBAAuB,CAAC,EAAE,SAAS;aACvC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,mBAAmB,CAAC,IAA6B;QAC7C,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,aAAa;QACT,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,gBAAgB,CAAC,IAAa;QAC1B,2EAA2E;QAC3E,uEAAuE;QACvE,2EAA2E;QAC3E,gEAAgE;QAChE,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;CACJ"}

package/dist/resources/api_resources.d.ts

@@ -0,0 +1,37 @@
+import type { ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
+import type { ApifyClient } from '../apify_client.js';
+/**
+ * True when the URI is an Apify API URL (same origin as the configured API base).
+ *
+ * This is the security gate for the generic read proxy: the apify-client attaches the
+ * session token as an `Authorization` header to every outbound request, so we must only
+ * hand it Apify API URLs — never an arbitrary host. Userinfo-bearing URLs
+ * (`user@api.apify.com`) are rejected even when the host is genuinely ours: axios drops
+ * the default `Authorization` header for credentials-bearing URLs, so the read would
+ * silently run unauthenticated.
+ */
+export declare function isApifyApiUri(uri: string): boolean;
+/**
+ * Read any Apify API GET endpoint as an MCP resource.
+ *
+ * A thin streaming proxy: the apify-client injects the session token (and the MCP-origin header),
+ * the body streams in verbatim and is returned by its declared Content-Type — textual types
+ * (text/*, JSON, XML) as `text`, anything else as a base64 `blob`. The body is never parsed, so
+ * JSON primitives, formatting, and bytes round-trip exactly.
+ *
+ * Genuine failures (no token, bad origin, a missing resource, a bad token, a 5xx, a network error)
+ * throw an `McpError` so the SDK returns a JSON-RPC error rather than success-shaped content for an
+ * unreadable resource (see SEP-2164). A body over `MAX_INLINE_BYTES` is NOT a failure — it is a
+ * successful read returning a download pointer.
+ *
+ * The request goes straight through `apifyClient.httpClient.axios` (the same axios instance
+ * apify-client builds internally, so token/origin headers still apply) instead of
+ * `httpClient.call()`: with `responseType: 'stream'`, a non-2xx reaches `call()` as an unconsumed
+ * stream — its `ApifyApiError` message degrades to junk and each retry attempt strands an unread
+ * socket. One attempt, no retries. `maxContentLength` is enforced by axios itself mid-consumption
+ * (verified in axios@1.16.1: the adapter wraps streamed responses in a byte-counting generator
+ * that throws `ERR_BAD_RESPONSE` when the decoded size crosses the limit), so an oversized body
+ * is aborted at ~`MAX_INLINE_BYTES`, never buffered whole.
+ */
+export declare function readApiResource(uri: string, apifyClient?: ApifyClient): Promise<ReadResourceResult>;
+//# sourceMappingURL=api_resources.d.ts.map

package/dist/resources/api_resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api_resources.d.ts","sourceRoot":"","sources":["../../src/resources/api_resources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,kBAAkB,EAErB,MAAM,oCAAoC,CAAC;AAI5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA2CtD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAQlD;AAkGD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2FzG"}

package/dist/resources/api_resources.js

@@ -0,0 +1,255 @@
+import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { isAxiosError } from 'axios';
+import { getApifyAPIBaseUrl } from '../apify_client.js';
+import { MAX_INLINE_BYTES } from '../const.js';
+import { parseBaseMimeType } from '../tools/storage/storage_helpers.js';
+import { getHttpStatusCode, logHttpError } from '../utils/logging.js';
+import { getHttpErrorHint } from '../utils/mcp.js';
+const TEXT_MIME_TYPE = 'text/plain';
+/** Textual base MIME types (returned as `text`); everything else becomes a base64 `blob`. */
+function isTextualMimeType(baseMimeType) {
+    if (!baseMimeType)
+        return false;
+    return (baseMimeType.startsWith('text/') ||
+        baseMimeType === 'application/json' ||
+        baseMimeType.endsWith('+json') ||
+        baseMimeType === 'application/xml' ||
+        baseMimeType.endsWith('+xml') ||
+        baseMimeType === 'application/javascript');
+}
+/**
+ * Maps a failed read's HTTP status to a JSON-RPC error code:
+ * - 3xx/4xx except 429 → `InvalidParams` (the request/resource is the problem — bad URI, missing/invalid
+ *   token, private resource, or a resource that does not exist; SEP-2164 remaps "nonexistent" here too).
+ * - 429, 5xx, or no status (network failure) → `InternalError` (transient or upstream).
+ */
+function getErrorCodeForStatus(status) {
+    if (status !== undefined && status < 500 && status !== 429)
+        return ErrorCode.InvalidParams;
+    return ErrorCode.InternalError;
+}
+/** Throw the standard resources/read failure McpError. Callers log the error first — the log source differs by site. */
+function throwReadFailure(uri, status, message) {
+    const hint = getHttpErrorHint(status);
+    throw new McpError(getErrorCodeForStatus(status), `Failed to read ${uri}: ${status ? `HTTP ${status}: ` : ''}${message}${hint ? `. ${hint}` : ''}`, { uri });
+}
+/**
+ * True when the URI is an Apify API URL (same origin as the configured API base).
+ *
+ * This is the security gate for the generic read proxy: the apify-client attaches the
+ * session token as an `Authorization` header to every outbound request, so we must only
+ * hand it Apify API URLs — never an arbitrary host. Userinfo-bearing URLs
+ * (`user@api.apify.com`) are rejected even when the host is genuinely ours: axios drops
+ * the default `Authorization` header for credentials-bearing URLs, so the read would
+ * silently run unauthenticated.
+ */
+export function isApifyApiUri(uri) {
+    try {
+        const url = new URL(uri);
+        if (url.username || url.password)
+            return false;
+        return url.origin === new URL(getApifyAPIBaseUrl()).origin;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Matches an Apify key-value-store record path, capturing the store id and the record key.
+ * Both groups exclude `/?#` so a trailing query or fragment can't leak into the captured key.
+ */
+const KV_RECORD_PATH_RE = /^\/v2\/key-value-stores\/([^/?#]+)\/records\/([^/?#]+)$/;
+/** `decodeURIComponent` that returns the input unchanged on malformed percent-encoding instead of throwing. */
+function safeDecodeURIComponent(segment) {
+    try {
+        return decodeURIComponent(segment);
+    }
+    catch {
+        return segment;
+    }
+}
+/**
+ * Download URL for a body too large to inline. For a key-value-store record URI, returns the
+ * store's signed `recordPublicUrl` — fetchable without an API token when the client can read the
+ * store's URL signing key. Falls back to the original API URL for any other endpoint, or if minting
+ * the signed URL fails (fetching that link then needs a token).
+ */
+async function fetchRecordDownloadUrl(uri, apifyClient) {
+    let pathname;
+    try {
+        pathname = new URL(uri).pathname;
+    }
+    catch {
+        return uri;
+    }
+    const match = KV_RECORD_PATH_RE.exec(pathname);
+    if (!match)
+        return uri;
+    try {
+        const store = apifyClient.keyValueStore(safeDecodeURIComponent(match[1]));
+        return await store.getRecordPublicUrl(safeDecodeURIComponent(match[2]));
+    }
+    catch (err) {
+        logHttpError(err, `Failed to mint signed download URL for ${uri}; falling back to API URL`);
+        return uri;
+    }
+}
+/** Single text-contents result; pass `mimeType` to preserve a body's declared Content-Type. */
+function buildTextResult(uri, text, mimeType = TEXT_MIME_TYPE) {
+    return { contents: [{ uri, mimeType, text }] };
+}
+/** True when the URI is a key-value-store record path (a single record, not a pageable list). */
+function isKvRecordUri(uri) {
+    try {
+        return KV_RECORD_PATH_RE.test(new URL(uri).pathname);
+    }
+    catch {
+        return false;
+    }
+}
+/** Body too large to inline: a download-pointer text result. NOT a failure — the resource is readable, just not inline. */
+async function buildLinkOutResult(uri, apifyClient) {
+    const downloadUrl = await fetchRecordDownloadUrl(uri, apifyClient);
+    // A KVS record is a single object with no paging; only a dataset/list can shrink via limit/offset.
+    const pagingHint = isKvRecordUri(uri) ? '' : ' For a dataset/list, re-read with a smaller limit/offset range.';
+    return buildTextResult(uri, `Response body exceeds the ${MAX_INLINE_BYTES}-byte inline limit. Download it from ${downloadUrl} ` +
+        `(may require your Apify API token).${pagingHint}`);
+}
+/** The mid-consumption abort axios raises when a streamed body crosses `maxContentLength`. */
+function isMaxContentLengthAbort(err) {
+    return isAxiosError(err) && err.code === 'ERR_BAD_RESPONSE' && err.message.includes('maxContentLength');
+}
+/** `charset` parameter of a Content-Type header, lowercased; `undefined` when absent. */
+function parseCharset(contentType) {
+    const match = /;\s*charset\s*=\s*"?([^";]+)"?/i.exec(contentType !== null && contentType !== void 0 ? contentType : '');
+    return match === null || match === void 0 ? void 0 : match[1].trim().toLowerCase();
+}
+/** Drain a response stream into one Buffer. Chunks are Buffers (`objectMode: false`). */
+async function collectStream(data) {
+    const chunks = [];
+    for await (const chunk of data) {
+        chunks.push(Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks);
+}
+/** `error.message` from an Apify API error body, or `undefined` when the body isn't that shape. */
+function parseApiErrorMessage(body) {
+    var _a;
+    if (!body || body.length === 0)
+        return undefined;
+    try {
+        const parsed = JSON.parse(body.toString('utf-8'));
+        return typeof ((_a = parsed === null || parsed === void 0 ? void 0 : parsed.error) === null || _a === void 0 ? void 0 : _a.message) === 'string' ? parsed.error.message : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Read any Apify API GET endpoint as an MCP resource.
+ *
+ * A thin streaming proxy: the apify-client injects the session token (and the MCP-origin header),
+ * the body streams in verbatim and is returned by its declared Content-Type — textual types
+ * (text/*, JSON, XML) as `text`, anything else as a base64 `blob`. The body is never parsed, so
+ * JSON primitives, formatting, and bytes round-trip exactly.
+ *
+ * Genuine failures (no token, bad origin, a missing resource, a bad token, a 5xx, a network error)
+ * throw an `McpError` so the SDK returns a JSON-RPC error rather than success-shaped content for an
+ * unreadable resource (see SEP-2164). A body over `MAX_INLINE_BYTES` is NOT a failure — it is a
+ * successful read returning a download pointer.
+ *
+ * The request goes straight through `apifyClient.httpClient.axios` (the same axios instance
+ * apify-client builds internally, so token/origin headers still apply) instead of
+ * `httpClient.call()`: with `responseType: 'stream'`, a non-2xx reaches `call()` as an unconsumed
+ * stream — its `ApifyApiError` message degrades to junk and each retry attempt strands an unread
+ * socket. One attempt, no retries. `maxContentLength` is enforced by axios itself mid-consumption
+ * (verified in axios@1.16.1: the adapter wraps streamed responses in a byte-counting generator
+ * that throws `ERR_BAD_RESPONSE` when the decoded size crosses the limit), so an oversized body
+ * is aborted at ~`MAX_INLINE_BYTES`, never buffered whole.
+ */
+export async function readApiResource(uri, apifyClient) {
+    var _a, _b;
+    if (!isApifyApiUri(uri)) {
+        throw new McpError(ErrorCode.InvalidParams, `Failed to read ${uri}: only Apify API URLs (${getApifyAPIBaseUrl()}) are readable as resources.`, { uri });
+    }
+    if (!apifyClient) {
+        throw new McpError(ErrorCode.InvalidParams, `Failed to read ${uri}: no Apify token in this session.`, {
+            uri,
+        });
+    }
+    let response;
+    try {
+        // The raw axios instance skips `httpClient.call()` → `ensureNodeInit()`, so reads do NOT honor
+        // `HTTPS_PROXY` (auth + MCP-origin headers are instance defaults and still apply — not a leak).
+        // Fine for direct egress; a proxy-mandatory deployment needs an apify-client init hook.
+        response = await apifyClient.httpClient.axios.request({
+            url: uri,
+            method: 'GET',
+            responseType: 'stream',
+            maxContentLength: MAX_INLINE_BYTES,
+        });
+    }
+    catch (err) {
+        logHttpError(err, `resources/read request failed`, { uri });
+        throwReadFailure(uri, getHttpStatusCode(err), err instanceof Error ? err.message : String(err));
+    }
+    let body;
+    let overLimit = false;
+    try {
+        body = await collectStream(response.data);
+    }
+    catch (err) {
+        if (isMaxContentLengthAbort(err)) {
+            overLimit = true;
+        }
+        else {
+            // A drop mid-body (reset, truncation, bad gzip). Never return partial content.
+            logHttpError(err, `resources/read response interrupted`, { uri });
+            const message = err instanceof Error ? err.message : String(err);
+            throw new McpError(ErrorCode.InternalError, `Failed to read ${uri}: response interrupted: ${message}`, {
+                uri,
+            });
+        }
+    }
+    // `validateStatus: null` on this axios instance resolves non-2xx responses instead of throwing,
+    // so a failed request is checked here. The error body was just collected above (Apify API error
+    // bodies are small JSON; if one somehow crossed the limit, fall back to the status text).
+    if (response.status >= 300) {
+        const message = (_a = parseApiErrorMessage(body)) !== null && _a !== void 0 ? _a : response.statusText;
+        logHttpError(Object.assign(new Error(message), { statusCode: response.status }), `resources/read failed`, {
+            uri,
+        });
+        throwReadFailure(uri, response.status, message);
+    }
+    // Second clause is runtime-redundant (undefined ⟺ overLimit) but narrows `body` to Buffer below.
+    if (overLimit || body === undefined) {
+        return buildLinkOutResult(uri, apifyClient);
+    }
+    const contentTypeHeader = response.headers['content-type'];
+    const contentType = typeof contentTypeHeader === 'string' ? contentTypeHeader : undefined;
+    // Empty body → empty text preserving the declared Content-Type, matching get-key-value-store-record
+    // (even for a binary type: an empty blob carries no bytes).
+    if (body.length === 0) {
+        return buildTextResult(uri, '', contentType);
+    }
+    const baseMimeType = parseBaseMimeType(contentType);
+    const charset = (_b = parseCharset(contentType)) !== null && _b !== void 0 ? _b : 'utf-8';
+    // Decode with the DECLARED charset, not hardcoded UTF-8 — latin1 bytes decoded as UTF-8 mangle
+    // irreversibly to U+FFFD. A charset Node cannot decode falls through to the blob branch (lossless
+    // base64 beats text in a wrong encoding), the same rule as apify-client's body_parser. The full
+    // Content-Type — charset included — rides along on the text result.
+    if (isTextualMimeType(baseMimeType) && Buffer.isEncoding(charset)) {
+        return buildTextResult(uri, body.toString(charset), contentType);
+    }
+    // Binary or undecodable text: base MIME type only (parameters are meaningless for a blob).
+    return {
+        contents: [
+            {
+                uri,
+                ...(baseMimeType && { mimeType: baseMimeType }),
+                blob: body.toString('base64'),
+            },
+        ],
+    };
+}
+//# sourceMappingURL=api_resources.js.map

package/dist/resources/api_resources.js.map

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

package/dist/resources/resource_service.d.ts

@@ -1,8 +1,9 @@
-import type { ListResourcesResult, ListResourceTemplatesResult, ReadResourceResult, TextResourceContents } from '@modelcontextprotocol/sdk/types.js';
+import type { BlobResourceContents, ListResourcesResult, ListResourceTemplatesResult, ReadResourceResult, TextResourceContents } from '@modelcontextprotocol/sdk/types.js';
+import type { ApifyClient } from '../apify_client.js';
 import type { PaymentProvider } from '../payments/types.js';
 import { SERVER_MODE } from '../types.js';
 import type { AvailableWidget } from './widgets.js';
-type ExtendedResourceContents = TextResourceContents & {
+type ExtendedResourceContents = (TextResourceContents | BlobResourceContents) & {
     html?: string;
     _meta?: AvailableWidget['meta'];
 };
@@ -11,7 +12,7 @@ type ExtendedReadResourceResult = Omit<ReadResourceResult, 'contents'> & {
 };
 type ResourceService = {
     listResources: () => Promise<ListResourcesResult>;
-    readResource: (uri: string) => Promise<ExtendedReadResourceResult>;
+    readResource: (uri: string, apifyClient?: ApifyClient) => Promise<ExtendedReadResourceResult>;
     listResourceTemplates: () => Promise<ListResourceTemplatesResult>;
 };
 type ResourceServiceOptions = {