Merge branch 'main' into feat/rag-pipeline

web/app/components/workflow/header/running-title.tsx

@@ -2,6 +2,7 @@ import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useIsChatMode } from '../hooks'
 import { useStore } from '../store'
+import { formatWorkflowRunIdentifier } from '../utils'
 import { ClockPlay } from '@/app/components/base/icons/src/vender/line/time'
 
 const RunningTitle = () => {
@@ -12,7 +13,7 @@ const RunningTitle = () => {
   return (
     <div className='flex h-[18px] items-center text-xs text-gray-500'>
       <ClockPlay className='mr-1 h-3 w-3 text-gray-500' />
-      <span>{isChatMode ? `Test Chat#${historyWorkflowData?.sequence_number}` : `Test Run#${historyWorkflowData?.sequence_number}`}</span>
+      <span>{isChatMode ? `Test Chat${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}` : `Test Run${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}</span>
       <span className='mx-1'>·</span>
       <span className='ml-1 flex h-[18px] items-center rounded-[5px] border border-indigo-300 bg-white/[0.48] px-1 text-[10px] font-semibold uppercase text-indigo-600'>
         {t('workflow.common.viewOnly')}

web/app/components/workflow/header/view-history.tsx

@@ -19,6 +19,7 @@ import {
   useWorkflowRun,
 } from '../hooks'
 import { ControlMode, WorkflowRunningStatus } from '../types'
+import { formatWorkflowRunIdentifier } from '../utils'
 import cn from '@/utils/classnames'
 import {
   PortalToFollowElem,
@@ -196,7 +197,7 @@ const ViewHistory = ({
                               item.id === historyWorkflowData?.id && 'text-text-accent',
                             )}
                           >
-                            {`Test ${isChatMode ? 'Chat' : 'Run'} #${item.sequence_number}`}
+                            {`Test ${isChatMode ? 'Chat' : 'Run'}${formatWorkflowRunIdentifier(item.finished_at)}`}
                           </div>
                           <div className='flex items-center text-xs leading-[18px] text-text-tertiary'>
                             {item.created_by_account?.name} · {formatTimeFromNow((item.finished_at || item.created_at) * 1000)}

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/index.tsx

@@ -11,7 +11,6 @@ import { ModelModeType } from '@/types/app'
 import { Theme } from '@/types/app'
 import { SchemaGeneratorDark, SchemaGeneratorLight } from './assets'
 import cn from '@/utils/classnames'
-import type { ModelInfo } from './prompt-editor'
 import PromptEditor from './prompt-editor'
 import GeneratedResult from './generated-result'
 import { useGenerateStructuredOutputRules } from '@/service/use-common'
@@ -19,7 +18,6 @@ import Toast from '@/app/components/base/toast'
 import { type FormValue, ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { useVisualEditorStore } from '../visual-editor/store'
-import { useTranslation } from 'react-i18next'
 import { useMittContext } from '../visual-editor/context'
 
 type JsonSchemaGeneratorProps = {
@@ -36,10 +34,12 @@ export const JsonSchemaGenerator: FC<JsonSchemaGeneratorProps> = ({
   onApply,
   crossAxisOffset,
 }) => {
-  const { t } = useTranslation()
+  const localModel = localStorage.getItem('auto-gen-model')
+    ? JSON.parse(localStorage.getItem('auto-gen-model') as string) as Model
+    : null
   const [open, setOpen] = useState(false)
   const [view, setView] = useState(GeneratorView.promptEditor)
-  const [model, setModel] = useState<Model>({
+  const [model, setModel] = useState<Model>(localModel || {
     name: '',
     provider: '',
     mode: ModelModeType.completion,
@@ -58,11 +58,19 @@ export const JsonSchemaGenerator: FC<JsonSchemaGeneratorProps> = ({
 
   useEffect(() => {
     if (defaultModel) {
-      setModel(prev => ({
-        ...prev,
-        name: defaultModel.model,
-        provider: defaultModel.provider.provider,
-      }))
+      const localModel = localStorage.getItem('auto-gen-model')
+        ? JSON.parse(localStorage.getItem('auto-gen-model') || '')
+        : null
+      if (localModel) {
+        setModel(localModel)
+      }
+      else {
+        setModel(prev => ({
+          ...prev,
+          name: defaultModel.model,
+          provider: defaultModel.provider.provider,
+        }))
+      }
     }
   }, [defaultModel])
 
@@ -77,22 +85,25 @@ export const JsonSchemaGenerator: FC<JsonSchemaGeneratorProps> = ({
     setOpen(false)
   }, [])
 
-  const handleModelChange = useCallback((model: ModelInfo) => {
-    setModel(prev => ({
-      ...prev,
-      provider: model.provider,
-      name: model.modelId,
-      mode: model.mode as ModelModeType,
-    }))
-  }, [])
+  const handleModelChange = useCallback((newValue: { modelId: string; provider: string; mode?: string; features?: string[] }) => {
+    const newModel = {
+      ...model,
+      provider: newValue.provider,
+      name: newValue.modelId,
+      mode: newValue.mode as ModelModeType,
+    }
+    setModel(newModel)
+    localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+  }, [model, setModel])
 
   const handleCompletionParamsChange = useCallback((newParams: FormValue) => {
-    setModel(prev => ({
-      ...prev,
+    const newModel = {
+      ...model,
       completion_params: newParams as CompletionParams,
-    }),
-    )
-  }, [])
+    }
+    setModel(newModel)
+    localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+  }, [model, setModel])
 
   const { mutateAsync: generateStructuredOutputRules, isPending: isGenerating } = useGenerateStructuredOutputRules()
 

web/app/components/workflow/nodes/llm/components/prompt-generator-btn.tsx

@@ -9,7 +9,6 @@ import GetAutomaticResModal from '@/app/components/app/configuration/config/auto
 import { AppType } from '@/types/app'
 import type { AutomaticRes } from '@/service/debug'
 import type { ModelConfig } from '@/app/components/workflow/types'
-import type { Model } from '@/types/app'
 
 type Props = {
   className?: string
@@ -20,7 +19,6 @@ type Props = {
 const PromptGeneratorBtn: FC<Props> = ({
   className,
   onGenerated,
-  modelConfig,
 }) => {
   const [showAutomatic, { setTrue: showAutomaticTrue, setFalse: showAutomaticFalse }] = useBoolean(false)
   const handleAutomaticRes = useCallback((res: AutomaticRes) => {
@@ -40,7 +38,6 @@ const PromptGeneratorBtn: FC<Props> = ({
           isShow={showAutomatic}
           onClose={showAutomaticFalse}
           onFinished={handleAutomaticRes}
-          model={modelConfig as Model}
           isInLLMNode
         />
       )}

web/app/components/workflow/panel/chat-record/index.tsx

@@ -10,6 +10,7 @@ import {
   useWorkflowStore,
 } from '../../store'
 import { useWorkflowRun } from '../../hooks'
+import { formatWorkflowRunIdentifier } from '../../utils'
 import UserInput from './user-input'
 import Chat from '@/app/components/base/chat/chat'
 import type { ChatItem, ChatItemInTree } from '@/app/components/base/chat/types'
@@ -99,7 +100,7 @@ const ChatRecord = () => {
       {fetched && (
         <>
           <div className='flex shrink-0 items-center justify-between p-4 pb-1 text-base font-semibold text-text-primary'>
-            {`TEST CHAT#${historyWorkflowData?.sequence_number}`}
+            {`TEST CHAT${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}
             <div
               className='flex h-6 w-6 cursor-pointer items-center justify-center'
               onClick={() => {

web/app/components/workflow/panel/record.tsx

@@ -4,6 +4,7 @@ import Run from '../run'
 import { useStore } from '../store'
 import { useWorkflowUpdate } from '../hooks'
 import { useHooksStore } from '../hooks-store'
+import { formatWorkflowRunIdentifier } from '../utils'
 
 const Record = () => {
   const historyWorkflowData = useStore(s => s.historyWorkflowData)
@@ -22,7 +23,7 @@ const Record = () => {
   return (
     <div className='flex h-full w-[400px] flex-col rounded-l-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xl'>
       <div className='system-xl-semibold flex items-center justify-between p-4 pb-0 text-text-primary'>
-        {`Test Run#${historyWorkflowData?.sequence_number}`}
+        {`Test Run${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}
       </div>
       <Run
         runDetailUrl={getWorkflowRunAndTraceUrl(historyWorkflowData?.id).runUrl}

web/app/components/workflow/panel/workflow-preview.tsx

@@ -20,6 +20,7 @@ import { useStore } from '../store'
 import {
   WorkflowRunningStatus,
 } from '../types'
+import { formatWorkflowRunIdentifier } from '../utils'
 import Toast from '../../base/toast'
 import InputsPanel from './inputs-panel'
 import cn from '@/utils/classnames'
@@ -88,7 +89,7 @@ const WorkflowPreview = () => {
         onMouseDown={startResizing}
       />
       <div className='flex items-center justify-between p-4 pb-1 text-base font-semibold text-text-primary'>
-        {`Test Run${!workflowRunningData?.result.sequence_number ? '' : `#${workflowRunningData?.result.sequence_number}`}`}
+        {`Test Run${formatWorkflowRunIdentifier(workflowRunningData?.result.finished_at)}`}
         <div className='cursor-pointer p-1' onClick={() => handleCancelDebugAndPreviewPanel()}>
           <RiCloseLine className='h-4 w-4 text-text-tertiary' />
         </div>

web/app/components/workflow/types.ts

@@ -376,7 +376,6 @@ export type WorkflowRunningData = {
   message_id?: string
   conversation_id?: string
   result: {
-    sequence_number?: number
     workflow_id?: string
     inputs?: string
     process_data?: string
@@ -399,9 +398,9 @@ export type WorkflowRunningData = {
 
 export type HistoryWorkflowData = {
   id: string
-  sequence_number: number
   status: string
   conversation_id?: string
+  finished_at?: number
 }
 
 export enum ChangeType {

web/app/components/workflow/update-dsl-modal.tsx

@@ -86,6 +86,8 @@ const UpdateDSLModal = ({
       graph,
       features,
       hash,
+      conversation_variables,
+      environment_variables,
     } = await fetchWorkflowDraft(`/apps/${app_id}/workflows/draft`)
 
     const { nodes, edges, viewport } = graph
@@ -122,6 +124,8 @@ const UpdateDSLModal = ({
         viewport,
         features: newFeatures,
         hash,
+        conversation_variables: conversation_variables || [],
+        environment_variables: environment_variables || [],
       },
     } as any)
   }, [eventEmitter])

web/app/components/workflow/utils/common.ts

@@ -33,3 +33,22 @@ export const isEventTargetInputArea = (target: HTMLElement) => {
   if (target.contentEditable === 'true')
     return true
 }
+
+/**
+ * Format workflow run identifier using finished_at timestamp
+ * @param finishedAt - Unix timestamp in seconds
+ * @param fallbackText - Text to show when finishedAt is not available (default: 'Running')
+ * @returns Formatted string like " (14:30:25)" or " (Running)"
+ */
+export const formatWorkflowRunIdentifier = (finishedAt?: number, fallbackText = 'Running'): string => {
+  if (!finishedAt)
+    return ` (${fallbackText})`
+
+  const date = new Date(finishedAt * 1000)
+  const timeStr = date.toLocaleTimeString([], {
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+  })
+  return ` (${timeStr})`
+}

web/app/components/workflow/utils/dagre-layout.ts

@@ -19,19 +19,87 @@ import { CUSTOM_ITERATION_START_NODE } from '../nodes/iteration-start/constants'
 import { CUSTOM_LOOP_START_NODE } from '../nodes/loop-start/constants'
 
 export const getLayoutByDagre = (originNodes: Node[], originEdges: Edge[]) => {
-  const dagreGraph = new dagre.graphlib.Graph()
+  const dagreGraph = new dagre.graphlib.Graph({ compound: true })
   dagreGraph.setDefaultEdgeLabel(() => ({}))
+
   const nodes = cloneDeep(originNodes).filter(node => !node.parentId && node.type === CUSTOM_NODE)
   const edges = cloneDeep(originEdges).filter(edge => (!edge.data?.isInIteration && !edge.data?.isInLoop))
+
+// The default dagre layout algorithm often fails to correctly order the branches
+// of an If/Else node, leading to crossed edges.
+//
+// To solve this, we employ a "virtual container" strategy:
+// 1. A virtual, compound parent node (the "container") is created for each If/Else node's branches.
+// 2. Each direct child of the If/Else node is preceded by a virtual dummy node. These dummies are placed inside the container.
+// 3. A rigid, sequential chain of invisible edges is created between these dummy nodes (e.g., dummy_IF -> dummy_ELIF -> dummy_ELSE).
+//
+// This forces dagre to treat the ordered branches as an unbreakable, atomic group,
+// ensuring their layout respects the intended logical sequence.
+  const ifElseNodes = nodes.filter(node => node.data.type === BlockEnum.IfElse)
+  let virtualLogicApplied = false
+
+  ifElseNodes.forEach((ifElseNode) => {
+    const childEdges = edges.filter(e => e.source === ifElseNode.id)
+    if (childEdges.length <= 1)
+      return
+
+    virtualLogicApplied = true
+    const sortedChildEdges = childEdges.sort((edgeA, edgeB) => {
+      const handleA = edgeA.sourceHandle
+      const handleB = edgeB.sourceHandle
+
+      if (handleA && handleB) {
+        const cases = (ifElseNode.data as any).cases || []
+        const isAElse = handleA === 'false'
+        const isBElse = handleB === 'false'
+
+        if (isAElse) return 1
+        if (isBElse) return -1
+
+        const indexA = cases.findIndex((c: any) => c.case_id === handleA)
+        const indexB = cases.findIndex((c: any) => c.case_id === handleB)
+
+        if (indexA !== -1 && indexB !== -1)
+          return indexA - indexB
+      }
+      return 0
+    })
+
+    const parentDummyId = `dummy-parent-${ifElseNode.id}`
+    dagreGraph.setNode(parentDummyId, { width: 1, height: 1 })
+
+    const dummyNodes: string[] = []
+    sortedChildEdges.forEach((edge) => {
+      const dummyNodeId = `dummy-${edge.source}-${edge.target}`
+      dummyNodes.push(dummyNodeId)
+      dagreGraph.setNode(dummyNodeId, { width: 1, height: 1 })
+      dagreGraph.setParent(dummyNodeId, parentDummyId)
+
+      const edgeIndex = edges.findIndex(e => e.id === edge.id)
+      if (edgeIndex > -1)
+        edges.splice(edgeIndex, 1)
+
+      edges.push({ id: `e-${edge.source}-${dummyNodeId}`, source: edge.source, target: dummyNodeId, sourceHandle: edge.sourceHandle } as Edge)
+      edges.push({ id: `e-${dummyNodeId}-${edge.target}`, source: dummyNodeId, target: edge.target, targetHandle: edge.targetHandle } as Edge)
+    })
+
+    for (let i = 0; i < dummyNodes.length - 1; i++) {
+      const sourceDummy = dummyNodes[i]
+      const targetDummy = dummyNodes[i + 1]
+      edges.push({ id: `e-dummy-${sourceDummy}-${targetDummy}`, source: sourceDummy, target: targetDummy } as Edge)
+    }
+  })
+
   dagreGraph.setGraph({
     rankdir: 'LR',
     align: 'UL',
     nodesep: 40,
-    ranksep: 60,
+    ranksep: virtualLogicApplied ? 30 : 60,
     ranker: 'tight-tree',
     marginx: 30,
     marginy: 200,
   })
+
   nodes.forEach((node) => {
     dagreGraph.setNode(node.id, {
       width: node.width!,

web/app/components/workflow/utils/index.ts

@@ -1,7 +1,7 @@
 export * from './node'
 export * from './edge'
 export * from './workflow-init'
-export * from './layout'
+export * from './dagre-layout'
 export * from './common'
 export * from './tool'
 export * from './workflow'