fix: tool id (#6544)

* fix: tool id * fix: test * fix: ts * add test
2026-05-05 01:02:59 +08:00 · 2026-03-11 23:15:17 +08:00
parent 960c8898cf
commit 38f6f9dd9f
30 changed files with 431 additions and 237 deletions
@@ -103,14 +103,15 @@ describe('httpTool utils', () => {
      const result = getHTTPToolRuntimeNode({
        tool,
        nodeId: 'node-123',
-        toolSetId: 'toolset-456'
+        toolSetId: 'toolset-456',
+        toolsetName: 'toolsetName'
      });

      expect(result.nodeId).toBe('node-123');
      expect(result.flowNodeType).toBe(FlowNodeTypeEnum.tool);
      expect(result.avatar).toBe('core/app/type/httpToolsFill');
      expect(result.intro).toBe('Search for items');
-      expect(result.name).toBe('searchTool');
+      expect(result.name).toBe('toolsetName/searchTool');
      expect(result.toolConfig?.httpTool?.toolId).toBe(
        `${AppToolSourceEnum.http}-toolset-456/searchTool`
      );
@@ -128,7 +129,8 @@ describe('httpTool utils', () => {
        tool,
        nodeId: 'node-789',
        avatar: 'custom-icon',
-        toolSetId: 'toolset-abc'
+        toolSetId: 'toolset-abc',
+        toolsetName: 'toolsetName'
      });

      expect(result.avatar).toBe('custom-icon');
@@ -145,7 +147,8 @@ describe('httpTool utils', () => {
      const result = getHTTPToolRuntimeNode({
        tool,
        nodeId: 'node-001',
-        toolSetId: 'toolset-002'
+        toolSetId: 'toolset-002',
+        toolsetName: 'toolsetName'
      });

      const rawResponseOutput = result.outputs.find((o) => o.key === NodeOutputKeyEnum.rawResponse);
@@ -28,8 +28,7 @@ describe('mcpTool utils', () => {

      const result = getMCPToolSetRuntimeNode({
        url: 'https://mcp.example.com/api',
-        toolList,
-        toolId: 'mcp-tool-123'
+        toolList
      });

      expect(result.flowNodeType).toBe(FlowNodeTypeEnum.toolSet);
@@ -40,7 +39,6 @@ describe('mcpTool utils', () => {
      expect(result.nodeId).toHaveLength(16);
      expect(result.toolConfig?.mcpToolSet?.url).toBe('https://mcp.example.com/api');
      expect(result.toolConfig?.mcpToolSet?.toolList).toEqual(toolList);
-      expect(result.toolConfig?.mcpToolSet?.toolId).toBe('mcp-tool-123');
    });

    it('should create runtime node with all optional params', () => {
@@ -49,7 +47,6 @@ describe('mcpTool utils', () => {
      const result = getMCPToolSetRuntimeNode({
        url: 'https://mcp.example.com/api',
        toolList,
-        toolId: 'mcp-tool-456',
        name: 'My MCP Tools',
        avatar: 'custom-mcp-avatar',
        headerSecret: { id: 'secret-1', key: 'Authorization' }
@@ -81,14 +78,15 @@ describe('mcpTool utils', () => {
      const result = getMCPToolRuntimeNode({
        tool,
        nodeId: 'node-123',
-        toolSetId: 'toolset-456'
+        toolSetId: 'toolset-456',
+        toolsetName: 'toolsetName'
      });

      expect(result.nodeId).toBe('node-123');
      expect(result.flowNodeType).toBe(FlowNodeTypeEnum.tool);
      expect(result.avatar).toBe('core/app/type/mcpToolsFill');
      expect(result.intro).toBe('Search for information');
-      expect(result.name).toBe('searchTool');
+      expect(result.name).toBe('toolsetName/searchTool');
      expect(result.toolConfig?.mcpTool?.toolId).toBe(
        `${AppToolSourceEnum.mcp}-toolset-456/searchTool`
      );
@@ -105,7 +103,8 @@ describe('mcpTool utils', () => {
        tool,
        nodeId: 'node-789',
        avatar: 'custom-icon',
-        toolSetId: 'toolset-abc'
+        toolSetId: 'toolset-abc',
+        toolsetName: 'toolsetName'
      });

      expect(result.avatar).toBe('custom-icon');
@@ -121,7 +120,8 @@ describe('mcpTool utils', () => {
      const result = getMCPToolRuntimeNode({
        tool,
        nodeId: 'node-001',
-        toolSetId: 'toolset-002'
+        toolSetId: 'toolset-002',
+        toolsetName: 'toolsetName'
      });

      expect(result.outputs).toHaveLength(1);
@@ -142,7 +142,8 @@ describe('mcpTool utils', () => {
      const result = getMCPToolRuntimeNode({
        tool,
        nodeId: 'node-test',
-        toolSetId: 'parent-123'
+        toolSetId: 'parent-123',
+        toolsetName: 'toolsetName'
      });

      expect(result.toolConfig?.mcpTool?.toolId).toBe('mcp-parent-123/myTool');
@@ -25,7 +25,6 @@ describe('splitCombineToolId', () => {

      expect(result.source).toBe(AppToolSourceEnum.personal);
      expect(result.pluginId).toBe('507f1f77bcf86cd799439011');
-      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
    });
  });

@@ -34,14 +33,14 @@ describe('splitCombineToolId', () => {
      const result = splitCombineToolId('commercial-507f1f77bcf86cd799439011');

      expect(result.source).toBe(AppToolSourceEnum.commercial);
-      expect(result.pluginId).toBe('commercial-507f1f77bcf86cd799439011');
+      expect(result.pluginId).toBe('507f1f77bcf86cd799439011');
    });

-    it('should convert commercial-dalle3 to systemTool', () => {
+    it('should convert commercial-dalle3 to systemTool(Adapt)', () => {
      const result = splitCombineToolId('commercial-dalle3');

      expect(result.source).toBe(AppToolSourceEnum.systemTool);
-      expect(result.pluginId).toBe('systemTool-dalle3');
+      expect(result.pluginId).toBe('dalle3');
    });
  });

@@ -50,14 +49,14 @@ describe('splitCombineToolId', () => {
      const result = splitCombineToolId('systemTool-websearch');

      expect(result.source).toBe(AppToolSourceEnum.systemTool);
-      expect(result.pluginId).toBe('systemTool-websearch');
+      expect(result.pluginId).toBe('websearch');
    });

    it('should handle systemTool with complex id', () => {
      const result = splitCombineToolId('systemTool-code-interpreter');

      expect(result.source).toBe(AppToolSourceEnum.systemTool);
-      expect(result.pluginId).toBe('systemTool-code-interpreter');
+      expect(result.pluginId).toBe('code-interpreter');
    });
  });

@@ -85,7 +84,7 @@ describe('splitCombineToolId', () => {

      expect(result.source).toBe(AppToolSourceEnum.http);
      expect(result.pluginId).toBe('507f1f77bcf86cd799439011');
-      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.authAppId).toBe('507f1f77bcf86cd799439011');
    });

    it('should parse http-parentId/toolName format correctly', () => {
@@ -93,7 +92,6 @@ describe('splitCombineToolId', () => {

      expect(result.source).toBe(AppToolSourceEnum.http);
      expect(result.pluginId).toBe('507f1f77bcf86cd799439011/apiTool');
-      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
    });
  });

@@ -102,13 +100,13 @@ describe('splitCombineToolId', () => {
      const result = splitCombineToolId('community-oldPlugin');

      expect(result.source).toBe(AppToolSourceEnum.systemTool);
-      expect(result.pluginId).toBe('systemTool-oldPlugin');
+      expect(result.pluginId).toBe('oldPlugin');
    });
  });

  describe('error handling', () => {
    it('should throw error when pluginId is empty after split', () => {
-      expect(() => splitCombineToolId('commercial-')).toThrow('pluginId not found');
+      expect(() => splitCombineToolId('commercial-')).toThrow('toolId not found');
    });
  });
 });
@@ -121,7 +119,7 @@ describe('getToolRawId', () => {

  it('should return pluginId for commercial tool', () => {
    const result = getToolRawId('commercial-507f1f77bcf86cd799439011');
-    expect(result).toBe('commercial-507f1f77bcf86cd799439011');
+    expect(result).toBe('507f1f77bcf86cd799439011');
  });

  it('should return parentId for mcp tool with toolName', () => {
@@ -136,7 +134,7 @@ describe('getToolRawId', () => {

  it('should handle systemTool correctly', () => {
    const result = getToolRawId('systemTool-websearch');
-    expect(result).toBe('systemTool-websearch');
+    expect(result).toBe('websearch');
  });

  it('should handle personal tool with prefix', () => {
@@ -146,6 +144,6 @@ describe('getToolRawId', () => {

  it('should handle converted community tool', () => {
    const result = getToolRawId('community-oldPlugin');
-    expect(result).toBe('systemTool-oldPlugin');
+    expect(result).toBe('oldPlugin');
  });
 });
@@ -0,0 +1,204 @@
+import { describe, it, expect } from 'vitest';
+import { parseToolId } from '@fastgpt/service/core/workflow/dispatch/child/runTool';
+
+describe('parseToolId', () => {
+  describe('新版格式: source-appId/toolName', () => {
+    it('should parse mcp tool format correctly', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/apiTool');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('apiTool');
+    });
+
+    it('should parse http tool format correctly', () => {
+      const result = parseToolId('http-507f1f77bcf86cd799439011/weatherAPI');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('weatherAPI');
+    });
+
+    it('should handle tool names with special characters', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/api-tool_v2');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('api-tool_v2');
+    });
+
+    it('should handle tool names with numbers', () => {
+      const result = parseToolId('http-507f1f77bcf86cd799439011/tool123');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('tool123');
+    });
+  });
+
+  describe('旧版格式: source-appId/toolsetName/toolName', () => {
+    it('should parse old mcp format correctly', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/toolset/apiTool');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('apiTool');
+    });
+
+    it('should parse old http format correctly', () => {
+      const result = parseToolId('http-507f1f77bcf86cd799439011/MyToolset/weatherAPI');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('weatherAPI');
+    });
+
+    it('should ignore toolset name in old format', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/ignoredToolset/actualTool');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('actualTool');
+      // toolsetName 应该被忽略
+    });
+
+    it('should handle toolset names with special characters', () => {
+      const result = parseToolId('http-507f1f77bcf86cd799439011/tool-set_v1/myTool');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('myTool');
+    });
+  });
+
+  describe('边界情况', () => {
+    it('should handle appId with hyphens', () => {
+      const result = parseToolId('mcp-507f-1f77-bcf8-6cd7-99439011/tool');
+      expect(result.parentId).toBe('507f-1f77-bcf8-6cd7-99439011');
+      expect(result.toolName).toBe('tool');
+    });
+
+    it('should handle multiple hyphens in source prefix', () => {
+      const result = parseToolId('custom-source-507f1f77bcf86cd799439011/tool');
+      expect(result.parentId).toBe('source-507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('tool');
+    });
+
+    it('should handle tool names with slashes in old format', () => {
+      // 注意: split('/') 只会分割成三个部分,所以第三个部分是 'tool'
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/toolset/tool/extra');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      // 实际上 split('/') 会得到 ['507f1f77bcf86cd799439011', 'toolset', 'tool/extra']
+      // 但由于解构赋值,legacyToolName 会是 'tool/extra'
+      // 等等,让我重新理解代码逻辑...
+      // formatId.split('/') 会得到 ['507f1f77bcf86cd799439011', 'toolset', 'tool', 'extra']
+      // 解构赋值只取前三个: parentId='507f1f77bcf86cd799439011', toolsetNameOrToolName='toolset', legacyToolName='tool'
+      // 所以 toolName 应该是 'tool',而不是 'tool/extra'
+      expect(result.toolName).toBe('tool');
+    });
+
+    it('should handle empty tool name', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('');
+    });
+
+    it('should handle empty toolset and tool name in old format', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011//');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('');
+    });
+  });
+
+  describe('向后兼容性', () => {
+    it('should correctly identify new format vs old format', () => {
+      // 新版格式: 只有两个部分(appId 和 toolName)
+      const newFormat = parseToolId('mcp-507f1f77bcf86cd799439011/tool');
+      expect(newFormat.toolName).toBe('tool');
+
+      // 旧版格式: 有三个部分(appId, toolsetName, toolName)
+      const oldFormat = parseToolId('mcp-507f1f77bcf86cd799439011/toolset/tool');
+      expect(oldFormat.toolName).toBe('tool');
+
+      // 两者的 toolName 应该相同
+      expect(newFormat.toolName).toBe(oldFormat.toolName);
+    });
+
+    it('should handle migration from old to new format', () => {
+      const oldId = 'mcp-507f1f77bcf86cd799439011/MyToolset/weatherAPI';
+      const newId = 'mcp-507f1f77bcf86cd799439011/weatherAPI';
+
+      const oldResult = parseToolId(oldId);
+      const newResult = parseToolId(newId);
+
+      // 两种格式应该解析出相同的 parentId 和 toolName
+      expect(oldResult.parentId).toBe(newResult.parentId);
+      expect(oldResult.toolName).toBe(newResult.toolName);
+    });
+  });
+
+  describe('真实场景测试', () => {
+    it('should parse real MCP tool ID', () => {
+      const result = parseToolId('mcp-65f8a9b2c3d4e5f6a7b8c9d0/filesystem/readFile');
+      expect(result.parentId).toBe('65f8a9b2c3d4e5f6a7b8c9d0');
+      expect(result.toolName).toBe('readFile');
+    });
+
+    it('should parse real HTTP tool ID', () => {
+      const result = parseToolId('http-65f8a9b2c3d4e5f6a7b8c9d0/WeatherAPI');
+      expect(result.parentId).toBe('65f8a9b2c3d4e5f6a7b8c9d0');
+      expect(result.toolName).toBe('WeatherAPI');
+    });
+
+    it('should handle Chinese tool names', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011/天气查询');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('天气查询');
+    });
+
+    it('should handle tool names with spaces', () => {
+      const result = parseToolId('http-507f1f77bcf86cd799439011/Weather API');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBe('Weather API');
+    });
+  });
+
+  describe('性能测试', () => {
+    it('should parse tool IDs efficiently', () => {
+      const iterations = 10000;
+      const start = Date.now();
+
+      for (let i = 0; i < iterations; i++) {
+        parseToolId('mcp-507f1f77bcf86cd799439011/toolset/tool');
+      }
+
+      const duration = Date.now() - start;
+      console.log(`Parsed ${iterations} tool IDs in ${duration}ms`);
+
+      // 性能检查: 10000 次解析应该在 100ms 内完成
+      expect(duration).toBeLessThan(100);
+    });
+
+    it('should handle batch parsing', () => {
+      const toolIds = [
+        'mcp-507f1f77bcf86cd799439011/tool1',
+        'http-507f1f77bcf86cd799439011/tool2',
+        'mcp-507f1f77bcf86cd799439011/toolset/tool3',
+        'http-507f1f77bcf86cd799439011/toolset/tool4'
+      ];
+
+      const results = toolIds.map((id) => parseToolId(id));
+
+      expect(results).toHaveLength(4);
+      expect(results[0].toolName).toBe('tool1');
+      expect(results[1].toolName).toBe('tool2');
+      expect(results[2].toolName).toBe('tool3');
+      expect(results[3].toolName).toBe('tool4');
+    });
+  });
+
+  describe('错误处理', () => {
+    it('should handle missing slash', () => {
+      const result = parseToolId('mcp-507f1f77bcf86cd799439011');
+      expect(result.parentId).toBe('507f1f77bcf86cd799439011');
+      expect(result.toolName).toBeUndefined();
+    });
+
+    it('should handle only source prefix', () => {
+      const result = parseToolId('mcp-');
+      expect(result.parentId).toBe('');
+      expect(result.toolName).toBeUndefined();
+    });
+
+    it('should handle malformed ID gracefully', () => {
+      // 虽然这些是无效的 ID,但函数应该不会崩溃
+      expect(() => parseToolId('invalid')).not.toThrow();
+      expect(() => parseToolId('')).not.toThrow();
+      expect(() => parseToolId('/')).not.toThrow();
+    });
+  });
+});