Merge remote-tracking branch 'origin/master' into feat/cancellable-actor

Author: MichalKalita

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.9](https://github.com/apify/actors-mcp-server/releases/tag/v0.3.9) (2025-08-21)
+
+
+## [0.3.9](https://github.com/apify/actors-mcp-server/releases/tag/v0.3.9) (2025-08-21)
+
+### 🚀 Features
+
+- **dxt:** Add mcp tool configuration options ([#221](https://github.com/apify/actors-mcp-server/pull/221)) ([5b305c5](https://github.com/apify/actors-mcp-server/commit/5b305c5239ae515a966c055b356d0bc3b90ee301)) by [@MQ37](https://github.com/MQ37), closes [#219](https://github.com/apify/actors-mcp-server/issues/219)
+- Prepare for dockerhub integration, prepare dockerfile, add support for reading config from env vars for stdio ([#224](https://github.com/apify/actors-mcp-server/pull/224)) ([08c62be](https://github.com/apify/actors-mcp-server/commit/08c62be284032bc1d5f4ccb25301129fc1ea2c58)) by [@MQ37](https://github.com/MQ37)
+
+### 🐛 Bug Fixes
+
+- Improve beta release cicd ([#202](https://github.com/apify/actors-mcp-server/pull/202)) ([2bd1ad7](https://github.com/apify/actors-mcp-server/commit/2bd1ad74e2aec01d7ae37750846abe3fbf66a4e7)) by [@MQ37](https://github.com/MQ37), closes [#80](https://github.com/apify/actors-mcp-server/issues/80)
+- Actor input transform array items type inference ([#225](https://github.com/apify/actors-mcp-server/pull/225)) ([eb38160](https://github.com/apify/actors-mcp-server/commit/eb381603edd00c82678c89a2fa6aa31720295e99)) by [@MQ37](https://github.com/MQ37), closes [#217](https://github.com/apify/actors-mcp-server/issues/217)
+- Dockerhub init unauth server start and tool list ([#227](https://github.com/apify/actors-mcp-server/pull/227)) ([87b2f2c](https://github.com/apify/actors-mcp-server/commit/87b2f2c470e1bddc92a568e8e826fc2ed8bfc1a9)) by [@MQ37](https://github.com/MQ37)
+- Dxt rename sever to apify-mcp-server ([#232](https://github.com/apify/actors-mcp-server/pull/232)) ([c5e51df](https://github.com/apify/actors-mcp-server/commit/c5e51df79c3a6dd037f114d4aa4bd3ecf7db8641)) by [@MQ37](https://github.com/MQ37)
+
+
 ## [0.3.8](https://github.com/apify/actors-mcp-server/releases/tag/v0.3.8) (2025-08-08)
 
 ### 🐛 Bug Fixes

Dockerfile

@@ -1,6 +1,5 @@
-# Generated by https://smithery.ai. See: https://smithery.ai/docs/config#dockerfile
-# Stage 1: Build the TypeScript project
-FROM node:18-alpine AS builder
+# Stage 1: Build the project
+FROM node:24-alpine AS builder
 
 # Set working directory
 WORKDIR /app
@@ -17,7 +16,7 @@ COPY tsconfig.json ./
 RUN npm run build
 
 # Stage 2: Set up the runtime environment
-FROM node:18-alpine
+FROM node:24-alpine
 
 # Set working directory
 WORKDIR /app
@@ -29,11 +28,5 @@ COPY package.json package-lock.json ./
 # Install production dependencies only
 RUN npm ci --omit=dev
 
-# Expose any necessary ports (example: 3000)
-EXPOSE 3000
-
-# Set the environment variable for the Apify token
-ENV APIFY_TOKEN=<your-apify-token>
-
 # Set the entry point for the container
-ENTRYPOINT ["node", "dist/main.js"]
+ENTRYPOINT ["node", "dist/stdio.js"]

manifest.json

@@ -1,7 +1,7 @@
 {
     "dxt_version": "0.1",
-    "name": "apify-actors-mcp-server",
-    "version": "0.0.0",
+    "name": "apify-mcp-server",
+    "version": "0.3.9",
     "description": "Extract data from any site with Apify Store, home to thousands of web scrapers.",
     "long_description": "Apify is the world's largest marketplace of tools for web scraping, data extraction, and web automation. You can extract structured data from social media, e-commerce, search engines, maps, travel sites, or any other website.",
     "keywords": [
@@ -94,4 +94,4 @@
             "node": ">=20.0.0"
         }
     }
-}
+}

package-lock.json

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

package.json

@@ -24,6 +24,17 @@ export function getApifyAPIBaseUrl(): string {
 
 export class ApifyClient extends _ApifyClient {
     constructor(options: ApifyClientOptions) {
+        /**
+         * In order to publish to DockerHub, we need to run their build task to validate our MCP server.
+         * This was failing since we were sending this dummy token to Apify in order to build the Actor tools.
+         * So if we encounter this dummy value, we remove it to use Apify client as unauthenticated, which is sufficient
+         * for server start and listing of tools.
+         */
+        if (options.token?.toLowerCase() === 'your-apify-token') {
+            // eslint-disable-next-line no-param-reassign
+            delete options.token;
+        }
+
         super({
             ...options,
             baseUrl: getApifyAPIBaseUrl(),

src/apify-client.ts

@@ -47,15 +47,16 @@ log.setLevel(log.LEVELS.ERROR);
 // Parse command line arguments using yargs
 const argv = yargs(hideBin(process.argv))
     .usage('Usage: $0 [options]')
+    .env()
     .option('actors', {
         type: 'string',
-        describe: 'Comma-separated list of Actor full names to add to the server.',
+        describe: 'Comma-separated list of Actor full names to add to the server. Can also be set via ACTORS environment variable.',
         example: 'apify/google-search-scraper,apify/instagram-scraper',
     })
     .option('enable-adding-actors', {
         type: 'boolean',
         default: true,
-        describe: 'Enable dynamically adding Actors as tools based on user requests.',
+        describe: 'Enable dynamically adding Actors as tools based on user requests. Can also be set via ENABLE_ADDING_ACTORS environment variable.',
     })
     .option('enableActorAutoLoading', {
         type: 'boolean',
@@ -65,7 +66,7 @@ const argv = yargs(hideBin(process.argv))
     })
     .options('tools', {
         type: 'string',
-        describe: `Comma-separated list of specific tool categories to enable.
+        describe: `Comma-separated list of specific tool categories to enable. Can also be set via TOOLS environment variable.
 
 Available choices: ${Object.keys(toolCategories).join(', ')}
 

src/stdio.ts

@@ -284,8 +284,8 @@ export function transformActorInputSchemaProperties(input: Readonly<IActorInputS
     const inputClone: IActorInputSchema = structuredClone(input);
     let transformedProperties = markInputPropertiesAsRequired(inputClone);
     transformedProperties = buildApifySpecificProperties(transformedProperties);
-    transformedProperties = filterSchemaProperties(transformedProperties);
     transformedProperties = inferArrayItemsTypeIfMissing(transformedProperties);
+    transformedProperties = filterSchemaProperties(transformedProperties);
     transformedProperties = shortenProperties(transformedProperties);
     transformedProperties = addEnumsToDescriptionsWithExamples(transformedProperties);
     transformedProperties = encodeDotPropertyNames(transformedProperties);

src/tools/utils.ts

@@ -11,6 +11,7 @@ export interface McpClientOptions {
     actors?: string[];
     enableAddingActors?: boolean;
     tools?: ToolCategory[]; // Tool categories to include
+    useEnv?: boolean; // Use environment variables instead of command line arguments (stdio only)
 }
 
 export async function createMcpSseClient(
@@ -97,24 +98,40 @@ export async function createMcpStdioClient(
     if (!process.env.APIFY_TOKEN) {
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
-    const { actors, enableAddingActors, tools } = options || {};
+    const { actors, enableAddingActors, tools, useEnv } = options || {};
     const args = ['dist/stdio.js'];
-    if (actors) {
-        args.push('--actors', actors.join(','));
-    }
-    if (enableAddingActors !== undefined) {
-        args.push('--enable-adding-actors', enableAddingActors.toString());
-    }
-    if (tools && tools.length > 0) {
-        args.push('--tools', tools.join(','));
+    const env: Record<string, string> = {
+        APIFY_TOKEN: process.env.APIFY_TOKEN as string,
+    };
+
+    // Set environment variables instead of command line arguments when useEnv is true
+    if (useEnv) {
+        if (actors) {
+            env.ACTORS = actors.join(',');
+        }
+        if (enableAddingActors !== undefined) {
+            env.ENABLE_ADDING_ACTORS = enableAddingActors.toString();
+        }
+        if (tools && tools.length > 0) {
+            env.TOOLS = tools.join(',');
+        }
+    } else {
+        // Use command line arguments as before
+        if (actors) {
+            args.push('--actors', actors.join(','));
+        }
+        if (enableAddingActors !== undefined) {
+            args.push('--enable-adding-actors', enableAddingActors.toString());
+        }
+        if (tools && tools.length > 0) {
+            args.push('--tools', tools.join(','));
+        }
     }
 
     const transport = new StdioClientTransport({
         command: 'node',
         args,
-        env: {
-            APIFY_TOKEN: process.env.APIFY_TOKEN as string,
-        },
+        env,
     });
     const client = new Client({
         name: 'stdio-client',

tests/helpers.ts

@@ -538,6 +538,57 @@ export function createIntegrationTestsSuite(
                 }
                 return false;
             }, { timeout: 30000, interval: 1000 });
+        });
+
+        // Environment variable tests - only applicable to stdio transport
+        it.runIf(options.transport === 'stdio')('should load actors from ACTORS environment variable', async () => {
+            const actors = ['apify/python-example', 'apify/rag-web-browser'];
+            const client = await createClientFn({ actors, useEnv: true });
+            const names = getToolNames(await client.listTools());
+            expect(names.length).toEqual(defaultTools.length + actors.length + addRemoveTools.length);
+            expectToolNamesToContain(names, DEFAULT_TOOL_NAMES);
+            expectToolNamesToContain(names, actors.map((actor) => actorNameToToolName(actor)));
+            expectToolNamesToContain(names, addRemoveTools.map((tool) => tool.tool.name));
+
+            await client.close();
+        });
+
+        it.runIf(options.transport === 'stdio')('should respect ENABLE_ADDING_ACTORS environment variable', async () => {
+            // Test with enableAddingActors = false via env var
+            const client = await createClientFn({ enableAddingActors: false, useEnv: true });
+            const names = getToolNames(await client.listTools());
+            expect(names.length).toEqual(defaultTools.length + defaults.actors.length);
+
+            expectToolNamesToContain(names, DEFAULT_TOOL_NAMES);
+            expectToolNamesToContain(names, DEFAULT_ACTOR_NAMES);
+            await client.close();
+        });
+
+        it.runIf(options.transport === 'stdio')('should load tool categories from TOOLS environment variable', async () => {
+            const categories = ['docs', 'runs'] as ToolCategory[];
+            const client = await createClientFn({ tools: categories, useEnv: true });
+
+            const loadedTools = await client.listTools();
+            const toolNames = getToolNames(loadedTools);
+
+            const expectedTools = [
+                ...toolCategories.docs,
+                ...toolCategories.runs,
+            ];
+            const expectedToolNames = expectedTools.map((tool) => tool.tool.name);
+
+            // Handle case where tools are enabled by default
+            const selectedCategoriesInDefault = categories.filter((key) => toolCategoriesEnabledByDefault.includes(key));
+            const numberOfToolsFromCategoriesInDefault = selectedCategoriesInDefault
+                .flatMap((key) => toolCategories[key]).length;
+
+            const numberOfToolsExpected = defaultTools.length + defaults.actors.length + addRemoveTools.length
+                // Tools from tool categories minus the ones already in default tools
+                + (expectedTools.length - numberOfToolsFromCategoriesInDefault);
+            expect(toolNames.length).toEqual(numberOfToolsExpected);
+            for (const expectedToolName of expectedToolNames) {
+                expect(toolNames).toContain(expectedToolName);
+            }
 
             await client.close();
         });