lint

Author: MQ37

src/types.ts

@@ -113,6 +113,7 @@ export type InternalToolArgs = {
      * Passing it from the server avoids a stdio-only circular import that made the
      * add-actor tool null during module initialization.
      */
+    // eslint-disable-next-line no-use-before-define
     getActorsAsTools?: (actorIdsOrNames: string[], apifyToken: string) => Promise<ToolEntry[]>;
 }
 

src/utils/tools-loader.ts

@@ -67,11 +67,14 @@ export async function loadToolsFromInput(
     }
 
     // Decide which Actors to load
-    const actorsFromField: string[] | undefined = input.actors === undefined
-        ? undefined
-        : Array.isArray(input.actors)
-            ? input.actors
-            : [input.actors];
+    let actorsFromField: string[] | undefined;
+    if (input.actors === undefined) {
+        actorsFromField = undefined;
+    } else if (Array.isArray(input.actors)) {
+        actorsFromField = input.actors;
+    } else {
+        actorsFromField = [input.actors];
+    }
 
     let actorNamesToLoad: string[] = [];
     if (actorsFromField !== undefined) {
@@ -94,13 +97,11 @@ export async function loadToolsFromInput(
             const hasAddActor = result.some((e) => e.tool.name === addTool.tool.name);
             if (!hasAddActor) result.push(addTool);
         }
-    } else {
+    } else if (addActorEnabled && !actorsExplicitlyEmpty) {
         // No selectors: either expose only add-actor (when enabled), or default categories
-        if (addActorEnabled && !actorsExplicitlyEmpty) {
-            result.push(addTool);
-        } else if (!actorsExplicitlyEmpty) {
-            result.push(...getExpectedToolsByCategories(toolCategoriesEnabledByDefault));
-        }
+        result.push(addTool);
+    } else if (!actorsExplicitlyEmpty) {
+        result.push(...getExpectedToolsByCategories(toolCategoriesEnabledByDefault));
     }
 
     // Actor tools (if any)
@@ -112,7 +113,7 @@ export async function loadToolsFromInput(
     // De-duplicate by tool name for safety
     const seen = new Set<string>();
     const deduped = result.filter((entry) => {
-        const name = entry.tool.name;
+        const { name } = entry.tool;
         if (seen.has(name)) return false;
         seen.add(name);
         return true;

tests/integration/internals.test.ts

@@ -3,10 +3,9 @@ import { beforeAll, describe, expect, it } from 'vitest';
 import log from '@apify/log';
 
 import { actorNameToToolName } from '../../dist/tools/utils.js';
-import { defaults } from '../../src/const.js';
 import { ActorsMcpServer } from '../../src/index.js';
 import { addTool } from '../../src/tools/helpers.js';
-import { defaultTools, getActorsAsTools } from '../../src/tools/index.js';
+import { getActorsAsTools } from '../../src/tools/index.js';
 import type { Input } from '../../src/types.js';
 import { loadToolsFromInput } from '../../src/utils/tools-loader.js';
 import { ACTOR_PYTHON_EXAMPLE } from '../const.js';

tests/integration/suite.ts

@@ -114,7 +114,7 @@ export function createIntegrationTestsSuite(
             expectToolNamesToContain(names, DEFAULT_ACTOR_NAMES);
             await client.close();
         });
-        
+
         it('should override enableAddingActors false with experimental tool category', async () => {
             const client = await createClientFn({ enableAddingActors: false, tools: ['experimental'] });
             const names = getToolNames(await client.listTools());