@apify/actors-mcp-server 0.10.5-beta.6 → 0.10.5-beta.8

package/dist/tools/core/actor_tools_factory.js

@@ -7,11 +7,31 @@ import { actorDefinitionPrunedCache } from '../../state.js';
 import { ajv } from '../../utils/ajv.js';
 import { logHttpError } from '../../utils/logging.js';
 import { getActorDefinition } from '../build.js';
-import { buildEnrichedCallActorOutputSchema, callActorOutputSchema } from '../structured_output_schemas.js';
+import { buildEnrichedDirectActorOutputSchema, getActorRunOutputSchema } from '../structured_output_schemas.js';
 import { actorNameToToolName, buildActorInputSchema, fixedAjvCompile, isActorInfoMcpServer } from '../utils.js';
+import { CALL_ACTOR_WAIT_SECS_DEFAULT, WAIT_SECS_MAX } from './actor_run_response.js';
 /**
- * Enriches actor tool output schemas with field-level detail from the ActorStore.
- * Uses Promise.allSettled to ensure individual failures don't block other tools.
+ * MCP-only opt-in injected next to the Actor's own input fields. Same contract as `call-actor`'s
+ * `waitSecs`: default 30, max 45. If the Actor's own input schema happens to declare `waitSecs`,
+ * this property overrides it — the field is reserved for the MCP server's wait control.
+ */
+const WAIT_SECS_INPUT_PROPERTY = {
+    type: 'integer',
+    minimum: 0,
+    maximum: WAIT_SECS_MAX,
+    default: CALL_ACTOR_WAIT_SECS_DEFAULT,
+    description: `Max seconds (0–45, default ${CALL_ACTOR_WAIT_SECS_DEFAULT}) to cap the wait for the Actor run to reach terminal state. `
+        + 'For long-running Actors the response returns at the cap with the current run status; '
+        + `follow \`nextStep\` to poll via ${HelperTools.ACTOR_RUNS_GET}. Set to 0 to fire-and-forget.`,
+};
+/**
+ * For each direct actor tool with a known historical item schema, replaces the generic
+ * `getActorRunOutputSchema` with a per-tool variant that declares
+ * `storages.datasets.default.itemsSchema` — letting an LLM plan field projection from
+ * `tools/list` alone, before any call.
+ *
+ * Uses `Promise.allSettled` so a single store failure doesn't block other tools. Individual
+ * misses (null / empty properties / thrown errors) leave the tool on the generic schema.
  */
 export async function enrichActorToolOutputSchemas(tools, actorStore) {
     const enrichPromises = tools
@@ -21,13 +41,17 @@ export async function enrichActorToolOutputSchemas(tools, actorStore) {
             const itemProperties = await actorStore.getActorOutputSchema(tool.actorFullName);
             if (itemProperties && Object.keys(itemProperties).length > 0) {
                 // eslint-disable-next-line no-param-reassign
-                tool.outputSchema = buildEnrichedCallActorOutputSchema(itemProperties);
+                tool.outputSchema = buildEnrichedDirectActorOutputSchema(itemProperties);
+                // Stash the raw properties so the executor can mirror them into
+                // `structuredContent.storages.datasets.default.itemsSchema` at runtime.
+                // eslint-disable-next-line no-param-reassign
+                tool.datasetItemsSchema = itemProperties;
             }
         }
         catch (error) {
             log.debug('Failed to enrich output schema for Actor', {
                 actorName: tool.actorFullName,
-                error: error instanceof Error ? error.message : String(error),
+                errMessage: error instanceof Error ? error.message : String(error),
             });
         }
     });
