fix: tool id by c121914yu · Pull Request #6544 · labring/FastGPT

c121914yu · 2026-03-11T14:48:14Z

No description provided.

github-actions · 2026-03-11T14:49:54Z

Preview sandbox Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_sandbox_9dc15d9c48b946a76b4ae6b7eec8d9677b4d2cd3

github-actions · 2026-03-11T14:51:10Z

Preview mcp_server Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_mcp_server_9dc15d9c48b946a76b4ae6b7eec8d9677b4d2cd3

github-actions · 2026-03-11T14:51:55Z

Docs Preview:

🚀 FastGPT Document Preview Ready!

🔗 👀 Click here to visit preview

c121914yu

📊 代码审查总结

这个 PR 在架构上有很好的改进,统一了 tool ID 的命名规范,但存在一些需要注意的问题。

主要问题

🔴 缺少错误处理,可能导致运行时错误
🔴 权限验证逻辑变更需要仔细验证
🟡 测试覆盖不完整
🟡 命名规范不一致

优点

✅ 统一了 tool ID 命名规范
✅ 删除了冗余代码
✅ 保持了向后兼容性

详细的审查意见请查看下方的行级评论。

packages/global/core/app/tool/utils.ts

packages/service/core/workflow/dispatch/plugin/run.ts

packages/service/core/workflow/dispatch/child/runTool.ts

test/cases/global/core/app/tool/utils.test.ts

packages/global/core/app/tool/httpTool/utils.ts

Copilot

Pull request overview

This PR updates the “tool id” contract across workflow/tool execution paths, aligning runtime node naming and tool-id parsing for MCP/HTTP tools, and adjusting related API/controllers, tests, i18n, and docs.

Changes:

Refactors tool-id parsing (splitCombineToolId) and updates downstream usage in workflow dispatch + system-tool lookup paths.
Updates MCP/HTTP runtime node builders to prefix runtime node names with toolsetName, and removes legacy toolId from MCP toolset config.
Renames/adjusts permission helper (authWorkflowToolByTmbId), updates i18n key for “tool deleted”, and adds 4.14.9 upgrade doc entry.

Reviewed changes

Copilot reviewed 29 out of 29 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
test/cases/global/core/app/tool/utils.test.ts	Updates assertions around tool-id parsing (but still contains outdated expectations).
test/cases/global/core/app/tool/mcpTool/utils.test.ts	Updates tests for MCP toolset/runtime node contract changes.
test/cases/global/core/app/tool/httpTool/utils.test.ts	Updates tests for HTTP runtime node naming contract changes.
projects/app/src/pages/api/core/app/tool/getVersionList.ts	Adjusts system-tool version-list lookup to use correct id.
projects/app/src/pages/api/core/app/mcpTools/update.ts	Removes legacy `toolId` field when building MCP toolset node.
projects/app/src/pages/api/core/app/mcpTools/create.ts	Removes legacy `toolId` field when building MCP toolset node.
projects/app/package.json	Bumps app version.
packages/web/i18n/zh-Hant/common.json	Renames i18n key for “tool deleted”.
packages/web/i18n/zh-CN/common.json	Renames i18n key for “tool deleted”.
packages/web/i18n/en/common.json	Renames i18n key for “tool deleted”.
packages/service/support/permission/app/auth.ts	Renames helper to `authWorkflowToolByTmbId` and simplifies auth path.
packages/service/core/workflow/dispatch/utils.ts	Passes `toolsetName` into MCP/HTTP runtime node creation.
packages/service/core/workflow/dispatch/plugin/run.ts	Refactors workflow-tool execution path; adds version lookup + name i18n parsing.
packages/service/core/workflow/dispatch/child/runTool.ts	Introduces `parseToolId` helper for MCP/HTTP tool ids.
packages/service/core/workflow/dispatch/ai/agent/utils.ts	Renames runtime tool builder function used by agent.
packages/service/core/workflow/dispatch/ai/agent/sub/tool/utils.ts	Updates MCP/HTTP runtime node creation to pass `toolsetName`.
packages/service/core/workflow/dispatch/ai/agent/sub/tool/index.ts	Reuses `parseToolId` for MCP/HTTP tool dispatch.
packages/service/core/plugin/tool/systemToolSchema.ts	Adds clarifying comment for `pluginId`.
packages/service/core/app/utils.ts	Minor comment cleanup.
packages/service/core/app/tool/runtime/utils.ts	Refines which tool sources incur direct plugin cost.
packages/service/core/app/tool/controller.ts	Renames params for system-tool lookup and updates preview-node formatting logic.
packages/global/core/workflow/type/node.ts	Updates tool config schema (removes MCP toolset `toolId`, adds comments).
packages/global/core/app/tool/utils.ts	Refactors tool-id parsing contract + return shape.
packages/global/core/app/tool/mcpTool/utils.ts	Removes MCP toolset `toolId` and requires `toolsetName` for tool runtime node naming.
packages/global/core/app/tool/httpTool/utils.ts	Requires `toolsetName` for HTTP tool runtime node naming.
packages/global/common/error/code/plugin.ts	Updates “tool deleted” i18n key.
document/data/doc-last-modified.json	Updates doc timestamps.
document/content/docs/toc.mdx	Adds 4.14.9 entry to upgrading TOC.
document/content/docs/self-host/upgrading/4-14/4149.mdx	Adds 4.14.9 (in-progress) upgrade notes.

