diff --git a/ui/AGENTS.md b/ui/AGENTS.md
index 59e91105d36..ae80a85e2c3 100644
--- a/ui/AGENTS.md
+++ b/ui/AGENTS.md
@@ -209,6 +209,8 @@ Keep these behaviors:
 ## Frontend Implementation Notes
 
 - Prefer existing project structure and naming.
+- Do not modify shared components under `src/components/` without an explicit user instruction to
+  change those components. Follow the modification boundary in `src/components/COMPONENT_README.md`.
 - Do not write `aria-label` attributes in project source. Add concise Chinese HTML comments before
   buttons to describe their purpose, following `src/components/COMPONENT_README.md`.
 - Before changing existing behavior, trace the affected flow and dependent requirements, including
diff --git a/ui/src/components/COMPONENT_README.md b/ui/src/components/COMPONENT_README.md
index 76796bf331f..dd7e2d2b8b2 100644
--- a/ui/src/components/COMPONENT_README.md
+++ b/ui/src/components/COMPONENT_README.md
@@ -6,6 +6,15 @@
 
 ## 选型与目录
 
+### 公共组件修改边界
+
+没有用户明确要求修改公共组件的指令，不允许修改 `src/components/` 下公共组件的内容，
+包括 `global/`、`business/` 及其他共享组件目录中的模板、逻辑、样式和接口。
+“参考某组件”“使用某组件”或修改业务页面，不视为授权修改该公共组件。
+实现前先使用已有 Props、事件和插槽，在所属 View 或功能目录中完成组合与适配。
+确实需要修改公共组件时，先说明具体组件、必要性及影响范围，取得明确指令后再修改。
+此约束纳入实现前检查和提交前 diff 检查；已有其他工作留下的公共组件改动不擅自覆盖或回退。
+
 依次检查全局 Mk 组件、业务组件、手动导入的共享 UI，最后使用 Element Plus；已有同类封装时
 直接复用，例如 `MkDialog`、`MkDrawer`、`MkDropdown`、`MkIcon`、`MkTable`。先用现有 Props、
 事件、插槽和样式适配，无法满足必要行为时再新增组件；无明确需求不引入新 UI 库。
@@ -71,7 +80,6 @@ Admin、Chat 入口调用 `configureMarkdownEditor()` 配置本地高亮、KaTeX
 ### MkCollapse
 
 `v-model:expanded` 可控制展开状态；未绑定时沿用 `defaultExpanded` 的内部状态。
-`destroyOnCollapse` 默认 `true`，设为 `false` 时折叠只隐藏内容，适用于需要保留参数表单及校验的场景。
 
 标题折叠区，`title` 或 `label` 插槽提供标题，默认插槽提供内容。
 `defaultExpanded` 默认 `true`，仅设置初始状态；点击标题内部切换，当前不提供展开状态事件。
diff --git a/ui/src/components/global/mk-collapse/index.vue b/ui/src/components/global/mk-collapse/index.vue
index fe5f92d7df0..01438c59945 100644
--- a/ui/src/components/global/mk-collapse/index.vue
+++ b/ui/src/components/global/mk-collapse/index.vue
@@ -7,13 +7,12 @@ defineOptions({ name: 'MkCollapse' })
 const props = withDefaults(
   defineProps<{
     defaultExpanded?: boolean
-    destroyOnCollapse?: boolean
     indicatorPosition?: 'after' | 'before'
     title?: string
     triggerClass?: HTMLAttributes['class']
     triggerStyle?: HTMLAttributes['style']
   }>(),
-  { defaultExpanded: true, destroyOnCollapse: true, indicatorPosition: 'before' },
+  { defaultExpanded: true, indicatorPosition: 'before' },
 )
 
 defineSlots<{ default?: () => unknown; label?: () => unknown }>()