@@ -51,11 +75,11 @@ export async function enrichActorToolOutputSchemas(tools, actorStore) {
  * 5. Enums are added to descriptions with examples using addEnumsToDescriptionsWithExamples()
  *
  * @param {ActorInfo[]} actorsInfo - An array of ActorInfo objects with webServerMcpPath, definition, and Actor.
- * @param options - Optional settings: mcpSessionId for telemetry correlation, actorStore for caching.
+ * @param options - Optional settings: mcpSessionId for telemetry correlation, actorStore for per-Actor itemsSchema enrichment.
  * @returns {Promise<ToolEntry[]>} - A promise that resolves to an array of MCP tools.
  */
 export async function getNormalActorsAsTools(actorsInfo, options) {
-    var _a;
+    var _a, _b;
     const { mcpSessionId, actorStore } = options !== null && options !== void 0 ? options : {};
     const tools = [];
     for (const actorInfo of actorsInfo) {
@@ -64,13 +88,19 @@ export async function getNormalActorsAsTools(actorsInfo, options) {
             continue;
         const isRag = definition.actorFullName === RAG_WEB_BROWSER;
         const { inputSchema } = buildActorInputSchema(definition.actorFullName, definition.input, isRag);
+        // Inject the MCP-only `waitSecs` opt-in before AJV compile so the LLM can cap the wait.
+        const inputSchemaWithWaitSecs = inputSchema;
+        inputSchemaWithWaitSecs.properties = {
+            ...((_a = inputSchemaWithWaitSecs.properties) !== null && _a !== void 0 ? _a : {}),
+            waitSecs: WAIT_SECS_INPUT_PROPERTY,
+        };
         let description = `This tool calls the Actor "${definition.actorFullName}" and retrieves its output results.
 Use this tool instead of the "${HelperTools.ACTOR_CALL}" if user requests this specific Actor.
 Actor description: ${definition.description}`;
         if (isRag) {
             description += RAG_WEB_BROWSER_ADDITIONAL_DESC;
         }
-        const memoryMbytes = Math.min(((_a = definition.defaultRunOptions) === null || _a === void 0 ? void 0 : _a.memoryMbytes) || ACTOR_MAX_MEMORY_MBYTES, ACTOR_MAX_MEMORY_MBYTES);
+        const memoryMbytes = Math.min(((_b = definition.defaultRunOptions) === null || _b === void 0 ? void 0 : _b.memoryMbytes) || ACTOR_MAX_MEMORY_MBYTES, ACTOR_MAX_MEMORY_MBYTES);
         let ajvValidate;
         try {
             // Unknown properties are silently stripped by AJV's removeAdditional option.
@@ -93,8 +123,8 @@ Actor description: ${definition.description}`;
             actorFullName: definition.actorFullName,
             description,
             inputSchema: inputSchema,
-            // reuse the common output schema
-            outputSchema: callActorOutputSchema,
+            // Canonical RunResponse shape — same as call-actor and get-actor-run.
+            outputSchema: getActorRunOutputSchema,
             ajvValidate,
             paymentRequired: true,
             memoryMbytes,
@@ -113,7 +143,6 @@ Actor description: ${definition.description}`;
             },
         });
     }
-    // Enrich output schemas with field-level detail if actorStore is available
     if (actorStore) {
         await enrichActorToolOutputSchemas(tools, actorStore);
     }

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

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

package/dist/tools/core/call_actor_common.d.ts

@@ -11,56 +11,31 @@ export declare const CALL_ACTOR_MCP_SERVER_SECTION = "For MCP server Actors:\n-
 export declare const CALL_ACTOR_USAGE_SECTION: 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 CallActorDescriptionParams = {
-    actorGetDetailsTool: HelperTools.ACTOR_GET_DETAILS;
-    alwaysAsync: boolean;
-};
-type StartedActorRun = {
-    id: string;
-    status: string;
-    startedAt?: Date;
-};
-type StartAsyncResponseResult = {
-    content: {
-        type: 'text';
-        text: string;
-    }[];
-    structuredContent: {
-        runId: string;
-        actorName: string;
-        status: string;
-        startedAt: string;
-        input: Record<string, unknown>;
-    };
-    _meta?: Record<string, unknown>;
-};
 type CallActorErrorResponseParams = {
     actorName: string;
     error: unknown;
     actorId?: string;
-    isAsync: boolean;
     mcpSessionId?: string;
     actorGetDetailsTool: HelperTools.ACTOR_GET_DETAILS;
 };
-export declare function buildCallActorDescription(params: CallActorDescriptionParams): string;
-export declare function buildStartAsyncResponse(params: {
-    actorName: string;
-    actorRun: StartedActorRun;
-    input: Record<string, unknown>;
-    widget: boolean;
-}): StartAsyncResponseResult;
+export declare function buildCallActorDescription(): string;
+export declare function buildCallActorAppsDescription(): string;
 export declare function isPermissionApprovalError(error: unknown): error is ApifyApiError;
 /** Exported for native actor tool error handling in server.ts — no logging, no telemetry. */
 export declare function buildPermissionApprovalResponse(error: ApifyApiError): ReturnType<typeof buildMCPResponse>;
 export declare function buildCallActorErrorResponse(params: CallActorErrorResponseParams): ReturnType<typeof buildMCPResponse>;
-/**
- * Zod schema for call-actor arguments — shared between default and apps variants.
- */
+export declare const callOptionsSchema: z.ZodObject<{
+    memory: z.ZodOptional<z.ZodNumber>;
+    timeout: z.ZodOptional<z.ZodNumber>;
+    build: z.ZodOptional<z.ZodString>;
+    maxItems: z.ZodOptional<z.ZodNumber>;
+    maxTotalChargeUsd: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
+/** Zod schema for call-actor arguments — shared between default and apps variants. */
 export declare const callActorArgs: z.ZodObject<{
     actor: z.ZodString;
     input: z.ZodObject<{}, z.core.$loose>;
-    async: z.ZodOptional<z.ZodBoolean>;
-    previewOutput: z.ZodOptional<z.ZodBoolean>;
+    waitSecs: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
     callOptions: z.ZodOptional<z.ZodObject<{
         memory: z.ZodOptional<z.ZodNumber>;
         timeout: z.ZodOptional<z.ZodNumber>;
@@ -69,9 +44,6 @@ export declare const callActorArgs: z.ZodObject<{
         maxTotalChargeUsd: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-/**
- * Compiled AJV input schema — shared between both variants.
- */
 export declare const callActorInputSchema: ToolInputSchema;
 export declare const callActorAjvValidate: import("ajv").ValidateFunction<unknown>;
 /**
@@ -134,5 +106,10 @@ export declare function callActorPreExecute(toolArgs: InternalToolArgs, options:
     baseActorName: string;
     mcpToolName: string | undefined;
 }>;
+/**
+ * Shared start-then-wait flow for call-actor variants (default + apps).
+ * `taskMode` is honored — when true, `waitSecs` is ignored and the SDK waits until terminal.
+ */
+export declare function executeCallActor(toolArgs: InternalToolArgs): Promise<object>;
 export {};
 //# sourceMappingURL=call_actor_common.d.ts.map

package/dist/tools/core/call_actor_common.d.ts.map

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

package/dist/tools/core/call_actor_common.js

@@ -5,7 +5,6 @@ import log from '@apify/log';
 import { ApifyClient } from '../../apify_client.js';
 import { APIFY_ERROR_TYPE_FULL_PERMISSION_NOT_APPROVED, APIFY_ERROR_TYPE_MEMORY_LIMIT_EXCEEDED, FAILURE_CATEGORY, HelperTools, TOOL_STATUS, } from '../../const.js';
 import { connectMCPClient } from '../../mcp/client.js';
-import { getWidgetConfig, WIDGET_URIS } from '../../resources/widgets.js';
 import { getActorMcpUrlCached } from '../../utils/actor.js';
 import { compileSchema } from '../../utils/ajv.js';
 import { getHttpStatusCode, logHttpError } from '../../utils/logging.js';
@@ -13,7 +12,9 @@ import { buildMCPResponse } from '../../utils/mcp.js';
 import { classifyFailureCategory, extractAjvErrorDetails, getToolStatusFromError } from '../../utils/tool_status.js';
 import { extractActorId } from '../../utils/tools.js';
 import { actorNameToToolName } from '../utils.js';
+import { abortRunOnSignal, buildStartRunResponse, CALL_ACTOR_WAIT_SECS_DEFAULT, fetchActorRunData } from './actor_run_response.js';
 import { fixActorNameInputAndLog, getActorsAsTools } from './actor_tools_factory.js';
+import { buildGetActorRunSuccessResponse } from './get_actor_run_common.js';
 // ---------------------------------------------------------------------------
 // Shared call-actor description building blocks
 // ---------------------------------------------------------------------------
@@ -34,88 +35,43 @@ USAGE:
 /** Shared examples section — identical in both modes. */
 export const CALL_ACTOR_EXAMPLES_SECTION = `EXAMPLES:
 - user_input: Get instagram posts using apify/instagram-scraper`;
-export function buildCallActorDescription(params) {
-    const { actorGetDetailsTool, alwaysAsync } = params;
-    const sections = [];
-    sections.push('Call any Actor from the Apify Store.');
-    sections.push(dedent `
-        WORKFLOW:
-        1. Use ${actorGetDetailsTool} to get the Actor's input schema
-        2. Call this tool with the actor name and proper input based on the schema
+const WIDGET_ADDENDUM = dedent `
+    WIDGET ALTERNATIVE (apps mode):
+    - If the user explicitly asks to see live progress, call ${HelperTools.ACTOR_CALL_WIDGET} instead — it renders an interactive UI that tracks the run.
+    - For silent name resolution before this call, use ${HelperTools.STORE_SEARCH} (not ${HelperTools.STORE_SEARCH_WIDGET}, which renders UI).
+`;
+function buildCallActorDescriptionSections(includeWidget) {
+    const sections = [
+        'Call any Actor from the Apify Store.',
+        dedent `
+            WORKFLOW:
+            1. Use ${HelperTools.ACTOR_GET_DETAILS} to get the Actor's input schema
+            2. Call this tool with the actor name and proper input based on the schema
 
-        If the actor name is not in "username/name" format and ${HelperTools.STORE_SEARCH} is available in this session, use it to resolve the correct Actor first.
-    `);
-    sections.push(CALL_ACTOR_MCP_SERVER_SECTION);
-    if (alwaysAsync) {
-        sections.push(dedent `
+            If the actor name is not in "username/name" format and ${HelperTools.STORE_SEARCH} is available in this session, use it to resolve the correct Actor first.
+        `,
+        CALL_ACTOR_MCP_SERVER_SECTION,
+        dedent `
             IMPORTANT:
-            - This tool always runs asynchronously — it starts the Actor and returns immediately with a runId. It renders no UI.
-            - For a live progress widget the user can watch, call ${HelperTools.ACTOR_CALL_WIDGET} instead.
-            - To check status or wait for completion, poll ${HelperTools.ACTOR_RUNS_GET} with the runId.
-            - Once the run completes, use ${HelperTools.ACTOR_OUTPUT_GET} tool with the datasetId to fetch full results.
-            - If the Actor name needs resolving first, use ${HelperTools.STORE_SEARCH} (silent). Do NOT use ${HelperTools.STORE_SEARCH_WIDGET} for name resolution.
+            - Waits up to waitSecs (default 30s) for completion; returns run status, storage IDs, and field metadata
+            - Use ${HelperTools.DATASET_GET_ITEMS} with the datasetId to fetch results; non-terminal runs include a nextStep with polling instructions
             - Use dedicated Actor tools when available for better experience
-        `);
-    }
-    else {
-        sections.push(dedent `
-            IMPORTANT:
-            - Typically returns a datasetId and preview of output items
-            - Use ${HelperTools.ACTOR_OUTPUT_GET} tool with the datasetId to fetch full results
-            - Use dedicated Actor tools when available for better experience
-        `);
-    }
-    sections.push(CALL_ACTOR_USAGE_SECTION);
-    if (!alwaysAsync) {
-        sections.push(dedent `
-            - This tool supports async execution via the \`async\` parameter:
-              - **When \`async: false\` or not provided** (default): Waits for completion and returns results immediately with dataset preview. Use this whenever the user asks for data or results.
-              - **When \`async: true\`**: Starts the run and returns immediately with runId. Only use this when the user explicitly asks to run the Actor in the background or does not need immediate results.
-        `);
-    }
-    sections.push(CALL_ACTOR_EXAMPLES_SECTION);
+        `,
+        CALL_ACTOR_USAGE_SECTION,
+        dedent `
+            - Use \`waitSecs\` (0–45) to control how long to wait. Default 30s returns results for fast actors. Use \`waitSecs: 0\` to start and return immediately for long-running actors.
+        `,
+        CALL_ACTOR_EXAMPLES_SECTION,
+    ];
+    if (includeWidget)
+        sections.push(WIDGET_ADDENDUM);
     return sections.join('\n\n');
 }
-export function buildStartAsyncResponse(params) {
-    var _a;
-    const { actorName, actorRun, input, widget } = params;
-    const structuredContent = {
-        runId: actorRun.id,
-        actorName,
-        status: actorRun.status,
-        startedAt: ((_a = actorRun.startedAt) === null || _a === void 0 ? void 0 : _a.toISOString()) || '',
-        input,
-    };
-    if (!widget) {
-        return {
-            content: [{
-                    type: 'text',
-                    text: `Started Actor "${actorName}" (Run ID: ${actorRun.id}).`,
-                }],
-            structuredContent,
-        };
-    }
-    const responseText = dedent `
-        Started Actor "${actorName}" (Run ID: ${actorRun.id}).
-
-        A live progress widget has been rendered that automatically tracks this run and refreshes status every few seconds until completion.
-
-        The widget will update the context with run status and datasetId when the run completes. Once complete (or if the user requests results), use ${HelperTools.ACTOR_OUTPUT_GET} with the datasetId to retrieve the output.
-
-        Do NOT proactively poll using ${HelperTools.ACTOR_RUNS_GET}. Wait for the widget state update or user instructions. Ask the user what they would like to do next.
-    `;
-    const widgetConfig = getWidgetConfig(WIDGET_URIS.ACTOR_RUN);
-    return {
-        content: [{
-                type: 'text',
-                text: responseText,
-            }],
-        structuredContent,
-        _meta: {
-            ...widgetConfig === null || widgetConfig === void 0 ? void 0 : widgetConfig.meta,
-            'openai/widgetDescription': `Actor run progress for ${actorName}`,
-        },
-    };
+export function buildCallActorDescription() {
+    return buildCallActorDescriptionSections(false);
+}
+export function buildCallActorAppsDescription() {
+    return buildCallActorDescriptionSections(true);
 }
 export function isPermissionApprovalError(error) {
     return error instanceof ApifyApiError && error.type === APIFY_ERROR_TYPE_FULL_PERMISSION_NOT_APPROVED;
@@ -135,10 +91,10 @@ export function buildPermissionApprovalResponse(error) {
         isError: true,
     });
 }
-function buildPermissionApprovalErrorResponse(actorName, error, actorId, logContext) {
+function buildPermissionApprovalErrorResponse(actorName, error, actorId, mcpSessionId) {
     logHttpError(error, 'Failed to call Actor — permission approval required', {
         actorName,
-        ...logContext,
+        mcpSessionId,
         failureCategory: FAILURE_CATEGORY.PERMISSION_APPROVAL_REQUIRED,
     });
     return {
@@ -153,15 +109,14 @@ function buildPermissionApprovalErrorResponse(actorName, error, actorId, logCont
     };
 }
 export function buildCallActorErrorResponse(params) {
-    const { actorName, error, actorId, isAsync, mcpSessionId, actorGetDetailsTool, } = params;
+    const { actorName, error, actorId, mcpSessionId, actorGetDetailsTool, } = params;
     if (error instanceof ApifyApiError && error.type === APIFY_ERROR_TYPE_FULL_PERMISSION_NOT_APPROVED) {
-        return buildPermissionApprovalErrorResponse(actorName, error, actorId, { async: isAsync, mcpSessionId });
+        return buildPermissionApprovalErrorResponse(actorName, error, actorId, mcpSessionId);
     }
     const errMsg = error instanceof Error ? error.message : String(error);
     const failureCategory = classifyFailureCategory(error);
     logHttpError(error, 'Failed to call Actor', {
         actorName,
-        async: isAsync,
         mcpSessionId,
         failureCategory,
     });
@@ -195,9 +150,42 @@ export function buildCallActorErrorResponse(params) {
         telemetry,
     });
 }
-/**
- * Zod schema for call-actor arguments — shared between default and apps variants.
- */
+export const callOptionsSchema = z.object({
+    memory: z.number()
+        .min(128, 'Memory must be at least 128 MB')
+        .max(32768, 'Memory cannot exceed 32 GB (32768 MB)')
+        .optional()
+        .describe(dedent `
+            Memory per run in MB. Power of 2 from 128 to 32768.
+            Apify also caps total memory across all your concurrent runs (account plan limit); if a run is rejected because that quota would be exceeded, retry with a smaller value.
+        `),
+    timeout: z.number()
+        .min(0, 'Timeout must be 0 or greater')
+        .optional()
+        .describe(dedent `
+            Maximum runtime for the Actor in seconds. After this time elapses, the Actor will be automatically terminated.
+            Use 0 for infinite timeout (no time limit).
+        `),
+    build: z.string()
+        .optional()
+        .describe('Tag or number of the Actor build to run (e.g., "latest", "beta", "1.2.345"). If omitted, the Actor\'s default build is used.'),
+    maxItems: z.number()
+        .int()
+        .positive()
+        .optional()
+        .describe(dedent `
+            Pay-per-result Actors only — ignored otherwise.
+            Caps billed dataset items; does NOT limit production. Prefer the Actor's own input fields (e.g. maxResults) to bound work.
+        `),
+    maxTotalChargeUsd: z.number()
+        .positive()
+        .optional()
+        .describe(dedent `
+            Pay-per-event Actors only — ignored otherwise.
+            Caps total USD billed; does NOT limit work. Prefer the Actor's own input fields to bound work.
+        `),
+});
+/** Zod schema for call-actor arguments — shared between default and apps variants. */
 export const callActorArgs = z.object({
     actor: z.string()
         .describe(dedent `
@@ -207,62 +195,17 @@ export const callActorArgs = z.object({
         `),
     input: z.object({}).passthrough()
         .describe('The input JSON to pass to the Actor. Required.'),
-    async: z.boolean()
-        .optional()
-        .describe(dedent `
-            When true, starts the run and returns immediately with runId.
-            When false or omitted, behavior depends on the active server mode/tool variant.
-            IMPORTANT: use async=true only when the user explicitly asks to run in the background or does not need immediate results.
-        `),
-    previewOutput: z.boolean()
+    waitSecs: z.number()
+        .int()
+        .min(0, 'waitSecs must be 0 or greater')
+        .max(45, 'waitSecs cannot exceed 45')
+        .default(CALL_ACTOR_WAIT_SECS_DEFAULT)
         .optional()
-        .describe(dedent `
-            When true (default): includes preview items. When false: metadata only (reduces context).
-            Use when fetching fields via get-actor-output.`),
-    callOptions: z.object({
-        memory: z.number()
-            .min(128, 'Memory must be at least 128 MB')
-            .max(32768, 'Memory cannot exceed 32 GB (32768 MB)')
-            .optional()
-            .describe(dedent `
-                Memory per run in MB. Power of 2 from 128 to 32768.
-                Apify also caps total memory across all your concurrent runs (account plan limit); if a run is rejected because that quota would be exceeded, retry with a smaller value.
-            `),
-        timeout: z.number()
-            .min(0, 'Timeout must be 0 or greater')
-            .optional()
-            .describe(dedent `
-                Maximum runtime for the Actor in seconds. After this time elapses, the Actor will be automatically terminated.
-                Use 0 for infinite timeout (no time limit). Minimum: 0 seconds (infinite).
-            `),
-        build: z.string()
-            .optional()
-            .describe('Tag or number of the Actor build to run (e.g., "latest", "beta", "1.2.345"). If omitted, the Actor\'s default build is used.'),
-        maxItems: z.number()
-            .int()
-            .positive()
-            .optional()
-            .describe(dedent `
-                Pay-per-result Actors ONLY — has no effect on any other pricing model (pay-per-event, pay-per-usage, rental, free).
-                Caps the number of dataset items billed for this run; does NOT limit how many items the Actor produces.
-                Most Actors also expose their own input field (e.g. "maxResults", "maxPages", "maxItems") to bound how much work they do — prefer those when limiting actual output, since this option only caps billing.
-            `),
-        maxTotalChargeUsd: z.number()
-            .positive()
-            .optional()
-            .describe(dedent `
-                Pay-per-event Actors ONLY — has no effect on any other pricing model (pay-per-result, pay-per-usage, rental, free).
-                Caps the total USD billed for this run; does NOT limit how much work the Actor does.
-                Most Actors also expose their own input field to bound work — prefer those when limiting actual output, since this option only caps billing.
-            `),
-    }).optional()
-        .describe('Optional call options for the Actor run configuration.'),
+        .describe('Seconds to wait for completion (0–45, default 30). Returns with current run status if not terminal within waitSecs.'),
+    callOptions: callOptionsSchema.optional()
+        .describe('Optional run config: memory (MB), timeout (s), build, maxItems (pay-per-result cap), maxTotalChargeUsd (pay-per-event cap).'),
 });
-/**
- * Compiled AJV input schema — shared between both variants.
- */
 export const callActorInputSchema = z.toJSONSchema(callActorArgs);
-// Allow additional properties for dynamic Actor input fields passed via the `input` object
 export const callActorAjvValidate = compileSchema({ ...z.toJSONSchema(callActorArgs), additionalProperties: true });
 /**
  * Resolves MCP URL and parses the "actor:tool" format.
@@ -309,7 +252,25 @@ export async function handleMcpToolCall(params) {
             name: mcpToolName,
             arguments: input,
         });
-        return { content: result.content };
+        // `call-actor` declares `getActorRunOutputSchema`, 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 = result.isError === true;
+        return {
+            content: result.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.',
+            },
+        };
     }
     catch (error) {
         logHttpError(error, `Failed to call MCP tool '${mcpToolName}' on Actor '${baseActorName}'`, {
@@ -477,4 +438,74 @@ export async function callActorPreExecute(toolArgs, options) {
     }
     return { parsed, baseActorName, mcpToolName };
 }
+/**
+ * Shared start-then-wait flow for call-actor variants (default + apps).
+ * `taskMode` is honored — when true, `waitSecs` is ignored and the SDK waits until terminal.
+ */
+export async function executeCallActor(toolArgs) {
+    const preResult = await callActorPreExecute(toolArgs, { route: HelperTools.ACTOR_CALL });
+    if ('earlyResponse' in preResult) {
+        return preResult.earlyResponse;
+    }
+    const { parsed, baseActorName } = preResult;
+    const { 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;
+    let resolvedActorId;
+    try {
+        const resolution = await resolveAndValidateActor({
+            actorName: baseActorName,
+            input: input,
+            toolArgs,
+        });
+        if ('error' in resolution) {
+            return resolution.error;
+        }
+        resolvedActorId = extractActorId(resolution.actor);
+        const { apifyClient } = toolArgs;
+        const abortSignal = toolArgs.extra.signal;
+        if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)
+            return {};
+        const actorRun = await apifyClient.actor(baseActorName).start(input, callOptions);
+        log.debug('Started Actor run', { actorName: baseActorName, runId: actorRun.id, mcpSessionId: toolArgs.mcpSessionId, waitSecs });
+        // Abort can arrive while start() was in flight — abort the newly created run.
+        if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+            await abortRunOnSignal(actorRun.id, apifyClient);
+            return {};
+        }
+        // waitSecs:0 means "fire and forget" — start() already returned the full run, skip re-fetch.
+        if (waitSecs === 0) {
+            const response = buildStartRunResponse({ actorName: baseActorName, actorRun });
+            return { ...response, toolTelemetry: { actorId: resolvedActorId } };
+        }
+        const fetchResult = await fetchActorRunData({
+            runId: actorRun.id,
+            waitSecs,
+            actorName: baseActorName,
+            client: apifyClient,
+            progressTracker: toolArgs.progressTracker,
+            abortSignal,
+            mcpSessionId: toolArgs.mcpSessionId,
+            onAbort: abortRunOnSignal,
+        });
+        if ('aborted' in fetchResult)
+            return {};
+        if ('error' in fetchResult)
+            return fetchResult.error;
+        return {
+            ...buildGetActorRunSuccessResponse({ ...fetchResult.result, widget: false }),
+            toolTelemetry: { actorId: resolvedActorId },
+        };
+    }
+    catch (error) {
+        return buildCallActorErrorResponse({
+            actorName: baseActorName,
+            error,
+            actorId: resolvedActorId,
+            mcpSessionId: toolArgs.mcpSessionId,
+            actorGetDetailsTool: HelperTools.ACTOR_GET_DETAILS,
+        });
+    }
+}
 //# sourceMappingURL=call_actor_common.js.map