fix proxy tool name handling

Author: MQ37

src/mcp/const.ts

@@ -1,3 +1,3 @@
 
 export const MAX_TOOL_NAME_LENGTH = 64;
-export const SERVER_ID_LENGTH = 16
+export const SERVER_ID_LENGTH = 8

src/mcp/mcp-server.ts

@@ -63,6 +63,8 @@ export class ActorsMcpServer {
     /**
      * Loads tools from URL params.
      *
+     * This method also handles enabling of Actor auto loading via the processParamsGetTools.
+     *
      * Used primarily for SSE.
      */
     public async loadToolsFromUrl(url: string, apifyToken: string) {
@@ -165,7 +167,7 @@ export class ActorsMcpServer {
                     try {
                         client = await createMCPClient(serverTool.serverUrl, apifyToken);
                         const res = await client.callTool({
-                            name: name,
+                            name: serverTool.originToolName,
                             arguments: args,
                         });
 

src/mcp/proxy.ts

@@ -1,7 +1,7 @@
 import Ajv from "ajv";
 import { ActorMCPTool, ToolWrap } from "../types";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { getMCPServerID } from "./utils";
+import { getMCPServerID, getProxyMCPServerToolName } from "./utils";
 
 export async function getMCPServerTools(
     actorID: string,
@@ -21,7 +21,9 @@ export async function getMCPServerTools(
             actorID,
             serverId: getMCPServerID(serverUrl),
             serverUrl,
-            name: tool.name,
+            originToolName: tool.name,
+
+            name: getProxyMCPServerToolName(serverUrl, tool.name),
             description: tool.description || "",
             inputSchema: tool.inputSchema,
             ajvValidate: ajv.compile(tool.inputSchema)

src/mcp/utils.ts

@@ -8,9 +8,6 @@ import type { ToolWrap } from '../types.js';
 
 import { addTool, getActorsAsTools, removeTool } from '../tools/index.js';
 import { Input } from "../types.js";
-import { getActorsMCPServerURL, isActorMCPServer } from "./actors";
-import { getMCPServerTools } from "./proxy";
-import { createMCPClient } from "./client";
 
 /**
  * Generates a unique server ID based on the provided URL.
@@ -32,7 +29,7 @@ export function getMCPServerID(url: string): string {
  * @param toolName The tool name to generate the tool name from.
  * @returns A unique tool name.
  */
-export function getServerToolName(url: string, toolName: string): string {
+export function getProxyMCPServerToolName(url: string, toolName: string): string {
     const prefix = getMCPServerID(url);
 
     const fullName = `${prefix}-${toolName}`;

src/types.ts

@@ -106,10 +106,16 @@ export interface HelperTool extends ToolBase {
 * Extends ToolBase with tool associated MCP server.
 */
 export interface ActorMCPTool extends ToolBase {
+    // Origin MCP server tool name, is needed for the tool call
+    originToolName: string;
     // ID of the Actorized MCP server
     actorID: string;
-    // Name of the Actorized MCP server the tool is associated with
+    /**
+     * ID of the Actorized MCP server the tool is associated with.
+     * See getMCPServerID()
+     */
     serverId: string;
+    // Connection URL of the Actorized MCP server
     serverUrl: string;
 }