From cfb54a0e7d3883207a0182ad178beca5e06b57ec Mon Sep 17 00:00:00 2001
From: yyh <yuanyouhuilyz@gmail.com>
Date: Sat, 27 Dec 2025 15:06:32 +0800
Subject: [PATCH] fix: enhance version management and validation in workflow
 hooks

- Updated `useVibeFlowData` to prevent adding empty graphs and ensure the current version is correctly derived from available versions.
- Improved error handling in `applyFlowchartToWorkflow` to notify users when the current flow graph is invalid.
- Added checks to only add valid workflow graphs to the versions list, enhancing data integrity.
---
 .../workflow/hooks/use-workflow-vibe.tsx      | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/web/app/components/workflow/hooks/use-workflow-vibe.tsx b/web/app/components/workflow/hooks/use-workflow-vibe.tsx
index a85a875747..5fec88556a 100644
--- a/web/app/components/workflow/hooks/use-workflow-vibe.tsx
+++ b/web/app/components/workflow/hooks/use-workflow-vibe.tsx
@@ -297,14 +297,25 @@ export const useVibeFlowData = ({ storageKey }: UseVibeFlowDataParams) => {
     defaultValue: 0,
   })
 
-  const current = versions?.[currentVersionIndex || 0]
+  const current = useMemo(() => {
+    if (!versions || versions.length === 0)
+      return undefined
+    const index = currentVersionIndex ?? 0
+    return versions[index] || versions[versions.length - 1]
+  }, [versions, currentVersionIndex])
 
   const addVersion = useCallback((version: FlowGraph) => {
-    setCurrentVersionIndex(() => versions?.length || 0)
+    // Prevent adding empty graphs
+    if (!version || !version.nodes || version.nodes.length === 0)
+      return
+
     setVersions((prev) => {
-      return [...prev!, version]
+      const newVersions = [...(prev || []), version]
+      // Set index in setVersions callback to ensure using the latest length
+      setCurrentVersionIndex(newVersions.length - 1)
+      return newVersions
     })
-  }, [setVersions, setCurrentVersionIndex, versions?.length])
+  }, [setVersions, setCurrentVersionIndex])
 
   return {
     versions,
@@ -672,6 +683,11 @@ export const useWorkflowVibe = () => {
   }, [nodeTypeLookup, toolLookup])
 
   const applyFlowchartToWorkflow = useCallback(() => {
+    if (!currentFlowGraph || !currentFlowGraph.nodes || currentFlowGraph.nodes.length === 0) {
+      Toast.notify({ type: 'error', message: t('workflow.vibe.invalidFlowchart') })
+      return
+    }
+
     const { setNodes, setEdges } = store.getState()
     const vibePanelPreviewNodes = currentFlowGraph.nodes || []
     const vibePanelPreviewEdges = currentFlowGraph.edges || []
@@ -687,6 +703,7 @@ export const useWorkflowVibe = () => {
       vibePanelMermaidCode: '',
     }))
   }, [
+    currentFlowGraph,
     handleSyncWorkflowDraft,
     nodeTypeLookup,
     nodesMetaDataMap,
@@ -794,7 +811,10 @@ export const useWorkflowVibe = () => {
       }))
 
       const workflowGraph = await flowchartToWorkflowGraph(mermaidCode)
-      addVersion(workflowGraph)
+      // Only add to versions if workflowGraph contains nodes
+      if (workflowGraph && workflowGraph.nodes && workflowGraph.nodes.length > 0) {
+        addVersion(workflowGraph)
+      }
 
       if (skipPanelPreview)
         applyFlowchartToWorkflow()