@apify/actors-mcp-server 0.9.16-beta.2 → 0.9.16-beta.4

package/dist/payments/x402.js

@@ -0,0 +1,208 @@
+import log from '@apify/log';
+import { getApifyAPIBaseUrl } from '../apify_client.js';
+import { cloneToolEntry } from '../utils/tools.js';
+/**
+ * Key used by MCP clients to pass x402 payment data in the JSON-RPC `_meta` field.
+ * The mcp-cli injects the decoded payment payload here (JSON object, not base64).
+ */
+const X402_META_KEY = 'x402/payment';
+/** HTTP header name for forwarding x402 payment signatures to the Apify API. */
+const PAYMENT_SIGNATURE_HEADER = 'PAYMENT-SIGNATURE';
+const PAYMENT_PROTOCOL_HEADER = 'x-apify-payment-protocol';
+const PAYMENT_REQUIRED_HEADER = 'payment-required';
+/** Timeout for fetching x402 payment requirements from the Apify API (ms). */
+const FETCH_TIMEOUT_MS = 8000;
+const X402_TOOL_INSTRUCTIONS = [
+    'This tool requires an x402 payment.',
+    'Include a valid x402 payment signature in the request metadata (_meta["x402/payment"]).',
+    'Your MCP client must support the x402 payment protocol.',
+].join(' ');
+// Module-level cache for X402 payment requirements.
+// We cache the Promise itself (rather than just the JSON result) to prevent the "thundering herd"
+// problem during server startup, where multiple concurrent incoming requests might otherwise
+// trigger duplicate identical fetches to the Apify API before the first one finishes.
+let cachedRequirementsPromise = null;
+let lastFetchTime = 0;
+// Cache TTL: 30 minutes
+const CACHE_TTL_MS = 30 * 60 * 1000;
+/**
+ * Fetches x402 payment requirements from the Apify API.
+ * Uses a module-level cache with a 30-minute TTL to prevent blocking SSE setup on every connection.
+ *
+ * Sends a request with `x-apify-payment-protocol: x402` header which triggers
+ * a 402 response containing the payment requirements in the `payment-required` header.
+ *
+ * @returns The decoded payment requirements, or undefined if the fetch fails.
+ */
+export async function fetchX402PaymentRequirements() {
+    const now = Date.now();
+    // If we have a cached promise, and the TTL hasn't expired since it successfully resolved, return it.
+    // Note: During the very first fetch, lastFetchTime is 0, so this will be false and we will
+    // fall through to create the promise, which is expected. However, if multiple requests hit this
+    // block *while the first fetch is still in-flight*, they will also see lastFetchTime = 0 and
+    // create duplicate promises. This is a known minor flaw in this specific caching pattern, but
+    // acceptable since the overhead of a few duplicate calls during cold-start is negligible.
+    if (cachedRequirementsPromise && (now - lastFetchTime < CACHE_TTL_MS)) {
+        return cachedRequirementsPromise;
+    }
+    cachedRequirementsPromise = (async () => {
+        const apiBaseUrl = getApifyAPIBaseUrl();
+        const url = `${apiBaseUrl}/v2/acts/`;
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+        try {
+            const response = await fetch(url, {
+                method: 'GET',
+                headers: { [PAYMENT_PROTOCOL_HEADER]: 'x402' },
+                signal: controller.signal,
+            });
+            const paymentRequiredBase64 = response.headers.get(PAYMENT_REQUIRED_HEADER);
+            if (!paymentRequiredBase64) {
+                log.warning('[x402] No payment-required header in API response', { status: response.status, url });
+                cachedRequirementsPromise = null;
+                return undefined;
+            }
+            const decoded = JSON.parse(Buffer.from(paymentRequiredBase64, 'base64').toString('utf-8'));
+            log.info('[x402] Fetched payment requirements from Apify API', { url });
+            lastFetchTime = Date.now();
+            return decoded;
+        }
+        catch (error) {
+            log.warning('[x402] Failed to fetch payment requirements — tools will advertise paymentRequired only', { url, error });
+            cachedRequirementsPromise = null;
+            return undefined;
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    })();
+    return cachedRequirementsPromise;
+}
+/**
+ * Extracts the PAYMENT-SIGNATURE value from incoming HTTP request headers.
+ * Header lookup is case-insensitive. Returns the first string value, or undefined.
+ */
+function getPaymentSignatureFromHeader(requestHeaders) {
+    var _a;
+    if (!requestHeaders)
+        return undefined;
+    // HTTP headers are case-insensitive; the SDK may normalize to lowercase
+    const value = (_a = requestHeaders[PAYMENT_SIGNATURE_HEADER]) !== null && _a !== void 0 ? _a : requestHeaders[PAYMENT_SIGNATURE_HEADER.toLowerCase()];
+    if (typeof value === 'string' && value.length > 0)
+        return value;
+    if (Array.isArray(value) && typeof value[0] === 'string' && value[0].length > 0)
+        return value[0];
+    return undefined;
+}
+/**
+ * Gets the base64-encoded payment signature from either _meta (JSON object) or HTTP headers.
+ */
+function getEncodedPaymentSignature(meta, requestHeaders) {
+    const metaPayment = meta === null || meta === void 0 ? void 0 : meta[X402_META_KEY];
+    if (metaPayment) {
+        return Buffer.from(JSON.stringify(metaPayment)).toString('base64');
+    }
+    return getPaymentSignatureFromHeader(requestHeaders);
+}
+/**
+ * x402 payment provider.
+ *
+ * Reads x402 payment signatures from MCP `_meta["x402/payment"]` or the incoming
+ * HTTP `PAYMENT-SIGNATURE` header, and forwards them as `PAYMENT-SIGNATURE`
+ * headers to the Apify API.
+ *
+ * Protocol flow:
+ * 1. Client reads `_meta.x402` from tool definitions to know payment is required
+ * 2. Client signs an EIP-3009 TransferWithAuthorization and includes it in
+ *    `_meta["x402/payment"]` (JSON object) and/or the `PAYMENT-SIGNATURE` HTTP header (base64)
+ * 3. This provider extracts the payment (preferring `_meta`, falling back to HTTP header),
+ *    base64-encodes it if needed, and forwards as PAYMENT-SIGNATURE header
+ * 4. The Apify API verifies and settles the payment
+ */
+export class X402PaymentProvider {
+    constructor(requirements) {
+        Object.defineProperty(this, "requirements", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: requirements
+        });
+        Object.defineProperty(this, "id", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'x402'
+        });
+        Object.defineProperty(this, "allowsUnauthenticated", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    /**
+     * Creates an X402PaymentProvider, fetching payment requirements from the Apify API.
+     * Falls back to a provider without full requirements if the fetch fails.
+     */
+    static async create() {
+        const requirements = await fetchX402PaymentRequirements();
+        return new X402PaymentProvider(requirements);
+    }
+    /**
+     * Extracts the first accept entry from the full payment requirements.
+     * This is the flattened payment info that goes into _meta.x402 for tool schemas.
+     */
+    getFirstAcceptEntry() {
+        if (!this.requirements)
+            return undefined;
+        const accepts = this.requirements.accepts;
+        if (!Array.isArray(accepts) || accepts.length === 0)
+            return undefined;
+        return accepts[0];
+    }
+    decorateToolSchema(tool) {
+        if (!tool.paymentRequired)
+            return tool;
+        const cloned = cloneToolEntry(tool);
+        // Add _meta.x402 to signal payment requirement to clients (idempotent)
+        // Only include the first accept entry (scheme, network, amount, asset, payTo, etc.)
+        // matching the demo server format — NOT the full API response
+        if (!cloned._meta) {
+            cloned._meta = {};
+        }
+        const metaRecord = cloned._meta;
+        if (!metaRecord.x402) {
+            const acceptEntry = this.getFirstAcceptEntry();
+            metaRecord.x402 = { paymentRequired: true, ...acceptEntry };
+        }
+        // Append x402 instructions to description (idempotent)
+        if (cloned.description && !cloned.description.includes(X402_TOOL_INSTRUCTIONS)) {
+            cloned.description += `\n\n${X402_TOOL_INSTRUCTIONS}`;
+        }
+        return Object.freeze(cloned);
+    }
+    validatePayment(_args, meta, requestHeaders) {
+        return getEncodedPaymentSignature(meta, requestHeaders) ? null : X402_TOOL_INSTRUCTIONS;
+    }
+    getPaymentHeaders(_args, meta, requestHeaders) {
+        const paymentSignature = getEncodedPaymentSignature(meta, requestHeaders);
+        return paymentSignature
+            ? { [PAYMENT_SIGNATURE_HEADER]: paymentSignature, [PAYMENT_PROTOCOL_HEADER]: 'x402' }
+            : {};
+    }
+    removePaymentFields(args) {
+        // x402 doesn't inject anything into tool arguments — payment is in _meta
+        return args;
+    }
+    getPaymentRequiredData() {
+        return this.requirements;
+    }
+    getUsageGuide() {
+        return null;
+    }
+    redactForLogging(args) {
+        // x402 doesn't put sensitive data in tool arguments
+        return args;
+    }
+}
+//# sourceMappingURL=x402.js.map

package/dist/payments/x402.js.map

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

package/dist/resources/resource_service.d.ts

@@ -1,4 +1,5 @@
 import type { ListResourcesResult, ListResourceTemplatesResult, ReadResourceResult, TextResourceContents } from '@modelcontextprotocol/sdk/types.js';
+import type { PaymentProvider } from '../payments/types.js';
 import type { ServerMode } from '../types.js';
 import type { AvailableWidget } from './widgets.js';
 type ExtendedResourceContents = TextResourceContents & {
@@ -14,7 +15,7 @@ type ResourceService = {
     listResourceTemplates: () => Promise<ListResourceTemplatesResult>;
 };
 type ResourceServiceOptions = {
-    skyfireMode?: boolean;
+    paymentProvider?: PaymentProvider;
     mode?: ServerMode;
     getAvailableWidgets: () => Map<string, AvailableWidget>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"resource_service.d.ts","sourceRoot":"","sources":["../../src/resources/resource_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,kBAAkB,EAAY,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAK/J,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,KAAK,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,GAAG;IACrE,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACxC,CAAC;AAEF,KAAK,eAAe,GAAG;IACnB,aAAa,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAClD,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACnE,qBAAqB,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,mBAAmB,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAoHtF"}
+{"version":3,"file":"resource_service.d.ts","sourceRoot":"","sources":["../../src/resources/resource_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,kBAAkB,EAAY,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI/J,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,KAAK,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,GAAG;IACrE,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACxC,CAAC;AAEF,KAAK,eAAe,GAAG;IACnB,aAAa,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAClD,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACnE,qBAAqB,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,mBAAmB,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAqHtF"}

package/dist/resources/resource_service.js

@@ -1,16 +1,16 @@
 import log from '@apify/log';
-import { SKYFIRE_README_CONTENT } from '../const.js';
 import { RESOURCE_MIME_TYPE } from './widgets.js';
 export function createResourceService(options) {
-    const { skyfireMode, mode = 'default', getAvailableWidgets } = options;
+    const { paymentProvider, mode = 'default', getAvailableWidgets } = options;
     const listResources = async () => {
+        var _a;
         const resources = [];
-        if (skyfireMode) {
+        if ((_a = paymentProvider === null || paymentProvider === void 0 ? void 0 : paymentProvider.getUsageGuide) === null || _a === void 0 ? void 0 : _a.call(paymentProvider)) {
             resources.push({
                 uri: 'file://readme.md',
                 name: 'readme',
-                description: 'Apify MCP Server usage guide. Read this to understand how to use the server, '
-                    + 'especially in Skyfire mode before interacting with it.',
+                description: 'Apify MCP Server usage guide. Read this to understand how to use the server '
+                    + 'before interacting with it.',
                 mimeType: 'text/markdown',
             });
         }
@@ -31,12 +31,14 @@ export function createResourceService(options) {
         return { resources };
     };
     const readResource = async (uri) => {
-        if (skyfireMode && uri === 'file://readme.md') {
+        var _a;
+        const usageGuide = (_a = paymentProvider === null || paymentProvider === void 0 ? void 0 : paymentProvider.getUsageGuide) === null || _a === void 0 ? void 0 : _a.call(paymentProvider);
+        if (usageGuide && uri === 'file://readme.md') {
             return {
                 contents: [{
                         uri: 'file://readme.md',
                         mimeType: 'text/markdown',
-                        text: SKYFIRE_README_CONTENT,
+                        text: usageGuide,
                     }],
             };
         }

package/dist/resources/resource_service.js.map

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

package/dist/tools/common/abort_actor_run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abort_actor_run.d.ts","sourceRoot":"","sources":["../../../src/tools/common/abort_actor_run.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAUnF;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,SAkCjB,CAAC"}
+{"version":3,"file":"abort_actor_run.d.ts","sourceRoot":"","sources":["../../../src/tools/common/abort_actor_run.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAUnF;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,SA6BjB,CAAC"}

package/dist/tools/common/abort_actor_run.js

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 const abortRunArgs = z.object({
@@ -25,11 +24,8 @@ USAGE EXAMPLES:
 - user_input: Abort run y2h7sK3Wc
 - user_input: Gracefully abort run y2h7sK3Wc`,
     inputSchema: z.toJSONSchema(abortRunArgs),
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(abortRunArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(abortRunArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Abort Actor run',
         readOnlyHint: false,
@@ -38,9 +34,8 @@ USAGE EXAMPLES:
         openWorldHint: false,
     },
     call: async (toolArgs) => {
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
+        const { args, apifyClient: client } = toolArgs;
         const parsed = abortRunArgs.parse(args);
-        const client = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
         const v = await client.run(parsed.runId).abort({ gracefully: parsed.gracefully });
         return { content: [{ type: 'text', text: `\`\`\`json\n${JSON.stringify(v)}\n\`\`\`` }] };
     },

package/dist/tools/common/abort_actor_run.js.map

@@ -1 +1 @@
-{"version":3,"file":"abort_actor_run.js","sourceRoot":"","sources":["../../../src/tools/common/abort_actor_run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mCAAmC,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SACZ,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,mCAAmC,CAAC;IAClD,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wEAAwE,CAAC;CACxH,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAc,MAAM,CAAC,MAAM,CAAC;IAClD,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,gBAAgB;IAClC,WAAW,EAAE;;;;;;;;;6CAS4B;IACzC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,YAAY,CAAoB;IAC5D;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC3F,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE;QACT,KAAK,EAAE,iBAAiB;QACxB,YAAY,EAAE,KAAK;QACnB,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QACtD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,MAAM,GAAG,mCAAmC,CAAC,cAAc,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAClF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;IAC7F,CAAC;CACK,CAAC,CAAC"}
+{"version":3,"file":"abort_actor_run.js","sourceRoot":"","sources":["../../../src/tools/common/abort_actor_run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SACZ,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,mCAAmC,CAAC;IAClD,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wEAAwE,CAAC;CACxH,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAc,MAAM,CAAC,MAAM,CAAC;IAClD,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,gBAAgB;IAClC,WAAW,EAAE;;;;;;;;;6CAS4B;IACzC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,YAAY,CAAoB;IAC5D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACxD,eAAe,EAAE,IAAI;IACrB,WAAW,EAAE;QACT,KAAK,EAAE,iBAAiB;QACxB,YAAY,EAAE,KAAK;QACnB,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QAC/C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAClF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;IAC7F,CAAC;CACK,CAAC,CAAC"}

package/dist/tools/common/get_actor_output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_actor_output.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_actor_output.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AA0BnF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAyB1D;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAiGlB,CAAC"}
+{"version":3,"file":"get_actor_output.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_actor_output.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AA0BnF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAyB1D;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SA4FlB,CAAC"}

package/dist/tools/common/get_actor_output.js

@@ -1,6 +1,5 @@
 import dedent from 'dedent';
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools, TOOL_MAX_OUTPUT_CHARS, TOOL_STATUS } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 import { getValuesByDotKeys, parseCommaSeparatedList } from '../../utils/generic.js';
@@ -79,11 +78,8 @@ export const getActorOutput = Object.freeze({
         Note: This tool is automatically included if the Apify MCP Server is configured with any Actor tools (e.g., "apify--rag-web-browser") or tools that can interact with Actors (e.g., "call-actor", "add-actor").`,
     inputSchema: z.toJSONSchema(getActorOutputArgs),
     outputSchema: datasetItemsOutputSchema,
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(getActorOutputArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(getActorOutputArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Get Actor output',
         readOnlyHint: true,
@@ -92,8 +88,7 @@ export const getActorOutput = Object.freeze({
         openWorldHint: false,
     },
     call: async (toolArgs) => {
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
-        const apifyClient = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
+        const { args, apifyClient } = toolArgs;
         const parsed = getActorOutputArgs.parse(args);
         // Parse fields into array
         const fieldsArray = parseCommaSeparatedList(parsed.fields);

package/dist/tools/common/get_actor_output.js.map

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

package/dist/tools/common/get_actor_run_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_actor_run_log.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_actor_run_log.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAWnF;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAoClB,CAAC"}
+{"version":3,"file":"get_actor_run_log.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_actor_run_log.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAWnF;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SA+BlB,CAAC"}

package/dist/tools/common/get_actor_run_log.js

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 const GetRunLogArgs = z.object({
@@ -27,11 +26,8 @@ USAGE EXAMPLES:
 - user_input: Get logs for run y2h7sK3Wc`,
     inputSchema: z.toJSONSchema(GetRunLogArgs),
     // It does not make sense to add structured output here since the log API just returns plain text
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(GetRunLogArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(GetRunLogArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Get Actor run log',
         readOnlyHint: true,
@@ -41,9 +37,8 @@ USAGE EXAMPLES:
     },
     call: async (toolArgs) => {
         var _a;
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
+        const { args, apifyClient: client } = toolArgs;
         const parsed = GetRunLogArgs.parse(args);
-        const client = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
         const v = (_a = await client.run(parsed.runId).log().get()) !== null && _a !== void 0 ? _a : '';
         const lines = v.split('\n');
         const text = lines.slice(lines.length - parsed.lines - 1, lines.length).join('\n');

package/dist/tools/common/get_actor_run_log.js.map

@@ -1 +1 @@
-{"version":3,"file":"get_actor_run_log.js","sourceRoot":"","sources":["../../../src/tools/common/get_actor_run_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mCAAmC,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;IACtD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SACZ,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,mDAAmD,CAAC;SAC7D,OAAO,CAAC,EAAE,CAAC;CACnB,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAc,MAAM,CAAC,MAAM,CAAC;IACnD,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,cAAc;IAChC,WAAW,EAAE;;;;;;;;yCAQwB;IACrC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,aAAa,CAAoB;IAC7D,iGAAiG;IACjG;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC5F,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE;QACT,KAAK,EAAE,mBAAmB;QAC1B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QACtD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,mCAAmC,CAAC,cAAc,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,MAAA,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACjD,CAAC;CACK,CAAC,CAAC"}
+{"version":3,"file":"get_actor_run_log.js","sourceRoot":"","sources":["../../../src/tools/common/get_actor_run_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;IACtD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SACZ,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,mDAAmD,CAAC;SAC7D,OAAO,CAAC,EAAE,CAAC;CACnB,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAc,MAAM,CAAC,MAAM,CAAC;IACnD,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,cAAc;IAChC,WAAW,EAAE;;;;;;;;yCAQwB;IACrC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,aAAa,CAAoB;IAC7D,iGAAiG;IACjG,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACzD,eAAe,EAAE,IAAI;IACrB,WAAW,EAAE;QACT,KAAK,EAAE,mBAAmB;QAC1B,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QAC/C,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,GAAG,MAAA,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACjD,CAAC;CACK,CAAC,CAAC"}

package/dist/tools/common/get_dataset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_dataset.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAUnF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,SA0Cd,CAAC"}
+{"version":3,"file":"get_dataset.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAUnF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,SAqCd,CAAC"}

package/dist/tools/common/get_dataset.js

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools, TOOL_STATUS } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 import { buildMCPResponse } from '../../utils/mcp.js';
@@ -26,11 +25,8 @@ USAGE EXAMPLES:
 - user_input: Show info for dataset xyz123
 - user_input: What fields does username~my-dataset have?`,
     inputSchema: z.toJSONSchema(getDatasetArgs),
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(getDatasetArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(getDatasetArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Get dataset',
         readOnlyHint: true,
@@ -39,9 +35,8 @@ USAGE EXAMPLES:
         openWorldHint: false,
     },
     call: async (toolArgs) => {
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
+        const { args, apifyClient: client } = toolArgs;
         const parsed = getDatasetArgs.parse(args);
-        const client = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
         const v = await client.dataset(parsed.datasetId).get();
         if (!v) {
             return buildMCPResponse({

package/dist/tools/common/get_dataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"get_dataset.js","sourceRoot":"","sources":["../../../src/tools/common/get_dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mCAAmC,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;SAChB,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,sCAAsC,CAAC;CACxD,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAc,MAAM,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,WAAW;IAC7B,WAAW,EAAE;;wDAEuC,WAAW,CAAC,iBAAiB;;;;;;;;yDAQ5B;IACrD,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc,CAAoB;IAC9D;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC7F,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE;QACT,KAAK,EAAE,aAAa;QACpB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QACtD,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,mCAAmC,CAAC,cAAc,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;QACvD,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,OAAO,gBAAgB,CAAC;gBACpB,KAAK,EAAE,CAAC,YAAY,MAAM,CAAC,SAAS,cAAc,CAAC;gBACnD,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,WAAW,CAAC,SAAS;aACpC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;IAC7F,CAAC;CACK,CAAC,CAAC"}
+{"version":3,"file":"get_dataset.js","sourceRoot":"","sources":["../../../src/tools/common/get_dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;SAChB,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,sCAAsC,CAAC;CACxD,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAc,MAAM,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,WAAW;IAC7B,WAAW,EAAE;;wDAEuC,WAAW,CAAC,iBAAiB;;;;;;;;yDAQ5B;IACrD,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc,CAAoB;IAC9D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAC1D,eAAe,EAAE,IAAI;IACrB,WAAW,EAAE;QACT,KAAK,EAAE,aAAa;QACpB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;IACD,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;QACvD,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,OAAO,gBAAgB,CAAC;gBACpB,KAAK,EAAE,CAAC,YAAY,MAAM,CAAC,SAAS,cAAc,CAAC;gBACnD,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,WAAW,CAAC,SAAS;aACpC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;IAC7F,CAAC;CACK,CAAC,CAAC"}

package/dist/tools/common/get_dataset_items.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_dataset_items.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset_items.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AA8BnF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,SAqEnB,CAAC"}
+{"version":3,"file":"get_dataset_items.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset_items.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AA8BnF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,SAgEnB,CAAC"}

package/dist/tools/common/get_dataset_items.js

@@ -1,6 +1,5 @@
 import dedent from 'dedent';
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools, TOOL_STATUS } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 import { parseCommaSeparatedList } from '../../utils/generic.js';
@@ -50,11 +49,8 @@ export const getDatasetItems = Object.freeze({
         - user_input: Get only metadata.url and title from dataset username~my-dataset (flatten metadata)`,
     inputSchema: z.toJSONSchema(getDatasetItemsArgs),
     outputSchema: datasetItemsOutputSchema,
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(getDatasetItemsArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(getDatasetItemsArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Get dataset items',
         readOnlyHint: true,
@@ -64,9 +60,8 @@ export const getDatasetItems = Object.freeze({
     },
     call: async (toolArgs) => {
         var _a;
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
+        const { args, apifyClient: client } = toolArgs;
         const parsed = getDatasetItemsArgs.parse(args);
-        const client = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
         // Convert comma-separated strings to arrays
         const fields = parseCommaSeparatedList(parsed.fields);
         const omit = parseCommaSeparatedList(parsed.omit);

package/dist/tools/common/get_dataset_items.js.map

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

package/dist/tools/common/get_dataset_schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_dataset_schema.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset_schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAoBnF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SA2EpB,CAAC"}
+{"version":3,"file":"get_dataset_schema.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_dataset_schema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AAoBnF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAsEpB,CAAC"}

package/dist/tools/common/get_dataset_schema.js

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { createApifyClientWithSkyfireSupport } from '../../apify_client.js';
 import { HelperTools, TOOL_STATUS } from '../../const.js';
 import { compileSchema } from '../../utils/ajv.js';
 import { buildMCPResponse } from '../../utils/mcp.js';
@@ -35,11 +34,8 @@ USAGE EXAMPLES:
 - user_input: Generate schema for dataset 34das2 using 10 items
 - user_input: Show schema of username~my-dataset (clean items only)`,
     inputSchema: z.toJSONSchema(getDatasetSchemaArgs),
-    /**
-     * Allow additional properties for Skyfire mode to pass `skyfire-pay-id`.
-     */
-    ajvValidate: compileSchema({ ...z.toJSONSchema(getDatasetSchemaArgs), additionalProperties: true }),
-    requiresSkyfirePayId: true,
+    ajvValidate: compileSchema(z.toJSONSchema(getDatasetSchemaArgs)),
+    paymentRequired: true,
     annotations: {
         title: 'Get dataset schema',
         readOnlyHint: true,
@@ -48,9 +44,8 @@ USAGE EXAMPLES:
         openWorldHint: false,
     },
     call: async (toolArgs) => {
-        const { args, apifyToken, apifyMcpServer } = toolArgs;
+        const { args, apifyClient: client } = toolArgs;
         const parsed = getDatasetSchemaArgs.parse(args);
-        const client = createApifyClientWithSkyfireSupport(apifyMcpServer, args, apifyToken);
         // Get dataset items
         const datasetResponse = await client.dataset(parsed.datasetId).listItems({
             clean: parsed.clean,

package/dist/tools/common/get_dataset_schema.js.map

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

package/dist/tools/common/get_key_value_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_key_value_store.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_key_value_store.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AASnF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAiCpB,CAAC"}
+{"version":3,"file":"get_key_value_store.d.ts","sourceRoot":"","sources":["../../../src/tools/common/get_key_value_store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAmB,MAAM,gBAAgB,CAAC;AASnF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SA4BpB,CAAC"}