diff --git a/src/api/variable.js b/src/api/variable.js
index 37dd80e869c378271e5ebc0fb4c73b6e5b5a12ca..42ea4a72af6de112d1ab6ad5c05dcbab8cece311 100644
--- a/src/api/variable.js
+++ b/src/api/variable.js
@@ -63,6 +63,7 @@ export async function getVariable(params) {
  * @param {string} params.scope 变量作用域 (user|env|system|conversation)
  * @param {string} [params.flow_id] 流程ID（环境级和对话级变量必需）
  * @param {string} [params.conversation_id] 对话ID（系统级和对话级变量必需）
+ * @param {string} [params.current_step_id] 当前步骤ID（用于获取前置节点变量，仅对话变量有效）
  */
 export async function listVariables(params = {}) {
   const [error, response] = await get(`${BASE_URL}/list`, params)
diff --git a/src/components/SafeStartNodeEditor.vue b/src/components/SafeStartNodeEditor.vue
deleted file mode 100644
index f45c2d8a2c7984be877dd130ed862fc993007541..0000000000000000000000000000000000000000
--- a/src/components/SafeStartNodeEditor.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<script lang="ts" setup>
-import { ref, computed, watch, onMounted, nextTick, onBeforeUnmount } from 'vue'
-import { 
-  ElDrawer, ElTabs, ElTabPane, ElForm, ElFormItem, ElInput, 
-  ElButton, ElMessage, ElDivider, ElIcon
-} from 'element-plus'
-import { Setting } from '@element-plus/icons-vue'
-import StartNodeVariableManager from './StartNodeVariableManager.vue'
-import { listVariables } from '@/api/variable'
-
-interface StartNodeParams {
-  input_parameters?: Record<string, any>
-  output_parameters?: Record<string, any>
-  conversation_variables?: Record<string, any>
-}
-
-interface Props {
-  visible: boolean
-  nodeName: string
-  nodeDescription: string
-  nodeParams: StartNodeParams
-  nodeId: string
-  conversationId?: string
-  flowId?: string
-}
-
-const props = defineProps<Props>()
-
-const emit = defineEmits<{
-  'update:visible': [value: boolean]
-  'save': [params: StartNodeParams, description: string, conversationVariables?: any]
-  'close': []
-}>()
-
-// 响应式数据 - 使用更安全的初始化
-const activeTab = ref('basic')
-const formData = ref<{
-  description: string
-  input_parameters: Record<string, any>
-  output_parameters: Record<string, any>
-}>({
-  description: '',
-  input_parameters: {},
-  output_parameters: {}
-})
-
-const conversationVariables = ref<Record<string, any>>({})
-const variablesLoading = ref(false)
-const isInitialized = ref(false)
-
-const form = ref<any>(null)
-
-// 计算属性 - 添加安全检查
-const drawerVisible = computed({
-  get: () => props.visible,
-  set: (value) => {
-    if (typeof value === 'boolean') {
-      emit('update:visible', value)
-    }
-  }
-})
-
-// 安全的初始化方法
-const safeInitFormData = () => {
-  try {
-    const newFormData = {
-      description: props.nodeDescription || '',
-      input_parameters: {},
-      output_parameters: {}
-    }
-    
-    // 安全复制参数
-    if (props.nodeParams?.input_parameters && typeof props.nodeParams.input_parameters === 'object') {
-      newFormData.input_parameters = { ...props.nodeParams.input_parameters }
-    }
-    
-    if (props.nodeParams?.output_parameters && typeof props.nodeParams.output_parameters === 'object') {
-      newFormData.output_parameters = { ...props.nodeParams.output_parameters }
-    }
-    
-    formData.value = newFormData
-    isInitialized.value = true
-  } catch (error) {
-    console.error('初始化表单数据失败:', error)
-    // 使用默认值
-    formData.value = {
-      description: '',
-      input_parameters: {},
-      output_parameters: {}
-    }
-    isInitialized.value = true
-  }
-}
-
-// 安全的变量加载
-const safeLoadConversationVariables = async () => {
-  if (!props.conversationId) {
-    conversationVariables.value = {}
-    return
-  }
-  
-  variablesLoading.value = true
-  try {
-    const response = await listVariables({ 
-      scope: 'conversation',
-      conversation_id: props.conversationId 
-    })
-    
-    if (response?.result?.variables && Array.isArray(response.result.variables)) {
-      const variables = response.result.variables
-      const variablesObj: Record<string, any> = {}
-      
-      variables.forEach(variable => {
-        if (variable && variable.name) {
-          variablesObj[variable.name] = {
-            value: variable.value ?? '',
-            type: variable.var_type || 'string',
-            description: variable.description || ''
-          }
-        }
-      })
-      
-      conversationVariables.value = variablesObj
-    } else {
-      conversationVariables.value = {}
-    }
-  } catch (error) {
-    console.error('加载对话变量失败:', error)
-    ElMessage.error('加载对话变量失败')
-    conversationVariables.value = {}
-  } finally {
-    variablesLoading.value = false
-  }
-}
-
-// 安全的保存方法
-const handleSave = async () => {
-  if (!isInitialized.value) {
-    ElMessage.warning('编辑器未完全初始化，请稍后再试')
-    return
-  }
-  
-  try {
-    // 验证表单
-    if (form.value) {
-      await form.value.validate()
-    }
-    
-    const params: StartNodeParams = {
-      input_parameters: { ...formData.value.input_parameters },
-      output_parameters: { ...formData.value.output_parameters }
-    }
-    
-    // 安全地传递数据
-    emit('save', params, formData.value.description, { ...conversationVariables.value })
-    ElMessage.success('保存成功')
-  } catch (error) {
-    console.error('保存失败:', error)
-    ElMessage.error('保存失败，请检查输入内容')
-  }
-}
-
-const handleClose = () => {
-  emit('close')
-}
-
-const handleVariablesUpdated = async () => {
-  try {
-    await safeLoadConversationVariables()
-    ElMessage.success('变量已更新')
-  } catch (error) {
-    console.error('更新变量失败:', error)
-  }
-}
-
-// 参数管理方法
-const addInputParameter = () => {
-  const key = `param_${Date.now()}`
-  formData.value.input_parameters[key] = ''
-}
-
-const removeInputParameter = (key: string) => {
-  if (formData.value.input_parameters[key] !== undefined) {
-    delete formData.value.input_parameters[key]
-  }
-}
-
-const addOutputParameter = () => {
-  const key = `output_${Date.now()}`
-  formData.value.output_parameters[key] = ''
-}
-
-const removeOutputParameter = (key: string) => {
-  if (formData.value.output_parameters[key] !== undefined) {
-    delete formData.value.output_parameters[key]
-  }
-}
-
-// 安全的监听器
-watch(() => props.visible, async (newVisible) => {
-  if (newVisible) {
-    try {
-      await nextTick()
-      safeInitFormData()
-      await safeLoadConversationVariables()
-    } catch (error) {
-      console.error('初始化编辑器失败:', error)
-    }
-  } else {
-    // 重置状态
-    isInitialized.value = false
-  }
-}, { immediate: false })
-
-watch(() => [props.nodeParams, props.nodeDescription], async () => {
-  if (props.visible && isInitialized.value) {
-    try {
-      await nextTick()
-      safeInitFormData()
-    } catch (error) {
-      console.error('更新表单数据失败:', error)
-    }
-  }
-}, { deep: true })
-
-// 生命周期
-onMounted(async () => {
-  try {
-    safeInitFormData()
-    if (props.visible) {
-      await safeLoadConversationVariables()
-    }
-  } catch (error) {
-    console.error('组件初始化失败:', error)
-  }
-})
-
-onBeforeUnmount(() => {
-  // 清理资源
-  isInitialized.value = false
-})
-</script>
-
-<template>
-  <ElDrawer
-    v-model="drawerVisible"
-    title="编辑开始节点"
-    :size="800"
-    direction="rtl"
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    @close="handleClose"
-  >
-    <template #header>
-      <div class="drawer-header">
-        <ElIcon><Setting /></ElIcon>
-        <span>编辑开始节点</span>
-        <div class="node-info">
-          <span class="node-name">{{ nodeName }}</span>
-        </div>
-      </div>
-    </template>
-    
-    <div class="drawer-content" v-if="isInitialized">
-      <ElTabs v-model="activeTab">
-        <!-- 基本配置 -->
-        <ElTabPane label="基本配置" name="basic">
-          <ElForm ref="form" :model="formData" label-width="100px">
-            <ElFormItem label="节点描述">
-              <ElInput
-                v-model="formData.description"
-                type="textarea"
-                :rows="3"
-                placeholder="请输入节点描述"
-              />
-            </ElFormItem>
-            
-            <ElDivider content-position="left">输入参数</ElDivider>
-            
-            <div class="parameter-section">
-              <div 
-                v-for="(value, key) in formData.input_parameters" 
-                :key="key"
-                class="parameter-item"
-              >
-                <ElFormItem :label="String(key)">
-                  <div class="parameter-row">
-                    <ElInput
-                      v-model="formData.input_parameters[key]"
-                      placeholder="请输入参数值"
-                    />
-                    <ElButton 
-                      type="danger" 
-                      size="small" 
-                      @click="removeInputParameter(String(key))"
-                    >
-                      删除
-                    </ElButton>
-                  </div>
-                </ElFormItem>
-              </div>
-              
-              <ElButton type="primary" size="small" @click="addInputParameter">
-                添加输入参数
-              </ElButton>
-            </div>
-            
-            <ElDivider content-position="left">输出参数</ElDivider>
-            
-            <div class="parameter-section">
-              <div 
-                v-for="(value, key) in formData.output_parameters" 
-                :key="key"
-                class="parameter-item"
-              >
-                <ElFormItem :label="String(key)">
-                  <div class="parameter-row">
-                    <ElInput
-                      v-model="formData.output_parameters[key]"
-                      placeholder="请输入参数值"
-                    />
-                    <ElButton 
-                      type="danger" 
-                      size="small" 
-                      @click="removeOutputParameter(String(key))"
-                    >
-                      删除
-                    </ElButton>
-                  </div>
-                </ElFormItem>
-              </div>
-              
-              <ElButton type="primary" size="small" @click="addOutputParameter">
-                添加输出参数
-              </ElButton>
-            </div>
-          </ElForm>
-        </ElTabPane>
-        
-        <!-- 变量管理 -->
-        <ElTabPane label="变量管理" name="variables">
-          <StartNodeVariableManager
-            v-if="conversationId"
-            :conversation-id="conversationId"
-            :flow-id="flowId"
-            @variables-updated="handleVariablesUpdated"
-          />
-          <div v-else class="no-conversation">
-            <p>需要会话ID才能管理变量</p>
-          </div>
-        </ElTabPane>
-      </ElTabs>
-    </div>
-    
-    <div v-else class="loading-state">
-      <ElIcon class="is-loading"><Setting /></ElIcon>
-      <span>正在初始化...</span>
-    </div>
-    
-    <template #footer>
-      <div class="drawer-footer">
-        <ElButton @click="handleClose">取消</ElButton>
-        <ElButton 
-          type="primary" 
-          @click="handleSave"
-          :disabled="!isInitialized"
-        >
-          保存
-        </ElButton>
-      </div>
-    </template>
-  </ElDrawer>
-</template>
-
-<style lang="scss" scoped>
-.drawer-header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  font-weight: 600;
-  
-  .node-info {
-    margin-left: auto;
-    
-    .node-name {
-      font-size: 14px;
-      color: var(--el-text-color-secondary);
-      background: var(--el-fill-color-light);
-      padding: 4px 8px;
-      border-radius: 4px;
-    }
-  }
-}
-
-.drawer-content {
-  height: 100%;
-  
-  .parameter-section {
-    margin-bottom: 24px;
-    
-    .parameter-item {
-      margin-bottom: 16px;
-      
-      .parameter-row {
-        display: flex;
-        gap: 8px;
-        align-items: center;
-      }
-    }
-  }
-}
-
-.loading-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 200px;
-  gap: 16px;
-  color: var(--el-text-color-secondary);
-}
-
-.no-conversation {
-  text-align: center;
-  padding: 32px;
-  color: var(--el-text-color-secondary);
-}
-
-.drawer-footer {
-  display: flex;
-  justify-content: flex-end;
-  gap: 12px;
-  padding: 16px 0;
-  border-top: 1px solid var(--el-border-color-light);
-}
-</style> 
\ No newline at end of file
diff --git a/src/components/StartNodeEditor.vue b/src/components/StartNodeEditor.vue
index b1d7db1c561ceddf5ecf58029ff8ad2585cf3164..f45c2d8a2c7984be877dd130ed862fc993007541 100644
--- a/src/components/StartNodeEditor.vue
+++ b/src/components/StartNodeEditor.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, computed, watch, onMounted, nextTick } from 'vue'
+import { ref, computed, watch, onMounted, nextTick, onBeforeUnmount } from 'vue'
 import { 
   ElDrawer, ElTabs, ElTabPane, ElForm, ElFormItem, ElInput, 
   ElButton, ElMessage, ElDivider, ElIcon
@@ -32,34 +32,68 @@ const emit = defineEmits<{
   'close': []
 }>()
 
-// 响应式数据
+// 响应式数据 - 使用更安全的初始化
 const activeTab = ref('basic')
-const formData = ref({
+const formData = ref<{
+  description: string
+  input_parameters: Record<string, any>
+  output_parameters: Record<string, any>
+}>({
   description: '',
-  input_parameters: {} as Record<string, any>,
-  output_parameters: {} as Record<string, any>
+  input_parameters: {},
+  output_parameters: {}
 })
+
 const conversationVariables = ref<Record<string, any>>({})
 const variablesLoading = ref(false)
+const isInitialized = ref(false)
 
-const form = ref()
+const form = ref<any>(null)
 
-// 计算属性
+// 计算属性 - 添加安全检查
 const drawerVisible = computed({
   get: () => props.visible,
-  set: (value) => emit('update:visible', value)
+  set: (value) => {
+    if (typeof value === 'boolean') {
+      emit('update:visible', value)
+    }
+  }
 })
 
-// 方法
-const initFormData = () => {
-  formData.value = {
-    description: props.nodeDescription || '',
-    input_parameters: props.nodeParams.input_parameters ? { ...props.nodeParams.input_parameters } : {},
-    output_parameters: props.nodeParams.output_parameters ? { ...props.nodeParams.output_parameters } : {}
+// 安全的初始化方法
+const safeInitFormData = () => {
+  try {
+    const newFormData = {
+      description: props.nodeDescription || '',
+      input_parameters: {},
+      output_parameters: {}
+    }
+    
+    // 安全复制参数
+    if (props.nodeParams?.input_parameters && typeof props.nodeParams.input_parameters === 'object') {
+      newFormData.input_parameters = { ...props.nodeParams.input_parameters }
+    }
+    
+    if (props.nodeParams?.output_parameters && typeof props.nodeParams.output_parameters === 'object') {
+      newFormData.output_parameters = { ...props.nodeParams.output_parameters }
+    }
+    
+    formData.value = newFormData
+    isInitialized.value = true
+  } catch (error) {
+    console.error('初始化表单数据失败:', error)
+    // 使用默认值
+    formData.value = {
+      description: '',
+      input_parameters: {},
+      output_parameters: {}
+    }
+    isInitialized.value = true
   }
 }
 
-const loadConversationVariables = async () => {
+// 安全的变量加载
+const safeLoadConversationVariables = async () => {
   if (!props.conversationId) {
     conversationVariables.value = {}
     return
@@ -72,40 +106,57 @@ const loadConversationVariables = async () => {
       conversation_id: props.conversationId 
     })
     
-    const variables = response.result?.variables || []
-    const variablesObj = {}
-    variables.forEach(variable => {
-      variablesObj[variable.name] = {
-        value: variable.value,
-        type: variable.var_type,
-        description: variable.description
-      }
-    })
-    
-    conversationVariables.value = variablesObj
+    if (response?.result?.variables && Array.isArray(response.result.variables)) {
+      const variables = response.result.variables
+      const variablesObj: Record<string, any> = {}
+      
+      variables.forEach(variable => {
+        if (variable && variable.name) {
+          variablesObj[variable.name] = {
+            value: variable.value ?? '',
+            type: variable.var_type || 'string',
+            description: variable.description || ''
+          }
+        }
+      })
+      
+      conversationVariables.value = variablesObj
+    } else {
+      conversationVariables.value = {}
+    }
   } catch (error) {
     console.error('加载对话变量失败:', error)
     ElMessage.error('加载对话变量失败')
+    conversationVariables.value = {}
   } finally {
     variablesLoading.value = false
   }
 }
 
+// 安全的保存方法
 const handleSave = async () => {
+  if (!isInitialized.value) {
+    ElMessage.warning('编辑器未完全初始化，请稍后再试')
+    return
+  }
+  
   try {
-    await form.value?.validate()
+    // 验证表单
+    if (form.value) {
+      await form.value.validate()
+    }
     
     const params: StartNodeParams = {
-      input_parameters: formData.value.input_parameters,
-      output_parameters: formData.value.output_parameters
+      input_parameters: { ...formData.value.input_parameters },
+      output_parameters: { ...formData.value.output_parameters }
     }
     
-    // 分别传递节点参数、描述和对话变量
-    emit('save', params, formData.value.description, conversationVariables.value)
+    // 安全地传递数据
+    emit('save', params, formData.value.description, { ...conversationVariables.value })
     ElMessage.success('保存成功')
   } catch (error) {
     console.error('保存失败:', error)
-    ElMessage.error('保存失败')
+    ElMessage.error('保存失败，请检查输入内容')
   }
 }
 
@@ -114,56 +165,80 @@ const handleClose = () => {
 }
 
 const handleVariablesUpdated = async () => {
-  // 当变量更新时，重新加载对话变量
-  await loadConversationVariables()
-  ElMessage.success('变量已更新')
+  try {
+    await safeLoadConversationVariables()
+    ElMessage.success('变量已更新')
+  } catch (error) {
+    console.error('更新变量失败:', error)
+  }
 }
 
-// 添加输入参数
+// 参数管理方法
 const addInputParameter = () => {
   const key = `param_${Date.now()}`
   formData.value.input_parameters[key] = ''
 }
 
-// 删除输入参数
 const removeInputParameter = (key: string) => {
-  delete formData.value.input_parameters[key]
+  if (formData.value.input_parameters[key] !== undefined) {
+    delete formData.value.input_parameters[key]
+  }
 }
 
-// 添加输出参数
 const addOutputParameter = () => {
   const key = `output_${Date.now()}`
   formData.value.output_parameters[key] = ''
 }
 
-// 删除输出参数
 const removeOutputParameter = (key: string) => {
-  delete formData.value.output_parameters[key]
+  if (formData.value.output_parameters[key] !== undefined) {
+    delete formData.value.output_parameters[key]
+  }
 }
 
-// 监听props变化
-watch(() => props.visible, async (visible) => {
-  if (visible) {
-    await nextTick()
-    initFormData()
-    await loadConversationVariables()
+// 安全的监听器
+watch(() => props.visible, async (newVisible) => {
+  if (newVisible) {
+    try {
+      await nextTick()
+      safeInitFormData()
+      await safeLoadConversationVariables()
+    } catch (error) {
+      console.error('初始化编辑器失败:', error)
+    }
+  } else {
+    // 重置状态
+    isInitialized.value = false
   }
 }, { immediate: false })
 
 watch(() => [props.nodeParams, props.nodeDescription], async () => {
-  if (props.visible) {
-    await nextTick()
-    initFormData()
+  if (props.visible && isInitialized.value) {
+    try {
+      await nextTick()
+      safeInitFormData()
+    } catch (error) {
+      console.error('更新表单数据失败:', error)
+    }
   }
 }, { deep: true })
 
 // 生命周期
 onMounted(async () => {
-  initFormData()
-  if (props.visible) {
-    await loadConversationVariables()
+  try {
+    safeInitFormData()
+    if (props.visible) {
+      await safeLoadConversationVariables()
+    }
+  } catch (error) {
+    console.error('组件初始化失败:', error)
   }
 })
+
+onBeforeUnmount(() => {
+  // 清理资源
+  isInitialized.value = false
+})
 </script>
 
 <template>
@@ -173,6 +248,7 @@ onMounted(async () => {
     :size="800"
     direction="rtl"
     :close-on-click-modal="false"
+    :destroy-on-close="true"
     @close="handleClose"
   >
     <template #header>
@@ -185,7 +261,7 @@ onMounted(async () => {
       </div>
     </template>
     
-    <div class="drawer-content">
+    <div class="drawer-content" v-if="isInitialized">
       <ElTabs v-model="activeTab">
         <!-- 基本配置 -->
         <ElTabPane label="基本配置" name="basic">
@@ -207,7 +283,7 @@ onMounted(async () => {
                 :key="key"
                 class="parameter-item"
               >
-                <ElFormItem :label="key">
+                <ElFormItem :label="String(key)">
                   <div class="parameter-row">
                     <ElInput
                       v-model="formData.input_parameters[key]"
@@ -216,7 +292,7 @@ onMounted(async () => {
                     <ElButton 
                       type="danger" 
                       size="small" 
-                      @click="removeInputParameter(key)"
+                      @click="removeInputParameter(String(key))"
                     >
                       删除
                     </ElButton>
@@ -237,7 +313,7 @@ onMounted(async () => {
                 :key="key"
                 class="parameter-item"
               >
-                <ElFormItem :label="key">
+                <ElFormItem :label="String(key)">
                   <div class="parameter-row">
                     <ElInput
                       v-model="formData.output_parameters[key]"
@@ -246,7 +322,7 @@ onMounted(async () => {
                     <ElButton 
                       type="danger" 
                       size="small" 
-                      @click="removeOutputParameter(key)"
+                      @click="removeOutputParameter(String(key))"
                     >
                       删除
                     </ElButton>
@@ -264,18 +340,33 @@ onMounted(async () => {
         <!-- 变量管理 -->
         <ElTabPane label="变量管理" name="variables">
           <StartNodeVariableManager
+            v-if="conversationId"
             :conversation-id="conversationId"
             :flow-id="flowId"
             @variables-updated="handleVariablesUpdated"
           />
+          <div v-else class="no-conversation">
+            <p>需要会话ID才能管理变量</p>
+          </div>
         </ElTabPane>
       </ElTabs>
     </div>
     
+    <div v-else class="loading-state">
+      <ElIcon class="is-loading"><Setting /></ElIcon>
+      <span>正在初始化...</span>
+    </div>
+    
     <template #footer>
       <div class="drawer-footer">
         <ElButton @click="handleClose">取消</ElButton>
-        <ElButton type="primary" @click="handleSave">保存</ElButton>
+        <ElButton 
+          type="primary" 
+          @click="handleSave"
+          :disabled="!isInitialized"
+        >
+          保存
+        </ElButton>
       </div>
     </template>
   </ElDrawer>
@@ -319,6 +410,22 @@ onMounted(async () => {
   }
 }
 
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 200px;
+  gap: 16px;
+  color: var(--el-text-color-secondary);
+}
+
+.no-conversation {
+  text-align: center;
+  padding: 32px;
+  color: var(--el-text-color-secondary);
+}
+
 .drawer-footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/components/StartNodeVariableManager.vue b/src/components/StartNodeVariableManager.vue
index ad8ec9de189a23386061b84b90ef1c1e59ec2f8e..9e19b886ae5c6664a8877b8855aa879740fce1c3 100644
--- a/src/components/StartNodeVariableManager.vue
+++ b/src/components/StartNodeVariableManager.vue
@@ -65,8 +65,9 @@ const typeLabels = computed(() => ({
   boolean: '布尔值',
   object: '对象',
   secret: '密钥',
+  group: '分组',
   file: '文件',
-  'array[any]': '数组',
+  'array[any]': '任意数组',
   'array[string]': '字符串数组',
   'array[number]': '数字数组',
   'array[object]': '对象数组',
@@ -111,7 +112,7 @@ const loadSystemVariables = async () => {
     }
     
     const response = await listVariables(params)
-    systemVariables.value = response.result?.variables || []
+    systemVariables.value = response?.result?.variables || []
     console.log('✅ 系统变量加载成功:', systemVariables.value.length, '个')
   } catch (error) {
     console.error('加载系统变量失败:', error)
@@ -130,7 +131,7 @@ const loadConversationVariables = async () => {
       scope: 'conversation',
       conversation_id: props.conversationId 
     })
-    conversationVariables.value = response.result?.variables || []
+    conversationVariables.value = response?.result?.variables || []
   } catch (error) {
     console.error('加载对话变量失败:', error)
     ElMessage.error('加载对话变量失败')
@@ -142,7 +143,7 @@ const loadConversationVariables = async () => {
 const loadVariableTypes = async () => {
   try {
     const response = await getVariableTypes()
-    variableTypes.value = response.result || {types: [], scopes: []}
+    variableTypes.value = response?.result || {types: [], scopes: []}
   } catch (error) {
     console.error('加载变量类型失败:', error)
   }
@@ -162,14 +163,93 @@ const handleSaveVariable = async () => {
   try {
     await addVariableForm.value.validate()
     
-    await createVariable({
+    // 根据变量类型转换值
+    let processedValue: any = newVariable.value.value
+    
+
+    
+    // 类型转换处理
+    switch (newVariable.value.var_type) {
+      case 'number':
+        processedValue = processedValue === '' ? 0 : Number(processedValue)
+        if (isNaN(processedValue)) {
+          ElMessage.error('请输入有效的数字')
+                    return
+        }
+        break
+      case 'boolean':
+        processedValue = processedValue === 'true' || processedValue === true
+        break
+      case 'object':
+        try {
+          processedValue = JSON.parse(processedValue)
+        } catch (error) {
+          ElMessage.error('请输入有效的JSON格式')
+          return
+        }
+        break
+      case 'array[string]':
+        if (typeof processedValue === 'string') {
+          processedValue = processedValue.split(',').map(item => item.trim()).filter(item => item)
+        }
+        break
+      case 'array[number]':
+        if (typeof processedValue === 'string') {
+          try {
+            processedValue = JSON.parse(processedValue)
+            if (!Array.isArray(processedValue) || !processedValue.every(item => typeof item === 'number')) {
+              throw new Error('Invalid array')
+            }
+          } catch (error) {
+            ElMessage.error('请输入有效的数字数组，如：[1,2,3]')
+            return
+          }
+        }
+        break
+      case 'array[boolean]':
+        if (typeof processedValue === 'string') {
+          try {
+            processedValue = JSON.parse(processedValue)
+            if (!Array.isArray(processedValue) || !processedValue.every(item => typeof item === 'boolean')) {
+              throw new Error('Invalid array')
+            }
+          } catch (error) {
+            ElMessage.error('请输入有效的布尔数组，如：[true,false]')
+            return
+          }
+        }
+        break
+      case 'array[object]':
+        if (typeof processedValue === 'string') {
+          try {
+            processedValue = JSON.parse(processedValue)
+            if (!Array.isArray(processedValue)) {
+              throw new Error('Invalid array')
+            }
+          } catch (error) {
+            ElMessage.error('请输入有效的对象数组')
+            return
+          }
+        }
+        break
+      default:
+        // 保持字符串类型
+        processedValue = String(processedValue)
+    }
+    
+    const requestData = {
       name: newVariable.value.name,
       var_type: newVariable.value.var_type,
       scope: 'conversation',
-      value: newVariable.value.value,
+      value: processedValue,
       description: newVariable.value.description,
+      flow_id: props.flowId,
       conversation_id: props.conversationId
-    })
+    }
+    
+
+    
+    await createVariable(requestData)
     
     ElMessage.success('变量创建成功')
     addVariableDialogVisible.value = false
diff --git a/src/components/VariableChooser.vue b/src/components/VariableChooser.vue
index 84cb1ec3b69fc10ea26b359b0887b0feae7407fb..c1623bf961be1d4035847d03c17036a223c44e62 100644
--- a/src/components/VariableChooser.vue
+++ b/src/components/VariableChooser.vue
@@ -28,7 +28,7 @@
                     <path fill="currentColor" d="M20 18a1 1 0 0 1-1 1h-4a3 3 0 0 0-3 3a3 3 0 0 0-3-3H5a1 1 0 0 1-1-1H2a3 3 0 0 0 3 3h4a2 2 0 0 1 2 2h2a2 2 0 0 1 2-2h4a3 3 0 0 0 3-3Zm0-12a1 1 0 0 0-1-1h-4a3 3 0 0 1-3-3a3 3 0 0 1-3 3H5a1 1 0 0 0-1 1H2a3 3 0 0 1 3-3h4a2 2 0 0 0 2-2h2a2 2 0 0 0 2 2h4a3 3 0 0 1 3 3Zm-8 6L9 8H7v8h2v-4l3 4h2V8h-2zm9-4l-2 5.27L17 8h-2l3 8h2l3-8zM1 8v8h5v-2H3v-1h2v-2H3v-1h3V8z" />
                   </svg>
                 </el-icon>
-                {{ getVariableDisplayName(selectedVariable) }}
+                {{ modelValue || getVariableDisplayName(selectedVariable) }}
               </span>
               <button 
                 class="clear-btn"
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index f505f2de4885da259c91b1eca1f67216a2635df6..59fddd06ca3a1825564fc8b4701961e530fe3671 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -93,6 +93,9 @@ const selectedNodeId = ref('');
 const conversationVariablesForDisplay = ref<any[]>([]);
 const variablesLoading = ref(false);
 
+// 添加 conversationId 变量（在工作流设计阶段，可以为空或生成临时ID）
+const conversationId = ref<string>('');
+
 // 插入节点相关状态
 const insertMenuData = ref({
   visible: false,
@@ -933,6 +936,11 @@ const executeInsertNode = (nodeMetaData) => {
               description: '选中的分支ID'
             }
           }
+        } : nodeMetaData.callId === 'DirectReply' ? {
+          input_parameters: {
+            answer: ''  // 确保新建的DirectReply节点内容为空
+          },
+          output_parameters: {}
         } : {
           input_parameters: {},
           output_parameters: {}
@@ -1674,6 +1682,8 @@ defineExpose({
     :nodeData="currentChoiceBranchNodeData"
     :nodeId="nodeYamlId"
     :flowId="flowObj?.flowId"
+    :conversationId="conversationId"
+    :currentStepId="nodeYamlId"
     @update:visible="closeChoiceBranchDrawer"
     @saveNode="saveChoiceBranchNode"
   />
diff --git a/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue b/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
index 53787fd864a24f6f8244afc6e11c0812f51427bb..e5c4894941c04bb3223bdd55e6cbaa1b0ca9341c 100644
--- a/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
@@ -354,13 +354,29 @@ const saveNode = () => {
     allChoices.push(formData.value.defaultBranch);
   }
   
+  // 对所有条件值进行类型转换
+  const processedChoices = allChoices.map(choice => ({
+    ...choice,
+    conditions: choice.conditions.map(condition => ({
+      ...condition,
+      left: {
+        ...condition.left,
+        value: condition.left.type === 'reference' ? condition.left.value : parseValue(condition.left.value, condition.left.type)
+      },
+      right: {
+        ...condition.right,
+        value: condition.right.type === 'reference' ? condition.right.value : parseValue(condition.right.value, condition.right.type)
+      }
+    }))
+  }));
+  
   const nodeData = {
     name: formData.value.name,
     description: formData.value.description,
     callId: 'Choice',
     parameters: {
       input_parameters: {
-        choices: allChoices,
+        choices: processedChoices,
       },
       output_parameters: {
         branch_id: {
diff --git a/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
index 0df40112ba0a333be08428ddab7b7955ebb5b0e0..f3c84466074a549992bd8a57606390a90ce5ea7b 100644
--- a/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
@@ -88,7 +88,7 @@
                             :show-variable-reference="true"
                             :show-actions="true"
                             :show-variable-info="true"
-                            output-format="raw"
+                            output-format="wrapped"
                             placeholder="输入节点内的变量名"
                             @remove="removeInputVariable(index)"
                             @variable-selected="(selectedVar, reference) => handleInputVariableSelected(selectedVar, index)"
diff --git a/src/views/createapp/components/workFlowConfig/SimpleCodeNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/SimpleCodeNodeDrawer.vue
index 6e0e5b3dd76286b039e15819e03ba440f3594d92..2c1e7a6523420f5162b98dd6eba5181ee48d3a3a 100644
--- a/src/views/createapp/components/workFlowConfig/SimpleCodeNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/SimpleCodeNodeDrawer.vue
@@ -353,10 +353,10 @@ const formData = ref({
 });
 
 // 输入变量
-const inputVariables = ref([]);
+const inputVariables = ref<Array<{name: string, type: string, description: string}>>([]);
 
 // 输出变量
-const outputVariables = ref([]);
+const outputVariables = ref<Array<{name: string, type: string, description: string}>>([]);
 
 // 监听visible变化
 watch(
@@ -393,14 +393,10 @@ watch(
         retry_delay: newData.retry_delay || 1,
       };
 
-      inputVariables.value = newData.input_variables || [
-        { name: 'depth', type: 'number', description: '递归深度' }
-      ];
+      // 对于新建节点，应该从空数组开始，让用户自己定义变量
+      inputVariables.value = newData.input_variables || [];
 
-      outputVariables.value = newData.output_variables || [
-        { name: 'array', type: 'array', description: '生成的数组' },
-        { name: 'depth', type: 'number', description: '实际深度值' }
-      ];
+      outputVariables.value = newData.output_variables || [];
     }
   },
   { immediate: true, deep: true }
diff --git a/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
index 4509ccf7d58b6fc200e18470249fcc04bf7f8f44..7b0a8e9ce7a9235049efb0e496286392fa949ee7 100644
--- a/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
@@ -481,26 +481,63 @@ const saveConversationVariable = async () => {
   try {
     let value = editingVariable.value.value
     
-    // 处理对象类型的值
-    if (editingVariable.value.var_type === 'object' && editingVariable.value.valueJson) {
-      try {
-        value = JSON.parse(editingVariable.value.valueJson)
-      } catch (error) {
-        ElMessage.error('JSON格式不正确，请检查对象值的语法')
-        return
-      }
+
+    
+    // 简单的前端验证（后端现在负责类型转换）
+    switch (editingVariable.value.var_type) {
+      case 'number':
+        // 基本数字格式验证
+        if (value && isNaN(Number(value))) {
+          ElMessage.error('请输入有效的数字')
+          return
+        }
+        break
+      case 'object':
+        // JSON格式验证
+        let jsonStr = value
+        if (editingVariable.value.valueJson) {
+          jsonStr = editingVariable.value.valueJson
+        }
+        if (jsonStr) {
+          try {
+            JSON.parse(jsonStr)
+            value = jsonStr
+          } catch (error) {
+            ElMessage.error('JSON格式不正确，请检查对象值的语法')
+            return
+          }
+        }
+        break
+      case 'array[number]':
+        // 数字数组格式验证
+        if (value && typeof value === 'string') {
+          try {
+            const arrayValue = JSON.parse(value)
+            if (!Array.isArray(arrayValue)) {
+              throw new Error('请输入数组格式')
+            }
+          } catch (error) {
+            ElMessage.error('请输入有效的JSON数组格式，如：[1,2,3]')
+            return
+          }
+        }
+        break
     }
+    
+    // 所有值都以字符串格式发送，让后端处理类型转换
 
     const variableData = {
       name: editingVariable.value.name.trim(),
       var_type: editingVariable.value.var_type,
       scope: 'conversation',
-      value: value || '',
+      value: value,
       description: editingVariable.value.description || '',
       flow_id: props.flowId
     }
     
 
+    
+
     if (isEditingVariable.value) {
       // 更新变量（配置阶段使用flow_id）
       const updateParams = { 
@@ -535,6 +572,8 @@ const saveConversationVariable = async () => {
       response: error?.response
     })
     
+
+    
     // 更详细的错误信息
     let errorMessage = '保存变量失败'
     if (error?.response) {
@@ -542,7 +581,9 @@ const saveConversationVariable = async () => {
       const data = error.response.data
       
       if (status === 400) {
-        errorMessage = `参数错误: ${data?.message || '请检查变量数据格式'}`
+        errorMessage = `参数错误: ${data?.message || data?.detail || '请检查变量数据格式'}`
+      } else if (status === 422) {
+        errorMessage = `数据验证失败: ${data?.detail || data?.message || '请检查变量数据是否符合要求'}`
       } else if (status === 401) {
         errorMessage = '权限不足，请重新登录'
       } else if (status === 404) {
diff --git a/src/views/createapp/components/workFlowConfig/useDnD.js b/src/views/createapp/components/workFlowConfig/useDnD.js
index b433981d3230f8c828ac13c656ccec2f84f3d3e1..5ec7aaac2294326a5b5fe6a72ba5d58f5874eb74 100644
--- a/src/views/createapp/components/workFlowConfig/useDnD.js
+++ b/src/views/createapp/components/workFlowConfig/useDnD.js
@@ -141,6 +141,20 @@ export default function useDragAndDrop() {
           }
         }
       };
+    } else if (cleanNodeData.callId === 'DirectReply') {
+      // 如果是DirectReply节点，确保parameters结构正确且内容为空
+      cleanNodeData.parameters = {
+        input_parameters: {
+          answer: ''  // 确保新建的DirectReply节点内容为空
+        },
+        output_parameters: {}
+      };
+    } else {
+      // 对于所有其他节点类型（LLM、RAG、API、SQL等），确保parameters结构正确且内容为空
+      cleanNodeData.parameters = {
+        input_parameters: {},
+        output_parameters: {}
+      };
     }
 
     const newNode = {