feature: System plugin (#5131)

* feat: system Tool (#4959)

* feat: independent system tool

* chore: use ToolNode instead of PluginModule

* chore: tools

* chore: tools templateDir

* refactor: templates

* feat: flush code

* chore: update template

* refactor: migrate delay

* feat: worker pool

* chore: Dockerfile

* docs:  add tools.template.json

* feat: auto flush system tools

* fix: ts error

* chore: create new pool temporarily

* chore: system tool migration

* chore: migration

* fix: fix pnpm-workspace.yaml

* chore: update pnpm-lock.yaml to integrate tool

* chore(systemTool): chore

* chore: add system plugin

* chore(deps): update @fastgpt-sdk/plugin

* fix: type error

* chore: remove plugin package

* chore: move pro plugins code to open source

* feat: support system tool config input

* fix: type error

* perf: i18n

* fix: cr

* chore: update sdk

* feat: system plugin cache

* update mcp server (#5076)

* update mcp server

* fix: action

* fix: dockerfile

* fix: dockerfile

* fix: dockerfile

* fix: dockerfile

* fix: dockerfile

* fix: dockerfile

* feat: system Tool (#4959)

* feat: independent system tool

* chore: use ToolNode instead of PluginModule

* chore: tools

* chore: tools templateDir

* refactor: templates

* feat: flush code

* chore: update template

* refactor: migrate delay

* feat: worker pool

* chore: Dockerfile

* docs:  add tools.template.json

* feat: auto flush system tools

* fix: ts error

* chore: create new pool temporarily

* chore: system tool migration

* chore: migration

* fix: fix pnpm-workspace.yaml

* chore: update pnpm-lock.yaml to integrate tool

* chore(systemTool): chore

* chore: add system plugin

* chore(deps): update @fastgpt-sdk/plugin

* fix: type error

* chore: remove plugin package

* chore: move pro plugins code to open source

* feat: support system tool config input

* fix: type error

* perf: i18n

* fix: cr

* chore: update sdk

* feat: system plugin cache

* perf: run tool

* update package

* perf: config key

* fix: tool ini

* tool config params

* perf: workflow type

* rename tools to  agent

* version list

* perf: tool error

* config secret ux

* perf: config secret ux

* fix: tool config field

* add course to secret input

* feat: support inputConfig switch (#5099)

* feat: support inputConfig switch

* deps: update @fastgpt-sdk/plugin

* chore: update workflows

* fix: inputType

* fix: secret

* add default value to node

* update i18n

* eslint

* add precision to number input

* feat: add number input and select

* perf: number ux

* fix: code

* Proxies image requests to plugin service (#5111)

* Proxies image requests to plugin service

Adds a rewrite rule and API endpoint to proxy image requests
to the plugin service. This allows the app to fetch images from
the plugin's tools directory.

It also adds the plugin base URL to the service's constants, so that
it can use the plugin URL when proxying requests.

* fix: update FastGPTPluginUrl to remove unnecessary API path

* feat: update image proxy destination and add plugin image handler

* Adapt plugin id

* replace avatar

* remove rewrite

* fix: plugin avatar

* update system tool doc

* feat: system tool type

* yml sh

* yml sh

* update doc

* fix: simple app tool select

* fix: switch ui

* update pacakge

* Yamljs (#5129)

* update docker-compose configuration: bump fastgpt and fastgpt-plugin images, change minio host to service name, and adjust service dependencies

* refactor: comment out port exposure in docker-compose configuration

* update: uncomment port exposure in docker-compose configuration

* update: change MINIO_HOST to use specific IP address in docker configuration

* update: modify fastgpt-plugin image version in docker configuration

* update readme

* doc

* remove

---------

Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com>

packages/service/core/workflow/dispatch/ai/agent/functionCall.ts

@@ -19,11 +19,7 @@ import {
   getLLMDefaultUsage
 } from '@fastgpt/global/core/ai/constants';
 import { dispatchWorkFlow } from '../../index';
-import {
-  type DispatchToolModuleProps,
-  type RunToolResponse,
-  type ToolNodeItemType
-} from './type.d';
+import { type DispatchToolModuleProps, type RunToolResponse, type ToolNodeItemType } from './type';
 import json5 from 'json5';
 import { type DispatchFlowResponse, type WorkflowResponseType } from '../../type';
 import { countGptMessagesTokens } from '../../../../../common/string/tiktoken/index';

packages/service/core/workflow/dispatch/ai/agent/index.ts

@@ -8,7 +8,7 @@ import type {
 import { getLLMModel } from '../../../../ai/model';
 import { filterToolNodeIdByEdges, getHistories } from '../../utils';
 import { runToolWithToolChoice } from './toolChoice';
-import { type DispatchToolModuleProps, type ToolNodeItemType } from './type.d';
+import { type DispatchToolModuleProps, type ToolNodeItemType } from './type';
 import { type ChatItemType, type UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import {

packages/service/core/workflow/dispatch/ai/agent/promptCall.ts

@@ -14,11 +14,7 @@ import {
   getLLMDefaultUsage
 } from '@fastgpt/global/core/ai/constants';
 import { dispatchWorkFlow } from '../../index';
-import {
-  type DispatchToolModuleProps,
-  type RunToolResponse,
-  type ToolNodeItemType
-} from './type.d';
+import { type DispatchToolModuleProps, type RunToolResponse, type ToolNodeItemType } from './type';
 import json5 from 'json5';
 import { countGptMessagesTokens } from '../../../../../common/string/tiktoken/index';
 import {

packages/service/core/workflow/dispatch/ai/agent/toolChoice.ts

@@ -15,11 +15,7 @@ import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/cons
 import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constants';
 import { dispatchWorkFlow } from '../../index';
-import {
-  type DispatchToolModuleProps,
-  type RunToolResponse,
-  type ToolNodeItemType
-} from './type.d';
+import { type DispatchToolModuleProps, type RunToolResponse, type ToolNodeItemType } from './type';
 import json5 from 'json5';
 import { type DispatchFlowResponse, type WorkflowResponseType } from '../../type';
 import { countGptMessagesTokens } from '../../../../../common/string/tiktoken/index';

packages/service/core/workflow/dispatch/ai/agent/type.d.ts

@@ -10,7 +10,7 @@ import type {
 } from '@fastgpt/global/core/workflow/runtime/type';
 import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type';
 import { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
-import type { DispatchFlowResponse } from '../../type.d';
+import type { DispatchFlowResponse } from '../../type';
 import type { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import type { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';

packages/service/core/workflow/dispatch/dataset/search.ts

@@ -3,7 +3,7 @@ import {
   type DispatchNodeResultType
 } from '@fastgpt/global/core/workflow/runtime/type.d';
 import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
-import type { SelectedDatasetType } from '@fastgpt/global/core/workflow/api.d';
+import type { SelectedDatasetType } from '@fastgpt/global/core/workflow/type/io';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { getEmbeddingModel, getRerankModel } from '../../../ai/model';

packages/service/core/workflow/dispatch/index.ts

@@ -1,9 +1,21 @@
+import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { getSystemTime } from '@fastgpt/global/common/time/timezone';
+import type {
+  AIChatItemValueItemType,
+  ChatHistoryItemResType,
+  NodeOutputItemType,
+  ToolRunResponseItemType
+} from '@fastgpt/global/core/chat/type.d';
+import type { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeTypeEnum
+} from '@fastgpt/global/core/workflow/node/constant';
 import {
   DispatchNodeResponseKeyEnum,
   SseResponseEventEnum
 } from '@fastgpt/global/core/workflow/runtime/constants';
-import type { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type {
   ChatDispatchProps,
   DispatchNodeResultType,
@@ -11,71 +23,58 @@ import type {
   SystemVariablesType
 } from '@fastgpt/global/core/workflow/runtime/type';
 import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type.d';
-import type {
-  AIChatItemValueItemType,
-  ChatHistoryItemResType,
-  NodeOutputItemType,
-  ToolRunResponseItemType
-} from '@fastgpt/global/core/chat/type.d';
-import {
-  FlowNodeInputTypeEnum,
-  FlowNodeTypeEnum
-} from '@fastgpt/global/core/workflow/node/constant';
-import { getNanoid } from '@fastgpt/global/common/string/tools';
-import { getSystemTime } from '@fastgpt/global/common/time/timezone';
-
-import { dispatchWorkflowStart } from './init/workflowStart';
-import { dispatchChatCompletion } from './chat/oneapi';
-import { dispatchDatasetSearch } from './dataset/search';
-import { dispatchDatasetConcat } from './dataset/concat';
-import { dispatchAnswer } from './tools/answer';
-import { dispatchClassifyQuestion } from './agent/classifyQuestion';
-import { dispatchContentExtract } from './agent/extract';
-import { dispatchHttp468Request } from './tools/http468';
-import { dispatchAppRequest } from './abandoned/runApp';
-import { dispatchQueryExtension } from './tools/queryExternsion';
-import { dispatchRunPlugin } from './plugin/run';
-import { dispatchPluginInput } from './plugin/runInput';
-import { dispatchPluginOutput } from './plugin/runOutput';
-import { formatHttpError, removeSystemVariable, rewriteRuntimeWorkFlow } from './utils';
-import { valueTypeFormat } from '@fastgpt/global/core/workflow/runtime/utils';
-import {
-  filterWorkflowEdges,
-  checkNodeRunStatus,
-  textAdaptGptResponse,
-  replaceEditorVariable
-} from '@fastgpt/global/core/workflow/runtime/utils';
-import type { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
-import { dispatchRunTools } from './agent/runTool/index';
+import { getErrText } from '@fastgpt/global/common/error/utils';
 import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
-import type { DispatchFlowResponse } from './type';
-import { dispatchStopToolCall } from './agent/runTool/stopTool';
-import { dispatchLafRequest } from './tools/runLaf';
-import { dispatchIfElse } from './tools/runIfElse';
+import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
+import {
+  checkNodeRunStatus,
+  filterWorkflowEdges,
+  getReferenceVariableValue,
+  replaceEditorVariable,
+  textAdaptGptResponse,
+  valueTypeFormat
+} from '@fastgpt/global/core/workflow/runtime/utils';
+import type {
+  InteractiveNodeResponseType,
+  WorkflowInteractiveResponseType
+} from '@fastgpt/global/core/workflow/template/system/interactive/type';
 import type { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
-import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
-import { dispatchSystemConfig } from './init/systemConfig';
-import { dispatchUpdateVariable } from './tools/runUpdateVar';
+import type { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
 import { addLog } from '../../../common/system/log';
 import { surrenderProcess } from '../../../common/system/tools';
+import { dispatchAppRequest } from './abandoned/runApp';
+import { dispatchClassifyQuestion } from './ai/classifyQuestion';
+import { dispatchContentExtract } from './ai/extract';
+import { dispatchRunTools } from './ai/agent/index';
+import { dispatchStopToolCall } from './ai/agent/stopTool';
+import { dispatchToolParams } from './ai/agent/toolParams';
+import { dispatchChatCompletion } from './ai/chat';
 import { dispatchRunCode } from './code/run';
-import { dispatchTextEditor } from './tools/textEditor';
-import { dispatchCustomFeedback } from './tools/customFeedback';
-import { dispatchReadFiles } from './tools/readFiles';
+import { dispatchDatasetConcat } from './dataset/concat';
+import { dispatchDatasetSearch } from './dataset/search';
+import { dispatchSystemConfig } from './init/systemConfig';
+import { dispatchWorkflowStart } from './init/workflowStart';
+import { dispatchFormInput } from './interactive/formInput';
 import { dispatchUserSelect } from './interactive/userSelect';
-import type {
-  WorkflowInteractiveResponseType,
-  InteractiveNodeResponseType
-} from '@fastgpt/global/core/workflow/template/system/interactive/type';
-import { dispatchRunAppNode } from './plugin/runApp';
 import { dispatchLoop } from './loop/runLoop';
 import { dispatchLoopEnd } from './loop/runLoopEnd';
 import { dispatchLoopStart } from './loop/runLoopStart';
-import { dispatchFormInput } from './interactive/formInput';
-import { dispatchToolParams } from './agent/runTool/toolParams';
-import { getErrText } from '@fastgpt/global/common/error/utils';
-import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
+import { dispatchRunPlugin } from './plugin/run';
+import { dispatchRunAppNode } from './plugin/runApp';
+import { dispatchPluginInput } from './plugin/runInput';
+import { dispatchPluginOutput } from './plugin/runOutput';
 import { dispatchRunTool } from './plugin/runTool';
+import { dispatchAnswer } from './tools/answer';
+import { dispatchCustomFeedback } from './tools/customFeedback';
+import { dispatchHttp468Request } from './tools/http468';
+import { dispatchQueryExtension } from './tools/queryExternsion';
+import { dispatchReadFiles } from './tools/readFiles';
+import { dispatchIfElse } from './tools/runIfElse';
+import { dispatchLafRequest } from './tools/runLaf';
+import { dispatchUpdateVariable } from './tools/runUpdateVar';
+import { dispatchTextEditor } from './tools/textEditor';
+import type { DispatchFlowResponse } from './type';
+import { formatHttpError, removeSystemVariable, rewriteRuntimeWorkFlow } from './utils';
 
 const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart,
@@ -91,7 +90,7 @@ const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.pluginInput]: dispatchPluginInput,
   [FlowNodeTypeEnum.pluginOutput]: dispatchPluginOutput,
   [FlowNodeTypeEnum.queryExtension]: dispatchQueryExtension,
-  [FlowNodeTypeEnum.tools]: dispatchRunTools,
+  [FlowNodeTypeEnum.agent]: dispatchRunTools,
   [FlowNodeTypeEnum.stopTool]: dispatchStopToolCall,
   [FlowNodeTypeEnum.toolParams]: dispatchToolParams,
   [FlowNodeTypeEnum.lafModule]: dispatchLafRequest,
@@ -116,7 +115,8 @@ const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.comment]: () => Promise.resolve(),
   [FlowNodeTypeEnum.toolSet]: () => Promise.resolve(),
 
-  [FlowNodeTypeEnum.runApp]: dispatchAppRequest // abandoned
+  // @deprecated
+  [FlowNodeTypeEnum.runApp]: dispatchAppRequest
 };
 
 type Props = ChatDispatchProps & {
@@ -460,7 +460,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
 
     if (!nodeRunResult) return [];
 
-    /* 
+    /*
       特殊情况：
       通过 skipEdges 可以判断是运行了分支节点。
       由于分支节点，可能会实现递归调用（skip 连线往前递归）
@@ -729,7 +729,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       if (
         item.flowNodeType !== FlowNodeTypeEnum.userSelect &&
         item.flowNodeType !== FlowNodeTypeEnum.formInput &&
-        item.flowNodeType !== FlowNodeTypeEnum.tools
+        item.flowNodeType !== FlowNodeTypeEnum.agent
       ) {
         item.isEntry = false;
       }

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

@@ -1,8 +1,9 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
-import { dispatchWorkFlow } from '../index';
+import { getPluginInputsFromStoreNodes } from '@fastgpt/global/core/app/plugin/utils';
+import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
+import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import { getChildAppRuntimeById } from '../../../app/plugin/controller';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import {
   getWorkflowEntryNodeIds,
   storeEdges2RuntimeEdges,
@@ -13,11 +14,12 @@ import { authPluginByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { computedPluginUsage } from '../../../app/plugin/utils';
 import { filterSystemVariables } from '../utils';
-import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { getPluginRunUserQuery } from '@fastgpt/global/core/workflow/utils';
-import { getPluginInputsFromStoreNodes } from '@fastgpt/global/core/app/plugin/utils';
 import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { getChildAppRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller';
+import { dispatchWorkFlow } from '../index';
 import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
+import { dispatchRunTool } from './runTool';
 
 type RunPluginProps = ModuleDispatchProps<{
   [NodeInputKeyEnum.forbidStream]?: boolean;
@@ -35,6 +37,26 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     return Promise.reject('pluginId can not find');
   }
 
+  // Adapt <= 4.10 system tool
+  const { source, pluginId: formatPluginId } = splitCombinePluginId(pluginId);
+  if (source === PluginSourceEnum.systemTool) {
+    return dispatchRunTool({
+      ...props,
+      node: {
+        ...props.node,
+        toolConfig: {
+          systemTool: {
+            toolId: formatPluginId
+          }
+        }
+      }
+    });
+  }
+
+  /* 
+    1. Team app
+    2. Admin selected system tool
+  */
   const { files } = chatValue2RuntimePrompt(query);
 
   // auth plugin

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

@@ -1,51 +1,146 @@
+import { getErrText } from '@fastgpt/global/common/error/utils';
+import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import {
   type DispatchNodeResultType,
   type ModuleDispatchProps
 } from '@fastgpt/global/core/workflow/runtime/type';
-import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
-import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { MCPClient } from '../../../app/mcp';
-import { getErrText } from '@fastgpt/global/common/error/utils';
 import { getSecretValue } from '../../../../common/secret/utils';
 import type { McpToolDataType } from '@fastgpt/global/core/app/mcpTools/type';
+import { runTool } from '../../../app/tool/api';
+import { MongoSystemPlugin } from '../../../app/plugin/systemPluginSchema';
+import { SystemToolInputTypeEnum } from '@fastgpt/global/core/app/systemTool/constants';
+import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type';
+import { getSystemPluginById, splitCombinePluginId } from '../../../app/plugin/controller';
 
-type RunToolProps = ModuleDispatchProps<{
-  toolData?: McpToolDataType;
-  [NodeInputKeyEnum.toolData]: McpToolDataType;
-}>;
+type SystemInputConfigType = {
+  type: SystemToolInputTypeEnum;
+  value: StoreSecretValueType;
+};
 
-type RunToolResponse = DispatchNodeResultType<{
-  [NodeOutputKeyEnum.rawResponse]?: any;
-}>;
+type RunToolProps = ModuleDispatchProps<
+  {
+    [NodeInputKeyEnum.toolData]?: McpToolDataType;
+    [NodeInputKeyEnum.systemInputConfig]?: SystemInputConfigType;
+  } & Record<string, any>
+>;
+
+type RunToolResponse = DispatchNodeResultType<
+  {
+    [NodeOutputKeyEnum.rawResponse]?: any;
+  } & Record<string, any>
+>;
 
 export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolResponse> => {
   const {
     params,
-    node: { avatar }
+    runningUserInfo,
+    runningAppInfo,
+    variables,
+    node: { name, avatar, toolConfig, version }
   } = props;
 
-  const { toolData, system_toolData, ...restParams } = params;
-  const { name: toolName, url, headerSecret } = toolData || system_toolData;
-
-  const mcpClient = new MCPClient({
-    url,
-    headers: getSecretValue({
-      storeSecret: headerSecret
-    })
-  });
-
   try {
-    const result = await mcpClient.toolCall(toolName, restParams);
+    // run system tool
+    if (toolConfig?.systemTool?.toolId) {
+      const tool = await getSystemPluginById(toolConfig.systemTool!.toolId);
 
-    return {
-      [DispatchNodeResponseKeyEnum.nodeResponse]: {
-        toolRes: result,
-        moduleLogo: avatar
-      },
-      [DispatchNodeResponseKeyEnum.toolResponses]: result,
-      [NodeOutputKeyEnum.rawResponse]: result
-    };
+      const inputConfigParams = await (async () => {
+        switch (params.system_input_config?.type) {
+          case SystemToolInputTypeEnum.team:
+            return Promise.reject(new Error('This is not supported yet'));
+          case SystemToolInputTypeEnum.manual:
+            const val = params.system_input_config.value || {};
+            return getSecretValue({
+              storeSecret: val
+            });
+          case SystemToolInputTypeEnum.system:
+          default:
+            // read from mongo
+            const dbPlugin = await MongoSystemPlugin.findOne({
+              pluginId: toolConfig.systemTool?.toolId
+            }).lean();
+            return dbPlugin?.inputListVal || {};
+        }
+      })();
+      const inputs = {
+        ...Object.fromEntries(
+          Object.entries(params).filter(([key]) => key !== NodeInputKeyEnum.systemInputConfig)
+        ),
+        ...inputConfigParams
+      };
+
+      const formatToolId = tool.id.split('-')[1];
+      const result = await runTool({
+        toolId: formatToolId,
+        inputs,
+        systemVar: {
+          user: {
+            id: variables.userId,
+            teamId: runningUserInfo.teamId,
+            name: runningUserInfo.tmbId
+          },
+          app: {
+            id: runningAppInfo.id,
+            name: runningAppInfo.id
+          },
+          tool: {
+            id: formatToolId,
+            version
+          },
+          time: variables.cTime
+        }
+      });
+
+      const usagePoints = await (async () => {
+        if (
+          params.system_input_config?.type !== SystemToolInputTypeEnum.system ||
+          result[NodeOutputKeyEnum.systemError]
+        ) {
+          return 0;
+        }
+        return tool.currentCost ?? 0;
+      })();
+
+      return {
+        [DispatchNodeResponseKeyEnum.nodeResponse]: {
+          toolRes: result,
+          moduleLogo: avatar,
+          totalPoints: usagePoints
+        },
+        [DispatchNodeResponseKeyEnum.toolResponses]: result,
+        [DispatchNodeResponseKeyEnum.nodeDispatchUsages]: [
+          {
+            moduleName: name,
+            totalPoints: usagePoints
+          }
+        ],
+        ...result
+      };
+    } else {
+      // mcp tool
+      const { toolData, system_toolData, ...restParams } = params;
+      const { name: toolName, url, headerSecret } = toolData || system_toolData;
+
+      const mcpClient = new MCPClient({
+        url,
+        headers: getSecretValue({
+          storeSecret: headerSecret
+        })
+      });
+      const result = await mcpClient.toolCall(toolName, restParams);
+
+      return {
+        [DispatchNodeResponseKeyEnum.nodeResponse]: {
+          toolRes: result,
+          moduleLogo: avatar
+        },
+        [DispatchNodeResponseKeyEnum.toolResponses]: result,
+        [NodeOutputKeyEnum.rawResponse]: result
+      };
+    }
   } catch (error) {
     return {
       [DispatchNodeResponseKeyEnum.nodeResponse]: {

packages/service/core/workflow/dispatch/tools/http468.ts

@@ -1,5 +1,6 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
+import { getErrText } from '@fastgpt/global/common/error/utils';
 import {
+  ContentTypes,
   NodeInputKeyEnum,
   NodeOutputKeyEnum,
   VARIABLE_NODE_ID,
@@ -10,27 +11,22 @@ import {
   SseResponseEventEnum
 } from '@fastgpt/global/core/workflow/runtime/constants';
 import axios from 'axios';
-import { formatHttpError } from '../utils';
 import { valueTypeFormat } from '@fastgpt/global/core/workflow/runtime/utils';
-import { SERVICE_LOCAL_HOST } from '../../../../common/system/tools';
-import { addLog } from '../../../../common/system/log';
 import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
-import { getErrText } from '@fastgpt/global/common/error/utils';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import {
-  textAdaptGptResponse,
-  replaceEditorVariable,
   formatVariableValByType,
-  getReferenceVariableValue
+  getReferenceVariableValue,
+  replaceEditorVariable,
+  textAdaptGptResponse
 } from '@fastgpt/global/core/workflow/runtime/utils';
-import { ContentTypes } from '@fastgpt/global/core/workflow/constants';
-import { uploadFileFromBase64Img } from '../../../../common/file/gridfs/controller';
-import { ReadFileBaseUrl } from '@fastgpt/global/common/file/constants';
-import { createFileToken } from '../../../../support/permission/controller';
-import { JSONPath } from 'jsonpath-plus';
-import type { SystemPluginSpecialResponse } from '../../../../../plugins/type';
 import json5 from 'json5';
+import { JSONPath } from 'jsonpath-plus';
 import { getSecretValue } from '../../../../common/secret/utils';
 import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type';
+import { addLog } from '../../../../common/system/log';
+import { SERVICE_LOCAL_HOST } from '../../../../common/system/tools';
+import { formatHttpError } from '../utils';
 
 type PropsArrType = {
   key: string;
@@ -302,19 +298,6 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
 
   try {
     const { formatResponse, rawResponse } = await (async () => {
-      const systemPluginCb = global.systemPluginCb;
-      if (systemPluginCb[httpReqUrl]) {
-        const pluginResult = await replaceSystemPluginResponse({
-          response: await systemPluginCb[httpReqUrl](requestBody),
-          teamId,
-          tmbId
-        });
-
-        return {
-          formatResponse: pluginResult,
-          rawResponse: pluginResult
-        };
-      }
       return fetchData({
         method: httpMethod,
         url: httpReqUrl,
@@ -426,38 +409,3 @@ async function fetchData({
     rawResponse: response
   };
 }
-
-// Replace some special response from system plugin
-async function replaceSystemPluginResponse({
-  response,
-  teamId,
-  tmbId
-}: {
-  response: Record<string, any>;
-  teamId: string;
-  tmbId: string;
-}) {
-  for await (const key of Object.keys(response)) {
-    if (typeof response[key] === 'object' && response[key].type === 'SYSTEM_PLUGIN_BASE64') {
-      const fileObj = response[key] as SystemPluginSpecialResponse;
-      const filename = `${tmbId}-${Date.now()}.${fileObj.extension}`;
-      try {
-        const fileId = await uploadFileFromBase64Img({
-          teamId,
-          tmbId,
-          bucketName: 'chat',
-          base64: fileObj.value,
-          filename,
-          metadata: {}
-        });
-        response[key] = `${ReadFileBaseUrl}/${filename}?token=${await createFileToken({
-          bucketName: 'chat',
-          teamId,
-          uid: tmbId,
-          fileId
-        })}`;
-      } catch (error) {}
-    }
-  }
-  return response;
-}