@apify/actors-mcp-server 0.9.18-beta.1 → 0.9.18-beta.11
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 +124 -87
- package/dist/dev_server.js +1 -1
- package/dist/dev_server.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -9
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +68 -47
- package/dist/mcp/server.js.map +1 -1
- package/dist/payments/helpers.d.ts +7 -7
- package/dist/payments/helpers.d.ts.map +1 -1
- package/dist/payments/helpers.js +9 -9
- package/dist/payments/helpers.js.map +1 -1
- package/dist/tools/core/actor_execution.d.ts.map +1 -1
- package/dist/tools/core/actor_execution.js +37 -13
- package/dist/tools/core/actor_execution.js.map +1 -1
- package/dist/tools/core/actor_tools_factory.d.ts +13 -0
- package/dist/tools/core/actor_tools_factory.d.ts.map +1 -1
- package/dist/tools/core/actor_tools_factory.js +52 -7
- package/dist/tools/core/actor_tools_factory.js.map +1 -1
- package/dist/tools/core/call_actor_common.d.ts +4 -0
- package/dist/tools/core/call_actor_common.d.ts.map +1 -1
- package/dist/tools/core/call_actor_common.js +8 -2
- package/dist/tools/core/call_actor_common.js.map +1 -1
- package/dist/tools/core/search_actors_common.d.ts +1 -1
- package/dist/tools/core/search_actors_common.d.ts.map +1 -1
- package/dist/tools/core/search_actors_common.js +18 -18
- package/dist/tools/core/search_actors_common.js.map +1 -1
- package/dist/tools/default/fetch_actor_details.d.ts.map +1 -1
- package/dist/tools/default/fetch_actor_details.js +8 -6
- package/dist/tools/default/fetch_actor_details.js.map +1 -1
- package/dist/tools/default/get_actor_run.d.ts.map +1 -1
- package/dist/tools/default/get_actor_run.js +1 -3
- package/dist/tools/default/get_actor_run.js.map +1 -1
- package/dist/tools/default/search_actors.d.ts +1 -1
- package/dist/tools/default/search_actors.d.ts.map +1 -1
- package/dist/tools/default/search_actors.js +30 -19
- package/dist/tools/default/search_actors.js.map +1 -1
- package/dist/tools/openai/fetch_actor_details.d.ts.map +1 -1
- package/dist/tools/openai/fetch_actor_details.js +7 -5
- package/dist/tools/openai/fetch_actor_details.js.map +1 -1
- package/dist/tools/openai/fetch_actor_details_internal.d.ts.map +1 -1
- package/dist/tools/openai/fetch_actor_details_internal.js +6 -4
- package/dist/tools/openai/fetch_actor_details_internal.js.map +1 -1
- package/dist/tools/openai/search_actors.d.ts.map +1 -1
- package/dist/tools/openai/search_actors.js +37 -17
- package/dist/tools/openai/search_actors.js.map +1 -1
- package/dist/tools/openai/search_actors_internal.d.ts.map +1 -1
- package/dist/tools/openai/search_actors_internal.js +11 -10
- package/dist/tools/openai/search_actors_internal.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/ajv.d.ts +10 -1
- package/dist/utils/ajv.d.ts.map +1 -1
- package/dist/utils/ajv.js +11 -2
- package/dist/utils/ajv.js.map +1 -1
- package/dist/utils/mcp.d.ts +2 -0
- package/dist/utils/mcp.d.ts.map +1 -1
- package/dist/utils/mcp.js +13 -0
- package/dist/utils/mcp.js.map +1 -1
- package/dist/utils/payment_errors.d.ts.map +1 -1
- package/dist/utils/payment_errors.js +9 -4
- package/dist/utils/payment_errors.js.map +1 -1
- package/dist/web/dist/actor-detail-widget.js +236 -236
- package/dist/web/dist/actor-run-widget.js +236 -236
- package/dist/web/dist/search-actors-widget.js +216 -216
- package/manifest.json +1 -1
- package/package.json +2 -1
|
@@ -21,31 +21,55 @@ export async function callActorGetDataset(options) {
|
|
|
21
21
|
const { actorName, input, apifyClient, callOptions, progressTracker, abortSignal, previewOutput = true, mcpSessionId, } = options;
|
|
22
22
|
const CLIENT_ABORT = Symbol('CLIENT_ABORT'); // Just an internal symbol to identify client abort
|
|
23
23
|
const actorClient = apifyClient.actor(actorName);
|
|
24
|
+
const abortActorRun = async (runId) => {
|
|
25
|
+
try {
|
|
26
|
+
await apifyClient.run(runId).abort({ gracefully: false });
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
logHttpError(e, 'Error aborting Actor run', { runId });
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
// The Actor start request itself is not tied to our AbortSignal, so a client can cancel
|
|
33
|
+
// before we even create the run. In that case we should exit without starting follow-up work.
|
|
34
|
+
if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
|
|
35
|
+
log.info('Actor run aborted by client before start', { actorName, mcpSessionId, input: redactSkyfirePayId(input) });
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
24
38
|
// Start the actor run
|
|
25
39
|
const actorRun = await actorClient.start(input, callOptions);
|
|
40
|
+
// Cancellation can also arrive while actorClient.start() is still in flight. Once start()
|
|
41
|
+
// returns we finally have a run ID, so we must immediately check again and abort that run
|
|
42
|
+
// ourselves; otherwise the abort event is missed and the run continues in the background.
|
|
43
|
+
if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
|
|
44
|
+
await abortActorRun(actorRun.id);
|
|
45
|
+
log.info('Actor run aborted by client', { actorName, mcpSessionId, input: redactSkyfirePayId(input) });
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
26
48
|
// Start progress tracking if a tracker is provided
|
|
27
49
|
if (progressTracker) {
|
|
28
50
|
progressTracker.startActorRunUpdates(actorRun.id, apifyClient, actorName);
|
|
29
51
|
}
|
|
30
|
-
//
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
catch (e) {
|
|
38
|
-
logHttpError(e, 'Error aborting Actor run', { runId: actorRun.id });
|
|
39
|
-
}
|
|
40
|
-
// Reject to stop waiting
|
|
52
|
+
// Resolve the race immediately on cancellation and abort the Actor run in the background.
|
|
53
|
+
// If we waited for the abort API call to finish first, waitForFinish() could win the race
|
|
54
|
+
// and the run might complete before we treat the request as cancelled.
|
|
55
|
+
let abortListener;
|
|
56
|
+
const abortPromise = new Promise((resolve) => {
|
|
57
|
+
abortListener = () => {
|
|
41
58
|
resolve(CLIENT_ABORT);
|
|
42
|
-
|
|
59
|
+
void abortActorRun(actorRun.id);
|
|
60
|
+
};
|
|
61
|
+
abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', abortListener, { once: true });
|
|
43
62
|
});
|
|
44
63
|
// Wait for completion or cancellation
|
|
45
64
|
const potentialAbortedRun = await Promise.race([
|
|
46
65
|
apifyClient.run(actorRun.id).waitForFinish(),
|
|
47
|
-
...(abortSignal ? [abortPromise
|
|
66
|
+
...(abortSignal ? [abortPromise] : []),
|
|
48
67
|
]);
|
|
68
|
+
// Clean up the abort listener if waitForFinish() won the race, so a later signal
|
|
69
|
+
// doesn't try to abort an already-completed run.
|
|
70
|
+
if (abortListener) {
|
|
71
|
+
abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', abortListener);
|
|
72
|
+
}
|
|
49
73
|
if (potentialAbortedRun === CLIENT_ABORT) {
|
|
50
74
|
log.info('Actor run aborted by client', { actorName, mcpSessionId, input: redactSkyfirePayId(input) });
|
|
51
75
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor_execution.js","sourceRoot":"","sources":["../../../src/tools/core/actor_execution.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,YAAY,CAAC;AAG7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAC;AACxG,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAc3E;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OASzC;;IACG,MAAM,EACF,SAAS,EACT,KAAK,EACL,WAAW,EACX,WAAW,EACX,eAAe,EACf,WAAW,EACX,aAAa,GAAG,IAAI,EACpB,YAAY,GACf,GAAG,OAAO,CAAC;IACZ,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,mDAAmD;IAChG,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEjD,
|
|
1
|
+
{"version":3,"file":"actor_execution.js","sourceRoot":"","sources":["../../../src/tools/core/actor_execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,19 @@ export declare function getNormalActorsAsTools(actorsInfo: ActorInfo[], options?
|
|
|
31
31
|
actorStore?: ActorStore;
|
|
32
32
|
}): Promise<ToolEntry[]>;
|
|
33
33
|
export declare function getMCPServersAsTools(actorsInfo: ActorInfo[], apifyToken: ApifyToken, mcpSessionId?: string): Promise<ToolEntry[]>;
|
|
34
|
+
/**
|
|
35
|
+
* Fixes an Actor name input from LLM and logs at INFO when the input differed from the fixed version.
|
|
36
|
+
* Single entry point for fix+log — avoids duplicating the pattern at every call site.
|
|
37
|
+
*/
|
|
38
|
+
export declare function fixActorNameInputAndLog(actorName: string, extra?: Record<string, unknown>): string;
|
|
39
|
+
/**
|
|
40
|
+
* Fixes Actor name strings (`username/name`) before cache + Apify API lookup.
|
|
41
|
+
*
|
|
42
|
+
* LLMs often wrap values in markdown quotes or smart quotes and insert spaces around `/`.
|
|
43
|
+
* The Apify API treats those as distinct strings → avoidable 404 SOFT_FAIL. This only trims
|
|
44
|
+
* and strips common wrappers / spacing noise; valid names pass through unchanged.
|
|
45
|
+
*/
|
|
46
|
+
export declare function fixActorNameInput(actorName: string): string;
|
|
34
47
|
export declare function getActorsAsTools(actorIdsOrNames: string[], apifyClient: ApifyClient, options?: {
|
|
35
48
|
mcpSessionId?: string;
|
|
36
49
|
actorStore?: ActorStore;
|
|
@@ -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;AAYzD,OAAO,KAAK,EACR,SAAS,EACT,UAAU,EAEV,UAAU,EACV,SAAS,EAEZ,MAAM,gBAAgB,CAAC;AAOxB;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB5G;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,
|
|
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;AAYzD,OAAO,KAAK,EACR,SAAS,EACT,UAAU,EAEV,UAAU,EACV,SAAS,EAEZ,MAAM,gBAAgB,CAAC;AAOxB;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB5G;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,CA6EtB;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,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,UAAU,CAAA;CAAE,GAC7D,OAAO,CAAC,SAAS,EAAE,CAAC,CAgEtB"}
|
|
@@ -74,8 +74,10 @@ Actor description: ${definition.description}`;
|
|
|
74
74
|
const memoryMbytes = Math.min(((_a = definition.defaultRunOptions) === null || _a === void 0 ? void 0 : _a.memoryMbytes) || ACTOR_MAX_MEMORY_MBYTES, ACTOR_MAX_MEMORY_MBYTES);
|
|
75
75
|
let ajvValidate;
|
|
76
76
|
try {
|
|
77
|
-
//
|
|
78
|
-
|
|
77
|
+
// Unknown properties are silently stripped by AJV's removeAdditional option.
|
|
78
|
+
// Dynamic Actor input fields are part of the Actor's own inputSchema, so they
|
|
79
|
+
// are declared properties and won't be stripped.
|
|
80
|
+
ajvValidate = fixedAjvCompile(ajv, inputSchema);
|
|
79
81
|
}
|
|
80
82
|
catch (e) {
|
|
81
83
|
log.error('Failed to compile schema', {
|
|
@@ -175,11 +177,49 @@ export async function getMCPServersAsTools(actorsInfo, apifyToken, mcpSessionId)
|
|
|
175
177
|
const actorToolsArrays = await Promise.all(actorToolPromises);
|
|
176
178
|
return actorToolsArrays.flat();
|
|
177
179
|
}
|
|
180
|
+
// Quote/backtick pairs that LLMs wrap actor names in (allocated once, not per call).
|
|
181
|
+
const ACTOR_NAME_WRAPPERS = [['`', '`'], ['"', '"'], ['\u201c', '\u201d'], ['\u2018', '\u2019']];
|
|
182
|
+
/**
|
|
183
|
+
* Fixes an Actor name input from LLM and logs at INFO when the input differed from the fixed version.
|
|
184
|
+
* Single entry point for fix+log — avoids duplicating the pattern at every call site.
|
|
185
|
+
*/
|
|
186
|
+
export function fixActorNameInputAndLog(actorName, extra) {
|
|
187
|
+
const fixed = fixActorNameInput(actorName);
|
|
188
|
+
if (fixed !== actorName) {
|
|
189
|
+
log.info('Actor name input required normalization before lookup (quotes, spacing, or slash padding)', {
|
|
190
|
+
actorNameInput: actorName,
|
|
191
|
+
actorNameFixed: fixed,
|
|
192
|
+
...extra,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
return fixed;
|
|
196
|
+
}
|
|
197
|
+
/**
|
|
198
|
+
* Fixes Actor name strings (`username/name`) before cache + Apify API lookup.
|
|
199
|
+
*
|
|
200
|
+
* LLMs often wrap values in markdown quotes or smart quotes and insert spaces around `/`.
|
|
201
|
+
* The Apify API treats those as distinct strings → avoidable 404 SOFT_FAIL. This only trims
|
|
202
|
+
* and strips common wrappers / spacing noise; valid names pass through unchanged.
|
|
203
|
+
*/
|
|
204
|
+
export function fixActorNameInput(actorName) {
|
|
205
|
+
let s = actorName.trim();
|
|
206
|
+
for (const [open, close] of ACTOR_NAME_WRAPPERS) {
|
|
207
|
+
if (s.startsWith(open) && s.endsWith(close) && s.length >= open.length + close.length) {
|
|
208
|
+
s = s.slice(open.length, -close.length).trim();
|
|
209
|
+
break;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
// Unpaired markdown / JSON leakage (Mezmo: `apify/rag-web-browser` or `...pr-226"`)
|
|
213
|
+
s = s.replace(/^[`'"\u201c\u201d\u2018\u2019]+|[`'"\u201c\u201d\u2018\u2019]+$/g, '').trim();
|
|
214
|
+
s = s.replace(/\s*\/\s*/g, '/');
|
|
215
|
+
return s.replace(/\s+/g, ' ').trim();
|
|
216
|
+
}
|
|
178
217
|
export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
|
|
179
218
|
const { mcpSessionId, actorStore } = options !== null && options !== void 0 ? options : {};
|
|
180
219
|
log.debug('Fetching Actors as tools', { actorNames: actorIdsOrNames, mcpSessionId });
|
|
181
220
|
const actorsInfo = await Promise.all(actorIdsOrNames.map(async (actorIdOrName) => {
|
|
182
|
-
const
|
|
221
|
+
const actorName = fixActorNameInputAndLog(actorIdOrName, { mcpSessionId });
|
|
222
|
+
const actorDefinitionWithInfoCached = actorDefinitionPrunedCache.get(actorName);
|
|
183
223
|
if (actorDefinitionWithInfoCached) {
|
|
184
224
|
return {
|
|
185
225
|
definition: actorDefinitionWithInfoCached.definition,
|
|
@@ -188,15 +228,19 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
|
|
|
188
228
|
};
|
|
189
229
|
}
|
|
190
230
|
try {
|
|
191
|
-
const actorDefinitionWithInfo = await getActorDefinition(
|
|
231
|
+
const actorDefinitionWithInfo = await getActorDefinition(actorName, apifyClient);
|
|
192
232
|
if (!actorDefinitionWithInfo) {
|
|
193
233
|
log.softFail('Actor not found or definition is not available', {
|
|
194
|
-
actorName
|
|
234
|
+
actorName,
|
|
235
|
+
...(actorName !== actorIdOrName && { actorNameInput: actorIdOrName }),
|
|
236
|
+
mcpSessionId,
|
|
237
|
+
statusCode: 404,
|
|
238
|
+
failureCategory: 'INVALID_INPUT',
|
|
195
239
|
});
|
|
196
240
|
return null;
|
|
197
241
|
}
|
|
198
242
|
// Cache the Actor definition with info
|
|
199
|
-
actorDefinitionPrunedCache.set(
|
|
243
|
+
actorDefinitionPrunedCache.set(actorName, actorDefinitionWithInfo);
|
|
200
244
|
return {
|
|
201
245
|
definition: actorDefinitionWithInfo.definition,
|
|
202
246
|
actor: actorDefinitionWithInfo.info,
|
|
@@ -205,7 +249,8 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
|
|
|
205
249
|
}
|
|
206
250
|
catch (error) {
|
|
207
251
|
logHttpError(error, 'Failed to fetch Actor definition', {
|
|
208
|
-
actorName
|
|
252
|
+
actorName,
|
|
253
|
+
...(actorName !== actorIdOrName && { actorNameInput: actorIdOrName }),
|
|
209
254
|
mcpSessionId,
|
|
210
255
|
});
|
|
211
256
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/core/actor_tools_factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,10 @@ export declare function resolveAndValidateActor(params: {
|
|
|
71
71
|
* - Handles MCP tool calls
|
|
72
72
|
*
|
|
73
73
|
* Returns either an early response (error or MCP tool result) or the parsed context for mode-specific execution.
|
|
74
|
+
*
|
|
75
|
+
* Applies the same `actor` string normalization as `getActorsAsTools` **before** MCP URL lookup and routing so
|
|
76
|
+
* clients cannot pass a clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo:
|
|
77
|
+
* e.g. trailing `` ` `` on `apify/rag-web-browser`).
|
|
74
78
|
*/
|
|
75
79
|
export declare function callActorPreExecute(toolArgs: InternalToolArgs): Promise<{
|
|
76
80
|
earlyResponse: object;
|
|
@@ -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,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQxE,OAAO,
|
|
1
|
+
{"version":3,"file":"call_actor_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQxE,OAAO,EAA2B,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAQrF,gEAAgE;AAChE,eAAO,MAAM,6BAA6B,+MAEmD,CAAC;AAE9F,0EAA0E;AAC1E,eAAO,MAAM,wBAAwB,QAMqD,CAAC;AAE3F,yDAAyD;AACzD,eAAO,MAAM,2BAA2B,+EACwB,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;;iBAyBxB,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAoC,eAAe,CAAC;AAGrF,eAAO,MAAM,oBAAoB,yCAAkF,CAAC;AAEpH;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CASA;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,KAAK,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6CzB;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,CAsF1F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CACxE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GACzB;IACE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CACJ,CAqDA"}
|
|
@@ -10,7 +10,7 @@ import { buildMCPResponse } from '../../utils/mcp.js';
|
|
|
10
10
|
import { extractAjvErrorDetails } from '../../utils/tool_status.js';
|
|
11
11
|
import { extractActorId } from '../../utils/tools.js';
|
|
12
12
|
import { actorNameToToolName } from '../utils.js';
|
|
13
|
-
import { getActorsAsTools } from './actor_tools_factory.js';
|
|
13
|
+
import { fixActorNameInputAndLog, getActorsAsTools } from './actor_tools_factory.js';
|
|
14
14
|
// ---------------------------------------------------------------------------
|
|
15
15
|
// Shared call-actor description building blocks
|
|
16
16
|
// ---------------------------------------------------------------------------
|
|
@@ -219,10 +219,16 @@ You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.
|
|
|
219
219
|
* - Handles MCP tool calls
|
|
220
220
|
*
|
|
221
221
|
* Returns either an early response (error or MCP tool result) or the parsed context for mode-specific execution.
|
|
222
|
+
*
|
|
223
|
+
* Applies the same `actor` string normalization as `getActorsAsTools` **before** MCP URL lookup and routing so
|
|
224
|
+
* clients cannot pass a clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo:
|
|
225
|
+
* e.g. trailing `` ` `` on `apify/rag-web-browser`).
|
|
222
226
|
*/
|
|
223
227
|
export async function callActorPreExecute(toolArgs) {
|
|
224
228
|
const { args, apifyToken, apifyMcpServer, mcpSessionId } = toolArgs;
|
|
225
|
-
const
|
|
229
|
+
const parsedArgs = callActorArgs.parse(args);
|
|
230
|
+
const actorName = fixActorNameInputAndLog(parsedArgs.actor, { mcpSessionId, route: 'call-actor' });
|
|
231
|
+
const parsed = { ...parsedArgs, actor: actorName };
|
|
226
232
|
const { baseActorName, mcpToolName } = resolveActorContext(parsed.actor);
|
|
227
233
|
// For definition resolution we always use a token-based client; payment provider is only for actual Actor runs
|
|
228
234
|
const apifyClientForDefinition = new ApifyClient({ token: apifyToken });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call_actor_common.js","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACH,oCAAoC,EACpC,gBAAgB,EAChB,WAAW,EACX,WAAW,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"call_actor_common.js","sourceRoot":"","sources":["../../../src/tools/core/call_actor_common.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare const searchActorsArgsSchema: z.ZodObject<{
|
|
|
10
10
|
}, z.core.$strip>;
|
|
11
11
|
/**
|
|
12
12
|
* Shared tool metadata for search-actors — everything except the `call` handler.
|
|
13
|
-
* Used by both default and
|
|
13
|
+
* Used by both default and OpenAI variants.
|
|
14
14
|
*/
|
|
15
15
|
export declare const searchActorsMetadata: Omit<HelperTool, 'call'>;
|
|
16
16
|
//# sourceMappingURL=search_actors_common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_actors_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/search_actors_common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search_actors_common.d.ts","sourceRoot":"","sources":["../../../src/tools/core/search_actors_common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,UAAU,EAAmB,MAAM,gBAAgB,CAAC;AAIlE;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;iBA+BjC,CAAC;AAwCH;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAgBzD,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
var _a;
|
|
2
|
+
import dedent from 'dedent';
|
|
2
3
|
import { z } from 'zod';
|
|
3
4
|
import { HelperTools } from '../../const.js';
|
|
4
5
|
import { getWidgetConfig, WIDGET_URIS } from '../../resources/widgets.js';
|
|
@@ -10,22 +11,23 @@ import { actorSearchOutputSchema } from '../structured_output_schemas.js';
|
|
|
10
11
|
export const searchActorsArgsSchema = z.object({
|
|
11
12
|
keywords: z.string()
|
|
12
13
|
.default('')
|
|
13
|
-
.describe(`
|
|
14
|
-
|
|
14
|
+
.describe(dedent `
|
|
15
|
+
Space-separated keywords used to search pre-built solutions (Actors) in the Apify Store.
|
|
16
|
+
The search engine searches across Actor's name, description, username, and readme content.
|
|
15
17
|
|
|
16
|
-
Follow these rules for search keywords:
|
|
17
|
-
- Use 1-3 simple keyword terms maximum (e.g., "Instagram posts", "Twitter", "Amazon products")
|
|
18
|
-
- Actors are named using platform or service name together with the type of data or task they perform
|
|
19
|
-
- The most effective keywords are specific platform names (Instagram, Twitter, TikTok) and specific data types (posts, products, profiles, weather, news, reviews, comments)
|
|
20
|
-
- Avoid generic terms like "crawler", "data extraction" as these are less effective
|
|
21
|
-
- If a user asks about "fetching Instagram posts", use "Instagram posts" as keywords
|
|
22
|
-
- The goal is to find Actors that specifically handle the platform and data type the user mentioned
|
|
18
|
+
Follow these rules for search keywords:
|
|
19
|
+
- Use 1-3 simple keyword terms maximum (e.g., "Instagram posts", "Twitter", "Amazon products")
|
|
20
|
+
- Actors are named using platform or service name together with the type of data or task they perform
|
|
21
|
+
- The most effective keywords are specific platform names (Instagram, Twitter, TikTok) and specific data types (posts, products, profiles, weather, news, reviews, comments)
|
|
22
|
+
- Avoid generic terms like "crawler", "data extraction" as these are less effective
|
|
23
|
+
- If a user asks about "fetching Instagram posts", use "Instagram posts" as keywords
|
|
24
|
+
- The goal is to find Actors that specifically handle the platform and data type the user mentioned
|
|
23
25
|
|
|
24
|
-
Examples:
|
|
25
|
-
✅ Good: "Instagram posts", "Twitter", "Amazon products", "weather", "news articles"
|
|
26
|
-
❌ Bad: "Instagram posts profiles comments hashtags reels stories followers..." (too long, too many terms)
|
|
27
|
-
❌ Bad: "data extraction scraping tools" (too generic)
|
|
28
|
-
`),
|
|
26
|
+
Examples:
|
|
27
|
+
✅ Good: "Instagram posts", "Twitter", "Amazon products", "weather", "news articles"
|
|
28
|
+
❌ Bad: "Instagram posts profiles comments hashtags reels stories followers..." (too long, too many terms)
|
|
29
|
+
❌ Bad: "data extraction scraping tools" (too generic)
|
|
30
|
+
`),
|
|
29
31
|
limit: z.number()
|
|
30
32
|
.int()
|
|
31
33
|
.min(1)
|
|
@@ -77,7 +79,7 @@ Returns list of Actor cards with the following info:
|
|
|
77
79
|
`;
|
|
78
80
|
/**
|
|
79
81
|
* Shared tool metadata for search-actors — everything except the `call` handler.
|
|
80
|
-
* Used by both default and
|
|
82
|
+
* Used by both default and OpenAI variants.
|
|
81
83
|
*/
|
|
82
84
|
export const searchActorsMetadata = {
|
|
83
85
|
type: 'internal',
|
|
@@ -87,9 +89,7 @@ export const searchActorsMetadata = {
|
|
|
87
89
|
outputSchema: actorSearchOutputSchema,
|
|
88
90
|
ajvValidate: compileSchema(z.toJSONSchema(searchActorsArgsSchema)),
|
|
89
91
|
// openai/* and ui keys are stripped in non-openai mode by stripWidgetMeta() in src/utils/tools.ts
|
|
90
|
-
_meta: {
|
|
91
|
-
...(_a = getWidgetConfig(WIDGET_URIS.SEARCH_ACTORS)) === null || _a === void 0 ? void 0 : _a.meta,
|
|
92
|
-
},
|
|
92
|
+
_meta: { ...(_a = getWidgetConfig(WIDGET_URIS.SEARCH_ACTORS)) === null || _a === void 0 ? void 0 : _a.meta },
|
|
93
93
|
annotations: {
|
|
94
94
|
title: 'Search Actors',
|
|
95
95
|
readOnlyHint: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_actors_common.js","sourceRoot":"","sources":["../../../src/tools/core/search_actors_common.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;SACf,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"search_actors_common.js","sourceRoot":"","sources":["../../../src/tools/core/search_actors_common.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;SACf,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,MAAM,CAAA;;;;;;;;;;;;;;;;SAgBf,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SACZ,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,CAAC,sDAAsD,CAAC;IACrE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACb,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;SACN,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,CAAC,6DAA6D,CAAC;CAC/E,CAAC,CAAC;AAEH,MAAM,yBAAyB,GAAG;;;+EAG6C,WAAW,CAAC,qBAAqB;;;;;;;;;;;;;;;;;;;;sCAoB1E,WAAW,CAAC,iBAAiB;;;;;;;;;;;;;CAalE,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAA6B;IAC1D,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW,CAAC,YAAY;IAC9B,WAAW,EAAE,yBAAyB;IACtC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,sBAAsB,CAAoB;IACtE,YAAY,EAAE,uBAAuB;IACrC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAClE,kGAAkG;IAClG,KAAK,EAAE,EAAE,GAAG,MAAA,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC,0CAAE,IAAI,EAAE;IAC9D,WAAW,EAAE;QACT,KAAK,EAAE,eAAe;QACtB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,KAAK;KACvB;CACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch_actor_details.d.ts","sourceRoot":"","sources":["../../../src/tools/default/fetch_actor_details.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch_actor_details.d.ts","sourceRoot":"","sources":["../../../src/tools/default/fetch_actor_details.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAelE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,SAqC5B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ApifyClient } from '../../apify_client.js';
|
|
2
2
|
import { buildActorDetailsTextResponse, buildActorNotFoundResponse, buildCardOptions, fetchActorDetails, resolveOutputOptions, } from '../../utils/actor_details.js';
|
|
3
3
|
import { buildMCPResponse } from '../../utils/mcp.js';
|
|
4
|
+
import { fixActorNameInputAndLog } from '../core/actor_tools_factory.js';
|
|
4
5
|
import { fetchActorDetailsMetadata, fetchActorDetailsToolArgsSchema, } from '../core/fetch_actor_details_common.js';
|
|
5
6
|
/**
|
|
6
7
|
* Default mode fetch-actor-details tool.
|
|
@@ -11,22 +12,23 @@ export const defaultFetchActorDetails = Object.freeze({
|
|
|
11
12
|
call: async (toolArgs) => {
|
|
12
13
|
var _a;
|
|
13
14
|
const { args, apifyToken, apifyMcpServer, mcpSessionId } = toolArgs;
|
|
14
|
-
const
|
|
15
|
+
const parsedArgs = fetchActorDetailsToolArgsSchema.parse(args);
|
|
16
|
+
const actorName = fixActorNameInputAndLog(parsedArgs.actor, { mcpSessionId, route: 'fetch-actor-details' });
|
|
15
17
|
const apifyClient = new ApifyClient({ token: apifyToken });
|
|
16
|
-
const resolvedOutput = resolveOutputOptions(
|
|
18
|
+
const resolvedOutput = resolveOutputOptions(parsedArgs.output);
|
|
17
19
|
const cardOptions = buildCardOptions(resolvedOutput);
|
|
18
|
-
const details = await fetchActorDetails(apifyClient,
|
|
20
|
+
const details = await fetchActorDetails(apifyClient, actorName, cardOptions);
|
|
19
21
|
if (!details) {
|
|
20
|
-
return buildActorNotFoundResponse(
|
|
22
|
+
return buildActorNotFoundResponse(actorName);
|
|
21
23
|
}
|
|
22
24
|
// Fetch output schema from ActorStore if available and requested
|
|
23
25
|
const actorOutputSchema = resolvedOutput.outputSchema
|
|
24
|
-
? await ((_a = apifyMcpServer.actorStore) === null || _a === void 0 ? void 0 : _a.getActorOutputSchemaAsTypeObject(
|
|
26
|
+
? await ((_a = apifyMcpServer.actorStore) === null || _a === void 0 ? void 0 : _a.getActorOutputSchemaAsTypeObject(actorName).catch(() => null))
|
|
25
27
|
: undefined;
|
|
26
28
|
// NOTE: Data duplication between texts and structuredContent is intentional and required.
|
|
27
29
|
// Some MCP clients only read text content, while others only read structured content.
|
|
28
30
|
const { texts, structuredContent: responseStructuredContent } = await buildActorDetailsTextResponse({
|
|
29
|
-
actorName
|
|
31
|
+
actorName,
|
|
30
32
|
details,
|
|
31
33
|
output: resolvedOutput,
|
|
32
34
|
cardOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch_actor_details.js","sourceRoot":"","sources":["../../../src/tools/default/fetch_actor_details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACH,6BAA6B,EAC7B,0BAA0B,EAC1B,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACH,yBAAyB,EACzB,+BAA+B,GAClC,MAAM,uCAAuC,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAc,MAAM,CAAC,MAAM,CAAC;IAC7D,GAAG,yBAAyB;IAC5B,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QACpE,MAAM,
|
|
1
|
+
{"version":3,"file":"fetch_actor_details.js","sourceRoot":"","sources":["../../../src/tools/default/fetch_actor_details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACH,6BAA6B,EAC7B,0BAA0B,EAC1B,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EACH,yBAAyB,EACzB,+BAA+B,GAClC,MAAM,uCAAuC,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAc,MAAM,CAAC,MAAM,CAAC;IAC7D,GAAG,yBAAyB;IAC5B,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QACpE,MAAM,UAAU,GAAG,+BAA+B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,uBAAuB,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAC5G,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAE3D,MAAM,cAAc,GAAG,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC7E,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,0BAA0B,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC;QAED,iEAAiE;QACjE,MAAM,iBAAiB,GAAG,cAAc,CAAC,YAAY;YACjD,CAAC,CAAC,MAAM,CAAA,MAAA,cAAc,CAAC,UAAU,0CAAE,gCAAgC,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;YAChG,CAAC,CAAC,SAAS,CAAC;QAEhB,0FAA0F;QAC1F,sFAAsF;QACtF,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,GAAG,MAAM,6BAA6B,CAAC;YAChG,SAAS;YACT,OAAO;YACP,MAAM,EAAE,cAAc;YACtB,WAAW;YACX,WAAW;YACX,UAAU;YACV,iBAAiB;YACjB,eAAe,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,CAAC,eAAe;YACxD,YAAY;SACf,CAAC,CAAC;QAEH,OAAO,gBAAgB,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACrF,CAAC;CACK,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_actor_run.d.ts","sourceRoot":"","sources":["../../../src/tools/default/get_actor_run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AASlE;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"get_actor_run.d.ts","sourceRoot":"","sources":["../../../src/tools/default/get_actor_run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AASlE;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAmCtB,CAAC"}
|
|
@@ -21,9 +21,7 @@ export const defaultGetActorRun = Object.freeze({
|
|
|
21
21
|
return fetchResult.error;
|
|
22
22
|
}
|
|
23
23
|
const { run, structuredContent } = fetchResult.result;
|
|
24
|
-
const texts = [
|
|
25
|
-
`# Actor Run Information\n\`\`\`json\n${JSON.stringify(run, null, 2)}\n\`\`\``,
|
|
26
|
-
];
|
|
24
|
+
const texts = [`# Actor Run Information\n\`\`\`json\n${JSON.stringify(run)}\n\`\`\``];
|
|
27
25
|
return buildMCPResponse({
|
|
28
26
|
texts,
|
|
29
27
|
structuredContent,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_actor_run.js","sourceRoot":"","sources":["../../../src/tools/default/get_actor_run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,mBAAmB,GACtB,MAAM,iCAAiC,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAc,MAAM,CAAC,MAAM,CAAC;IACvD,GAAG,mBAAmB;IACtB,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC;gBACxC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM;gBACN,YAAY;aACf,CAAC,CAAC;YAEH,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;gBACzB,OAAO,WAAW,CAAC,KAAK,CAAC;YAC7B,CAAC;YAED,MAAM,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"get_actor_run.js","sourceRoot":"","sources":["../../../src/tools/default/get_actor_run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,mBAAmB,GACtB,MAAM,iCAAiC,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAc,MAAM,CAAC,MAAM,CAAC;IACvD,GAAG,mBAAmB;IACtB,IAAI,EAAE,KAAK,EAAE,QAA0B,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC;gBACxC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM;gBACN,YAAY;aACf,CAAC,CAAC;YAEH,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;gBACzB,OAAO,WAAW,CAAC,KAAK,CAAC;YAC7B,CAAC;YAED,MAAM,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEtF,OAAO,gBAAgB,CAAC;gBACpB,KAAK;gBACL,iBAAiB;gBACjB,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC;aAC7B,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,YAAY,CAAC,KAAK,EAAE,yBAAyB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YACxE,OAAO,gBAAgB,CAAC;gBACpB,KAAK,EAAE,CAAC,4BAA4B,MAAM,CAAC,KAAK,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;yDACnE,CAAC;gBAC1C,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,SAAS,EAAE;aACnD,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACK,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ToolEntry } from '../../types.js';
|
|
2
2
|
/**
|
|
3
3
|
* Default mode search-actors tool.
|
|
4
|
-
* Returns text-based
|
|
4
|
+
* Returns text-based Actor cards without widget metadata.
|
|
5
5
|
*/
|
|
6
6
|
export declare const defaultSearchActors: ToolEntry;
|
|
7
7
|
//# sourceMappingURL=search_actors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_actors.d.ts","sourceRoot":"","sources":["../../../src/tools/default/search_actors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search_actors.d.ts","sourceRoot":"","sources":["../../../src/tools/default/search_actors.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAMlE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAgEvB,CAAC"}
|