@apify/actors-mcp-server 0.5.2 → 0.5.6
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/README.md +8 -0
- package/dist/actor/server.d.ts.map +1 -1
- package/dist/actor/server.js +12 -4
- package/dist/actor/server.js.map +1 -1
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +2 -1
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/server.d.ts +2 -2
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +37 -30
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/utils.d.ts +3 -2
- package/dist/mcp/utils.d.ts.map +1 -1
- package/dist/mcp/utils.js +3 -2
- package/dist/mcp/utils.js.map +1 -1
- package/dist/tools/actor.d.ts.map +1 -1
- package/dist/tools/actor.js +31 -18
- package/dist/tools/actor.js.map +1 -1
- package/dist/tools/build.d.ts +1 -1
- package/dist/tools/build.d.ts.map +1 -1
- package/dist/tools/build.js +8 -2
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/dataset.d.ts.map +1 -1
- package/dist/tools/dataset.js +19 -4
- package/dist/tools/dataset.js.map +1 -1
- package/dist/tools/dataset_collection.d.ts.map +1 -1
- package/dist/tools/dataset_collection.js +5 -0
- package/dist/tools/dataset_collection.js.map +1 -1
- package/dist/tools/fetch-actor-details.d.ts.map +1 -1
- package/dist/tools/fetch-actor-details.js +16 -8
- package/dist/tools/fetch-actor-details.js.map +1 -1
- package/dist/tools/fetch-apify-docs.d.ts.map +1 -1
- package/dist/tools/fetch-apify-docs.js +22 -26
- package/dist/tools/fetch-apify-docs.js.map +1 -1
- package/dist/tools/get-actor-output.d.ts.map +1 -1
- package/dist/tools/get-actor-output.js +6 -1
- package/dist/tools/get-actor-output.js.map +1 -1
- package/dist/tools/get-html-skeleton.d.ts.map +1 -1
- package/dist/tools/get-html-skeleton.js +9 -4
- package/dist/tools/get-html-skeleton.js.map +1 -1
- package/dist/tools/helpers.d.ts.map +1 -1
- package/dist/tools/helpers.js +4 -0
- package/dist/tools/helpers.js.map +1 -1
- package/dist/tools/key_value_store.d.ts.map +1 -1
- package/dist/tools/key_value_store.js +15 -0
- package/dist/tools/key_value_store.js.map +1 -1
- package/dist/tools/key_value_store_collection.d.ts.map +1 -1
- package/dist/tools/key_value_store_collection.js +5 -0
- package/dist/tools/key_value_store_collection.js.map +1 -1
- package/dist/tools/run.d.ts.map +1 -1
- package/dist/tools/run.js +15 -1
- package/dist/tools/run.js.map +1 -1
- package/dist/tools/run_collection.d.ts.map +1 -1
- package/dist/tools/run_collection.js +5 -0
- package/dist/tools/run_collection.js.map +1 -1
- package/dist/tools/search-apify-docs.d.ts.map +1 -1
- package/dist/tools/search-apify-docs.js +24 -26
- package/dist/tools/search-apify-docs.js.map +1 -1
- package/dist/tools/store_collection.d.ts.map +1 -1
- package/dist/tools/store_collection.js +13 -12
- package/dist/tools/store_collection.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/actor-details.d.ts.map +1 -1
- package/dist/utils/actor-details.js +2 -14
- package/dist/utils/actor-details.js.map +1 -1
- package/dist/utils/logging.d.ts +15 -0
- package/dist/utils/logging.d.ts.map +1 -0
- package/dist/utils/logging.js +51 -0
- package/dist/utils/logging.js.map +1 -0
- package/dist/utils/mcp.d.ts +4 -1
- package/dist/utils/mcp.d.ts.map +1 -1
- package/dist/utils/mcp.js +4 -1
- package/dist/utils/mcp.js.map +1 -1
- package/dist/utils/tools-loader.d.ts +2 -1
- package/dist/utils/tools-loader.d.ts.map +1 -1
- package/dist/utils/tools-loader.js +2 -1
- package/dist/utils/tools-loader.js.map +1 -1
- package/dist/utils/tools.d.ts +7 -0
- package/dist/utils/tools.d.ts.map +1 -1
- package/dist/utils/tools.js +1 -0
- package/dist/utils/tools.js.map +1 -1
- package/manifest.json +1 -1
- package/package.json +1 -1
- package/server.json +1 -1
package/README.md
CHANGED
|
@@ -178,6 +178,14 @@ Here is an overview list of all the tools provided by the Apify MCP Server.
|
|
|
178
178
|
|
|
179
179
|
> The `get-actor-output` tool is automatically included with any Actor-related tool, such as `call-actor`, `add-actor`, or any specific Actor tool like `apify-slash-rag-web-browser`. When you call an Actor - either through the `call-actor` tool or directly via an Actor tool (e.g., `apify-slash-rag-web-browser`) - you receive a preview of the output. The preview depends on the Actor's output format and length; for some Actors and runs, it may include the entire output, while for others, only a limited version is returned to avoid overwhelming the LLM. To retrieve the full output of an Actor run, use the `get-actor-output` tool (supports limit, offset, and field filtering) with the `datasetId` provided by the Actor call.
|
|
180
180
|
|
|
181
|
+
### Tool annotations
|
|
182
|
+
|
|
183
|
+
All tools include metadata annotations to help MCP clients and LLMs understand tool behavior:
|
|
184
|
+
|
|
185
|
+
- **`title`**: Short display name for the tool (e.g., "Search Actors", "Call Actor", "apify/rag-web-browser")
|
|
186
|
+
- **`readOnlyHint`**: `true` for tools that only read data without modifying state (e.g., `get-dataset`, `fetch-actor-details`)
|
|
187
|
+
- **`openWorldHint`**: `true` for tools that access external resources outside the Apify platform (e.g., `call-actor` executes external Actors, `get-html-skeleton` scrapes external websites). Tools that interact only with the Apify platform (like `search-actors` or `fetch-apify-docs`) do not have this hint.
|
|
188
|
+
|
|
181
189
|
### Tools configuration
|
|
182
190
|
|
|
183
191
|
The `tools` configuration parameter is used to specify loaded tools - either categories or specific tools directly, and Apify Actors. For example, `tools=storage,runs` loads two categories; `tools=add-actor` loads just one tool.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"AAUA,OAAO,OAAO,MAAM,SAAS,CAAC;AAS9B,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"AAUA,OAAO,OAAO,MAAM,SAAS,CAAC;AAS9B,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAuNjB"}
|
package/dist/actor/server.js
CHANGED
|
@@ -16,7 +16,15 @@ export function createExpressApp(host) {
|
|
|
16
16
|
const transportsSSE = {};
|
|
17
17
|
const transports = {};
|
|
18
18
|
function respondWithError(res, error, logMessage, statusCode = 500) {
|
|
19
|
-
|
|
19
|
+
if (statusCode >= 500) {
|
|
20
|
+
// Server errors (>= 500) - log as exception
|
|
21
|
+
log.exception(error instanceof Error ? error : new Error(String(error)), 'Error in request', { logMessage, statusCode });
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
// Client errors (< 500) - log as softFail without stack trace
|
|
25
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
26
|
+
log.softFail('Error in request', { logMessage, error: errorMessage, statusCode });
|
|
27
|
+
}
|
|
20
28
|
if (!res.headersSent) {
|
|
21
29
|
res.status(statusCode).json({
|
|
22
30
|
jsonrpc: '2.0',
|
|
@@ -90,7 +98,7 @@ export function createExpressApp(host) {
|
|
|
90
98
|
});
|
|
91
99
|
const sessionId = new URL(req.url, `http://${req.headers.host}`).searchParams.get('sessionId');
|
|
92
100
|
if (!sessionId) {
|
|
93
|
-
log.
|
|
101
|
+
log.softFail('No session ID provided in POST request', { statusCode: 400 });
|
|
94
102
|
res.status(400).json({
|
|
95
103
|
jsonrpc: '2.0',
|
|
96
104
|
error: {
|
|
@@ -106,7 +114,7 @@ export function createExpressApp(host) {
|
|
|
106
114
|
await transport.handlePostMessage(req, res);
|
|
107
115
|
}
|
|
108
116
|
else {
|
|
109
|
-
log.
|
|
117
|
+
log.softFail('Server is not connected to the client.', { statusCode: 400 });
|
|
110
118
|
res.status(400).json({
|
|
111
119
|
jsonrpc: '2.0',
|
|
112
120
|
error: {
|
|
@@ -196,7 +204,7 @@ export function createExpressApp(host) {
|
|
|
196
204
|
await transport.handleRequest(req, res, req.body);
|
|
197
205
|
return;
|
|
198
206
|
}
|
|
199
|
-
log.
|
|
207
|
+
log.softFail('Session not found', { sessionId, statusCode: 400 });
|
|
200
208
|
res.status(400).send('Bad Request: Session not found').end();
|
|
201
209
|
});
|
|
202
210
|
// Catch-all for undefined routes
|
package/dist/actor/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAGnG,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,UAAU,gBAAgB,CAC5B,IAAY;IAEZ,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,MAAM,UAAU,GAA6C,EAAE,CAAC;IAChE,MAAM,aAAa,GAAgD,EAAE,CAAC;IACtE,MAAM,UAAU,GAA2D,EAAE,CAAC;IAE9E,SAAS,gBAAgB,CAAC,GAAa,EAAE,KAAc,EAAE,UAAkB,EAAE,UAAU,GAAG,GAAG;QACzF,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/actor/server.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAWnE;;;GAGG;AACH,wBAAsB,gBAAgB,CAClC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6BxB"}
|
package/dist/mcp/client.js
CHANGED
|
@@ -3,6 +3,7 @@ import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
|
|
|
3
3
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
4
4
|
import log from '@apify/log';
|
|
5
5
|
import { TimeoutError } from '../errors.js';
|
|
6
|
+
import { logHttpError } from '../utils/logging.js';
|
|
6
7
|
import { ACTORIZED_MCP_CONNECTION_TIMEOUT_MSEC } from './const.js';
|
|
7
8
|
import { getMCPServerID } from './utils.js';
|
|
8
9
|
/**
|
|
@@ -35,7 +36,7 @@ export async function connectMCPClient(url, token) {
|
|
|
35
36
|
log.warning('Connection to MCP server using SSE transport timed out', { url });
|
|
36
37
|
return null;
|
|
37
38
|
}
|
|
38
|
-
|
|
39
|
+
logHttpError(error, 'Failed to connect to MCP server using SSE transport', { url, cause: error });
|
|
39
40
|
throw error;
|
|
40
41
|
}
|
|
41
42
|
}
|
package/dist/mcp/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,qCAAqC,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,GAAW,EAAE,KAAa;IAE1B,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACD,MAAM,GAAG,MAAM,yBAAyB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,uFAAuF;QACvF,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAChC,GAAG,CAAC,OAAO,CAAC,oEAAoE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC3F,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,iEAAiE;QACjE,GAAG,CAAC,KAAK,CAAC,iEAAiE,EAAE;YACzE,GAAG;SACN,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC;QACD,MAAM,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAChC,GAAG,CAAC,OAAO,CAAC,wDAAwD,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/server.d.ts
CHANGED
|
@@ -68,14 +68,14 @@ export declare class ActorsMcpServer {
|
|
|
68
68
|
* Loads missing toolNames from a provided list of tool names.
|
|
69
69
|
* Skips toolNames that are already loaded and loads only the missing ones.
|
|
70
70
|
* @param toolNames - Array of tool names to ensure are loaded
|
|
71
|
-
* @param
|
|
71
|
+
* @param apifyClient
|
|
72
72
|
*/
|
|
73
73
|
loadToolsByName(toolNames: string[], apifyClient: ApifyClient): Promise<void>;
|
|
74
74
|
/**
|
|
75
75
|
* Load actors as tools, upsert them to the server, and return the tool entries.
|
|
76
76
|
* This is a public method that wraps getActorsAsTools and handles the upsert operation.
|
|
77
77
|
* @param actorIdsOrNames - Array of actor IDs or names to load as tools
|
|
78
|
-
* @param
|
|
78
|
+
* @param apifyClient
|
|
79
79
|
* @returns Promise<ToolEntry[]> - Array of loaded tool entries
|
|
80
80
|
*/
|
|
81
81
|
loadActorsAsTools(actorIdsOrNames: string[], apifyClient: ApifyClient): Promise<ToolEntry[]>;
|
package/dist/mcp/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAoB5E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAYjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAoB5E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAYjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAY7C,UAAU,sBAAsB;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qBAAqB,CAAC,EAAE,iBAAiB,CAAC;CAC7C;AAED;;GAEG;AACH,qBAAa,eAAe;IACxB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC9C,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,eAAe,CAAU;IACjC,SAAgB,OAAO,EAAE,sBAAsB,CAAC;gBAEpC,OAAO,GAAE,sBAA2B;IAiChD;;;OAGG;IACI,aAAa,IAAI,MAAM,EAAE;IAIhC;;;;;;;MAOE;IACK,2BAA2B,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI;IAOzE;;;MAGE;IACK,6BAA6B;IAOpC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAM7B;;;OAGG;IACI,kBAAkB,IAAI,MAAM,EAAE;IAMrC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAQjC;;;OAGG;IACI,gBAAgB,IAAI,MAAM,EAAE;IAInC;;;;;MAKE;IACW,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW;IA6B1E;;;;;;OAMG;IACU,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAQzG;;;;;;OAMG;IACU,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW;IAQnE;OACG;IACI,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,+BAA+B,UAAQ,GAAG,MAAM,EAAE;IAahG;;;;;OAKG;IACI,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,+BAA+B,UAAQ;IA4C9E,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,qBAAqB;IA8C7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAyC3B,OAAO,CAAC,iBAAiB;IA8OnB,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAoB/B"}
|
package/dist/mcp/server.js
CHANGED
|
@@ -10,6 +10,7 @@ import { prompts } from '../prompts/index.js';
|
|
|
10
10
|
import { callActorGetDataset, defaultTools, getActorsAsTools, toolCategories } from '../tools/index.js';
|
|
11
11
|
import { decodeDotPropertyNames } from '../tools/utils.js';
|
|
12
12
|
import { buildActorResponseContent } from '../utils/actor-response.js';
|
|
13
|
+
import { logHttpError } from '../utils/logging.js';
|
|
13
14
|
import { buildMCPResponse } from '../utils/mcp.js';
|
|
14
15
|
import { createProgressTracker } from '../utils/progress.js';
|
|
15
16
|
import { cloneToolEntry, getToolPublicFieldOnly } from '../utils/tools.js';
|
|
@@ -156,7 +157,7 @@ export class ActorsMcpServer {
|
|
|
156
157
|
* Loads missing toolNames from a provided list of tool names.
|
|
157
158
|
* Skips toolNames that are already loaded and loads only the missing ones.
|
|
158
159
|
* @param toolNames - Array of tool names to ensure are loaded
|
|
159
|
-
* @param
|
|
160
|
+
* @param apifyClient
|
|
160
161
|
*/
|
|
161
162
|
async loadToolsByName(toolNames, apifyClient) {
|
|
162
163
|
const loadedTools = this.listAllToolNames();
|
|
@@ -190,7 +191,7 @@ export class ActorsMcpServer {
|
|
|
190
191
|
* Load actors as tools, upsert them to the server, and return the tool entries.
|
|
191
192
|
* This is a public method that wraps getActorsAsTools and handles the upsert operation.
|
|
192
193
|
* @param actorIdsOrNames - Array of actor IDs or names to load as tools
|
|
193
|
-
* @param
|
|
194
|
+
* @param apifyClient
|
|
194
195
|
* @returns Promise<ToolEntry[]> - Array of loaded tool entries
|
|
195
196
|
*/
|
|
196
197
|
async loadActorsAsTools(actorIdsOrNames, apifyClient) {
|
|
@@ -272,8 +273,8 @@ export class ActorsMcpServer {
|
|
|
272
273
|
}
|
|
273
274
|
else {
|
|
274
275
|
// No skyfire mode - store tools as-is
|
|
275
|
-
for (const
|
|
276
|
-
this.tools.set(
|
|
276
|
+
for (const tool of tools) {
|
|
277
|
+
this.tools.set(tool.name, tool);
|
|
277
278
|
}
|
|
278
279
|
}
|
|
279
280
|
if (shouldNotifyToolsChangedHandler)
|
|
@@ -438,8 +439,10 @@ export class ActorsMcpServer {
|
|
|
438
439
|
delete request.params.userRentedActorIds;
|
|
439
440
|
// Validate token
|
|
440
441
|
if (!apifyToken && !this.options.skyfireMode) {
|
|
441
|
-
const msg =
|
|
442
|
-
|
|
442
|
+
const msg = `APIFY_TOKEN is required but was not provided.
|
|
443
|
+
Please set the APIFY_TOKEN environment variable or pass it as a parameter in the request body.
|
|
444
|
+
You can obtain your Apify token from https://console.apify.com/account/integrations.`;
|
|
445
|
+
log.softFail(msg, { statusCode: 400 });
|
|
443
446
|
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
444
447
|
throw new McpError(ErrorCode.InvalidParams, msg);
|
|
445
448
|
}
|
|
@@ -458,14 +461,18 @@ export class ActorsMcpServer {
|
|
|
458
461
|
const tool = Array.from(this.tools.values())
|
|
459
462
|
.find((t) => t.name === name || (t.type === 'actor' && t.actorFullName === name));
|
|
460
463
|
if (!tool) {
|
|
461
|
-
const
|
|
462
|
-
|
|
464
|
+
const availableTools = this.listToolNames();
|
|
465
|
+
const msg = `Tool "${name}" was not found.
|
|
466
|
+
Available tools: ${availableTools.length > 0 ? availableTools.join(', ') : 'none'}.
|
|
467
|
+
Please verify the tool name is correct. You can list all available tools using the tools/list request.`;
|
|
468
|
+
log.softFail(msg, { statusCode: 404 });
|
|
463
469
|
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
464
470
|
throw new McpError(ErrorCode.InvalidParams, msg);
|
|
465
471
|
}
|
|
466
472
|
if (!args) {
|
|
467
|
-
const msg = `Missing arguments for tool ${name}
|
|
468
|
-
|
|
473
|
+
const msg = `Missing arguments for tool "${name}".
|
|
474
|
+
Please provide the required arguments for this tool. Check the tool's input schema using ${HelperTools.ACTOR_GET_DETAILS} tool to see what parameters are required.`;
|
|
475
|
+
log.softFail(msg, { statusCode: 400 });
|
|
469
476
|
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
470
477
|
throw new McpError(ErrorCode.InvalidParams, msg);
|
|
471
478
|
}
|
|
@@ -474,8 +481,12 @@ export class ActorsMcpServer {
|
|
|
474
481
|
args = decodeDotPropertyNames(args);
|
|
475
482
|
log.debug('Validate arguments for tool', { toolName: tool.name, input: args });
|
|
476
483
|
if (!tool.ajvValidate(args)) {
|
|
477
|
-
const
|
|
478
|
-
|
|
484
|
+
const errors = (tool === null || tool === void 0 ? void 0 : tool.ajvValidate.errors) || [];
|
|
485
|
+
const errorMessages = errors.map((e) => `${e.instancePath || 'root'}: ${e.message || 'validation error'}`).join('; ');
|
|
486
|
+
const msg = `Invalid arguments for tool "${tool.name}".
|
|
487
|
+
Validation errors: ${errorMessages}.
|
|
488
|
+
Please check the tool's input schema using ${HelperTools.ACTOR_GET_DETAILS} tool and ensure all required parameters are provided with correct types and values.`;
|
|
489
|
+
log.softFail(msg, { statusCode: 400 });
|
|
479
490
|
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
480
491
|
throw new McpError(ErrorCode.InvalidParams, msg);
|
|
481
492
|
}
|
|
@@ -506,14 +517,11 @@ export class ActorsMcpServer {
|
|
|
506
517
|
try {
|
|
507
518
|
client = await connectMCPClient(tool.serverUrl, apifyToken);
|
|
508
519
|
if (!client) {
|
|
509
|
-
const msg = `Failed to connect to MCP server ${tool.serverUrl}
|
|
510
|
-
|
|
520
|
+
const msg = `Failed to connect to MCP server at "${tool.serverUrl}".
|
|
521
|
+
Please verify the server URL is correct and accessible, and ensure you have a valid Apify token with appropriate permissions.`;
|
|
522
|
+
log.softFail(msg, { statusCode: 408 }); // 408 Request Timeout
|
|
511
523
|
await this.server.sendLoggingMessage({ level: 'error', data: msg });
|
|
512
|
-
return
|
|
513
|
-
content: [
|
|
514
|
-
{ type: 'text', text: msg },
|
|
515
|
-
],
|
|
516
|
-
};
|
|
524
|
+
return buildMCPResponse([msg], true);
|
|
517
525
|
}
|
|
518
526
|
// Only set up notification handlers if progressToken is provided by the client
|
|
519
527
|
if (progressToken) {
|
|
@@ -551,12 +559,7 @@ export class ActorsMcpServer {
|
|
|
551
559
|
if (tool.type === 'actor') {
|
|
552
560
|
if (this.options.skyfireMode
|
|
553
561
|
&& args['skyfire-pay-id'] === undefined) {
|
|
554
|
-
return
|
|
555
|
-
content: [{
|
|
556
|
-
type: 'text',
|
|
557
|
-
text: SKYFIRE_TOOL_INSTRUCTIONS,
|
|
558
|
-
}],
|
|
559
|
-
};
|
|
562
|
+
return buildMCPResponse([SKYFIRE_TOOL_INSTRUCTIONS]);
|
|
560
563
|
}
|
|
561
564
|
// Create progress tracker if progressToken is available
|
|
562
565
|
const progressTracker = createProgressTracker(progressToken, extra.sendNotification);
|
|
@@ -587,14 +590,18 @@ export class ActorsMcpServer {
|
|
|
587
590
|
}
|
|
588
591
|
}
|
|
589
592
|
catch (error) {
|
|
590
|
-
|
|
593
|
+
logHttpError(error, 'Error occurred while calling tool', { toolName: name });
|
|
591
594
|
const errorMessage = (error instanceof Error) ? error.message : 'Unknown error';
|
|
592
595
|
return buildMCPResponse([
|
|
593
|
-
`Error calling tool ${name}: ${errorMessage}
|
|
594
|
-
|
|
596
|
+
`Error calling tool "${name}": ${errorMessage}.
|
|
597
|
+
Please verify the tool name, input parameters, and ensure all required resources are available.`,
|
|
598
|
+
], true);
|
|
595
599
|
}
|
|
596
|
-
const
|
|
597
|
-
|
|
600
|
+
const availableTools = this.listToolNames();
|
|
601
|
+
const msg = `Unknown tool type for "${name}".
|
|
602
|
+
Available tools: ${availableTools.length > 0 ? availableTools.join(', ') : 'none'}.
|
|
603
|
+
Please verify the tool name and ensure the tool is properly registered.`;
|
|
604
|
+
log.softFail(msg, { statusCode: 404 });
|
|
598
605
|
await this.server.sendLoggingMessage({
|
|
599
606
|
level: 'error',
|
|
600
607
|
data: msg,
|
package/dist/mcp/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/utils.d.ts
CHANGED
|
@@ -20,8 +20,9 @@ export declare function getProxyMCPServerToolName(url: string, toolName: string)
|
|
|
20
20
|
/**
|
|
21
21
|
* Process input parameters from URL and get tools
|
|
22
22
|
* If URL contains query parameter `actors`, return tools from Actors otherwise return null.
|
|
23
|
-
* @param url
|
|
24
|
-
* @param
|
|
23
|
+
* @param url The URL to process
|
|
24
|
+
* @param apifyClient The Apify client instance
|
|
25
|
+
* @param initializeRequestData Optional initialize request data
|
|
25
26
|
*/
|
|
26
27
|
export declare function processParamsGetTools(url: string, apifyClient: ApifyClient, initializeRequestData?: InitializeRequest): Promise<import("../types.js").ToolEntry[]>;
|
|
27
28
|
export declare function parseInputParamsFromUrl(url: string): Input;
|
package/dist/mcp/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/mcp/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIzC;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAK/E;AAED
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/mcp/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIzC;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAK/E;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,qBAAqB,CAAC,EAAE,iBAAiB,8CAG3H;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAI1D"}
|
package/dist/mcp/utils.js
CHANGED
|
@@ -29,8 +29,9 @@ export function getProxyMCPServerToolName(url, toolName) {
|
|
|
29
29
|
/**
|
|
30
30
|
* Process input parameters from URL and get tools
|
|
31
31
|
* If URL contains query parameter `actors`, return tools from Actors otherwise return null.
|
|
32
|
-
* @param url
|
|
33
|
-
* @param
|
|
32
|
+
* @param url The URL to process
|
|
33
|
+
* @param apifyClient The Apify client instance
|
|
34
|
+
* @param initializeRequestData Optional initialize request data
|
|
34
35
|
*/
|
|
35
36
|
export async function processParamsGetTools(url, apifyClient, initializeRequestData) {
|
|
36
37
|
const input = parseInputParamsFromUrl(url);
|
package/dist/mcp/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/mcp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACtC,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAExE,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,GAAW,EAAE,QAAgB;IACnE,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAEnC,MAAM,QAAQ,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;IACzC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;AACnD,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/mcp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACtC,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAExE,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,GAAW,EAAE,QAAgB;IACnE,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAEnC,MAAM,QAAQ,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;IACzC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAW,EAAE,WAAwB,EAAE,qBAAyC;IACxH,MAAM,KAAK,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,MAAM,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,qBAAqB,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAW;IAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAqB,CAAC;IAChD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/tools/actor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAY,MAAM,cAAc,CAAC;AAM/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAcjD,OAAO,KAAK,EAA0B,SAAS,EAAc,WAAW,EAAoB,SAAS,EAAmB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/tools/actor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAY,MAAM,cAAc,CAAC;AAM/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAcjD,OAAO,KAAK,EAA0B,SAAS,EAAc,WAAW,EAAoB,SAAS,EAAmB,MAAM,aAAa,CAAC;AAO5I,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAMxE,MAAM,MAAM,yBAAyB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,WAAW,EAAE,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,gBAAgB,GAAG,SAAqB,EACrD,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,EACxC,WAAW,CAAC,EAAE,WAAW,GAC1B,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAmE3C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,sBAAsB,CACxC,UAAU,EAAE,SAAS,EAAE,GACxB,OAAO,CAAC,SAAS,EAAE,CAAC,CAiDtB;AA6DD,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,SAAS,EAAE,CAAC,CA+CtB;AAwBD,eAAO,MAAM,SAAS,EAAE,SA0NvB,CAAC"}
|
package/dist/tools/actor.js
CHANGED
|
@@ -11,6 +11,7 @@ import { ensureOutputWithinCharLimit, getActorDefinitionStorageFieldNames, getAc
|
|
|
11
11
|
import { fetchActorDetails } from '../utils/actor-details.js';
|
|
12
12
|
import { buildActorResponseContent } from '../utils/actor-response.js';
|
|
13
13
|
import { ajv } from '../utils/ajv.js';
|
|
14
|
+
import { logHttpError } from '../utils/logging.js';
|
|
14
15
|
import { buildMCPResponse } from '../utils/mcp.js';
|
|
15
16
|
import { generateSchemaFromItems } from '../utils/schema-generation.js';
|
|
16
17
|
import { getActorDefinition } from './build.js';
|
|
@@ -51,7 +52,7 @@ export async function callActorGetDataset(actorName, input, apifyClient, callOpt
|
|
|
51
52
|
await apifyClient.run(actorRun.id).abort({ gracefully: false });
|
|
52
53
|
}
|
|
53
54
|
catch (e) {
|
|
54
|
-
|
|
55
|
+
logHttpError(e, 'Error aborting Actor run', { runId: actorRun.id });
|
|
55
56
|
}
|
|
56
57
|
// Reject to stop waiting
|
|
57
58
|
resolve(CLIENT_ABORT);
|
|
@@ -149,6 +150,10 @@ Actor description: ${actorDefinitionPruned.description}`;
|
|
|
149
150
|
inputSchema: inputSchema,
|
|
150
151
|
ajvValidate,
|
|
151
152
|
memoryMbytes,
|
|
153
|
+
annotations: {
|
|
154
|
+
title: actorDefinitionPruned.actorFullName,
|
|
155
|
+
openWorldHint: true,
|
|
156
|
+
},
|
|
152
157
|
});
|
|
153
158
|
}
|
|
154
159
|
return tools;
|
|
@@ -188,11 +193,9 @@ async function getMCPServersAsTools(actorsInfo, apifyToken) {
|
|
|
188
193
|
return await getMCPServerTools(actorId, client, mcpServerUrl);
|
|
189
194
|
}
|
|
190
195
|
catch (error) {
|
|
191
|
-
|
|
192
|
-
log.error('Failed to connect to MCP server', {
|
|
196
|
+
logHttpError(error, 'Failed to connect to MCP server', {
|
|
193
197
|
actorFullName: actorInfo.actorDefinitionPruned.actorFullName,
|
|
194
198
|
actorId,
|
|
195
|
-
error,
|
|
196
199
|
});
|
|
197
200
|
return [];
|
|
198
201
|
}
|
|
@@ -219,7 +222,7 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient) {
|
|
|
219
222
|
try {
|
|
220
223
|
const actorDefinitionPruned = await getActorDefinition(actorIdOrName, apifyClient);
|
|
221
224
|
if (!actorDefinitionPruned) {
|
|
222
|
-
log.
|
|
225
|
+
log.softFail('Actor not found or definition is not available', { actorName: actorIdOrName, statusCode: 404 });
|
|
223
226
|
return null;
|
|
224
227
|
}
|
|
225
228
|
// Cache the pruned Actor definition
|
|
@@ -230,10 +233,8 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient) {
|
|
|
230
233
|
};
|
|
231
234
|
}
|
|
232
235
|
catch (error) {
|
|
233
|
-
|
|
234
|
-
log.error('Failed to fetch Actor definition', {
|
|
236
|
+
logHttpError(error, 'Failed to fetch Actor definition', {
|
|
235
237
|
actorName: actorIdOrName,
|
|
236
|
-
error,
|
|
237
238
|
});
|
|
238
239
|
return null;
|
|
239
240
|
}
|
|
@@ -307,6 +308,10 @@ EXAMPLES:
|
|
|
307
308
|
// Additional props true to allow skyfire-pay-id
|
|
308
309
|
additionalProperties: true,
|
|
309
310
|
}),
|
|
311
|
+
annotations: {
|
|
312
|
+
title: 'Call Actor',
|
|
313
|
+
openWorldHint: true,
|
|
314
|
+
},
|
|
310
315
|
call: async (toolArgs) => {
|
|
311
316
|
const { args, apifyToken, progressTracker, extra, apifyMcpServer } = toolArgs;
|
|
312
317
|
const { actor: actorName, step, input, callOptions } = callActorArgs.parse(args);
|
|
@@ -327,7 +332,9 @@ EXAMPLES:
|
|
|
327
332
|
const isActorMcpServer = mcpServerUrlOrFalse && typeof mcpServerUrlOrFalse === 'string';
|
|
328
333
|
// Standby Actors, thus MCPs, are not supported in Skyfire mode
|
|
329
334
|
if (isActorMcpServer && apifyMcpServer.options.skyfireMode) {
|
|
330
|
-
return buildMCPResponse([
|
|
335
|
+
return buildMCPResponse([
|
|
336
|
+
`This Actor (${actorName}) is an MCP server and cannot be accessed using a Skyfire token. To use this Actor, please provide a valid Apify token instead of a Skyfire token.`,
|
|
337
|
+
], true);
|
|
331
338
|
}
|
|
332
339
|
try {
|
|
333
340
|
if (performStep === 'info') {
|
|
@@ -339,7 +346,7 @@ EXAMPLES:
|
|
|
339
346
|
try {
|
|
340
347
|
client = await connectMCPClient(mcpServerUrl, apifyToken);
|
|
341
348
|
if (!client) {
|
|
342
|
-
return buildMCPResponse([`Failed to connect to MCP server ${mcpServerUrl}`]);
|
|
349
|
+
return buildMCPResponse([`Failed to connect to MCP server ${mcpServerUrl}`], true);
|
|
343
350
|
}
|
|
344
351
|
const toolsResponse = await client.listTools();
|
|
345
352
|
const toolsInfo = toolsResponse.tools.map((tool) => `**${tool.name}**\n${tool.description || 'No description'}\nInput schema:\n\`\`\`json\n${JSON.stringify(tool.inputSchema)}\n\`\`\``).join('\n\n');
|
|
@@ -354,7 +361,9 @@ EXAMPLES:
|
|
|
354
361
|
// Regular actor: return schema
|
|
355
362
|
const details = await fetchActorDetails(apifyClientForDefinition, baseActorName);
|
|
356
363
|
if (!details) {
|
|
357
|
-
return buildMCPResponse([`Actor information for '${baseActorName}' was not found.
|
|
364
|
+
return buildMCPResponse([`Actor information for '${baseActorName}' was not found.
|
|
365
|
+
Please verify Actor ID or name format (e.g., "username/name" like "apify/rag-web-browser") and ensure that the Actor exists.
|
|
366
|
+
You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.`], true);
|
|
358
367
|
}
|
|
359
368
|
const content = [
|
|
360
369
|
`Actor name: ${actorName}`,
|
|
@@ -389,25 +398,25 @@ EXAMPLES:
|
|
|
389
398
|
: new ApifyClient({ token: apifyToken });
|
|
390
399
|
// Step 2: Call the Actor
|
|
391
400
|
if (!input) {
|
|
392
|
-
return buildMCPResponse([`Input is required when step="call". Please provide the input parameter based on the Actor's input schema.`]);
|
|
401
|
+
return buildMCPResponse([`Input is required when step="call". Please provide the input parameter based on the Actor's input schema.`], true);
|
|
393
402
|
}
|
|
394
403
|
// Handle the case where LLM does not respect instructions when calling MCP server Actors
|
|
395
404
|
// and does not provide the tool name.
|
|
396
405
|
const isMcpToolNameInvalid = mcpToolName === undefined || mcpToolName.trim().length === 0;
|
|
397
406
|
if (isActorMcpServer && isMcpToolNameInvalid) {
|
|
398
|
-
return buildMCPResponse([CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG]);
|
|
407
|
+
return buildMCPResponse([CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG], true);
|
|
399
408
|
}
|
|
400
409
|
// Handle MCP tool calls
|
|
401
410
|
if (mcpToolName) {
|
|
402
411
|
if (!isActorMcpServer) {
|
|
403
|
-
return buildMCPResponse([`Actor '${baseActorName}' is not an MCP server.`]);
|
|
412
|
+
return buildMCPResponse([`Actor '${baseActorName}' is not an MCP server.`], true);
|
|
404
413
|
}
|
|
405
414
|
const mcpServerUrl = mcpServerUrlOrFalse;
|
|
406
415
|
let client = null;
|
|
407
416
|
try {
|
|
408
417
|
client = await connectMCPClient(mcpServerUrl, apifyToken);
|
|
409
418
|
if (!client) {
|
|
410
|
-
return buildMCPResponse([`Failed to connect to MCP server ${mcpServerUrl}`]);
|
|
419
|
+
return buildMCPResponse([`Failed to connect to MCP server ${mcpServerUrl}`], true);
|
|
411
420
|
}
|
|
412
421
|
const result = await client.callTool({
|
|
413
422
|
name: mcpToolName,
|
|
@@ -423,7 +432,9 @@ EXAMPLES:
|
|
|
423
432
|
// Handle regular Actor calls
|
|
424
433
|
const [actor] = await getActorsAsTools([actorName], apifyClient);
|
|
425
434
|
if (!actor) {
|
|
426
|
-
return buildMCPResponse([`Actor '${actorName}' was not found
|
|
435
|
+
return buildMCPResponse([`Actor '${actorName}' was not found.
|
|
436
|
+
Please verify Actor ID or name format (e.g., "username/name" like "apify/rag-web-browser") and ensure that the Actor exists.
|
|
437
|
+
You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.`], true);
|
|
427
438
|
}
|
|
428
439
|
if (!actor.ajvValidate(input)) {
|
|
429
440
|
const { errors } = actor.ajvValidate;
|
|
@@ -446,8 +457,10 @@ EXAMPLES:
|
|
|
446
457
|
return { content };
|
|
447
458
|
}
|
|
448
459
|
catch (error) {
|
|
449
|
-
|
|
450
|
-
return buildMCPResponse([`Failed to call Actor '${actorName}': ${error instanceof Error ? error.message : String(error)}
|
|
460
|
+
logHttpError(error, 'Failed to call Actor', { actorName, performStep });
|
|
461
|
+
return buildMCPResponse([`Failed to call Actor '${actorName}': ${error instanceof Error ? error.message : String(error)}.
|
|
462
|
+
Please verify the Actor name, input parameters, and ensure the Actor exists.
|
|
463
|
+
You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}, or get Actor details using: ${HelperTools.ACTOR_GET_DETAILS}.`], true);
|
|
451
464
|
}
|
|
452
465
|
},
|
|
453
466
|
};
|