@apify/actors-mcp-server 0.19.6-beta.2 → 0.19.6-beta.3

package/dist/tools/actors/actor_tools_factory.d.ts

@@ -1,7 +1,7 @@
 import type { ApifyClient } from '../../apify_client.js';
 import { ActorLoadError } from '../../errors.js';
 import type { PaymentProvider } from '../../payments/types.js';
-import { type ActorInfo, type ActorStore, type ApifyToken, type ToolEntry } from '../../types.js';
+import { type ActorInfo, type ActorStore, type ToolEntry } from '../../types.js';
 /**
  * For each direct actor tool with a known historical item schema, replaces the generic
  * `actorRunOutputSchema` with a per-tool variant that declares
@@ -33,18 +33,21 @@ export declare function getNormalActorsAsTools(actorsInfo: ActorInfo[], options?
     actorStore?: ActorStore;
     isDirectTool?: boolean;
 }): Promise<ToolEntry[]>;
-export declare function getMCPServersAsTools(actorsInfo: ActorInfo[], apifyToken: ApifyToken, mcpSessionId?: string): Promise<ToolEntry[]>;
+export declare function getMCPServersAsTools(actorsInfo: ActorInfo[], apifyClient: Pick<ApifyClient, 'token' | 'requestOrigin'>, mcpSessionId?: string): Promise<ToolEntry[]>;
 /**
  * Fixes an Actor name input from LLM and logs at INFO when the input differed from the fixed version.
  * Single entry point for fix+log — avoids duplicating the pattern at every call site.
  */
 export declare function fixActorNameInputAndLog(actorName: string, extra?: Record<string, unknown>): string;
