Merge remote-tracking branch 'origin/master' into fix/code-improvements

Author: MQ37

.actor/ACTOR.md

@@ -1,7 +1,6 @@
 # Apify Model Context Protocol (MCP) Server
 
 [![Actors MCP Server](https://apify.com/actor-badge?actor=apify/actors-mcp-server)](https://apify.com/apify/actors-mcp-server)
-[![smithery badge](https://smithery.ai/badge/@apify/actors-mcp-server)](https://smithery.ai/server/@apify/actors-mcp-server)
 
 Implementation of an MCP server for all [Apify Actors](https://apify.com/store).
 This server enables interaction with one or more Apify Actors that can be defined in the MCP Server configuration.

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file.
 
+<!-- git-cliff-unreleased-start -->
+## 0.1.29 - **not yet released**
+
+### 🐛 Bug Fixes
+
+- Add tool call timeout ([#93](https://github.com/apify/actors-mcp-server/pull/93)) ([409ad50](https://github.com/apify/actors-mcp-server/commit/409ad50569e5bd2e3dff950c11523a8440a98034)) by [@MQ37](https://github.com/MQ37)
+
+
+<!-- git-cliff-unreleased-end -->
+## [0.1.28](https://github.com/apify/actors-mcp-server/releases/tag/v0.1.28) (2025-04-22)
+
+### 🐛 Bug Fixes
+
+- Default actors not loaded ([#94](https://github.com/apify/actors-mcp-server/pull/94)) ([fde4c3b](https://github.com/apify/actors-mcp-server/commit/fde4c3b0d66195439d2677d0ac33a08bc77b84cd)) by [@jirispilka](https://github.com/jirispilka)
+
+
+## [0.1.27](https://github.com/apify/actors-mcp-server/releases/tag/v0.1.27) (2025-04-22)
+
+### 🐛 Bug Fixes
+
+- Move logic to enableAddingActors and enableDefaultActors to constructor ([#90](https://github.com/apify/actors-mcp-server/pull/90)) ([0f44740](https://github.com/apify/actors-mcp-server/commit/0f44740ed3c34a15d938133ac30254afe5d81c57)) by [@jirispilka](https://github.com/jirispilka)
+
+
+## [0.1.26](https://github.com/apify/actors-mcp-server/releases/tag/v0.1.26) (2025-04-22)
+
+### 🐛 Bug Fixes
+
+- Readme smithery ([#92](https://github.com/apify/actors-mcp-server/pull/92)) ([e585cf3](https://github.com/apify/actors-mcp-server/commit/e585cf394a16aa9891428106d91c443ce9791001)) by [@jirispilka](https://github.com/jirispilka)
+
+
 ## [0.1.25](https://github.com/apify/actors-mcp-server/releases/tag/v0.1.25) (2025-04-21)
 
 ### 🐛 Bug Fixes

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@apify/actors-mcp-server",
-  "version": "0.1.25",
+  "version": "0.1.29",
   "type": "module",
   "description": "Model Context Protocol Server for Apify",
   "engines": {

package.json

@@ -13,6 +13,7 @@ import log from '@apify/log';
 
 import { type ActorsMcpServer } from '../mcp/server.js';
 import { processParamsGetTools } from '../mcp/utils.js';
+import { addTool, removeTool } from '../tools/helpers.js';
 import { getHelpMessage, HEADER_READINESS_PROBE, Routes } from './const.js';
 import { getActorRunData } from './utils.js';
 
@@ -69,7 +70,9 @@ export function createExpressApp(
             const tools = await processParamsGetTools(req.url, process.env.APIFY_TOKEN as string);
             if (tools.length > 0) {
                 mcpServer.updateTools(tools);
-            } else {
+            }
+            // TODO fix this - we should not be loading default tools here or provide more generic way
+            if (tools.length === 2 && tools.includes(addTool) && tools.includes(removeTool)) {
                 // We are loading default Actors (if not specified otherwise), so that we don't have "empty" tools
                 await mcpServer.loadDefaultTools(process.env.APIFY_TOKEN as string);
             }

src/actor/server.ts

@@ -11,14 +11,7 @@ import log from '@apify/log';
 import { createExpressApp } from './actor/server.js';
 import { processInput } from './input.js';
 import { ActorsMcpServer } from './mcp/server.js';
-import {
-    actorDefinitionTool,
-    addTool,
-    callActorGetDataset,
-    getActorsAsTools,
-    removeTool,
-    searchTool,
-} from './tools/index.js';
+import { callActorGetDataset, getActorsAsTools } from './tools/index.js';
 import type { Input } from './types.js';
 
 const STANDBY_MODE = Actor.getEnv().metaOrigin === 'STANDBY';
@@ -33,25 +26,26 @@ if (!process.env.APIFY_TOKEN) {
     process.exit(1);
 }
 
-const mcpServer = new ActorsMcpServer();
-
 const input = processInput((await Actor.getInput<Partial<Input>>()) ?? ({} as Input));
 log.info(`Loaded input: ${JSON.stringify(input)} `);
 
 if (STANDBY_MODE) {
+    const mcpServer = new ActorsMcpServer({
+        enableAddingActors: Boolean(input.enableAddingActors),
+        enableDefaultActors: false,
+    });
+
     const app = createExpressApp(HOST, mcpServer);
     log.info('Actor is running in the STANDBY mode.');
-    // Do not load default Actors here, for mastra.ai template we need to start without default Actors
-    const tools = [searchTool, actorDefinitionTool];
-    if (input.enableAddingActors) {
-        tools.push(addTool, removeTool);
-    }
+
+    // Load only Actors specified in the input
+    // If you wish to start without any Actor, create a task and leave the input empty
     if (input.actors && input.actors.length > 0) {
         const { actors } = input;
         const actorsToLoad = Array.isArray(actors) ? actors : actors.split(',');
-        tools.push(...await getActorsAsTools(actorsToLoad, process.env.APIFY_TOKEN as string));
+        const tools = await getActorsAsTools(actorsToLoad, process.env.APIFY_TOKEN as string);
+        mcpServer.updateTools(tools);
     }
-    mcpServer.updateTools(tools);
     app.listen(PORT, () => {
         log.info(`The Actor web server is listening for user requests at ${HOST}`);
     });

src/main.ts

@@ -1,2 +1,3 @@
 export const MAX_TOOL_NAME_LENGTH = 64;
 export const SERVER_ID_LENGTH = 8;
+export const EXTERNAL_TOOL_CALL_TIMEOUT_MSEC = 120_000; // 2 minutes

src/mcp/const.ts

@@ -5,7 +5,7 @@
 import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { CallToolRequestSchema, CallToolResultSchema, ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js';
 import type { ActorCallOptions } from 'apify-client';
 
 import log from '@apify/log';
@@ -17,20 +17,38 @@ import {
     SERVER_NAME,
     SERVER_VERSION,
 } from '../const.js';
-import { actorDefinitionTool, callActorGetDataset, getActorsAsTools, searchTool } from '../tools/index.js';
+import {
+    actorDefinitionTool,
+    addTool,
+    callActorGetDataset,
+    getActorsAsTools,
+    removeTool,
+    searchTool,
+} from '../tools/index.js';
 import { actorNameToToolName } from '../tools/utils.js';
 import type { ActorMCPTool, ActorTool, HelperTool, ToolWrap } from '../types.js';
 import { createMCPClient } from './client.js';
+import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC } from './const.js';
 import { processParamsGetTools } from './utils.js';
 
+type ActorsMcpServerOptions = {
+    enableAddingActors?: boolean;
+    enableDefaultActors?: boolean;
+};
+
 /**
  * Create Apify MCP server
  */
 export class ActorsMcpServer {
     public readonly server: Server;
     public readonly tools: Map<string, ToolWrap>;
+    private readonly options: ActorsMcpServerOptions;
 
-    constructor() {
+    constructor(options: ActorsMcpServerOptions = {}) {
+        this.options = {
+            enableAddingActors: options.enableAddingActors ?? false,
+            enableDefaultActors: options.enableDefaultActors ?? true, // Default to true for backward compatibility
+        };
         this.server = new Server(
             {
                 name: SERVER_NAME,
@@ -49,10 +67,29 @@ export class ActorsMcpServer {
 
         // Add default tools
         this.updateTools([searchTool, actorDefinitionTool]);
+
+        // Add tools to dynamically load Actors
+        if (this.options.enableAddingActors) {
+            this.loadToolsToAddActors();
+        }
+
+        // Initialize automatically for backward compatibility
+        this.initialize().catch((error) => {
+            log.error('Failed to initialize server:', error);
+        });
+    }
+
+    /**
+     * Initialize the server with default tools if enabled
+     */
+    public async initialize(): Promise<void> {
+        if (this.options.enableDefaultActors) {
+            await this.loadDefaultTools(process.env.APIFY_TOKEN as string);
+        }
     }
 
     /**
-     * Loads missing default tools.
+     * Loads default tools if not already loaded.
      */
     public async loadDefaultTools(apifyToken: string) {
         const missingDefaultTools = defaults.actors.filter((name) => !this.tools.has(actorNameToToolName(name)));
@@ -66,7 +103,7 @@ export class ActorsMcpServer {
     /**
      * Loads tools from URL params.
      *
-     * This method also handles enabling of Actor auto loading via the processParamsGetTools.
+     * This method also handles enabling of Actor autoloading via the processParamsGetTools.
      *
      * Used primarily for SSE.
      */
@@ -78,6 +115,13 @@ export class ActorsMcpServer {
         }
     }
 
+    /**
+     * Add Actors to server dynamically
+     */
+    public loadToolsToAddActors() {
+        this.updateTools([addTool, removeTool]);
+    }
+
     /**
      * Upsert new tools.
      * @param tools - Array of tool wrappers.
@@ -199,6 +243,8 @@ export class ActorsMcpServer {
                         const res = await client.callTool({
                             name: serverTool.originToolName,
                             arguments: args,
+                        }, CallToolResultSchema, {
+                            timeout: EXTERNAL_TOOL_CALL_TIMEOUT_MSEC,
                         });
 
                         return { ...res };

src/mcp/server.ts

@@ -19,7 +19,7 @@ import log from '@apify/log';
 
 import { defaults } from './const.js';
 import { ActorsMcpServer } from './mcp/server.js';
-import { addTool, getActorsAsTools, removeTool } from './tools/index.js';
+import { getActorsAsTools } from './tools/index.js';
 
 // Configure logging, set to ERROR
 log.setLevel(log.LEVELS.ERROR);
@@ -36,7 +36,8 @@ const argv = parser(process.argv.slice(2), {
         'enable-adding-actors': false,
     },
 });
-const { actors = '', enableActorAutoLoading = false } = argv;
+const enableAddingActors = argv['enable-adding-actors'] || argv.enableActorAutoLoading || false;
+const { actors = '' } = argv;
 const actorList = actors ? actors.split(',').map((a: string) => a.trim()) : [];
 
 // Validate environment
@@ -46,12 +47,8 @@ if (!process.env.APIFY_TOKEN) {
 }
 
 async function main() {
-    const mcpServer = new ActorsMcpServer();
-    // Initialize tools
+    const mcpServer = new ActorsMcpServer({ enableAddingActors, enableDefaultActors: false });
     const tools = await getActorsAsTools(actorList.length ? actorList : defaults.actors, process.env.APIFY_TOKEN as string);
-    if (enableActorAutoLoading) {
-        tools.push(addTool, removeTool);
-    }
     mcpServer.updateTools(tools);
 
     // Start server