Comments suppressed due to low confidence (1)

packages/service/core/workflow/dispatch/plugin/run.ts:72

In the system-tool adaptation branch, toolConfig.systemTool.toolId is set to formatPluginId from splitCombineToolId(pluginId). If splitCombineToolId returns the raw tool suffix (e.g. websearch) instead of the full id (systemTool-websearch), getSystemToolById/MongoSystemTool.findOne({ pluginId }) will fail to resolve the tool. Safer options: pass the original pluginId through here, or ensure splitCombineToolId preserves the full systemTool-* id for system tools.

    // Adapt <= 4.10 system tool
    const { source, pluginId: formatPluginId } = splitCombineToolId(pluginId);
    if (source === AppToolSourceEnum.systemTool) {
      return await dispatchRunTool({
        ...props,
        node: {
          ...props.node,
          toolConfig: {
            systemTool: {
              toolId: formatPluginId
            }
          }

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

packages/service/core/app/tool/controller.ts

packages/global/core/workflow/type/node.ts

projects/app/package.json

Copilot · 2026-03-11T14:59:29Z

test/cases/global/core/app/tool/utils.test.ts


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


This test file still asserts the old splitCombineToolId contract in multiple places (e.g. commercial/systemTool/community pluginId expectations and the thrown error message text). With the updated implementation (now throwing 'toolId not found' and changing what pluginId contains for some prefixed ids), these assertions will fail unless the tests are updated to the new expected outputs (or the implementation is adjusted to preserve the old outputs).

packages/global/core/app/tool/utils.ts

github-actions · 2026-03-11T15:08:33Z

Preview fastgpt Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_9dc15d9c48b946a76b4ae6b7eec8d9677b4d2cd3

c121914yu · 2026-03-11T15:11:30Z

✅ 测试更新

已为 parseToolId 函数添加完整的测试覆盖:

测试文件

test/cases/service/core/workflow/dispatch/tools/runTool.test.ts

测试覆盖

✅ 24 个测试用例全部通过
✅ 新版格式测试 (4 个用例)
✅ 旧版格式测试 (4 个用例)
✅ 边界情况测试 (6 个用例)
✅ 向后兼容性测试 (2 个用例)
✅ 真实场景测试 (4 个用例)
✅ 性能测试 (2 个用例)
✅ 错误处理测试 (3 个用例)

测试结果

Test Files  1 passed (1)
Tests       24 passed (24)
Duration    1.14s

性能测试结果

10,000 次解析耗时: 2ms
平均每次解析: 0.0002ms

测试覆盖了新旧格式的兼容性、边界情况、真实场景和性能要求。

fix: tool id

0b392ed

Copilot AI review requested due to automatic review settings March 11, 2026 14:48

pull-request-size bot added the size/L label Mar 11, 2026

Copilot started reviewing on behalf of c121914yu March 11, 2026 14:49 View session

c121914yu added 2 commits March 11, 2026 22:57

fix: test

48a83eb

fix: ts

fd723de

c121914yu commented Mar 11, 2026

View reviewed changes

Copilot AI reviewed Mar 11, 2026

View reviewed changes

add test

9dc15d9

pull-request-size bot added size/XL and removed size/L labels Mar 11, 2026

c121914yu merged commit 38f6f9d into labring:main Mar 11, 2026
7 checks passed

Conversation

c121914yu commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview sandbox Image:

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview mcp_server Image:

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Docs Preview:

Uh oh!

c121914yu left a comment

Choose a reason for hiding this comment

📊 代码审查总结

主要问题

优点

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview fastgpt Image:

Uh oh!

c121914yu commented Mar 11, 2026

✅ 测试更新

测试文件

测试覆盖

测试结果

性能测试结果

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Mar 11, 2026 •

edited

Loading

github-actions bot commented Mar 11, 2026 •

edited

Loading

github-actions bot commented Mar 11, 2026 •

edited

Loading

github-actions bot commented Mar 11, 2026 •

edited

Loading