4.8.6 merge (#1943)

* Dataset collection forbid (#1885)

* perf: tool call support same id

* feat: collection forbid

* feat: collection forbid

* Inheritance Permission for apps (#1897)

* feat: app schema define

chore: references of authapp

* feat: authApp method inheritance

* feat: create and update api

* feat: update

* feat: inheritance Permission controller for app.

* feat: abstract version of inheritPermission

* feat: ancestorId for apps

* chore: update app

* fix: inheritPermission abstract version

* feat: update folder defaultPermission

* feat: app update api

* chore: inheritance frontend

* chore: app list api

* feat: update defaultPermission in app deatil

* feat: backend api finished

* feat: app inheritance permission fe

* fix: app update defaultpermission causes collaborator miss

* fix: ts error

* chore: adjust the codes

* chore: i18n

chore: i18n

* chore: fe adjust and i18n

* chore: adjust the code

* feat: resume api;
chore: rewrite update api and inheritPermission methods

* chore: something

* chore: fe code adjusting

* feat: frontend adjusting

* chore: fe code adjusting

* chore: adjusting the code

* perf: fe loading

* format

* Inheritance fix (#1908)

* fix: SlideCard

* fix: authapp did not return parent app for inheritance app

* fix: fe adjusting

* feat: fe adjusing

* perf: inherit per ux

* doc

* fix: ts errors (#1916)

* perf: inherit permission

* fix: permission inherit

* Workflow type (#1938)

* perf: workflow type

tmp workflow

perf: workflow type

feat: custom field config

* perf: dynamic input

* perf: node classify

* perf: node classify

* perf: node classify

* perf: node classify

* fix: workflow custom input

* feat: text editor and customFeedback move to basic nodes

* feat: community system plugin

* fix: ts

* feat: exprEval plugin

* perf: workflow type

* perf: plugin important

* fix: default templates

* perf: markdown hr css

* lock

* perf: fetch url

* perf: new plugin version

* fix: chat histories update

* fix: collection paths invalid

* perf: app card ui

---------

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

packages/service/core/workflow/dispatch/agent/classifyQuestion.ts

@@ -3,10 +3,10 @@ import { countMessagesTokens } from '../../../../common/string/tiktoken/index';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { getAIApi } from '../../../ai/config';
-import type { ClassifyQuestionAgentItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ClassifyQuestionAgentItemType } from '@fastgpt/global/core/workflow/template/system/classifyQuestion/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
 import { Prompt_CQJson } from '@fastgpt/global/core/ai/prompt/agent';
 import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';

packages/service/core/workflow/dispatch/agent/extract.ts

@@ -7,10 +7,10 @@ import {
 } from '../../../../common/string/tiktoken/index';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { getAIApi } from '../../../ai/config';
-import type { ContextExtractAgentItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ContextExtractAgentItemType } from '@fastgpt/global/core/workflow/template/system/contextExtract/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { Prompt_ExtractJson } from '@fastgpt/global/core/ai/prompt/agent';
 import { replaceVariable, sliceJsonStr } from '@fastgpt/global/common/string/tools';
 import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';

packages/service/core/workflow/dispatch/agent/runTool/stopTool.ts

@@ -1,5 +1,5 @@
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 
 export type AnswerProps = ModuleDispatchProps<{}>;

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

@@ -377,31 +377,41 @@ async function streamResponse({
           if (toolCall.function?.arguments === undefined) {
             toolCall.function.arguments = '';
           }
-          toolCalls.push({
-            ...toolCall,
-            toolName: toolNode.name,
-            toolAvatar: toolNode.avatar
-          });
 
-          if (detail) {
-            responseWrite({
-              write,
-              event: SseResponseEventEnum.toolCall,
-              data: JSON.stringify({
-                tool: {
-                  id: toolCall.id,
-                  toolName: toolNode.name,
-                  toolAvatar: toolNode.avatar,
-                  functionName: toolCall.function.name,
-                  params: toolCall.function.arguments,
-                  response: ''
-                }
-              })
+          // Get last tool call
+          const lastToolCall = toolCalls[toolCalls.length - 1];
+
+          // new tool
+          if (lastToolCall?.id !== toolCall.id) {
+            toolCalls.push({
+              ...toolCall,
+              toolName: toolNode.name,
+              toolAvatar: toolNode.avatar
             });
-          }
-        }
 
-        continue;
+            if (detail) {
+              responseWrite({
+                write,
+                event: SseResponseEventEnum.toolCall,
+                data: JSON.stringify({
+                  tool: {
+                    id: toolCall.id,
+                    toolName: toolNode.name,
+                    toolAvatar: toolNode.avatar,
+                    functionName: toolCall.function.name,
+                    params: toolCall.function.arguments,
+                    response: ''
+                  }
+                })
+              });
+            }
+
+            continue;
+          }
+          // last tool, update params
+        } else {
+          continue;
+        }
       }
 
       /* arg 插入最后一个工具的参数里 */

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

@@ -3,7 +3,7 @@ import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workfl
 import type {
   ModuleDispatchProps,
   DispatchNodeResponseType
-} from '@fastgpt/global/core/workflow/type/index.d';
+} 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';

packages/service/core/workflow/dispatch/chat/oneapi.ts

@@ -36,7 +36,7 @@ import {
 } from '@fastgpt/global/core/ai/prompt/AIChat';
 import type { AIChatNodeProps } from '@fastgpt/global/core/workflow/runtime/type.d';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { responseWrite, responseWriteController } from '../../../../common/response';
 import { getLLMModel, ModelTypeEnum } from '../../../ai/model';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';

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

@@ -1,4 +1,4 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import axios from 'axios';
@@ -8,7 +8,7 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti
 type RunCodeType = ModuleDispatchProps<{
   [NodeInputKeyEnum.codeType]: 'js';
   [NodeInputKeyEnum.code]: string;
-  [key: string]: any;
+  [NodeInputKeyEnum.addInputParam]: Record<string, any>;
 }>;
 type RunCodeResponse = DispatchNodeResultType<{
   [NodeOutputKeyEnum.error]?: any;
@@ -18,7 +18,7 @@ type RunCodeResponse = DispatchNodeResultType<{
 
 export const dispatchRunCode = async (props: RunCodeType): Promise<RunCodeResponse> => {
   const {
-    params: { codeType, code, ...customVariables }
+    params: { codeType, code, [NodeInputKeyEnum.addInputParam]: customVariables }
   } = props;
 
   const sandBoxRequestUrl = `${process.env.SANDBOX_URL}/sandbox/js`;

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

@@ -1,5 +1,5 @@
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { datasetSearchResultConcat } from '@fastgpt/global/core/dataset/search/utils';
 import { filterSearchResultsByMaxChars } from '../../utils';

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

@@ -5,7 +5,7 @@ import {
 import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
 import type { SelectedDatasetType } from '@fastgpt/global/core/workflow/api.d';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { ModelTypeEnum, getLLMModel, getVectorModel } from '../../../ai/model';
 import { searchDatasetData } from '../../../dataset/search/controller';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';

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

@@ -2,15 +2,20 @@ import { NextApiResponse } from 'next';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
-import type { ChatDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type {
+  ChatDispatchProps,
+  ModuleDispatchProps
+} from '@fastgpt/global/core/workflow/runtime/type';
 import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
 import type {
   AIChatItemValueItemType,
   ChatHistoryItemResType,
   ToolRunResponseItemType
 } from '@fastgpt/global/core/chat/type.d';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeTypeEnum
+} from '@fastgpt/global/core/workflow/node/constant';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
 import { responseWriteNodeStatus } from '../../../common/response';
 import { getSystemTime } from '@fastgpt/global/common/time/timezone';
@@ -47,6 +52,8 @@ import { dispatchUpdateVariable } from './tools/runUpdateVar';
 import { addLog } from '../../../common/system/log';
 import { surrenderProcess } from '../../../common/system/tools';
 import { dispatchRunCode } from './code/run';
+import { dispatchTextEditor } from './tools/textEditor';
+import { dispatchCustomFeedback } from './tools/customFeedback';
 
 const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart,
@@ -68,6 +75,8 @@ const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.ifElseNode]: dispatchIfElse,
   [FlowNodeTypeEnum.variableUpdate]: dispatchUpdateVariable,
   [FlowNodeTypeEnum.code]: dispatchRunCode,
+  [FlowNodeTypeEnum.textEditor]: dispatchTextEditor,
+  [FlowNodeTypeEnum.customFeedback]: dispatchCustomFeedback,
 
   // none
   [FlowNodeTypeEnum.systemConfig]: dispatchSystemConfig,
@@ -259,8 +268,26 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
   }
   /* Inject data into module input */
   function getNodeRunParams(node: RuntimeNodeItemType) {
-    const params: Record<string, any> = {};
+    if (node.flowNodeType === FlowNodeTypeEnum.pluginInput) {
+      return node.inputs.reduce<Record<string, any>>((acc, item) => {
+        acc[item.key] = valueTypeFormat(item.value, item.valueType);
+        return acc;
+      }, {});
+    }
+
+    // common nodes
+    const dynamicInput = node.inputs.find(
+      (item) => item.renderTypeList[0] === FlowNodeInputTypeEnum.addInputParam
+    );
+    const params: Record<string, any> = dynamicInput
+      ? {
+          [dynamicInput.key]: {}
+        }
+      : {};
+
     node.inputs.forEach((input) => {
+      if (input.key === dynamicInput?.key) return;
+
       // replace {{}} variables
       let value = replaceVariable(input.value, variables);
 
@@ -270,7 +297,13 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
         nodes: runtimeNodes,
         variables
       });
-      // format valueType
+
+      // concat dynamic inputs
+      if (input.canEdit && dynamicInput && params[dynamicInput.key]) {
+        params[dynamicInput.key][input.key] = valueTypeFormat(value, input.valueType);
+      }
+
+      // Not dynamic input
       params[input.key] = valueTypeFormat(value, input.valueType);
     });
 

packages/service/core/workflow/dispatch/init/workflowStart.tsx

@@ -1,7 +1,7 @@
 import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 export type UserChatInputProps = ModuleDispatchProps<{
   [NodeInputKeyEnum.userChatInput]: string;
   [NodeInputKeyEnum.inputFiles]: UserChatItemValueItemType['file'][];

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

@@ -1,7 +1,6 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { dispatchWorkFlow } from '../index';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
-import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { getPluginRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller';
 import {
@@ -11,7 +10,6 @@ import {
 } from '@fastgpt/global/core/workflow/runtime/utils';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { updateToolInputValue } from '../agent/runTool/utils';
-import { replaceVariable } from '@fastgpt/global/common/string/tools';
 import { authAppByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
@@ -50,41 +48,6 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     (item) => item.flowNodeType === FlowNodeTypeEnum.pluginInput
   );
   if (!inputModule) return Promise.reject('Plugin error, It has no set input.');
-  const hasDynamicInput = inputModule.inputs.find(
-    (input) => input.key === NodeInputKeyEnum.addInputParam
-  );
-
-  const startParams: Record<string, any> = (() => {
-    if (!hasDynamicInput) return data;
-
-    const params: Record<string, any> = {
-      [NodeInputKeyEnum.addInputParam]: {}
-    };
-
-    for (const key in data) {
-      if (key === NodeInputKeyEnum.addInputParam) continue;
-
-      const input = inputModule.inputs.find((input) => input.key === key);
-      if (input) {
-        params[key] = data[key];
-      } else {
-        params[NodeInputKeyEnum.addInputParam][key] = data[key];
-      }
-    }
-
-    return params;
-  })();
-
-  // replace input by dynamic variables
-  if (hasDynamicInput) {
-    for (const key in startParams) {
-      if (key === NodeInputKeyEnum.addInputParam) continue;
-      startParams[key] = replaceVariable(
-        startParams[key],
-        startParams[NodeInputKeyEnum.addInputParam]
-      );
-    }
-  }
 
   const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
     ...props,
@@ -96,7 +59,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
             showStatus: false,
             inputs: updateToolInputValue({
               inputs: node.inputs,
-              params: startParams
+              params: data
             })
           };
         }

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

@@ -1,4 +1,4 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 
 export type PluginInputProps = ModuleDispatchProps<{
   [key: string]: any;

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

@@ -1,4 +1,4 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type.d';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 

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

@@ -4,7 +4,7 @@ import {
 } from '@fastgpt/global/core/workflow/runtime/constants';
 import { responseWrite } from '../../../../common/response';
 import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 export type AnswerProps = ModuleDispatchProps<{

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

@@ -0,0 +1,54 @@
+import {
+  DispatchNodeResponseKeyEnum,
+  SseResponseEventEnum
+} from '@fastgpt/global/core/workflow/runtime/constants';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
+import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
+import { addCustomFeedbacks } from '../../../chat/controller';
+import { responseWrite } from '../../../../common/response';
+import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
+
+type Props = ModuleDispatchProps<{
+  [NodeInputKeyEnum.textareaInput]: string;
+}>;
+type Response = DispatchNodeResultType<{}>;
+
+export const dispatchCustomFeedback = (props: Record<string, any>): Response => {
+  const {
+    res,
+    app: { _id: appId },
+    chatId,
+    responseChatItemId: chatItemId,
+    stream,
+    detail,
+    params: { system_textareaInput: feedbackText = '' }
+  } = props as Props;
+
+  setTimeout(() => {
+    addCustomFeedbacks({
+      appId,
+      chatId,
+      chatItemId,
+      feedbacks: [feedbackText]
+    });
+  }, 60000);
+
+  if (stream) {
+    if (!chatId || !chatItemId) {
+      responseWrite({
+        res,
+        event: detail ? SseResponseEventEnum.fastAnswer : undefined,
+        data: textAdaptGptResponse({
+          text: `\n\n**自定义反馈成功: (仅调试模式下展示该内容)**: "${feedbackText}"\n\n`
+        })
+      });
+    }
+  }
+
+  return {
+    [DispatchNodeResponseKeyEnum.nodeResponse]: {
+      textOutput: feedbackText
+    }
+  };
+};

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

@@ -1,4 +1,4 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import {
   NodeInputKeyEnum,
   NodeOutputKeyEnum,
@@ -16,6 +16,7 @@ import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/ty
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { responseWrite } from '../../../../common/response';
 import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
+import { getCommunityCb } from '@fastgpt/plugins/register';
 
 type PropsArrType = {
   key: string;
@@ -65,14 +66,17 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
     return Promise.reject('Http url is empty');
   }
 
-  const concatVariables = {
+  const systemVariables = {
     appId,
     chatId,
     responseChatItemId,
+    histories: histories?.slice(-10) || []
+  };
+  const concatVariables = {
     ...variables,
-    histories: histories?.slice(-10) || [],
     ...body,
-    ...dynamicInput
+    // ...dynamicInput,
+    ...systemVariables
   };
 
   const allVariables = {
@@ -116,13 +120,23 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
   })();
 
   try {
-    const { formatResponse, rawResponse } = await fetchData({
-      method: httpMethod,
-      url: httpReqUrl,
-      headers,
-      body: requestBody,
-      params
-    });
+    const { formatResponse, rawResponse } = await (async () => {
+      const communityPluginCb = await getCommunityCb();
+      if (communityPluginCb[httpReqUrl]) {
+        const pluginResult = await communityPluginCb[httpReqUrl](requestBody);
+        return {
+          formatResponse: pluginResult,
+          rawResponse: pluginResult
+        };
+      }
+      return fetchData({
+        method: httpMethod,
+        url: httpReqUrl,
+        headers,
+        body: requestBody,
+        params
+      });
+    })();
 
     // format output value type
     const results: Record<string, any> = {};
@@ -183,7 +197,7 @@ async function fetchData({
   headers: Record<string, any>;
   body: Record<string, any>;
   params: Record<string, any>;
-}): Promise<Record<string, any>> {
+}) {
   const { data: response } = await axios({
     method,
     baseURL: `http://${SERVICE_LOCAL_HOST}`,

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

@@ -1,5 +1,5 @@
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { ModelTypeEnum, getLLMModel } from '../../../../core/ai/model';

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

@@ -1,6 +1,6 @@
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
-import { SelectAppItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
+import { SelectAppItemType } from '@fastgpt/global/core/workflow/template/system/runApp/type';
 import { dispatchWorkFlow } from '../index';
 import { responseWrite } from '../../../../common/response';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';

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

@@ -10,7 +10,7 @@ import {
   IfElseConditionType,
   IfElseListItemType
 } from '@fastgpt/global/core/workflow/template/system/ifElse/type';
-import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type';
+import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { getElseIFLabel, getHandleId } from '@fastgpt/global/core/workflow/utils';
 import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
 import { replaceRegChars } from '@fastgpt/global/common/string/tools';

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

@@ -1,4 +1,4 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import axios from 'axios';
@@ -39,11 +39,13 @@ export const dispatchLafRequest = async (props: LafRequestProps): Promise<LafRes
   }
 
   const concatVariables = {
+    ...variables,
+    ...body,
+    ...dynamicInput,
     appId,
     chatId,
     responseChatItemId,
-    ...variables,
-    ...body
+    histories: histories?.slice(-10) || []
   };
 
   httpReqUrl = replaceVariable(httpReqUrl, concatVariables);

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

@@ -6,7 +6,7 @@ import {
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
 import { TUpdateListItem } from '@fastgpt/global/core/workflow/template/system/variableUpdate/type';
-import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type';
+import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
 import { removeSystemVariable, valueTypeFormat } from '../utils';
 import { responseWrite } from '../../../../common/response';
 

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

@@ -0,0 +1,52 @@
+import {
+  DispatchNodeResponseKeyEnum,
+  SseResponseEventEnum
+} from '@fastgpt/global/core/workflow/runtime/constants';
+import { responseWrite } from '../../../../common/response';
+import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
+import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
+import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
+import { replaceVariable } from '@fastgpt/global/common/string/tools';
+
+type Props = ModuleDispatchProps<{
+  [NodeInputKeyEnum.textareaInput]: string;
+  [NodeInputKeyEnum.addInputParam]: Record<string, any>;
+}>;
+type Response = DispatchNodeResultType<{
+  [NodeOutputKeyEnum.text]: string;
+}>;
+
+export const dispatchTextEditor = (props: Record<string, any>): Response => {
+  const {
+    variables,
+    params: { system_textareaInput: text = '', system_addInputParam: customVariables = {} }
+  } = props as Props;
+
+  // format variable
+  Object.keys(customVariables).forEach((key) => {
+    let val = customVariables[key];
+
+    if (typeof val === 'object') {
+      val = JSON.stringify(val, null, 2);
+    } else if (typeof val === 'number') {
+      val = String(val);
+    } else if (typeof val === 'boolean') {
+      val = val ? 'true' : 'false';
+    }
+
+    customVariables[key] = val;
+  });
+
+  const textResult = replaceVariable(text, {
+    ...customVariables,
+    ...variables
+  });
+
+  return {
+    [NodeOutputKeyEnum.text]: textResult,
+    [DispatchNodeResponseKeyEnum.nodeResponse]: {
+      textOutput: textResult
+    }
+  };
+};

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

@@ -6,6 +6,7 @@ import {
   NodeOutputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
 import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/runtime/type';
+import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io';
 
 export const filterToolNodeIdByEdges = ({
   nodeId,