rename to tool categories, include beta tools as separte preview category, remove beta flag param

Author: MQ37

src/actor/server.ts

@@ -73,7 +73,7 @@ export function createExpressApp(
             // Load MCP server tools
             const apifyToken = process.env.APIFY_TOKEN as string;
             const input = parseInputParamsFromUrl(req.url);
-            if (input.actors || input.enableAddingActors || input.beta || input.tools) {
+            if (input.actors || input.enableAddingActors || input.tools) {
                 log.debug('[SSE] Loading tools from URL', { sessionId: transport.sessionId });
                 await mcpServer.loadToolsFromUrl(req.url, apifyToken);
             }
@@ -159,7 +159,7 @@ export function createExpressApp(
                 // Load MCP server tools
                 const apifyToken = process.env.APIFY_TOKEN as string;
                 const input = parseInputParamsFromUrl(req.url);
-                if (input.actors || input.enableAddingActors || input.beta || input.tools) {
+                if (input.actors || input.enableAddingActors || input.tools) {
                     log.debug('[Streamable] Loading tools from URL', { sessionId: transport.sessionId });
                     await mcpServer.loadToolsFromUrl(req.url, apifyToken);
                 }

src/input.ts

@@ -3,7 +3,7 @@
  */
 import log from '@apify/log';
 
-import type { FeatureToolKey, Input } from './types.js';
+import type { Input, ToolCategory } from './types.js';
 
 /**
  * Process input parameters, split Actors string into an array
@@ -30,11 +30,8 @@ export function processInput(originalInput: Partial<Input>): Input {
         input.enableAddingActors = input.enableAddingActors === true || input.enableAddingActors === 'true';
     }
 
-    // If beta present, set input.beta to true
-    input.beta = input.beta !== undefined && (input.beta !== false && input.beta !== 'false');
-
     if (input.tools && typeof input.tools === 'string') {
-        input.tools = input.tools.split(',').map((tool: string) => tool.trim()) as FeatureToolKey[];
+        input.tools = input.tools.split(',').map((tool: string) => tool.trim()) as ToolCategory[];
     }
     return input;
 }

src/mcp/server.ts

@@ -23,17 +23,16 @@ import {
     SERVER_NAME,
     SERVER_VERSION,
 } from '../const.js';
-import { addRemoveTools, betaTools, callActorGetDataset, defaultTools, featureTools, getActorsAsTools } from '../tools/index.js';
+import { addRemoveTools, callActorGetDataset, defaultTools, getActorsAsTools, toolCategories } from '../tools/index.js';
 import { actorNameToToolName, decodeDotPropertyNames } from '../tools/utils.js';
-import type { ActorMcpTool, ActorTool, FeatureToolKey, HelperTool, ToolEntry } from '../types.js';
+import type { ActorMcpTool, ActorTool, HelperTool, ToolCategory, ToolEntry } from '../types.js';
 import { connectMCPClient } from './client.js';
 import { EXTERNAL_TOOL_CALL_TIMEOUT_MSEC } from './const.js';
 import { processParamsGetTools } from './utils.js';
 
 type ActorsMcpServerOptions = {
     enableAddingActors?: boolean;
     enableDefaultActors?: boolean;
-    enableBeta?: boolean; // Enable beta features
 };
 
 type ToolsChangedHandler = (toolNames: string[]) => void;
@@ -52,7 +51,6 @@ export class ActorsMcpServer {
         this.options = {
             enableAddingActors: options.enableAddingActors ?? true,
             enableDefaultActors: options.enableDefaultActors ?? true, // Default to true for backward compatibility
-            enableBeta: options.enableBeta ?? false, // Disabled by default
         };
         this.server = new Server(
             {
@@ -78,10 +76,6 @@ export class ActorsMcpServer {
             this.enableDynamicActorTools();
         }
 
-        if (this.options.enableBeta) {
-            this.upsertTools(betaTools, false);
-        }
-
         // Initialize automatically for backward compatibility
         this.initialize().catch((error) => {
             log.error('Failed to initialize server:', error);
@@ -172,10 +166,10 @@ export class ActorsMcpServer {
         const loadedTools = this.listAllToolNames();
         const actorsToLoad: string[] = [];
         const toolsToLoad: ToolEntry[] = [];
-        const internalToolMap = new Map([...defaultTools, ...addRemoveTools, ...betaTools].map((tool) => [tool.tool.name, tool]));
-        // Add all feature tools
-        for (const key of Object.keys(featureTools)) {
-            const tools = featureTools[key as FeatureToolKey];
+        const internalToolMap = new Map([...defaultTools, ...addRemoveTools].map((tool) => [tool.tool.name, tool]));
+        // Add all category tools
+        for (const key of Object.keys(toolCategories)) {
+            const tools = toolCategories[key as ToolCategory];
             for (const tool of tools) {
                 internalToolMap.set(tool.tool.name, tool);
             }

src/stdio.ts

@@ -23,8 +23,8 @@ import { hideBin } from 'yargs/helpers';
 import log from '@apify/log';
 
 import { ActorsMcpServer } from './mcp/server.js';
-import { featureTools } from './tools/index.js';
-import type { FeatureToolKey, Input } from './types.js';
+import { toolCategories } from './tools/index.js';
+import type { Input, ToolCategory } from './types.js';
 import { loadToolsFromInput } from './utils/tools-loader.js';
 
 // Keeping this interface here and not types.ts since
@@ -37,7 +37,7 @@ interface CliArgs {
     enableAddingActors: boolean;
     /** @deprecated */
     enableActorAutoLoading: boolean;
-    beta: boolean;
+    /** Tool categories to include */
     tools?: string;
 }
 
@@ -63,21 +63,17 @@ const argv = yargs(hideBin(process.argv))
         hidden: true,
         describe: 'Deprecated: use enable-adding-actors instead.',
     })
-    .option('beta', {
-        type: 'boolean',
-        default: false,
-        describe: 'Enable beta features.',
-    })
     .options('tools', {
         type: 'string',
-        describe: `Comma-separated list of specific feature tools to enable.
+        describe: `Comma-separated list of specific tool categories to enable.
 
-Available choices: ${Object.keys(featureTools).join(', ')}
+Available choices: ${Object.keys(toolCategories).join(', ')}
 
-Feature tools are categorized as follows:
+Tool categories are as follows:
 - docs: Search and fetch Apify documentation tools.
 - runs: Get Actor runs list, run details, and logs from a specific Actor run.
 - storage: Access datasets, key-value stores, and their records.
+- preview: Experimental tools in preview mode.
 
 Note: Tools that enable you to search Actors from the Apify Store and get their details are always enabled by default.
 `,
@@ -96,9 +92,8 @@ Note: Tools that enable you to search Actors from the Apify Store and get their
 const enableAddingActors = argv.enableAddingActors && argv.enableActorAutoLoading;
 const actors = argv.actors as string || '';
 const actorList = actors ? actors.split(',').map((a: string) => a.trim()) : [];
-const enableBeta = argv.beta;
-// Keys of the feature tools to enable
-const featureToolKeys = argv.tools ? argv.tools.split(',').map((t: string) => t.trim()) : [];
+// Keys of the tool categories to enable
+const toolCategoryKeys = argv.tools ? argv.tools.split(',').map((t: string) => t.trim()) : [];
 
 // Validate environment
 if (!process.env.APIFY_TOKEN) {
@@ -107,14 +102,13 @@ if (!process.env.APIFY_TOKEN) {
 }
 
 async function main() {
-    const mcpServer = new ActorsMcpServer({ enableAddingActors, enableDefaultActors: false, enableBeta });
+    const mcpServer = new ActorsMcpServer({ enableAddingActors, enableDefaultActors: false });
 
     // Create an Input object from CLI arguments
     const input: Input = {
         actors: actorList.length ? actorList : [],
         enableAddingActors,
-        beta: enableBeta,
-        tools: featureToolKeys as FeatureToolKey[],
+        tools: toolCategoryKeys as ToolCategory[],
     };
 
     // Use the shared tools loading logic

src/tools/index.ts

@@ -1,4 +1,5 @@
 // Import specific tools that are being used
+import type { ToolCategory } from '../types.js';
 import { callActor, callActorGetDataset, getActorsAsTools } from './actor.js';
 import { getDataset, getDatasetItems } from './dataset.js';
 import { getUserDatasetsList } from './dataset_collection.js';
@@ -12,12 +13,7 @@ import { getUserRunsList } from './run_collection.js';
 import { searchApifyDocsTool } from './search-apify-docs.js';
 import { searchActors } from './store_collection.js';
 
-export const defaultTools = [
-    getActorDetailsTool,
-    searchActors,
-];
-
-export const featureTools = {
+export const toolCategories = {
     docs: [
         searchApifyDocsTool,
         fetchApifyDocsTool,
@@ -36,10 +32,19 @@ export const featureTools = {
         getUserDatasetsList,
         getUserKeyValueStoresList,
     ],
+    preview: [
+        callActor,
+    ],
 };
+export const toolCategoriesEnabledByDefault: ToolCategory[] = [
+    'docs',
+];
 
-export const betaTools = [
-    callActor,
+export const defaultTools = [
+    getActorDetailsTool,
+    searchActors,
+    // Add the tools from the enabled categories
+    ...toolCategoriesEnabledByDefault.map((key) => toolCategories[key]).flat(),
 ];
 
 export const addRemoveTools = [

src/types.ts

@@ -6,7 +6,7 @@ import type { ActorDefaultRunOptions, ActorDefinition, ActorStoreList, PricingIn
 
 import type { ACTOR_PRICING_MODEL } from './const.js';
 import type { ActorsMcpServer } from './mcp/server.js';
-import type { featureTools } from './tools/index.js';
+import type { toolCategories } from './tools/index.js';
 
 export interface ISchemaProperties {
     type: string;
@@ -214,7 +214,7 @@ export interface InternalTool extends ToolBase {
     call: (toolArgs: InternalToolArgs) => Promise<object>;
 }
 
-export type FeatureToolKey = keyof typeof featureTools;
+export type ToolCategory = keyof typeof toolCategories;
 
 export type Input = {
     actors: string[] | string;
@@ -226,9 +226,8 @@ export type Input = {
     maxActorMemoryBytes?: number;
     debugActor?: string;
     debugActorInput?: unknown;
-    /** Enable beta features flag */
-    beta?: boolean | string;
-    tools?: FeatureToolKey[] | string;
+    /** Tool categories to include */
+    tools?: ToolCategory[] | string;
 };
 
 // Utility type to get a union of values from an object type

src/utils/tools-loader.ts

@@ -4,8 +4,8 @@
  */
 
 import { defaults } from '../const.js';
-import { addRemoveTools, betaTools, featureTools, getActorsAsTools } from '../tools/index.js';
-import type { FeatureToolKey, Input, ToolEntry } from '../types.js';
+import { addRemoveTools, getActorsAsTools, toolCategories } from '../tools/index.js';
+import type { Input, ToolCategory, ToolEntry } from '../types.js';
 
 /**
  * Load tools based on the provided Input object.
@@ -37,16 +37,11 @@ export async function loadToolsFromInput(
         tools.push(...addRemoveTools);
     }
 
-    // Add beta tools if enabled
-    if (input.beta) {
-        tools.push(...betaTools);
-    }
-
-    // Add feature tools based on the input
+    // Add tools from enabled categories
     if (input.tools) {
         const toolKeys = Array.isArray(input.tools) ? input.tools : [input.tools];
         for (const toolKey of toolKeys) {
-            const keyTools = featureTools[toolKey as FeatureToolKey] || [];
+            const keyTools = toolCategories[toolKey as ToolCategory] || [];
             tools.push(...keyTools);
         }
     }

tests/helpers.ts

@@ -5,13 +5,12 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { expect } from 'vitest';
 
 import { HelperTools } from '../src/const.js';
-import type { FeatureToolKey } from '../src/types.js';
+import type { ToolCategory } from '../src/types.js';
 
 export interface McpClientOptions {
     actors?: string[];
     enableAddingActors?: boolean;
-    enableBeta?: boolean; // Optional, used for beta features
-    tools?: FeatureToolKey[]; // Optional, used for feature tools
+    tools?: ToolCategory[]; // Tool categories to include
 }
 
 export async function createMcpSseClient(
@@ -22,16 +21,13 @@ export async function createMcpSseClient(
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
     const url = new URL(serverUrl);
-    const { actors, enableAddingActors, enableBeta, tools } = options || {};
+    const { actors, enableAddingActors, tools } = options || {};
     if (actors) {
         url.searchParams.append('actors', actors.join(','));
     }
     if (enableAddingActors !== undefined) {
         url.searchParams.append('enableAddingActors', enableAddingActors.toString());
     }
-    if (enableBeta !== undefined) {
-        url.searchParams.append('beta', enableBeta.toString());
-    }
     if (tools && tools.length > 0) {
         url.searchParams.append('tools', tools.join(','));
     }
@@ -64,16 +60,13 @@ export async function createMcpStreamableClient(
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
     const url = new URL(serverUrl);
-    const { actors, enableAddingActors, enableBeta, tools } = options || {};
+    const { actors, enableAddingActors, tools } = options || {};
     if (actors) {
         url.searchParams.append('actors', actors.join(','));
     }
     if (enableAddingActors !== undefined) {
         url.searchParams.append('enableAddingActors', enableAddingActors.toString());
     }
-    if (enableBeta !== undefined) {
-        url.searchParams.append('beta', enableBeta.toString());
-    }
     if (tools && tools.length > 0) {
         url.searchParams.append('tools', tools.join(','));
     }
@@ -104,17 +97,14 @@ export async function createMcpStdioClient(
     if (!process.env.APIFY_TOKEN) {
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
-    const { actors, enableAddingActors, enableBeta, tools } = options || {};
+    const { actors, enableAddingActors, tools } = options || {};
     const args = ['dist/stdio.js'];
     if (actors) {
         args.push('--actors', actors.join(','));
     }
     if (enableAddingActors !== undefined) {
         args.push('--enable-adding-actors', enableAddingActors.toString());
     }
-    if (enableBeta !== undefined) {
-        args.push('--beta', enableBeta.toString());
-    }
     if (tools && tools.length > 0) {
         args.push('--tools', tools.join(','));
     }