@apify/actors-mcp-server 0.10.5-beta.0 → 0.10.5-beta.10
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/apify_client.d.ts.map +1 -1
- package/dist/apify_client.js +16 -1
- package/dist/apify_client.js.map +1 -1
- package/dist/const.d.ts +1 -1
- package/dist/const.d.ts.map +1 -1
- package/dist/const.js +1 -3
- package/dist/const.js.map +1 -1
- package/dist/dev_server.d.ts.map +1 -1
- package/dist/dev_server.js +24 -5
- package/dist/dev_server.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -2
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +96 -51
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/utils.d.ts +1 -1
- package/dist/mcp/utils.js +1 -1
- package/dist/tools/actor_executor.d.ts +10 -0
- package/dist/tools/actor_executor.d.ts.map +1 -0
- package/dist/tools/actor_executor.js +79 -0
- package/dist/tools/actor_executor.js.map +1 -0
- package/dist/tools/apps/call_actor.d.ts +0 -1
- package/dist/tools/apps/call_actor.d.ts.map +1 -1
- package/dist/tools/apps/call_actor.js +8 -54
- package/dist/tools/apps/call_actor.js.map +1 -1
- package/dist/tools/apps/call_actor_widget.d.ts.map +1 -1
- package/dist/tools/apps/call_actor_widget.js +8 -32
- package/dist/tools/apps/call_actor_widget.js.map +1 -1
- package/dist/tools/apps/get_actor_run_widget.d.ts.map +1 -1
- package/dist/tools/apps/get_actor_run_widget.js +15 -9
- package/dist/tools/apps/get_actor_run_widget.js.map +1 -1
- package/dist/tools/categories.d.ts +6 -0
- package/dist/tools/categories.d.ts.map +1 -1
- package/dist/tools/categories.js +7 -1
- package/dist/tools/categories.js.map +1 -1
- package/dist/tools/core/actor_run_response.d.ts +127 -0
- package/dist/tools/core/actor_run_response.d.ts.map +1 -0
- package/dist/tools/core/actor_run_response.js +551 -0
- package/dist/tools/core/actor_run_response.js.map +1 -0
- package/dist/tools/core/actor_tools_factory.d.ts +8 -3
- package/dist/tools/core/actor_tools_factory.d.ts.map +1 -1
- package/dist/tools/core/actor_tools_factory.js +39 -15
- package/dist/tools/core/actor_tools_factory.js.map +1 -1
- package/dist/tools/core/call_actor_common.d.ts +19 -39
- package/dist/tools/core/call_actor_common.d.ts.map +1 -1
- package/dist/tools/core/call_actor_common.js +196 -129
- package/dist/tools/core/call_actor_common.js.map +1 -1
- package/dist/tools/core/fetch_actor_details_common.d.ts.map +1 -1
- package/dist/tools/core/fetch_actor_details_common.js +1 -0
- package/dist/tools/core/fetch_actor_details_common.js.map +1 -1
- package/dist/tools/core/get_actor_run_common.d.ts +10 -49
- package/dist/tools/core/get_actor_run_common.d.ts.map +1 -1
- package/dist/tools/core/get_actor_run_common.js +51 -86
- package/dist/tools/core/get_actor_run_common.js.map +1 -1
- package/dist/tools/default/call_actor.d.ts +0 -2
- package/dist/tools/default/call_actor.d.ts.map +1 -1
- package/dist/tools/default/call_actor.js +5 -85
- package/dist/tools/default/call_actor.js.map +1 -1
- package/dist/tools/default/get_actor_run.d.ts +1 -2
- package/dist/tools/default/get_actor_run.d.ts.map +1 -1
- package/dist/tools/default/get_actor_run.js +12 -6
- package/dist/tools/default/get_actor_run.js.map +1 -1
- package/dist/tools/index.d.ts +1 -2
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +1 -2
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/structured_output_schemas.d.ts +258 -51
- package/dist/tools/structured_output_schemas.d.ts.map +1 -1
- package/dist/tools/structured_output_schemas.js +128 -68
- package/dist/tools/structured_output_schemas.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +26 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/mcp.d.ts +6 -0
- package/dist/utils/mcp.d.ts.map +1 -1
- package/dist/utils/mcp.js +30 -0
- package/dist/utils/mcp.js.map +1 -1
- package/dist/utils/progress.d.ts +1 -0
- package/dist/utils/progress.d.ts.map +1 -1
- package/dist/utils/progress.js +2 -2
- package/dist/utils/progress.js.map +1 -1
- package/dist/utils/server-instructions/index.d.ts.map +1 -1
- package/dist/utils/server-instructions/index.js +6 -7
- package/dist/utils/server-instructions/index.js.map +1 -1
- package/dist/utils/tools_loader.d.ts.map +1 -1
- package/dist/utils/tools_loader.js +9 -3
- package/dist/utils/tools_loader.js.map +1 -1
- package/dist/web/dist/actor-detail-widget.js +3 -0
- package/dist/web/dist/actor-run-widget.js +219 -216
- package/dist/web/dist/search-actors-widget.js +3 -0
- package/package.json +7 -7
- package/dist/tools/apps/actor_executor.d.ts +0 -8
- package/dist/tools/apps/actor_executor.d.ts.map +0 -1
- package/dist/tools/apps/actor_executor.js +0 -29
- package/dist/tools/apps/actor_executor.js.map +0 -1
- package/dist/tools/core/actor_execution.d.ts +0 -39
- package/dist/tools/core/actor_execution.d.ts.map +0 -1
- package/dist/tools/core/actor_execution.js +0 -135
- package/dist/tools/core/actor_execution.js.map +0 -1
- package/dist/tools/core/actor_response.d.ts +0 -37
- package/dist/tools/core/actor_response.d.ts.map +0 -1
- package/dist/tools/core/actor_response.js +0 -94
- package/dist/tools/core/actor_response.js.map +0 -1
- package/dist/tools/default/actor_executor.d.ts +0 -7
- package/dist/tools/default/actor_executor.d.ts.map +0 -1
- package/dist/tools/default/actor_executor.js +0 -31
- package/dist/tools/default/actor_executor.js.map +0 -1
|
@@ -3,16 +3,35 @@ import { ACTOR_MAX_MEMORY_MBYTES, HelperTools, RAG_WEB_BROWSER, RAG_WEB_BROWSER_
|
|
|
3
3
|
import { getActorMCPServerPath, getActorMCPServerURL } from '../../mcp/actors.js';
|
|
4
4
|
import { connectMCPClient } from '../../mcp/client.js';
|
|
5
5
|
import { getMCPServerTools } from '../../mcp/proxy.js';
|
|
6
|
-
import { getWidgetConfig, WIDGET_URIS } from '../../resources/widgets.js';
|
|
7
6
|
import { actorDefinitionPrunedCache } from '../../state.js';
|
|
8
7
|
import { ajv } from '../../utils/ajv.js';
|
|
9
8
|
import { logHttpError } from '../../utils/logging.js';
|
|
10
9
|
import { getActorDefinition } from '../build.js';
|
|
11
|
-
import {
|
|
10
|
+
import { buildEnrichedDirectActorOutputSchema, getActorRunOutputSchema } from '../structured_output_schemas.js';
|
|
12
11
|
import { actorNameToToolName, buildActorInputSchema, fixedAjvCompile, isActorInfoMcpServer } from '../utils.js';
|
|
12
|
+
import { CALL_ACTOR_WAIT_SECS_DEFAULT, WAIT_SECS_MAX } from './actor_run_response.js';
|
|
13
13
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
14
|
+
* MCP-only opt-in injected next to the Actor's own input fields. Same contract as `call-actor`'s
|
|
15
|
+
* `waitSecs`: default 30, max 45. If the Actor's own input schema happens to declare `waitSecs`,
|
|
16
|
+
* this property overrides it — the field is reserved for the MCP server's wait control.
|
|
17
|
+
*/
|
|
18
|
+
const WAIT_SECS_INPUT_PROPERTY = {
|
|
19
|
+
type: 'integer',
|
|
20
|
+
minimum: 0,
|
|
21
|
+
maximum: WAIT_SECS_MAX,
|
|
22
|
+
default: CALL_ACTOR_WAIT_SECS_DEFAULT,
|
|
23
|
+
description: `Max seconds (0–45, default ${CALL_ACTOR_WAIT_SECS_DEFAULT}) to cap the wait for the Actor run to reach terminal state. `
|
|
24
|
+
+ 'For long-running Actors the response returns at the cap with the current run status; '
|
|
25
|
+
+ `follow \`nextStep\` to poll via ${HelperTools.ACTOR_RUNS_GET}. Set to 0 to fire-and-forget.`,
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* For each direct actor tool with a known historical item schema, replaces the generic
|
|
29
|
+
* `getActorRunOutputSchema` with a per-tool variant that declares
|
|
30
|
+
* `storages.datasets.default.itemsSchema` — letting an LLM plan field projection from
|
|
31
|
+
* `tools/list` alone, before any call.
|
|
32
|
+
*
|
|
33
|
+
* Uses `Promise.allSettled` so a single store failure doesn't block other tools. Individual
|
|
34
|
+
* misses (null / empty properties / thrown errors) leave the tool on the generic schema.
|
|
16
35
|
*/
|
|
17
36
|
export async function enrichActorToolOutputSchemas(tools, actorStore) {
|
|
18
37
|
const enrichPromises = tools
|
|
@@ -22,13 +41,17 @@ export async function enrichActorToolOutputSchemas(tools, actorStore) {
|
|
|
22
41
|
const itemProperties = await actorStore.getActorOutputSchema(tool.actorFullName);
|
|
23
42
|
if (itemProperties && Object.keys(itemProperties).length > 0) {
|
|
24
43
|
// eslint-disable-next-line no-param-reassign
|
|
25
|
-
tool.outputSchema =
|
|
44
|
+
tool.outputSchema = buildEnrichedDirectActorOutputSchema(itemProperties);
|
|
45
|
+
// Stash the raw properties so the executor can mirror them into
|
|
46
|
+
// `structuredContent.storages.datasets.default.itemsSchema` at runtime.
|
|
47
|
+
// eslint-disable-next-line no-param-reassign
|
|
48
|
+
tool.datasetItemsSchema = itemProperties;
|
|
26
49
|
}
|
|
27
50
|
}
|
|
28
51
|
catch (error) {
|
|
29
52
|
log.debug('Failed to enrich output schema for Actor', {
|
|
30
53
|
actorName: tool.actorFullName,
|
|
31
|
-
|
|
54
|
+
errMessage: error instanceof Error ? error.message : String(error),
|
|
32
55
|
});
|
|
33
56
|
}
|
|
34
57
|
});
|
|
@@ -52,7 +75,7 @@ export async function enrichActorToolOutputSchemas(tools, actorStore) {
|
|
|
52
75
|
* 5. Enums are added to descriptions with examples using addEnumsToDescriptionsWithExamples()
|
|
53
76
|
*
|
|
54
77
|
* @param {ActorInfo[]} actorsInfo - An array of ActorInfo objects with webServerMcpPath, definition, and Actor.
|
|
55
|
-
* @param options - Optional settings: mcpSessionId for telemetry correlation, actorStore for
|
|
78
|
+
* @param options - Optional settings: mcpSessionId for telemetry correlation, actorStore for per-Actor itemsSchema enrichment.
|
|
56
79
|
* @returns {Promise<ToolEntry[]>} - A promise that resolves to an array of MCP tools.
|
|
57
80
|
*/
|
|
58
81
|
export async function getNormalActorsAsTools(actorsInfo, options) {
|
|
@@ -65,13 +88,19 @@ export async function getNormalActorsAsTools(actorsInfo, options) {
|
|
|
65
88
|
continue;
|
|
66
89
|
const isRag = definition.actorFullName === RAG_WEB_BROWSER;
|
|
67
90
|
const { inputSchema } = buildActorInputSchema(definition.actorFullName, definition.input, isRag);
|
|
91
|
+
// Inject the MCP-only `waitSecs` opt-in before AJV compile so the LLM can cap the wait.
|
|
92
|
+
const inputSchemaWithWaitSecs = inputSchema;
|
|
93
|
+
inputSchemaWithWaitSecs.properties = {
|
|
94
|
+
...((_a = inputSchemaWithWaitSecs.properties) !== null && _a !== void 0 ? _a : {}),
|
|
95
|
+
waitSecs: WAIT_SECS_INPUT_PROPERTY,
|
|
96
|
+
};
|
|
68
97
|
let description = `This tool calls the Actor "${definition.actorFullName}" and retrieves its output results.
|
|
69
98
|
Use this tool instead of the "${HelperTools.ACTOR_CALL}" if user requests this specific Actor.
|
|
70
99
|
Actor description: ${definition.description}`;
|
|
71
100
|
if (isRag) {
|
|
72
101
|
description += RAG_WEB_BROWSER_ADDITIONAL_DESC;
|
|
73
102
|
}
|
|
74
|
-
const memoryMbytes = Math.min(((
|
|
103
|
+
const memoryMbytes = Math.min(((_b = definition.defaultRunOptions) === null || _b === void 0 ? void 0 : _b.memoryMbytes) || ACTOR_MAX_MEMORY_MBYTES, ACTOR_MAX_MEMORY_MBYTES);
|
|
75
104
|
let ajvValidate;
|
|
76
105
|
try {
|
|
77
106
|
// Unknown properties are silently stripped by AJV's removeAdditional option.
|
|
@@ -94,15 +123,11 @@ Actor description: ${definition.description}`;
|
|
|
94
123
|
actorFullName: definition.actorFullName,
|
|
95
124
|
description,
|
|
96
125
|
inputSchema: inputSchema,
|
|
97
|
-
//
|
|
98
|
-
outputSchema:
|
|
126
|
+
// Canonical RunResponse shape — same as call-actor and get-actor-run.
|
|
127
|
+
outputSchema: getActorRunOutputSchema,
|
|
99
128
|
ajvValidate,
|
|
100
129
|
paymentRequired: true,
|
|
101
130
|
memoryMbytes,
|
|
102
|
-
// openai/* and ui keys are stripped in non-apps mode by stripWidgetMeta() in src/utils/tools.ts
|
|
103
|
-
_meta: {
|
|
104
|
-
...(_b = getWidgetConfig(WIDGET_URIS.ACTOR_RUN)) === null || _b === void 0 ? void 0 : _b.meta,
|
|
105
|
-
},
|
|
106
131
|
icons: definition.pictureUrl
|
|
107
132
|
? [{ src: definition.pictureUrl, mimeType: 'image/png' }]
|
|
108
133
|
: undefined,
|
|
@@ -118,7 +143,6 @@ Actor description: ${definition.description}`;
|
|
|
118
143
|
},
|
|
119
144
|
});
|
|
120
145
|
}
|
|
121
|
-
// Enrich output schemas with field-level detail if actorStore is available
|
|
122
146
|
if (actorStore) {
|
|
123
147
|
await enrichActorToolOutputSchemas(tools, actorStore);
|
|
124
148
|
}
|
|
@@ -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,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,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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"}
|
|
@@ -11,64 +11,39 @@ export declare const CALL_ACTOR_MCP_SERVER_SECTION = "For MCP server Actors:\n-
|
|
|
11
11
|
export declare const CALL_ACTOR_USAGE_SECTION: string;
|
|
12
12
|
/** Shared examples section — identical in both modes. */
|
|
13
13
|
export declare const CALL_ACTOR_EXAMPLES_SECTION = "EXAMPLES:\n- user_input: Get instagram posts using apify/instagram-scraper";
|
|
14
|
-
type CallActorDescriptionParams = {
|
|
15
|
-
actorGetDetailsTool: HelperTools.ACTOR_GET_DETAILS;
|
|
16
|
-
alwaysAsync: boolean;
|
|
17
|
-
};
|
|
18
|
-
type StartedActorRun = {
|
|
19
|
-
id: string;
|
|
20
|
-
status: string;
|
|
21
|
-
startedAt?: Date;
|
|
22
|
-
};
|
|
23
|
-
type StartAsyncResponseResult = {
|
|
24
|
-
content: {
|
|
25
|
-
type: 'text';
|
|
26
|
-
text: string;
|
|
27
|
-
}[];
|
|
28
|
-
structuredContent: {
|
|
29
|
-
runId: string;
|
|
30
|
-
actorName: string;
|
|
31
|
-
status: string;
|
|
32
|
-
startedAt: string;
|
|
33
|
-
input: Record<string, unknown>;
|
|
34
|
-
};
|
|
35
|
-
_meta?: Record<string, unknown>;
|
|
36
|
-
};
|
|
37
14
|
type CallActorErrorResponseParams = {
|
|
38
15
|
actorName: string;
|
|
39
16
|
error: unknown;
|
|
40
17
|
actorId?: string;
|
|
41
|
-
isAsync: boolean;
|
|
42
18
|
mcpSessionId?: string;
|
|
43
19
|
actorGetDetailsTool: HelperTools.ACTOR_GET_DETAILS;
|
|
44
20
|
};
|
|
45
|
-
export declare function buildCallActorDescription(
|
|
46
|
-
export declare function
|
|
47
|
-
actorName: string;
|
|
48
|
-
actorRun: StartedActorRun;
|
|
49
|
-
input: Record<string, unknown>;
|
|
50
|
-
widget: boolean;
|
|
51
|
-
}): StartAsyncResponseResult;
|
|
21
|
+
export declare function buildCallActorDescription(): string;
|
|
22
|
+
export declare function buildCallActorAppsDescription(): string;
|
|
52
23
|
export declare function isPermissionApprovalError(error: unknown): error is ApifyApiError;
|
|
53
24
|
/** Exported for native actor tool error handling in server.ts — no logging, no telemetry. */
|
|
54
25
|
export declare function buildPermissionApprovalResponse(error: ApifyApiError): ReturnType<typeof buildMCPResponse>;
|
|
55
26
|
export declare function buildCallActorErrorResponse(params: CallActorErrorResponseParams): ReturnType<typeof buildMCPResponse>;
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
27
|
+
export declare const callOptionsSchema: z.ZodObject<{
|
|
28
|
+
memory: z.ZodOptional<z.ZodNumber>;
|
|
29
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
30
|
+
build: z.ZodOptional<z.ZodString>;
|
|
31
|
+
maxItems: z.ZodOptional<z.ZodNumber>;
|
|
32
|
+
maxTotalChargeUsd: z.ZodOptional<z.ZodNumber>;
|
|
33
|
+
}, z.core.$strip>;
|
|
34
|
+
/** Zod schema for call-actor arguments — shared between default and apps variants. */
|
|
59
35
|
export declare const callActorArgs: z.ZodObject<{
|
|
60
36
|
actor: z.ZodString;
|
|
61
37
|
input: z.ZodObject<{}, z.core.$loose>;
|
|
62
|
-
|
|
63
|
-
previewOutput: z.ZodOptional<z.ZodBoolean>;
|
|
38
|
+
waitSecs: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
|
|
64
39
|
callOptions: z.ZodOptional<z.ZodObject<{
|
|
65
40
|
memory: z.ZodOptional<z.ZodNumber>;
|
|
66
41
|
timeout: z.ZodOptional<z.ZodNumber>;
|
|
42
|
+
build: z.ZodOptional<z.ZodString>;
|
|
43
|
+
maxItems: z.ZodOptional<z.ZodNumber>;
|
|
44
|
+
maxTotalChargeUsd: z.ZodOptional<z.ZodNumber>;
|
|
67
45
|
}, z.core.$strip>>;
|
|
68
46
|
}, z.core.$strip>;
|
|
69
|
-
/**
|
|
70
|
-
* Compiled AJV input schema — shared between both variants.
|
|
71
|
-
*/
|
|
72
47
|
export declare const callActorInputSchema: ToolInputSchema;
|
|
73
48
|
export declare const callActorAjvValidate: import("ajv").ValidateFunction<unknown>;
|
|
74
49
|
/**
|
|
@@ -131,5 +106,10 @@ export declare function callActorPreExecute(toolArgs: InternalToolArgs, options:
|
|
|
131
106
|
baseActorName: string;
|
|
132
107
|
mcpToolName: string | undefined;
|
|
133
108
|
}>;
|
|
109
|
+
/**
|
|
110
|
+
* Shared start-then-wait flow for call-actor variants (default + apps).
|
|
111
|
+
* `taskMode` is honored — when true, `waitSecs` is ignored and the SDK waits until terminal.
|
|
112
|
+
*/
|
|
113
|
+
export declare function executeCallActor(toolArgs: InternalToolArgs): Promise<object>;
|
|
134
114
|
export {};
|
|
135
115
|
//# sourceMappingURL=call_actor_common.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"call_actor_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"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"}
|