Merge branch 'develop' of github.com:SuanmoSuanyangTechnology/MemoryBear into develop

2026-01-14 12:07:28 +08:00
parent a16c099f02 a6e1898e1b
commit fbc1906fa2
68 changed files with 1697 additions and 800 deletions
--- a/web/src/api/memory.ts
+++ b/web/src/api/memory.ts
@@ -117,26 +117,26 @@ export const getRagContent = (end_user_id: string) => {
 }
 // 情感分布分析
 export const getWordCloud = (group_id: string) => {
-  return request.post(`/memory/emotion/wordcloud`, { group_id, limit: 20 })
+  return request.post(`/memory/emotion-memory/wordcloud`, { group_id, limit: 20 })
 }
 // 高频情绪关键词
 export const getEmotionTags = (group_id: string) => {
-  return request.post(`/memory/emotion/tags`, { group_id, limit: 20 })
+  return request.post(`/memory/emotion-memory/tags`, { group_id, limit: 20 })
 }
 // 情绪健康指数
 export const getEmotionHealth = (group_id: string) => {
-  return request.post(`/memory/emotion/health`, { group_id, limit: 20 })
+  return request.post(`/memory/emotion-memory/health`, { group_id, limit: 20 })
 }
 // 个性化建议
 export const getEmotionSuggestions = (group_id: string) => {
-  return request.post(`/memory/emotion/suggestions`, { group_id, limit: 20 })
+  return request.post(`/memory/emotion-memory/suggestions`, { group_id, limit: 20 })
 }
 export const analyticsRefresh = (end_user_id: string) => {
  return request.post('/memory-storage/analytics/generate_cache', { end_user_id })
 }
 // 遗忘
 export const getForgetStats = (group_id: string) => {
-  return request.get(`/memory/forget/stats`, { group_id })
+  return request.get(`/memory/forget-memory/stats`, { group_id })
 }
 // 隐性记忆-偏好
 export const getImplicitPreferences = (end_user_id: string) => {
@@ -176,10 +176,10 @@ export const getPerceptualTimeline = (end_user: string) => {
 }
 // 情景记忆-总览
 export const getEpisodicOverview = (data: { end_user_id: string; time_range: string; episodic_type: string; } ) => {
-  return request.post(`/memory-storage/classifications/episodic-memory`, data)
+  return request.post(`/memory/episodic-memory/overview`, data)
 }
 export const getEpisodicDetail = (data: { end_user_id: string; summary_id: string; } ) => {
-  return request.post(`/memory-storage/classifications/episodic-memory-details`, data)
+  return request.post(`/memory/episodic-memory/details`, data)
 }
 // 关系演化
 export const getRelationshipEvolution = (data: { id: string; label: string; } ) => {
@@ -190,10 +190,10 @@ export const getTimelineMemories = (data: { id: string; label: string; }) => {
  return request.get(`/memory-storage/memory_space/timeline_memories`, data)
 }
 export const getExplicitMemory = (end_user_id: string) => {
-  return request.post(`/memory-storage/classifications/explicit-memory`, { end_user_id })
+  return request.post(`/memory/explicit-memory/overview`, { end_user_id })
 }
 export const getExplicitMemoryDetails = (data: { end_user_id: string, memory_id: string; }) => {
-  return request.post(`/memory-storage/classifications/explicit-memory-details`, data)
+  return request.post(`/memory/explicit-memory/details`, data)
 }
 export const getConversations = (end_user: string) => {
  return request.get(`/memory/work/${end_user}/conversations`)
@@ -205,7 +205,7 @@ export const getConversationDetail = (end_user: string, conversation_id: string)
  return request.get(`/memory/work/${end_user}/detail`, { conversation_id })
 }
 export const forgetTrigger = (data: { max_merge_batch_size: number; min_days_since_access: number; end_user_id: string;}) => {
-  return request.post(`/memory/forget/trigger`, data)
+  return request.post(`/memory/forget-memory/trigger`, data)
 }
 /*************** end 用户记忆 相关接口 ******************************/

@@ -229,11 +229,11 @@ export const deleteMemoryConfig = (config_id: number) => {
 }
 // 遗忘引擎-获取配置
 export const getMemoryForgetConfig = (config_id: number | string) => {
-  return request.get('/memory/forget/read_config', { config_id })
+  return request.get('/memory/forget-memory/read_config', { config_id })
 }
 // 遗忘引擎-更新配置
 export const updateMemoryForgetConfig = (values: ForgetConfigForm) => {
-  return request.post('/memory/forget/update_config', values)
+  return request.post('/memory/forget-memory/update_config', values)
 }
 // 记忆萃取引擎-获取配置
 export const getMemoryExtractionConfig = (config_id: number | string) => {
--- a/web/src/assets/images/menu/spaceConfig.svg
+++ b/web/src/assets/images/menu/spaceConfig.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>模型 (1)</title>
+    <g id="v0.2.0" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="红熊空间-记忆管理" transform="translate(-24, -409)" stroke="#5B6167">
+            <g id="记忆对话备份-2" transform="translate(12, 401)">
+                <g id="模型-(1)" transform="translate(12, 8)">
+                    <g id="编组-21" transform="translate(1.5, 1.5)">
+                        <path d="M7,0.288675135 L11.6291651,2.96132487 C11.9385662,3.13995766 12.1291651,3.47008468 12.1291651,3.82735027 L12.1291651,9.17264973 C12.1291651,9.52991532 11.9385662,9.86004234 11.6291651,10.0386751 L7,12.7113249 C6.69059892,12.8899577 6.30940108,12.8899577 6,12.7113249 L1.37083488,10.0386751 C1.0614338,9.86004234 0.870834875,9.52991532 0.870834875,9.17264973 L0.870834875,3.82735027 C0.870834875,3.47008468 1.0614338,3.13995766 1.37083488,2.96132487 L6,0.288675135 C6.30940108,0.11004234 6.69059892,0.11004234 7,0.288675135 Z" id="多边形"></path>
+                        <polyline id="路径-15" points="0.931223827 3.37218958 6.5 6.5 6.5 12.8581283"></polyline>
+                        <line x1="6.5" y1="6.49748419" x2="12.0714286" y2="3.37218958" id="路径-16"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/web/src/assets/images/menu/spaceConfig_active.svg
+++ b/web/src/assets/images/menu/spaceConfig_active.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>模型 (1)</title>
+    <g id="v0.2.0" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="红熊空间-记忆管理" transform="translate(-24, -409)" stroke="#212332">
+            <g id="记忆对话备份-2" transform="translate(12, 401)">
+                <g id="模型-(1)" transform="translate(12, 8)">
+                    <g id="编组-21" transform="translate(1.5, 1.5)">
+                        <path d="M7,0.288675135 L11.6291651,2.96132487 C11.9385662,3.13995766 12.1291651,3.47008468 12.1291651,3.82735027 L12.1291651,9.17264973 C12.1291651,9.52991532 11.9385662,9.86004234 11.6291651,10.0386751 L7,12.7113249 C6.69059892,12.8899577 6.30940108,12.8899577 6,12.7113249 L1.37083488,10.0386751 C1.0614338,9.86004234 0.870834875,9.52991532 0.870834875,9.17264973 L0.870834875,3.82735027 C0.870834875,3.47008468 1.0614338,3.13995766 1.37083488,2.96132487 L6,0.288675135 C6.30940108,0.11004234 6.69059892,0.11004234 7,0.288675135 Z" id="多边形"></path>
+                        <polyline id="路径-15" points="0.931223827 3.37218958 6.5 6.5 6.5 12.8581283"></polyline>
+                        <line x1="6.5" y1="6.49748419" x2="12.0714286" y2="3.37218958" id="路径-16"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/web/src/assets/images/userMemory/goto.svg
+++ b/web/src/assets/images/userMemory/goto.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 13备份</title>
+    <g id="V1.1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="红熊空间-记忆管理" transform="translate(-947, -144)">
+            <g id="1备份-2" transform="translate(651, 128)">
+                <g id="编组-13备份" transform="translate(296, 16)">
+                    <rect id="矩形" stroke="#DFE4ED" x="0.5" y="0.5" width="27" height="27" rx="6"></rect>
+                    <g id="进入@2x" transform="translate(5.8333, 5.8333)">
+                        <g id="编组-11" transform="translate(2.0417, 2.5521)">
+                            <path d="M5.42385066,3.34516089 L8.15899029,5.47250014 C8.23746067,5.5335329 8.25159666,5.64662254 8.1905639,5.72509292 C8.1813906,5.73688711 8.17078448,5.74749323 8.15899029,5.75666652 L5.42385066,7.88400578 C5.34538028,7.94503854 5.23229064,7.93090256 5.17125788,7.85243218 C5.14668314,7.82083621 5.13334107,7.78195037 5.13334107,7.74192259 L5.13334107,6.2384308 L5.13334107,6.2384308 L0,6.2384308 L0,4.99073587 L5.13334107,4.99073587 L5.13334107,3.48724407 C5.13334107,3.38783282 5.21392981,3.30724407 5.31334107,3.30724407 C5.35336884,3.30724407 5.39225469,3.32058615 5.42385066,3.34516089 Z" id="路径" fill="#5B6167" fill-rule="nonzero"></path>
+                            <path d="M1.60417096,2.83745334 L1.60417096,0.9 C1.60417096,0.402943725 2.00711469,0 2.50417096,-1.11022302e-16 L10.3291667,-1.11022302e-16 C10.8262229,-2.22044605e-16 11.2291667,0.402943725 11.2291667,0.9 L11.2291667,10.3291667 C11.2291667,10.8262229 10.8262229,11.2291667 10.3291667,11.2291667 L2.50417096,11.2291667 C2.00711469,11.2291667 1.60417096,10.8262229 1.60417096,10.3291667 L1.60417096,8.46506778 L1.60417096,8.46506778" id="路径" stroke="#5B6167" stroke-width="1.1" stroke-linejoin="round"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/web/src/components/CustomSelect/index.tsx
+++ b/web/src/components/CustomSelect/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState, useCallback, useRef, type FC, type Key } from 'react';
+import { useEffect, useState, type FC, type Key } from 'react';
 import { Select } from 'antd'
 import type { SelectProps, DefaultOptionType } from 'antd/es/select'
 import { useTranslation } from 'react-i18next';
@@ -26,7 +26,7 @@ interface CustomSelectProps extends Omit<SelectProps, 'filterOption'> {
  disabled?: boolean;
  style?: React.CSSProperties;
  className?: string;
-  filterOption?: (inputValue: string, option: DefaultOptionType) => boolean;
+  filterOption?: (inputValue: string, option?: DefaultOptionType) => boolean;
 }
 interface OptionType {
  [key: string]: Key | string | number;
@@ -48,44 +48,27 @@ const CustomSelect: FC<CustomSelectProps> = ({
 }) => {
  const { t } = useTranslation();
  const [options, setOptions] = useState<OptionType[]>([]); 
-  // 创建防抖定时器引用
-  const debounceRef = useRef<number>();
-  
-  // 防抖搜索函数
-  const handleSearch = useCallback((value?: string) => {
-    // 清除之前的定时器
-    if (debounceRef.current) {
-      clearTimeout(debounceRef.current);
-    }
-    
-    // 设置新的定时器
-    debounceRef.current = window.setTimeout(() => {
-      request.get<ApiResponse<OptionType>>(url, {...params, [optionFilterProp]: value}).then((res) => {
-        const data = res;
-        setOptions(Array.isArray(data) ? data || [] : Array.isArray(data?.items) ? data.items || [] : []);
-      });
-    }, 300); // 300毫秒防抖延迟
-  }, [url, params, optionFilterProp]);
  
+  // 默认模糊搜索函数
+  const defaultFilterOption = (inputValue: string, option?: DefaultOptionType) => {
+    if (!option || !inputValue) return true;
+    const label = String(option.children || option.label || '');
+    return label.toLowerCase().includes(inputValue.toLowerCase());
+  };
  // 组件挂载时获取初始数据
  useEffect(() => {
-    handleSearch();
-    
-    // 组件卸载时清除定时器
-    return () => {
-      if (debounceRef.current) {
-        clearTimeout(debounceRef.current);
-      }
-    };
-  }, [url, handleSearch]);
+    request.get<ApiResponse<OptionType>>(url, params).then((res) => {
+      const data = res;
+      setOptions(Array.isArray(data) ? data || [] : Array.isArray(data?.items) ? data.items || [] : []);
+    });
+  }, []);
  return (
    <Select 
      placeholder={placeholder ? placeholder : t('common.select')} 
      onChange={onChange}
      defaultValue={hasAll ? null : undefined}
      showSearch={showSearch}
-      onSearch={handleSearch}
-      filterOption={filterOption || false} // 禁用本地过滤，使用服务器端过滤
+      filterOption={filterOption || defaultFilterOption}
      {...props}
    >
      {hasAll && (<Select.Option>{allTitle || t('common.all')}</Select.Option>)}
--- a/web/src/components/SiderMenu/index.tsx
+++ b/web/src/components/SiderMenu/index.tsx
@@ -40,6 +40,8 @@ import apiKeyIcon from '@/assets/images/menu/apiKey.png';
 import apiKeyActiveIcon from '@/assets/images/menu/apiKey_active.png';
 import pricingIcon from '@/assets/images/menu/pricing.svg'
 import pricingActiveIcon from '@/assets/images/menu/pricing_active.svg'
+import spaceConfigIcon from '@/assets/images/menu/spaceConfig.svg'
+import spaceConfigActiveIcon from '@/assets/images/menu/spaceConfig_active.svg'

 // 图标路径映射表
 const iconPathMap: Record<string, string> = {
@@ -68,7 +70,9 @@ const iconPathMap: Record<string, string> = {
  'apiKey': apiKeyIcon,
  'apiKeyActive': apiKeyActiveIcon,
  'pricing': pricingIcon,
-  'pricingActive': pricingActiveIcon
+  'pricingActive': pricingActiveIcon,
+  'spaceConfig': spaceConfigIcon,
+  'spaceConfigActive': spaceConfigActiveIcon,
 };

 const { Sider } = Layout;
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -87,7 +87,7 @@ export const en = {
      modelManagement: 'Model Management',
      memoryStore: 'Memory Store',
      apiParameters: 'API Parameters',
-      userMemory: 'User Memory',
+      userMemory: 'Memory Store',
      memberManagement: 'Member Management',
      memorySummary: 'Memory Summary',
      memoryConversation: 'Memory Validation',
@@ -110,6 +110,7 @@ export const en = {
      pricing: 'Pricing Management',
      orderPayment: 'Order Payment',
      orderHistory: 'Order History',
+      spaceConfig: 'Space Configuration'
    },
    dashboard: {
      total_models: 'Total number of available models',
@@ -1232,6 +1233,8 @@ export const en = {
      hire_date: 'Hire Date',
      memoryContent: 'Memory Content',
      created_at: 'Created At',
+      updated_at: 'Updated At',
+      fullScreen: 'Full Screen',

      memoryWindow: "{{name}}'s Window of Memory",
      memory_insight: 'Overall Overview',
@@ -1258,7 +1261,7 @@ export const en = {
      unix: 'items',
      completeMemory: 'Complete Memory',
      relationshipEvolution: 'Relationship Evolution',
-      timelineMemories: 'Shared Memory Timeline',
+      timelineMemories: 'Long-term Memory',
      emotionLine: 'Emotion Changes Over Time',
      interaction: 'Interaction Frequency & Relationship Stages',
      timelines_memory: 'All',
@@ -1269,6 +1272,12 @@ export const en = {
      negative: 'Negative Emotion',
      neutral: 'Neutral Emotion',
      interactionCountData: 'Interaction Count',
+      capacity: 'Capacity',
+      type: 'Type',
+      person: 'Personal',
+      memoryNum: 'memories',
+      memory_config_name: 'Memory Engine',
+      searchPlaceholder: 'Search memory store name',
    },
    space: {
      createSpace: 'Create Space',
@@ -1284,7 +1293,8 @@ export const en = {
      neo4jDesc: 'Based on knowledge graph, suitable for relational reasoning and path query',
      llmModel: 'LLM Model',
      embeddingModel: 'Embedding Model',
-      rerankModel: 'Rerank Model'
+      rerankModel: 'Rerank Model',
+      configAlert: 'Space model configuration ensures that the space can correctly call the corresponding models to process business data during runtime.',
    },
    memoryExtractionEngine: {
      title: 'Memory Engine Module Configuration Center',
@@ -1459,6 +1469,8 @@ Memory Bear: After the rebellion, regional warlordism intensified for several re
      quickReply: 'Quick Reply',
      web_search: 'Online search',
      memory: 'Memory',
+      memoryConversationAnalysisEmpty: 'There is currently no dialogue analysis content available',
+      memoryConversationAnalysisEmptySubTitle: 'After entering your user ID, click on "Test Memory" to view the conversation memory',
    },
    login: {
      title: 'Red Bear Memory Science',
@@ -1613,19 +1625,17 @@ Memory Bear: After the rebellion, regional warlordism intensified for several re

      JsonTool_desc: 'Data Format Conversion',
      JsonTool_features: 'JSON formatting, compression, validation and conversion functions',
-      jsonFormat: 'JSON Formatting',
-      jsonGzip: 'JSON Compression',
-      jsonCheck: 'JSON Validation',
-      jsonConversion: 'Format Conversion',
+      jsonParse: 'JSON Parse',
+      jsonInsert: 'JSON Insert',
+      jsonReplace: 'JSON Validation',
+      jsonDelete: 'JSON Delete',
      jsonEg: 'Example JSON',
      enterJson: 'Enter JSON',
      jsonPlaceholder: 'Enter JSON data, e.g.: {"name": "test", "value": 123}',
      clear: 'Clear',
-      parse: 'Paste',
-      format: 'Format',
-      minify: 'Minify',
-      validate: 'Validate',
-      convert: 'Escape',
+      paste: 'Paste',
+      parse: 'Parse',
+      json_path: 'JSON Path Parameters',
      outputResult: 'Output Result',
      validJosn: 'JSON format is correct, validation passed!',

@@ -1944,7 +1954,8 @@ Memory Bear: After the rebellion, regional warlordism intensified for several re
      variableConfig: 'Variable Configuration',
      variableRequired: 'Required',
      addMessage: 'Add Message',
-      answerDesc: 'Reply'
+      answerDesc: 'Reply',
+      addNode: 'Add Node',
    },
    emotionEngine: {
      emotionEngineConfig: 'Emotion Engine Configuration',
--- a/web/src/i18n/zh.ts
+++ b/web/src/i18n/zh.ts
@@ -87,7 +87,7 @@ export const zh = {
      modelManagement: '模型管理',
      memoryStore: '记忆存储',
      apiParameters: 'API参数',
-      userMemory: '用户记忆',
+      userMemory: '记忆库',
      memberManagement: '成员管理',
      memorySummary: '记忆摘要',
      memoryConversation: '记忆验证',
@@ -102,7 +102,7 @@ export const zh = {
      knowledgeShare: '详情',
      knowledgeCreateDataset: '新建数据集',
      knowledgeDocumentDetails: '详情',
-      userMemoryDetail: '用户记忆详情',
+      userMemoryDetail: '记忆库详情',
      toolManagement: '工具管理',
      emotionEngine: '情感引擎',
      statementDetail: '情绪记忆',
@@ -110,6 +110,7 @@ export const zh = {
      pricing: '收费管理',
      orderPayment: '订单支付',
      orderHistory: '订单记录',
+      spaceConfig: '空间配置'
    },
    knowledgeBase: {
      home: '首页',
@@ -1313,7 +1314,7 @@ export const zh = {
      updated_at: '最后更新时间',
      fullScreen: '全屏',

-      memoryWindow: "{{name}}的记忆之窗",
+      memoryWindow: "{{name}} 的记忆之窗",
      memory_insight: '总体概述',
      key_findings: '关键发现',
      behavior_pattern: '行为模式',
@@ -1338,7 +1339,7 @@ export const zh = {
      unix: '个',
      completeMemory: '完整记忆',
      relationshipEvolution: '关系演化',
-      timelineMemories: '共同记忆时间线',
+      timelineMemories: '长期记忆',
      emotionLine: '情绪随时间变化',
      interaction: '互动频率 & 关系阶段',
      timelines_memory: '全部',
@@ -1349,6 +1350,12 @@ export const zh = {
      negative: '负向情绪',
      neutral: '中性情绪',
      interactionCountData: '互动次数',
+      capacity: '容量',
+      type: '类型',
+      person: '个人',
+      memoryNum: '条记忆',
+      memory_config_name: '记忆引擎',
+      searchPlaceholder: '搜索记忆库名称',
    },
    space: {
      createSpace: '创建空间',
@@ -1364,7 +1371,8 @@ export const zh = {
      neo4jDesc: '基于知识图谱，适合关系推理和路径查询',
      llmModel: 'LLM 模型',
      embeddingModel: 'Embedding 模型',
-      rerankModel: 'Rerank 模型'
+      rerankModel: 'Rerank 模型',
+      configAlert: '空间模型配置为空间的模型模型，保障空间运行时能正确的调用到相应的模型来处理业务数据。',
    },
    memoryExtractionEngine: {
      title: '记忆引擎模块配置中心',
@@ -1537,6 +1545,8 @@ export const zh = {
      quickReply: '快速回复',
      web_search: '联网搜索',
      memory: '记忆',
+      memoryConversationAnalysisEmpty: '目前没有可用的对话分析内容',
+      memoryConversationAnalysisEmptySubTitle: '输入您的用户ID后，点击"测试记忆"查看对话记忆',
    },
    login: {
      title: '红熊记忆科学',
@@ -1711,19 +1721,17 @@ export const zh = {

      JsonTool_desc: '数据格式转换',
      JsonTool_features: 'JSON格式化、压缩、验证和转换功能',
-      jsonFormat: 'JSON格式化',
-      jsonGzip: 'JSON压缩',
-      jsonCheck: 'JSON验证',
-      jsonConversion: '格式转换',
+      jsonParse: 'JSON解析',
+      jsonInsert: 'JSON插入',
+      jsonReplace: 'JSON验证',
+      jsonDelete: 'JSON删除',
      jsonEg: '示例JSON',
      enterJson: '输入JSON',
      jsonPlaceholder: '输入JSON数据，例如：{"name": "测试", "value": 123}',
      clear: '清空',
-      parse: '粘贴',
-      format: '格式化',
-      minify: '压缩',
-      validate: '验证',
-      convert: '转义',
+      paste: '粘贴',
+      parse: '解析',
+      json_path: 'JSON 路径参数',
      outputResult: '输出结果',
      validJosn: 'JSON格式正确，验证通过！',
      
@@ -2043,7 +2051,8 @@ export const zh = {
      variableConfig: '变量配置',
      variableRequired: '必填',
      addMessage: '添加消息',
-      answerDesc: '回复'
+      answerDesc: '回复',
+      addNode: '添加节点',
    },
    emotionEngine: {
      emotionEngineConfig: '情感引擎配置',
--- a/web/src/routes/index.tsx
+++ b/web/src/routes/index.tsx
@@ -66,6 +66,7 @@ const componentMap: Record<string, LazyExoticComponent<ComponentType<object>>> =
  OrderHistory: lazy(() => import('@/views/OrderHistory')),
  Pricing: lazy(() => import('@/views/Pricing')),
  ToolManagement: lazy(() => import('@/views/ToolManagement')),
+  SpaceConfig: lazy(() => import('@/views/SpaceConfig')),
  Login: lazy(() => import('@/views/Login')),
  InviteRegister: lazy(() => import('@/views/InviteRegister')),
  NoPermission: lazy(() => import('@/views/NoPermission')),
--- a/web/src/routes/routes.json
+++ b/web/src/routes/routes.json
@@ -33,6 +33,7 @@
      { "path": "/api-key", "element": "ApiKeyManagement" },
      { "path": "/emotion-engine/:id", "element": "EmotionEngine" },
      { "path": "/reflection-engine/:id", "element": "SelfReflectionEngine" },
+      { "path": "/space-config", "element": "SpaceConfig" },
      { "path": "/no-permission", "element": "NoPermission" },
      { "path": "/*", "element": "NotFound" }
    ]
--- a/web/src/store/menu.json
+++ b/web/src/store/menu.json
@@ -376,6 +376,21 @@
      "icon": null,
      "iconActive": null,
      "subs": null
+    },
+    {
+      "id": 12,
+      "parent": 0,
+      "code": "spaceConfig",
+      "label": "空间配置",
+      "i18nKey": "menu.spaceConfig",
+      "path": "/space-config",
+      "enable": true,
+      "display": true,
+      "level": 1,
+      "sort": 0,
+      "icon": null,
+      "iconActive": null,
+      "subs": null
    }
  ]
 }
--- a/web/src/views/SpaceConfig/index.tsx
+++ b/web/src/views/SpaceConfig/index.tsx
@@ -0,0 +1,118 @@
+import { type FC, useEffect, useState } from 'react';
+import { Form, App, Button, Skeleton } from 'antd';
+import { useTranslation } from 'react-i18next';
+
+import type { SpaceConfigData } from './types'
+import { getWorkspaceModels, updateWorkspaceModels } from '@/api/workspaces'
+import { getModelListUrl } from '@/api/models'
+import CustomSelect from '@/components/CustomSelect'
+import RbAlert from '@/components/RbAlert';
+
+const SpaceConfig: FC = () => {
+  const { t } = useTranslation();
+  const { message } = App.useApp();
+  const [pageLoading, setPageLoding] = useState(false)
+  const [form] = Form.useForm<SpaceConfigData>();
+  const [loading, setLoading] = useState(false)
+
+  const values = Form.useWatch([], form);
+
+  useEffect(() => {
+    setPageLoding(true)
+    getWorkspaceModels().then((res) => {
+      const { llm, embedding, rerank } = res as SpaceConfigData
+      form.setFieldsValue({
+        llm,
+        embedding,
+        rerank
+      })
+    })
+    .finally(() => {
+      setPageLoding(false)
+    })
+  }, [])
+  // 封装保存方法，添加提交逻辑
+  const handleSave = () => {
+    form
+      .validateFields()
+      .then(() => {
+        setLoading(true)
+        updateWorkspaceModels(values)
+          .then(() => {
+            setLoading(false)
+            message.success(t('common.updateSuccess'))
+          })
+          .catch(() => {
+            setLoading(false)
+          });
+      })
+      .catch((err) => {
+        console.log('err', err)
+      });
+  }
+
+  return (
+    <div className="rb:h-full rb:max-w-140 rb:mx-auto">
+      {pageLoading
+        ? <Skeleton active />
+        : <Form
+          form={form}
+          layout="vertical"
+        >
+          <Form.Item 
+            label={t('space.llmModel')} 
+            name="llm"
+            rules={[{ required: true, message: t('common.pleaseSelect') }]}
+          >
+            <CustomSelect
+              url={getModelListUrl}
+              params={{ type: 'llm', pagesize: 100 }}
+              valueKey="id"
+              labelKey="name"
+              hasAll={false}
+              style={{width: '100%'}}
+            />
+          </Form.Item>
+          <Form.Item 
+            label={t('space.embeddingModel')} 
+            name="embedding"
+            rules={[{ required: true, message: t('common.pleaseSelect') }]}
+          >
+            <CustomSelect
+              url={getModelListUrl}
+              params={{ type: 'embedding', pagesize: 100 }}
+              valueKey="id"
+              labelKey="name"
+              hasAll={false}
+              style={{width: '100%'}}
+            />
+          </Form.Item>
+          <Form.Item 
+            label={t('space.rerankModel')} 
+            name="rerank"
+            rules={[{ required: true, message: t('common.pleaseSelect') }]}
+          >
+            <CustomSelect
+              url={getModelListUrl}
+              params={{ type: 'rerank', pagesize: 100 }}
+              valueKey="id"
+              labelKey="name"
+              hasAll={false}
+              style={{width: '100%'}}
+            />
+          </Form.Item>
+
+          <RbAlert>{t('space.configAlert')}</RbAlert>
+
+          <Form.Item className="rb:text-right">
+            <Button type="primary" className="rb:mt-6" onClick={handleSave} loading={loading}>
+              {t('common.save')}
+            </Button>
+          </Form.Item>
+        </Form>
+      }
+    </div>
+  );
+};
+
+export default SpaceConfig;
--- a/web/src/views/SpaceConfig/types.ts
+++ b/web/src/views/SpaceConfig/types.ts
@@ -0,0 +1,8 @@
+export interface SpaceConfigData {
+  llm: string;
+  embedding: string;
+  rerank: string;
+}
+export interface SpaceConfigRef {
+  handleOpen: () => void;
+}
--- a/web/src/views/ToolManagement/components/JsonToolModal.tsx
+++ b/web/src/views/ToolManagement/components/JsonToolModal.tsx
@@ -1,5 +1,5 @@
 import { forwardRef, useImperativeHandle, useState } from 'react';
-import { Form, Input, Button, Space, Tree } from 'antd';
+import { Form, Input, Button, Space } from 'antd';
 import { useTranslation } from 'react-i18next';
 import type { TreeDataNode } from 'antd';

@@ -12,7 +12,7 @@ import { execute } from '@/api/tools';
 const JsonToolModal = forwardRef<JsonToolModalRef>((_props, ref) => {
  const { t } = useTranslation();
  const [visible, setVisible] = useState(false);
-  const [form] = Form.useForm<{ json: string; }>();
+  const [form] = Form.useForm<{ json: string; json_path: string; }>();
  const [data, setData] = useState<ToolItem>({} as ToolItem)
  const [formatValue, setFormatValue] = useState<string | Record<string, any> | null>(null)

@@ -60,44 +60,29 @@ const JsonToolModal = forwardRef<JsonToolModalRef>((_props, ref) => {
  }
  const handleOperate = (type: string) => {
    const json = form.getFieldValue('json')
+    const json_path = form.getFieldValue('json_path')
    if (!json || !data.id) return
    let params: ExecuteData = {
      tool_id: data.id,
      parameters: {
        operation: type,
-        input_data: json
+        input_data: json,
+        json_path
      }
    }
-    if (type === 'format') {
+    if (type === 'parse') {
      params = {
        ...params,
        parameters: {
          ...params.parameters,
-          indent: 2,
-          ensure_ascii: false,
-          sort_keys: false
        }
      }
    }

    execute(params)
      .then(res => {
-        const { data } = res as {data: {
-          formatted_json: string;
-          minified_json: string;
-          is_valid: boolean;
-          converted_json: string;
-          error: string;
-          structure: Record<string, string | number>
-        }}
-        switch (type) {
-          case 'format':
-            setFormatValue(data.formatted_json);
-            break
-          case 'minify':
-            setFormatValue(data.minified_json)
-            break
-        }
+        const { data } = res as { data: string; }
+        setFormatValue(data);
      })
  }
  const clear = () => {
@@ -126,15 +111,20 @@ const JsonToolModal = forwardRef<JsonToolModalRef>((_props, ref) => {
          label={<Space size={8}>
            {t('tool.enterJson')}
            <Button onClick={clear}>{t('tool.clear')}</Button>
-            <Button onClick={handleParse}>{t('tool.parse')}</Button>
+            <Button onClick={handleParse}>{t('tool.paste')}</Button>
          </Space>}
        >
          <Input.TextArea rows={10} placeholder={t('tool.jsonPlaceholder')} />
        </FormItem>
+        <FormItem
+          name="json_path"
+          label={t('tool.json_path')}
+        >
+          <Input placeholder={t('common.pleaseEnter')} />
+        </FormItem>

        <Space size={8} className="rb:mb-3">
-          <Button onClick={() => handleOperate('format')}>{t('tool.format')}</Button>
-          <Button onClick={() => handleOperate('minify')}>{t('tool.minify')}</Button>
+          <Button onClick={() => handleOperate('parse')}>{t('tool.parse')}</Button>
        </Space>
        <FormItem
          label={t('tool.outputResult')}
--- a/web/src/views/ToolManagement/components/TimeToolModal.tsx
+++ b/web/src/views/ToolManagement/components/TimeToolModal.tsx
@@ -23,6 +23,7 @@ interface CurrentTimeObj {
  iso_format: string;
  timestamp: string;
  timestamp_ms: string;
+  utc_datetime: string;
 }
 const TimeToolModal = forwardRef<TimeToolModalRef>((_props, ref) => {
  const { t } = useTranslation();
@@ -88,8 +89,8 @@ const TimeToolModal = forwardRef<TimeToolModalRef>((_props, ref) => {
      }
    })
    .then(res => {
-      const response = res as { data: CurrentTimeObj }
-      setTimestampFormat(response.data.datetime)
+      const response = res as { data: string }
+      setTimestampFormat(response.data)
    })
  }
  const handleChangeFormatType = () => {
@@ -149,7 +150,7 @@ const TimeToolModal = forwardRef<TimeToolModalRef>((_props, ref) => {
              <Input disabled value={currentTime?.datetime} />
            </FormItem>
            <FormItem label={t('tool.utcTime')} >
-              <Input disabled value={currentTime?.iso_format} />
+              <Input disabled value={currentTime?.utc_datetime} />
            </FormItem>
            <FormItem label={t('tool.secondsTimestamp')} >
            <Input disabled value={currentTime?.timestamp} />
--- a/web/src/views/ToolManagement/constant.ts
+++ b/web/src/views/ToolManagement/constant.ts
@@ -10,10 +10,10 @@ export const InnerConfigData: Record<string, InnerConfigItem> = {
  },
  JsonTool: {
    features: [
-      'jsonFormat',
-      'jsonGzip',
-      'jsonCheck',
-      'jsonConversion'
+      'jsonParse',
+      'jsonInsert',
+      'jsonReplace',
+      'jsonDelete'
    ],
    eg: '{"name":"工具","tool_class":"内置"}'
  },
--- a/web/src/views/ToolManagement/types.ts
+++ b/web/src/views/ToolManagement/types.ts
@@ -130,6 +130,7 @@ export interface ExecuteData {
    ensure_ascii?: boolean;
    sort_keys?: boolean;
    input_data?: string;
+    json_path?: string;
  }
 }
 export interface CustomToolModalRef {
--- a/web/src/views/UserMemory/components/ConfigModal.tsx
+++ b/web/src/views/UserMemory/components/ConfigModal.tsx
@@ -1,127 +0,0 @@
-import { forwardRef, useImperativeHandle, useState } from 'react';
-import { Form, App } from 'antd';
-import { useTranslation } from 'react-i18next';
-
-import type { ConfigModalData, ConfigModalRef } from '../types'
-import { getWorkspaceModels, updateWorkspaceModels } from '@/api/workspaces'
-import { getModelListUrl } from '@/api/models'
-import CustomSelect from '@/components/CustomSelect'
-import RbModal from '@/components/RbModal'
-
-const ConfigModal = forwardRef<ConfigModalRef>((_props, ref) => {
-  const { t } = useTranslation();
-  const { message } = App.useApp();
-  const [visible, setVisible] = useState(false);
-  const [form] = Form.useForm<ConfigModalData>();
-  const [loading, setLoading] = useState(false)
-
-  const values = Form.useWatch([], form);
-
-  // 封装取消方法，添加关闭弹窗逻辑
-  const handleClose = () => {
-    setVisible(false);
-    form.resetFields();
-    setLoading(false)
-  };
-
-  const handleOpen = () => {
-    getWorkspaceModels().then((res) => {
-      const { llm, embedding, rerank } = res as ConfigModalData
-      form.setFieldsValue({
-        llm,
-        embedding,
-        rerank
-      })
-    })
-    setVisible(true);
-  };
-  // 封装保存方法，添加提交逻辑
-  const handleSave = () => {
-    form
-      .validateFields()
-      .then(() => {
-        setLoading(true)
-        updateWorkspaceModels(values)
-          .then(() => {
-            setLoading(false)
-            handleClose()
-            message.success(t('common.updateSuccess'))
-          })
-          .catch(() => {
-            setLoading(false)
-          });
-
-        handleClose()
-      })
-      .catch((err) => {
-        console.log('err', err)
-      });
-  }
-
-  // 暴露给父组件的方法
-  useImperativeHandle(ref, () => ({
-    handleOpen,
-    handleClose
-  }));
-
-  return (
-    <RbModal
-      title={t(`userMemory.editConfig`)}
-      open={visible}
-      onCancel={handleClose}
-      okText={t('common.save')}
-      onOk={handleSave}
-      confirmLoading={loading}
-    >
-      <Form
-        form={form}
-        layout="vertical"
-      >
-        <Form.Item 
-          label={t('space.llmModel')} 
-          name="llm"
-          rules={[{ required: true, message: t('common.pleaseSelect') }]}
-        >
-          <CustomSelect
-            url={getModelListUrl}
-            params={{ type: 'llm', pagesize: 100 }}
-            valueKey="id"
-            labelKey="name"
-            hasAll={false}
-            style={{width: '100%'}}
-          />
-        </Form.Item>
-        <Form.Item 
-          label={t('space.embeddingModel')} 
-          name="embedding"
-          rules={[{ required: true, message: t('common.pleaseSelect') }]}
-        >
-          <CustomSelect
-            url={getModelListUrl}
-            params={{ type: 'embedding', pagesize: 100 }}
-            valueKey="id"
-            labelKey="name"
-            hasAll={false}
-            style={{width: '100%'}}
-          />
-        </Form.Item>
-        <Form.Item 
-          label={t('space.rerankModel')} 
-          name="rerank"
-          rules={[{ required: true, message: t('common.pleaseSelect') }]}
-        >
-          <CustomSelect
-            url={getModelListUrl}
-            params={{ type: 'rerank', pagesize: 100 }}
-            valueKey="id"
-            labelKey="name"
-            hasAll={false}
-            style={{width: '100%'}}
-          />
-        </Form.Item>
-      </Form>
-    </RbModal>
-  );
-});
-
-export default ConfigModal;
--- a/web/src/views/UserMemory/index.tsx
+++ b/web/src/views/UserMemory/index.tsx
@@ -1,56 +1,28 @@
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom'
-import { Row, Col, Radio, Button, List, Skeleton, Space } from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import type { RadioChangeEvent } from 'antd';
-import { AppstoreOutlined, MenuOutlined } from '@ant-design/icons';
+import { Row, Col, List, Skeleton } from 'antd';
 import Empty from '@/components/Empty'

-import type { Data, ConfigModalRef } from './types'
-import totalNum from '@/assets/images/memory/totalNum.svg'
-import onlineNum from '@/assets/images/memory/onlineNum.svg'
-import Table from '@/components/Table'
-import { getTotalEndUsers, userMemoryListUrl, getUserMemoryList } from '@/api/memory';
-import ConfigModal from './components/ConfigModal';
+import type { Data } from './types'
+import { getUserMemoryList } from '@/api/memory';
 import { useUser } from '@/store/user'
+import RbCard from '@/components/RbCard/Card'
+import SearchInput from '@/components/SearchInput';

-const bgList = [
-  'linear-gradient( 180deg, #F1F6FE 0%, #FBFDFF 100%)',
-  'linear-gradient( 180deg, #F1F9FE 0%, #FBFDFF 100%)',
-  'linear-gradient( 180deg, #FEFBF7 0%, #FBFDFF 100%)',
-  'linear-gradient( 180deg, #F1F9FE 0%, #FBFDFF 100%)',
-]
-
-const countList = [
-  'total_num', 'online_num',
-]
-const IconList: Record<string, string> = {
-  total_num: totalNum,
-  online_num: onlineNum,
-}
 export default function UserMemory() {
  const { t } = useTranslation();
  const navigate = useNavigate()
  const { storageType } = useUser()
-  const configModalRef = useRef<ConfigModalRef>(null)
  const [loading, setLoading] = useState<boolean>(false);
  const [data, setData] = useState<Data[]>([]);
-  const [countData, setCountData] = useState<Record<string, number>>({});
-  const [layout, setLayout] = useState<'card' | 'list'>('card');
+  const [search, setSearch] = useState<string | undefined>(undefined);

  // 获取数据
  useEffect(() => {
-    getCountData()
    getData()
  }, []);

-  // 用户记忆统计
-  const getCountData = () => {
-    getTotalEndUsers().then((res) => {
-      setCountData(res as Record<string, number> || {})
-    })
-  }
  const getData = () => {
    setLoading(true)
    getUserMemoryList().then((res) => {
@@ -60,7 +32,6 @@ export default function UserMemory() {
      setLoading(false)
    })
  }
-  console.log('storageType', storageType)
  const handleViewDetail = (id: string | number) => {
    switch (storageType) {
      case 'neo4j':
@@ -70,112 +41,77 @@ export default function UserMemory() {
        navigate(`/user-memory/${id}`)
    }
  }
-  const handleChangeLayout = (e: RadioChangeEvent) => {
-    const type = e.target.value
-    setLayout(type)
+  const handleViewMemoryConfig = () => {
+    navigate(`/memory`)
  }
-  // 表格列配置
-  const columns: ColumnsType = [
-    {
-      title: t('userMemory.user'),
-      dataIndex: 'end_user',
-      key: 'end_user',
-      render: (value) => value?.other_name && value?.other_name !== '' ? value?.other_name : value?.id || '-'
-    },
-    {
-      title: t('userMemory.knowledgeEntryCount'),
-      dataIndex: 'memory_num',
-      key: 'memory_num',
-      render: (value) => value?.total || 0
-    },
-    {
-      title: t('common.operation'),
-      key: 'action',
-      render: (_, record) => (
-          <Button
-            type="link"
-            onClick={() => handleViewDetail(record.end_user?.id)}
-          >
-            {t('common.viewDetail')}
-          </Button>
-      ),
-    },
-  ];
+
+  const filterData = useMemo(() => {
+    if (search && search.trim() !== '') {
+      return data.filter((item) => {
+        const { end_user } = item as Data;
+        const name = end_user?.other_name && end_user?.other_name !== '' ? end_user?.other_name : end_user?.id
+        return name?.includes(search)
+      })
+    }
+
+    return data
+  }, [search, data])

  return (
    <div>
      <Row gutter={16} className="rb:mb-4">
-        {countList.map(key => (
-          <Col key={key} span={6}>
-            <div className="rb:bg-[#FBFDFF] rb:border rb:border-[#DFE4ED] rb:rounded-xl rb:p-[18px_20px_20px_20px]">
-              <div className="rb:text-[28px] rb:font-extrabold rb:leading-8.75 rb:flex rb:items-center rb:justify-between rb:mb-3">
-                {countData[key] || 0}{key === 'avgInteractionTime' ? 's' : ''}
-                <img className="rb:w-6 rb:h-6" src={IconList[key]} />
-              </div>
-              <div className="rb:text-[12px] rb:text-[#5B6167] rb:font-regular rb:leading-4">{t(`userMemory.${key}`)}</div>
-            </div>
-          </Col>
-        ))}
-        <Col span={12} className="rb:text-right">
-          <Space>
-            <Button type="primary" onClick={() => configModalRef?.current?.handleOpen()}>{t('userMemory.chooseModel')}</Button>
-            <Radio.Group value={layout} onChange={handleChangeLayout}>
-              <Radio.Button value="card" disabled={layout === 'card'}><AppstoreOutlined /></Radio.Button>
-              <Radio.Button value="list" disabled={layout === 'list'}><MenuOutlined /></Radio.Button>
-            </Radio.Group>
-          </Space>
+        <Col span={8}>
+          <SearchInput
+            placeholder={t('userMemory.searchPlaceholder')}
+            onSearch={(value) => setSearch(value)}
+            style={{ width: '100%' }}
+          />
        </Col>
      </Row>
-      {layout === 'card' &&
-        <>
-          {loading ? 
-            <Skeleton active />
-          : data.length > 0 ? (
-            <List
-              grid={{ gutter: 16, column: 4 }}
-              dataSource={data}
-              renderItem={(item, index) => {
-                const { end_user, memory_num } = item as Data;
-                const name = end_user?.other_name && end_user?.other_name !== '' ? end_user?.other_name : end_user?.id
-                return (
-                  <List.Item key={index}>
-                    <div
-                      className="rb:p-5 rb:rounded-xl rb:border rb:border-[#DFE4ED] rb:cursor-pointer"
-                      style={{
-                        background: bgList[index % bgList.length],
-                      }}
+      {loading ?
+        <Skeleton active />
+        : filterData.length > 0 ? (
+          <List
+            grid={{ gutter: 16, column: 3 }}
+            dataSource={filterData}
+            renderItem={(item, index) => {
+              const { end_user, memory_num, memory_config } = item as Data;
+              const name = end_user?.other_name && end_user?.other_name !== '' ? end_user?.other_name : end_user?.id
+              return (
+                <List.Item key={index}>
+                  <RbCard
+                    avatar={<div className="rb:w-12 rb:h-12 rb:text-center rb:font-semibold rb:text-[28px] rb:leading-12 rb:rounded-lg rb:text-[#FBFDFF] rb:bg-[#155EEF] rb:mr-2">{name[0]}</div>}
+                    title={name || '-'}
+                    extra={<div
+                      className="rb:w-7 rb:h-7 rb:cursor-pointer rb:bg-cover rb:bg-[url('@/assets/images/userMemory/goto.svg')]"
                      onClick={() => handleViewDetail(end_user.id)}
-                    >
-                      <div className="rb:flex rb:items-center">
-                        <div className="rb:w-12 rb:h-12 rb:text-center rb:font-semibold rb:text-[28px] rb:leading-12 rb:rounded-lg rb:text-[#FBFDFF] rb:bg-[#155EEF]">{name[0]}</div>
-                        <div className="rb:max-w-[calc(100%-60px)] rb:text-base rb:font-medium rb:leading-6 rb:ml-3 rb:text-ellipsis rb:overflow-hidden rb:whitespace-nowrap">
-                          {name || '-'}<br/>
-                        </div>
-                      </div>
-                      <div className="rb:grid rb:grid-cols-1 rb:gap-3 rb:mt-7 rb:mb-7">
-                        <div className="rb:text-center">
-                          <div className="rb:text-[24px] rb:leading-7.5 rb:font-extrabold">{memory_num.total || 0}</div>
-                          <div className="rb:wrap-break-word">{t(`userMemory.knowledgeEntryCount`)}</div>
-                        </div>
-                      </div>
+                    ></div>}
+                  >
+                    <div className="rb:flex rb:justify-between rb:items-center">
+                      <div>{t('userMemory.capacity')}</div>
+                      <div>{memory_num?.total || 0} {t('userMemory.memoryNum')}</div>
+                    </div>
+                    <div className="rb:flex rb:justify-between rb:items-center rb:mt-2.5">
+                      <div>{t('userMemory.type')}</div>
+                      <div>{t(`userMemory.${item.type || 'person'}`)}</div>
                    </div>
-                  </List.Item>
-                )
-              }}
-            />
-          ) : <Empty />}
-        </>
-      }

-      {layout === 'list' &&
-        <Table
-          apiUrl={userMemoryListUrl}
-          columns={columns}
-          rowKey="end_user.id"
-          pagination={false}
-        />
+                    <div className="rb:mt-3 rb:bg-[#F6F8FC] rb:rounded-lg rb:border rb:border-[#DFE4ED] rb:py-2 rb:px-3" onClick={handleViewMemoryConfig}>
+                      <div className="rb:text-[#5B6167] rb:leading-5 rb:flex rb:justify-between rb:items-center">
+                        {t('userMemory.memory_config_name')}
+                        <div
+                          className="rb:w-7 rb:h-7 rb:cursor-pointer rb:bg-cover rb:bg-[url('@/assets/images/userMemory/arrow_right.svg')]"
+                        ></div>
+                      </div>
+                      <div className="rb:font-medium rb:leading-5 rb:mt-1">{memory_config?.memory_config_name || '-'}</div>
+                    </div>
+                  </RbCard>
+                </List.Item>
+              )
+            }}
+          />
+        ) : <Empty />
      }
-      <ConfigModal ref={configModalRef} />
    </div>
  );
 }
--- a/web/src/views/UserMemory/types.ts
+++ b/web/src/views/UserMemory/types.ts
@@ -17,13 +17,10 @@ export interface Data {
      entity: number;
    }
  },
+  memory_config: {
+    memory_config_id: string;
+    memory_config_name: string;
+  },
+  type: string;
  name?: string;
-}
-export interface ConfigModalData {
-  llm: string;
-  embedding: string;
-  rerank: string;
-}
-export interface ConfigModalRef {
-  handleOpen: () => void;
 }
--- a/web/src/views/UserMemoryDetail/components/EmotionLine.tsx
+++ b/web/src/views/UserMemoryDetail/components/EmotionLine.tsx
@@ -3,8 +3,7 @@ import { useTranslation } from 'react-i18next'
 import ReactEcharts from 'echarts-for-react';
 import Empty from '@/components/Empty'
 import Loading from '@/components/Empty/Loading'
-import type { Emotion } from './GraphDetail'
-import { format } from 'echarts';
+import type { Emotion } from '../pages/GraphDetail'

 interface EmotionLineProps {
  chartData: Emotion[];
--- a/web/src/views/UserMemoryDetail/components/InteractionBar.tsx
+++ b/web/src/views/UserMemoryDetail/components/InteractionBar.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import ReactEcharts from 'echarts-for-react'
 import Empty from '@/components/Empty'
 import Loading from '@/components/Empty/Loading'
-import type { Interaction } from './GraphDetail'
+import type { Interaction } from '../pages/GraphDetail'

 interface InteractionBarProps {
  chartData: Interaction[];
--- a/web/src/views/UserMemoryDetail/components/RelationshipNetwork.tsx
+++ b/web/src/views/UserMemoryDetail/components/RelationshipNetwork.tsx
@@ -1,19 +1,18 @@
 import React, { type FC, useEffect, useState, useRef, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useParams } from 'react-router-dom'
+import { useParams, useNavigate } from 'react-router-dom'
 import { Col, Row, Space, Button } from 'antd'
 import dayjs from 'dayjs'

 import RbCard from '@/components/RbCard/Card'
 import ReactEcharts from 'echarts-for-react'
 import detailEmpty from '@/assets/images/userMemory/detail_empty.png'
-import type { Node, Edge, GraphData, StatementNodeProperties, ExtractedEntityNodeProperties, GraphDetailRef } from '../types'
+import type { Node, Edge, GraphData, StatementNodeProperties, ExtractedEntityNodeProperties } from '../types'
 import {
  getMemorySearchEdges,
 } from '@/api/memory'
 import Empty from '@/components/Empty'
 import Tag from '@/components/Tag'
-import GraphDetail from '../components/GraphDetail'

 const colors = ['#155EEF', '#369F21', '#4DA8FF', '#FF5D34', '#9C6FFF', '#FF8A4C', '#8BAEF7', '#FFB048']
 const RelationshipNetwork:FC = () => {
@@ -26,7 +25,7 @@ const RelationshipNetwork:FC = () => {
  const [categories, setCategories] = useState<{ name: string }[]>([])
  const [selectedNode, setSelectedNode] = useState<Node | null>(null)
  // const [fullScreen, setFullScreen] = useState<boolean>(false)
-  const graphDetailRef = useRef<GraphDetailRef>(null)
+  const navigate = useNavigate()

  console.log('categories', categories)
  // 关系网络
@@ -133,15 +132,14 @@ const RelationshipNetwork:FC = () => {
    }
  }, [nodes])

-  // const handleFullScreen = () => {
-  //   setFullScreen(prev => !prev)
-  // }
-
-  console.log('selectedNode', selectedNode)
-
  const handleViewAll = () => {
    if (!selectedNode) return
-    graphDetailRef.current?.handleOpen(selectedNode)
+    const params = new URLSearchParams({
+      nodeId: selectedNode.id,
+      nodeLabel: selectedNode.label,
+      nodeName: selectedNode.name || ''
+    })
+    navigate(`/user-memory/detail/${id}/GRAPH?${params.toString()}`)
  }

  return (
@@ -336,8 +334,6 @@ const RelationshipNetwork:FC = () => {
          </div>
        </RbCard>
      </Col>
-
-      <GraphDetail ref={graphDetailRef} />
    </Row>
  )
 }
--- a/web/src/views/UserMemoryDetail/components/GraphDetail.tsx
+++ b/web/src/views/UserMemoryDetail/components/GraphDetail.tsx
@@ -1,16 +1,17 @@
-import {  useState, forwardRef, useImperativeHandle, useMemo } from 'react'
+import {  useState, forwardRef, useImperativeHandle, useMemo, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useSearchParams } from 'react-router-dom'
 import { Row, Col, Tabs, Space, Skeleton } from 'antd'

 import { getRelationshipEvolution, getTimelineMemories } from '@/api/memory'
 import type { Node, GraphDetailRef } from '../types'
-import RbDrawer from '@/components/RbDrawer'
 import RbCard from '@/components/RbCard/Card'
-import EmotionLine from './EmotionLine'
+import EmotionLine from '../components/EmotionLine'
 import { formatDateTime } from '@/utils/format'
 import Tag from '@/components/Tag'
-import InteractionBar from './InteractionBar'
+import InteractionBar from '../components/InteractionBar'
 import Empty from '@/components/Empty'
+import PageHeader from '../components/PageHeader'

 export interface Emotion {
  emotion_intensity: number;
@@ -35,7 +36,7 @@ interface Timeline {

 const GraphDetail = forwardRef<GraphDetailRef>((_props, ref) => {
  const { t } = useTranslation()
-  const [open, setOpen] = useState(false);
+  const [searchParams] = useSearchParams()
  const [vo, setVo] = useState<Node | null>(null)
  const [loading, setLoading] = useState(false)
  const [emotionData, setEmotionData] = useState<Emotion[]>([])
@@ -43,14 +44,23 @@ const GraphDetail = forwardRef<GraphDetailRef>((_props, ref) => {
  const [activeTab, setActiveTab] = useState('timelines_memory')
  const [timelineLoading, setTimelineLoading] = useState(false)
  const [timelineMemories, setTimelineMemories] = useState<Timeline>({ timelines_memory: [], MemorySummary: [], Statement: [], ExtractedEntity: []})
+  useEffect(() => {
+    const nodeId = searchParams.get('nodeId')
+    const nodeLabel = searchParams.get('nodeLabel')
+    const nodeName = searchParams.get('nodeName')
+    
+    if (nodeId && nodeLabel) {
+      const nodeFromUrl = {
+        id: nodeId,
+        label: nodeLabel,
+        name: nodeName || nodeLabel
+      }
+      handleOpen(nodeFromUrl as Node)
+    }
+  }, [searchParams])

-  const handleCancel = () => {
-    setVo(null)
-    setOpen(false)
-  }
  const handleOpen = (vo: Node) => {
    setActiveTab('timelines_memory')
-    setOpen(true)
    setVo(vo)
    getRelationshipEvolutionData(vo)
    getTimelineMemoriesData(vo)
@@ -85,56 +95,57 @@ const GraphDetail = forwardRef<GraphDetailRef>((_props, ref) => {
  }, [activeTab, timelineMemories])

  return (
-    <RbDrawer
-      title={vo?.name}
-      open={open}
-      onClose={handleCancel}
-      width={1000}
-    >
-      <div className="rb:text-[16px] rb:font-medium rb:leading-5.5 rb:mb-3">{t('userMemory.relationshipEvolution')}</div>
-      <RbCard>
-        <Row gutter={16}>
-          <Col span={12}>
-            <EmotionLine chartData={emotionData} loading={loading} />
-          </Col>
-          <Col span={12}>
-            <InteractionBar chartData={interactionData} loading={loading} />
-          </Col>
-        </Row>
-      </RbCard>
+    <>
+      <PageHeader
+        name={vo?.name}
+        source="node"
+      />
+      <div className="rb:h-full rb:max-w-266 rb:mx-auto">
+        <div className="rb:text-[16px] rb:font-medium rb:leading-5.5 rb:mb-3">{t('userMemory.relationshipEvolution')}</div>
+        <RbCard>
+          <Row gutter={16}>
+            <Col span={12}>
+              <EmotionLine chartData={emotionData} loading={loading} />
+            </Col>
+            <Col span={12}>
+              <InteractionBar chartData={interactionData} loading={loading} />
+            </Col>
+          </Row>
+        </RbCard>

-      <div className="rb:text-[16px] rb:font-medium rb:leading-5.5 rb:mb-3 rb:mt-6">{t('userMemory.timelineMemories')}</div>
-      <RbCard>
-        <Tabs
-          activeKey={activeTab}
-          items={['timelines_memory', 'ExtractedEntity', 'Statement', 'MemorySummary'].map(key => ({
-            label: t(`userMemory.${key}`),
-            key
-          }))}
-          onChange={(key: string) => setActiveTab(key)}
-        />
-        {timelineLoading
-          ? <Skeleton active />
-          : !activeContent || activeContent.length === 0
-          ? <Empty size={120} className="rb:mt-12 rb:mb-20.25" />
-          : <Space size={16} direction="vertical" className="rb:w-full">
-            {activeContent.map((vo, index) => (
-              <RbCard
-                key={index}
-                headerType="borderL"
-                headerClassName="rb:before:bg-[#155EEF]!"
-                title={vo.text}
-              >
-                <div className="rb:text-[#A8A9AA] rb:text-[12px] rb:leading-4">{formatDateTime(vo.created_at)}</div>
-                <Tag className="rb:mt-2">{vo.type}</Tag>
-              </RbCard>
-            ))}
-          </Space>
-        }
+        <div className="rb:text-[16px] rb:font-medium rb:leading-5.5 rb:mb-3 rb:mt-6">{t('userMemory.timelineMemories')}</div>
+        <RbCard>
+          <Tabs
+            activeKey={activeTab}
+            items={['timelines_memory', 'Statement', 'MemorySummary'].map(key => ({
+              label: t(`userMemory.${key}`),
+              key
+            }))}
+            onChange={(key: string) => setActiveTab(key)}
+          />
+          {timelineLoading
+            ? <Skeleton active />
+            : !activeContent || activeContent.length === 0
+            ? <Empty size={120} className="rb:mt-12 rb:mb-20.25" />
+            : <Space size={16} direction="vertical" className="rb:w-full">
+              {activeContent.map((vo, index) => (
+                <RbCard
+                  key={index}
+                  headerType="borderL"
+                  headerClassName="rb:before:bg-[#155EEF]!"
+                  title={vo.text}
+                >
+                  <div className="rb:text-[#A8A9AA] rb:text-[12px] rb:leading-4">{formatDateTime(vo.created_at)}</div>
+                  <Tag className="rb:mt-2">{vo.type}</Tag>
+                </RbCard>
+              ))}
+            </Space>
+          }

-        
-      </RbCard>
-    </RbDrawer>
+          
+        </RbCard>
+      </div>
+    </>
  )
 })
 export default GraphDetail
--- a/web/src/views/UserMemoryDetail/pages/index.tsx
+++ b/web/src/views/UserMemoryDetail/pages/index.tsx
@@ -1,7 +1,7 @@
 import { type FC, useEffect, useState, useMemo, useRef } from 'react'
 import { useParams, useNavigate } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
-import { Dropdown, Space, Button } from 'antd'
+import { Dropdown, Button } from 'antd'

 import PageHeader from '../components/PageHeader'
 import StatementDetail from './StatementDetail'
@@ -16,6 +16,7 @@ import {
  getEndUserProfile,
 } from '@/api/memory'
 import refreshIcon from '@/assets/images/refresh_hover.svg'
+import GraphDetail from './GraphDetail'

 const Detail: FC = () => {
  const { t } = useTranslation()
@@ -47,6 +48,10 @@ const Detail: FC = () => {
    forgetDetailRef.current?.handleRefresh()
  }

+  if (type === 'GRAPH') {
+    return <GraphDetail />
+  }
+
  return (
    <div className="rb:h-full rb:w-full">
      <PageHeader 
--- a/web/src/views/Workflow/components/Nodes/AddNode.tsx
+++ b/web/src/views/Workflow/components/Nodes/AddNode.tsx
@@ -107,7 +107,7 @@ const AddNode: ReactShapeConfig['component'] = ({ node, graph }) => {
    <div style={{ maxHeight: '300px', overflowY: 'auto', minWidth: '240px' }}>
      {nodeLibrary.map((category, categoryIndex) => {
        const filteredNodes = category.nodes.filter(nodeType => 
-          nodeType.type !== 'start' && nodeType.type !== 'end' && nodeType.type !== 'loop' && nodeType.type !== 'cycle-start'
+          nodeType.type !== 'start' && nodeType.type !== 'end' && nodeType.type !== 'iteration' && nodeType.type !== 'loop' && nodeType.type !== 'cycle-start'
        );
        
        if (filteredNodes.length === 0) return null;
--- a/web/src/views/Workflow/components/Nodes/LoopNode.tsx
+++ b/web/src/views/Workflow/components/Nodes/LoopNode.tsx
@@ -33,7 +33,7 @@ const LoopNode: ReactShapeConfig['component'] = ({ node, graph }) => {
        y: cycleStartBBox.y,
        data: {
          type: 'add-node',
-          label: '添加节点',
+          label: t('workflow.addNode'),
          icon: '+',
          parentId: node.id,
          cycle: data.id,
@@ -61,7 +61,7 @@ const LoopNode: ReactShapeConfig['component'] = ({ node, graph }) => {
            },
          },
        },
-        zIndex: 3
+        zIndex: 10
      });
    }
  }
@@ -97,7 +97,7 @@ const LoopNode: ReactShapeConfig['component'] = ({ node, graph }) => {
      y: centerY,
      data: {
        type: 'add-node',
-        label: '添加节点',
+        label: t('workflow.addNode'),
        icon: '+',
        parentId: node.id,
        cycle: data.id,
@@ -128,7 +128,7 @@ const LoopNode: ReactShapeConfig['component'] = ({ node, graph }) => {
          },
        },
      },
-      zIndex: 3
+      zIndex: 10
    }

    graph.addEdge(edgeConfig)
--- a/web/src/views/Workflow/components/PortClickHandler.tsx
+++ b/web/src/views/Workflow/components/PortClickHandler.tsx
@@ -151,11 +151,11 @@ const PortClickHandler: React.FC<PortClickHandlerProps> = ({ graph }) => {
        
        let filteredNodes;
        if (isChildOfLoop) {
-          // Use same filtering as AddNode for child nodes of loop
+          // Use same filtering as AddNode for child nodes of loop, but allow break
          filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
        } else if (isChildOfIteration) {
-          // Filter out loop and iteration nodes for children of iteration nodes
-          filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'break', 'cycle-start', 'iteration'].includes(nodeType.type));
+          // Filter out loop and iteration nodes for children of iteration nodes, but allow break
+          filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
        } else {
          // Original filtering for non-loop child nodes
          filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'break', 'cycle-start'].includes(nodeType.type));
--- a/web/src/views/Workflow/components/Properties/AssignmentList/index.tsx
+++ b/web/src/views/Workflow/components/Properties/AssignmentList/index.tsx
@@ -60,7 +60,7 @@ const AssignmentList: FC<AssignmentListProps> = ({
                    >
                      <VariableSelect
                        placeholder={t('common.pleaseSelect')}
-                        options={options}
+                        options={options.filter(vo => vo.nodeData.type === 'loop' || vo.value.includes('conv.'))}
                        popupMatchSelectWidth={false}
                        onChange={() => {
                          form.setFieldValue([parentName, name, 'operation'], undefined);
--- a/web/src/views/Workflow/components/Properties/CategoryList/index.tsx
+++ b/web/src/views/Workflow/components/Properties/CategoryList/index.tsx
@@ -1,17 +1,19 @@
 import { type FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Input, Button, Form, Space } from 'antd';
-import { PlusOutlined, CopyOutlined, DeleteOutlined, ExpandOutlined } from '@ant-design/icons';
+import { Button, Form, Space } from 'antd';
+import { DeleteOutlined } from '@ant-design/icons';
 import { Graph, Node } from '@antv/x6';
-import type { PortMetadata } from '@antv/x6/lib/model/port';
+import Editor from '../../Editor';
+import type { Suggestion } from '../../Editor/plugin/AutocompletePlugin'

 interface CategoryListProps {
  parentName: string;
+  options: Suggestion[];
  selectedNode?: Node | null;
  graphRef?: React.MutableRefObject<Graph | undefined>;
 }

-const CategoryList: FC<CategoryListProps> = ({ parentName, selectedNode, graphRef }) => {
+const CategoryList: FC<CategoryListProps> = ({ parentName, selectedNode, graphRef, options }) => {
  const { t } = useTranslation();
  const form = Form.useFormInstance();
  const formValues = Form.useWatch([parentName], form);
@@ -167,9 +169,9 @@ const CategoryList: FC<CategoryListProps> = ({ parentName, selectedNode, graphRe
                  name={[name, 'class_name']}
                noStyle
              >
-                <Input.TextArea
+                <Editor
                  placeholder={t('common.pleaseEnter')}
-                  rows={2}
+                  options={options}
                />
              </Form.Item>
            </div>
--- a/web/src/views/Workflow/components/Properties/ConditionList/index.tsx
+++ b/web/src/views/Workflow/components/Properties/ConditionList/index.tsx
@@ -1,6 +1,6 @@
 import { type FC } from 'react'
 import { useTranslation } from 'react-i18next';
-import { Form, Button, Select, Row, Col, InputNumber, Radio, type SelectProps } from 'antd'
+import { Form, Button, Select, Row, Col, InputNumber, Radio, Input, type SelectProps } from 'antd'
 import { DeleteOutlined } from '@ant-design/icons';

 import type { Suggestion } from '../../Editor/plugin/AutocompletePlugin'
@@ -114,7 +114,7 @@ const ConditionList: FC<CaseListProps> = ({
                      <Col span={14}>
                        <Form.Item name={[field.name, 'left']} noStyle>
                          <VariableSelect
-                            options={options}
+                            options={options.filter(vo => vo.value.includes('sys.') || vo.value.includes('conv.') || vo.nodeData.type === 'loop')}
                            size="small"
                            allowClear={false}
                            popupMatchSelectWidth={false}
@@ -186,7 +186,7 @@ const ConditionList: FC<CaseListProps> = ({
                                  <Radio.Button value={true}>True</Radio.Button>
                                  <Radio.Button value={false}>False</Radio.Button>
                                </Radio.Group>
-                                : <Editor options={options} />
+                                : <Input placeholder={t('common.pleaseEnter')} />
                              }
                            </Form.Item>
                          </Col>
--- a/web/src/views/Workflow/components/Properties/CycleVarsList/index.tsx
+++ b/web/src/views/Workflow/components/Properties/CycleVarsList/index.tsx
@@ -1,6 +1,6 @@
 import { type FC } from 'react'
 import { useTranslation } from 'react-i18next';
-import { Form, Button, Select, Row, Col, Input } from 'antd'
+import { Form, Select, Row, Col, Input } from 'antd'
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import VariableSelect from '../VariableSelect'

@@ -36,7 +36,6 @@ const CycleVarsList: FC<CycleVarsListProps> = ({
  value = [],
  options,
  parentName,
-  onChange,
  selectedNode,
  graphRef
 }) => {
@@ -139,12 +138,17 @@ const CycleVarsList: FC<CycleVarsListProps> = ({
                  <Form.Item name={[name, 'value']} noStyle>
                    {currentInputType === 'variable' ? (
                      <VariableSelect
-                        placeholder="选择变量"
-                        options={availableOptions}
+                        placeholder={t('common.pleaseSelect')}
+                        options={availableOptions.filter(option => {
+                          const currentType = value?.[index]?.type;
+                          if (!currentType) return true;
+
+                          return option.dataType === currentType
+                        })}
                      />
                    ) : (
                      <Input.TextArea
-                        placeholder="输入值"
+                        placeholder={t('common.pleaseEnter')}
                        rows={3}
                        className="rb:w-full"
                      />
--- a/web/src/views/Workflow/components/Properties/GroupVariableList/index.tsx
+++ b/web/src/views/Workflow/components/Properties/GroupVariableList/index.tsx
@@ -18,8 +18,22 @@ const GroupVariableList: FC<GroupVariableListProps> = ({
  isCanAdd = false
 }) => {
  const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const value = form.getFieldValue(name) || [];
+
+  console.log('GroupVariableList', value)

  if (!isCanAdd) {
+    // Filter options based on first variable's dataType if value exists
+    let filteredOptions = options;
+    if (value.length > 0) {
+      const firstVariableValue = value[0];
+      const firstVariable = options.find(opt => `{{${opt.value}}}` === firstVariableValue);
+      if (firstVariable) {
+        filteredOptions = options.filter(opt => opt.dataType === firstVariable.dataType);
+      }
+    }
+    
    return (
      <div className="rb:mb-4">
        <Row gutter={12} className="rb:mb-2!">
@@ -38,7 +52,7 @@ const GroupVariableList: FC<GroupVariableListProps> = ({
        >
          <VariableSelect
            placeholder={t('common.pleaseSelect')}
-            options={options}
+            options={filteredOptions}
            mode="multiple"
          />
        </Form.Item>
@@ -77,7 +91,18 @@ const GroupVariableList: FC<GroupVariableListProps> = ({
                >
                  <VariableSelect
                    placeholder={t('common.pleaseSelect')}
-                    options={options}
+                    options={(() => {
+                      const currentGroupValue = value[name]?.value || [];
+                      if (currentGroupValue.length > 0) {
+                        const firstVariableValue = currentGroupValue[0];
+                        const firstVariable = options.find(opt => `{{${opt.value}}}` === firstVariableValue);
+                        if (firstVariable) {
+                          return options.filter(opt => opt.dataType === firstVariable.dataType);
+                        }
+                      }
+                      return options;
+                    })()
+                    }
                    mode="multiple"
                  />
                </Form.Item>
--- a/web/src/views/Workflow/components/Properties/HttpRequest/index.tsx
+++ b/web/src/views/Workflow/components/Properties/HttpRequest/index.tsx
@@ -90,7 +90,7 @@ const HttpRequest: FC<{ options: Suggestion[]; selectedNode?: any; graphRef?: an
        </Col>
        <Col span={16}>
          <Form.Item name="url">
-            <Editor options={options} variant="outlined" />
+            <Editor options={options.filter(vo => vo.dataType === 'string' || vo.dataType === 'number')} variant="outlined" />
          </Form.Item>
        </Col>
      </Row>
@@ -144,7 +144,7 @@ const HttpRequest: FC<{ options: Suggestion[]; selectedNode?: any; graphRef?: an
          <Form.Item name={['body', 'data']} noStyle>
            <EditableTable
              parentName={['body', 'data']}
-              options={options}
+              options={options.filter(vo => vo.dataType === 'string' || vo.dataType === 'number')}
              filterBooleanType={true}
            />
          </Form.Item>
@@ -154,7 +154,7 @@ const HttpRequest: FC<{ options: Suggestion[]; selectedNode?: any; graphRef?: an
            <MessageEditor
              key="json"
              parentName={['body', 'data']}
-              options={options}
+              options={options.filter(vo => vo.dataType === 'string' || vo.dataType === 'number')}
              isArray={false}
              title="JSON"
            />
--- a/web/src/views/Workflow/components/Properties/VariableSelect.tsx
+++ b/web/src/views/Workflow/components/Properties/VariableSelect.tsx
@@ -91,6 +91,7 @@ const VariableSelect: FC<VariableSelectProps> = ({
      showSearch
      allowClear={allowClear}
      filterOption={(input, option) => {
+        if (input === '/') return true;
        if (option?.options) {
          return option.label?.toLowerCase().includes(input.toLowerCase()) ||
                 option.options.some((opt: any) => 
--- a/web/src/views/Workflow/components/Properties/index.tsx
+++ b/web/src/views/Workflow/components/Properties/index.tsx
@@ -22,6 +22,7 @@ import ConditionList from './ConditionList'
 import CycleVarsList from './CycleVarsList'
 import AssignmentList from './AssignmentList'
 import ToolConfig from './ToolConfig'
+// import { calculateVariableList } from './utils/variableListCalculator'

 interface PropertiesProps {
  selectedNode?: Node | null; 
@@ -338,112 +339,35 @@ const Properties: FC<PropertiesProps> = ({
    const parentLoopNode = getParentLoopNode(selectedNode.id);
    
    console.log('childNodeIds', selectedNode, childNodeIds)
-    const allRelevantNodeIds = [...allPreviousNodeIds, ...childNodeIds];
+    let allRelevantNodeIds = [...allPreviousNodeIds, ...childNodeIds];
    
-    // Add parent loop/iteration node variables if current node is a child
+    // Add variables from nodes preceding the parent loop/iteration node if current node is a child
    if (parentLoopNode) {
-      const parentData = parentLoopNode.getData();
-      const parentNodeId = parentLoopNode.getData().id;
-      
-      if (parentData.type === 'loop') {
-        const cycleVars = parentData.cycle_vars || [];
-        cycleVars.forEach((cycleVar: any) => {
-          const key = `${parentNodeId}_cycle_${cycleVar.name}`;
-          if (!addedKeys.has(key)) {
-            addedKeys.add(key);
-            variableList.push({
-              key,
-              label: cycleVar.name,
-              type: 'variable',
-              dataType: cycleVar.type || 'String',
-              value: `${parentNodeId}.${cycleVar.name}`,
-              nodeData: parentData,
-            });
-          }
-        });
-      } else if (parentData.type === 'iteration') {
-        // Add item and index variables for iteration parent
-        const itemKey = `${parentNodeId}_item`;
-        const indexKey = `${parentNodeId}_index`;
-        
-        if (!addedKeys.has(itemKey)) {
-          addedKeys.add(itemKey);
-          variableList.push({
-            key: itemKey,
-            label: 'item',
-            type: 'variable',
-            dataType: 'Object',
-            value: `${parentNodeId}.item`,
-            nodeData: parentData,
-          });
-        }
-        
-        if (!addedKeys.has(indexKey)) {
-          addedKeys.add(indexKey);
-          variableList.push({
-            key: indexKey,
-            label: 'index',
-            type: 'variable',
-            dataType: 'Number',
-            value: `${parentNodeId}.index`,
-            nodeData: parentData,
-          });
-        }
-      }
-      
-      // Check if parent loop/iteration is connected to http-request via ERROR connection
-      if (parentData.type === 'loop' || parentData.type === 'iteration') {
-        const parentPreviousNodeIds = getAllPreviousNodes(parentLoopNode.id);
-        parentPreviousNodeIds.forEach(prevNodeId => {
-          const prevNode = nodes.find(n => n.id === prevNodeId);
-          if (!prevNode) return;
-          
-          const prevNodeData = prevNode.getData();
-          if (prevNodeData.type === 'http-request') {
-            // Check if connected via ERROR connection point
-            const errorEdges = edges.filter(edge => {
-              return edge.getTargetCellId() === parentLoopNode.id && 
-              edge.getSourceCellId() === prevNodeId &&
-              edge.getSourcePortId() === 'ERROR'
-            });
-            
-            if (errorEdges.length > 0) {
-              const errorMessageKey = `${prevNodeData.id}_error_message`;
-              const errorTypeKey = `${prevNodeData.id}_error_type`;
-              
-              if (!addedKeys.has(errorMessageKey)) {
-                addedKeys.add(errorMessageKey);
-                variableList.push({
-                  key: errorMessageKey,
-                  label: 'error_message',
-                  type: 'variable',
-                  dataType: 'string',
-                  value: `${prevNodeData.id}.error_message`,
-                  nodeData: prevNodeData,
-                });
-              }
-              
-              if (!addedKeys.has(errorTypeKey)) {
-                addedKeys.add(errorTypeKey);
-                variableList.push({
-                  key: errorTypeKey,
-                  label: 'error_type',
-                  type: 'variable',
-                  dataType: 'string',
-                  value: `${prevNodeData.id}.error_type`,
-                  nodeData: prevNodeData,
-                });
-              }
-            }
-          }
-        });
-      }
-      
-      // Add variables from nodes preceding the parent loop/iteration node
      const parentPreviousNodeIds = getAllPreviousNodes(parentLoopNode.id);
      allRelevantNodeIds.push(...parentPreviousNodeIds);
    }
    
+
+
+    // Add conversation variables from global config
+    const conversationVariables = workflowConfig?.variables || [];
+
+    conversationVariables.forEach((variable: any) => {
+      const key = `CONVERSATION_${variable.name}`;
+      if (!addedKeys.has(key)) {
+        addedKeys.add(key);
+        variableList.push({
+          key,
+          label: variable.name,
+          type: 'variable',
+          dataType: variable.type,
+          value: `conv.${variable.name}`,
+          nodeData: { type: 'CONVERSATION', name: 'CONVERSATION', icon: '' },
+          group: 'CONVERSATION'
+        });
+      }
+    });
+    
    allRelevantNodeIds.forEach(nodeId => {
      const node = nodes.find(n => n.id === nodeId);
      if (!node) return;
@@ -496,7 +420,7 @@ const Properties: FC<PropertiesProps> = ({
              key: llmKey,
              label: 'output',
              type: 'variable',
-              dataType: 'String',
+              dataType: 'string',
              value: `${dataNodeId}.output`,
              nodeData: nodeData,
            });
@@ -565,6 +489,17 @@ const Properties: FC<PropertiesProps> = ({
            const groupVariables = nodeData.config.group_variables.defaultValue || [];
            groupVariables?.forEach((groupVar: any) => {
              if (!groupVar || !groupVar.key) return;
+              
+              // Determine dataType from first variable in the group
+              let groupDataType = 'string';
+              if (groupVar.value && Array.isArray(groupVar.value) && groupVar.value.length > 0) {
+                const firstVariableValue = groupVar.value[0];
+                const firstVariable = variableList.find(v => `{{${v.value}}}` === firstVariableValue);
+                if (firstVariable) {
+                  groupDataType = firstVariable.dataType;
+                }
+              }
+              
              const groupVarKey = `${dataNodeId}_${groupVar.key}`;
              if (!addedKeys.has(groupVarKey)) {
                addedKeys.add(groupVarKey);
@@ -572,14 +507,26 @@ const Properties: FC<PropertiesProps> = ({
                  key: groupVarKey,
                  label: groupVar.key,
                  type: 'variable',
-                  dataType: 'string',
+                  dataType: groupDataType,
                  value: `${dataNodeId}.${groupVar.key}`,
                  nodeData: nodeData,
                });
              }
            });
          } else {
-            // If group=false, add output variable
+            // If group=false, add output variable with type from first group_variable
+            const groupVariables = nodeData.config.group_variables.defaultValue || [];
+            const firstVariable = groupVariables[0];
+            let outputDataType: string = 'any';
+            if (firstVariable) {
+              const filterVo = [...variableList].find(v => {
+                return `{{${v.value}}}` === firstVariable
+              })
+              if (filterVo) {
+                outputDataType = filterVo?.dataType
+              }
+            }
+            
            const varAggregatorKey = `${dataNodeId}_output`;
            if (!addedKeys.has(varAggregatorKey)) {
              addedKeys.add(varAggregatorKey);
@@ -587,7 +534,7 @@ const Properties: FC<PropertiesProps> = ({
                key: varAggregatorKey,
                label: 'output',
                type: 'variable',
-                dataType: 'string',
+                dataType: outputDataType,
                value: `${dataNodeId}.output`,
                nodeData: nodeData,
              });
@@ -684,21 +631,20 @@ const Properties: FC<PropertiesProps> = ({
              nodeData: nodeData,
            });
          }
-          if (!addedKeys.has(outputKey)) {
-            addedKeys.add(outputKey);
-            variableList.push({
-              key: outputKey,
-              label: 'output',
-              type: 'variable',
-              dataType: 'string',
-              value: `${dataNodeId}.output`,
-              nodeData: nodeData,
-            });
-          }
+          // if (!addedKeys.has(outputKey)) {
+          //   addedKeys.add(outputKey);
+          //   variableList.push({
+          //     key: outputKey,
+          //     label: 'output',
+          //     type: 'variable',
+          //     dataType: 'string',
+          //     value: `${dataNodeId}.output`,
+          //     nodeData: nodeData,
+          //   });
+          // }
          break
        case 'iteration':
          const iterationOutputKey = `${dataNodeId}_output`;
-          const iterationItemKey = `${dataNodeId}_item`;
          if (!addedKeys.has(iterationOutputKey)) {
            addedKeys.add(iterationOutputKey);
            // Get the data type from the output configuration, default to string
@@ -715,22 +661,11 @@ const Properties: FC<PropertiesProps> = ({
              key: iterationOutputKey,
              label: 'output',
              type: 'variable',
-              dataType: outputDataType,
+              dataType: `array[${outputDataType}]`,
              value: `${dataNodeId}.output`,
              nodeData: nodeData,
            });
          }
-          if (!addedKeys.has(iterationItemKey)) {
-            addedKeys.add(iterationItemKey);
-            variableList.push({
-              key: iterationItemKey,
-              label: 'item',
-              type: 'variable',
-              dataType: 'string',
-              value: `${dataNodeId}.item`,
-              nodeData: nodeData,
-            });
-          }
          break
        case 'loop':
          const cycleVars = nodeData.config.cycle_vars.defaultValue || [];
@@ -760,47 +695,337 @@ const Properties: FC<PropertiesProps> = ({
              key: toolDataKey,
              label: 'data',
              type: 'variable',
-              dataType: 'object',
+              dataType: 'string',
              value: `${dataNodeId}.data`,
              nodeData: nodeData,
            });
          }
          break
+        case 'memory-read':
+          const memoryReadAnswerKey = `${dataNodeId}_answer`;
+          const memoryReadIntermediateOutputs = `${dataNodeId}_intermediate_outputs`;
+          if (!addedKeys.has(memoryReadAnswerKey)) {
+            addedKeys.add(memoryReadAnswerKey);
+            variableList.push({
+              key: memoryReadAnswerKey,
+              label: 'answer',
+              type: 'variable',
+              dataType: 'string',
+              value: `${dataNodeId}.answer`,
+              nodeData: nodeData,
+            });
+          }
+          if (!addedKeys.has(memoryReadIntermediateOutputs)) {
+            addedKeys.add(memoryReadIntermediateOutputs);
+            variableList.push({
+              key: memoryReadIntermediateOutputs,
+              label: 'intermediate_outputs',
+              type: 'variable',
+              dataType: 'array[object]',
+              value: `${dataNodeId}.intermediate_outputs`,
+              nodeData: nodeData,
+            });
+          }
+          break
      }
    });

-    // Add conversation variables from global config
-    const conversationVariables = workflowConfig?.variables || [];
-    
-    conversationVariables.forEach((variable: any) => {
-      const key = `CONVERSATION_${variable.name}`;
-      if (!addedKeys.has(key)) {
-        addedKeys.add(key);
-        variableList.push({
-          key,
-          label: variable.name,
-          type: 'variable',
-          dataType: variable.type,
-          value: `conv.${variable.name}`,
-          nodeData: { type: 'CONVERSATION', name: 'CONVERSATION', icon: '' },
-          group: 'CONVERSATION'
+
+    // Add parent loop/iteration node variables if current node is a child
+    if (parentLoopNode) {
+      const parentData = parentLoopNode.getData();
+      const parentNodeId = parentLoopNode.getData().id;
+
+      if (parentData.type === 'loop') {
+        const cycleVars = parentData.cycle_vars || [];
+        cycleVars.forEach((cycleVar: any) => {
+          const key = `${parentNodeId}_cycle_${cycleVar.name}`;
+          if (!addedKeys.has(key)) {
+            addedKeys.add(key);
+            variableList.push({
+              key,
+              label: cycleVar.name,
+              type: 'variable',
+              dataType: cycleVar.type || 'String',
+              value: `${parentNodeId}.${cycleVar.name}`,
+              nodeData: parentData,
+            });
+          }
+        });
+      } else if (parentData.type === 'iteration') {
+        // Add item and index variables for iteration parent only if input has value
+        if (parentData.config.input.defaultValue) {
+          const itemKey = `${parentNodeId}_item`;
+          const indexKey = `${parentNodeId}_index`;
+
+          // Determine item dataType from input variable
+          let itemDataType = 'object';
+          const inputVariable = variableList.find(v => `{{${v.value}}}` === parentData.config.input.defaultValue);
+          console.log('itemDataType defaultValue', parentData.config.input.defaultValue, variableList, inputVariable)
+          if (inputVariable && inputVariable.dataType.startsWith('array[')) {
+            itemDataType = inputVariable.dataType.replace(/^array\[(.+)\]$/, '$1');
+            console.log('itemDataType', itemDataType)
+          }
+
+
+          if (!addedKeys.has(itemKey)) {
+            addedKeys.add(itemKey);
+            variableList.push({
+              key: itemKey,
+              label: 'item',
+              type: 'variable',
+              dataType: itemDataType,
+              value: `${parentNodeId}.item`,
+              nodeData: parentData,
+            });
+          }
+
+          if (!addedKeys.has(indexKey)) {
+            addedKeys.add(indexKey);
+            variableList.push({
+              key: indexKey,
+              label: 'index',
+              type: 'variable',
+              dataType: 'number',
+              value: `${parentNodeId}.index`,
+              nodeData: parentData,
+            });
+          }
+        }
+      }
+
+      // Check if parent loop/iteration is connected to http-request via ERROR connection
+      if (parentData.type === 'loop' || parentData.type === 'iteration') {
+        const parentPreviousNodeIds = getAllPreviousNodes(parentLoopNode.id);
+        parentPreviousNodeIds.forEach(prevNodeId => {
+          const prevNode = nodes.find(n => n.id === prevNodeId);
+          if (!prevNode) return;
+
+          const prevNodeData = prevNode.getData();
+          if (prevNodeData.type === 'http-request') {
+            // Check if connected via ERROR connection point
+            const errorEdges = edges.filter(edge => {
+              return edge.getTargetCellId() === parentLoopNode.id &&
+                edge.getSourceCellId() === prevNodeId &&
+                edge.getSourcePortId() === 'ERROR'
+            });
+
+            if (errorEdges.length > 0) {
+              const errorMessageKey = `${prevNodeData.id}_error_message`;
+              const errorTypeKey = `${prevNodeData.id}_error_type`;
+
+              if (!addedKeys.has(errorMessageKey)) {
+                addedKeys.add(errorMessageKey);
+                variableList.push({
+                  key: errorMessageKey,
+                  label: 'error_message',
+                  type: 'variable',
+                  dataType: 'string',
+                  value: `${prevNodeData.id}.error_message`,
+                  nodeData: prevNodeData,
+                });
+              }
+
+              if (!addedKeys.has(errorTypeKey)) {
+                addedKeys.add(errorTypeKey);
+                variableList.push({
+                  key: errorTypeKey,
+                  label: 'error_type',
+                  type: 'variable',
+                  dataType: 'string',
+                  value: `${prevNodeData.id}.error_type`,
+                  nodeData: prevNodeData,
+                });
+              }
+            }
+          }
        });
      }
-    });
+    }

    return variableList;
  }, [selectedNode, graphRef, workflowConfig?.variables]);

  // Filter out boolean type variables for loop and llm nodes
-  const getFilteredVariableList = (nodeType?: string) => {
-    if (nodeType === 'loop' || nodeType === 'llm') {
-      return variableList.filter(variable => variable.dataType !== 'boolean');
+  const getFilteredVariableList = (nodeType?: string, key?: string) => {
+    // Check if current node is a child of iteration node
+    const parentIterationNode = selectedNode ? (() => {
+      const nodes = graphRef.current?.getNodes() || [];
+      const nodeData = selectedNode.getData();
+      const cycle = nodeData?.cycle;
+      
+      if (cycle) {
+        const parentNode = nodes.find(n => n.getData().id === cycle);
+        if (parentNode) {
+          const parentData = parentNode.getData();
+          if (parentData?.type === 'iteration') {
+            return parentNode;
+          }
+        }
+      }
+      return null;
+    })() : null;
+
+    // Helper function to add parent iteration variables
+    const addParentIterationVars = (filteredList: any[]) => {
+      if (parentIterationNode) {
+        const parentData = parentIterationNode.getData();
+        const parentNodeId = parentData.id;
+        
+        if (parentData.config?.input?.defaultValue) {
+          const itemKey = `${parentNodeId}_item`;
+          const indexKey = `${parentNodeId}_index`;
+          
+          const existingItemVar = filteredList.find(v => v.key === itemKey);
+          const existingIndexVar = filteredList.find(v => v.key === indexKey);
+          
+          if (!existingItemVar) {
+            // Determine item dataType from input variable
+            let itemDataType = 'object';
+            const inputVariable = variableList.find(v => `{{${v.value}}}` === parentData.config.input.defaultValue);
+            if (inputVariable && inputVariable.dataType.startsWith('array[')) {
+              itemDataType = inputVariable.dataType.replace(/^array\[(.+)\]$/, '$1');
+            }
+            
+            filteredList.push({
+              key: itemKey,
+              label: 'item',
+              type: 'variable',
+              dataType: itemDataType,
+              value: `${parentNodeId}.item`,
+              nodeData: parentData,
+            });
+          }
+          
+          if (!existingIndexVar) {
+            filteredList.push({
+              key: indexKey,
+              label: 'index',
+              type: 'variable',
+              dataType: 'number',
+              value: `${parentNodeId}.index`,
+              nodeData: parentData,
+            });
+          }
+        }
+      }
+      return filteredList;
+    };
+
+    if (nodeType === 'llm') {
+      // For LLM nodes that are children of iteration or loop nodes, include parent variables
+      const parentLoopNode = selectedNode ? (() => {
+        const nodes = graphRef.current?.getNodes() || [];
+        const nodeData = selectedNode.getData();
+        const cycle = nodeData?.cycle;
+        
+        if (cycle) {
+          const parentNode = nodes.find(n => n.getData().id === cycle);
+          if (parentNode) {
+            const parentData = parentNode.getData();
+            if (parentData?.type === 'loop' || parentData?.type === 'iteration') {
+              return parentNode;
+            }
+          }
+        }
+        return null;
+      })() : null;
+      
+      let filteredList = variableList.filter(variable => variable.dataType !== 'boolean');
+      
+      // If this LLM node is a child of iteration/loop, ensure parent variables are included
+      if (parentLoopNode) {
+        const parentData = parentLoopNode.getData();
+        const parentNodeId = parentData.id;
+        
+        // Ensure parent loop/iteration variables are included
+        if (parentData.type === 'loop') {
+          const cycleVars = parentData.cycle_vars || [];
+          cycleVars.forEach((cycleVar: any) => {
+            const key = `${parentNodeId}_cycle_${cycleVar.name}`;
+            const existingVar = filteredList.find(v => v.key === key);
+            if (!existingVar && cycleVar.name && cycleVar.type !== 'boolean') {
+              filteredList.push({
+                key,
+                label: cycleVar.name,
+                type: 'variable',
+                dataType: cycleVar.type || 'String',
+                value: `${parentNodeId}.${cycleVar.name}`,
+                nodeData: parentData,
+              });
+            }
+          });
+        } else if (parentData.type === 'iteration') {
+          // Add item and index variables for iteration parent
+          if (parentData.config?.input?.defaultValue) {
+            const itemKey = `${parentNodeId}_item`;
+            const indexKey = `${parentNodeId}_index`;
+            
+            const existingItemVar = filteredList.find(v => v.key === itemKey);
+            const existingIndexVar = filteredList.find(v => v.key === indexKey);
+            
+            if (!existingItemVar) {
+              // Determine item dataType from input variable
+              let itemDataType = 'object';
+              const inputVariable = variableList.find(v => `{{${v.value}}}` === parentData.config.input.defaultValue);
+              if (inputVariable && inputVariable.dataType.startsWith('array[')) {
+                itemDataType = inputVariable.dataType.replace(/^array\[(.+)\]$/, '$1');
+              }
+              
+              filteredList.push({
+                key: itemKey,
+                label: 'item',
+                type: 'variable',
+                dataType: itemDataType,
+                value: `${parentNodeId}.item`,
+                nodeData: parentData,
+              });
+            }
+            
+            if (!existingIndexVar) {
+              filteredList.push({
+                key: indexKey,
+                label: 'index',
+                type: 'variable',
+                dataType: 'Number',
+                value: `${parentNodeId}.index`,
+                nodeData: parentData,
+              });
+            }
+          }
+        }
+      }
+      
+      return filteredList;
    }
-    return variableList;
+    if (nodeType === 'knowledge-retrieval' || nodeType === 'parameter-extractor' && key !== 'prompt' || nodeType === 'memory-read' || nodeType === 'memory-write' || nodeType === 'question-classifier') {
+      let filteredList = variableList.filter(variable => variable.dataType === 'string');
+      return addParentIterationVars(filteredList);
+    }
+    if (nodeType === 'parameter-extractor' && key === 'prompt') {
+      let filteredList = variableList.filter(variable => variable.dataType === 'string' || variable.dataType === 'number');
+      return addParentIterationVars(filteredList);
+    }
+    if (nodeType === 'iteration' && key === 'output') {
+      return variableList.filter(variable => variable.value.includes('sys.'));
+    }
+    if (nodeType === 'iteration') {
+      return variableList.filter(variable => variable.dataType.includes('array'));
+    }
+    if (nodeType === 'loop' && key === 'condition') {
+      let filteredList = variableList.filter(variable => variable.nodeData.type !== 'loop');
+      return addParentIterationVars(filteredList);
+    }
+    
+    // For all other node types, add parent iteration variables if applicable
+    let baseList = variableList;
+    return addParentIterationVars(baseList);
  };

+  // const defaultVariableList = calculateVariableList(selectedNode as Node, graphRef, workflowConfig )
+
  console.log('values', values)
-  console.log('variableList', variableList, selectedNode?.data)
+  // console.log('variableList', variableList, defaultVariableList)

  return (
    <div className="rb:w-75 rb:fixed rb:right-0 rb:top-16 rb:bottom-0 rb:p-3">
@@ -901,11 +1126,10 @@ const Properties: FC<PropertiesProps> = ({
                      });
                    }
                  }
-                  
                  return (
                    <Form.Item key={key} name={key}>
                      <MessageEditor
-                        key={key} 
+                        key={key}
                        options={contextVariableList.filter(variable => variable.nodeData?.type !== 'knowledge-retrieval')} 
                        parentName={key}
                      />
@@ -915,7 +1139,12 @@ const Properties: FC<PropertiesProps> = ({
                if (selectedNode?.data?.type === 'end' && key === 'output') {
                  return (
                    <Form.Item key={key} name={key}>
-                      <MessageEditor key={key} isArray={false} parentName={key} options={variableList} />
+                      <MessageEditor
+                        key={key}
+                        isArray={false}
+                        parentName={key}
+                        options={variableList.filter(variable => variable.nodeData?.type !== 'knowledge-retrieval')} 
+                      />
                    </Form.Item>
                  )
                }
@@ -943,7 +1172,7 @@ const Properties: FC<PropertiesProps> = ({
                        isArray={!!config.isArray} 
                        parentName={key}
                        enableJinja2={config.enableJinja2 as boolean}
-                        options={getFilteredVariableList(selectedNode?.data?.type)}
+                        options={getFilteredVariableList(selectedNode?.data?.type, key)}
                      />
                    </Form.Item>
                  )
@@ -964,7 +1193,7 @@ const Properties: FC<PropertiesProps> = ({
                    <Form.Item key={key} name={key}>
                      <GroupVariableList
                        name={key}
-                        options={getFilteredVariableList(selectedNode?.data?.type)}
+                        options={getFilteredVariableList(selectedNode?.data?.type, key)}
                        isCanAdd={!!(values as any)?.group}
                      />
                    </Form.Item>
@@ -976,7 +1205,7 @@ const Properties: FC<PropertiesProps> = ({
                    <Form.Item key={key} name={key}>
                      <CaseList
                        name={key}
-                        options={getFilteredVariableList(selectedNode?.data?.type)}
+                        options={getFilteredVariableList(selectedNode?.data?.type, key)}
                        selectedNode={selectedNode}
                        graphRef={graphRef}
                      />
@@ -989,7 +1218,7 @@ const Properties: FC<PropertiesProps> = ({
                    <Form.Item key={key} name={key}
                      label={t(`workflow.config.${selectedNode?.data?.type}.${key}`)}
                    >
-                      <MappingList name={key} options={getFilteredVariableList(selectedNode?.data?.type)} />
+                      <MappingList name={key} options={getFilteredVariableList(selectedNode?.data?.type, key)} />
                    </Form.Item>
                  
                  )
@@ -999,7 +1228,7 @@ const Properties: FC<PropertiesProps> = ({
                    <Form.Item key={key} name={key}>
                      <CycleVarsList
                        parentName={key}
-                        options={getFilteredVariableList(selectedNode?.data?.type)}
+                        options={getFilteredVariableList(selectedNode?.data?.type, key)}
                      />
                    </Form.Item>
                  )
@@ -1013,9 +1242,9 @@ const Properties: FC<PropertiesProps> = ({
                          if (config.filterLoopIterationVars) {
                            const loopIterationVars: Suggestion[] = [];
                            
-                            return [...getFilteredVariableList(selectedNode?.data?.type), ...loopIterationVars];
+                            return [...getFilteredVariableList(selectedNode?.data?.type, key), ...loopIterationVars];
                          }
-                          return getFilteredVariableList(selectedNode?.data?.type);
+                          return getFilteredVariableList(selectedNode?.data?.type, key);
                        })()
                      }
                    />
@@ -1060,7 +1289,7 @@ const Properties: FC<PropertiesProps> = ({
                      ? <VariableSelect
                          placeholder={t('common.pleaseSelect')}
                          options={(() => {
-                            const baseVariableList = getFilteredVariableList(selectedNode?.data?.type);
+                            const baseVariableList = getFilteredVariableList(selectedNode?.data?.type, key);
                            // Apply filtering if specified in config
                            if (config.filterNodeTypes || config.filterVariableNames) {
                              return baseVariableList.filter(variable => {
@@ -1068,7 +1297,7 @@ const Properties: FC<PropertiesProps> = ({
                                  (Array.isArray(config.filterNodeTypes) && config.filterNodeTypes.includes(variable.nodeData?.type));
                                const variableNameMatch = !config.filterVariableNames || 
                                  (Array.isArray(config.filterVariableNames) && config.filterVariableNames.includes(variable.label));
-                                return nodeTypeMatch && variableNameMatch;
+                                return nodeTypeMatch || variableNameMatch;
                              });
                            }
                            // Filter child nodes for iteration output
@@ -1085,7 +1314,7 @@ const Properties: FC<PropertiesProps> = ({
                              });
                              
                              return baseVariableList.filter(variable => 
-                                childNodes.some(node => node.id === variable.nodeData?.id)
+                                childNodes.some(node => node.id === variable.nodeData?.id) || selectedNode?.data?.type === 'iteration' && key === 'output' && variable.value.includes('sys.')
                              );
                            }
                            return baseVariableList;
@@ -1095,7 +1324,12 @@ const Properties: FC<PropertiesProps> = ({
                      : config.type === 'switch'
                      ? <Switch onChange={key === 'group' ? () => { form.setFieldValue('group_variables', []) } : undefined} />
                      : config.type === 'categoryList'
-                      ? <CategoryList parentName={key} selectedNode={selectedNode} graphRef={graphRef} />
+                      ? <CategoryList 
+                        parentName={key} 
+                        selectedNode={selectedNode}
+                        graphRef={graphRef}
+                        options={getFilteredVariableList(selectedNode?.data?.type, key)}
+                      />
                      : config.type === 'conditionList'
                      ? <ConditionList
                        parentName={key}
@@ -1109,18 +1343,9 @@ const Properties: FC<PropertiesProps> = ({
                            value: `${selectedNode.getData().id}.${cycleVar.name}`,
                            nodeData: selectedNode.getData(),
                          }));
-                          return [...variableList.filter(variable => {
-                            // Keep conversation variables
-                            if (variable.group === 'CONVERSATION') return true;
-                            // Keep sys variables from start nodes
-                            if (variable.nodeData?.type === 'start' && variable.value?.startsWith('sys.')) return true;
-                            // Keep variables from non-start nodes
-                            if (variable.nodeData?.type !== 'start' && variable.nodeData?.type !== 'http-request' && variable.dataType !== 'boolean') return true;
-                            // Filter out custom variables from start nodes
-                            return false;
-                          }), ...cycleVarSuggestions];
-                        })()
-                      }
+
+                          return [...getFilteredVariableList(selectedNode?.data?.type, key), ...cycleVarSuggestions];
+                        })()}
                        selectedNode={selectedNode}
                        graphRef={graphRef}
                        addBtnText={t('workflow.config.addCase')}
--- a/web/src/views/Workflow/constant.ts
+++ b/web/src/views/Workflow/constant.ts
@@ -270,7 +270,7 @@ export const nodeLibrary: NodeLibrary[] = [
        config: {
          input: {
            type: 'variableList',
-            filterNodeTypes: ['knowledge-retrieval'],
+            filterNodeTypes: ['knowledge-retrieval', 'iteration', 'loop'],
            filterVariableNames: ['message']
          },
          parallel: {
@@ -334,8 +334,7 @@ export const nodeLibrary: NodeLibrary[] = [
          }
        }
      },
-      {
-        type: "assigner", icon: assignerIcon,
+      { type: "assigner", icon: assignerIcon,
        config: {
          assignments: {
            type: 'assignmentList',
@@ -656,4 +655,114 @@ export const graphNodeLibrary: Record<string, NodeConfig> = {
      items: [{ group: 'left' }],
    },
  }
+}
+
+
+export interface OutputVariable {
+  default?: Array<{
+    name: string;
+    type: string;
+  }>;
+  define?: string[];
+  sys?: Array<{
+    name: string;
+    type: string;
+  }>;
+  error?: Array<{
+    name: string;
+    type: string;
+  }>;
+}
+export const outputVariable: { [key: string]: OutputVariable } = {
+  start: {
+    sys: [
+      { name: "message", type: "string" },
+      { name: "conversation_id", type: "string" },
+      { name: "execution_id", type: "string", },
+      { name: "workspace_id", type: "string" },
+      { name: "user_id", type: "string" },
+    ],
+    define: ['variables']
+  },
+  end: {
+  },
+  llm: {
+    default: [
+      { name: "output", type: "string" },
+    ]
+  },
+  'knowledge-retrieval': {
+    default: [
+      { name: "output", type: "array[object]" },
+    ]
+  },
+  'parameter-extractor': {
+    default: [
+      { name: "__is_success", type: "number" },
+      { name: "__reason", type: "string" },
+    ],
+    define: ['params']
+  },
+  'memory-read': {
+    default: [
+      { name: "answer", type: "string" },
+      { name: "intermediate_outputs", type: "array[object]" },
+    ],
+  },
+  'memory-write': {
+
+  },
+  'if-else': {
+
+  },
+  'question-classifier': {
+    default: [
+      { name: "class_name", type: "string" },
+      // { name: "output", type: "string" },
+    ],
+  },
+  'iteration': {
+    default: [
+      // { name: "item", type: "string" }, // 仅内部使用
+      { name: "output", type: "array[string]" },
+    ],
+  },
+  'loop': {
+    define: ['cycle_vars']
+  },
+  'cycle-start': {
+
+  },
+  'break': {
+
+  },
+  'var-aggregator': {
+    // default: [
+    //   { name: "output", type: "string" },
+    // ],
+    define: ['group_variables']
+  },
+  'assigner': {
+
+  },
+  'http-request': {
+    default: [
+      { name: "body", type: "string" },
+      { name: "status_code", type: "number" },
+    ],
+    error: [
+      { name: "error_message", type: "string" },
+      { name: "error_type", type: "string" },
+    ]
+  },
+  'tool': {
+    default: [
+      { name: "data", type: "string" },
+    ],
+  },
+  'jinja-render': {
+    default: [
+      { name: "output", type: "string" },
+    ],
+  },
 }