@apify/actors-mcp-server 0.10.9-beta.1 → 0.10.9-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dev_server.d.ts.map +1 -1
- package/dist/dev_server.js +64 -6
- package/dist/dev_server.js.map +1 -1
- package/dist/errors.d.ts +29 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +51 -0
- package/dist/errors.js.map +1 -1
- package/dist/mcp/server.d.ts +6 -6
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +69 -17
- package/dist/mcp/server.js.map +1 -1
- package/dist/payments/const.d.ts +1 -0
- package/dist/payments/const.d.ts.map +1 -1
- package/dist/payments/const.js +1 -0
- package/dist/payments/const.js.map +1 -1
- package/dist/payments/skyfire.d.ts.map +1 -1
- package/dist/payments/skyfire.js +1 -2
- package/dist/payments/skyfire.js.map +1 -1
- package/dist/payments/x402.d.ts.map +1 -1
- package/dist/payments/x402.js +1 -1
- package/dist/payments/x402.js.map +1 -1
- package/dist/state.d.ts +1 -1
- package/dist/state.d.ts.map +1 -1
- package/dist/state.js +1 -1
- package/dist/state.js.map +1 -1
- package/dist/tools/common/add_actor.d.ts.map +1 -1
- package/dist/tools/common/add_actor.js +16 -25
- package/dist/tools/common/add_actor.js.map +1 -1
- package/dist/tools/common/get_dataset.d.ts.map +1 -1
- package/dist/tools/common/get_dataset.js +10 -1
- package/dist/tools/common/get_dataset.js.map +1 -1
- package/dist/tools/core/actor_run_response.d.ts +23 -0
- package/dist/tools/core/actor_run_response.d.ts.map +1 -1
- package/dist/tools/core/actor_run_response.js +34 -9
- package/dist/tools/core/actor_run_response.js.map +1 -1
- package/dist/tools/core/actor_tools_factory.d.ts +32 -1
- package/dist/tools/core/actor_tools_factory.d.ts.map +1 -1
- package/dist/tools/core/actor_tools_factory.js +60 -38
- package/dist/tools/core/actor_tools_factory.js.map +1 -1
- package/dist/tools/core/call_actor_common.d.ts +21 -3
- package/dist/tools/core/call_actor_common.d.ts.map +1 -1
- package/dist/tools/core/call_actor_common.js +60 -18
- package/dist/tools/core/call_actor_common.js.map +1 -1
- package/dist/tools/index.d.ts +2 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/utils.d.ts +7 -0
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +10 -0
- package/dist/tools/utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/actor.d.ts +9 -1
- package/dist/utils/actor.d.ts.map +1 -1
- package/dist/utils/actor.js +18 -2
- package/dist/utils/actor.js.map +1 -1
- package/dist/utils/tools_loader.d.ts +12 -2
- package/dist/utils/tools_loader.d.ts.map +1 -1
- package/dist/utils/tools_loader.js +13 -6
- package/dist/utils/tools_loader.js.map +1 -1
- package/package.json +1 -1
|
@@ -57,6 +57,39 @@ async function raceAbort(promise, abortSignal) {
|
|
|
57
57
|
function slashToDot(field) {
|
|
58
58
|
return field.replace(/\//g, '.');
|
|
59
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Apify expands array indices in dataset fields (e.g. `entities.hashtags.0.text`,
|
|
62
|
+
* `entities.hashtags.1.text`, ... `entities.hashtags.14.text`), so deeply-nested or
|
|
63
|
+
* array-heavy schemas balloon into hundreds of redundant paths. Strip pure-numeric
|
|
64
|
+
* segments and dedupe; the resulting paths stay valid projections for `fields="..."`.
|
|
65
|
+
*
|
|
66
|
+
* Exported for direct unit testing of edge cases (empty input, all-numeric paths) —
|
|
67
|
+
* production callers go through `normalizeDatasetFields`.
|
|
68
|
+
*/
|
|
69
|
+
export function collapseArrayIndices(fields) {
|
|
70
|
+
const seen = new Set();
|
|
71
|
+
const result = [];
|
|
72
|
+
for (const field of fields) {
|
|
73
|
+
const collapsed = field
|
|
74
|
+
.split('.')
|
|
75
|
+
.filter((segment) => !/^\d+$/.test(segment))
|
|
76
|
+
.join('.');
|
|
77
|
+
if (collapsed && !seen.has(collapsed)) {
|
|
78
|
+
seen.add(collapsed);
|
|
79
|
+
result.push(collapsed);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return result;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Canonical normalization for an Apify-returned `dataset.fields` array: translate
|
|
86
|
+
* slash-notation to dot-notation AND collapse expanded array indices. Used at every
|
|
87
|
+
* MCP tool boundary that surfaces dataset field metadata (`buildRunDataset` for
|
|
88
|
+
* `call-actor` / `get-actor-run`, and `get-dataset` for the raw API passthrough).
|
|
89
|
+
*/
|
|
90
|
+
export function normalizeDatasetFields(fields) {
|
|
91
|
+
return collapseArrayIndices(fields.map(slashToDot));
|
|
92
|
+
}
|
|
60
93
|
/**
|
|
61
94
|
* Drop undefined and null keys. Apify's SDK returns null for fields it doesn't have (e.g.
|
|
62
95
|
* an unnamed default dataset's `name`), and the response shape declares no nullable fields, so we
|
|
@@ -87,7 +120,6 @@ function buildStats(run) {
|
|
|
87
120
|
return Object.keys(out).length > 0 ? out : undefined;
|
|
88
121
|
}
|
|
89
122
|
function buildRunDataset(run, datasetMeta, resolvedItemCount) {
|
|
90
|
-
var _a;
|
|
91
123
|
if (!run.defaultDatasetId)
|
|
92
124
|
return undefined;
|
|
93
125
|
if (!datasetMeta) {
|
|
@@ -99,7 +131,7 @@ function buildRunDataset(run, datasetMeta, resolvedItemCount) {
|
|
|
99
131
|
title: datasetMeta.title,
|
|
100
132
|
itemCount: resolvedItemCount !== null && resolvedItemCount !== void 0 ? resolvedItemCount : datasetMeta.itemCount,
|
|
101
133
|
cleanItemCount: datasetMeta.cleanItemCount,
|
|
102
|
-
fields:
|
|
134
|
+
fields: datasetMeta.fields ? normalizeDatasetFields(datasetMeta.fields) : undefined,
|
|
103
135
|
});
|
|
104
136
|
}
|
|
105
137
|
function buildRunKeyValueStore(run, listKeysResult) {
|
|
@@ -227,13 +259,6 @@ function summarizeKv(keyValueStore) {
|
|
|
227
259
|
const keyCountLabel = kvTruncated ? `at least ${KV_KEYS_LIMIT} keys` : `${n} ${n === 1 ? 'key' : 'keys'}`;
|
|
228
260
|
return { hasKv: true, kvId, keys, keyCountLabel, summarySuffix: ` Key-value store has ${keyCountLabel}.` };
|
|
229
261
|
}
|
|
230
|
-
// TODO: Apify's fields list expands array indices (e.g. `entities.hashtags.0.text`,
|
|
231
|
-
// `entities.hashtags.1.text`, ... `entities.hashtags.14.text`), so deeply-nested or array-heavy
|
|
232
|
-
// schemas balloon into hundreds of paths and bloat nextStep. Real example: a Twitter dataset
|
|
233
|
-
// returned 174 expanded paths for ~30 unique schema fields. Two viable fixes — collapse `.N`
|
|
234
|
-
// segments to the array root (`entities.hashtags`) and dedupe (all paths stay projection-valid,
|
|
235
|
-
// schema detail lost inside arrays), or collapse `.N.` to `[]` (preserves shape but produces
|
|
236
|
-
// paths that aren't directly valid for `fields="..."`). Deferred pending a real-world choice.
|
|
237
262
|
function fieldsProjectionHint(fields) {
|
|
238
263
|
if (!fields || fields.length === 0)
|
|
239
264
|
return '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor_run_response.js","sourceRoot":"","sources":["../../../src/tools/core/actor_run_response.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actor_run_response.js","sourceRoot":"","sources":["../../../src/tools/core/actor_run_response.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { ApifyClient } from '../../apify_client.js';
|
|
2
|
+
import { ActorLoadError } from '../../errors.js';
|
|
3
|
+
import type { PaymentProvider } from '../../payments/types.js';
|
|
2
4
|
import type { ActorInfo, ActorStore, ApifyToken, ToolEntry } from '../../types.js';
|
|
3
5
|
/**
|
|
4
6
|
* For each direct actor tool with a known historical item schema, replaces the generic
|
|
@@ -49,8 +51,37 @@ export declare function fixActorNameInputAndLog(actorName: string, extra?: Recor
|
|
|
49
51
|
* and strips common wrappers / spacing noise; valid names pass through unchanged.
|
|
50
52
|
*/
|
|
51
53
|
export declare function fixActorNameInput(actorName: string): string;
|
|
54
|
+
/**
|
|
55
|
+
* Result type for {@link getActorsAsTools}: every requested name produces
|
|
56
|
+
* either a successful load (contributing to `tools` — a single Actor can fan
|
|
57
|
+
* out into multiple tools for MCP-server Actors) or an `ActorLoadError`
|
|
58
|
+
* describing why the load failed.
|
|
59
|
+
*
|
|
60
|
+
* Bulk callers (`getActors`, server load-helpers) typically only read
|
|
61
|
+
* `tools`. Single-Actor callers (`add-actor`, `call-actor`) read `errors[0]`
|
|
62
|
+
* to surface the precise reason back to the agent.
|
|
63
|
+
*/
|
|
64
|
+
export type ActorsAsToolsResult = {
|
|
65
|
+
tools: ToolEntry[];
|
|
66
|
+
errors: ActorLoadError[];
|
|
67
|
+
};
|
|
68
|
+
/**
|
|
69
|
+
* Loads Actor metadata + builds MCP tool entries for the requested Actor
|
|
70
|
+
* names. Returns both successful tools and `ActorLoadError` entries so
|
|
71
|
+
* callers can surface precise reasons when needed (single-Actor flows like
|
|
72
|
+
* `add-actor` / `call-actor`) or just ignore failures (bulk session-boot
|
|
73
|
+
* flows that build the initial tool surface).
|
|
74
|
+
*
|
|
75
|
+
* When `paymentProvider` is set, standby and MCP-server Actors are reported
|
|
76
|
+
* as `STANDBY_PAYMENT_NOT_SUPPORTED` errors instead of contributing tools.
|
|
77
|
+
* External payment providers (x402, Skyfire) cannot pay for standby Actor
|
|
78
|
+
* runs — the call-time guard in `call_actor_common.ts` rejects any such
|
|
79
|
+
* tool call. Filtering at list time keeps the advertised tool surface
|
|
80
|
+
* honest so agents never discover a tool that can only fail later.
|
|
81
|
+
*/
|
|
52
82
|
export declare function getActorsAsTools(actorIdsOrNames: string[], apifyClient: ApifyClient, options?: {
|
|
53
83
|
mcpSessionId?: string;
|
|
54
84
|
actorStore?: ActorStore;
|
|
55
|
-
|
|
85
|
+
paymentProvider?: PaymentProvider;
|
|
86
|
+
}): Promise<ActorsAsToolsResult>;
|
|
56
87
|
//# sourceMappingURL=actor_tools_factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor_tools_factory.d.ts","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"actor_tools_factory.d.ts","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOzD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAER,SAAS,EACT,UAAU,EAEV,UAAU,EACV,SAAS,EAEZ,MAAM,gBAAgB,CAAC;AA4BxB;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB5G;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,sBAAsB,CACxC,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,UAAU,CAAA;CAAE,GAC7D,OAAO,CAAC,SAAS,EAAE,CAAC,CA+EtB;AAED,wBAAsB,oBAAoB,CACtC,UAAU,EAAE,SAAS,EAAE,EACvB,UAAU,EAAE,UAAU,EACtB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC,CAuDtB;AAKD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAUlG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAY3D;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,MAAM,EAAE,cAAc,EAAE,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IACN,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,eAAe,CAAC;CACrC,GACF,OAAO,CAAC,mBAAmB,CAAC,CAuE9B"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import log from '@apify/log';
|
|
2
2
|
import { ACTOR_MAX_MEMORY_MBYTES, HelperTools, RAG_WEB_BROWSER, RAG_WEB_BROWSER_ADDITIONAL_DESC, } from '../../const.js';
|
|
3
|
+
import { ActorLoadError } from '../../errors.js';
|
|
4
|
+
import { getActorDefinitionCached } from '../../utils/actor.js';
|
|
3
5
|
import { getActorMCPServerPath, getActorMCPServerURL } from '../../mcp/actors.js';
|
|
4
6
|
import { connectMCPClient } from '../../mcp/client.js';
|
|
5
7
|
import { getMCPServerTools } from '../../mcp/proxy.js';
|
|
6
|
-
import { actorDefinitionPrunedCache } from '../../state.js';
|
|
7
8
|
import { ajv } from '../../utils/ajv.js';
|
|
8
9
|
import { logHttpError } from '../../utils/logging.js';
|
|
9
|
-
import { getActorDefinition } from '../build.js';
|
|
10
10
|
import { buildEnrichedDirectActorOutputSchema, getActorRunOutputSchema } from '../structured_output_schemas.js';
|
|
11
|
-
import { actorNameToToolName, buildActorInputSchema, fixedAjvCompile, isActorInfoMcpServer } from '../utils.js';
|
|
11
|
+
import { actorNameToToolName, buildActorInputSchema, fixedAjvCompile, isActorBlockedUnderPaymentProvider, isActorInfoMcpServer, } from '../utils.js';
|
|
12
12
|
import { CALL_ACTOR_WAIT_SECS_DEFAULT, WAIT_SECS_MAX } from './actor_run_response.js';
|
|
13
13
|
/**
|
|
14
14
|
* MCP-only opt-in injected next to the Actor's own input fields. Same contract as `call-actor`'s
|
|
@@ -238,38 +238,33 @@ export function fixActorNameInput(actorName) {
|
|
|
238
238
|
s = s.replace(/\s*\/\s*/g, '/');
|
|
239
239
|
return s.replace(/\s+/g, ' ').trim();
|
|
240
240
|
}
|
|
241
|
+
/**
|
|
242
|
+
* Loads Actor metadata + builds MCP tool entries for the requested Actor
|
|
243
|
+
* names. Returns both successful tools and `ActorLoadError` entries so
|
|
244
|
+
* callers can surface precise reasons when needed (single-Actor flows like
|
|
245
|
+
* `add-actor` / `call-actor`) or just ignore failures (bulk session-boot
|
|
246
|
+
* flows that build the initial tool surface).
|
|
247
|
+
*
|
|
248
|
+
* When `paymentProvider` is set, standby and MCP-server Actors are reported
|
|
249
|
+
* as `STANDBY_PAYMENT_NOT_SUPPORTED` errors instead of contributing tools.
|
|
250
|
+
* External payment providers (x402, Skyfire) cannot pay for standby Actor
|
|
251
|
+
* runs — the call-time guard in `call_actor_common.ts` rejects any such
|
|
252
|
+
* tool call. Filtering at list time keeps the advertised tool surface
|
|
253
|
+
* honest so agents never discover a tool that can only fail later.
|
|
254
|
+
*/
|
|
241
255
|
export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
|
|
242
|
-
const { mcpSessionId, actorStore } = options !== null && options !== void 0 ? options : {};
|
|
243
|
-
log.debug('Fetching Actors as tools', {
|
|
256
|
+
const { mcpSessionId, actorStore, paymentProvider } = options !== null && options !== void 0 ? options : {};
|
|
257
|
+
log.debug('Fetching Actors as tools', {
|
|
258
|
+
actorNames: actorIdsOrNames,
|
|
259
|
+
mcpSessionId,
|
|
260
|
+
paymentProviderId: paymentProvider === null || paymentProvider === void 0 ? void 0 : paymentProvider.id,
|
|
261
|
+
});
|
|
262
|
+
const errors = [];
|
|
244
263
|
const actorsInfo = await Promise.all(actorIdsOrNames.map(async (actorIdOrName) => {
|
|
245
264
|
const actorName = fixActorNameInputAndLog(actorIdOrName, { mcpSessionId });
|
|
246
|
-
|
|
247
|
-
if (actorDefinitionWithInfoCached) {
|
|
248
|
-
return {
|
|
249
|
-
definition: actorDefinitionWithInfoCached.definition,
|
|
250
|
-
actor: actorDefinitionWithInfoCached.info,
|
|
251
|
-
webServerMcpPath: getActorMCPServerPath(actorDefinitionWithInfoCached.definition),
|
|
252
|
-
};
|
|
253
|
-
}
|
|
265
|
+
let actorDefinitionWithInfo;
|
|
254
266
|
try {
|
|
255
|
-
|
|
256
|
-
if (!actorDefinitionWithInfo) {
|
|
257
|
-
log.softFail('Actor not found or definition is not available', {
|
|
258
|
-
actorName,
|
|
259
|
-
...(actorName !== actorIdOrName && { actorNameInput: actorIdOrName }),
|
|
260
|
-
mcpSessionId,
|
|
261
|
-
statusCode: 404,
|
|
262
|
-
failureCategory: 'INVALID_INPUT',
|
|
263
|
-
});
|
|
264
|
-
return null;
|
|
265
|
-
}
|
|
266
|
-
// Cache the Actor definition with info
|
|
267
|
-
actorDefinitionPrunedCache.set(actorName, actorDefinitionWithInfo);
|
|
268
|
-
return {
|
|
269
|
-
definition: actorDefinitionWithInfo.definition,
|
|
270
|
-
actor: actorDefinitionWithInfo.info,
|
|
271
|
-
webServerMcpPath: getActorMCPServerPath(actorDefinitionWithInfo.definition),
|
|
272
|
-
};
|
|
267
|
+
actorDefinitionWithInfo = await getActorDefinitionCached(actorName, apifyClient);
|
|
273
268
|
}
|
|
274
269
|
catch (error) {
|
|
275
270
|
logHttpError(error, 'Failed to fetch Actor definition', {
|
|
@@ -277,21 +272,48 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
|
|
|
277
272
|
...(actorName !== actorIdOrName && { actorNameInput: actorIdOrName }),
|
|
278
273
|
mcpSessionId,
|
|
279
274
|
});
|
|
275
|
+
errors.push(ActorLoadError.loadFailed(actorIdOrName));
|
|
280
276
|
return null;
|
|
281
277
|
}
|
|
278
|
+
if (!actorDefinitionWithInfo) {
|
|
279
|
+
log.softFail('Actor not found or definition is not available', {
|
|
280
|
+
actorName,
|
|
281
|
+
...(actorName !== actorIdOrName && { actorNameInput: actorIdOrName }),
|
|
282
|
+
mcpSessionId,
|
|
283
|
+
statusCode: 404,
|
|
284
|
+
failureCategory: 'INVALID_INPUT',
|
|
285
|
+
});
|
|
286
|
+
errors.push(ActorLoadError.notFound(actorIdOrName));
|
|
287
|
+
return null;
|
|
288
|
+
}
|
|
289
|
+
return {
|
|
290
|
+
definition: actorDefinitionWithInfo.definition,
|
|
291
|
+
actor: actorDefinitionWithInfo.info,
|
|
292
|
+
webServerMcpPath: getActorMCPServerPath(actorDefinitionWithInfo.definition),
|
|
293
|
+
};
|
|
282
294
|
}));
|
|
283
295
|
const clonedActors = structuredClone(actorsInfo);
|
|
284
|
-
// Filter out nulls - actorInfo can be null if the Actor was not found or an error occurred
|
|
285
296
|
const nonNullActors = clonedActors.filter((actorInfo) => Boolean(actorInfo));
|
|
286
|
-
//
|
|
287
|
-
//
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
const normalActorsInfo =
|
|
297
|
+
// Split MCP-server vs normal Actors. Under `paymentProvider`, standby/MCP-server
|
|
298
|
+
// Actors are reported as STANDBY_PAYMENT_NOT_SUPPORTED errors instead of contributing
|
|
299
|
+
// tools — the platform API hard-rejects standby runs under third-party providers.
|
|
300
|
+
const actorMCPServersInfo = [];
|
|
301
|
+
const normalActorsInfo = [];
|
|
302
|
+
for (const actorInfo of nonNullActors) {
|
|
303
|
+
const isMcpServer = isActorInfoMcpServer(actorInfo);
|
|
304
|
+
if (paymentProvider && isActorBlockedUnderPaymentProvider(actorInfo)) {
|
|
305
|
+
errors.push(ActorLoadError.standbyPaymentNotSupported(actorInfo.definition.actorFullName));
|
|
306
|
+
continue;
|
|
307
|
+
}
|
|
308
|
+
if (isMcpServer)
|
|
309
|
+
actorMCPServersInfo.push(actorInfo);
|
|
310
|
+
else
|
|
311
|
+
normalActorsInfo.push(actorInfo);
|
|
312
|
+
}
|
|
291
313
|
const [normalTools, mcpServerTools] = await Promise.all([
|
|
292
314
|
getNormalActorsAsTools(normalActorsInfo, { mcpSessionId, actorStore }),
|
|
293
315
|
getMCPServersAsTools(actorMCPServersInfo, apifyClient.token, mcpSessionId),
|
|
294
316
|
]);
|
|
295
|
-
return [...normalTools, ...mcpServerTools];
|
|
317
|
+
return { tools: [...normalTools, ...mcpServerTools], errors };
|
|
296
318
|
}
|
|
297
319
|
//# sourceMappingURL=actor_tools_factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,YAAY,CAAC;AAG7B,OAAO,EACH,uBAAuB,EACvB,WAAW,EACX,eAAe,EACf,+BAA+B,GAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ApifyApiError } from 'apify-client';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { HelperTools } from '../../const.js';
|
|
4
|
-
import type {
|
|
4
|
+
import type { PaymentProvider } from '../../payments/types.js';
|
|
5
|
+
import type { ApifyToken, InternalToolArgs, ToolEntry, ToolInputSchema } from '../../types.js';
|
|
5
6
|
import { buildMCPResponse } from '../../utils/mcp.js';
|
|
6
|
-
import { getActorsAsTools } from './actor_tools_factory.js';
|
|
7
7
|
export declare const CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG = "When calling an MCP server Actor, you must specify the tool name in the actor parameter as \"{actorName}:{toolName}\" in the \"actor\" input property.";
|
|
8
8
|
/** Shared MCP server instructions — identical in both modes. */
|
|
9
9
|
export declare const CALL_ACTOR_MCP_SERVER_SECTION = "For MCP server Actors:\n- Use fetch-actor-details with output={ mcpTools: true } to list available tools\n- Call using format: \"actorName:toolName\" (e.g., \"apify/actors-mcp-server:fetch-apify-docs\")";
|
|
@@ -50,6 +50,24 @@ export declare const callActorAjvValidate: import("ajv").ValidateFunction<unknow
|
|
|
50
50
|
* Parsed call-actor arguments.
|
|
51
51
|
*/
|
|
52
52
|
export type CallActorParsedArgs = z.infer<typeof callActorArgs>;
|
|
53
|
+
/**
|
|
54
|
+
* Returns a rejection MCP response when the requested Actor is a standby
|
|
55
|
+
* (or MCP-server) Actor AND the session uses a third-party payment provider.
|
|
56
|
+
* Otherwise returns `null`.
|
|
57
|
+
*
|
|
58
|
+
* Standby Actors cannot be paid for via x402 / Skyfire — calling them in
|
|
59
|
+
* payment mode is a hard input error, so this guard must run BEFORE the
|
|
60
|
+
* generic payment-required short-circuit in the tool-call handler so the
|
|
61
|
+
* agent receives the precise reason instead of a generic 402.
|
|
62
|
+
*
|
|
63
|
+
* Uses `actorDefinitionCache` — one definition fetch on a cold cache.
|
|
64
|
+
*/
|
|
65
|
+
export declare function checkPaymentProviderStandbyConflict(params: {
|
|
66
|
+
actorName: string;
|
|
67
|
+
paymentProvider: PaymentProvider;
|
|
68
|
+
apifyToken: ApifyToken;
|
|
69
|
+
mcpSessionId?: string;
|
|
70
|
+
}): Promise<Record<string, unknown> | null>;
|
|
53
71
|
/**
|
|
54
72
|
* Resolves MCP URL and parses the "actor:tool" format.
|
|
55
73
|
* Shared pre-processing step used by both default and apps variants.
|
|
@@ -82,7 +100,7 @@ export declare function resolveAndValidateActor(params: {
|
|
|
82
100
|
}): Promise<{
|
|
83
101
|
error: object;
|
|
84
102
|
} | {
|
|
85
|
-
actor:
|
|
103
|
+
actor: ToolEntry;
|
|
86
104
|
}>;
|
|
87
105
|
/**
|
|
88
106
|
* Performs the pre-execution checks common to both modes:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call_actor_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAIH,WAAW,EAEd,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"call_actor_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,15 @@ import { z } from 'zod';
|
|
|
4
4
|
import log from '@apify/log';
|
|
5
5
|
import { ApifyClient } from '../../apify_client.js';
|
|
6
6
|
import { APIFY_ERROR_TYPE_FULL_PERMISSION_NOT_APPROVED, APIFY_ERROR_TYPE_MEMORY_LIMIT_EXCEEDED, FAILURE_CATEGORY, HelperTools, TOOL_STATUS, } from '../../const.js';
|
|
7
|
+
import { ACTOR_LOAD_ERROR_KIND, ActorLoadError } from '../../errors.js';
|
|
7
8
|
import { connectMCPClient } from '../../mcp/client.js';
|
|
8
|
-
import { getActorMcpUrlCached } from '../../utils/actor.js';
|
|
9
|
+
import { getActorDefinitionCached, getActorMcpUrlCached } from '../../utils/actor.js';
|
|
9
10
|
import { compileSchema } from '../../utils/ajv.js';
|
|
10
11
|
import { getHttpStatusCode, logHttpError } from '../../utils/logging.js';
|
|
11
12
|
import { buildMCPResponse } from '../../utils/mcp.js';
|
|
12
13
|
import { classifyFailureCategory, extractAjvErrorDetails, getToolStatusFromError } from '../../utils/tool_status.js';
|
|
13
14
|
import { extractActorId } from '../../utils/tools.js';
|
|
14
|
-
import { actorNameToToolName } from '../utils.js';
|
|
15
|
+
import { actorNameToToolName, isActorBlockedUnderPaymentProvider } from '../utils.js';
|
|
15
16
|
import { abortRunOnSignal, buildStartRunResponse, CALL_ACTOR_WAIT_SECS_DEFAULT, fetchActorRunData } from './actor_run_response.js';
|
|
16
17
|
import { fixActorNameInputAndLog, getActorsAsTools } from './actor_tools_factory.js';
|
|
17
18
|
import { buildGetActorRunSuccessResponse } from './get_actor_run_common.js';
|
|
@@ -207,6 +208,48 @@ export const callActorArgs = z.object({
|
|
|
207
208
|
});
|
|
208
209
|
export const callActorInputSchema = z.toJSONSchema(callActorArgs);
|
|
209
210
|
export const callActorAjvValidate = compileSchema({ ...z.toJSONSchema(callActorArgs), additionalProperties: true });
|
|
211
|
+
/**
|
|
212
|
+
* Returns a rejection MCP response when the requested Actor is a standby
|
|
213
|
+
* (or MCP-server) Actor AND the session uses a third-party payment provider.
|
|
214
|
+
* Otherwise returns `null`.
|
|
215
|
+
*
|
|
216
|
+
* Standby Actors cannot be paid for via x402 / Skyfire — calling them in
|
|
217
|
+
* payment mode is a hard input error, so this guard must run BEFORE the
|
|
218
|
+
* generic payment-required short-circuit in the tool-call handler so the
|
|
219
|
+
* agent receives the precise reason instead of a generic 402.
|
|
220
|
+
*
|
|
221
|
+
* Uses `actorDefinitionCache` — one definition fetch on a cold cache.
|
|
222
|
+
*/
|
|
223
|
+
export async function checkPaymentProviderStandbyConflict(params) {
|
|
224
|
+
const { actorName, paymentProvider, apifyToken, mcpSessionId } = params;
|
|
225
|
+
const normalizedActorName = fixActorNameInputAndLog(actorName, { mcpSessionId });
|
|
226
|
+
const { baseActorName } = resolveActorContext(normalizedActorName);
|
|
227
|
+
// Token-based client — payment headers are only relevant for actual Actor runs.
|
|
228
|
+
const apifyClientForDefinition = new ApifyClient({ token: apifyToken });
|
|
229
|
+
const actorDefinitionWithInfo = await getActorDefinitionCached(baseActorName, apifyClientForDefinition);
|
|
230
|
+
if (!actorDefinitionWithInfo) {
|
|
231
|
+
return null;
|
|
232
|
+
}
|
|
233
|
+
const actorInfo = {
|
|
234
|
+
definition: actorDefinitionWithInfo.definition,
|
|
235
|
+
actor: actorDefinitionWithInfo.info,
|
|
236
|
+
webServerMcpPath: null,
|
|
237
|
+
};
|
|
238
|
+
if (!isActorBlockedUnderPaymentProvider(actorInfo)) {
|
|
239
|
+
return null;
|
|
240
|
+
}
|
|
241
|
+
log.softFail('Rejecting call-actor for standby Actor under third-party payment provider', {
|
|
242
|
+
actorName: baseActorName,
|
|
243
|
+
paymentProviderId: paymentProvider.id,
|
|
244
|
+
mcpSessionId,
|
|
245
|
+
failureCategory: FAILURE_CATEGORY.INVALID_INPUT,
|
|
246
|
+
});
|
|
247
|
+
return buildMCPResponse({
|
|
248
|
+
texts: [ActorLoadError.standbyPaymentNotSupported(normalizedActorName).message],
|
|
249
|
+
isError: true,
|
|
250
|
+
telemetry: { toolStatus: TOOL_STATUS.SOFT_FAIL, failureCategory: FAILURE_CATEGORY.INVALID_INPUT },
|
|
251
|
+
});
|
|
252
|
+
}
|
|
210
253
|
/**
|
|
211
254
|
* Resolves MCP URL and parses the "actor:tool" format.
|
|
212
255
|
* Shared pre-processing step used by both default and apps variants.
|
|
@@ -296,7 +339,17 @@ export async function resolveAndValidateActor(params) {
|
|
|
296
339
|
var _a;
|
|
297
340
|
const { actorName, input, toolArgs } = params;
|
|
298
341
|
const { apifyClient } = toolArgs;
|
|
299
|
-
const
|
|
342
|
+
const { tools, errors } = await getActorsAsTools([actorName], apifyClient, {
|
|
343
|
+
mcpSessionId: toolArgs.mcpSessionId,
|
|
344
|
+
});
|
|
345
|
+
// NOT_FOUND falls through to the structured "Actor not found" response below.
|
|
346
|
+
// Any other error (LOAD_FAILED / STANDBY_PAYMENT_NOT_SUPPORTED) is rethrown so the
|
|
347
|
+
// outer call-actor handler reports it; STANDBY is also caught upstream by the
|
|
348
|
+
// call-time guard in server.ts, so it's a defensive fallback here.
|
|
349
|
+
if (errors[0] && errors[0].kind !== ACTOR_LOAD_ERROR_KIND.NOT_FOUND) {
|
|
350
|
+
throw errors[0];
|
|
351
|
+
}
|
|
352
|
+
const actor = tools[0];
|
|
300
353
|
if (!actor) {
|
|
301
354
|
return {
|
|
302
355
|
error: buildMCPResponse({
|
|
@@ -388,28 +441,17 @@ export async function resolveAndValidateActor(params) {
|
|
|
388
441
|
* e.g. trailing `` ` `` on `apify/rag-web-browser`).
|
|
389
442
|
*/
|
|
390
443
|
export async function callActorPreExecute(toolArgs, options) {
|
|
391
|
-
const { args, apifyToken,
|
|
444
|
+
const { args, apifyToken, mcpSessionId } = toolArgs;
|
|
392
445
|
const parsedArgs = callActorArgs.parse(args);
|
|
393
446
|
const actorName = fixActorNameInputAndLog(parsedArgs.actor, { mcpSessionId, route: options.route });
|
|
394
447
|
const parsed = { ...parsedArgs, actor: actorName };
|
|
395
448
|
const { baseActorName, mcpToolName } = resolveActorContext(parsed.actor);
|
|
396
|
-
// For definition resolution we always use a token-based client; payment provider is only for actual Actor runs
|
|
449
|
+
// For definition resolution we always use a token-based client; payment provider is only for actual Actor runs.
|
|
450
|
+
// Standby/MCP-server Actors under a third-party payment provider are rejected upstream by
|
|
451
|
+
// `checkPaymentProviderStandbyConflict` in the generic tool-call handler — see src/mcp/server.ts.
|
|
397
452
|
const apifyClientForDefinition = new ApifyClient({ token: apifyToken });
|
|
398
453
|
const mcpServerUrlOrFalse = await getActorMcpUrlCached(baseActorName, apifyClientForDefinition);
|
|
399
454
|
const isActorMcpServer = !!mcpServerUrlOrFalse;
|
|
400
|
-
// Standby Actors (MCPs) are not supported with external payment providers (like Skyfire or x402)
|
|
401
|
-
if (isActorMcpServer && apifyMcpServer.options.paymentProvider) {
|
|
402
|
-
return {
|
|
403
|
-
earlyResponse: buildMCPResponse({
|
|
404
|
-
texts: [dedent `
|
|
405
|
-
This Actor (${parsed.actor}) is an MCP server and cannot be accessed using a third-party payment provider.
|
|
406
|
-
To use this Actor, please provide a valid Apify token instead.
|
|
407
|
-
`],
|
|
408
|
-
isError: true,
|
|
409
|
-
telemetry: { toolStatus: TOOL_STATUS.SOFT_FAIL, failureCategory: FAILURE_CATEGORY.INVALID_INPUT },
|
|
410
|
-
}),
|
|
411
|
-
};
|
|
412
|
-
}
|
|
413
455
|
// Handle the case where LLM does not respect instructions when calling MCP server Actors
|
|
414
456
|
// and does not provide the tool name.
|
|
415
457
|
const isMcpToolNameInvalid = mcpToolName === undefined || mcpToolName.trim().length === 0;
|