+/** The `:toolName` of the removed `actorName:toolName` form; a URL's `scheme://` is not one. */
+export declare const MCP_TOOL_NAME_SUFFIX: RegExp;
 /**
  * Fixes Actor name strings (`username/name`) before cache + Apify API lookup.
  *
  * LLMs often wrap values in markdown quotes or smart quotes and insert spaces around `/`.
  * The Apify API treats those as distinct strings → avoidable 404 SOFT_FAIL. This only trims
  * and strips common wrappers / spacing noise; valid names pass through unchanged.
+ * It also drops the `:toolName` of the removed `actorName:toolName` form, since a name never contains a colon.
  */
 export declare function fixActorNameInput(actorName: string): string;
 /**

package/dist/tools/actors/actor_tools_factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actor_tools_factory.d.ts","sourceRoot":"","sources":["../../../src/tools/actors/actor_tools_factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQzD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAEH,KAAK,SAAS,EACd,KAAK,UAAU,EAEf,KAAK,UAAU,EAEf,KAAK,SAAS,EAKjB,MAAM,gBAAgB,CAAC;AA2BxB;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB5G;AA0BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,sBAAsB,CACxC,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GACrF,OAAO,CAAC,SAAS,EAAE,CAAC,CAuFtB;AAED,wBAAsB,oBAAoB,CACtC,UAAU,EAAE,SAAS,EAAE,EACvB,UAAU,EAAE,UAAU,EACtB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC,CAoDtB;AAED;;;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,CAG3D;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,MAAM,EAAE,cAAc,EAAE,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IACN,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,GACF,OAAO,CAAC,mBAAmB,CAAC,CAmF9B"}
+{"version":3,"file":"actor_tools_factory.d.ts","sourceRoot":"","sources":["../../../src/tools/actors/actor_tools_factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQzD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAEH,KAAK,SAAS,EACd,KAAK,UAAU,EAGf,KAAK,SAAS,EAKjB,MAAM,gBAAgB,CAAC;AA2BxB;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB5G;AA0BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,sBAAsB,CACxC,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GACrF,OAAO,CAAC,SAAS,EAAE,CAAC,CAuFtB;AAED,wBAAsB,oBAAoB,CACtC,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,eAAe,CAAC,EACzD,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqDtB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAalG;AAED,gGAAgG;AAChG,eAAO,MAAM,oBAAoB,QAAY,CAAC;AAE9C;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,MAAM,EAAE,cAAc,EAAE,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IACN,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,GACF,OAAO,CAAC,mBAAmB,CAAC,CAmF9B"}

package/dist/tools/actors/actor_tools_factory.js

@@ -184,10 +184,11 @@ ${hasTool(HELPER_TOOLS.ACTOR_CALL) ? `Use this tool instead of the "${HELPER_TOO
     }
     return tools;
 }
-export async function getMCPServersAsTools(actorsInfo, apifyToken, mcpSessionId) {
+export async function getMCPServersAsTools(actorsInfo, apifyClient, mcpSessionId) {
+    const { token, requestOrigin } = apifyClient;
     // Payment-provider request with no Apify token: standby Actors aren't supported here, so
     // MCP servers — which are always standby Actors — are skipped since they'd fail anyway.
-    if (apifyToken === null || apifyToken === undefined) {
+    if (token === null || token === undefined) {
         return [];
     }
     // Process all actors in parallel
@@ -212,7 +213,7 @@ export async function getMCPServersAsTools(actorsInfo, apifyToken, mcpSessionId)
                 mcpServerUrl,
                 mcpSessionId,
             });
-            client = await connectMCPClient(mcpServerUrl, apifyToken, mcpSessionId);
+            client = await connectMCPClient(mcpServerUrl, { token, requestOrigin }, mcpSessionId);
             if (!client) {
                 // Skip this Actor, connectMCPClient will log the error
                 return [];
@@ -243,7 +244,7 @@ export async function getMCPServersAsTools(actorsInfo, apifyToken, mcpSessionId)
 export function fixActorNameInputAndLog(actorName, extra) {
     const fixed = fixActorNameInput(actorName);
     if (fixed !== actorName) {
-        log.info('Actor name input required normalization before lookup (quotes, spacing, or slash padding)', {
+        log.info('Actor name input required normalization before lookup (quotes, spacing, slash padding, or a tool name)', {
             actorNameInput: actorName,
             actorNameFixed: fixed,
             ...extra,
@@ -251,16 +252,19 @@ export function fixActorNameInputAndLog(actorName, extra) {
     }
     return fixed;
 }
+/** The `:toolName` of the removed `actorName:toolName` form; a URL's `scheme://` is not one. */
+export const MCP_TOOL_NAME_SUFFIX = /:[^/]*$/;
 /**
  * Fixes Actor name strings (`username/name`) before cache + Apify API lookup.
  *
  * LLMs often wrap values in markdown quotes or smart quotes and insert spaces around `/`.
  * The Apify API treats those as distinct strings → avoidable 404 SOFT_FAIL. This only trims
  * and strips common wrappers / spacing noise; valid names pass through unchanged.
+ * It also drops the `:toolName` of the removed `actorName:toolName` form, since a name never contains a colon.
  */
 export function fixActorNameInput(actorName) {
     const s = stripQuoteWrappers(actorName).replace(/\s*\/\s*/g, '/');
-    return s.replace(/\s+/g, ' ').trim();
+    return s.replace(/\s+/g, ' ').trim().replace(MCP_TOOL_NAME_SUFFIX, '');
 }
 /**
  * Loads Actor metadata + builds MCP tool entries for the requested Actor
@@ -347,7 +351,7 @@ export async function getActorsAsTools(actorIdsOrNames, apifyClient, options) {
     }
     const [normalTools, mcpServerTools] = await Promise.all([
         getNormalActorsAsTools(normalActorsInfo, { mcpSessionId, actorStore, isDirectTool }),
-        getMCPServersAsTools(actorMCPServersInfo, apifyClient.token, mcpSessionId),
+        getMCPServersAsTools(actorMCPServersInfo, apifyClient, mcpSessionId),
     ]);
     return { tools: [...normalTools, ...mcpServerTools], errors };
 }

package/dist/tools/actors/actor_tools_factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/actors/actor_tools_factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"actor_tools_factory.js","sourceRoot":"","sources":["../../../src/tools/actors/actor_tools_factory.ts"],"names":[],"mappings":"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"}

package/dist/tools/actors/call_actor.d.ts

@@ -2,9 +2,6 @@ import { z } from 'zod';
 import type { PaymentProvider } from '../../payments/types.js';
 import type { ApifyToken, InternalToolArgs, ToolDescriptionContext, ToolEntry, ToolInputSchema } from '../../types.js';
 import { type ToolResponse } from '../../utils/mcp.js';
-export declare const CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG = "When calling an MCP server Actor, you must specify the tool name in the actor parameter as \"{actorName}:{toolName}\" in the \"actor\" input property.";
-/** Shared MCP server instructions — identical in both modes. */
-export declare function buildCallActorMcpServerSection({ hasTool }: ToolDescriptionContext): string;
 /** Shared examples section — identical in both modes. */
 export declare const CALL_ACTOR_EXAMPLES_SECTION = "EXAMPLES:\n- user_input: Get instagram posts using apify/instagram-scraper";
 type CallActorErrorResponseParams = {
@@ -58,32 +55,14 @@ export type CallActorParsedArgs = z.infer<typeof callActorArgs>;
  * Uses `actorDefinitionCache` — one definition fetch on a cold cache.
  */
 export declare function checkPaymentProviderStandbyConflict(params: {
-    actorName: string;
-    paymentProvider: PaymentProvider;
+    tool: ToolEntry;
+    args: Record<string, unknown>;
+    paymentProvider: PaymentProvider | undefined;
     apifyToken: ApifyToken;
     mcpSessionId?: string;
 }): Promise<Record<string, unknown> | null>;
-/**
- * Resolves MCP URL and parses the "actor:tool" format.
- * Shared pre-processing step used by both default and apps variants.
- */
-export declare function resolveActorContext(actorName: string): {
-    baseActorName: string;
-    mcpToolName: string | undefined;
-};
-/**
- * Proxies the MCP tool call flow (when actorName contains ":toolName"). The caller routes here only
- * for {@link ACTOR_TOOL_MODE.MCP} Actors, so `mcpServerUrl` is always known good.
- */
-export declare function handleMcpToolCall(params: {
-    baseActorName: string;
-    mcpToolName: string;
-    input: Record<string, unknown>;
-    mcpServerUrl: string;
-    apifyToken: string;
-    mcpSessionId?: string;
-    signal: AbortSignal;
-}): Promise<ToolResponse>;
+/** Rejects removed MCP call syntax before Actor or payment metadata is fetched. */
+export declare function buildLegacyMcpSyntaxRejection(toolName: string, actor: unknown, loadedToolNames: readonly string[]): ToolResponse | null;
 /**
  * Validates the actor and its input, returning the resolved actor tool or an error response.
  * Shared validation logic used by both default and openai execution paths.
@@ -98,17 +77,12 @@ export declare function resolveAndValidateActor(params: {
     actor: ToolEntry;
 }>;
 /**
- * Performs the pre-execution checks common to both modes:
- * - Parses args
- * - Resolves actor/MCP context
- * - Handles payment provider restrictions
- * - Handles MCP tool calls
- *
- * Returns either an early response (error or MCP tool result) or the parsed context for mode-specific execution.
+ * Performs the pre-execution checks common to both modes: parses args and rejects an Actor that `call-actor`
+ * cannot run (a standby Actor with neither an MCP server nor an input schema, or an MCP server).
  *
- * Applies the same `actor` string normalization as `getActorsAsTools` **before** MCP URL lookup and routing so
- * clients cannot pass a clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo:
- * e.g. trailing `` ` `` on `apify/rag-web-browser`).
+ * Applies the same `actor` string normalization as `getActorsAsTools` **before** routing so clients cannot pass a
+ * clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo: e.g. trailing `` ` ``
+ * on `apify/rag-web-browser`).
  */
 export declare function callActorPreExecute(toolArgs: InternalToolArgs, options: {
     route: string;
@@ -116,8 +90,6 @@ export declare function callActorPreExecute(toolArgs: InternalToolArgs, options:
     earlyResponse: ToolResponse;
 } | {
     parsed: CallActorParsedArgs;
-    baseActorName: string;
-    mcpToolName: string | undefined;
 }>;
 /**
  * Shared start-then-wait flow for call-actor variants (default + apps).

package/dist/tools/actors/call_actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call_actor.d.ts","sourceRoot":"","sources":["../../../src/tools/actors/call_actor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAevH,OAAO,EAMH,KAAK,YAAY,EACpB,MAAM,oBAAoB,CAAC;AAmB5B,eAAO,MAAM,oCAAoC,2JAAuJ,CAAC;AAEzM,gEAAgE;AAChE,wBAAgB,8BAA8B,CAAC,EAAE,OAAO,EAAE,EAAE,sBAAsB,GAAG,MAAM,CAG1F;AAuBD,yDAAyD;AACzD,eAAO,MAAM,2BAA2B,+EACwB,CAAC;AAEjE,KAAK,4BAA4B,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4FAA4F;IAC5F,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,6FAA6F;IAC7F,WAAW,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AA+BF,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,sBAA0C,GAAG,MAAM,CAsCjG;AA2CD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,4BAA4B,GAAG,YAAY,CAuE9F;AAED,eAAO,MAAM,iBAAiB;;;;;;iBA2B5B,CAAC;AAEH,sFAAsF;AACtF,eAAO,MAAM,aAAa;;;;;;;;;;;iBAsBxB,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAoC,eAAe,CAAC;AACrF,eAAO,MAAM,oBAAoB,yCAAkF,CAAC;AAEpH;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,wBAAsB,mCAAmC,CAAC,MAAM,EAAE;IAC9D,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAmB1C;AAED;;;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,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC;CACvB,GAAG,OAAO,CAAC,YAAY,CAAC,CAuDxB;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,YAAY,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC,CA2E1D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CACJ;IAAE,aAAa,EAAE,YAAY,CAAA;CAAE,GAC/B;IACI,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CACN,CA6DA;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAiFxF;AAED,8IAA8I;AAC9I,eAAO,MAAM,SAAS,EAAE,SAsBb,CAAC"}
+{"version":3,"file":"call_actor.d.ts","sourceRoot":"","sources":["../../../src/tools/actors/call_actor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAcvH,OAAO,EAKH,KAAK,YAAY,EACpB,MAAM,oBAAoB,CAAC;AAwC5B,yDAAyD;AACzD,eAAO,MAAM,2BAA2B,+EACwB,CAAC;AAEjE,KAAK,4BAA4B,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4FAA4F;IAC5F,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,6FAA6F;IAC7F,WAAW,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AA+BF,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,sBAA0C,GAAG,MAAM,CAsCjG;AAwCD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,4BAA4B,GAAG,YAAY,CAuE9F;AAED,eAAO,MAAM,iBAAiB;;;;;;iBA2B5B,CAAC;AAEH,sFAAsF;AACtF,eAAO,MAAM,aAAa;;;;;;;;;;;iBAsBxB,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAoC,eAAe,CAAC;AACrF,eAAO,MAAM,oBAAoB,yCAAkF,CAAC;AAEpH;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,wBAAsB,mCAAmC,CAAC,MAAM,EAAE;IAC9D,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAsB1C;AAYD,mFAAmF;AACnF,wBAAgB,6BAA6B,CACzC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,SAAS,MAAM,EAAE,GACnC,YAAY,GAAG,IAAI,CASrB;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,YAAY,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC,CA2E1D;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC;IAAE,aAAa,EAAE,YAAY,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC,CA0B5E;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAiFxF;AAED,8IAA8I;AAC9I,eAAO,MAAM,SAAS,EAAE,SAsBb,CAAC"}

package/dist/tools/actors/call_actor.js

@@ -1,37 +1,28 @@
-import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import dedent from 'dedent';
 import { z } from 'zod';
 import log from '@apify/log';
 import { ApifyClient } from '../../apify_client.js';
 import { APIFY_ERROR_TYPE_CANNOT_START_ACTOR_RUNS, APIFY_ERROR_TYPE_FULL_PERMISSION_NOT_APPROVED, APIFY_ERROR_TYPE_MEMORY_LIMIT_EXCEEDED, FAILURE_CATEGORY, HELPER_TOOLS, } from '../../const.js';
 import { ACTOR_LOAD_ERROR_KIND, ActorLoadError } from '../../errors.js';
-import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC } from '../../mcp/const.js';
-import { withRemoteMcpClient } from '../../mcp/remote_tool_call.js';
 import { ACTOR_TOOL_MODE, ALL_TOOLS_PRESENT, TOOL_TYPE } from '../../types.js';
 import { getActorDefinitionCached, getActorToolResolutionCached } from '../../utils/actor.js';
 import { compileSchema } from '../../utils/ajv.js';
-import { ACTOR_RUN_LIMIT_MESSAGE, isActorInputValidationError, isActorRunLimitError, isMemoryQuotaError, isPermissionApprovalError, remoteMcpFailureDetail, } from '../../utils/apify_errors.js';
+import { ACTOR_RUN_LIMIT_MESSAGE, isActorInputValidationError, isActorRunLimitError, isMemoryQuotaError, isPermissionApprovalError, } from '../../utils/apify_errors.js';
 import { getConsoleLinkContext } from '../../utils/console_link.js';
 import { wrapJsonText } from '../../utils/encode_text.js';
 import { logHttpError } from '../../utils/logging.js';
-import { buildInvalidInputTexts, respondAborted, respondRaw, respondServerError, respondUserError, } from '../../utils/mcp.js';
+import { buildInvalidInputTexts, respondAborted, respondServerError, respondUserError, } from '../../utils/mcp.js';
 import { buildPermissionApprovalTexts } from '../../utils/payment_errors.js';
 import { classifyFailureCategory, extractAjvErrorDetails } from '../../utils/tool_status.js';
 import { extractActorId } from '../../utils/tools.js';
-import { isActorBlockedUnderPaymentProvider } from '../actor_tool_naming.js';
+import { getOwnServerRemedy, isActorBlockedUnderPaymentProvider } from '../actor_tool_naming.js';
 import { buildGetActorRunResponse } from '../runs/get_actor_run.js';
 import { actorRunOutputSchema, anyJsonObjectSchema } from '../structured_output_schemas.js';
 import { abortRunOnSignal, buildStartRunResponse, CALL_ACTOR_WAIT_SECS_DEFAULT, fetchActorRunData, } from './actor_run_response.js';
-import { fixActorNameInputAndLog, getActorsAsTools } from './actor_tools_factory.js';
+import { fixActorNameInputAndLog, getActorsAsTools, MCP_TOOL_NAME_SUFFIX } from './actor_tools_factory.js';
 // ---------------------------------------------------------------------------
 // Shared call-actor description building blocks
 // ---------------------------------------------------------------------------
-export const CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG = `When calling an MCP server Actor, you must specify the tool name in the actor parameter as "{actorName}:{toolName}" in the "actor" input property.`;
-/** Shared MCP server instructions — identical in both modes. */
-export function buildCallActorMcpServerSection({ hasTool }) {
-    return `For MCP server Actors:
-${hasTool(HELPER_TOOLS.ACTOR_GET_DETAILS) ? `- Use ${HELPER_TOOLS.ACTOR_GET_DETAILS} with output={ mcpTools: true } to list available tools\n` : ''}- Call using format: "actorName:toolName" (e.g., "username/name:tool-name")`;
-}
 /** Points at the Actor Server for results that do not need a batch run. */
 function buildCallActorServerActorSection({ hasTool }) {
     const operations = hasTool(HELPER_TOOLS.ACTOR_GET_DETAILS)
@@ -101,7 +92,7 @@ export function buildCallActorDescription(ctx = ALL_TOOLS_PRESENT) {
     const sections = [
         'Call any Actor from the Apify Store.',
         workflowSection,
-        buildCallActorMcpServerSection(ctx),
+        `MCP server Actors are not run here${hasTool(HELPER_TOOLS.ACTOR_MCP_TOOL_CALL) ? `; ${HELPER_TOOLS.ACTOR_MCP_TOOL_CALL} calls their MCP tools` : ''}.`,
         ...(hasTool(HELPER_TOOLS.ACTOR_SERVER_REQUEST) ? [buildCallActorServerActorSection(ctx)] : []),
         dedent `
             IMPORTANT:
@@ -126,8 +117,8 @@ export function buildCallActorDescription(ctx = ALL_TOOLS_PRESENT) {
  */
 function respondStandbyRejection(error, opts) {
     log.softFail('Rejecting a tool call for an unsupported standby Actor', {
-        // The error's canonical Actor name, so both call shapes log the same value even when the
-        // caller addressed the Actor by ID. `actorLoadErrorKind` distinguishes which cell rejected it.
+        // The error's canonical Actor name, not the caller's identifier, which may be an Actor ID.
+        // `actorLoadErrorKind` distinguishes which cell rejected it.
         actorName: error.actorName,
         mcpSessionId: opts.mcpSessionId,
         paymentProviderId: opts.paymentProviderId,
@@ -136,10 +127,7 @@ function respondStandbyRejection(error, opts) {
     });
     return respondUserError(error.message, { actorId: opts.actorId, detail: error.kind });
 }
-/**
- * Canonical "Actor not found" answer, shared by the run path and the `actor:toolName` route so an
- * unknown Actor gets the same response regardless of call shape.
- */
+/** Canonical "Actor not found" answer for the run path. */
 function respondActorNotFound(actorName, loadedToolNames) {
     // See apify/apify-mcp-server#1296.
     // Only search-actors: the Actor does not exist, so buildCallFailureRecoveryHint's second
@@ -237,11 +225,9 @@ export const callOptionsSchema = z.object({
 });
 /** Zod schema for call-actor arguments — shared between default and apps variants. */
 export const callActorArgs = z.object({
-    actor: z.string().describe(dedent `
-            The Actor to call: its ID, or its name in the "username/name" form (e.g., "apify/rag-web-browser").
-
-            For MCP server Actors, use format "actorName:toolName" to call a specific tool (e.g., "username/name:tool-name").
-        `),
+    actor: z
+        .string()
+        .describe('The Actor to call: its ID, or its name in the "username/name" form (e.g., "apify/rag-web-browser").'),
     input: anyJsonObjectSchema.describe('The input JSON to pass to the Actor. Required.'),
     waitSecs: z
         .number()
@@ -270,85 +256,47 @@ export const callActorAjvValidate = compileSchema({ ...z.toJSONSchema(callActorA
  * Uses `actorDefinitionCache` — one definition fetch on a cold cache.
  */
 export async function checkPaymentProviderStandbyConflict(params) {
-    const { actorName, paymentProvider, apifyToken, mcpSessionId } = params;
+    const { tool, args, paymentProvider, apifyToken, mcpSessionId } = params;
+    if (!paymentProvider || !tool.hasPaymentProviderStandbyCheck)
+        return null;
+    const actorName = args.actor;
+    if (typeof actorName !== 'string' || !actorName)
+        return null;
     const normalizedActorName = fixActorNameInputAndLog(actorName, { mcpSessionId });
-    const { baseActorName } = resolveActorContext(normalizedActorName);
     // Token-based client — payment headers are only relevant for actual Actor runs.
     const apifyClientForDefinition = new ApifyClient({ token: apifyToken });
-    const actorDefinitionWithInfo = await getActorDefinitionCached(baseActorName, apifyClientForDefinition);
+    const actorDefinitionWithInfo = await getActorDefinitionCached(normalizedActorName, apifyClientForDefinition);
     if (!actorDefinitionWithInfo) {
         return null;
     }
     if (!isActorBlockedUnderPaymentProvider(actorDefinitionWithInfo.info)) {
         return null;
     }
-    // Canonical name, not the caller's identifier — it may be an Actor ID or carry a `:toolName` suffix.
+    // Canonical name, not the caller's identifier, which may be an Actor ID.
     const error = ActorLoadError.standbyPaymentNotSupported(actorDefinitionWithInfo.definition.actorFullName);
     return respondStandbyRejection(error, { mcpSessionId, paymentProviderId: paymentProvider.id });
 }
-/**
- * Resolves MCP URL and parses the "actor:tool" format.
- * Shared pre-processing step used by both default and apps variants.
- */
-export function resolveActorContext(actorName) {
-    const mcpToolMatch = actorName.match(/^(.+):(.+)$/);
-    if (mcpToolMatch) {
-        return {
-            baseActorName: mcpToolMatch[1],
-            mcpToolName: mcpToolMatch[2],
-        };
-    }
-    return { baseActorName: actorName, mcpToolName: undefined };
+/** Rejection for an Actor that is an MCP server: its input interface is unused, so a run of it is a mistake. */
+function respondMcpServerActor(actorFullName, route, loadedToolNames) {
+    const replacement = loadedToolNames.includes(HELPER_TOOLS.ACTOR_MCP_TOOL_CALL)
+        ? ` Its MCP tools can be called with ${HELPER_TOOLS.ACTOR_MCP_TOOL_CALL}.`
+        : ` Its MCP tools cannot be called in this configuration. To use them, ${getOwnServerRemedy()}`;
+    return respondUserError(`Actor '${actorFullName}' is an MCP server, which ${route} does not run.${replacement}`, {
+        detail: 'MCP server Actor',
+    });
 }
-/**
- * Proxies the MCP tool call flow (when actorName contains ":toolName"). The caller routes here only
- * for {@link ACTOR_TOOL_MODE.MCP} Actors, so `mcpServerUrl` is always known good.
- */
-export async function handleMcpToolCall(params) {
-    const { baseActorName, mcpToolName, input, mcpServerUrl, apifyToken, mcpSessionId, signal } = params;
-    if (!input) {
-        return respondServerError(`Input is required for MCP tool '${mcpToolName}'. Please provide the input parameter based on the tool's input schema.`);
-    }
-    if (signal.aborted) {
-        return respondAborted();
-    }
-    const outcome = await withRemoteMcpClient(mcpServerUrl, apifyToken, mcpSessionId, signal, async (client) => client.callTool({ name: mcpToolName, arguments: input }, CallToolResultSchema, {
-        timeout: EXTERNAL_TOOL_CALL_TIMEOUT_MSEC,
-        signal,
-    }));
-    switch (outcome.outcome) {
-        case 'connect-failed':
-            return respondServerError(`Failed to connect to MCP server ${mcpServerUrl}`);
-        case 'aborted':
-            return respondAborted();
-        case 'error':
-            logHttpError(outcome.error, `Failed to call MCP tool '${mcpToolName}' on Actor '${baseActorName}'`, {
-                actorName: baseActorName,
-                toolName: mcpToolName,
-            });
-            return respondServerError(`Failed to call MCP tool '${mcpToolName}' on Actor '${baseActorName}': ${remoteMcpFailureDetail(outcome.error)}`);
-        case 'success': {
-            // `call-actor` declares `actorRunOutputSchema`, so MCP SDK ≥ 1.11.4 rejects any response
-            // without `structuredContent` (unless `isError: true`) with -32600. The pass-through has no
-            // Apify run, so synthesize a sentinel `RunResponse` matching the schema's `required` keys;
-            // the remote tool's payload still flows through `content`. Also forward `isError` so a
-            // failing remote tool surfaces as a failure here.
-            const isErrorFromRemote = outcome.value.isError === true;
-            return respondRaw({
-                content: outcome.value.content,
-                isError: isErrorFromRemote,
-                structuredContent: {
-                    runId: 'mcp-passthrough',
-                    actorId: baseActorName,
-                    actorName: baseActorName,
-                    status: isErrorFromRemote ? 'FAILED' : 'SUCCEEDED',
-                    storages: {},
-                    summary: `Called MCP tool '${mcpToolName}' on '${baseActorName}'.`,
-                    nextStep: 'Response content carries the remote MCP tool result; no Apify run was started.',
-                },
-            });
-        }
-    }
+/** Rejects removed MCP call syntax before Actor or payment metadata is fetched. */
+export function buildLegacyMcpSyntaxRejection(toolName, actor, loadedToolNames) {
+    if (toolName !== HELPER_TOOLS.ACTOR_CALL && toolName !== HELPER_TOOLS.ACTOR_CALL_WIDGET)
+        return null;
+    if (typeof actor !== 'string' || !MCP_TOOL_NAME_SUFFIX.test(actor))
+        return null;
+    const replacement = loadedToolNames.includes(HELPER_TOOLS.ACTOR_MCP_TOOL_CALL)
+        ? ` Use ${HELPER_TOOLS.ACTOR_MCP_TOOL_CALL} with separate actor and tool arguments.`
+        : ` MCP tools cannot be called in this configuration. To use them, ${getOwnServerRemedy()}`;
+    return respondUserError(`The "actor:tool" syntax is no longer supported by ${toolName}.${replacement}`, {
+        detail: 'legacy MCP call syntax',
+    });
 }
 /**
  * Validates the actor and its input, returning the resolved actor tool or an error response.
@@ -420,29 +368,25 @@ export async function resolveAndValidateActor(params) {
     return { actor };
 }
 /**
- * Performs the pre-execution checks common to both modes:
- * - Parses args
- * - Resolves actor/MCP context
- * - Handles payment provider restrictions
- * - Handles MCP tool calls
- *
- * Returns either an early response (error or MCP tool result) or the parsed context for mode-specific execution.
+ * Performs the pre-execution checks common to both modes: parses args and rejects an Actor that `call-actor`
+ * cannot run (a standby Actor with neither an MCP server nor an input schema, or an MCP server).
  *
- * Applies the same `actor` string normalization as `getActorsAsTools` **before** MCP URL lookup and routing so
- * clients cannot pass a clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo:
- * e.g. trailing `` ` `` on `apify/rag-web-browser`).
+ * Applies the same `actor` string normalization as `getActorsAsTools` **before** routing so clients cannot pass a
+ * clean-enough id for definition fetch but a dirty id to `apifyClient.actor()` (see Mezmo: e.g. trailing `` ` ``
+ * on `apify/rag-web-browser`).
  */
 export async function callActorPreExecute(toolArgs, options) {
     const { args, apifyToken, mcpSessionId, loadedToolNames } = toolArgs;
     const parsedArgs = callActorArgs.parse(args);
+    const legacyRejection = buildLegacyMcpSyntaxRejection(options.route, parsedArgs.actor, loadedToolNames);
+    if (legacyRejection)
+        return { earlyResponse: legacyRejection };
     const actorName = fixActorNameInputAndLog(parsedArgs.actor, { mcpSessionId, route: options.route });
-    const parsed = { ...parsedArgs, actor: actorName };
-    const { baseActorName, mcpToolName } = resolveActorContext(parsed.actor);
     // For definition resolution we always use a token-based client; payment provider is only for actual Actor runs.
     // Standby/MCP-server Actors under a third-party payment provider are rejected upstream by
     // `checkPaymentProviderStandbyConflict` — see src/mcp/tool_call_engine.ts.
     const apifyClientForDefinition = new ApifyClient({ token: apifyToken });
-    const resolution = await getActorToolResolutionCached(baseActorName, apifyClientForDefinition);
+    const resolution = await getActorToolResolutionCached(actorName, apifyClientForDefinition);
     if ((resolution === null || resolution === void 0 ? void 0 : resolution.toolMode) === ACTOR_TOOL_MODE.SERVER_ACTOR_WITHOUT_MCP) {
         const error = ActorLoadError.serverActorWithoutMcpNotSupported(resolution.actorFullName);
         if (resolution.interfaces.server && loadedToolNames.includes(HELPER_TOOLS.ACTOR_SERVER_REQUEST)) {
@@ -452,40 +396,10 @@ export async function callActorPreExecute(toolArgs, options) {
             earlyResponse: respondStandbyRejection(error, { mcpSessionId }),
         };
     }
-    const isActorMcpServer = (resolution === null || resolution === void 0 ? void 0 : resolution.toolMode) === ACTOR_TOOL_MODE.MCP;
-    // Handle the case where LLM does not respect instructions when calling MCP server Actors
-    // and does not provide the tool name.
-    const isMcpToolNameInvalid = mcpToolName === undefined || mcpToolName.trim().length === 0;
-    if (isActorMcpServer && isMcpToolNameInvalid) {
-        return {
-            earlyResponse: respondServerError(CALL_ACTOR_MCP_MISSING_TOOL_NAME_MSG),
-        };
+    if ((resolution === null || resolution === void 0 ? void 0 : resolution.toolMode) === ACTOR_TOOL_MODE.MCP) {
+        return { earlyResponse: respondMcpServerActor(resolution.actorFullName, options.route, loadedToolNames) };
     }
-    // A `:toolName` suffix only means anything for an MCP-server Actor; every other mode is a dead end.
-    if (mcpToolName) {
-        if (resolution === null) {
-            return { earlyResponse: respondActorNotFound(baseActorName, loadedToolNames) };
-        }
-        if (resolution.toolMode !== ACTOR_TOOL_MODE.MCP) {
-            return {
-                earlyResponse: respondUserError(`Actor '${resolution.actorFullName}' is not an MCP server.`, {
-                    detail: 'tool name given for a non-MCP Actor',
-                }),
-            };
-        }
-        return {
-            earlyResponse: await handleMcpToolCall({
-                baseActorName,
-                mcpToolName,
-                input: parsed.input,
-                mcpServerUrl: resolution.mcpServerUrl,
-                apifyToken,
-                mcpSessionId,
-                signal: toolArgs.signal,
-            }),
-        };
-    }
-    return { parsed, baseActorName, mcpToolName };
+    return { parsed: { ...parsedArgs, actor: actorName } };
 }
 /**
  * Shared start-then-wait flow for call-actor variants (default + apps).
@@ -496,8 +410,8 @@ export async function executeCallActor(toolArgs) {
     if ('earlyResponse' in preResult) {
         return preResult.earlyResponse;
     }
-    const { parsed, baseActorName } = preResult;
-    const { input, callOptions } = parsed;
+    const { parsed } = preResult;
+    const { actor: actorName, input, callOptions } = parsed;
     // Task mode waits until terminal (waitSecs=undefined uses SDK default ~999999s); caller's waitSecs is ignored.
     // Non-task mode: pass waitSecs so the SDK blocks up to that many seconds before returning.
     const waitSecs = toolArgs.taskMode ? undefined : parsed.waitSecs;
@@ -505,7 +419,7 @@ export async function executeCallActor(toolArgs) {
     let resolvedInputSchema;
     try {
         const resolution = await resolveAndValidateActor({
-            actorName: baseActorName,
+            actorName,
             input: input,
             toolArgs,
         });
@@ -518,9 +432,9 @@ export async function executeCallActor(toolArgs) {
         const abortSignal = toolArgs.signal;
         if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)
             return respondAborted();
-        const actorRun = await apifyClient.actor(baseActorName).start(input, callOptions);
+        const actorRun = await apifyClient.actor(actorName).start(input, callOptions);
         log.debug('Started Actor run', {
-            actorName: baseActorName,
+            actorName,
             runId: actorRun.id,
             mcpSessionId: toolArgs.mcpSessionId,
             waitSecs,
@@ -533,13 +447,13 @@ export async function executeCallActor(toolArgs) {
         const linkContext = await getConsoleLinkContext(toolArgs.apifyToken, apifyClient);
         // waitSecs:0 means "fire and forget" — start() already returned the full run, skip re-fetch.
         if (waitSecs === 0) {
-            const response = buildStartRunResponse({ actorName: baseActorName, actorRun, linkContext });
+            const response = buildStartRunResponse({ actorName, actorRun, linkContext });
             return { ...response, toolTelemetry: { actorId: resolvedActorId } };
         }
         const fetchResult = await fetchActorRunData({
             runId: actorRun.id,
             waitSecs,
-            actorName: baseActorName,
+            actorName,
             client: apifyClient,
             progressTracker: toolArgs.progressTracker,
             abortSignal,
@@ -557,7 +471,7 @@ export async function executeCallActor(toolArgs) {
     }
     catch (error) {
         return buildCallActorErrorResponse({
-            actorName: baseActorName,
+            actorName,
             error,
             actorId: resolvedActorId,
             mcpSessionId: toolArgs.mcpSessionId,