apify
diff --git a/‎package.json‎
Lines changed: 1 addition & 0 deletions b/‎package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/actor/server.ts‎
Lines changed: 7 additions & 8 deletions b/‎src/actor/server.ts‎
Lines changed: 7 additions & 8 deletions
diff --git a/‎src/apify_client.ts‎
Lines changed: 7 additions & 26 deletions b/‎src/apify_client.ts‎
Lines changed: 7 additions & 26 deletions
diff --git a/‎src/const.ts‎
Lines changed: 3 additions & 0 deletions b/‎src/const.ts‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/index_internals.ts‎
Lines changed: 7 additions & 0 deletions b/‎src/index_internals.ts‎
Lines changed: 7 additions & 0 deletions
@@ -92,6 +92,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "type-check": "tsc -p tsconfig.json --noEmit",
+    "typecheck": "npm run type-check",
     "check": "npm run type-check && npm run lint",
     "check:widgets": "tsx scripts/check_widgets.ts",
     "test": "npm run test:unit",
 
@@ -16,6 +16,7 @@ import { parseBooleanOrNull } from '@apify/utilities';
 
 import { ApifyClient } from '../apify_client.js';
 import { ActorsMcpServer } from '../mcp/server.js';
+import { resolvePaymentProvider } from '../payments/index.js';
 import type { ApifyRequestParams } from '../types.js';
 import { parseUiMode } from '../types.js';
 import { getHelpMessage, Routes, TransportType } from './const.js';
@@ -67,9 +68,8 @@ export function createExpressApp(
 
             const uiMode = parseUiMode(urlParams.get('ui')) ?? parseUiMode(process.env.UI_MODE);
 
-            // Extract payment mode parameter - if payment=skyfire, enable skyfire mode
-            const paymentParam = urlParams.get('payment');
-            const skyfireMode = paymentParam === 'skyfire';
+            // Resolve payment provider from URL parameter (e.g., ?payment=skyfire)
+            const paymentProvider = await resolvePaymentProvider(urlParams.get('payment'));
 
             const mcpServer = new ActorsMcpServer({
                 taskStore,
@@ -79,7 +79,7 @@ export function createExpressApp(
                     enabled: telemetryEnabled,
                 },
                 uiMode,
-                skyfireMode,
+                paymentProvider,
             });
             const transport = new SSEServerTransport(Routes.MESSAGE, res);
 
@@ -199,9 +199,8 @@ export function createExpressApp(
 
                 const uiMode = parseUiMode(urlParams.get('ui')) ?? parseUiMode(process.env.UI_MODE);
 
-                // Extract payment mode parameter - if payment=skyfire, enable skyfire mode
-                const paymentParam = urlParams.get('payment');
-                const skyfireMode = paymentParam === 'skyfire';
+                // Resolve payment provider from URL parameter (e.g., ?payment=skyfire)
+                const paymentProvider = await resolvePaymentProvider(urlParams.get('payment'));
 
                 const mcpServer = new ActorsMcpServer({
                     taskStore,
@@ -212,7 +211,7 @@ export function createExpressApp(
                         enabled: telemetryEnabled,
                     },
                     uiMode,
-                    skyfireMode,
+                    paymentProvider,
                 });
 
                 // Load MCP server tools
 
@@ -3,12 +3,12 @@ import { ApifyClient as _ApifyClient } from 'apify-client';
 import type { AxiosRequestConfig } from 'axios';
 
 import { USER_AGENT_ORIGIN } from './const.js';
-import type { ActorsMcpServer } from './mcp/server.js';
-import type { ApifyToken } from './types.js';
+import type { PaymentHeaders } from './payments/types.js';
 
 type ExtendedApifyClientOptions = Omit<ApifyClientOptions, 'token'> & {
     token?: string | null | undefined;
-    skyfirePayId?: string;
+    /** Payment headers to forward on outbound API requests (from PaymentProvider.getPaymentHeaders) */
+    paymentHeaders?: PaymentHeaders;
 };
 
 /**
@@ -42,16 +42,16 @@ export class ApifyClient extends _ApifyClient {
             delete options.token;
         }
 
-        const { skyfirePayId, ...clientOptions } = options;
+        const { paymentHeaders, ...clientOptions } = options;
         const requestInterceptors = [addUserAgent];
         /**
-         * Add skyfire-pay-id header if provided.
+         * Add payment headers if provided by a PaymentProvider.
          */
-        if (skyfirePayId) {
+        if (paymentHeaders && Object.keys(paymentHeaders).length > 0) {
             requestInterceptors.push((config) => {
                 const updatedConfig = { ...config };
                 updatedConfig.headers = updatedConfig.headers ?? {};
-                updatedConfig.headers['skyfire-pay-id'] = skyfirePayId;
+                Object.assign(updatedConfig.headers, paymentHeaders);
                 return updatedConfig;
             });
         }
@@ -64,22 +64,3 @@ export class ApifyClient extends _ApifyClient {
         });
     }
 }
-
-/**
- * Creates ApifyClient with appropriate credentials based on Skyfire mode.
- * In Skyfire mode, uses skyfire-pay-id from args; otherwise uses apifyToken.
- *
- * @param apifyMcpServer - The MCP server instance with configuration options
- * @param args - Tool arguments that may contain skyfire-pay-id
- * @param apifyToken - Standard Apify token for non-Skyfire mode
- * @returns ApifyClient instance configured for the appropriate mode
- */
-export function createApifyClientWithSkyfireSupport(
-    apifyMcpServer: ActorsMcpServer,
-    args: Record<string, unknown>,
-    apifyToken: ApifyToken,
-): ApifyClient {
-    return apifyMcpServer.options.skyfireMode && typeof args['skyfire-pay-id'] === 'string'
-        ? new ApifyClient({ skyfirePayId: args['skyfire-pay-id'] })
-        : new ApifyClient({ token: apifyToken });
-}
@@ -200,5 +200,8 @@ export const TOOL_STATUS = {
     SOFT_FAIL: 'SOFT_FAIL',
 } as const;
 
+// HTTP status codes
+export const HTTP_PAYMENT_REQUIRED = 402;
+
 // Modes that allow long running task tool executions
 export const ALLOWED_TASK_TOOL_EXECUTION_MODES = ['optional', 'required'] as const;
@@ -5,6 +5,8 @@
 import { ApifyClient } from './apify_client.js';
 import { APIFY_FAVICON_URL, defaults, HelperTools, SERVER_NAME, SERVER_TITLE } from './const.js';
 import { processParamsGetTools } from './mcp/utils.js';
+import { resolvePaymentProvider } from './payments/index.js';
+import type { PaymentProvider } from './payments/types.js';
 import { getServerCard } from './server_card.js';
 import { addTool } from './tools/common/add_actor.js';
 import { getActorsAsTools, getCategoryTools, getDefaultTools, getUnauthEnabledToolCategories,
@@ -48,5 +50,10 @@ export {
     readJsonFile,
     parseCommaSeparatedList,
     parseQueryParamList,
+    resolvePaymentProvider,
+    type PaymentProvider,
+    /**
+     * @deprecated Use the server's paymentProvider.redactForLogging instead. This will be removed in a future release.
+     */
     redactSkyfirePayId,
 };