fix: fix stdio.only add-actor tool related circular dependency cause by import of getActorsAsTools and pass it as internal tool arg instead.

Author: MQ37

src/mcp/server.ts

@@ -404,6 +404,7 @@ export class ActorsMcpServer {
                         apifyToken,
                         userRentedActorIds,
                         progressTracker,
+                        getActorsAsTools,
                     }) as object;
 
                     if (progressTracker) {

src/tools/helpers.ts

@@ -4,7 +4,6 @@ import zodToJsonSchema from 'zod-to-json-schema';
 
 import { HelperTools } from '../const.js';
 import type { InternalTool, ToolEntry } from '../types';
-import { getActorsAsTools } from './actor.js';
 import { actorNameToToolName } from './utils.js';
 
 const ajv = new Ajv({ coerceTypes: 'array', strict: false });
@@ -49,7 +48,7 @@ export const addTool: ToolEntry = {
         ajvValidate: ajv.compile(zodToJsonSchema(addToolArgsSchema)),
         // TODO: I don't like that we are passing apifyMcpServer and mcpServer to the tool
         call: async (toolArgs) => {
-            const { apifyMcpServer, apifyToken, args, extra: { sendNotification } } = toolArgs;
+            const { apifyMcpServer, apifyToken, args, extra: { sendNotification }, getActorsAsTools } = toolArgs;
             const parsed = addToolArgsSchema.parse(args);
             if (apifyMcpServer.listAllToolNames().includes(parsed.actor)) {
                 return {
@@ -59,6 +58,9 @@ export const addTool: ToolEntry = {
                     }],
                 };
             }
+            if (!getActorsAsTools) {
+                throw new Error('Internal configuration error: getActorsAsTools must be passed via InternalToolArgs from the MCP server');
+            }
             const tools = await getActorsAsTools([parsed.actor], apifyToken);
             /**
              * If no tools were found, return a message that the Actor was not found

src/types.ts

@@ -108,6 +108,12 @@ export type InternalToolArgs = {
     userRentedActorIds?: string[];
     /** Optional progress tracker for long running internal tools, like call-actor */
     progressTracker?: ProgressTracker | null;
+    /**
+     * Injected dependency for turning Actor names/IDs into tools.
+     * Passing it from the server avoids a stdio-only circular import that made the
+     * add-actor tool null during module initialization.
+     */
+    getActorsAsTools?: (actorIdsOrNames: string[], apifyToken: string) => Promise<ToolEntry[]>;
 }
 
 /**