diff --git a/package.json b/package.json
index 01ef828d991fdcd83ff2d9ef176f085572a530b0..7d6b043d1def995fd8fa205dada45fd11c1250e7 100644
--- a/package.json
+++ b/package.json
@@ -123,12 +123,13 @@
     "axios": "1.7.9",
     "codemirror": "^6.0.1",
     "dayjs": "1.11.9",
+    "dompurify": "^3.3.0",
     "echarts": "^5.6.0",
     "element-plus": "2.8.0",
     "highlight.js": "11.10.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "marked": "^15.0.8",
+    "marked": "^15.0.12",
     "marked-highlight": "^2.2.1",
     "monaco-editor": "^0.52.2",
     "monaco-yaml": "^5.3.1",
@@ -153,7 +154,9 @@
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-typescript": "^12.1.2",
+    "@types/dompurify": "^3.0.5",
     "@types/estree": "1.0.7",
+    "@types/marked": "^5.0.2",
     "@types/minimist": "^1.2.5",
     "@types/mockjs": "^1.0.10",
     "@types/node": "^22.14.0",
diff --git a/src/apis/paths/api.ts b/src/apis/paths/api.ts
index 95dd5fae5c99954fe28296b65d4b0706f9325b7c..b9db2c05d66861839bda69770f32301808d700af 100644
--- a/src/apis/paths/api.ts
+++ b/src/apis/paths/api.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Huawei Technologies Co., Ltd. 2023-2025. All rights reserved.
-import { post, get, del, put } from 'src/apis/server';
+import { post, get, del, put, witchainDGet } from 'src/apis/server';
 import type { FcResponse } from 'src/apis/server';
 import { QueryApiListParamsType, CreateOrUpdateApiParamsType } from './type';
 /**
@@ -83,10 +83,22 @@ export const changeSingleApiCollect = (params: {
     favorited: params.favorited,
   });
 };
+
+/**
+ * 获取检索方法列表
+ * @returns
+ */
+export const getSearchMethods = (): Promise<
+  [any, FcResponse<string[]> | undefined]
+> => {
+  return witchainDGet('/witchaind/api/other/search_method');
+};
+
 export const apiApi = {
   queryApiList,
   createOrUpdateApi,
   querySingleApiData,
   deleteSingleApiData,
   changeSingleApiCollect,
+  getSearchMethods,
 };
diff --git a/src/apis/paths/llm.ts b/src/apis/paths/llm.ts
index 923fc5a16022bb4671d7bc62fbdfeb97f6d17dfb..ca170f96b634b965c19529c99d3ba52b3be69ae4 100644
--- a/src/apis/paths/llm.ts
+++ b/src/apis/paths/llm.ts
@@ -2,19 +2,11 @@ import { get, post, del, put } from '../server';
 import { AddedModalList } from './type';
 /**
  * 获取用户的模型列表
+ * @param modelType 模型类型，可选值：'chat' | 'embedding' | 'reranker' 等
  * @returns
  */
-const getLLMList = () => {
-  return get<
-    {
-      id: string;
-      icon: string;
-      openaiBaseUrl: string;
-      openaiApiKey: string;
-      modelName: string;
-      maxTokens: number;
-    }[]
-  >('/api/llm');
+const getLLMList = (modelType?: string) => {
+  return get<AddedModalList[]>('/api/llm', modelType ? { modelType } : {});
 };
 
 /**
@@ -58,10 +50,39 @@ const getRerankerConfig = () => {
   }[]>('/api/llm/reranker');
 };
 
+/**
+ * 获取指定模型的能力配置
+ * @param llmId 模型ID
+ * @returns
+ */
+const getModelCapabilities = (llmId: string) => {
+  return get<{
+    provider: string;
+    modelName: string;
+    modelType: string;
+    supportsTemperature: boolean;
+    supportsTopP: boolean;
+    supportsTopK: boolean;
+    supportsFrequencyPenalty: boolean;
+    supportsPresencePenalty: boolean;
+    supportsMinP: boolean;
+    supportsThinking: boolean;
+    canToggleThinking: boolean;
+    supportsEnableSearch: boolean;
+    supportsFunctionCalling: boolean;
+    supportsJsonMode: boolean;
+    supportsStructuredOutput: boolean;
+    supportsContext: boolean;
+    maxTokensParam: string;
+    notes: string;
+  }>('/api/llm/capabilities', { llmId });
+};
+
 export const llmApi = {
   getAddedModels,
   getLLMList,
   updateLLMList,
   getEmbeddingConfig,
   getRerankerConfig,
+  getModelCapabilities,
 };
diff --git a/src/apis/paths/model.ts b/src/apis/paths/model.ts
index d01a43801c91b8447fdd2cda5c560b0f166ed6e1..e6d011fa67d20d51b2d9bdaff882694f52f7e492 100644
--- a/src/apis/paths/model.ts
+++ b/src/apis/paths/model.ts
@@ -24,6 +24,8 @@ const getUserModelList = () => {
       modelName: string;
       maxTokens: number;
       isEditable?: boolean;
+      type?: string | string[];
+      provider?: string;
     }[]
   >('/api/llm');
 };
@@ -51,6 +53,9 @@ const getModelProviderList = () => {
       icon: string;
       url: string;
       description: string;
+      aliasZh?: string;
+      aliasEn?: string;
+      type?: string;
     }[]
   >('/api/llm/provider');
 };
@@ -82,7 +87,7 @@ const createOrUpdateModel = (params: {
   openaiApiKey: string;
   modelName: string;
   maxTokens: number;
-  type?: 'chat' | 'image' | 'video' | 'speech' | 'embedding' | 'reranker';
+  type?: string | string[];
 }) => {
   return put('/api/llm', params, { llmId: params.llmId });
 };
diff --git a/src/apis/paths/type.ts b/src/apis/paths/type.ts
index 0f0d832e4af0a5f3af8db01ba9626103f249552d..78d4f98b93d4112ca2d744a52806d81f7ab391a9 100644
--- a/src/apis/paths/type.ts
+++ b/src/apis/paths/type.ts
@@ -224,6 +224,7 @@ export interface AddedModalList {
   openaiApiKey: string;
   modelName: string;
   maxTokens: string;
+  type?: string;  // 模型类型: chat, embedding, reranker等
   supportsThinking?: boolean;
   canToggleThinking?: boolean;
 }
diff --git a/src/components/CodeMonacoEditor.vue b/src/components/CodeMonacoEditor.vue
index a1b07f9d5ed3e23b639d9e1be86345543e51c357..9894939859ee56771515ce7d637d6223f175419f 100644
--- a/src/components/CodeMonacoEditor.vue
+++ b/src/components/CodeMonacoEditor.vue
@@ -116,6 +116,12 @@ const symbols = ref<any[]>([])
 const isFullScreen = ref(false)
 let editor: monaco.editor.IStandaloneCodeEditor | null = null
 
+// 检测当前主题
+const getCurrentTheme = (): 'light' | 'dark' => {
+  const bodyTheme = document.body.getAttribute('theme')
+  return bodyTheme === 'dark' ? 'dark' : 'light'
+}
+
 // 计算容器高度 - 弹性变化
 const editorHeight = ref(props.minHeight)
 