@@ -54,7 +53,7 @@ const expanded = computed({
       </div>
     </div>
     <el-collapse-transition>
-      <div v-if="!destroyOnCollapse || expanded" v-show="expanded">
+      <div v-show="expanded">
         <slot />
       </div>
     </el-collapse-transition>
diff --git a/ui/src/views/VIEW_README.md b/ui/src/views/VIEW_README.md
index cdf21796997..17bb80802a9 100644
--- a/ui/src/views/VIEW_README.md
+++ b/ui/src/views/VIEW_README.md
@@ -405,13 +405,16 @@ Workspace 与 System 授权均使用该工作空间 ID，不读取路由工作
 任务选择复用 `SelectApplicationDialog` 与 `SelectToolDialog`，工具限定自定义和工作流类型。
 `trigger/trigger-form/request-parameters/RequestParameters.vue` 用 `MkFormList` 展示和删除事件请求参数，
 同目录 `RequestParameterDialog.vue` 负责新增、编辑及参数名必填与重名校验；确认后回写，取消保留原值。
-`trigger/trigger-form/task-execution/TaskParameters.vue` 展示任务输入及事件参数引用，
-`trigger/trigger-form/task-execution/task-parameters.ts` 从资源输入定义生成字段，只补全缺失值，不覆盖已有配置。
+`trigger/trigger-form/task-execution/parameters/` 内 `ApplicationParameter.vue` 与 `ToolParameter.vue`
+分别生成智能体和工具字段，共用 `ParameterForm.vue` 的输入、事件引用、初始化和校验；
+`types.ts` 仅维护跨组件使用的字段描述类型，不再单独拆分每个组件专用的参数工具文件。
+初始化只补全缺失值，不覆盖已有自定义配置；切回定时或移除全部事件参数时，引用参数恢复自定义默认值。
+智能体包含 Question、启用的文件类型、用户输入和接口参数；工具包含普通输入和工作流用户输入。
 抽屉采用类型卡片选择，选中卡片内显示配置，触发周期与 Cron 通过切换按钮切换；新建时需选择周期。
-`trigger/trigger-form/task-execution/TriggerTaskGroups.vue` 维护任务分组、展开收起、移除及参数表单，
+`trigger/trigger-form/task-execution/TaskExecution.vue` 维护任务分组、展开收起、移除及参数表单，
 组件内管理智能体与工具选择弹窗、资源详情加载和任务参数保留，通过 `v-model` 回写任务、
 `v-model:loading` 同步加载状态、`change` 通知清理校验，并提供 `validate`、`expandAll`、`reset`。
-任务 UI 沿用 AI Chat 技能区的 `MkCollapse` 分组和紧凑资源卡片，参数区折叠后保留挂载以支持完整校验。
+任务 UI 沿用 AI Chat 技能区的 `MkCollapse` 分组和紧凑资源卡片，保存前先展开全部任务，待参数表单挂载后统一校验。
 抽屉负责触发器详情查询与保存，将详情资源快照通过 `initialResources` 传入任务组件；
 任务组件新增资源后展开任务，抽屉保存时调用分组组件校验全部参数。
 保存时校验所有任务，包括折叠的任务；接口失败保持抽屉打开。
diff --git a/ui/src/views/system/chat/users/UserFromDrawer.vue b/ui/src/views/system/chat/users/UserFromDrawer.vue
index d8974230f1c..8ddf01bf6a6 100644
--- a/ui/src/views/system/chat/users/UserFromDrawer.vue
+++ b/ui/src/views/system/chat/users/UserFromDrawer.vue
@@ -148,7 +148,7 @@ defineExpose({ open })
           <el-input v-model="userForm.password" readonly>
             <template #suffix>
               <el-button text @click="copyText(userForm.password)" class="-mr-1">
-                <mk-icon name="icon_copy_outlined" class="text-N600"></mk-icon>
+                <MkIcon name="icon_copy_outlined" class="text-N600" />
               </el-button>
             </template>
           </el-input>
diff --git a/ui/src/views/system/chat/users/UserListView.vue b/ui/src/views/system/chat/users/UserListView.vue
index 952610f1ba6..5fff2e7f573 100644
--- a/ui/src/views/system/chat/users/UserListView.vue
+++ b/ui/src/views/system/chat/users/UserListView.vue
@@ -215,7 +215,7 @@ onMounted(() => loadChatUsers())
                 <!-- 编辑 -->
                 <el-tooltip content="编辑" placement="top">
                   <el-button type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
-                    <mk-icon name="icon_edit_outlined"></mk-icon>
+                    <MkIcon name="icon_edit_outlined" />
                   </el-button>
                 </el-tooltip>
                 <!-- 修改用户密码 -->
diff --git a/ui/src/views/system/identity/users/UserFromDrawer.vue b/ui/src/views/system/identity/users/UserFromDrawer.vue
index 6b230672b04..b349cffba61 100644
--- a/ui/src/views/system/identity/users/UserFromDrawer.vue
+++ b/ui/src/views/system/identity/users/UserFromDrawer.vue
@@ -211,7 +211,7 @@ defineExpose({ open })
           <el-input v-model="userForm.password" readonly>
             <template #suffix>
               <el-button text @click="copyText(userForm.password)" class="-mr-1">
-                <mk-icon name="icon_copy_outlined" class="text-N600"></mk-icon>
+                <MkIcon name="icon_copy_outlined" class="text-N600" />
               </el-button>
             </template>
           </el-input>
diff --git a/ui/src/views/system/identity/users/UserListView.vue b/ui/src/views/system/identity/users/UserListView.vue
index a1d634a7ca8..a4571287652 100644
--- a/ui/src/views/system/identity/users/UserListView.vue
+++ b/ui/src/views/system/identity/users/UserListView.vue
@@ -216,7 +216,7 @@ onMounted(() => loadSystemUsers())
                 <!-- 编辑 -->
                 <el-tooltip content="编辑" placement="top">
                   <el-button type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
-                    <mk-icon name="icon_edit_outlined"></mk-icon>
+                    <MkIcon name="icon_edit_outlined" />
                   </el-button>
                 </el-tooltip>
                 <!-- 修改用户密码 -->
@@ -224,7 +224,7 @@ onMounted(() => loadSystemUsers())
                 <!-- 删除 -->
                 <el-tooltip content="删除" placement="top">
                   <el-button type="primary" text @click.stop="deleteUser(row)">
-                    <mk-icon name="icon_delete-trash_outlined"></mk-icon>
+                    <MkIcon name="icon_delete-trash_outlined" />
                   </el-button>
                 </el-tooltip>
               </div>
diff --git a/ui/src/views/tool/tool-form/component/init-field/InitFieldTable.vue b/ui/src/views/tool/tool-form/component/init-field/InitFieldTable.vue
index 5ccbc074134..7198a52892f 100644
--- a/ui/src/views/tool/tool-form/component/init-field/InitFieldTable.vue
+++ b/ui/src/views/tool/tool-form/component/init-field/InitFieldTable.vue
@@ -40,9 +40,8 @@ function getTypeLabel(inputType: string) {
   <section>
     <div class="mb-4 flex-between">
       <h4 class="mk-title-decoration">启动参数</h4>
-      <el-button link type="primary" @click="handleOpenInitField()">
+      <el-button text type="primary" @click="handleOpenInitField()">
         <MkIcon name="icon_add_outlined" />
-        <span>添加</span>
       </el-button>
     </div>
     <MkTable :data="initFields" size="small">
diff --git a/ui/src/views/tool/tool-form/component/input-field/InputFieldTable.vue b/ui/src/views/tool/tool-form/component/input-field/InputFieldTable.vue
index 97df8ab2543..3b644c251d7 100644
--- a/ui/src/views/tool/tool-form/component/input-field/InputFieldTable.vue
+++ b/ui/src/views/tool/tool-form/component/input-field/InputFieldTable.vue
@@ -35,9 +35,8 @@ function handleDeleteInputField(index: number) {
         <h4 class="mk-title-decoration">输入参数</h4>
         <span class="text-N600">使用工具时显示</span>
       </div>
-      <el-button link type="primary" @click="handleOpenInputField()">
+      <el-button text type="primary" @click="handleOpenInputField()">
         <MkIcon name="icon_add_outlined" />
-        <span>添加</span>
       </el-button>
     </div>
     <MkTable :data="inputFields" size="small">
diff --git a/ui/src/views/trigger/TriggerView.vue b/ui/src/views/trigger/TriggerView.vue
index 571c628bb1d..28882d72c48 100644
--- a/ui/src/views/trigger/TriggerView.vue
+++ b/ui/src/views/trigger/TriggerView.vue
@@ -204,14 +204,14 @@ onMounted(() => loadTriggers())
                 <!-- 编辑当前触发器 -->
                 <el-tooltip content="编辑" placement="top">
                   <el-button type="primary" text @click.stop="handleOpenTriggerDrawer(row)">
-                    <mk-icon name="icon_edit_outlined"></mk-icon>
+                    <MkIcon name="icon_edit_outlined" />
                   </el-button>
                 </el-tooltip>
                 <!-- 删除当前触发器 -->
 
                 <el-tooltip content="删除" placement="top">
                   <el-button type="primary" text @click.stop="handleDeleteTrigger(row)">
-                    <mk-icon name="icon_delete-trash_outlined"></mk-icon>
+                    <MkIcon name="icon_delete-trash_outlined" />
                   </el-button>
                 </el-tooltip>
               </div>
diff --git a/ui/src/views/trigger/trigger-form/TriggerFormDrawer.vue b/ui/src/views/trigger/trigger-form/TriggerFormDrawer.vue
index f88da2b6ece..49783d13a1e 100644
--- a/ui/src/views/trigger/trigger-form/TriggerFormDrawer.vue
+++ b/ui/src/views/trigger/trigger-form/TriggerFormDrawer.vue
@@ -7,7 +7,7 @@ import TriggerApi from '@/api/admin/workspace/trigger/trigger'
 import { ADMIN_API_BASE_PATH } from '@/api/constants'
 import { RESOURCE_TYPE, TRIGGER_TYPE, TRIGGER_SCHEDULE_TYPE as SCHEDULE, TRIGGER_INTERVAL_UNIT as INTERVAL } from '@/api/enums'
 import type { ApplicationDetail, ToolItem, TriggerPayload, TriggerSetting } from '@/api/types'
-import TriggerTaskGroups from './task-execution/TriggerTaskGroups.vue'
+import TaskExecution from './task-execution/TaskExecution.vue'
 import RequestParameters from './request-parameters/RequestParameters.vue'
 import { copyText } from '@/utils/clipboard'
 import { MsgSuccess } from '@/utils/message'
@@ -21,7 +21,7 @@ const detailFailed = ref(false)
 const editingId = ref<string>()
 const formRef = ref<FormInstance>()
 const presetScheduleType = ref<TriggerSetting['schedule_type']>()
-const taskGroupsRef = ref<InstanceType<typeof TriggerTaskGroups>>()
+const taskExecutionRef = ref<InstanceType<typeof TaskExecution>>()
 const resources = ref<Record<string, Partial<ApplicationDetail & ToolItem>>>({})
 
 // HTTP 部署中 randomUUID 可能不可用，使用浏览器安全随机数生成 UUID。
@@ -184,10 +184,9 @@ function handleSave() {
   form.value.name = form.value.name.trim()
   saving.value = true
   return nextTick()
-    .then(() => Promise.all([formRef.value?.validate().catch(() => false), taskGroupsRef.value?.validate()]))
+    .then(() => Promise.all([formRef.value?.validate().catch(() => false), taskExecutionRef.value?.validate()]))
     .then((validations) => {
       if (validations.some((valid) => !valid)) {
-        taskGroupsRef.value?.expandAll()
         return
       }
       const payload = cloneDeep(form.value)
@@ -226,7 +225,7 @@ function resetData() {
   saving.value = false
   detailFailed.value = false
   resources.value = {}
-  taskGroupsRef.value?.reset()
+  taskExecutionRef.value?.reset()
   presetScheduleType.value = undefined
   formRef.value?.clearValidate()
 }
@@ -293,7 +292,7 @@ defineExpose({ open })
                       <el-input v-model="eventUrl" readonly>
                         <template #suffix>
                           <el-button text @click="copyText(eventUrl)" class="-mr-1">
-                            <mk-icon name="icon_copy_outlined" class="text-N600"></mk-icon>
+                            <MkIcon name="icon_copy_outlined" class="text-N600" />
                           </el-button>
                         </template>
                       </el-input>
@@ -303,16 +302,16 @@ defineExpose({ open })
                       <el-input v-model="form.trigger_setting.token" readonly>
                         <template #suffix>
                           <el-button text @click="copyText(form.trigger_setting.token)">
-                            <mk-icon name="icon_copy_outlined" class="text-N600"></mk-icon>
+                            <MkIcon name="icon_copy_outlined" class="text-N600" />
                           </el-button>
                           <!-- 刷新Token -->
                           <el-button text @click="handleRefreshToken" class="-mr-1">
-                            <mk-icon name="icon_refresh_outlined" class="text-N600"></mk-icon>
+                            <MkIcon name="icon_refresh_outlined" class="text-N600" />
                           </el-button>
                         </template>
                       </el-input>
                       <!-- 请求参数 -->
-                      <RequestParameters v-model="form.trigger_setting.body" />
+                      <!-- <RequestParameters v-model="form.trigger_setting.body" /> -->
                     </template>
                   </div>
                 </el-form-item>
@@ -323,12 +322,11 @@ defineExpose({ open })
         <!-- 任务执行 -->
         <el-form-item label="任务执行" prop="trigger_task">
           <div class="mk-gray-card w-full p-4! rounded-xl!">
-            <TriggerTaskGroups
-              ref="taskGroupsRef"
+            <TaskExecution
+              ref="taskExecutionRef"
               v-model="form.trigger_task"
               :initial-resources="resources"
               v-model:loading="loading"
-              :active="visible"
               :trigger-type="form.trigger_type"
               :body="form.trigger_setting.body ?? []"
               :disabled="saving || loading"
diff --git a/ui/src/views/trigger/trigger-form/request-parameters/RequestParameters.vue b/ui/src/views/trigger/trigger-form/request-parameters/RequestParameters.vue
index d85b851aaba..a103ceb7668 100644
--- a/ui/src/views/trigger/trigger-form/request-parameters/RequestParameters.vue
+++ b/ui/src/views/trigger/trigger-form/request-parameters/RequestParameters.vue
@@ -29,7 +29,9 @@ function saveField(field: TriggerBodyField, index?: number) {
     <div class="flex-between mt-4 mb-2">
       <h6>请求参数</h6>
       <!-- 添加请求参数 -->
-      <el-button link type="primary" @click="dialogRef?.open()">添加参数</el-button>
+      <el-button text type="primary" @click="dialogRef?.open()">
+        <MkIcon name="icon_add_outlined" />
+      </el-button>
     </div>
     <MkFormList v-model="fields" :default-item="defaultField" :min-rows="0" :first-row-has-label="false" :show-add-button="false">
       <template #default="{ item, index }">
diff --git a/ui/src/views/trigger/trigger-form/task-execution/TriggerTaskGroups.vue b/ui/src/views/trigger/trigger-form/task-execution/TaskExecution.vue
similarity index 59%
rename from ui/src/views/trigger/trigger-form/task-execution/TriggerTaskGroups.vue
rename to ui/src/views/trigger/trigger-form/task-execution/TaskExecution.vue
index c8b81b9ec0a..48237de1366 100644
--- a/ui/src/views/trigger/trigger-form/task-execution/TriggerTaskGroups.vue
+++ b/ui/src/views/trigger/trigger-form/task-execution/TaskExecution.vue
@@ -2,7 +2,8 @@
 import { computed, nextTick, ref } from 'vue'
 import { RESOURCE_TYPE, TOOL_TYPE } from '@/api/enums'
 import type { ApplicationDetail, ToolItem, TriggerBodyField, TriggerTaskPayload, TriggerTaskSource, TriggerType } from '@/api/types'
-import TaskParameters from './TaskParameters.vue'
+import ApplicationParameter from './parameters/ApplicationParameter.vue'
+import ToolParameter from './parameters/ToolParameter.vue'
 import ApplicationApi from '@/api/admin/workspace/application/application'
 import ToolApi from '@/api/admin/workspace/tool/tool'
 import WorkflowApi from '@/api/admin/workspace/tool/workflow'
@@ -11,7 +12,6 @@ import SelectToolDialog from '@/components/business/select-tool-dialog/index.vue
 
 const props = defineProps<{
   initialResources: Record<string, Partial<ApplicationDetail & ToolItem>>
-  active: boolean
   triggerType: TriggerType
   body: TriggerBodyField[]
   disabled: boolean
@@ -25,7 +25,7 @@ const loadedResources = ref<Record<string, Partial<ApplicationDetail & ToolItem>
 const resources = computed(() => ({ ...props.initialResources, ...loadedResources.value }))
 const expandedTaskGroups = ref<TriggerTaskSource[]>([RESOURCE_TYPE.APPLICATION, RESOURCE_TYPE.TOOL])
 const expandedTaskKeys = ref<string[]>([])
-const parameterRefs = ref<InstanceType<typeof TaskParameters>[]>([])
+const parameterRefs = ref<(InstanceType<typeof ApplicationParameter> | InstanceType<typeof ToolParameter>)[]>([])
 const taskKey = (task: TriggerTaskPayload) => `${task.source_type}:${task.source_id}`
 const taskGroups = computed(() =>
   [
@@ -48,7 +48,7 @@ function handleOpenToolDialog() {
   )
 }
 function handleSelectResources(source: TriggerTaskSource, selected: { id: string }[]) {
-  if (props.disabled || !props.active) return
+  if (props.disabled) return
   const existingTasks = new Map(tasks.value.filter((task) => task.source_type === source).map((task) => [task.source_id, task]))
   loading.value = true
   // 先完整加载新增资源，任一请求失败时保留原来的关联任务。
@@ -66,7 +66,6 @@ function handleSelectResources(source: TriggerTaskSource, selected: { id: string
     }),
   )
     .then((selectedResources) => {
-      if (!props.active) return
       selectedResources.forEach(({ id, resource }) => {
         loadedResources.value[`${source}:${id}`] = resource
       })
@@ -74,7 +73,6 @@ function handleSelectResources(source: TriggerTaskSource, selected: { id: string
         ...tasks.value.filter((task) => task.source_type !== source),
         ...selectedResources.map(({ id }) => existingTasks.get(id) ?? { source_type: source, source_id: id, parameter: {} }),
       ]
-      void nextTick(expandAll)
       emit('change')
     })
     .finally(() => {
@@ -87,111 +85,99 @@ function handleOpenTaskDialog(type: TriggerTaskSource) {
   else handleOpenToolDialog()
 }
 
-function handleToggleTaskGroup(type: TriggerTaskSource) {
-  if (props.disabled) return
-  expandedTaskGroups.value = expandedTaskGroups.value.includes(type)
-    ? expandedTaskGroups.value.filter((source) => source !== type)
-    : [...expandedTaskGroups.value, type]
-}
-function handleToggleTask(key: string) {
-  if (props.disabled) return
-  expandedTaskKeys.value = expandedTaskKeys.value.includes(key)
-    ? expandedTaskKeys.value.filter((taskKey) => taskKey !== key)
-    : [...expandedTaskKeys.value, key]
-}
 function handleRemoveTask(task: TriggerTaskPayload) {
   if (props.disabled) return
   tasks.value = tasks.value.filter((current) => current !== task)
 }
-function expandAll() {
-  expandedTaskGroups.value = [RESOURCE_TYPE.APPLICATION, RESOURCE_TYPE.TOOL]
-  expandedTaskKeys.value = tasks.value.map(taskKey)
-}
+
 function reset() {
   loadedResources.value = {}
   expandedTaskGroups.value = [RESOURCE_TYPE.APPLICATION, RESOURCE_TYPE.TOOL]
   expandedTaskKeys.value = []
 }
 async function validate() {
-  // 分组使用 v-show 保留参数表单，保存时校验所有任务，包括已折叠的任务。
+  // 先展开所有任务，等待参数表单挂载后再统一校验。
+  expandedTaskGroups.value = [RESOURCE_TYPE.APPLICATION, RESOURCE_TYPE.TOOL]
+  expandedTaskKeys.value = tasks.value.map(taskKey)
   await nextTick()
   const validations = await Promise.all(parameterRefs.value.map((parameter) => parameter.validate().catch(() => false)))
   return validations.every(Boolean)
 }
-defineExpose({ validate, expandAll, reset })
+defineExpose({ validate, reset })
 </script>
 
 <template>
-  <div class="w-full space-y-1">
-    <MkCollapse
-      v-for="group in taskGroups"
-      :key="group.type"
-      :expanded="expandedTaskGroups.includes(group.type)"
-      :destroy-on-collapse="false"
-      trigger-class="py-1!"
-      @update:expanded="handleToggleTaskGroup(group.type)"
-    >
-      <template #label>
-        <div class="flex-between min-w-0 flex-1">
-          <span
-            >{{ group.label }}<span v-if="group.tasks.length">（{{ group.tasks.length }}）</span></span
-          >
-          <!-- 添加该分组的执行任务 -->
-          <el-button text type="primary" :disabled="disabled" :title="`添加${group.label}`" @click.stop="handleOpenTaskDialog(group.type)">
-            <MkIcon name="icon_add_outlined" />
-          </el-button>
-        </div>
-      </template>
-      <div v-if="group.tasks.length" class="mb-2 flex flex-col gap-1">
-        <el-card v-for="task in group.tasks" :key="taskKey(task)" class="small" shadow="never">
-          <MkCollapse
-            :expanded="expandedTaskKeys.includes(taskKey(task))"
-            :destroy-on-collapse="false"
-            trigger-class="py-0!"
-            indicator-position="after"
-            @update:expanded="handleToggleTask(taskKey(task))"
-          >
-            <template #label>
-              <div class="flex-between min-w-0 flex-1">
-                <span class="flex min-w-0 items-center gap-2">
-                  <ApplicationIcon
+  <div class="w-full space-y-2">
+    <template v-for="group in taskGroups" :key="group.type">
+      <MkCollapse trigger-class="py-0!" :default-expanded="true">
+        <template #label>
+          <div class="flex-between min-w-0 flex-1">
+            <span
+              >{{ group.label }}<span v-if="group.tasks.length">（{{ group.tasks.length }}）</span></span
+            >
+            <!-- 添加该分组的执行任务 -->
+            <el-button text type="primary" :disabled="disabled" :title="`添加${group.label}`" @click.stop="handleOpenTaskDialog(group.type)">
+              <MkIcon name="icon_add_outlined" />
+            </el-button>
+          </div>
+        </template>
+
+        <div v-if="group.tasks.length" class="mt-2 flex flex-col gap-1">
+          <template v-for="task in group.tasks" :key="taskKey(task)">
+            <el-card class="small" shadow="never">
+              <MkCollapse trigger-class="py-0!">
+                <template #label>
+                  <div class="flex-between min-w-0 flex-1">
+                    <span class="flex min-w-0 items-center gap-2">
+                      <ApplicationIcon
+                        v-if="task.source_type === RESOURCE_TYPE.APPLICATION"
+                        :icon="resources[taskKey(task)]?.icon"
+                        :size="20"
+                        class="shrink-0 small"
+                      />
+                      <ToolIcon
+                        v-else
+                        :icon="resources[taskKey(task)]?.icon"
+                        :type="resources[taskKey(task)]?.tool_type"
+                        :size="20"
+                        class="shrink-0 small"
+                      />
+                      <span class="truncate" :title="resources[taskKey(task)]?.name || task.source_id">{{
+                        resources[taskKey(task)]?.name || task.source_id
+                      }}</span>
+                    </span>
+                    <!-- 移除执行任务 -->
+                    <el-button text :disabled="disabled" @click.stop="handleRemoveTask(task)">
+                      <MkIcon name="icon_close_outlined" />
+                    </el-button>
+                  </div>
+                </template>
+                <div class="my-2">
+                  <ApplicationParameter
                     v-if="task.source_type === RESOURCE_TYPE.APPLICATION"
-                    :icon="resources[taskKey(task)]?.icon"
-                    :size="20"
-                    class="shrink-0 small"
+                    ref="parameterRefs"
+                    v-model="task.parameter"
+                    :disabled="disabled"
+                    :application="resources[taskKey(task)]"
+                    :trigger-type="triggerType"
+                    :body="body"
                   />
-                  <ToolIcon
+                  <ToolParameter
                     v-else
-                    :icon="resources[taskKey(task)]?.icon"
-                    :type="resources[taskKey(task)]?.tool_type"
-                    :size="20"
-                    class="shrink-0 small"
+                    ref="parameterRefs"
+                    v-model="task.parameter"
+                    :disabled="disabled"
+                    :tool="resources[taskKey(task)]"
+                    :trigger-type="triggerType"
+                    :body="body"
                   />
-                  <span class="truncate" :title="resources[taskKey(task)]?.name || task.source_id">{{
-                    resources[taskKey(task)]?.name || task.source_id
-                  }}</span>
-                </span>
-                <!-- 移除执行任务 -->
-                <el-button text :disabled="disabled" title="移除任务" @click.stop="handleRemoveTask(task)">
-                  <MkIcon name="icon_close_outlined" />
-                </el-button>
-              </div>
-            </template>
-            <div class="mt-2">
-              <TaskParameters
-                ref="parameterRefs"
-                v-model="task.parameter"
-                :disabled="disabled"
-                :source="task.source_type"
-                :resource="resources[taskKey(task)]"
-                :trigger-type="triggerType"
-                :body="body"
-              />
-            </div>
-          </MkCollapse>
-        </el-card>
-      </div>
-    </MkCollapse>
+                </div>
+              </MkCollapse>
+            </el-card>
+          </template>
+        </div>
+      </MkCollapse>
+    </template>
   </div>
   <SelectApplicationDialog ref="applicationDialogRef" @submit="handleSelectResources(RESOURCE_TYPE.APPLICATION, $event)" />
   <SelectToolDialog
diff --git a/ui/src/views/trigger/trigger-form/task-execution/TaskParameters.vue b/ui/src/views/trigger/trigger-form/task-execution/TaskParameters.vue
deleted file mode 100644
index 10e1339f9d8..00000000000
--- a/ui/src/views/trigger/trigger-form/task-execution/TaskParameters.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<script setup lang="ts">
-import { computed, nextTick, ref, watch } from 'vue'
-import type { FormInstance, FormItemRule } from 'element-plus'
-import { TRIGGER_PARAMETER_SOURCE, TRIGGER_TYPE } from '@/api/enums'
-import type { ApplicationDetail, ToolItem, TriggerBodyField, TriggerParameters, TriggerTaskSource, TriggerType } from '@/api/types'
-import { type TaskParameterField, getTaskParameterFields, getTaskParameter, initializeTaskParameters } from './task-parameters'
-
-const props = defineProps<{
-  disabled?: boolean
-  source: TriggerTaskSource
-  resource?: Partial<ApplicationDetail & ToolItem>
-  triggerType: TriggerType
-  body: TriggerBodyField[]
-}>()
-const parameters = defineModel<TriggerParameters>({ required: true })
-const formRef = ref<FormInstance>()
-const fields = computed(() => getTaskParameterFields(props.source, props.resource))
-const referenceOptions = computed(() => [
-  { label: 'body', value: 'body', children: props.body.filter(({ field }) => field.trim()).map(({ field }) => ({ label: field, value: field })) },
-])
-watch(
-  fields,
-  (fields) => {
-    initializeTaskParameters(parameters.value, fields)
-  },
-  { immediate: true },
-)
-
-function getParameterRules(field: TaskParameterField): FormItemRule[] {
-  return [
-    {
-      validator: (_rule, _value, callback) => {
-        const parameter = getTaskParameter(parameters.value, field)
-        const value = parameter.value
-        if (
-          parameter.source === TRIGGER_PARAMETER_SOURCE.REFERENCE &&
-          (props.triggerType !== TRIGGER_TYPE.EVENT ||
-            !Array.isArray(value) ||
-            value[0] !== 'body' ||
-            !props.body.some(({ field }) => field === value[1]))
-        ) {
-          callback(new Error('请选择有效的事件请求参数，或切换为自定义'))
-        } else if (field.required && (Array.isArray(value) ? !value.length : !value?.trim())) {
-          callback(new Error(`请输入${field.label}`))
-        } else callback()
-      },
-      trigger: 'change',
-    },
-  ]
-}
-
-function validate() {
-  return nextTick().then(() => formRef.value?.validate())
-}
-defineExpose({ validate })
-</script>
-
-<template>
-  <el-form ref="formRef" :model="parameters" :disabled="disabled" label-position="top" @submit.prevent>
-    <el-form-item
-      v-for="field in fields"
-      :key="JSON.stringify(field.path)"
-      :prop="[...field.path, 'value']"
-      :label="field.label"
-      :rules="getParameterRules(field)"
-    >
-      <div class="flex w-full gap-2">
-        <el-select
-          v-model="getTaskParameter(parameters, field).source"
-          class="w-24! shrink-0"
-          @change="getTaskParameter(parameters, field).value = ''"
-        >
-          <el-option label="自定义" :value="TRIGGER_PARAMETER_SOURCE.CUSTOM" />
-          <el-option label="引用" :value="TRIGGER_PARAMETER_SOURCE.REFERENCE" :disabled="triggerType !== TRIGGER_TYPE.EVENT || !body.length" />
-        </el-select>
-        <el-cascader
-          v-if="getTaskParameter(parameters, field).source === TRIGGER_PARAMETER_SOURCE.REFERENCE"
-          v-model="getTaskParameter(parameters, field).value"
-          :options="referenceOptions"
-          class="flex-1"
-        />
-        <el-input v-else v-model="getTaskParameter(parameters, field).value" :placeholder="`请输入${field.label}`" />
-      </div>
-    </el-form-item>
-  </el-form>
-</template>
diff --git a/ui/src/views/trigger/trigger-form/task-execution/parameters/ApplicationParameter.vue b/ui/src/views/trigger/trigger-form/task-execution/parameters/ApplicationParameter.vue
new file mode 100644
index 00000000000..fd152289c56
--- /dev/null
+++ b/ui/src/views/trigger/trigger-form/task-execution/parameters/ApplicationParameter.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { computed, useTemplateRef } from 'vue'
+import type { ApplicationDetail, TriggerBodyField, TriggerParameters, TriggerType } from '@/api/types'
+import ParameterForm from './ParameterForm.vue'
+import type { TaskParameterField } from './types'
+
+const props = defineProps<{ application?: Partial<ApplicationDetail>; triggerType: TriggerType; body: TriggerBodyField[]; disabled?: boolean }>()
+const parameters = defineModel<TriggerParameters>({ required: true })
+const parameterFormRef = useTemplateRef<InstanceType<typeof ParameterForm>>('parameterFormRef')
+// 生成当前资源的执行参数，保留各自的字段分组和默认值。
+const fields = computed<TaskParameterField[]>(() => {
+  const fields: TaskParameterField[] = [{ path: ['question'], label: 'Question', required: true, defaultValue: '' }]
+  const properties = props.application?.work_flow?.nodes?.find((node) => node.type === 'base-node')?.properties ?? {}
+  const nodeData = properties.node_data ?? {}
+  if (nodeData.file_upload_enable) {
+    const fileLabels = { document: '文档', image: '图片', audio: '音频', video: '视频', other: '其他文件' }
+    Object.entries(fileLabels).forEach(([type, label]) => {
+      if (nodeData.file_upload_setting?.[type]) fields.push({ path: [`${type}_list`], label, required: true, defaultValue: '[]' })
+    })
+  }
+  const userFields = properties.user_input_field_list as
+    | { field: string; required?: boolean; default_value?: unknown; label?: string | { label?: string } }[]
+    | undefined
+  userFields?.forEach((field) => {
+    fields.push({
+      path: ['user_input_field_list', field.field],
+      label: (typeof field.label === 'string' ? field.label : field.label?.label) || field.field,
+      required: field.required ?? false,
+      defaultValue:
+        typeof field.default_value === 'string' ? field.default_value : field.default_value === undefined ? '' : JSON.stringify(field.default_value),
+    })
+  })
+  const apiFields = properties.api_input_field_list as { variable: string; is_required?: boolean; default_value?: unknown }[] | undefined
+  apiFields?.forEach((field) => {
+    fields.push({
+      path: ['api_input_field_list', field.variable],
+      label: field.variable,
+      required: field.is_required ?? false,
+      defaultValue:
+        typeof field.default_value === 'string' ? field.default_value : field.default_value === undefined ? '' : JSON.stringify(field.default_value),
+    })
+  })
+  return fields
+})
+function validate() {
+  return parameterFormRef.value?.validate() ?? Promise.resolve(false)
+}
+defineExpose({ validate })
+</script>
+
+<template>
+  <ParameterForm ref="parameterFormRef" v-model="parameters" :fields="fields" :trigger-type="triggerType" :body="body" :disabled="disabled" />
+</template>
diff --git a/ui/src/views/trigger/trigger-form/task-execution/parameters/ParameterForm.vue b/ui/src/views/trigger/trigger-form/task-execution/parameters/ParameterForm.vue
new file mode 100644
index 00000000000..b3ce04c8e85
--- /dev/null
+++ b/ui/src/views/trigger/trigger-form/task-execution/parameters/ParameterForm.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from 'vue'
+import type { FormInstance, FormItemRule } from 'element-plus'
+import { TRIGGER_PARAMETER_SOURCE, TRIGGER_TYPE } from '@/api/enums'
+import type { TriggerBodyField, TriggerParameters, TriggerType } from '@/api/types'
+import { get, set } from 'lodash'
+import type { TriggerParameter } from '@/api/types'
+import type { TaskParameterField } from './types'
+
+const props = defineProps<{
+  disabled?: boolean
+  fields: TaskParameterField[]
+  triggerType: TriggerType
+  body: TriggerBodyField[]
+}>()
+const parameters = defineModel<TriggerParameters>({ required: true })
+const formRef = ref<FormInstance>()
+const showSource = computed(() => props.triggerType === TRIGGER_TYPE.EVENT && props.body.some(({ field }) => field.trim()))
+const referenceOptions = computed(() => [
+  { label: 'body', value: 'body', children: props.body.filter(({ field }) => field.trim()).map(({ field }) => ({ label: field, value: field })) },
+])
+watch(
+  [() => props.fields, showSource],
+  ([fields, canReference]) => {
+    initializeTaskParameters(parameters.value, fields)
+    if (!canReference) resetUnavailableReferences(parameters.value, fields)
+    formRef.value?.clearValidate()
+  },
+  { immediate: true },
+)
+
+/** 只补全缺失输入，编辑和折叠时不覆盖已保存参数。 */
+function initializeTaskParameters(parameters: TriggerParameters, fields: TaskParameterField[]) {
+  fields.forEach((field) => {
+    if (!get(parameters, field.path)) set(parameters, field.path, { source: TRIGGER_PARAMETER_SOURCE.CUSTOM, value: field.defaultValue })
+  })
+  return parameters
+}
+
+function getTaskParameter(parameters: TriggerParameters, field: TaskParameterField): TriggerParameter {
+  return get(parameters, field.path) as TriggerParameter
+}
+
+/** 引用来源不可用时恢复自定义默认值，不改动已有的自定义参数。 */
+function resetUnavailableReferences(parameters: TriggerParameters, fields: TaskParameterField[]) {
+  fields.forEach((field) => {
+    const parameter = getTaskParameter(parameters, field)
+    if (parameter.source === TRIGGER_PARAMETER_SOURCE.REFERENCE) {
+      parameter.source = TRIGGER_PARAMETER_SOURCE.CUSTOM
+      parameter.value = field.defaultValue
+    }
+  })
+}
+
+function getParameterRules(field: TaskParameterField): FormItemRule[] {
+  return [
+    {
+      validator: (_rule, _value, callback) => {
+        const parameter = getTaskParameter(parameters.value, field)
+        const value = parameter.value
+        if (
+          parameter.source === TRIGGER_PARAMETER_SOURCE.REFERENCE &&
+          (props.triggerType !== TRIGGER_TYPE.EVENT ||
+            !Array.isArray(value) ||
+            value.length !== 2 ||
+            value[0] !== 'body' ||
+            !props.body.some(({ field }) => field === value[1]))
+        ) {
+          callback(new Error('请选择有效的事件请求参数，或切换为自定义'))
+        } else if (field.required && (Array.isArray(value) ? !value.length : !value?.trim())) {
+          callback(new Error(`请输入${field.label}`))
+        } else callback()
+      },
+      trigger: 'change',
+    },
+  ]
+}
+
+function validate() {
+  return nextTick().then(() => formRef.value?.validate())
+}
+defineExpose({ validate })
+</script>
+
+<template>
+  <el-form ref="formRef" :model="parameters" :disabled="disabled" label-position="top" hide-required-asterisk @submit.prevent>
+    <el-form-item
+      v-for="field in fields"
+      :key="JSON.stringify(field.path)"
+      :prop="[...field.path, 'value']"
+      :label="field.label"
+      :rules="getParameterRules(field)"
+    >
+      <template #label>
+        <div class="flex-between w-full">
+          <span>{{ field.label }}<span v-if="field.required" class="ml-1 text-danger">*</span></span>
+          <el-select
+            v-if="showSource"
+            v-model="getTaskParameter(parameters, field).source"
+            :teleported="false"
+            size="small"
+            class="w-24!"
+            @change="
+              getTaskParameter(parameters, field).value =
+                getTaskParameter(parameters, field).source === TRIGGER_PARAMETER_SOURCE.REFERENCE ? [] : field.defaultValue
+            "
+          >
+            <el-option label="引用" :value="TRIGGER_PARAMETER_SOURCE.REFERENCE" />
+            <el-option label="自定义" :value="TRIGGER_PARAMETER_SOURCE.CUSTOM" />
+          </el-select>
+        </div>
+      </template>
+      <el-cascader
+        v-if="getTaskParameter(parameters, field).source === TRIGGER_PARAMETER_SOURCE.REFERENCE"
+        v-model="getTaskParameter(parameters, field).value"
+        :options="referenceOptions"
+        class="w-full"
+        placeholder="请选择"
+      />
+      <el-input v-else v-model="getTaskParameter(parameters, field).value" :placeholder="`请输入${field.label}`" />
+    </el-form-item>
+  </el-form>
+</template>
diff --git a/ui/src/views/trigger/trigger-form/task-execution/parameters/ToolParameter.vue b/ui/src/views/trigger/trigger-form/task-execution/parameters/ToolParameter.vue
new file mode 100644
index 00000000000..c2bf57dcf3f
--- /dev/null
+++ b/ui/src/views/trigger/trigger-form/task-execution/parameters/ToolParameter.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import { computed, useTemplateRef } from 'vue'
+import type { ToolItem, TriggerBodyField, TriggerParameters, TriggerType } from '@/api/types'
+import ParameterForm from './ParameterForm.vue'
+import type { TaskParameterField } from './types'
+
+const props = defineProps<{ tool?: Partial<ToolItem>; triggerType: TriggerType; body: TriggerBodyField[]; disabled?: boolean }>()
+const parameters = defineModel<TriggerParameters>({ required: true })
+const parameterFormRef = useTemplateRef<InstanceType<typeof ParameterForm>>('parameterFormRef')
+// 生成当前资源的执行参数，保留各自的字段分组和默认值。
+const fields = computed<TaskParameterField[]>(() => {
+  const fields: TaskParameterField[] = (props.tool?.input_field_list ?? []).map((field) => ({
+    path: [field.name],
+    label: field.name,
+    required: field.is_required,
+    defaultValue: '',
+  }))
+  const properties = props.tool?.work_flow?.nodes?.find((node) => node.type === 'tool-base-node')?.properties ?? {}
+  const userFields = properties.user_input_field_list as
+    | { field: string; is_required?: boolean; required?: boolean; default_value?: unknown; label?: string | { label?: string } }[]
+    | undefined
+  userFields?.forEach((field) => {
+    fields.push({
+      path: ['user_input_field_list', field.field],
+      label: (typeof field.label === 'string' ? field.label : field.label?.label) || field.field,
+      required: field.is_required ?? field.required ?? false,
+      defaultValue:
+        typeof field.default_value === 'string' ? field.default_value : field.default_value === undefined ? '' : JSON.stringify(field.default_value),
+    })
+  })
+  return fields
+})
+function validate() {
+  return parameterFormRef.value?.validate() ?? Promise.resolve(false)
+}
+defineExpose({ validate })
+</script>
+
+<template>
+  <ParameterForm ref="parameterFormRef" v-model="parameters" :fields="fields" :trigger-type="triggerType" :body="body" :disabled="disabled" />
+</template>
diff --git a/ui/src/views/trigger/trigger-form/task-execution/parameters/types.ts b/ui/src/views/trigger/trigger-form/task-execution/parameters/types.ts
new file mode 100644
index 00000000000..fc2161b3f87
--- /dev/null
+++ b/ui/src/views/trigger/trigger-form/task-execution/parameters/types.ts
@@ -0,0 +1,7 @@
+/** 执行任务参数表单的字段描述。 */
+export interface TaskParameterField {
+  path: string[]
+  label: string
+  required: boolean
+  defaultValue: string
+}
diff --git a/ui/src/views/trigger/trigger-form/task-execution/task-parameters.ts b/ui/src/views/trigger/trigger-form/task-execution/task-parameters.ts
deleted file mode 100644
index 66db855e6be..00000000000
--- a/ui/src/views/trigger/trigger-form/task-execution/task-parameters.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { get, set } from 'lodash'
-import { RESOURCE_TYPE, TRIGGER_PARAMETER_SOURCE } from '@/api/enums'
-import type { ApplicationDetail, ToolItem, TriggerParameter, TriggerParameters, TriggerTaskSource } from '@/api/types'
-
-export interface TaskParameterField {
-  path: string[]
-  label: string
-  required: boolean
-  defaultValue: string
-}
-
-/** 根据资源输入定义生成触发任务参数，兼容普通工具和工作流工具。 */
-export function getTaskParameterFields(source: TriggerTaskSource, resource?: Partial<ApplicationDetail & ToolItem>): TaskParameterField[] {
-  const fields: TaskParameterField[] = []
-  const isApplication = source === RESOURCE_TYPE.APPLICATION
-  const baseNode = resource?.work_flow?.nodes?.find((node) => node.type === (isApplication ? 'base-node' : 'tool-base-node'))
-  const properties = baseNode?.properties ?? {}
-  if (isApplication) {
-    fields.push({ path: ['question'], label: '问题', required: true, defaultValue: '' })
-    const nodeData = properties.node_data ?? {}
-    if (nodeData.file_upload_enable) {
-      const fileLabels = { document: '文档', image: '图片', audio: '音频', video: '视频', other: '其他文件' }
-      Object.entries(fileLabels).forEach(([type, label]) => {
-        if (nodeData.file_upload_setting?.[type]) fields.push({ path: [`${type}_list`], label, required: true, defaultValue: '[]' })
-      })
-    }
-  } else {
-    resource?.input_field_list?.forEach((field) => {
-      fields.push({ path: [field.name], label: field.name, required: field.is_required, defaultValue: '' })
-    })
-  }
-  const userFields = properties.user_input_field_list as
-    | { field: string; required?: boolean; is_required?: boolean; default_value?: unknown; label?: string | { label?: string } }[]
-    | undefined
-  userFields?.forEach((field) => {
-    fields.push({
-      path: ['user_input_field_list', field.field],
-      label: typeof field.label === 'string' ? field.label : field.label?.label || field.field,
-      required: field.required ?? field.is_required ?? false,
-      defaultValue:
-        typeof field.default_value === 'string' ? field.default_value : field.default_value === undefined ? '' : JSON.stringify(field.default_value),
-    })
-  })
-  if (isApplication) {
-    const apiFields = properties.api_input_field_list as { variable: string; is_required?: boolean }[] | undefined
-    apiFields?.forEach((field) =>
-      fields.push({ path: ['api_input_field_list', field.variable], label: field.variable, required: field.is_required ?? false, defaultValue: '' }),
-    )
-  }
-  return fields
-}
-
-/** 只补全缺失输入，编辑和折叠时不覆盖已保存参数。 */
-export function initializeTaskParameters(parameters: TriggerParameters, fields: TaskParameterField[]) {
-  fields.forEach((field) => {
-    if (!get(parameters, field.path)) set(parameters, field.path, { source: TRIGGER_PARAMETER_SOURCE.CUSTOM, value: field.defaultValue })
-  })
-  return parameters
-}
-
-export function getTaskParameter(parameters: TriggerParameters, field: TaskParameterField): TriggerParameter {
-  return get(parameters, field.path) as TriggerParameter
-}