use tool_node_version to judge tool node & agent node data transfer

web/app/components/workflow/nodes/agent/default.ts

@@ -7,7 +7,7 @@ import { renderI18nObject } from '@/i18n'
 
 const nodeDefault: NodeDefault<AgentNodeType> = {
   defaultValue: {
-    version: '2',
+    tool_node_version: '2',
   },
   getAvailablePrevNodes(isChatMode) {
     return isChatMode
@@ -62,27 +62,29 @@ const nodeDefault: NodeDefault<AgentNodeType> = {
           const userSettings = toolValue.settings
           const reasoningConfig = toolValue.parameters
           const version = payload.version
+          const toolNodeVersion = payload.tool_node_version
+          const mergeVersion = version || toolNodeVersion
           schemas.forEach((schema: any) => {
             if (schema?.required) {
-              if (schema.form === 'form' && !version && !userSettings[schema.name]?.value) {
+              if (schema.form === 'form' && !mergeVersion && !userSettings[schema.name]?.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
                 }
               }
-              if (schema.form === 'form' && version && !userSettings[schema.name]?.value.value) {
+              if (schema.form === 'form' && mergeVersion && !userSettings[schema.name]?.value.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
                 }
               }
-              if (schema.form === 'llm' && !version && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value) {
+              if (schema.form === 'llm' && !mergeVersion && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
                 }
               }
-              if (schema.form === 'llm' && version && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value.value) {
+              if (schema.form === 'llm' && mergeVersion && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),

web/app/components/workflow/nodes/agent/types.ts

@@ -12,6 +12,7 @@ export type AgentNodeType = CommonNodeType & {
   plugin_unique_identifier?: string
   memory?: Memory
   version?: string
+  tool_node_version?: string
 }
 
 export enum AgentFeature {

web/app/components/workflow/nodes/agent/use-config.ts

@@ -120,7 +120,7 @@ const useConfig = (id: string, payload: AgentNodeType) => {
   }
 
   const formattingLegacyData = () => {
-    if (inputs.version)
+    if (inputs.version || inputs.tool_node_version)
       return inputs
     const newData = produce(inputs, (draft) => {
       const schemas = currentStrategy?.parameters || []
@@ -131,7 +131,7 @@ const useConfig = (id: string, payload: AgentNodeType) => {
         if (targetSchema?.type === FormTypeEnum.multiToolSelector)
           draft.agent_parameters![key].value = draft.agent_parameters![key].value.map((tool: any) => formattingToolData(tool))
       })
-      draft.version = '2'
+      draft.tool_node_version = '2'
     })
     return newData
   }

web/app/components/workflow/nodes/tool/default.ts

@@ -10,7 +10,7 @@ const nodeDefault: NodeDefault<ToolNodeType> = {
   defaultValue: {
     tool_parameters: {},
     tool_configurations: {},
-    version: '2',
+    tool_node_version: '2',
   },
   getAvailablePrevNodes(isChatMode: boolean) {
     const nodes = isChatMode

web/app/components/workflow/nodes/tool/types.ts

@@ -23,4 +23,5 @@ export type ToolNodeType = CommonNodeType & {
   output_schema: Record<string, any>
   paramSchemas?: Record<string, any>[]
   version?: string
+  tool_node_version?: string
 }

web/app/components/workflow/utils/workflow-init.ts

@@ -286,8 +286,8 @@ export const initialNodes = (originNodes: Node[], originEdges: Edge[]) => {
       }
     }
 
-    if (node.data.type === BlockEnum.Tool && !(node as Node<ToolNodeType>).data.version) {
+    if (node.data.type === BlockEnum.Tool && !(node as Node<ToolNodeType>).data.version && !(node as Node<ToolNodeType>).data.tool_node_version) {
-      (node as Node<ToolNodeType>).data.version = '2'
+      (node as Node<ToolNodeType>).data.tool_node_version = '2'
 
       const toolConfigurations = (node as Node<ToolNodeType>).data.tool_configurations
       if (toolConfigurations && Object.keys(toolConfigurations).length > 0) {