@@ -213,7 +219,7 @@ const initMonacoEditor = async () => {
   // 配置Worker - 不设置worker，使用默认配置
   // Monaco Editor会自动处理worker加载
 
-  // 定义Atom One Dark Pro主题
+  // 定义Atom One Dark Pro主题（暗色）
   monaco.editor.defineTheme('atom-one-dark-pro', {
     base: 'vs-dark',
     inherit: true,
@@ -261,11 +267,63 @@ const initMonacoEditor = async () => {
     }
   })
 
+  // 定义Atom One Light主题（浅色）
+  monaco.editor.defineTheme('atom-one-light', {
+    base: 'vs',
+    inherit: true,
+    rules: [
+      { token: 'comment', foreground: 'A0A1A7', fontStyle: 'italic' },
+      { token: 'keyword', foreground: 'A626A4' },
+      { token: 'operator', foreground: '0184BC' },
+      { token: 'namespace', foreground: 'E45649' },
+      { token: 'type', foreground: 'C18401' },
+      { token: 'struct', foreground: 'C18401' },
+      { token: 'class', foreground: 'C18401' },
+      { token: 'interface', foreground: 'C18401' },
+      { token: 'parameter', foreground: '986801' },
+      { token: 'variable', foreground: 'E45649' },
+      { token: 'property', foreground: 'E45649' },
+      { token: 'enumMember', foreground: '986801' },
+      { token: 'function', foreground: '4078F2' },
+      { token: 'member', foreground: '4078F2' },
+      { token: 'macro', foreground: '4078F2' },
+      { token: 'label', foreground: 'E45649' },
+      { token: 'string', foreground: '50A14F' },
+      { token: 'number', foreground: '986801' },
+      { token: 'regexp', foreground: '50A14F' },
+      { token: 'delimiter', foreground: '383A42' },
+    ],
+    colors: {
+      'editor.background': '#FAFAFA',
+      'editor.foreground': '#383A42',
+      'editorCursor.foreground': '#526FFF',
+      'editor.lineHighlightBackground': '#F0F0F0',
+      'editorLineNumber.foreground': '#9D9D9F',
+      'editorLineNumber.activeForeground': '#383A42',
+      'editor.selectionBackground': '#E5E5E6',
+      'editor.selectionHighlightBackground': '#E5E5E6',
+      'editorBracketMatch.background': '#E5E5E6',
+      'editorBracketMatch.border': '#526FFF',
+      'editorGutter.background': '#FAFAFA',
+      'editorGutter.addedBackground': '#109868',
+      'editorGutter.deletedBackground': '#946EE5',
+      'editorGutter.modifiedBackground': '#C18401',
+      'editorScrollbar.shadow': '#E5E5E6',
+      'scrollbarSlider.background': '#D0D0D080',
+      'scrollbarSlider.hoverBackground': '#B0B0B080',
+      'scrollbarSlider.activeBackground': '#90909080'
+    }
+  })
+
+  // 根据当前主题选择Monaco主题
+  const currentTheme = getCurrentTheme()
+  const monacoTheme = currentTheme === 'dark' ? 'atom-one-dark-pro' : 'atom-one-light'
+
   // 创建编辑器
   editor = monaco.editor.create(editorContainer.value, {
     value: props.modelValue || codeTemplates.value[currentLanguage.value] || '',
     language: currentLanguage.value,
-    theme: 'atom-one-dark-pro',
+    theme: monacoTheme,
     automaticLayout: true,
     tabSize: 2,
     insertSpaces: true,
@@ -473,6 +531,15 @@ const copyCode = async () => {
   }
 }
 
+// 监听主题变化并更新Monaco主题
+const updateMonacoTheme = () => {
+  if (!editor) return
+  
+  const currentTheme = getCurrentTheme()
+  const monacoTheme = currentTheme === 'dark' ? 'atom-one-dark-pro' : 'atom-one-light'
+  editor.updateOptions({ theme: monacoTheme })
+}
+
 // 切换全屏
 const toggleFullScreen = () => {
   isFullScreen.value = !isFullScreen.value
@@ -558,24 +625,40 @@ const addFullscreenStyles = () => {
       visibility: visible !important;
       opacity: 1 !important;
       pointer-events: auto !important;
-      background: #282c34 !important;
       margin: 0 !important;
       padding: 0 !important;
       border: none !important;
       border-radius: 0 !important;
     }
     
+    /* 根据主题设置背景色 */
+    body[theme='dark'] .code-monaco-editor.fullscreen {
+      background: #282c34 !important;
+    }
+    
+    body[theme='light'] .code-monaco-editor.fullscreen {
+      background: #fafafa !important;
+    }
+    
     /* 确保工具栏在正确位置 */
     .code-monaco-editor.fullscreen .editor-toolbar {
       position: relative !important;
       z-index: 1000000 !important;
-      background: #1e2127 !important;
       visibility: visible !important;
       opacity: 1 !important;
       width: 100% !important;
       padding: 12px 16px !important;
     }
     
+    /* 根据主题设置工具栏背景色 */
+    body[theme='dark'] .code-monaco-editor.fullscreen .editor-toolbar {
+      background: #1e2127 !important;
+    }
+    
+    body[theme='light'] .code-monaco-editor.fullscreen .editor-toolbar {
+      background: #f6f8fa !important;
+    }
+    
     /* 确保编辑器容器占满剩余空间 */
     .code-monaco-editor.fullscreen .editor-container {
       width: 100% !important;
@@ -583,9 +666,17 @@ const addFullscreenStyles = () => {
       position: relative !important;
       visibility: visible !important;
       opacity: 1 !important;
+    }
+    
+    /* 根据主题设置编辑器容器背景色 */
+    body[theme='dark'] .code-monaco-editor.fullscreen .editor-container {
       background: #282c34 !important;
     }
     
+    body[theme='light'] .code-monaco-editor.fullscreen .editor-container {
+      background: #fafafa !important;
+    }
+    
     /* 确保Monaco编辑器本身可见并占满容器 */
     .code-monaco-editor.fullscreen .monaco-editor {
       width: 100% !important;
@@ -686,6 +777,19 @@ onMounted(async () => {
   
   // 添加键盘事件监听
   document.addEventListener('keydown', handleKeyDown)
+  
+  // 监听主题变化
+  const observer = new MutationObserver(() => {
+    updateMonacoTheme()
+  })
+  
+  observer.observe(document.body, {
+    attributes: true,
+    attributeFilter: ['theme']
+  })
+  
+  // 保存observer引用以便后续清理
+  ;(window as any).__monacoThemeObserver = observer
 })
 
 onBeforeUnmount(() => {
@@ -697,6 +801,12 @@ onBeforeUnmount(() => {
   // 移除键盘事件监听
   document.removeEventListener('keydown', handleKeyDown)
   
+  // 清理主题监听器
+  if ((window as any).__monacoThemeObserver) {
+    ;(window as any).__monacoThemeObserver.disconnect()
+    delete (window as any).__monacoThemeObserver
+  }
+  
   // 恢复页面滚动
   document.body.style.overflow = ''
   document.body.classList.remove('monaco-editor-fullscreen')
@@ -738,6 +848,12 @@ defineExpose({
   overflow: hidden;
   background: #282c34;
   
+  // 浅色主题样式
+  body[theme='light'] & {
+    border: 1px solid #d0d7de;
+    background: #fafafa;
+  }
+  
   &.fullscreen {
     position: fixed !important;
     top: 0 !important;
@@ -778,6 +894,12 @@ defineExpose({
     background: #21252b;
     border-bottom: 1px solid #3e4451;
     
+    // 浅色主题样式
+    body[theme='light'] & {
+      background: #f6f8fa;
+      border-bottom: 1px solid #d0d7de;
+    }
+    
     .fullscreen & {
       padding: 12px 16px;
       background: #1e2127;
@@ -807,6 +929,10 @@ defineExpose({
           color: #abb2bf;
           font-size: 12px;
           font-weight: 500;
+          
+          body[theme='light'] & {
+            color: #57606a;
+          }
         }
       }
       
@@ -824,8 +950,17 @@ defineExpose({
           border: 1px solid transparent !important; // 透明边框便于添加悬停效果
           background: transparent !important;
           
+          // 浅色主题样式
+          body[theme='light'] & {
+            color: #24292f !important;
+          }
+          
           span {
             color: #ffffff !important;
+            
+            body[theme='light'] & {
+              color: #24292f !important;
+            }
           }
           
           &:hover {
@@ -835,20 +970,39 @@ defineExpose({
             transform: translateY(-1px) !important; // 轻微上移效果
             box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2) !important; // 添加阴影
             
+            body[theme='light'] & {
+              color: #0969da !important;
+              background: rgba(9, 105, 218, 0.1) !important;
+              border-color: rgba(9, 105, 218, 0.2) !important;
+            }
+            
             span {
               color: #61afef !important;
+              
+              body[theme='light'] & {
+                color: #0969da !important;
+              }
             }
           }
           
           &:active {
             transform: translateY(0) !important; // 点击时回到原位
             background: rgba(97, 175, 239, 0.25) !important;
+            
+            body[theme='light'] & {
+              background: rgba(9, 105, 218, 0.15) !important;
+            }
           }
           
           &:focus {
             outline: none !important;
             border-color: #61afef !important;
             box-shadow: 0 0 0 2px rgba(97, 175, 239, 0.2) !important;
+            
+            body[theme='light'] & {
+              border-color: #0969da !important;
+              box-shadow: 0 0 0 2px rgba(9, 105, 218, 0.2) !important;
+            }
           }
         }
       }
@@ -859,7 +1013,6 @@ defineExpose({
           // 修复导航选择框的文字颜色
           :deep(.el-select) {
             .el-select__wrapper:not(.is-disabled) .el-select__selected-item {
-              color: #ffffff !important;
               font-weight: 500;
             }
             
@@ -892,20 +1045,32 @@ defineExpose({
     width: 100%;
     transition: height 0.2s ease-in-out;
     
-    :deep(.monaco-editor) {
+      :deep(.monaco-editor) {
       width: 100% !important;
       height: 100% !important;
       
       .margin {
         background-color: #282c34;
+        
+        body[theme='light'] & {
+          background-color: #fafafa;
+        }
       }
       
       .monaco-editor-background {
         background-color: #282c34;
+        
+        body[theme='light'] & {
+          background-color: #fafafa;
+        }
       }
       
       .current-line {
         background-color: #2c313c;
+        
+        body[theme='light'] & {
+          background-color: #f0f0f0;
+        }
       }
       
       .view-lines {
@@ -970,13 +1135,26 @@ defineExpose({
       background-color: #3e4451;
       border: 1px solid #5c6370;
       
+      body[theme='light'] & {
+        background-color: #ffffff;
+        border: 1px solid #d0d7de;
+      }
+      
       .el-input__inner {
         color: #ffffff !important; // 使用白色文字确保在暗色背景下清晰可见
         font-weight: 500;
+        
+        body[theme='light'] & {
+          color: #24292f !important;
+        }
       }
       
       .el-select__suffix {
         color: #abb2bf;
+        
+        body[theme='light'] & {
+          color: #57606a;
+        }
       }
     }
     
@@ -984,26 +1162,47 @@ defineExpose({
     .el-select__wrapper:not(.is-disabled) .el-select__selected-item {
       color: #ffffff !important;
       font-weight: 500;
+      
+      body[theme='light'] & {
+        color: #24292f !important;
+      }
     }
     
     // 修复输入框中的选中文字
     .el-select__wrapper .el-select__selected-item {
       color: #ffffff !important;
       font-weight: 500;
+      
+      body[theme='light'] & {
+        color: #24292f !important;
+      }
     }
     
     // 修复占位符文字颜色
     .el-select__wrapper .el-select__placeholder {
       color: #8b949e !important;
+      
+      body[theme='light'] & {
+        color: #6e7781 !important;
+      }
     }
     
     &:hover .el-input__wrapper {
       border-color: #61afef;
+      
+      body[theme='light'] & {
+        border-color: #0969da;
+      }
     }
     
     &.is-focus .el-input__wrapper {
       border-color: #61afef;
       box-shadow: 0 0 0 2px rgba(97, 175, 239, 0.2);
+      
+      body[theme='light'] & {
+        border-color: #0969da;
+        box-shadow: 0 0 0 2px rgba(9, 105, 218, 0.2);
+      }
     }
   }
 }
@@ -1014,18 +1213,38 @@ defineExpose({
   border: 1px solid #3e4451;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
   
+  body[theme='light'] & {
+    background-color: #ffffff;
+    border: 1px solid #d0d7de;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  }
+  
   .el-select-dropdown__item {
     color: #ffffff !important; // 使用白色文字
     font-weight: 500;
     
+    body[theme='light'] & {
+      color: #24292f !important;
+    }
+    
     &:hover {
       background-color: #3e4451;
       color: #61afef !important;
+      
+      body[theme='light'] & {
+        background-color: #f6f8fa;
+        color: #0969da !important;
+      }
     }
     
     &.selected {
       background-color: #61afef;
       color: #ffffff !important;
+      
+      body[theme='light'] & {
+        background-color: #0969da;
+        color: #ffffff !important;
+      }
     }
   }
 }
@@ -1036,14 +1255,26 @@ defineExpose({
     .el-select__selected-item {
       color: #ffffff !important;
       font-weight: 500;
+      
+      body[theme='light'] & {
+        color: #24292f !important;
+      }
     }
     
     .el-select__placeholder {
       color: #8b949e !important;
+      
+      body[theme='light'] & {
+        color: #6e7781 !important;
+      }
     }
     
     .el-input__inner {
       color: #ffffff !important;
+      
+      body[theme='light'] & {
+        color: #24292f !important;
+      }
     }
   }
   
@@ -1051,6 +1282,10 @@ defineExpose({
     .el-select__selected-item {
       color: #ffffff !important;
       font-weight: 500;
+      
+      body[theme='light'] & {
+        color: #24292f !important;
+      }
     }
   }
 }
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 3c1944ec97ad67e7df71c4c13c0a11dd6b3847a8..41813cd52b9d05b1cf2d9e0a7db40fbaa8955f2f 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -39,6 +39,7 @@ export default {
       speech: 'Speech',
       embedding: 'Embedding',
       reranker: 'Reranker',
+      function_call: 'Function Call',
     },
   },
   settings: {
@@ -65,10 +66,15 @@ export default {
     reasoning_model_preference: 'Reasoning Model Preference',
     embedding_model_preference: 'Embedding Model Preference',
     reranker_preference: 'Reranker Preference',
+    function_call_model_preference: 'Function Call Model Preference',
+    search_method_preference: 'Search Method Preference',
     chain_of_thought_preference: 'Chain of Thought Preference',
     auto_execute_preference: 'Auto Execute Preference',
     save_success: 'Saved successfully',
     save_failed: 'Save failed',
+    unknown_provider: 'Unknown Provider',
+    public_api: 'Public',
+    private_api: 'Private',
   },
   thinking: {
     enable_thinking: 'Enable thinking',
@@ -221,8 +227,12 @@ export default {
     appDescription_input: 'Enter an agent description.',
     modelSelected: 'Model',
     modelSelected_input: 'Select a model.',
+    model_context_tip: 'This model will be used for context understanding, question rewriting, and memory storage.',
     enable_thinking: 'Chain of Thought',
     enable_thinking_tip: 'Enable thinking',
+    thinking_warning_title: 'Chain of Thought Warning',
+    thinking_warning_message: 'The selected model is only used for context understanding, question rewriting, and memory storage. Enabling Chain of Thought will significantly increase processing time for these operations, which may severely impact the overall response speed and user experience of the application. It is recommended to enable this only when deep reasoning is required.',
+    thinking_warning_confirm: 'Confirm Enable',
     multi_Dialogue: 'Multi-turn Conversation',
     multi_Dialogue_select: 'Number of Turns',
     ability_Configuration: 'Capabilities',
@@ -630,6 +640,12 @@ export default {
       mb: 'MB',
       cores: 'cores',
       code_editor: 'Code Editor',
+      view_code_spec: 'View Code Specification',
+      code_spec_title: '{lang} Code Security Specification',
+      health_checking: 'Checking...',
+      health_unknown: 'Unknown',
+      health_normal: 'Service Normal',
+      health_error: 'Service Error',
       at_least_one_operation: 'At least one variable operation must be retained',
       operation_select_variable: 'Operation {index}: Please select variable',
       operation_select_type: 'Operation {index}: Please select operation type',
@@ -1385,6 +1401,8 @@ export default {
     admin: 'Administrator',
     regular_user: 'Regular User',
     preferences_settings: 'Preferences Settings',
+    enabled: 'Enabled',
+    disabled: 'Disabled',
     auto_execute_enabled: 'Enabled',
     auto_execute_disabled: 'Disabled',
     chain_of_thought_enabled: 'Enabled',
@@ -1392,6 +1410,8 @@ export default {
     reasoning_model: 'Reasoning Model',
     embedding_model: 'Embedding Model',
     reranker_model: 'Reranker Model',
+    function_call_model: 'Function Call Model',
+    search_method: 'Search Method',
     default_model: 'Default',
     not_logged_in: 'Not Logged In',
     login_prompt: 'Please log in to use full features',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index 5fff83298726d8420705b87292fe24e72091ac90..c62cc9ea999e713bf4675d4ab897e54835db2aa7 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -38,6 +38,7 @@ export default {
       speech: '语音',
       embedding: '嵌入',
       reranker: '重排',
+      function_call: '函数调用',
     },
   },
   settings: {
@@ -64,10 +65,15 @@ export default {
     reasoning_model_preference: '推理模型偏好',
     embedding_model_preference: 'Embedding模型偏好',
     reranker_preference: 'Reranker偏好',
+    function_call_model_preference: '函数调用模型偏好',
+    search_method_preference: '检索方法偏好',
     chain_of_thought_preference: '思维链偏好',
     auto_execute_preference: '自动执行偏好',
     save_success: '保存成功',
     save_failed: '保存失败',
+    unknown_provider: '未知供应商',
+    public_api: '公网',
+    private_api: '私有',
   },
   thinking: {
     enable_thinking: '启用思维链',
@@ -220,8 +226,12 @@ export default {
     appDescription_input: '请输入智能体描述',
     modelSelected: '模型选择',
     modelSelected_input: '请选择模型',
+    model_context_tip: '此模型将用于理解上下文、问题改写和记忆存储等功能',
     enable_thinking: '思维链',
     enable_thinking_tip: '开启思维链',
+    thinking_warning_title: '思维链警告',
+    thinking_warning_message: '当前选择的模型仅在理解上下文、问题改写和记忆存储环节使用。开启思维链会显著增加这些环节的处理时间，可能严重影响应用的整体响应速度和用户体验。建议仅在需要深度推理时开启。',
+    thinking_warning_confirm: '确认开启',
     multi_Dialogue: '多轮对话',
     multi_Dialogue_select: '请选择对话轮次',
     ability_Configuration: '能力配置',
@@ -660,6 +670,12 @@ export default {
       mb: 'MB',
       cores: '核心',
       code_editor: '代码编辑',
+      view_code_spec: '查阅代码规范',
+      code_spec_title: '{lang} 代码安全规范',
+      health_checking: '检查中...',
+      health_unknown: '未知',
+      health_normal: '服务正常',
+      health_error: '服务异常',
       at_least_one_operation: '至少需要保留一个变量操作',
       operation_select_variable: '第 {index} 个操作：请选择变量',
       operation_select_type: '第 {index} 个操作：请选择操作类型',
@@ -1415,6 +1431,8 @@ export default {
     admin: '管理员',
     regular_user: '普通用户',
     preferences_settings: '偏好设置',
+    enabled: '已开启',
+    disabled: '已关闭',
     auto_execute_enabled: '已开启',
     auto_execute_disabled: '已关闭',
     chain_of_thought_enabled: '已开启',
@@ -1422,6 +1440,8 @@ export default {
     reasoning_model: '推理模型',
     embedding_model: '嵌入模型',
     reranker_model: '重排序模型',
+    function_call_model: '函数调用模型',
+    search_method: '检索方法',
     default_model: '默认',
     not_logged_in: '未登录',
     login_prompt: '请登录以使用完整功能',
diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index 2e0cd5beee5c7e46484fe12781f2f2f243c3d5f4..c015c6686761dd330a0e83ac49e9d2a6804d9703 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -305,12 +305,6 @@ export const useSessionStore = defineStore('conversation', () => {
     msgData: Record<string, unknown>,
     conversationItem: RobotConversationItem,
   ) => {
-    // 🔑 关键修复：检查暂停状态和生成状态，双重保险
-    if (isPaused.value || !isAnswerGenerating.value) {
-      // 手动暂停输出或已停止生成
-      isAnswerGenerating.value = false;
-      return;
-    }
     const rawMsgData = msgData.data as string;
     if (rawMsgData === '[DONE]') {
       dataTransfers.dataDone(conversationItem, !!params.type);
@@ -325,12 +319,19 @@ export const useSessionStore = defineStore('conversation', () => {
     // 这里json解析
     const message = JSON.parse(rawMsgData || '{}');
     const eventType = message['event'];
+    
     if ('metadata' in message) {
       conversationItem.metadata = message.metadata;
     }
     if ('event' in message) {
       switch (eventType) {
         case 'text.add':
+          // 🔑 只在text.add事件时检查暂停状态
+          if (isPaused.value || !isAnswerGenerating.value) {
+            // 手动暂停输出或已停止生成，跳过文本添加
+            break;
+          }
+          // console.log('📝 [Store] 收到 text.add 事件'); // 太多了，注释掉避免刷屏
           currentMessage.value = message;
           dataTransfers.textAdd(conversationItem, message);
           break;
diff --git a/src/utils/userPreferences.ts b/src/utils/userPreferences.ts
index a6dbfe469a9c45d717713114b74ae09d7556bb7e..59a7f372c49d0392a508f9fd57b59cb515f39f6d 100644
--- a/src/utils/userPreferences.ts
+++ b/src/utils/userPreferences.ts
@@ -14,6 +14,8 @@ export interface UserPreferences {
   reasoningModelPreference?: ModelPreference;
   embeddingModelPreference?: ModelPreference;
   rerankerPreference?: ModelPreference;
+  functionCallModelPreference?: ModelPreference; // 新增函数调用模型偏好
+  searchMethodPreference?: string; // 新增检索方法偏好
   chainOfThoughtPreference?: boolean;
   autoExecutePreference?: boolean;
 }
@@ -133,6 +135,16 @@ export function getPreferredRerankerModel<T extends { llmId?: string; modelName?
   return findPreferredOption(options, preferences.rerankerPreference);
 }
 
+/**
+ * 获取函数调用模型的默认选项
+ */
+export function getPreferredFunctionCallModel<T extends { llmId?: string; modelName?: string; label?: string }>(
+  options: T[]
+): T | undefined {
+  const preferences = getUserPreferences();
+  return findPreferredOption(options, preferences.functionCallModelPreference);
+}
+
 /**
  * 获取思维链偏好设置
  */
@@ -149,6 +161,14 @@ export function getAutoExecutePreference(): boolean {
   return preferences.autoExecutePreference ?? false; // 默认关闭
 }
 
+/**
+ * 获取检索方法偏好设置
+ */
+export function getSearchMethodPreference(): string | undefined {
+  const preferences = getUserPreferences();
+  return preferences.searchMethodPreference;
+}
+
 /**
  * 监听用户偏好设置变化
  */
diff --git a/src/views/createapp/components/AgentAppConfig.vue b/src/views/createapp/components/AgentAppConfig.vue
index d2fab03c8dcf07a54649b6dc29e661f46206da98..f1ce96f3607a93c985255e665370b1c6dadaf1d2 100644
--- a/src/views/createapp/components/AgentAppConfig.vue
+++ b/src/views/createapp/components/AgentAppConfig.vue
@@ -13,7 +13,7 @@ import type { Mcp } from './McpDrawer.vue';
 import CustomLoading from '../../customLoading/index.vue';
 import i18n from '@/i18n';
 import defaultIcon from '@/assets/svgs/defaultIcon.webp';
-import { getPreferredReasoningModel, getChainOfThoughtPreference } from '@/utils/userPreferences';
+import { getPreferredReasoningModel, getChainOfThoughtPreference, getPreferredFunctionCallModel } from '@/utils/userPreferences';
 
 const { t } = i18n.global;
 const route = useRoute();
@@ -185,12 +185,12 @@ async function queryUserList() {
 }
 
 async function queryModelList() {
-  const [, res] = await api.getAddedModels('chat');
+  const [, res] = await api.getAddedModels('function_call');
   if (res) {
     modelOptions.value = res.result;
     if (modelOptions.value.length > 0) {
-      // 优先使用用户偏好的推理模型
-      const preferredModel = getPreferredReasoningModel(modelOptions.value);
+      // 优先使用用户偏好的函数调用模型
+      const preferredModel = getPreferredFunctionCallModel(modelOptions.value);
       if (preferredModel) {
         createAppForm.model = preferredModel.llmId;
       } else {
diff --git a/src/views/createapp/components/appConfig.vue b/src/views/createapp/components/appConfig.vue
index 143a7e1c6cde84572ae92995e8ed0d8d1de790a7..ea33d465d5f5c68b7e07061bd894ec3f5f14ee3d 100644
--- a/src/views/createapp/components/appConfig.vue
+++ b/src/views/createapp/components/appConfig.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, watch, onMounted } from 'vue';
+import { ref, reactive, watch, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 import i18n from 'src/i18n';
@@ -9,12 +9,15 @@ import {
   IconDelete,
   IconSearch,
 } from '@computing/opendesign-icons';
+import { CaretBottom } from '@element-plus/icons-vue';
 import { useRoute } from 'vue-router';
 import { api } from 'src/apis';
 import CustomLoading from '../../customLoading/index.vue';
 import AppInitalPreview from 'src/views/dialogue/components/AppInitalPreview.vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { useChangeThemeStore } from 'src/store';
+import type { AddedModalList } from 'src/apis/paths/type';
+import { getPreferredReasoningModel, getChainOfThoughtPreference, getPreferredFunctionCallModel } from '@/utils/userPreferences';
 
 type AppConfig = {
   icon: string;
@@ -23,6 +26,8 @@ type AppConfig = {
   links: string[];
   recommendedQuestions: string[];
   dialogRounds: number;
+  model: string;
+  enableThinking: boolean;
   permission: {
     visibility: string;
     authorizedUsers: string[];
@@ -48,6 +53,8 @@ const createAppForm = ref<AppConfig>({
   links: [],
   recommendedQuestions: [],
   dialogRounds: 3,
+  model: '',
+  enableThinking: false,
   permission: {
     visibility: 'private',
     authorizedUsers: [],
@@ -74,13 +81,25 @@ const base64Image: any = ref('');
 const permissionList = ref([]);
 const curPersonList = ref([]);
 const publishStatus = ref(false);
+const modelOptions = ref<AddedModalList[]>([]);
+const thinkingWarningDialogVisible = ref(false);
+const pendingThinkingValue = ref(false);
+
+const selectedModel = computed(() =>
+  modelOptions.value.find((m) => m.llmId === createAppForm.value.model)
+);
+
+const canToggleThinking = computed(() =>
+  selectedModel.value?.canToggleThinking || false
+);
 
 // 这里校验url是否符合规范
 const checkLinks = (rule, value, callback) => {
-  // 这里校验各个url链接
+  // 这里校验各个url链接，只验证非空的链接
   let result = true;
   createAppForm.value.links.forEach((item) => {
-    if (!checkUrl(item)) {
+    // 跳过空字符串，只验证已填写的链接
+    if (item && item.trim() && !checkUrl(item)) {
       result = false;
     }
   });
@@ -185,7 +204,63 @@ const httpRequest = (res) => {
   res.onSuccess();
 };
 
-onMounted(() => {
+// 查询模型列表
+async function queryModelList() {
+  const [, res] = await api.getAddedModels('function_call');
+  if (res) {
+    modelOptions.value = res.result;
+    if (modelOptions.value.length > 0 && !createAppForm.value.model) {
+      // 优先使用用户偏好的函数调用模型
+      const preferredModel = getPreferredFunctionCallModel(modelOptions.value);
+      if (preferredModel) {
+        createAppForm.value.model = preferredModel.llmId;
+      } else {
+        // 如果没有偏好设置，使用第一个模型
+        createAppForm.value.model = modelOptions.value[0].llmId;
+      }
+    }
+  }
+}
+
+// 处理思维链开关变化
+const handleThinkingChange = (value: boolean) => {
+  if (value) {
+    // 如果要开启思维链，弹出警告对话框
+    pendingThinkingValue.value = true;
+    thinkingWarningDialogVisible.value = true;
+  } else {
+    // 如果要关闭思维链，直接更新
+    createAppForm.value.enableThinking = false;
+  }
+};
+
+// 确认开启思维链
+const confirmEnableThinking = () => {
+  createAppForm.value.enableThinking = true;
+  thinkingWarningDialogVisible.value = false;
+};
+
+// 取消开启思维链
+const cancelEnableThinking = () => {
+  createAppForm.value.enableThinking = false;
+  thinkingWarningDialogVisible.value = false;
+};
+
+// 监听模型切换，始终重置思维链为关闭状态
+watch(
+  () => createAppForm.value.model,
+  (newModelId) => {
+    if (!newModelId) return;
+    
+    // 模型切换时，始终将思维链重置为关闭状态
+    createAppForm.value.enableThinking = false;
+  }
+);
+
+onMounted(async () => {
+  // 先加载模型列表
+  await queryModelList();
+  
   // 判断是否编辑--是否需要查询回显数据
   if (route.query?.appId) {
     loading.value = true;
@@ -203,6 +278,8 @@ onMounted(() => {
             links: appInfo.links.map((item) => item.url),
             recommendedQuestions: appInfo.recommendedQuestions,
             dialogRounds: appInfo.dialogRounds,
+            model: appInfo.llm?.llmId || '',
+            enableThinking: appInfo.enableThinking !== undefined ? appInfo.enableThinking : false,
             permission: {
               visibility: appInfo.permission.visibility,
               authorizedUsers: appInfo.permission.authorizedUsers,
@@ -306,6 +383,7 @@ const beforeUpload = async (file: ElFile) => {
 defineExpose({
   createAppForm,
   createAppFormRef,
+  modelOptions,
 });
 </script>
 <template>
@@ -395,6 +473,77 @@ defineExpose({
             ></el-input>
           </el-form-item>
           <!-- 这里notRequired样式,在局部的通过校验时，控制局部的样式为正常。links为空时通过校验 -->
+          <el-form-item :label="$t('app.modelSelected')" prop="model">
+            <el-select
+              v-model="createAppForm.model"
+              style="width: 100%"
+              :suffix-icon="CaretBottom"
+              :placeholder="$t('app.modelSelected_input')"
+            >
+              <el-option
+                v-for="model in modelOptions"
+                :key="model.llmId"
+                :label="model.modelName"
+                :value="model.llmId"
+              >
+                <div
+                  :style="{
+                    display: 'flex',
+                    alignItems: 'center',
+                  }"
+                >
+                  <img
+                    style="width: 14px; height: 14px"
+                    :src="model.icon"
+                    alt=""
+                  />
+                  <span style="margin-left: 5px">{{ model.modelName }}</span>
+                </div>
+              </el-option>
+              <template #label>
+                <div
+                  :style="{
+                    display: 'flex',
+                    alignItems: 'center',
+                  }"
+                >
+                  <img
+                    style="width: 14px; height: 14px"
+                    :src="
+                      modelOptions.find(
+                        (item) => item.llmId === createAppForm.model,
+                      )?.icon || ''
+                    "
+                    alt=""
+                  />
+                  <span style="margin-left: 5px">
+                    {{
+                      modelOptions.find(
+                        (item) => item.llmId === createAppForm.model,
+                      )?.modelName
+                    }}
+                  </span>
+                </div>
+              </template>
+            </el-select>
+            <div class="model-tip">
+              <span class="tip-text">{{ $t('app.model_context_tip') }}</span>
+            </div>
+          </el-form-item>
+
+          <el-form-item 
+            v-if="canToggleThinking" 
+            :label="$t('app.enable_thinking')" 
+            prop="enableThinking"
+            class="notRequired"
+          >
+            <el-switch 
+              :model-value="createAppForm.enableThinking"
+              @change="handleThinkingChange"
+            />
+            <span class="thinking-tip">{{ $t('app.enable_thinking_tip') }}</span>
+          </el-form-item>
+
           <el-form-item
             :label="$t('app.link')"
             prop="links"
@@ -573,10 +722,61 @@ defineExpose({
       <AppInitalPreview :createAppForm="createAppForm" />
     </div>
   </div>
+
+  <!-- 思维链开关警告对话框 -->
+  <el-dialog
+    v-model="thinkingWarningDialogVisible"
+    :title="$t('app.thinking_warning_title')"
+    width="500px"
+    :close-on-click-modal="false"
+  >
+    <el-alert
+      :title="$t('app.thinking_warning_message')"
+      type="warning"
+      :closable="false"
+      show-icon
+    />
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancelEnableThinking">
+          {{ $t('semantic.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmEnableThinking">
+          {{ $t('app.thinking_warning_confirm') }}
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 <style lang="scss" scoped>
 :deep(.el-collapse-item__content) {
   margin: 0 32px 16px 0px;
 }
+
+.model-tip {
+  margin-top: 8px;
+  padding: 8px 12px;
+  background-color: var(--o-color-info-light-9);
+  border-radius: 4px;
+  
+  .tip-text {
+    font-size: 12px;
+    color: var(--o-text-color-secondary);
+    line-height: 1.5;
+  }
+}
+
+.thinking-tip {
+  margin-left: 12px;
+  font-size: 12px;
+  color: var(--o-text-color-tertiary);
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+}
+
 /* 滚动条轨道样式 */
 </style>
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index b9edae3780f2eebe3e7da8dc6e23b0cde5d2625b..04501fff0f0c3cbddb1bc685d1a47764c53bae61 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -433,6 +433,7 @@ const editCommonDrawer = (name, desc, nodeId, yamlCode) => {
   nodeName.value = name;
   nodeDesc.value = desc;
   selectedNodeId.value = nodeId;
+  nodeYamlId.value = nodeId;  // 同时设置 nodeYamlId，供各种抽屉组件使用
 };
 
 // 编辑yaml
@@ -1222,6 +1223,14 @@ const handleZommOnScroll = () => {
   flowZoom.value = newZoom;
 };
 
+// 监听viewport实时变化（包括缩放），解决在节点/连线上滚动时缩放数字不更新的问题
+const handleViewportChange = (viewport) => {
+  if (viewport?.zoom !== undefined) {
+    const newZoom = Number(viewport.zoom.toFixed(2));
+    flowZoom.value = newZoom;
+  }
+};
+
 async function layoutGraph(direction) {
   nodes.value = layout(getNodes.value, getEdges.value, direction);
   setViewport({
@@ -1653,6 +1662,58 @@ const redrageFlow = (nodesList, edgesList, notesList = []) => {
           }
         }
       };
+    } else if (node.callId === 'LLM') {
+      // LLM节点特殊处理：强制固定output_parameters结构
+      newNode.type = 'custom';
+      const fixedParameters = {
+        input_parameters: node.parameters?.input_parameters || {},
+        output_parameters: {
+          reply: {
+            type: 'string',
+            description: '定义LLM工具调用的输出'
+          }
+        }
+      };
+      newNode.data = {
+        ...newNode.data,
+        parameters: fixedParameters
+      };
+    } else if (node.callId === 'RAG') {
+      // RAG节点特殊处理：强制固定output_parameters结构
+      newNode.type = 'custom';
+      const fixedParameters = {
+        input_parameters: node.parameters?.input_parameters || {},
+        output_parameters: {
+          question: {
+            type: 'string',
+            description: '定义LLM工具调用的输出容'
+          },
+          corpus: {
+            type: 'array',
+            description: '知识库的语料列表'
+          }
+        }
+      };
+      newNode.data = {
+        ...newNode.data,
+        parameters: fixedParameters
+      };
+    } else if (node.callId === 'MCP') {
+      // MCP节点特殊处理：强制固定output_parameters结构
+      newNode.type = 'custom';
+      const fixedParameters = {
+        input_parameters: node.parameters?.input_parameters || {},
+        output_parameters: {
+          message: {
+            type: 'string',
+            description: 'MCP Server的自然语言输出'
+          }
+        }
+      };
+      newNode.data = {
+        ...newNode.data,
+        parameters: fixedParameters
+      };
     } else {
       newNode.type = 'custom';
     }
@@ -2769,7 +2830,67 @@ const saveFlow = async (updateNodeParameter?, debug?) => {
     if (updateNodeParameter) {
       updateNodes.forEach((item) => {
         if (item.stepId === updateNodeParameter.id) {
-          if (item.type === 'Code') {
+          if (item.callId === 'RAG') {
+            // RAG 知识库节点 - 固定output_parameters结构
+            if (!item.parameters) {
+              item.parameters = {};
+            }
+            if (updateNodeParameter.inputStream) {
+              item.parameters.input_parameters = updateNodeParameter.inputStream;
+            }
+            // 强制固定RAG节点的output_parameters结构
+            item.parameters.output_parameters = {
+              question: {
+                type: 'string',
+                description: '定义LLM工具调用的输出容'
+              },
+              corpus: {
+                type: 'array',
+                description: '知识库的语料列表'
+              }
+            };
+          } else if (item.callId === 'LLM') {
+            // LLM 节点 - 固定output_parameters结构
+            if (!item.parameters) {
+              item.parameters = {};
+            }
+            if (updateNodeParameter.inputStream) {
+              item.parameters.input_parameters = updateNodeParameter.inputStream;
+            }
+            // 强制固定LLM节点的output_parameters结构
+            item.parameters.output_parameters = {
+              reply: {
+                type: 'string',
+                description: '定义LLM工具调用的输出',
+              }
+            };
+          } else if (item.callId === 'MCP') {
+            // MCP 节点 - 固定output_parameters结构
+            if (!item.parameters) {
+              item.parameters = {};
+            }
+            if (updateNodeParameter.inputStream) {
+              item.parameters.input_parameters = updateNodeParameter.inputStream;
+            }
+            // 强制固定MCP节点的output_parameters结构
+            item.parameters.output_parameters = {
+              message: {
+                type: 'string',
+                description: 'MCP Server的自然语言输出'
+              }
+            };
+          } else if (item.callId === 'API') {
+            // API 节点
+            if (!item.parameters) {
+              item.parameters = {};
+            }
+            if (updateNodeParameter.inputStream) {
+              item.parameters.input_parameters = updateNodeParameter.inputStream;
+            }
+            if (updateNodeParameter.parameters?.output_parameters) {
+              item.parameters.output_parameters = updateNodeParameter.parameters.output_parameters;
+            }
+          } else if (item.type === 'Code') {
             item.parameters.input_parameters = updateNodeParameter.parameters.input_parameters;
             item.parameters.output_parameters = updateNodeParameter.parameters.output_parameters;
             item.parameters.code = updateNodeParameter.parameters.code;
@@ -2971,6 +3092,7 @@ defineExpose({
         @edges-change="edgesChange"
         @nodes-change="nodesChange"
         @paneScroll="handleZommOnScroll"
+        @viewportChange="handleViewportChange"
         @viewportChangeEnd="viewportChangeEndFunc"
         @mouseup="cancelConnectStatus"
         @pane-context-menu="handleContextMenu"
diff --git a/src/views/createapp/components/workFlowConfig/ApiCallDrawer.vue b/src/views/createapp/components/workFlowConfig/ApiCallDrawer.vue
index e268dd7d9f09165833e62b6390de64093a924823..37e61b854b18584f589b1ca2ab7e557983f8267d 100644
--- a/src/views/createapp/components/workFlowConfig/ApiCallDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/ApiCallDrawer.vue
@@ -983,12 +983,6 @@
     justify-content: flex-end;
     gap: 12px;
     padding: 16px;
-    border-top: 1px solid #ebeef5;
-    
-    // 深色模式适配
-    body[theme='dark'] & {
-      border-top: 1px solid var(--el-border-color-lighter);
-    }
   }
 }
 
diff --git a/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
index aed04e7c427fc45ef1be74855ecc54b50bd057cd..f62d47a7ee557640cba1d2a38fe787838f9d8bdc 100644
--- a/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
@@ -209,6 +209,33 @@
                   <IconCaretRight />
                 </el-icon>
                 <span>{{ $t('flow.node_config.code_editor') }}</span>
+                <div class="code-header-actions">
+                  <!-- 沙箱服务健康状态 -->
+                  <el-tooltip 
+                    :content="healthStatusText" 
+                    placement="top"
+                  >
+                    <div :class="['sandbox-health-status', healthStatusClass]">
+                      <el-icon v-if="checkingHealth"><Loading /></el-icon>
+                      <el-icon v-else-if="sandboxHealthy === true"><SuccessFilled /></el-icon>
+                      <el-icon v-else-if="sandboxHealthy === false"><CircleCloseFilled /></el-icon>
+                      <el-icon v-else><QuestionFilled /></el-icon>
+                      <span class="status-text">{{ healthStatusText }}</span>
+                    </div>
+                  </el-tooltip>
+                  
+                  <!-- 查阅代码规范按钮 -->
+                  <el-button 
+                    text
+                    size="small" 
+                    @click.stop="viewCodeSpec"
+                    :loading="loadingSpec"
+                    :disabled="!sandboxHealthy"
+                  >
+                    <el-icon style="margin-right: 4px;"><Document /></el-icon>
+                    {{ $t('flow.node_config.view_code_spec') }}
+                  </el-button>
+                </div>
               </template>
               <div class="code-content">
                 <!-- Monaco 代码编辑器 -->
@@ -237,6 +264,21 @@
         </div>
       </template>
     </el-drawer>
+    
+    <!-- 代码规范查看弹窗 -->
+    <el-dialog
+      v-model="specDialogVisible"
+      :title="$t('flow.node_config.code_spec_title', { lang: specLanguage.toUpperCase() })"
+      width="80%"
+      class="code-spec-dialog"
+      :close-on-click-modal="false"
+      align-center
+    >
+      <div class="spec-content" v-html="renderMarkdown(specContent)"></div>
+      <template #footer>
+        <el-button @click="specDialogVisible = false">{{ $t('common.close') }}</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -244,13 +286,39 @@
 import { ref, watch, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import { IconCaretRight } from '@computing/opendesign-icons'
-import { Plus, Delete } from '@element-plus/icons-vue'
+import { 
+  Plus, 
+  Delete, 
+  Document, 
+  Loading, 
+  SuccessFilled, 
+  CircleCloseFilled, 
+  QuestionFilled 
+} from '@element-plus/icons-vue'
 import { getSrcIcon } from '../types'
 import CodeMonacoEditor from '@/components/CodeMonacoEditor.vue'
 import VariableChooser from '@/components/VariableChooser.vue'
 import { useI18n } from 'vue-i18n'
+import { marked } from 'marked'
+import DOMPurify from 'dompurify'
 
-const { t } = useI18n()
+const { t, locale } = useI18n()
+
+// Markdown渲染函数
+const renderMarkdown = (content: string): string => {
+  if (!content) return ''
+  try {
+    // 使用 marked.parse() 方法（同步方式）
+    const html = marked.parse(content, { 
+      breaks: true,  // 支持换行符
+      gfm: true      // 启用 GitHub 风格的 Markdown
+    })
+    return DOMPurify.sanitize(html as string)
+  } catch (error) {
+    console.error('Markdown渲染失败:', error)
+    return content
+  }
+}
 
 interface Variable {
   variableName?: string      // 自定义变量名
@@ -293,6 +361,12 @@ const drawerVisible = ref(false)
 const activeName = ref(['basic', 'code', 'variables'])
 const variableTab = ref('input')
 const saving = ref(false)
+const specDialogVisible = ref(false)
+const specContent = ref('')
+const specLanguage = ref('python')
+const loadingSpec = ref(false)
+const sandboxHealthy = ref<boolean | null>(null)
+const checkingHealth = ref(false)
 
 // 节点配置
 const nodeConfig = ref({
@@ -718,6 +792,68 @@ const handleLanguageChange = (language: string) => {
   }
 }
 
+// 查阅代码规范
+const viewCodeSpec = async () => {
+  try {
+    loadingSpec.value = true
+    specLanguage.value = nodeConfig.value.codeType
+    
+    // 获取当前语言设置（zh 或 en）
+    const currentLocale = locale.value || 'zh'
+    
+    // 调用API获取规范，传递语言参数
+    const response = await fetch(`/api/sandbox/code-spec/${nodeConfig.value.codeType}?lang=${currentLocale}`)
+    if (!response.ok) {
+      throw new Error('获取代码规范失败')
+    }
+    
+    const result = await response.json()
+    if (result.success && result.data) {
+      specContent.value = result.data.content
+      specDialogVisible.value = true
+    } else {
+      ElMessage.error(result.message || '获取代码规范失败')
+    }
+  } catch (error) {
+    console.error('获取代码规范失败:', error)
+    ElMessage.error('获取代码规范失败，请稍后重试')
+  } finally {
+    loadingSpec.value = false
+  }
+}
+
+// 检查沙箱服务健康状态
+const checkSandboxHealth = async () => {
+  try {
+    checkingHealth.value = true
+    const response = await fetch('/api/sandbox/health')
+    if (!response.ok) {
+      sandboxHealthy.value = false
+      return
+    }
+    
+    const result = await response.json()
+    sandboxHealthy.value = result.success === true
+  } catch (error) {
+    console.error('检查沙箱服务健康状态失败:', error)
+    sandboxHealthy.value = false
+  } finally {
+    checkingHealth.value = false
+  }
+}
+
+// 计算健康状态的显示文本和样式
+const healthStatusText = computed(() => {
+  if (checkingHealth.value) return t('flow.node_config.health_checking')
+  if (sandboxHealthy.value === null) return t('flow.node_config.health_unknown')
+  return sandboxHealthy.value ? t('flow.node_config.health_normal') : t('flow.node_config.health_error')
+})
+
+const healthStatusClass = computed(() => {
+  if (sandboxHealthy.value === null) return 'status-unknown'
+  return sandboxHealthy.value ? 'status-healthy' : 'status-unhealthy'
+})
+
 const addInputVariable = () => {
   inputVariables.value.push({
     variableName: '',
@@ -875,6 +1011,10 @@ const saveNode = async () => {
 // 监听器
 watch(() => props.visible, (newVal) => {
   drawerVisible.value = newVal
+  // 当抽屉打开时检查沙箱服务健康状态
+  if (newVal) {
+    checkSandboxHealth()
+  }
 }, { immediate: true })
 
 watch(drawerVisible, (newVal) => {
@@ -992,35 +1132,89 @@ watch(inputVariables, () => {
       background: #1f2329;
     };
 
-    .code-content {
-      :deep(.el-collapse-item__header) {
-        padding: 16px 24px;
-        font-weight: 500;
-        background: var(--el-fill-color-extra-light);
-        border-bottom: 1px solid var(--el-border-color-lighter);
-        color: var(--el-text-color-primary);
-        
-        body[theme='dark'] & {
-          background: var(--o-bash-bg, #2a2f37);
-          border-bottom-color: var(--el-border-color);
-          color: #e4e8ee;
-        }
+  .code-content {
+    :deep(.el-collapse-item__header) {
+      padding: 16px 24px;
+      font-weight: 500;
+      background: var(--el-fill-color-extra-light);
+      color: var(--el-text-color-primary);
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+        border-bottom-color: var(--el-border-color);
+        color: #e4e8ee;
       }
+    }
 
-      :deep(.el-collapse-item__wrap) {
-        border-bottom: none;
-      }
+    :deep(.el-collapse-item__wrap) {
+      border-bottom: none;
+    }
 
-      :deep(.el-collapse-item__content) {
-        padding: 20px 24px;
-        background: var(--el-bg-color);
+    :deep(.el-collapse-item__content) {
+      padding: 20px 24px;
+      background: var(--el-bg-color);
+      
+      body[theme='dark'] & {
+        background: #1f2329;
+      }
+    }
+    
+    // 代码编辑器标题栏操作区域
+    .code-header-actions {
+      margin-left: auto;
+      margin-right: 8px;
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      
+      .sandbox-health-status {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        padding: 0 12px;
+        height: 100%;
+        border-radius: 4px;
+        font-size: 12px;
+        transition: all 0.3s ease;
         
-        body[theme='dark'] & {
-          background: #1f2329;
+        .el-icon {
+          font-size: 14px;
+        }
+        
+        .status-text {
+          font-weight: 500;
+        }
+        
+        &.status-healthy {
+          color: #67c23a;
+          background: rgba(103, 194, 58, 0.1);
+          
+          body[theme='dark'] & {
+            background: rgba(103, 194, 58, 0.15);
+          }
+        }
+        
+        &.status-unhealthy {
+          color: #f56c6c;
+          background: rgba(245, 108, 108, 0.1);
+          
+          body[theme='dark'] & {
+            background: rgba(245, 108, 108, 0.15);
+          }
+        }
+        
+        &.status-unknown {
+          color: #909399;
+          background: rgba(144, 147, 153, 0.1);
+          
+          body[theme='dark'] & {
+            background: rgba(144, 147, 153, 0.15);
+          }
         }
       }
     }
   }
+  }
 
   .basic-content,
   .execution-content {
@@ -1247,4 +1441,274 @@ watch(inputVariables, () => {
 :deep(.transparent-modal) {
   background-color: transparent !important;
 }
+
+// 代码规范弹窗样式
+.code-spec-dialog {
+  :deep(.el-dialog__body) {
+    max-height: 70vh !important;
+    overflow-y: auto !important;
+    overflow-x: hidden !important;
+    padding: 20px !important;
+    
+    body[theme='dark'] & {
+      background: #1f2329;
+    }
+  }
+  
+  :deep(.spec-content) {
+    font-size: 14px;
+    line-height: 1.8;
+    color: var(--el-text-color-primary);
+    word-wrap: break-word;
+    
+    body[theme='dark'] & {
+      color: #e4e8ee;
+    }
+    
+    // Markdown样式 - 直接应用到标签上
+    h1 {
+      font-size: 24px;
+      font-weight: 600;
+      margin: 20px 0 16px;
+      padding-bottom: 8px;
+      border-bottom: 1px solid var(--el-border-color-lighter);
+    }
+    
+    h2 {
+      font-size: 20px;
+      font-weight: 600;
+      margin: 18px 0 12px;
+    }
+    
+    h3 {
+      font-size: 16px;
+      font-weight: 600;
+      margin: 16px 0 10px;
+    }
+    
+    p {
+      margin: 8px 0;
+    }
+    
+    ul, ol {
+      padding-left: 24px;
+      margin: 8px 0;
+    }
+    
+    li {
+      margin: 4px 0;
+    }
+    
+    code {
+      background: var(--el-fill-color-extra-light);
+      padding: 2px 6px;
+      border-radius: 3px;
+      font-family: 'Courier New', monospace;
+      font-size: 13px;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+    }
+    
+    pre {
+      background: var(--el-fill-color-extra-light);
+      padding: 12px;
+      border-radius: 6px;
+      overflow-x: auto;
+      margin: 12px 0;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+      
+      code {
+        background: transparent;
+        padding: 0;
+      }
+    }
+    
+    blockquote {
+      border-left: 4px solid var(--el-color-primary);
+      padding-left: 16px;
+      margin: 12px 0;
+      color: var(--el-text-color-secondary);
+      
+      body[theme='dark'] & {
+        color: #d3dce9;
+      }
+    }
+    
+    table {
+      border-collapse: collapse;
+      width: 100%;
+      margin: 12px 0;
+    }
+    
+    th, td {
+      border: 1px solid var(--el-border-color-lighter);
+      padding: 8px 12px;
+      text-align: left;
+      
+      body[theme='dark'] & {
+        border-color: var(--el-border-color);
+      }
+    }
+    
+    th {
+      background: var(--el-fill-color-extra-light);
+      font-weight: 600;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+    }
+    
+    hr {
+      border: none;
+      border-top: 1px solid var(--el-border-color-lighter);
+      margin: 20px 0;
+      
+      body[theme='dark'] & {
+        border-top-color: var(--el-border-color);
+      }
+    }
+  }
+}
+
+</style>
+
+<style lang="scss">
+// 全局样式 - 代码规范弹窗（非 scoped，因为 Dialog 渲染到 body）
+.code-spec-dialog {
+  .el-dialog {
+    margin-top: 5vh !important;
+  }
+  
+  .el-dialog__body {
+    max-height: 70vh !important;
+    overflow-y: auto !important;
+    overflow-x: hidden !important;
+    padding: 20px !important;
+  }
+  
+  .spec-content {
+    font-size: 14px;
+    line-height: 1.8;
+    color: var(--el-text-color-primary);
+    word-wrap: break-word;
+    
+    body[theme='dark'] & {
+      color: #e4e8ee;
+    }
+    
+    h1 {
+      font-size: 24px;
+      font-weight: 600;
+      margin: 20px 0 16px;
+      padding-bottom: 8px;
+      border-bottom: 1px solid var(--el-border-color-lighter);
+    }
+    
+    h2 {
+      font-size: 20px;
+      font-weight: 600;
+      margin: 18px 0 12px;
+    }
+    
+    h3 {
+      font-size: 16px;
+      font-weight: 600;
+      margin: 16px 0 10px;
+    }
+    
+    p {
+      margin: 8px 0;
+    }
+    
+    ul, ol {
+      padding-left: 24px;
+      margin: 8px 0;
+    }
+    
+    li {
+      margin: 4px 0;
+    }
+    
+    code {
+      background: var(--el-fill-color-extra-light);
+      padding: 2px 6px;
+      border-radius: 3px;
+      font-family: 'Courier New', monospace;
+      font-size: 13px;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+    }
+    
+    pre {
+      background: var(--el-fill-color-extra-light);
+      padding: 12px;
+      border-radius: 6px;
+      overflow-x: auto;
+      margin: 12px 0;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+      
+      code {
+        background: transparent;
+        padding: 0;
+      }
+    }
+    
+    blockquote {
+      border-left: 4px solid var(--el-color-primary);
+      padding-left: 16px;
+      margin: 12px 0;
+      color: var(--el-text-color-secondary);
+      
+      body[theme='dark'] & {
+        color: #d3dce9;
+      }
+    }
+    
+    table {
+      border-collapse: collapse;
+      width: 100%;
+      margin: 12px 0;
+    }
+    
+    th, td {
+      border: 1px solid var(--el-border-color-lighter);
+      padding: 8px 12px;
+      text-align: left;
+      
+      body[theme='dark'] & {
+        border-color: var(--el-border-color);
+      }
+    }
+    
+    th {
+      background: var(--el-fill-color-extra-light);
+      font-weight: 600;
+      
+      body[theme='dark'] & {
+        background: var(--o-bash-bg, #2a2f37);
+      }
+    }
+    
+    hr {
+      border: none;
+      border-top: 1px solid var(--el-border-color-lighter);
+      margin: 20px 0;
+      
+      body[theme='dark'] & {
+        border-top-color: var(--el-border-color);
+      }
+    }
+  }
+}
 </style> 
\ No newline at end of file
diff --git a/src/views/createapp/components/workFlowConfig/LLMNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/LLMNodeDrawer.vue
index aaa14b3d97f52da1ccd6fc48a61dc5a989a58879..2351cbd738eab1109f35c628fef9235863ee75c8 100644
--- a/src/views/createapp/components/workFlowConfig/LLMNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/LLMNodeDrawer.vue
@@ -76,57 +76,39 @@
                         :placeholder="$t('llmNode.model_placeholder')"
                         style="width: 100%"
                       >
+                        <!-- 自定义选中后的显示 -->
                         <template #label="{ value }">
-                          <div style="display: flex; align-items: center">
+                          <div style="display: flex; align-items: center" v-if="value">
                             <img
-                              v-if="
-                                llmForm.selectedModel.modelName ===
-                                'default-model'
-                              "
                               style="width: 16px"
-                              src="@/assets/images/logo-euler-copilot.png"
-                              alt=""
-                            />
-                            <img
-                              v-else
-                              style="width: 16px"
-                              :src="value.icon"
+                              :src="getSelectedModelIcon(value)"
                               alt=""
                             />
                             <span
                               style="
-                                width: 100px;
                                 overflow: hidden;
                                 line-height: 32px;
                                 padding-left: 8px;
                               "
                             >
-                              {{ value.modelName }}
+                              {{ getSelectedModelName(value) }}
                             </span>
                           </div>
                         </template>
                         <el-option
-                          :label="option.modelName"
-                          :value="option"
                           v-for="option in llmOptions"
                           :key="option.llmId"
+                          :label="option.modelName"
+                          :value="option.llmId"
                         >
                           <div style="display: flex; align-items: center">
                             <img
-                              v-if="option.modelName === 'default-model'"
-                              style="width: 16px"
-                              src="@/assets/images/logo-euler-copilot.png"
-                              alt=""
-                            />
-                            <img
-                              v-else
                               style="width: 16px"
                               :src="option.icon"
                               alt=""
                             />
                             <span
                               style="
-                                width: 100px;
                                 overflow: hidden;
                                 line-height: 32px;
                                 padding-left: 8px;
@@ -142,53 +124,6 @@
                 </div>
               </el-collapse-item>
   
-              <!-- 提示词配置 -->
-              <el-collapse-item name="prompt" class="prompt-panel">
-                <template #title>
-                  <el-icon
-                    class="el-collapse-item__arrow"
-                    :class="{ 'is-active': activeName.includes('prompt') }"
-                  >
-                    <IconCaretRight />
-                  </el-icon>
-                  <span>{{ $t('llmNode.prompt_config') }}</span>
-                </template>
-                <div class="prompt-content">
-                  <el-form
-                    :model="llmForm"
-                    label-position="left"
-                    label-width="120px"
-                  >
-                    <el-form-item :label="$t('llmNode.system_prompt_label')">
-                      <VariableRichTextEditor
-                        v-model="llmForm.system_prompt"
-                        :current-step-id="nodeYamlId"
-                        :flow-id="flowId"
-                        :placeholder="$t('llmNode.system_prompt_placeholder')"
-                      />
-                    </el-form-item>
-  
-                    <el-form-item :label="$t('llmNode.user_prompt_label')">
-                      <VariableRichTextEditor
-                        v-model="llmForm.user_prompt"
-                        :flow-id="flowId"
-                        :current-step-id="nodeYamlId"
-                        :placeholder="$t('llmNode.user_prompt_placeholder')"
-                      />
-                    </el-form-item>
-  
-                    <el-form-item :label="$t('llmNode.question_label')" required>
-                      <VariableRichTextEditor
-                        v-model="llmForm.user_question"
-                        :flow-id="flowId"
-                        :current-step-id="nodeYamlId"
-                        :placeholder="$t('llmNode.question_placeholder')"
-                      />
-                    </el-form-item>
-                  </el-form>
-                </div>
-              </el-collapse-item>
-  
               <!-- 参数配置 -->
               <el-collapse-item name="parameters" class="parameters-panel">
                 <template #title>
@@ -204,9 +139,174 @@
                   <el-form
                     :model="llmForm"
                     label-position="left"
-                    label-width="120px"
+                    label-width="140px"
                   >
-                    <el-form-item :label="$t('llmNode.temperature_label')">
+                    <!-- 1. 思维链开关 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.canToggleThinking && modelCapabilities.supportsThinking"
+                    >
+                      <template #label>
+                        <span>开关思维链</span>
+                        <el-tooltip content="启用后模型会展示思考过程" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <el-switch v-model="llmForm.enable_thinking" />
+                    </el-form-item>
+
+                    <!-- 2. 上下文 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsContext"
+                    >
+                      <template #label>
+                        <span>上下文</span>
+                        <el-tooltip content="启用后会包含历史对话上下文" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <div style="display: flex; align-items: center; gap: 12px">
+                        <el-switch v-model="llmForm.enable_context" />
+                        <el-slider
+                          :disabled="!llmForm.enable_context"
+                          v-model="llmForm.step_history_size"
+                          :max="10"
+                          :min="1"
+                          :step="1"
+                          show-input
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
+                        />
+                      </div>
+                    </el-form-item>
+
+                    <!-- 3. 联网搜索 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsEnableSearch"
+                    >
+                      <template #label>
+                        <span>联网搜索</span>
+                        <el-tooltip content="启用后模型可以搜索互联网获取最新信息" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <el-switch v-model="llmForm.enable_search" />
+                    </el-form-item>
+
+                    <!-- 4. 频率惩罚 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsFrequencyPenalty"
+                    >
+                      <template #label>
+                        <span>频率惩罚</span>
+                        <el-tooltip content="降低模型重复相同词语的概率，范围：-2.0到2.0" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <div style="display: flex; align-items: center; gap: 12px">
+                        <el-switch v-model="llmForm.enable_frequency_penalty" />
+                        <el-slider
+                          :disabled="!llmForm.enable_frequency_penalty"
+                          v-model="llmForm.frequency_penalty"
+                          :max="2"
+                          :min="-2"
+                          :step="0.1"
+                          show-input
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
+                        />
+                      </div>
+                    </el-form-item>
+
+                    <!-- 5. 动态过滤阈值 (Min-P) -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsMinP"
+                    >
+                      <template #label>
+                        <span>动态过滤阈值</span>
+                        <el-tooltip content="动态调整token选择阈值，范围：0到1" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <div style="display: flex; align-items: center; gap: 12px">
+                        <el-switch v-model="llmForm.enable_min_p" />
+                        <el-slider
+                          :disabled="!llmForm.enable_min_p"
+                          v-model="llmForm.min_p"
+                          :max="1"
+                          :min="0"
+                          :step="0.01"
+                          show-input
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
+                        />
+                      </div>
+                    </el-form-item>
+
+                    <!-- 6. 内容重复度惩罚 (Presence Penalty) -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsPresencePenalty"
+                    >
+                      <template #label>
+                        <span>内容重复度惩罚</span>
+                        <el-tooltip content="降低模型讨论已提及主题的概率，范围：-2.0到2.0" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <div style="display: flex; align-items: center; gap: 12px">
+                        <el-switch v-model="llmForm.enable_presence_penalty" />
+                        <el-slider
+                          :disabled="!llmForm.enable_presence_penalty"
+                          v-model="llmForm.presence_penalty"
+                          :max="2"
+                          :min="-2"
+                          :step="0.1"
+                          show-input
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
+                        />
+                      </div>
+                    </el-form-item>
+
+                    <!-- 7. JSON模式输出 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsJsonMode"
+                    >
+                      <template #label>
+                        <span>JSON模式输出</span>
+                        <el-tooltip content="确保模型输出有效的JSON格式" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <el-switch v-model="llmForm.enable_json_mode" />
+                    </el-form-item>
+
+                    <!-- 8. 结构化输出 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsStructuredOutput"
+                    >
+                      <template #label>
+                        <span>结构化输出</span>
+                        <el-tooltip content="确保模型输出严格符合预定义的JSON Schema" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
+                      <el-switch v-model="llmForm.enable_structured_output" />
+                    </el-form-item>
+
+                    <!-- 9. 温度 -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsTemperature"
+                    >
+                      <template #label>
+                        <span>温度</span>
+                        <el-tooltip content="控制输出的随机性，范围：0到1，值越高输出越随机" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
                       <div style="display: flex; align-items: center; gap: 12px">
                         <el-switch v-model="llmForm.enable_temperature" />
                         <el-slider
@@ -216,43 +316,114 @@
                           :min="0"
                           :step="0.1"
                           show-input
-                          style="flex: 1"
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
                         />
                       </div>
                     </el-form-item>
   
-                    <el-form-item :label="$t('llmNode.context_label')">
+                    <!-- 10. Top-K -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsTopK"
+                    >
+                      <template #label>
+                        <span>Top-K</span>
+                        <el-tooltip content="从概率最高的K个token中采样，范围：0到100" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
                       <div style="display: flex; align-items: center; gap: 12px">
-                        <el-switch v-model="llmForm.enable_context" />
+                        <el-switch v-model="llmForm.enable_top_k" />
                         <el-slider
-                          :disabled="!llmForm.enable_context"
-                          v-model="llmForm.step_history_size"
-                          :max="10"
-                          :min="1"
+                          :disabled="!llmForm.enable_top_k"
+                          v-model="llmForm.top_k"
+                          :max="100"
+                          :min="0"
                           :step="1"
                           show-input
-                          style="flex: 1"
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
                         />
                       </div>
                     </el-form-item>
   
-                    <el-form-item :label="$t('llmNode.frequency_penalty_label')">
+                    <!-- 11. Top-P -->
+                    <el-form-item 
+                      v-if="modelCapabilities.supportsTopP"
+                    >
+                      <template #label>
+                        <span>Top-P</span>
+                        <el-tooltip content="核采样，从累积概率达到P的最小token集合中采样，范围：0.1到1.0" placement="top">
+                          <el-icon style="margin-left: 4px"><QuestionFilled /></el-icon>
+                        </el-tooltip>
+                      </template>
                       <div style="display: flex; align-items: center; gap: 12px">
-                        <el-switch v-model="llmForm.enable_frequency_penalty" />
+                        <el-switch v-model="llmForm.enable_top_p" />
                         <el-slider
-                          :disabled="!llmForm.enable_frequency_penalty"
-                          v-model="llmForm.frequency_penalty"
+                          :disabled="!llmForm.enable_top_p"
+                          v-model="llmForm.top_p"
                           :max="1"
-                          :min="0"
+                          :min="0.1"
                           :step="0.1"
                           show-input
-                          style="flex: 1"
+                          :input-size="'small'"
+                          style="flex: 1; min-width: 400px"
+                          class="slider-with-input"
                         />
                       </div>
                     </el-form-item>
                   </el-form>
                 </div>
               </el-collapse-item>
+
+              <!-- 提示词配置 -->
+              <el-collapse-item name="prompt" class="prompt-panel">
+                <template #title>
+                  <el-icon
+                    class="el-collapse-item__arrow"
+                    :class="{ 'is-active': activeName.includes('prompt') }"
+                  >
+                    <IconCaretRight />
+                  </el-icon>
+                  <span>{{ $t('llmNode.prompt_config') }}</span>
+                </template>
+                <div class="prompt-content">
+                  <el-form
+                    :model="llmForm"
+                    label-position="left"
+                    label-width="120px"
+                  >
+                    <el-form-item :label="$t('llmNode.system_prompt_label')">
+                      <VariableRichTextEditor
+                        v-model="llmForm.system_prompt"
+                        :current-step-id="nodeYamlId"
+                        :flow-id="flowId"
+                        :placeholder="$t('llmNode.system_prompt_placeholder')"
+                      />
+                    </el-form-item>
+  
+                    <el-form-item :label="$t('llmNode.user_prompt_label')">
+                      <VariableRichTextEditor
+                        v-model="llmForm.user_prompt"
+                        :flow-id="flowId"
+                        :current-step-id="nodeYamlId"
+                        :placeholder="$t('llmNode.user_prompt_placeholder')"
+                      />
+                    </el-form-item>
+  
+                    <el-form-item :label="$t('llmNode.question_label')" required>
+                      <VariableRichTextEditor
+                        v-model="llmForm.user_question"
+                        :flow-id="flowId"
+                        :current-step-id="nodeYamlId"
+                        :placeholder="$t('llmNode.question_placeholder')"
+                      />
+                    </el-form-item>
+                  </el-form>
+                </div>
+              </el-collapse-item>
   
               <!-- 输出变量 -->
               <el-collapse-item name="output" class="output-panel">
@@ -294,6 +465,7 @@
   import { onMounted, ref, reactive, watch } from 'vue';
   import yaml from 'js-yaml';
   import { IconCaretRight } from '@computing/opendesign-icons';
+  import { QuestionFilled } from '@element-plus/icons-vue';
   import YamlContentOutput from 'src/components/yamloutput/yamlContentOutput.jsx';
   import { ElMessage, FormInstance } from 'element-plus';
   import i18n from 'src/i18n';
@@ -320,14 +492,22 @@
     enable_temperature: boolean;
     enable_frequency_penalty: boolean;
     frequency_penalty: number;
+    enable_thinking: boolean;
+    enable_search: boolean;
+    min_p: number;
+    enable_min_p: boolean;
+    presence_penalty: number;
+    enable_presence_penalty: boolean;
+    enable_json_mode: boolean;
+    enable_structured_output: boolean;
+    top_k: number;
+    enable_top_k: boolean;
+    top_p: number;
+    enable_top_p: boolean;
     llmId: string;
     user_question: string;
     node_type: string;
-    selectedModel: {
-      icon: string;
-      modelName: string;
-      llmId: string;
-    };
+    selectedModel: string;
   }
   
   const llmForm = reactive<LLMForm>({
@@ -337,19 +517,43 @@
     enable_context: false,
     step_history_size: 3,
     system_prompt: '',
-    temperature: 0,
+    temperature: 0.7,
     user_prompt: '',
     enable_temperature: false,
     enable_frequency_penalty: false,
     frequency_penalty: 0,
+    enable_thinking: false,
+    enable_search: false,
+    min_p: 0.1,
+    enable_min_p: false,
+    presence_penalty: 0,
+    enable_presence_penalty: false,
+    enable_json_mode: false,
+    enable_structured_output: false,
+    top_k: 50,
+    enable_top_k: false,
+    top_p: 0.9,
+    enable_top_p: false,
     llmId: '',
     user_question: '',
     node_type: NodeType.LLM,
-    selectedModel: {
-      icon: '@/assets/images/logo-euler-copilot.png',
-      modelName: 'default-model',
-      llmId: '',
-    },
+    selectedModel: '',
+  });
+  
+  // 模型能力状态
+  const modelCapabilities = ref({
+    supportsTemperature: true,
+    supportsFrequencyPenalty: false,
+    supportsPresencePenalty: false,
+    supportsTopP: true,
+    supportsTopK: false,
+    supportsMinP: false,
+    supportsThinking: false,
+    canToggleThinking: false,
+    supportsContext: true,
+    supportsEnableSearch: false,
+    supportsJsonMode: true,
+    supportsStructuredOutput: false,
   });
   
   const llmFormRef = ref<FormInstance>();
@@ -385,49 +589,93 @@
     ],
   });
   
-  // 获取可用LLM
+  // 获取可用LLM（只查询chat类型）
   const getProviderLLM = async () => {
-    const [_, res] = await api.getLLMList();
+    const [_, res] = await api.getLLMList('chat'); // 传递modelType参数，只查询chat类型
     if (!_ && res && res.code === 200) {
-      // 🔑 新增：只保留chat类型的模型
       const allModels = res.result || [];
-      const chatModels = allModels.filter(model => 
-        !model.type || model.type === 'chat'  // 如果没有type字段则默认为chat类型
-      );
       
-      if (chatModels.length === 0) {
+      if (allModels.length === 0) {
         ElMessage.error(i18n.global.t('feedback.no_model_error'));
       }
-      llmOptions.value.push(...chatModels);
+      
+      // 转换格式，确保icon不为undefined
+      const formattedModels = allModels.map(model => ({
+        icon: model.icon || '@/assets/images/logo-euler-copilot.png',
+        modelName: model.modelName,
+        llmId: model.llmId,
+      }));
+      
+      llmOptions.value = formattedModels; // 直接赋值而不是push，避免重复
+      
       if (llmForm.llmId) {
-        llmOptions.value.forEach((item) => {
-          llmForm.selectedModel =
-            item.llmId === llmForm.llmId ? item : llmForm.selectedModel;
-        });
+        // 如果有已保存的llmId，找到对应的模型并设置selectedModel为llmId字符串
+        const matchedModel = llmOptions.value.find(item => item.llmId === llmForm.llmId);
+        if (matchedModel) {
+          llmForm.selectedModel = matchedModel.llmId; // 直接使用llmId字符串
+        }
+        // 注意：不在这里调用loadModelCapabilities，让onMounted统一处理
       } else {
         // 如果是新节点，使用用户偏好的推理模型作为默认选项
-        const preferredModel = getPreferredReasoningModel(chatModels);
+        const preferredModel = getPreferredReasoningModel(allModels);
         if (preferredModel) {
-          llmForm.selectedModel = preferredModel;
+          llmForm.selectedModel = preferredModel.llmId; // 直接使用llmId字符串
           llmForm.llmId = preferredModel.llmId;
         }
+        // 注意：不在这里调用loadModelCapabilities，让onMounted统一处理
       }
     } else {
       ElMessage.error(i18n.global.t('feedback.network_error'));
     }
   };
   
-  // 设计默认model是为了应对需要导出或平台配置改动导致模型找不到id的情况
-  const llmOptions = ref([
-    {
-      icon: '@/assets/images/logo-euler-copilot.png',
-      modelName: 'default-model',
-      llmId: '',
-    },
-  ]);
+  // 加载模型能力
+  const loadModelCapabilities = async (llmId: string) => {
+    if (!llmId) {
+      return;
+    }
+    
+    const [error, res] = await api.getModelCapabilities(llmId);
+    
+    if (!error && res && res.code === 200) {
+      const capabilities = res.result;
+      
+      modelCapabilities.value = {
+        supportsTemperature: capabilities.supportsTemperature,
+        supportsFrequencyPenalty: capabilities.supportsFrequencyPenalty,
+        supportsPresencePenalty: capabilities.supportsPresencePenalty,
+        supportsTopP: capabilities.supportsTopP,
+        supportsTopK: capabilities.supportsTopK,
+        supportsMinP: capabilities.supportsMinP,
+        supportsThinking: capabilities.supportsThinking,
+        canToggleThinking: capabilities.canToggleThinking,
+        supportsContext: capabilities.supportsContext,
+        supportsEnableSearch: capabilities.supportsEnableSearch,
+        supportsJsonMode: capabilities.supportsJsonMode,
+        supportsStructuredOutput: capabilities.supportsStructuredOutput,
+      };
+    } else {
+      ElMessage.error('加载模型能力配置失败');
+    }
+  };
+  
+  // 获取选中模型的图标
+  const getSelectedModelIcon = (llmId: string) => {
+    const model = llmOptions.value.find(m => m.llmId === llmId);
+    return model?.icon || '@/assets/images/logo-euler-copilot.png';
+  };
+  
+  // 获取选中模型的名称
+  const getSelectedModelName = (llmId: string) => {
+    const model = llmOptions.value.find(m => m.llmId === llmId);
+    return model?.modelName || '';
+  };
+  
+  // 模型选项列表（不再包含默认的default-model，从接口动态加载）
+  const llmOptions = ref<Array<{ icon: string; modelName: string; llmId: string }>>([]);
   
   // TODO app.outputContent 还没有对接 在预定义的插件那里会有outputContent
-  const LLMOutputInYaml = ref('');
+  const LLMOutputInYaml = ref<any>('');
   const emits = defineEmits(['closeDrawer', 'saveNode']);
   const props = defineProps<{
     yamlContent: any;
@@ -438,14 +686,24 @@
     nodeYamlId: any;
   }>();
   
-  onMounted(() => {
+  onMounted(async () => {
     let input_content = props.yamlContent.input_parameters;
     Object.assign(llmForm, {
       ...input_content,
       name: props.nodeName,
       description: props.nodeDesc,
-      enable_frequency_penalty: input_content.frequency_penalty !== 0,
-      enable_temperature: input_content.temperature !== 0.7,
+      
+      // 根据实际值设置enable状态
+      enable_frequency_penalty: input_content.enable_frequency_penalty ?? (input_content.frequency_penalty !== 0),
+      enable_temperature: input_content.enable_temperature ?? (input_content.temperature !== 0.7),
+      enable_min_p: input_content.enable_min_p ?? false,
+      enable_presence_penalty: input_content.enable_presence_penalty ?? false,
+      enable_top_k: input_content.enable_top_k ?? false,
+      enable_top_p: input_content.enable_top_p ?? false,
+      enable_thinking: input_content.enable_thinking ?? false,
+      enable_search: input_content.enable_search ?? false,
+      enable_json_mode: input_content.enable_json_mode ?? false,
+      enable_structured_output: input_content.enable_structured_output ?? false,
     });
 
     if (llmForm.name && llmForm.description) {
@@ -476,7 +734,14 @@
         }
       };
     }
-    getProviderLLM();
+    
+    // 先加载模型列表
+    await getProviderLLM();
+    
+    // 如果已经选中了模型（selectedModel现在是llmId字符串），加载该模型的能力配置
+    if (llmForm.selectedModel) {
+      await loadModelCapabilities(llmForm.selectedModel);
+    }
   });
   
   const closeDrawer = () => {
@@ -498,29 +763,60 @@
     }
   });
   
+  // 监听模型选择变化（避免初始化时触发）
+  watch(
+    () => llmForm.selectedModel,
+    async (newModelId, oldModelId) => {
+      // 只有在真正切换模型时才查询（避免初始化时触发）
+      if (newModelId && oldModelId && newModelId !== oldModelId) {
+        await loadModelCapabilities(newModelId);
+        // 同步更新llmId
+        llmForm.llmId = newModelId;
+      }
+    }
+  );
+  
   // 完成yaml更新
   const updateNodeYaml = async (formEl: FormInstance | undefined) => {
     if (!formEl) return;
-    console.log(llmForm);
   
     await formEl.validate((valid, fields) => {
       if (valid) {
         try {
+          // 只提取 input_parameters 相关的字段
           let transResult = {
-            ...llmForm,
+            to_user: llmForm.to_user,
+            enable_context: llmForm.enable_context,
             step_history_size: llmForm.enable_context
               ? llmForm.step_history_size
               : 0,
+            system_prompt: llmForm.system_prompt,
             temperature: llmForm.enable_temperature ? llmForm.temperature : 0.7,
+            user_prompt: llmForm.user_prompt,
+            enable_temperature: llmForm.enable_temperature,
+            enable_frequency_penalty: llmForm.enable_frequency_penalty,
             frequency_penalty: llmForm.enable_frequency_penalty
               ? llmForm.frequency_penalty
               : 0,
-            llmId: llmForm.selectedModel.llmId,
-            node_type: NodeType.LLM,
+            llmId: llmForm.selectedModel, // selectedModel现在直接是llmId字符串
+            user_question: llmForm.user_question,
+            
+            // 新增的参数配置项
+            enable_thinking: llmForm.enable_thinking,
+            enable_search: llmForm.enable_search,
+            enable_min_p: llmForm.enable_min_p,
+            min_p: llmForm.enable_min_p ? llmForm.min_p : 0,
+            enable_presence_penalty: llmForm.enable_presence_penalty,
+            presence_penalty: llmForm.enable_presence_penalty ? llmForm.presence_penalty : 0,
+            enable_json_mode: llmForm.enable_json_mode,
+            enable_structured_output: llmForm.enable_structured_output,
+            enable_top_k: llmForm.enable_top_k,
+            top_k: llmForm.enable_top_k ? llmForm.top_k : 0,
+            enable_top_p: llmForm.enable_top_p,
+            top_p: llmForm.enable_top_p ? llmForm.top_p : 0.9,
           };
           let transResultToYaml = yaml.load(JSON.stringify(transResult));
   
-          console.log(transResultToYaml);
           // 调用接口并更新--根据id包含更新后的yamlCode, name, desc
           emits(
             'saveNode',
@@ -530,11 +826,9 @@
             llmForm.description,
           );
           closeDrawer();
-        } catch {
+        } catch (error) {
           ElMessage.error(i18n.global.t('semantic.checkFormat'));
         }
-      } else {
-        console.log('submit failed!', fields);
       }
     });
   };
@@ -726,6 +1020,8 @@
           }
 
           .el-input-number {
+            width: 120px !important; // 增加input框宽度以完整显示数值
+            
             .el-input__wrapper {
               background-color: var(--el-bg-color-page) !important;
               border-color: var(--el-border-color) !important;
@@ -745,12 +1041,6 @@
       justify-content: flex-end;
       gap: 12px;
       padding: 16px;
-      border-top: 1px solid #ebeef5;
-      
-      // 深色模式适配
-      body[theme='dark'] & {
-        border-top: 1px solid var(--el-border-color-lighter);
-      }
     }
   }
   
@@ -954,6 +1244,10 @@ body[theme='light'] .llm-drawer {
     color: var(--el-text-color-primary) !important;
   }
 
+  .el-collapse-item__content {
+    margin-top: 8px;
+  }
+
   .el-collapse-item__wrap,
   .o-hpc-collapse {
     background-color: transparent !important;
diff --git a/src/views/createapp/components/workFlowConfig/MCPNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/MCPNodeDrawer.vue
index 40fcc9a43705c74cd994c492bb2326b2c0104ddd..55506960325316f45c547e3459a5131cf8b4242e 100644
--- a/src/views/createapp/components/workFlowConfig/MCPNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/MCPNodeDrawer.vue
@@ -280,13 +280,13 @@
   
   // 完成yaml更新
   const updateNodeYaml = async (formEl: FormInstance | undefined) => {
-    // 现在把每个数值单独提取出来是为了更好的可拓展性
-  
     if (!formEl) return;
     await formEl.validate((valid, fields) => {
       if (valid) {
+        // 只提取 input_parameters 相关的字段
         const transResult = {
-          ...mcpForm,
+          mcp_list: mcpForm.mcp_list,
+          max_steps: mcpForm.max_steps,
         };
         try {
           let transResultToYaml = yaml.load(JSON.stringify(transResult));
@@ -295,16 +295,16 @@
             'saveNode',
             transResultToYaml,
             props.nodeYamlId,
-            transResult.name,
-            transResult.description,
+            mcpForm.name,
+            mcpForm.description,
           );
           closeDrawer();
-        } catch {
+        } catch (error) {
+          console.error('保存失败:', error);
           ElMessage.error(i18n.global.t('semantic.checkFormat'));
         }
-        console.log('submit!');
       } else {
-        console.log('error submit!', fields);
+        console.log('表单验证失败:', fields);
       }
     });
   };
@@ -685,6 +685,10 @@
       color: var(--el-text-color-primary) !important;
     }
 
+    .el-collapse-item__content {
+      margin-top: 8px;
+    }
+
     .el-collapse-item__wrap,
     .o-hpc-collapse {
       background-color: transparent !important;
diff --git a/src/views/createapp/components/workFlowConfig/RAGNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/RAGNodeDrawer.vue
index a24d74c213987852f3d3792590d4cc77fd0effdc..c6423cc60f438472d3c031e6f3b0a46e255b9751 100644
--- a/src/views/createapp/components/workFlowConfig/RAGNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/RAGNodeDrawer.vue
@@ -286,28 +286,36 @@
     node_type: string; // node type
     top_k: number; // 返回的分片数
     document_ids: string[]; // 文档id列表
+    knowledge_base_ids: string[]; // 知识库id列表（如果需要）
     search_method: string; // 检索方法
     is_related_surrounding: boolean; // 是否关联上下文
     is_classify_by_doc: boolean; // 是否按文档分类
     is_rerank: boolean; // 是否重排
     is_compress: boolean; // 是否压缩
-    token_limits: number; // TODO token限制 这个还没开放配置
+    tokens_limit: number; // token限制（注意字段名是tokens_limit）
     query_variables: string; // 查询变量
+    to_user: boolean; // 是否输出给用户
+    enable_variable_resolution: boolean; // 是否启用变量解析
+    controlled_output: boolean; // 是否控制输出
   }
-  
+
   const ragForm = reactive<RAGForm>({
     name: '',
     description: '',
     node_type: NodeType.RAG,
-    top_k: 0,
+    top_k: 5,
     document_ids: [],
-    search_method: '',
+    knowledge_base_ids: [],
+    search_method: 'keyword_and_vector',
     is_related_surrounding: true,
     is_classify_by_doc: false,
     is_rerank: false,
     is_compress: false,
-    token_limits: 8192,
+    tokens_limit: 8192,
     query_variables: '',
+    to_user: false,
+    enable_variable_resolution: true,
+    controlled_output: false,
   });
   
   const ragFormRef = ref<FormInstance>();
@@ -398,12 +406,27 @@
   onMounted(() => {
     getKnowledgeList();
     let input_content = props.yamlContent.input_parameters;
-  
-    Object.assign(ragForm, {
-      ...input_content,
-      name: props.nodeName,
-      description: props.nodeDesc,
-    });
+    
+    // 使用 Object.assign 会覆盖默认值，需要确保正确合并
+    if (input_content) {
+      // 过滤掉 document_ids 中的空字符串
+      const filteredInputContent = {
+        ...input_content,
+        document_ids: Array.isArray(input_content.document_ids) 
+          ? input_content.document_ids.filter(id => id && id.trim() !== '')
+          : [],
+      };
+      
+      Object.assign(ragForm, {
+        ...filteredInputContent,
+        name: props.nodeName,
+        description: props.nodeDesc,
+      });
+    } else {
+      // 如果没有 input_content，只设置 name 和 description
+      ragForm.name = props.nodeName;
+      ragForm.description = props.nodeDesc;
+    }
   
     ragOutputInYaml.value = props.yamlContent.output_parameters;
     if (ragForm.name && ragForm.description) {
@@ -432,37 +455,51 @@
     }
   });
   
-  // 完成yaml更新
-  const updateNodeYaml = async (formEl: FormInstance | undefined) => {
-    // 现在把每个数值单独提取出来是为了更好的可拓展性
-  
-    if (!formEl) return;
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        console.log(ragForm);
-        const transResult = {
-          ...ragForm,
-        };
-        try {
-          let transResultToYaml = yaml.load(JSON.stringify(transResult));
-          // 调用接口并更新--根据id包含更新后的yamlCode, name, desc
-          emits(
-            'saveNode',
-            transResultToYaml,
-            props.nodeYamlId,
-            transResult.name,
-            transResult.description,
-          );
-          closeDrawer();
-        } catch {
-          ElMessage.error(i18n.global.t('semantic.checkFormat'));
-        }
-        console.log('submit!');
-      } else {
-        console.log('error submit!', fields);
+// 完成yaml更新
+const updateNodeYaml = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 过滤掉 document_ids 中的空字符串
+      const filteredDocumentIds = ragForm.document_ids.filter(id => id && id.trim() !== '');
+      
+      // 只提取 input_parameters 相关的字段
+      const transResult = {
+        to_user: ragForm.to_user,
+        enable_variable_resolution: ragForm.enable_variable_resolution,
+        controlled_output: ragForm.controlled_output,
+        knowledge_base_ids: ragForm.knowledge_base_ids,
+        top_k: ragForm.top_k,
+        document_ids: filteredDocumentIds,
+        search_method: ragForm.search_method,
+        is_related_surrounding: ragForm.is_related_surrounding,
+        is_classify_by_doc: ragForm.is_classify_by_doc,
+        is_rerank: ragForm.is_rerank,
+        is_compress: ragForm.is_compress,
+        tokens_limit: ragForm.tokens_limit,
+        query_variables: ragForm.query_variables,
+      };
+      
+      try {
+        let transResultToYaml = yaml.load(JSON.stringify(transResult));
+        // 调用接口并更新--根据id包含更新后的yamlCode, name, desc
+        emits(
+          'saveNode',
+          transResultToYaml,
+          props.nodeYamlId,
+          ragForm.name,
+          ragForm.description,
+        );
+        closeDrawer();
+      } catch (error) {
+        console.error('保存失败:', error);
+        ElMessage.error(i18n.global.t('semantic.checkFormat'));
       }
-    });
-  };
+    } else {
+      console.log('表单验证失败:', fields);
+    }
+  });
+};
   </script>
   
   <style lang="scss" scoped>
@@ -890,6 +927,10 @@
       background-color: transparent !important;
     }
 
+    .el-collapse-item__content {
+      margin-top: 8px;
+    }
+
     .el-form-item__label {
       color: var(--el-text-color-primary) !important;
     }
diff --git a/src/views/createapp/components/workFlowConfig/useDnD.js b/src/views/createapp/components/workFlowConfig/useDnD.js
index 0a84547ed70517e577f3f57be7b840fae749ec02..3a90aaa6e774ed7f43d2e3b14560231645f0594a 100644
--- a/src/views/createapp/components/workFlowConfig/useDnD.js
+++ b/src/views/createapp/components/workFlowConfig/useDnD.js
@@ -247,6 +247,46 @@ function sanitizeNodeData(nodeData, nodeId) {
       }
     };
     
+    return cleanNodeData;
+  } else if (cleanNodeData.type === 'LLM') {
+    // 如果是FileExtractor节点，设置正确的parameters结构
+    cleanNodeData.parameters = {
+      input_parameters: {},
+      output_parameters: {
+        reply: {
+          type: 'string',
+          description: '定义LLM工具调用的输出容'
+        }
+      }
+    };
+    return cleanNodeData;
+  } else if (cleanNodeData.type === 'RAG') {
+    // 如果是FileExtractor节点，设置正确的parameters结构
+    cleanNodeData.parameters = {
+      input_parameters: {},
+      output_parameters: {
+        question: {
+          type: 'string',
+          description: '定义LLM工具调用的输出容'
+        },
+        corpus: {
+          type: 'array',
+          description: '知识库的语料列表'
+        }
+      }
+    };
+    return cleanNodeData;
+  } else if (cleanNodeData.type === 'MCP') {
+    // 如果是FileExtractor节点，设置正确的parameters结构
+    cleanNodeData.parameters = {
+      input_parameters: {},
+      output_parameters: {
+        message: {
+          type: 'string',
+          description: 'MCP Server的自然语言输出'
+        }
+      }
+    };
     return cleanNodeData;
   } else {
     // 对于所有其他节点类型（LLM、RAG、API、SQL等），使用API返回的原始parameters
diff --git a/src/views/createapp/components/workFlowDebug.vue b/src/views/createapp/components/workFlowDebug.vue
index 5107ea95578700dd370780c1d8bec41e0d363a8b..c12bb5d29170aba172a599060d67169b9bf6c9a3 100644
--- a/src/views/createapp/components/workFlowDebug.vue
+++ b/src/views/createapp/components/workFlowDebug.vue
@@ -355,7 +355,6 @@ onMounted(() => {
   conversationList.value = [];
   selectedSessionIds.value = [];
   currentSelectedSession.value = '';
-  historySession.value = [];
   
   // 尝试加载变量配置（基于flowId）
   loadConversationVariables();
@@ -530,7 +529,8 @@ const delChat = async () => {
       conversationList.value = [];
       selectedSessionIds.value = [];
       currentSelectedSession.value = '';
-      historySession.value = [];
+      // historySession is a computed property, cannot be directly assigned
+      // historySession.value = [];
     }
   }
 };
diff --git a/src/views/createapp/index.vue b/src/views/createapp/index.vue
index 32559fa930049cac1c617140095a6ded6155eb3a..a6c9d2a770a44ffa3701cce657de0bdced75ce97 100644
--- a/src/views/createapp/index.vue
+++ b/src/views/createapp/index.vue
@@ -119,6 +119,8 @@ const handleCreateOrUpdateApp = async () => {
       }),
       recommendedQuestions: appFormValue.recommendedQuestions,
       dialogRounds: appFormValue.dialogRounds,
+      llm: appFormValue.model,
+      enableThinking: appFormValue.enableThinking,
       permission: appFormValue.permission,
     });
   }
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index e12a48e30abd5f01feb8eba5bfc71552bb77a7e5..486bd0a048c98660d84488f90062c30af4fd6fdd 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -828,13 +828,24 @@ const clearSuggestion = (index: number): void => {
 };
 
 const getProviderLLM = async () => {
-  const [_, res] = await api.getLLMList();
+  // 🔑 修复：使用查询参数type限制只查询chat类型的模型
+  const [_, res] = await api.getLLMList({ type: 'chat' });
   if (!_ && res && res.code === 200) {
-    // 🔑 新增：只保留chat类型的模型
     const allModels = res.result || [];
-    const chatModels = allModels.filter(model => 
-      !model.type || model.type === 'chat'  // 如果没有type字段则默认为chat类型
-    );
+    // 🔑 修复：适配后端type从字符串改为字符串数组的变更
+    // 保留前端过滤作为兜底，确保只有chat类型的模型
+    const chatModels = allModels.filter(model => {
+      // 如果没有type字段，默认为chat类型
+      if (!model.type) return true;
+      
+      // 适配type为字符串数组的情况
+      if (Array.isArray(model.type)) {
+        return model.type.includes('chat');
+      }
+      
+      // 兼容旧的字符串格式
+      return model.type === 'chat';
+    });
     llmOptions.value = chatModels;
     
     // 🔑 修复：区分新对话和已存在对话的模型选择逻辑
diff --git a/src/views/dialogue/components/TitleBar.vue b/src/views/dialogue/components/TitleBar.vue
index c02495b081819e32f2854f3cd8fcc49ddc7fadd2..275d81dbe7c3a9ceb3b4b695f0cfc2d25aa6f4bf 100644
--- a/src/views/dialogue/components/TitleBar.vue
+++ b/src/views/dialogue/components/TitleBar.vue
@@ -304,7 +304,7 @@ const headerStyles = computed<CSSProperties>(() => {
             popper-class="user-profile-popover" 
             :offset="4"
             placement="bottom-end"
-            :width="280"
+            :width="350"
           >
             <template #reference>
               <div class="avatar icon-wrapper"></div>
@@ -334,35 +334,107 @@ const headerStyles = computed<CSSProperties>(() => {
                 <!-- 用户偏好设置区域 -->
                 <div class="preferences-section" v-loading="preferencesLoading">
                   <div class="section-title">{{ $t('userInfo.preferences_settings') }}</div>
-                  <div class="preference-item">
-                    <div class="preference-label">{{ $t('history.auto_execute') }}</div>
-                    <el-tag 
-                      :type="preferences.autoExecutePreference ? 'success' : 'info'" 
-                      size="small"
-                    >
-                      {{ preferences.autoExecutePreference ? $t('userInfo.auto_execute_enabled') : $t('userInfo.auto_execute_disabled') }}
-                    </el-tag>
-                  </div>
-                  <div class="preference-item" v-if="preferences.chainOfThoughtPreference !== undefined">
-                    <div class="preference-label">{{ $t('settings.chain_of_thought_preference') }}</div>
-                    <el-tag 
-                      :type="preferences.chainOfThoughtPreference ? 'success' : 'info'" 
-                      size="small"
-                    >
-                      {{ preferences.chainOfThoughtPreference ? $t('userInfo.chain_of_thought_enabled') : $t('userInfo.chain_of_thought_disabled') }}
-                    </el-tag>
-                  </div>
-                  <div class="preference-item" v-if="preferences.reasoningModelPreference">
-                    <div class="preference-label">{{ $t('userInfo.reasoning_model') }}</div>
-                    <div class="preference-value">{{ preferences.reasoningModelPreference.modelName || $t('userInfo.default_model') }}</div>
-                  </div>
-                  <div class="preference-item" v-if="preferences.embeddingModelPreference">
-                    <div class="preference-label">{{ $t('userInfo.embedding_model') }}</div>
-                    <div class="preference-value">{{ preferences.embeddingModelPreference.modelName || $t('userInfo.default_model') }}</div>
+                  
+                  <!-- 模型偏好 - 使用网格布局 -->
+                  <div class="model-preferences-grid">
+                    <div class="model-pref-item" v-if="preferences.reasoningModelPreference">
+                      <el-tooltip :content="$t('userInfo.reasoning_model')" placement="top">
+                        <div class="model-pref-header">
+                          <svg class="preference-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
+                            <path d="M8.186 1.113a.5.5 0 0 0-.372 0L1.846 3.5l2.404.961L10.404 2l-2.218-.887zm3.564 1.426L5.596 5 8 5.961 14.154 3.5l-2.404-.961zm3.25 1.7l-6.5 2.6v7.922l6.5-2.6V4.24zM7.5 14.762V6.838L1 4.239v7.923l6.5 2.6zM7.443.184a1.5 1.5 0 0 1 1.114 0l7.129 2.852A.5.5 0 0 1 16 3.5v8.662a1 1 0 0 1-.629.928l-7.185 2.874a.5.5 0 0 1-.372 0L.63 13.09a1 1 0 0 1-.63-.928V3.5a.5.5 0 0 1 .314-.464L7.443.184z"/>
+                          </svg>
+                          <span class="model-pref-label">{{ $t('userInfo.reasoning_model') }}</span>
+                        </div>
+                      </el-tooltip>
+                      <el-tooltip :content="preferences.reasoningModelPreference.modelName" placement="top">
+                        <div class="model-pref-value">{{ preferences.reasoningModelPreference.modelName || $t('userInfo.default_model') }}</div>
+                      </el-tooltip>
+                    </div>
+                    
+                    <div class="model-pref-item" v-if="preferences.functionCallModelPreference">
+                      <el-tooltip :content="$t('userInfo.function_call_model')" placement="top">
+                        <div class="model-pref-header">
+                          <svg class="preference-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
+                            <path d="M4.545 6.714 4.11 8H3l1.862-5h1.284L8 8H6.833l-.435-1.286H4.545zm1.634-.736L5.5 3.956h-.049l-.679 2.022H6.18z"/>
+                            <path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm2-1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H2z"/>
+                          </svg>
+                          <span class="model-pref-label">{{ $t('userInfo.function_call_model') }}</span>
+                        </div>
+                      </el-tooltip>
+                      <el-tooltip :content="preferences.functionCallModelPreference.modelName" placement="top">
+                        <div class="model-pref-value">{{ preferences.functionCallModelPreference.modelName || $t('userInfo.default_model') }}</div>
+                      </el-tooltip>
+                    </div>
+                    
+                    <div class="model-pref-item" v-if="preferences.embeddingModelPreference">
+                      <el-tooltip :content="$t('userInfo.embedding_model')" placement="top">
+                        <div class="model-pref-header">
+                          <svg class="preference-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
+                            <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+                            <path d="M5.5 12a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm-2-8.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm7 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm2 8.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
+                          </svg>
+                          <span class="model-pref-label">{{ $t('userInfo.embedding_model') }}</span>
+                        </div>
+                      </el-tooltip>
+                      <el-tooltip :content="preferences.embeddingModelPreference.modelName" placement="top">
+                        <div class="model-pref-value">{{ preferences.embeddingModelPreference.modelName || $t('userInfo.default_model') }}</div>
+                      </el-tooltip>
+                    </div>
+                    
+                    <div class="model-pref-item" v-if="preferences.rerankerPreference">
+                      <el-tooltip :content="$t('userInfo.reranker_model')" placement="top">
+                        <div class="model-pref-header">
+                          <svg class="preference-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
+                            <path d="M3.5 2.5a.5.5 0 0 0-1 0v8.793l-1.146-1.147a.5.5 0 0 0-.708.708l2 1.999.007.007a.497.497 0 0 0 .7-.006l2-2a.5.5 0 0 0-.707-.708L3.5 11.293V2.5zm3.5 1a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zM7.5 6a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1h-5zm0 3a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zm0 3a.5.5 0 0 0 0 1h1a.5.5 0 0 0 0-1h-1z"/>
+                          </svg>
+                          <span class="model-pref-label">{{ $t('userInfo.reranker_model') }}</span>
+                        </div>
+                      </el-tooltip>
+                      <el-tooltip :content="preferences.rerankerPreference.modelName || preferences.rerankerPreference.name" placement="top">
+                        <div class="model-pref-value">{{ preferences.rerankerPreference.modelName || preferences.rerankerPreference.name || $t('userInfo.default_model') }}</div>
+                      </el-tooltip>
+                    </div>
+                    
+                    <div class="model-pref-item model-pref-item--full" v-if="preferences.searchMethodPreference">
+                      <div class="model-pref-header">
+                        <svg class="preference-icon" width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
+                          <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/>
+                        </svg>
+                        <span class="model-pref-label">{{ $t('userInfo.search_method') }}</span>
+                      </div>
+                      <el-tag type="primary" size="small" effect="plain" class="search-method-tag">
+                        {{ preferences.searchMethodPreference }}
+                      </el-tag>
+                    </div>
                   </div>
-                  <div class="preference-item" v-if="preferences.rerankerPreference">
-                    <div class="preference-label">{{ $t('userInfo.reranker_model') }}</div>
-                    <div class="preference-value">{{ preferences.rerankerPreference.modelName || preferences.rerankerPreference.name || $t('userInfo.default_model') }}</div>
+                  
+                  <!-- 开关类偏好 - 网格布局 -->
+                  <div class="toggle-preferences-grid">
+                    <div class="preference-toggle-item">
+                      <div class="toggle-label">
+                        <span>{{ $t('history.auto_execute') }}</span>
+                      </div>
+                      <el-tag 
+                        :type="preferences.autoExecutePreference ? 'success' : 'info'" 
+                        size="small"
+                        effect="plain"
+                      >
+                        {{ preferences.autoExecutePreference ? $t('userInfo.enabled') : $t('userInfo.disabled') }}
+                      </el-tag>
+                    </div>
+                    
+                    <div class="preference-toggle-item" v-if="preferences.chainOfThoughtPreference !== undefined">
+                      <div class="toggle-label">
+                        <span>{{ $t('settings.chain_of_thought_preference') }}</span>
+                      </div>
+                      <el-tag 
+                        :type="preferences.chainOfThoughtPreference ? 'success' : 'info'" 
+                        size="small"
+                        effect="plain"
+                      >
+                        {{ preferences.chainOfThoughtPreference ? $t('userInfo.enabled') : $t('userInfo.disabled') }}
+                      </el-tag>
+                    </div>
                   </div>
                 </div>
                 
@@ -596,12 +668,12 @@ const headerStyles = computed<CSSProperties>(() => {
   }
 }
 
-// 用户资料弹窗样式
-:deep(.user-profile-popover) {
-  .el-popper {
-    border-radius: 8px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-    border: 1px solid var(--o-border-color-light);
+// 用户资料弹窗样式（全局样式，因为popover被teleport到body下）
+:global(.user-profile-popover.el-popper) {
+  max-width: none !important;
+  
+  .el-popper__arrow {
+    display: block;
   }
 }
 
@@ -670,43 +742,134 @@ const headerStyles = computed<CSSProperties>(() => {
       font-size: 14px;
       font-weight: 500;
       color: var(--o-text-color-primary);
-      margin-bottom: 8px;
+      margin-bottom: 12px;
     }
     
-    .preference-item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 6px 0;
-      
-      .preference-label {
-        font-size: 13px;
-        color: var(--o-text-color-regular);
-      }
+    // 模型偏好 - 2列网格布局
+    .model-preferences-grid {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 6px;
+      margin-bottom: 8px;
+      width: 100%; // 确保网格容器占满整个宽度
       
-      .preference-value {
-        font-size: 13px;
-        color: var(--o-text-color-secondary);
-        max-width: 120px;
-        text-align: right;
-        word-break: break-all;
+      .model-pref-item {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        padding: 8px;
+        background-color: var(--o-fill-color-blank);
+        border: 1px solid var(--o-border-color-lighter);
+        border-radius: 6px;
+        transition: all 0.2s ease;
+        min-height: 56px;
+        min-width: 0; // 防止内容撑开卡片宽度
+        box-sizing: border-box; // 包含padding和border在宽度内
+        
+        &:hover {
+          border-color: var(--o-border-color-light);
+          background-color: var(--o-fill-color-light);
+        }
+        
+        // 占满整行的项（检索方法）
+        &--full {
+          grid-column: 1 / -1;
+          flex-direction: row;
+          align-items: center;
+          justify-content: space-between;
+          min-height: auto;
+          
+          .model-pref-header {
+            margin-bottom: 0;
+          }
+          
+          .search-method-tag {
+            margin-left: auto;
+            max-width: none; // 不限制检索方法tag的最大宽度
+          }
+        }
+        
+        .model-pref-header {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          min-width: 0; // 允许子元素收缩
+          
+          .preference-icon {
+            flex-shrink: 0;
+            color: var(--o-color-primary);
+          }
+          
+          .model-pref-label {
+            font-size: 11px;
+            color: var(--o-text-color-secondary);
+            font-weight: 500;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            min-width: 0; // 允许文本收缩
+          }
+        }
+        
+        .model-pref-value {
+          font-size: 12px;
+          color: var(--o-text-color-primary);
+          font-weight: 500;
+          padding-left: 16px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          cursor: help;
+        }
+        
+        .el-tag {
+          font-size: 11px;
+          font-weight: 500;
+        }
       }
+    }
+    
+    // 开关类偏好 - 2列网格布局
+    .toggle-preferences-grid {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 6px;
       
-      .el-tag {
-        font-size: 12px;
-        border-radius: 4px;
-        font-weight: 500;
+      .preference-toggle-item {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: space-between;
+        gap: 6px;
+        padding: 8px;
+        background-color: var(--o-fill-color-blank);
+        border: 1px solid var(--o-border-color-lighter);
+        border-radius: 6px;
+        transition: all 0.2s ease;
+        min-height: 56px;
         
-        &.el-tag--success {
-          background-color: var(--o-color-success-light-9);
-          border-color: var(--o-color-success-light-7);
-          color: var(--o-color-success);
+        &:hover {
+          border-color: var(--o-border-color-light);
+          background-color: var(--o-fill-color-light);
         }
         
-        &.el-tag--info {
-          background-color: var(--o-fill-color-light);
-          border-color: var(--o-border-color-light);
+        .toggle-label {
+          font-size: 11px;
           color: var(--o-text-color-regular);
+          font-weight: 500;
+          
+          span {
+            line-height: 1.3;
+          }
+        }
+        
+        .el-tag {
+          font-size: 10px;
+          font-weight: 500;
+          padding: 0 6px;
+          height: 18px;
+          line-height: 18px;
+          align-self: flex-start;
         }
       }
     }
diff --git a/src/views/settings/Model.vue b/src/views/settings/Model.vue
index 4a05da8a6874bc769f00ff5f132137c4824f4a07..180ef822c17fb2ad59cde726d55f592f9d9a21bb 100644
--- a/src/views/settings/Model.vue
+++ b/src/views/settings/Model.vue
@@ -22,16 +22,46 @@ interface Model {
   modelName: string;
   maxTokens: number;
   isEditable?: boolean;
-  type?: 'chat' | 'image' | 'video' | 'speech' | 'embedding' | 'reranker';
+  type?: string | string[]; // 支持单个类型或类型数组
+  provider?: string; // 模型提供商
 }
 
-const { t } = i18n.global;
+const { t, locale } = i18n.global;
 
 const { theme } = storeToRefs(useChangeThemeStore());
 
 // 用户偏好设置store
 const userPreferencesStore = useUserPreferencesStore();
 
+// 根据当前语言获取供应商显示名称
+const getProviderDisplayName = (provider: ModelProvider) => {
+  const currentLocale = locale.value;
+  if (currentLocale === 'zh' || currentLocale.startsWith('zh')) {
+    return provider.aliasZh || provider.provider;
+  }
+  return provider.aliasEn || provider.provider;
+};
+
+// 根据 provider 名称获取显示名称（用于分组标题）
+const getProviderGroupName = (providerName: string) => {
+  const provider = modelProviders.value.find(p => p.provider === providerName);
+  if (provider) {
+    return getProviderDisplayName(provider);
+  }
+  return providerName;
+};
+
+// 折叠状态管理 - 使用对象而不是Set来确保响应式
+const collapsedGroups = ref<Record<string, boolean>>({});
+
+const toggleGroup = (provider: string) => {
+  collapsedGroups.value[provider] = !collapsedGroups.value[provider];
+};
+
+const isGroupCollapsed = (provider: string) => {
+  return collapsedGroups.value[provider] === true;
+};
+
 const emptyImg = computed(() =>
   theme.value === 'light' ? lightNull : DarkNull,
 );
@@ -44,6 +74,29 @@ const embeddingOptions = ref<any[]>([]);
 
 const rerankerOptions = ref<any[]>([]);
 
+const functionCallOptions = ref<any[]>([]); // 新增函数调用模型选项
+
+// 按供应商分组的模型
+const modelsByProvider = computed(() => {
+  const grouped: Record<string, Model[]> = {};
+  
+  models.value.forEach(model => {
+    const provider = model.provider || t('settings.unknown_provider');
+    if (!grouped[provider]) {
+      grouped[provider] = [];
+    }
+    grouped[provider].push(model);
+  });
+  
+  // 返回排序后的分组数组
+  return Object.entries(grouped)
+    .sort(([providerA], [providerB]) => providerA.localeCompare(providerB, 'zh-CN'))
+    .map(([provider, models]) => ({
+      provider,
+      models
+    }));
+});
+
 // 用户偏好设置
 const userPreferences = ref<any>({});
 
@@ -68,7 +121,10 @@ function onAddModel(provider: ModelProvider) {
 async function queryModels() {
   const [, res] = await api.getUserModelList();
   if (res) {
-    models.value = res.result;
+    // 按模型名称字母序升序排列
+    models.value = res.result.sort((a, b) => {
+      return a.modelName.localeCompare(b.modelName, 'zh-CN');
+    });
   }
 }
 
@@ -120,6 +176,13 @@ async function queryRerankerOptions() {
   }
 }
 
+async function queryFunctionCallOptions() {
+  const [, res] = await api.getAddedModels('function_call');
+  if (res) {
+    functionCallOptions.value = res.result || [];
+  }
+}
+
 async function queryUserPreferences() {
   const [, res] = await api.getUserPreferences();
   if (res) {
@@ -232,6 +295,25 @@ async function handleSystemModelSettingsSave(settings: any) {
       }
     }
     
+    if (settings.functionCallModel) {
+      const model = functionCallOptions.value.find(m => m.llmId === settings.functionCallModel);
+      if (model) {
+        preferences.functionCallModelPreference = {
+          llmId: model.llmId,
+          icon: model.icon || '',
+          openaiBaseUrl: model.openaiBaseUrl || '',
+          openaiApiKey: model.openaiApiKey || '',
+          modelName: model.modelName || '',
+          maxTokens: model.maxTokens || 8192,
+          isEditable: model.isEditable
+        };
+      }
+    }
+    
+    if (settings.searchMethod) {
+      preferences.searchMethodPreference = settings.searchMethod;
+    }
+    
     // 思维链偏好总是包含，因为它有明确的boolean值
     preferences.chainOfThoughtPreference = settings.chainOfThought;
     
@@ -274,6 +356,18 @@ async function handleSystemModelSettingsSave(settings: any) {
         };
       }
       
+      if (preferences.functionCallModelPreference) {
+        localPreferences.functionCallModelPreference = {
+          llmId: preferences.functionCallModelPreference.llmId,
+          modelName: preferences.functionCallModelPreference.modelName,
+          icon: preferences.functionCallModelPreference.icon
+        };
+      }
+      
+      if (preferences.searchMethodPreference) {
+        localPreferences.searchMethodPreference = preferences.searchMethodPreference;
+      }
+      
       localPreferences.chainOfThoughtPreference = preferences.chainOfThoughtPreference;
       localPreferences.autoExecutePreference = preferences.autoExecutePreference;
       
@@ -350,6 +444,7 @@ onMounted(() => {
   queryModelProviders();
   queryEmbeddingOptions();
   queryRerankerOptions();
+  queryFunctionCallOptions();
   queryUserPreferences();
   
   // 添加全局点击监听器
@@ -405,6 +500,7 @@ onUnmounted(() => {
           :models="models"
           :embedding-options="embeddingOptions"
           :reranker-options="rerankerOptions"
+          :function-call-options="functionCallOptions"
           :user-preferences="userPreferences"
           @save="handleSystemModelSettingsSave"
           @cancel="handleSystemModelSettingsCancel"
@@ -412,31 +508,51 @@ onUnmounted(() => {
       </el-popover>
     </div>
     <div class="added-model" v-if="models.length">
-      <ModelCard
-        v-for="item in models"
-        :name="item.modelName"
-        :icon="item.icon"
-        :key="item.llmId"
-        :type="item.type || 'chat'"
-        size="small"
-      >
-        <template #headerRight>
-          <div class="added-model__operate">
-            <a
-              @click="onModelEdit(item.isEditable ? item : undefined)"
-              :class="{ disabled: !item.isEditable }"
-            >
-              {{ t('common.edit') }}
-            </a>
-            <a
-              @click="handleDelete(item.isEditable ? item.llmId : '')"
-              :class="{ disabled: !item.isEditable }"
+      <div v-for="group in modelsByProvider" :key="group.provider" class="provider-group">
+        <div class="provider-header" @click="toggleGroup(group.provider)">
+          <div class="provider-header-left">
+            <svg 
+              class="collapse-icon" 
+              :class="{ collapsed: isGroupCollapsed(group.provider) }"
+              width="14" 
+              height="14" 
+              viewBox="0 0 16 16" 
+              fill="currentColor"
             >
-              {{ t('common.delete') }}
-            </a>
+              <path d="M4.427 7.427l3.396 3.396a.25.25 0 00.354 0l3.396-3.396A.25.25 0 0011.396 7H4.604a.25.25 0 00-.177.427z"/>
+            </svg>
+            <span class="provider-name">{{ getProviderGroupName(group.provider) }}</span>
+            <span class="provider-count">{{ group.models.length }}</span>
           </div>
-        </template>
-      </ModelCard>
+        </div>
+        <div v-show="!isGroupCollapsed(group.provider)" class="provider-models">
+          <ModelCard
+            v-for="item in group.models"
+            :name="item.modelName"
+            :icon="item.icon"
+            :key="item.llmId"
+            :type="item.type || 'chat'"
+            size="small"
+          >
+            <template #headerRight>
+              <div class="added-model__operate">
+                <a
+                  @click="onModelEdit(item.isEditable ? item : undefined)"
+                  :class="{ disabled: !item.isEditable }"
+                >
+                  {{ t('common.edit') }}
+                </a>
+                <a
+                  @click="handleDelete(item.isEditable ? item.llmId : '')"
+                  :class="{ disabled: !item.isEditable }"
+                >
+                  {{ t('common.delete') }}
+                </a>
+              </div>
+            </template>
+          </ModelCard>
+        </div>
+      </div>
     </div>
     <ElEmpty v-else :image="lightNull" :description="t('common.null')" />
 
@@ -446,11 +562,21 @@ onUnmounted(() => {
     <div class="model-provider" v-if="modelProviders.length">
       <ModelCard
         v-for="item in modelProviders"
-        :name="item.provider"
+        :name="getProviderDisplayName(item)"
         :icon="item.icon"
         :description="item.description"
         :key="item.provider"
       >
+        <template #headerRight>
+          <el-tag 
+            v-if="item.type" 
+            :type="item.type === 'public' ? 'primary' : 'info'"
+            size="small"
+            effect="plain"
+          >
+            {{ item.type === 'public' ? t('settings.public_api') : t('settings.private_api') }}
+          </el-tag>
+        </template>
         <template #cardFooter>
           <div class="model-provider-footer">
             <a @click="onAddModel(item)">{{ t('common.add') }}</a>
@@ -476,6 +602,7 @@ onUnmounted(() => {
     justify-content: space-between;
     align-items: center;
     margin-bottom: 8px;
+    margin-top: 8px;
   }
 
   &-label {
@@ -521,12 +648,83 @@ onUnmounted(() => {
   }
 
   .added-model {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    align-content: flex-start;
-    gap: 16px;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
     min-height: 210px;
 
+    .provider-group {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+
+    .provider-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 8px 12px;
+      background: var(--o-bg-color-page);
+      border-radius: 4px;
+      font-size: 13px;
+      line-height: 18px;
+      font-weight: 600;
+      cursor: pointer;
+      user-select: none;
+      transition: background-color 0.2s ease;
+
+      &:hover {
+        background: var(--o-bg-color-overlay);
+      }
+      
+      &-left {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+      
+      .collapse-icon {
+        flex-shrink: 0;
+        color: var(--o-text-color-secondary);
+        transition: transform 0.2s ease;
+        
+        &.collapsed {
+          transform: rotate(-90deg);
+        }
+      }
+      
+      .provider-name {
+        color: var(--o-text-color-primary);
+      }
+      
+      .provider-count {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 20px;
+        height: 20px;
+        padding: 0 6px;
+        background: var(--o-color-primary-light-9);
+        color: var(--o-color-primary);
+        border-radius: 10px;
+        font-size: 12px;
+        font-weight: 500;
+      }
+    }
+
+    .provider-models {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      padding-left: 12px;
+    }
+
+    :deep(.model-card) {
+      width: 100%;
+      height: auto;
+      min-height: 64px;
+    }
+
     &__operate {
       display: flex;
       gap: 8px;
diff --git a/src/views/settings/components/AddModel.vue b/src/views/settings/components/AddModel.vue
index dc1820c9cbea634f6778ebde029945cb16cd78f7..6364ea2262c9e16e6b50d848b06b28d5cb24ca67 100644
--- a/src/views/settings/components/AddModel.vue
+++ b/src/views/settings/components/AddModel.vue
@@ -14,7 +14,7 @@ interface From {
   model: string;
   apiKey: string;
   maxTokens: string;
-  type: 'chat' | 'image' | 'video' | 'speech' | 'embedding' | 'reranker';
+  type: string[]; // 改为数组支持多选
 }
 
 export interface ModelProvider {
@@ -22,6 +22,9 @@ export interface ModelProvider {
   icon: string;
   url: string;
   description: string;
+  aliasZh?: string;
+  aliasEn?: string;
+  type?: string;
 }
 
 const props = defineProps<{
@@ -34,7 +37,7 @@ const props = defineProps<{
     openaiApiKey: string;
     modelName: string;
     maxTokens: number;
-    type?: 'chat' | 'image' | 'video' | 'speech' | 'embedding' | 'reranker';
+    type?: string | string[]; // 支持单个类型或类型数组
   };
   title?: string;
   provider?: ModelProvider;
@@ -49,7 +52,7 @@ const form = ref<From>({
   model: '',
   apiKey: '',
   maxTokens: '',
-  type: 'chat',
+  type: [], // 默认为空数组
 });
 
 const formRef = ref<FormInstance>();
@@ -129,7 +132,7 @@ watch(
           model: modelName,
           apiKey: openaiApiKey,
           maxTokens: String(maxTokens),
-          type: type || 'chat',
+          type: type ? (Array.isArray(type) ? type : [type]) : [],
         };
       }
       if (props.provider) {
@@ -172,6 +175,7 @@ const disabledUrl = computed(() => {
         <el-form-item :label="t('settings.model_type')" prop="type">
           <el-select
             v-model="form.type"
+            multiple
             :placeholder="t('settings.placeHolder.model_type')"
             style="width: 100%"
           >
@@ -179,6 +183,18 @@ const disabledUrl = computed(() => {
               :label="t('model.type.chat')"
               value="chat"
             />
+            <el-option
+              :label="t('model.type.function_call')"
+              value="function_call"
+            />
+            <el-option
+              :label="t('model.type.embedding')"
+              value="embedding"
+            />
+            <el-option
+              :label="t('model.type.reranker')"
+              value="reranker"
+            />
             <el-option
               :label="t('model.type.image')"
               value="image"
@@ -191,14 +207,6 @@ const disabledUrl = computed(() => {
               :label="t('model.type.speech')"
               value="speech"
             />
-            <el-option
-              :label="t('model.type.embedding')"
-              value="embedding"
-            />
-            <el-option
-              :label="t('model.type.reranker')"
-              value="reranker"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="t('settings.select_model')" prop="model">
diff --git a/src/views/settings/components/ModelCard.vue b/src/views/settings/components/ModelCard.vue
index dcafb52f5c7da5b93005258655c3d4f7b5292abb..c2aebc2ba12de27c8d98585f3af750d1bc8c1639 100644
--- a/src/views/settings/components/ModelCard.vue
+++ b/src/views/settings/components/ModelCard.vue
@@ -13,7 +13,7 @@ interface ModelCard {
    */
   size?: 'small' | 'medium' | 'large';
   description?: string;
-  type?: 'chat' | 'image' | 'video' | 'speech' | 'embedding' | 'reranker';
+  type?: string | string[]; // 支持单个类型或类型数组
 }
 
 const props = withDefaults(defineProps<ModelCard>(), {
@@ -47,7 +47,8 @@ const getTypeColor = (type?: string) => {
     'video': '#E6A23C',
     'speech': '#F56C6C',
     'embedding': '#909399',
-    'reranker': '#9B59B6'
+    'reranker': '#9B59B6',
+    'function_call': '#8B5CF6'
   };
   return colorMap[type as keyof typeof colorMap] || '#909399';
 };
@@ -60,11 +61,18 @@ const getTypeLabel = (type?: string) => {
     'video': t('model.type.video'), 
     'speech': t('model.type.speech'),
     'embedding': t('model.type.embedding'),
-    'reranker': t('model.type.reranker')
+    'reranker': t('model.type.reranker'),
+    'function_call': t('model.type.function_call')
   };
   return labelMap[type as keyof typeof labelMap] || type;
 };
 
+// 将类型转换为数组
+const typeList = computed(() => {
+  if (!props.type) return [];
+  return Array.isArray(props.type) ? props.type : [props.type];
+});
+
 onMounted(() => {
   nextTick(() => {
     checkNameOverflow();
@@ -82,13 +90,14 @@ onMounted(() => {
           <span class="name" ref="nameRef">{{ name }}</span>
         </el-tooltip>
         <el-tag 
-          v-if="type" 
-          :color="getTypeColor(type)" 
+          v-for="typeItem in typeList"
+          :key="typeItem"
+          :color="getTypeColor(typeItem)" 
           size="small" 
           class="type-tag"
           effect="light"
         >
-          {{ getTypeLabel(type) }}
+          {{ getTypeLabel(typeItem) }}
         </el-tag>
       </div>
       <div>
diff --git a/src/views/settings/components/SystemModelSettings.vue b/src/views/settings/components/SystemModelSettings.vue
index b7a812b118c9b7520031516f5d806df1fba7dabc..60a11a58b677e6ff895ea141df8be66706f30d8f 100644
--- a/src/views/settings/components/SystemModelSettings.vue
+++ b/src/views/settings/components/SystemModelSettings.vue
@@ -2,6 +2,7 @@
 import { ref, computed, watch, nextTick, onMounted } from 'vue';
 import { ElPopover, ElSelect, ElOption, ElSwitch } from 'element-plus';
 import i18n from '@/i18n';
+import { api } from '@/apis';
 
 interface ModelOption {
   llmId: string;
@@ -15,6 +16,7 @@ const props = defineProps<{
   models?: ModelOption[];
   embeddingOptions?: ModelOption[];
   rerankerOptions?: ModelOption[];
+  functionCallOptions?: ModelOption[]; // 新增函数调用模型选项
   initialSettings?: Partial<SystemModelSettings>;
   userPreferences?: any;
 }>();
@@ -29,12 +31,17 @@ interface SystemModelSettings {
   reasoningModel: string;
   embeddingModel: string;
   rerankModel: string;
+  functionCallModel: string; // 新增函数调用模型
+  searchMethod: string; // 新增检索方法
   chainOfThought: boolean;
   autoExecute: boolean;
 }
 
 const { t } = i18n.global;
 
+// 检索方法选项
+const searchMethodOptions = ref<string[]>([]);
+
 // 使用从父组件传递的模型数据
 const reasoningModels = computed(() => props.models || []);
 
@@ -42,6 +49,8 @@ const embeddingModels = computed(() => props.embeddingOptions || []);
 
 const rerankModels = computed(() => props.rerankerOptions || []);
 
+const functionCallModels = computed(() => props.functionCallOptions || []); // 函数调用模型列表
+
 // 从用户偏好设置中获取默认值的函数
 const getDefaultModelId = (preferenceKey: string, optionsArray: any[]): string => {
   const preference = props.userPreferences?.[preferenceKey];
@@ -69,6 +78,8 @@ const currentSettings = ref<SystemModelSettings>({
   reasoningModel: props.initialSettings?.reasoningModel || getDefaultModelId('reasoningModelPreference', props.models || []),
   embeddingModel: props.initialSettings?.embeddingModel || getDefaultModelId('embeddingModelPreference', props.embeddingOptions || []),
   rerankModel: props.initialSettings?.rerankModel || getDefaultModelId('rerankerPreference', props.rerankerOptions || []),
+  functionCallModel: props.initialSettings?.functionCallModel || getDefaultModelId('functionCallModelPreference', props.functionCallOptions || []),
+  searchMethod: props.initialSettings?.searchMethod || props.userPreferences?.searchMethodPreference || '',
   chainOfThought: props.initialSettings?.chainOfThought ?? props.userPreferences?.chainOfThoughtPreference ?? true,
   autoExecute: props.initialSettings?.autoExecute ?? props.userPreferences?.autoExecutePreference ?? false,
 });
@@ -132,6 +143,20 @@ const updateDefaultSelections = () => {
       }
     }
     
+    // 基于用户偏好更新 function_call 模型选择
+    if (functionCallModels.value.length > 0) {
+      const preferredId = getDefaultModelId('functionCallModelPreference', functionCallModels.value);
+      if (preferredId) {
+        currentSettings.value.functionCallModel = preferredId;
+      } else {
+        const currentValue = currentSettings.value.functionCallModel;
+        const isValidSelection = currentValue && functionCallModels.value.some(model => model.llmId === currentValue);
+        if (!isValidSelection) {
+          currentSettings.value.functionCallModel = '';
+        }
+      }
+    }
+    
     // 更新思维链偏好
     if (props.userPreferences?.chainOfThoughtPreference !== undefined) {
       currentSettings.value.chainOfThought = props.userPreferences.chainOfThoughtPreference;
@@ -141,6 +166,11 @@ const updateDefaultSelections = () => {
     if (props.userPreferences?.autoExecutePreference !== undefined) {
       currentSettings.value.autoExecute = props.userPreferences.autoExecutePreference;
     }
+    
+    // 更新检索方法偏好
+    if (props.userPreferences?.searchMethodPreference) {
+      currentSettings.value.searchMethod = props.userPreferences.searchMethodPreference;
+    }
   });
 };
 
@@ -160,16 +190,28 @@ const selectedRerankModelIcon = computed(() => {
   return selected?.icon || '';
 });
 
+const selectedFunctionCallModelIcon = computed(() => {
+  const selected = functionCallModels.value.find(model => model.llmId === currentSettings.value.functionCallModel);
+  return selected?.icon || '';
+});
+
 
 // 监听模型选项和用户偏好设置变化
-watch([reasoningModels, embeddingModels, rerankModels, () => props.userPreferences], updateDefaultSelections, { 
+watch([reasoningModels, embeddingModels, rerankModels, functionCallModels, () => props.userPreferences], updateDefaultSelections, { 
   immediate: true,
   deep: true 
 });
 
 // 组件挂载后也执行一次选择更新，确保选择行为正确
-onMounted(() => {
+onMounted(async () => {
   updateDefaultSelections();
+  
+  // 加载检索方法列表
+  const [err, res] = await api.getSearchMethods();
+  if (!err && res?.result) {
+    // result 本身就是数组，不需要 .methods
+    searchMethodOptions.value = Array.isArray(res.result) ? res.result : (res.result.methods || []);
+  }
 });
 </script>
 
@@ -320,6 +362,78 @@ onMounted(() => {
         </el-select>
       </div>
 
+      <!-- 函数调用模型 -->
+      <div class="setting-item">
+        <div class="setting-label">
+          <span>{{ t('settings.function_call_model_preference') }}</span>
+          <el-icon class="help-icon">
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
+              <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+              <path d="M5.255 5.786a.237.237 0 0 0 .241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/>
+            </svg>
+          </el-icon>
+        </div>
+        <el-select 
+          v-model="currentSettings.functionCallModel" 
+          class="setting-select"
+          popper-class="system-model-select-dropdown"
+          :teleported="false"
+        >
+          <template #prefix>
+            <div class="selected-model-icon">
+              <img v-if="selectedFunctionCallModelIcon" :src="selectedFunctionCallModelIcon" alt="model icon" class="model-icon-img" />
+              <svg v-else width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                <circle cx="12" cy="12" r="3" fill="#8B5CF6"/>
+              </svg>
+            </div>
+          </template>
+          <el-option
+            label="请选择函数调用模型"
+            value=""
+          />
+          <el-option
+            v-for="model in functionCallModels"
+            :key="model.llmId"
+            :label="model.modelName"
+            :value="model.llmId"
+          >
+            <div class="model-option">
+              <div class="model-icon">
+                <img v-if="model.icon" :src="model.icon" :alt="model.modelName" class="model-icon-img" />
+                <svg v-else width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                  <circle cx="12" cy="12" r="3" fill="#8B5CF6"/>
+                </svg>
+              </div>
+              <span>{{ model.modelName }}</span>
+            </div>
+          </el-option>
+        </el-select>
+      </div>
+
+      <!-- 检索方法 -->
+      <div class="setting-item">
+        <div class="setting-label">
+          <span>{{ t('settings.search_method_preference') }}</span>
+        </div>
+        <el-select 
+          v-model="currentSettings.searchMethod" 
+          class="setting-select"
+          popper-class="system-model-select-dropdown"
+          :teleported="false"
+        >
+          <el-option
+            label="请选择检索方法"
+            value=""
+          />
+          <el-option
+            v-for="method in searchMethodOptions"
+            :key="method"
+            :label="method"
+            :value="method"
+          />
+        </el-select>
+      </div>
+
       <!-- 思维链偏好 -->
       <div class="setting-item">
         <div class="setting-label">