From 9e8354723f04fed803112a2be8cab085ac7235d8 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Tue, 8 Sep 2026 10:15:09 +0800
Subject: [PATCH] feat:  tool

---
 ui/src/api/API_README.md                      |   7 +
 ui/src/api/admin/workspace/tool/tool.ts       |  11 +-
 ui/src/components/COMPONENT_README.md         |  19 +-
 .../select-application-dialog/index.vue       | 180 ++++++++++++++++
 .../business/select-tool-dialog/index.vue     | 182 ++++++++++++++++
 ui/src/components/mk-form-list/index.vue      |   6 +-
 .../router/admin/system/modules/knowledge.ts  |   4 +-
 .../admin/workspace/modules/knowledge.ts      |   4 +-
 ui/src/workflow-canvas/WORKFLOW_README.md     |  30 ++-
 .../component/node-model-select/index.vue     |  18 +-
 .../component/node-model-select/types.ts      |  28 ++-
 ui/src/workflow-canvas/config/node-data.ts    |   4 -
 .../resource-setting/McpSettingDialog.vue     |  49 ++++-
 .../component/resource-setting/index.vue      |  83 ++++++--
 .../nodes/ai-chat-node/types.ts               |   3 +
 .../workflow-canvas/nodes/mcp-node/index.vue  |   3 +-
 ...ramSettingDialog.vue => SearchSetting.vue} |  34 ++-
 .../nodes/reranker-node/index.vue             | 144 +++++--------
 .../nodes/search-document-node/constant.ts    |   9 +
 .../nodes/search-document-node/index.ts       |  10 +-
 .../nodes/search-document-node/index.vue      | 195 +++++-------------
 .../nodes/search-document-node/types.ts       |  18 ++
 .../store/api/workspace/index.ts              |   2 +-
 ui/src/workflow-canvas/store/index.ts         |  10 +-
 24 files changed, 742 insertions(+), 311 deletions(-)
 create mode 100644 ui/src/components/business/select-application-dialog/index.vue
 create mode 100644 ui/src/components/business/select-tool-dialog/index.vue
 rename ui/src/workflow-canvas/nodes/reranker-node/component/{ParamSettingDialog.vue => SearchSetting.vue} (68%)
 create mode 100644 ui/src/workflow-canvas/nodes/search-document-node/constant.ts
 create mode 100644 ui/src/workflow-canvas/nodes/search-document-node/types.ts

diff --git a/ui/src/api/API_README.md b/ui/src/api/API_README.md
index c72d9f54e54..5972ecf4519 100644
--- a/ui/src/api/API_README.md
+++ b/ui/src/api/API_README.md
@@ -79,6 +79,13 @@ Action、Drawer 或 Dialog。复用方直接使用 `typeof XxxApi` 约束完整
 额外维护逐方法接口，例如 `ModelActionApi`，也不要使用不断扩展的 `Pick<typeof XxxApi, ...>`。
 仅展示数据的组件不接收 API。
 
+### 工具列表查询
+
+`workspace/tool/tool.ts` 的 `getAllTool(query)` 查询支持 `folder_id` 筛选的工作空间工具
+非分页列表，用于文件夹菜单和工具选择弹窗。`getToolListWithShared(query)` 请求 `tool/tool_list`，
+将响应的 `tools` 与 `shared_tools` 合并为 `ToolItem[]`，用于包含已授权共享工具的选项查询；
+按工具类型筛选时使用 `tool_type`。`workspace/shared.ts` 的 `getAllTool(query)` 仅查询共享工具。
+
 ### 知识库维护
 
 `workspace/knowledge/knowledge.ts` 与 `workspace/shared.ts` 的 `getAllKnowledge(query)`
diff --git a/ui/src/api/admin/workspace/tool/tool.ts b/ui/src/api/admin/workspace/tool/tool.ts
index a41ed578ee6..2cd2d3803ce 100644
--- a/ui/src/api/admin/workspace/tool/tool.ts
+++ b/ui/src/api/admin/workspace/tool/tool.ts
@@ -8,11 +8,19 @@ const getPrefix = () => {
   return `/workspace/${workspaceId}/tool`
 }
 
-/** 获取不分页的全部工具列表。 */
+/** 获取支持 folder_id 筛选的工作空间工具非分页列表。 */
 const getAllTool = (query?: Dict<unknown>) => {
   return get<{ tools: ToolItem[] }>(`${getPrefix()}`, query).then(({ tools }) => tools)
 }
 
+/** 获取包含已授权共享工具的非分页列表。 */
+const getToolListWithShared = (query?: Dict<unknown>) => {
+  return get<{ tools: ToolItem[]; shared_tools: ToolItem[] }>(`${getPrefix()}/tool_list`, query).then(({ tools, shared_tools }) => [
+    ...tools,
+    ...shared_tools,
+  ])
+}
+
 /** 获取工具分页列表。 */
 const getToolPage = (page: ParamsPage, query?: Dict<unknown>) => {
   return get<ResponsePage<ToolItem>>(`${getPrefix()}/${page.currentPage}/${page.pageSize}`, query)
@@ -110,4 +118,5 @@ export default {
   putBatchMoveTools,
   putTool,
   getAllTool,
+  getToolListWithShared,
 }
diff --git a/ui/src/components/COMPONENT_README.md b/ui/src/components/COMPONENT_README.md
index b814188a652..af3afa8f426 100644
--- a/ui/src/components/COMPONENT_README.md
+++ b/ui/src/components/COMPONENT_README.md
@@ -40,6 +40,10 @@ src/components/
 │   │   ├── MoveToDialog.vue
 │   │   ├── VirtualizedTree.vue
 │   │   └── types.ts
+│   ├── select-application-dialog/
+│   │   └── index.vue             # 已发布智能体选择
+│   ├── select-tool-dialog/
+│   │   └── index.vue             # 工具与 Skills 按类型选择
 │   ├── select-knowledge-dialog/
 │   │   └── index.vue             # 关联知识库选择、文件夹与共享资源查询
 │   ├── select-model/
@@ -904,7 +908,8 @@ import MkSourceCard from '@/components/mk-source-card/index.vue'
 ### MkFormList
 
 用于多个业务字段组成的动态表单行，负责重复行布局、添加、删除和可选排序，不管理业务字段、校验规则或
-选项请求。通过 `v-model` 传入行数据，`defaultItem` 创建新行，列表始终至少保留一行。默认插槽
+选项请求。通过 `v-model` 传入行数据，`defaultItem` 创建新行，`minRows` 默认值为 `1`，控制删除时保留的最小行数；
+允许删除到空列表时传入 `:min-rows="0"`。组件不会自动补齐初始行。默认插槽
 提供 `item`、`index`，业务组件在插槽中继续声明
 `el-form-item`、字段路径和校验规则。
 
@@ -1173,6 +1178,18 @@ import FolderTree from '@/components/business/folder-tree/index.vue'
 相同的 Embedding 模型。固定业务请求由
 该组件负责，调用方维护最终关联 ID 和快照。
 
+### SelectApplicationDialog、SelectToolDialog
+
+手动导入 `business/select-application-dialog/index.vue` 和 `business/select-tool-dialog/index.vue`。
+两者沿用知识库选择弹窗的目录、名称搜索、三列卡片、悬停详情、跨目录选择和清空交互；
+`open()` 接收已选资源对象数组，`submit` 返回深拷贝后的资源对象数组，兼容只有 ID 的旧数据。
+每次打开先重置临时状态；取消不提交，过期请求不写回。
+
+智能体通过 `getAllApplication` 全量查询已发布资源，不展示共享目录。工具通过工作空间或共享
+`getAllTool` 全量查询，仅展示启用资源；`toolTypes` 默认包含自定义、工作流和内置工具，
+Skills 场景传入 `[TOOL_TYPE.SKILL]`，并通过 `title` 指定标题。两者支持 `excludedIds`，
+供调用方排除当前智能体或工具，避免直接自引用。弹窗不使用滚动分页。
+
 ### SelectModel
 
 按供应商分组展示模型，通过 `v-model` 控制模型 ID，并在选择变化时触发 `change`。`options` 为
diff --git a/ui/src/components/business/select-application-dialog/index.vue b/ui/src/components/business/select-application-dialog/index.vue
new file mode 100644
index 00000000000..97024fe991a
--- /dev/null
+++ b/ui/src/components/business/select-application-dialog/index.vue
@@ -0,0 +1,180 @@
+<script setup lang="ts">
+import { computed, nextTick, ref, useTemplateRef } from 'vue'
+import { cloneDeep } from 'lodash'
+import ApplicationApi from '@/api/admin/workspace/application/application'
+import type { FolderItem, ApplicationDetail } from '@/api/types'
+import { RESOURCE_TYPE } from '@/api/enums'
+import { FOLDER_ENTRIES } from '@/constants/folder'
+import FolderTree from '@/components/business/folder-tree/index.vue'
+import MkSourceCard from '@/components/mk-source-card/index.vue'
+
+defineOptions({ name: 'SelectApplicationDialog' })
+
+const props = withDefaults(defineProps<{ excludedIds?: string[] }>(), { excludedIds: () => [] })
+
+const emit = defineEmits<{ submit: [application: (Partial<ApplicationDetail> & { id: string })[]] }>()
+const visible = ref(false)
+const loading = ref(false)
+const searchKeyword = ref('')
+const appliedSearchKeyword = ref('')
+const currentFolder = ref<FolderItem>({ ...FOLDER_ENTRIES[RESOURCE_TYPE.APPLICATION].all })
+const applicationOptions = ref<ApplicationDetail[]>([])
+const selectedApplication = ref<(Partial<ApplicationDetail> & { id: string })[]>([])
+const applicationLayoutRef = useTemplateRef<{ setScrollTop: (scrollTop: number) => void }>('applicationLayoutRef')
+const folderTreeRef = useTemplateRef<InstanceType<typeof FolderTree>>('folderTreeRef')
+let dialogVersion = 0
+
+const selectedApplicationIds = computed(() => selectedApplication.value.map(({ id }) => id))
+
+function toggleApplication(application: ApplicationDetail) {
+  selectedApplication.value = selectedApplicationIds.value.includes(application.id)
+    ? selectedApplication.value.filter(({ id }) => id !== application.id)
+    : [...selectedApplication.value, cloneDeep(application)]
+}
+
+// 每次查询一次加载全部结果，忽略切换目录或关闭弹窗前发出的旧请求。
+function refreshApplication() {
+  const version = ++dialogVersion
+  loading.value = true
+  applicationOptions.value = []
+  appliedSearchKeyword.value = searchKeyword.value.trim()
+  return ApplicationApi.getAllApplication({
+    folder_id: currentFolder.value.id,
+    publish_status: 'published',
+    ...(appliedSearchKeyword.value ? { name: appliedSearchKeyword.value } : {}),
+  })
+    .then((application) => {
+      if (version !== dialogVersion) return
+      applicationOptions.value = application.filter((resource) => resource.is_publish && !props.excludedIds.includes(resource.id))
+      // 仅补全已选快照，不因查询结果缺少某个 ID 而删除关联。
+      const applicationById = new Map(application.map((application) => [application.id, application]))
+      selectedApplication.value = selectedApplication.value.map((application) => applicationById.get(application.id) ?? application)
+      return nextTick(() => {
+        if (version === dialogVersion) applicationLayoutRef.value?.setScrollTop(0)
+      })
+    })
+    .finally(() => {
+      if (version === dialogVersion) loading.value = false
+    })
+}
+
+function refreshResources() {
+  folderTreeRef.value?.refresh()
+  void refreshApplication()
+}
+
+function selectFolder(folder?: FolderItem) {
+  if (!folder || folder.id === currentFolder.value.id) return
+  currentFolder.value = folder
+  void refreshApplication()
+}
+
+function open(application: (Partial<ApplicationDetail> & { id: string })[]) {
+  resetData()
+  selectedApplication.value = cloneDeep(application)
+  visible.value = true
+  void refreshApplication()
+}
+
+function submit() {
+  emit('submit', cloneDeep(selectedApplication.value))
+  visible.value = false
+}
+function resetData() {
+  dialogVersion++
+  loading.value = false
+  searchKeyword.value = ''
+  appliedSearchKeyword.value = ''
+  currentFolder.value = { ...FOLDER_ENTRIES[RESOURCE_TYPE.APPLICATION].all }
+  applicationOptions.value = []
+  selectedApplication.value = []
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <MkDialog v-model="visible" align-center class="mk-aside-content-dialog" title="智能体" width="1200" @closed="resetData">
+    <template #header="{ titleId }">
+      <div class="flex-between pr-8">
+        <div class="flex items-center gap-2">
+          <h4 :id="titleId">智能体</h4>
+        </div>
+
+        <el-button text class="h-7! w-7! min-w-0! p-1!" title="刷新" aria-label="刷新智能体" @click="refreshResources">
+          <MkIcon name="icon_refresh_outlined" :size="20" />
+        </el-button>
+      </div>
+    </template>
+
+    <MkViewLayout ref="applicationLayoutRef" :loading="loading" title="">
+      <template #aside>
+        <FolderTree
+          ref="folderTreeRef"
+          class="pt-4"
+          :can-edit="false"
+          :show-shared="false"
+          :source="RESOURCE_TYPE.APPLICATION"
+          @loaded="selectFolder"
+          @select="selectFolder"
+        />
+      </template>
+      <template #default="{ Header }">
+        <component :is="Header">
+          <h4 class="min-w-0 truncate" :title="currentFolder.name">{{ currentFolder.name }}</h4>
+          <MkSearchInput v-model="searchKeyword" class="w-60! shrink-0" @change="refreshApplication" />
+        </component>
+
+        <template v-if="!loading">
+          <div v-if="applicationOptions.length" class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+            <template v-for="application in applicationOptions" :key="application.id">
+              <el-popover placement="bottom-start" :width="360" :show-after="500" :persistent="false" popper-class="border-none! rounded-xl!">
+                <template #reference>
+                  <el-card
+                    shadow="hover"
+                    class="min-w-0 cursor-pointer"
+                    :class="{ 'border-primary!': selectedApplicationIds.includes(application.id) }"
+                    @click="toggleApplication(application)"
+                  >
+                    <div class="flex-between gap-3">
+                      <div class="flex min-w-0 flex-1 items-center gap-2">
+                        <ApplicationIcon :icon="application.icon" class="shrink-0" />
+                        <span class="min-w-0 flex-1 truncate" :title="application.name">{{ application.name }}</span>
+                      </div>
+                      <el-checkbox
+                        :model-value="selectedApplicationIds.includes(application.id)"
+                        :aria-label="application.name"
+                        class="shrink-0"
+                        @click.stop
+                        @change="toggleApplication(application)"
+                      />
+                    </div>
+                  </el-card>
+                </template>
+                <template #default>
+                  <MkSourceCard :title="application.name" :nick_name="application.nick_name || '-'" :create_time="application.create_time">
+                    <template #icon><ApplicationIcon :icon="application.icon" /></template>
+                    <p class="line-clamp-2" :title="application.desc || '-'">{{ application.desc || '-' }}</p>
+                  </MkSourceCard>
+                </template>
+              </el-popover>
+            </template>
+          </div>
+          <MkEmpty v-else class="mt-24" :type="appliedSearchKeyword ? 'search' : 'default'" />
+        </template>
+      </template>
+    </MkViewLayout>
+    <template #footer>
+      <div class="flex-between -mx-6 border-t px-6 pt-4">
+        <div class="flex items-center gap-2">
+          <span class="text-N600">已选 {{ selectedApplication.length }}</span>
+          <el-button v-if="selectedApplication.length" link type="primary" @click="selectedApplication = []">清空</el-button>
+        </div>
+        <div>
+          <el-button plain @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="submit">确定</el-button>
+        </div>
+      </div>
+    </template>
+  </MkDialog>
+</template>
diff --git a/ui/src/components/business/select-tool-dialog/index.vue b/ui/src/components/business/select-tool-dialog/index.vue
new file mode 100644
index 00000000000..5bbabf74149
--- /dev/null
+++ b/ui/src/components/business/select-tool-dialog/index.vue
@@ -0,0 +1,182 @@
+<script setup lang="ts">
+import { computed, nextTick, ref, useTemplateRef } from 'vue'
+import { cloneDeep } from 'lodash'
+import ToolApi from '@/api/admin/workspace/tool/tool'
+import SharedApi from '@/api/admin/workspace/shared'
+import type { FolderItem, ToolItem, ToolType } from '@/api/types'
+import { RESOURCE_TYPE, TOOL_TYPE } from '@/api/enums'
+import { FOLDER_ENTRIES, FOLDER_ENTRY_ID } from '@/constants/folder'
+import FolderTree from '@/components/business/folder-tree/index.vue'
+import MkSourceCard from '@/components/mk-source-card/index.vue'
+
+defineOptions({ name: 'SelectToolDialog' })
+
+const props = withDefaults(defineProps<{ excludedIds?: string[]; title?: string; toolTypes?: ToolType[] }>(), {
+  excludedIds: () => [],
+  title: '工具',
+  toolTypes: () => [TOOL_TYPE.CUSTOM, TOOL_TYPE.WORKFLOW, TOOL_TYPE.INTERNAL],
+})
+
+const emit = defineEmits<{ submit: [tool: (Partial<ToolItem> & { id: string })[]] }>()
+const visible = ref(false)
+const loading = ref(false)
+const searchKeyword = ref('')
+const appliedSearchKeyword = ref('')
+const currentFolder = ref<FolderItem>({ ...FOLDER_ENTRIES[RESOURCE_TYPE.TOOL].all })
+const toolOptions = ref<ToolItem[]>([])
+const selectedTool = ref<(Partial<ToolItem> & { id: string })[]>([])
+const toolLayoutRef = useTemplateRef<{ setScrollTop: (scrollTop: number) => void }>('toolLayoutRef')
+const folderTreeRef = useTemplateRef<InstanceType<typeof FolderTree>>('folderTreeRef')
+let dialogVersion = 0
+
+const selectedToolIds = computed(() => selectedTool.value.map(({ id }) => id))
+
+function toggleTool(tool: ToolItem) {
+  selectedTool.value = selectedToolIds.value.includes(tool.id)
+    ? selectedTool.value.filter(({ id }) => id !== tool.id)
+    : [...selectedTool.value, cloneDeep(tool)]
+}
+
+// 每次查询一次加载全部结果，忽略切换目录或关闭弹窗前发出的旧请求。
+function refreshTool() {
+  const version = ++dialogVersion
+  loading.value = true
+  toolOptions.value = []
+  appliedSearchKeyword.value = searchKeyword.value.trim()
+  const shared = currentFolder.value.id === FOLDER_ENTRY_ID.SHARED
+  const requestApi = shared ? SharedApi : ToolApi
+  return requestApi
+    .getAllTool({
+      tool_type_list: props.toolTypes,
+      ...(shared ? {} : { folder_id: currentFolder.value.id }),
+      ...(appliedSearchKeyword.value ? { name: appliedSearchKeyword.value } : {}),
+    })
+    .then((tool) => {
+      if (version !== dialogVersion) return
+      toolOptions.value = tool.filter(
+        (resource) => resource.is_active && props.toolTypes.includes(resource.tool_type) && !props.excludedIds.includes(resource.id),
+      )
+      // 仅补全已选快照，不因查询结果缺少某个 ID 而删除关联。
+      const toolById = new Map(tool.map((tool) => [tool.id, tool]))
+      selectedTool.value = selectedTool.value.map((tool) => toolById.get(tool.id) ?? tool)
+      return nextTick(() => {
+        if (version === dialogVersion) toolLayoutRef.value?.setScrollTop(0)
+      })
+    })
+    .finally(() => {
+      if (version === dialogVersion) loading.value = false
+    })
+}
+
+function refreshResources() {
+  folderTreeRef.value?.refresh()
+  void refreshTool()
+}
+
+function selectFolder(folder?: FolderItem) {
+  if (!folder || folder.id === currentFolder.value.id) return
+  currentFolder.value = folder
+  void refreshTool()
+}
+
+function open(tool: (Partial<ToolItem> & { id: string })[]) {
+  resetData()
+  selectedTool.value = cloneDeep(tool)
+  visible.value = true
+  void refreshTool()
+}
+
+function submit() {
+  emit('submit', cloneDeep(selectedTool.value))
+  visible.value = false
+}
+function resetData() {
+  dialogVersion++
+  loading.value = false
+  searchKeyword.value = ''
+  appliedSearchKeyword.value = ''
+  currentFolder.value = { ...FOLDER_ENTRIES[RESOURCE_TYPE.TOOL].all }
+  toolOptions.value = []
+  selectedTool.value = []
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <MkDialog v-model="visible" align-center class="mk-aside-content-dialog" :title="title" width="1200" @closed="resetData">
+    <template #header="{ titleId }">
+      <div class="flex-between pr-8">
+        <div class="flex items-center gap-2">
+          <h4 :id="titleId">{{ title }}</h4>
+        </div>
+
+        <el-button text class="h-7! w-7! min-w-0! p-1!" title="刷新" aria-label="刷新工具" @click="refreshResources">
+          <MkIcon name="icon_refresh_outlined" :size="20" />
+        </el-button>
+      </div>
+    </template>
+
+    <MkViewLayout ref="toolLayoutRef" :loading="loading" title="">
+      <template #aside>
+        <FolderTree ref="folderTreeRef" class="pt-4" :can-edit="false" :source="RESOURCE_TYPE.TOOL" @loaded="selectFolder" @select="selectFolder" />
+      </template>
+      <template #default="{ Header }">
+        <component :is="Header">
+          <h4 class="min-w-0 truncate" :title="currentFolder.name">{{ currentFolder.name }}</h4>
+          <MkSearchInput v-model="searchKeyword" class="w-60! shrink-0" @change="refreshTool" />
+        </component>
+
+        <template v-if="!loading">
+          <div v-if="toolOptions.length" class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+            <template v-for="tool in toolOptions" :key="tool.id">
+              <el-popover placement="bottom-start" :width="360" :show-after="500" :persistent="false" popper-class="border-none! rounded-xl!">
+                <template #reference>
+                  <el-card
+                    shadow="hover"
+                    class="min-w-0 cursor-pointer"
+                    :class="{ 'border-primary!': selectedToolIds.includes(tool.id) }"
+                    @click="toggleTool(tool)"
+                  >
+                    <div class="flex-between gap-3">
+                      <div class="flex min-w-0 flex-1 items-center gap-2">
+                        <ToolIcon :icon="tool.icon" :type="tool.tool_type" class="shrink-0" />
+                        <span class="min-w-0 flex-1 truncate" :title="tool.name">{{ tool.name }}</span>
+                      </div>
+                      <el-checkbox
+                        :model-value="selectedToolIds.includes(tool.id)"
+                        :aria-label="tool.name"
+                        class="shrink-0"
+                        @click.stop
+                        @change="toggleTool(tool)"
+                      />
+                    </div>
+                  </el-card>
+                </template>
+                <template #default>
+                  <MkSourceCard :title="tool.name" :nick_name="tool.nick_name || '-'" :create_time="tool.create_time">
+                    <template #icon><ToolIcon :icon="tool.icon" :type="tool.tool_type" /></template>
+                    <p class="line-clamp-2" :title="tool.desc || '-'">{{ tool.desc || '-' }}</p>
+                  </MkSourceCard>
+                </template>
+              </el-popover>
+            </template>
+          </div>
+          <MkEmpty v-else class="mt-24" :type="appliedSearchKeyword ? 'search' : 'default'" />
+        </template>
+      </template>
+    </MkViewLayout>
+    <template #footer>
+      <div class="flex-between -mx-6 border-t px-6 pt-4">
+        <div class="flex items-center gap-2">
+          <span class="text-N600">已选 {{ selectedTool.length }}</span>
+          <el-button v-if="selectedTool.length" link type="primary" @click="selectedTool = []">清空</el-button>
+        </div>
+        <div>
+          <el-button plain @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="submit">确定</el-button>
+        </div>
+      </div>
+    </template>
+  </MkDialog>
+</template>
diff --git a/ui/src/components/mk-form-list/index.vue b/ui/src/components/mk-form-list/index.vue
index bd8527f4e8a..e4cecf238de 100644
--- a/ui/src/components/mk-form-list/index.vue
+++ b/ui/src/components/mk-form-list/index.vue
@@ -10,6 +10,7 @@ const props = withDefaults(
     addText?: string
     defaultItem: T | (() => T)
     firstRowHasLabel?: boolean
+    minRows?: number
     showAddButton?: boolean
     sortable?: boolean
     itemKey?: keyof T | ((item: T) => string | number)
@@ -17,6 +18,7 @@ const props = withDefaults(
   {
     addText: '添加',
     firstRowHasLabel: true,
+    minRows: 1,
     showAddButton: true,
     sortable: false,
   },
@@ -60,7 +62,7 @@ function addRow() {
 }
 
 function removeRow(index: number) {
-  if (formRows.value.length === 1) return
+  if (formRows.value.length <= props.minRows) return
   const removedItem = formRows.value[index] as T
   formRows.value = cloneDeep(formRows.value.filter((_, rowIndex) => rowIndex !== index))
   emit('remove', removedItem, index)
@@ -82,7 +84,7 @@ function removeRow(index: number) {
       </el-button>
       <slot :index="index" :item="item" />
       <el-form-item class="shrink-0" :class="firstRowHasLabel ? (index === 0 ? 'mt-8' : 'mt-0.5') : 'mt-1'">
-        <el-button :disabled="formRows.length === 1" text @click="removeRow(index)">
+        <el-button :disabled="formRows.length <= minRows" text @click="removeRow(index)">
           <MkIcon name="icon_delete-trash_outlined" class="text-N600" />
         </el-button>
       </el-form-item>
diff --git a/ui/src/router/admin/system/modules/knowledge.ts b/ui/src/router/admin/system/modules/knowledge.ts
index 75eb8856717..0c3cce0a6bf 100644
--- a/ui/src/router/admin/system/modules/knowledge.ts
+++ b/ui/src/router/admin/system/modules/knowledge.ts
@@ -5,13 +5,13 @@ export const systemKnowledgeRoutes: RouteRecordRaw[] = [
   {
     path: 'knowledge/:knowledgeId',
     name: 'system-knowledge-detail',
-    component: () => import('@/views/knowledge/KnowledgeDetailView.vue'),
+    component: () => import('@/views/knowledge-detail/KnowledgeDetailView.vue'),
     meta: { title: '知识库详情', hidden: true },
   },
   {
     path: 'knowledge/:knowledgeId/document/:documentId',
     name: 'system-knowledge-document-detail',
-    component: () => import('@/views/knowledge/DocumentDetailView.vue'),
+    component: () => import('@/views/knowledge-detail/DocumentDetailView.vue'),
     meta: { title: '文档详情', hidden: true },
   },
 ]
diff --git a/ui/src/router/admin/workspace/modules/knowledge.ts b/ui/src/router/admin/workspace/modules/knowledge.ts
index b356c9b3976..82e06e35795 100644
--- a/ui/src/router/admin/workspace/modules/knowledge.ts
+++ b/ui/src/router/admin/workspace/modules/knowledge.ts
@@ -11,13 +11,13 @@ export const knowledgeRoutes: RouteRecordRaw[] = [
       {
         path: ':knowledgeId',
         name: 'workspace-knowledge-detail',
-        component: () => import('@/views/knowledge/KnowledgeDetailView.vue'),
+        component: () => import('@/views/knowledge-detail/KnowledgeDetailView.vue'),
         meta: { title: '知识库详情', hidden: true },
       },
       {
         path: ':knowledgeId/document/:documentId',
         name: 'workspace-knowledge-document-detail',
-        component: () => import('@/views/knowledge/DocumentDetailView.vue'),
+        component: () => import('@/views/knowledge-detail/DocumentDetailView.vue'),
         meta: { title: '文档详情', hidden: true },
       },
     ],
diff --git a/ui/src/workflow-canvas/WORKFLOW_README.md b/ui/src/workflow-canvas/WORKFLOW_README.md
index 3f82e5eed2d..cd5dbe36dfa 100644
--- a/ui/src/workflow-canvas/WORKFLOW_README.md
+++ b/ui/src/workflow-canvas/WORKFLOW_README.md
@@ -88,6 +88,11 @@ LogicFlow 的节点拖拽；仅拦截 `mousedown` 无法隔离当前版本的 Po
 搜索和资源列表；`index.vue` 只负责 Tabs 和事件汇总。`component/AddNode.vue` 负责画布右上角的
 悬浮入口、菜单显隐，以及点击添加和拖拽添加事件；画布入口传入 `workflowMode` 并完成节点创建。
 
+工作流 Store 的 `getToolListWithShared` 用于包含已授权共享工具的选项查询，MCP 节点使用
+`tool_type: 'MCP'` 筛选；AI 对话的 `McpSettingDialog` 每次打开通过
+`store.force.getToolListWithShared` 刷新同类选项，关闭或重新打开后忽略旧响应，通过 `loaded`
+将工具详情提供给资源区回显；取消不修改已选配置。文件夹菜单继续使用 `getAllTool`，不复用这一路查询。
+
 ### `nodes/`
 
 每个已实现节点使用一个目录，目录中包含 LogicFlow 注册文件 `index.ts` 和节点视图
@@ -109,7 +114,7 @@ Vue Teleport 节点继承页面上下文；画布核心不负责模型参数接
 只用于解析当前使用的模型，不覆盖节点保存的自定义配置。
 
 AI 对话、意图识别、问题优化、参数提取、图片理解、视频理解、图片生成、文生视频、图生视频、
-语音转文本和文本转语音这 11 个节点统一使用 `component/node-model-select/index.vue` 的
+语音转文本、文本转语音和多路召回这 12 个节点统一使用 `component/node-model-select/index.vue` 的
 `NodeModelSelect`。组件接收 `nodeModel`、只读 `formData`、`modelType`、`label`、`options` 和
 `providerOptions`；默认字段为 `model_id_type`、`model_id`、`model_id_reference` 与
 `model_params_setting`，语音节点通过类型化的 `fields` 映射 STT/TTS 字段。组件通过 `update`
@@ -118,15 +123,19 @@ AI 对话、意图识别、问题优化、参数提取、图片理解、视频
 默认来源检查保存后的默认模型，自定义来源检查模型 ID，引用来源检查必填并调用
 `NodeCascader.validate()` 检查引用有效性。切换来源清空引用与旧校验，保留自定义模型和参数。
 来源及模型下拉由组件统一维护锚点保护；参数按钮与默认参数加载继续复用 `SelectModel`。
-多路召回、基本信息中的语音设置和长期记忆保持各自实现，不接入该组件。
+多路召回通过 `fields` 映射 `reranker_model_id*`，不提供参数字段，并设置 `canEditParams` 为
+`false`，仅保留独立的检索参数弹窗；模型校验统一遵循上述规则，包括默认模型必填。
+`canEditParams` 默认为 `true`，仅配置参数字段时启用；`canAdd` 默认为 `false`，多路召回开启后
+通过 `refresh` 重新查询重排模型，保留添加模型能力。
+基本信息中的语音设置和长期记忆保持各自实现，不接入该组件。
 
-知识库检索的范围区块使用 `component/node-search-scope/index.vue` 的 `NodeSearchScope`。
+知识库检索与文档标签检索的范围区块使用 `component/node-search-scope/index.vue` 的 `NodeSearchScope`。
 组件通过 `formData` 接收 `NodeSearchScopeData`、通过 `selectedKnowledge` 接收包含 ID 回退的
 知识库快照，`nodeModel` 仅用于变量选择和浮层锚点保护。`update` 提交范围字段的局部变更，
 `update:knowledge` 提交选择或移除后的知识库列表；节点保留快照、关联 ID 和不可见关联的清理逻辑。
 组件复用 `SelectKnowledgeDialog`，保留相同 Embedding 模型约束。切换范围保留配置，切换知识库/
 文档列表清空引用；引用的必填与有效性校验通过组件内的表单项加入节点外层表单，自定义范围不校验
-隐藏引用，也不新增知识库必填限制。文档标签检索后续可以复用该组件，标签加载与过滤仍归节点。
+隐藏引用，也不新增知识库必填限制。文档标签的加载与过滤仍归文档标签检索节点。
 
 节点自身的表单、状态和专属校验留在节点目录；多个节点共享且属于画布基础协议的能力才上移到
 `core`。节点应复用 `core/node-container/index.vue`，需要选择上游节点字段时复用
@@ -167,6 +176,10 @@ AI 对话、意图识别、问题优化、参数提取、图片理解、视频
 
 AI 对话节点的 `component/resource-setting` 仅渲染技能卡片内的 MCP、工具、Skills 和智能体分组，
 各分组直接在入口使用 `MkCollapse`，不再拆分普通列表子组件，仅选择弹窗独立封装。
+工具和 Skills 的添加入口复用 `SelectToolDialog`，智能体入口使用 `SelectApplicationDialog`；
+Skills 仅查询 SKILL 类型，选择器排除当前路由对应的智能体或工具。确认后同时更新执行用的
+ID 数组及 `tool_list`、`skill_tool_list`、`application_list` 回显快照；移除时同步清理快照，
+取消不更新节点，旧数据缺少快照时继续显示 ID。
 标题、输出执行过程开关与 `mk-white-card` 由节点入口维护。组件通过 `setting`
 读取资源配置、通过 `update` 提交局部变更；资源选项由 Props 传入，未接入数据源时默认为空数组，
 已关联但缺少详情的资源保留 ID 回退展示。
@@ -177,9 +190,12 @@ AI 对话节点的提示词、历史记录、视觉理解和输出思考表单
 节点的正向与负向提示词同样使用 `MdEditorMagnify`，必填字段由所在节点表单统一校验。
 
 文档内容提取、多路召回和文档标签检索节点使用统一的节点标题、`mk-gray-card`、表单必填标记与
-`MkIcon`。多路召回的独立参数弹窗位于节点 `component/`，复用 `MkDialog` 和 `MkSlider`；
-重排内容与标签条件允许删除到空列表，保留原有列表语义。文档标签检索复用
-`SelectKnowledgeDialog`，保留知识库快照及缺少详情的关联 ID。
+`MkIcon`。多路召回的参数设置按钮与弹窗封装在节点 `component/SearchSetting.vue`，通过
+`v-model` 接收检索参数，保存时深拷贝回写，取消不修改节点；弹窗复用 `MkDialog` 和 `MkSlider`。
+重排内容使用 `MkFormList` 并隐藏内置添加按钮，由标题栏按钮深拷贝新增空引用，保留至少一行；
+标签条件使用 `MkFormList`，设置 `minRows` 为 `0`，保留允许删除到空列表的语义。文档标签检索通过
+`NodeSearchScope` 复用知识库选择，保留知识库快照及缺少详情的关联 ID；标签条件使用
+`MkFormList` 并设置 `minRows` 为 `0`，节点模型统一将新建及已有节点宽度设为 `455`。
 `ApplicationWorkflowView` 和 `ToolWorkflowView` 提供 `getKnowledgeTags` 与 `getRerankerModels`
 注入接口，分别用于文档标签选项与重排模型查询；新增模型后直接重新查询，不读取已有模型列表缓存。
 标签请求只回写当前关联知识库的结果，过期或节点卸载后的响应不再修改节点。
diff --git a/ui/src/workflow-canvas/component/node-model-select/index.vue b/ui/src/workflow-canvas/component/node-model-select/index.vue
index bac85fad812..818f4407a86 100644
--- a/ui/src/workflow-canvas/component/node-model-select/index.vue
+++ b/ui/src/workflow-canvas/component/node-model-select/index.vue
@@ -15,16 +15,20 @@ const props = withDefaults(
     nodeModel: WorkflowNodeModel
     formData: NodeModelData
     fields?: NodeModelFields
+    canEditParams?: boolean
+    canAdd?: boolean
     modelType: DefaultModelType
     label: string
     options: ModelItem[]
     providerOptions: ModelProviderItem[]
   }>(),
   {
+    canEditParams: true,
+    canAdd: false,
     fields: () => ({ source: 'model_id_type', id: 'model_id', reference: 'model_id_reference', params: 'model_params_setting' }),
   },
 )
-const emit = defineEmits<{ update: [patch: Partial<NodeModelData>] }>()
+const emit = defineEmits<{ update: [patch: Partial<NodeModelData>]; refresh: [] }>()
 const formItemRef = useTemplateRef<FormItemInstance>('formItemRef')
 const modelCascaderRef = useTemplateRef<InstanceType<typeof NodeCascader>>('modelCascaderRef')
 
@@ -40,6 +44,10 @@ function changeSource(value: NodeModelSource) {
   nextTick(() => formItemRef.value?.clearValidate())
 }
 
+function updateModelParams(params: Record<string, unknown>) {
+  if (props.canEditParams && props.fields.params) emit('update', { [props.fields.params]: params })
+}
+
 // 注册到节点的外层表单，引用有效性失败也由同一个表单项展示。
 async function validateModel() {
   if (source.value === 'reference') {
@@ -96,13 +104,15 @@ onBeforeUnmount(() => anchorGuard.reset())
     <SelectModel
       v-else-if="source === 'custom'"
       :model-value="modelId"
-      :model-params="formData[fields.params]"
+      :model-params="fields.params ? formData[fields.params] : undefined"
       :options="options"
       :provider-options="providerOptions"
-      can-edit-params
+      :can-edit-params="canEditParams && !!fields.params"
+      :can-add="canAdd"
       :placeholder="`请选择${label}`"
       @update:model-value="emit('update', { [fields.id]: $event })"
-      @update:model-params="emit('update', { [fields.params]: $event })"
+      @update:model-params="updateModelParams"
+      @refresh="emit('refresh')"
       @visible-change="anchorGuard.setOverlayVisible('model', $event)"
       @wheel="handleNodeWheel"
     />
diff --git a/ui/src/workflow-canvas/component/node-model-select/types.ts b/ui/src/workflow-canvas/component/node-model-select/types.ts
index b16bcfa7365..65bd6092b06 100644
--- a/ui/src/workflow-canvas/component/node-model-select/types.ts
+++ b/ui/src/workflow-canvas/component/node-model-select/types.ts
@@ -10,15 +10,25 @@ export interface NodeModelData {
   tts_model_id_type?: NodeModelSource
   tts_model_id?: string
   tts_model_id_reference?: string[]
-  model_params_setting: Record<string, unknown>
+  reranker_model_id_type?: NodeModelSource
+  reranker_model_id?: string
+  reranker_model_id_reference?: string[]
+  model_params_setting?: Record<string, unknown>
 }
 
 // 映射仅支持现有节点协议，同一组来源、模型和引用字段保持对应。
-export type NodeModelFields = {
-  [Prefix in '' | 'stt_' | 'tts_']: {
-    source: `${Prefix}model_id_type`
-    id: `${Prefix}model_id`
-    reference: `${Prefix}model_id_reference`
-    params: 'model_params_setting'
-  }
-}['' | 'stt_' | 'tts_']
+export type NodeModelFields =
+  | {
+      [Prefix in '' | 'stt_' | 'tts_']: {
+        source: `${Prefix}model_id_type`
+        id: `${Prefix}model_id`
+        reference: `${Prefix}model_id_reference`
+        params: 'model_params_setting'
+      }
+    }['' | 'stt_' | 'tts_']
+  | {
+      source: 'reranker_model_id_type'
+      id: 'reranker_model_id'
+      reference: 'reranker_model_id_reference'
+      params?: never
+    }
diff --git a/ui/src/workflow-canvas/config/node-data.ts b/ui/src/workflow-canvas/config/node-data.ts
index 3892475a2e1..2090a90604b 100644
--- a/ui/src/workflow-canvas/config/node-data.ts
+++ b/ui/src/workflow-canvas/config/node-data.ts
@@ -300,9 +300,7 @@ export const searchDocumentNode = {
   type: WorkflowNodeType.SearchDocument,
   text: '从设定的检索范围中，根据文档标签检索出满足条件的文档',
   label: '文档标签检索',
-  height: 355,
   properties: {
-    width: 600,
     stepName: '文档标签检索',
     config: {
       fields: [
@@ -318,7 +316,6 @@ export const documentExtractNode = {
   type: WorkflowNodeType.DocumentExtractNode,
   text: '解析输入文档，输出结构化文档内容',
   label: '文档内容提取',
-  height: 252,
   properties: {
     stepName: '文档内容提取',
     config: {
@@ -335,7 +332,6 @@ export const rerankerNode = {
   type: WorkflowNodeType.RerankerNode,
   text: '使用重排模型对多个知识库的检索结果进行二次召回',
   label: '多路召回',
-  height: 252,
   properties: {
     stepName: '多路召回',
     config: {
diff --git a/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/McpSettingDialog.vue b/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/McpSettingDialog.vue
index b1aa706fed0..04f4e7d1fc0 100644
--- a/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/McpSettingDialog.vue
+++ b/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/McpSettingDialog.vue
@@ -1,14 +1,18 @@
 <script setup lang="ts">
-import { nextTick, ref, useTemplateRef } from 'vue'
+import { inject, onBeforeUnmount, ref, useTemplateRef } from 'vue'
 import { cloneDeep } from 'lodash'
 import type { FormInstance } from 'element-plus'
+import { TOOL_TYPE } from '@/api/enums'
+import type { ToolItem } from '@/api/types'
+import { useWorkflowStore } from '@/workflow-canvas/store'
 import { MsgError } from '@/utils/message'
-import type { McpSetting, McpSource, ToolResourceOption } from '../../types'
+import type { McpSetting, McpSource } from '../../types'
 
 defineOptions({ name: 'AiChatNodeMcpSettingDialog' })
 
-defineProps<{ options: ToolResourceOption[] }>()
-const emit = defineEmits<{ submit: [setting: McpSetting] }>()
+const emit = defineEmits<{ submit: [setting: McpSetting]; loaded: [tools: ToolItem[]] }>()
+const apiType = inject<string>('apiType', 'workspace')
+const store = useWorkflowStore(apiType)
 
 const MCP_SERVER_EXAMPLE = `{
   "math": {
@@ -21,11 +25,36 @@ const visible = ref(false)
 const formRef = useTemplateRef<FormInstance>('formRef')
 const formData = ref<McpSetting>({ mcp_servers: '', mcp_source: 'referencing', mcp_tool_ids: [] })
 
+// 每次打开刷新包含共享资源的 MCP 工具，关闭或重新打开后忽略旧响应。
+const mcpOptions = ref<ToolItem[]>([])
+const loading = ref(false)
+let requestVersion = 0
+function resetData() {
+  requestVersion++
+  loading.value = false
+  mcpOptions.value = []
+  formData.value = { mcp_servers: '', mcp_source: 'referencing', mcp_tool_ids: [] }
+  formRef.value?.clearValidate()
+}
+onBeforeUnmount(() => requestVersion++)
+
 function open(setting: McpSetting) {
+  resetData()
   formData.value = cloneDeep(setting)
   if (formData.value.mcp_servers) formData.value.mcp_source = 'custom'
   visible.value = true
-  nextTick(() => formRef.value?.clearValidate())
+  const version = ++requestVersion
+  loading.value = true
+  return store.force
+    .getToolListWithShared({ tool_type: TOOL_TYPE.MCP })
+    .then((tools) => {
+      if (version !== requestVersion || !visible.value) return
+      mcpOptions.value = tools
+      emit('loaded', tools)
+    })
+    .finally(() => {
+      if (version === requestVersion) loading.value = false
+    })
 }
 
 function changeSource(source: McpSource) {
@@ -53,12 +82,12 @@ defineExpose({ open })
 </script>
 
 <template>
-  <MkDialog v-model="visible" title="MCP 设置" width="600">
+  <MkDialog v-model="visible" title="MCP 设置" @closed="resetData">
     <el-form ref="formRef" :model="formData" label-position="top" require-asterisk-position="right" @submit.prevent>
       <el-form-item>
         <el-radio-group :model-value="formData.mcp_source" @update:model-value="changeSource">
-          <el-radio value="referencing">引用 MCP 工具</el-radio>
-          <el-radio value="custom">自定义 MCP 服务</el-radio>
+          <el-radio value="referencing">引用 MCP</el-radio>
+          <el-radio value="custom">自定义</el-radio>
         </el-radio-group>
       </el-form-item>
 
@@ -68,8 +97,8 @@ defineExpose({ open })
         prop="mcp_tool_ids"
         :rules="{ type: 'array', required: true, message: '请选择 MCP 工具', trigger: 'change' }"
       >
-        <el-select v-model="formData.mcp_tool_ids" class="w-full" filterable multiple placeholder="请选择 MCP 工具">
-          <el-option v-for="option in options" :key="option.id" :label="option.name" :value="option.id">
+        <el-select v-model="formData.mcp_tool_ids" class="w-full" :loading="loading" filterable multiple placeholder="请选择 MCP 工具">
+          <el-option v-for="option in mcpOptions" :key="option.id" :label="option.name" :value="option.id">
             <div class="flex items-center gap-2">
               <ToolIcon :icon="option.icon" :size="20" :type="option.tool_type" />
               <span>{{ option.name }}</span>
diff --git a/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/index.vue b/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/index.vue
index 2f42d85b5c2..a11ece0c1ee 100644
--- a/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/index.vue
+++ b/ui/src/workflow-canvas/nodes/ai-chat-node/component/resource-setting/index.vue
@@ -1,5 +1,11 @@
 <script setup lang="ts">
-import { computed, useTemplateRef } from 'vue'
+import { computed, nextTick, ref, useTemplateRef } from 'vue'
+import { useRoute } from 'vue-router'
+import { cloneDeep } from 'lodash'
+import { TOOL_TYPE } from '@/api/enums'
+import type { ApplicationDetail, ToolItem } from '@/api/types'
+import SelectApplicationDialog from '@/components/business/select-application-dialog/index.vue'
+import SelectToolDialog from '@/components/business/select-tool-dialog/index.vue'
 import type { ApplicationResourceOption, ResourceSetting, ToolResourceOption } from '../../types'
 import McpSettingDialog from './McpSettingDialog.vue'
 
@@ -26,25 +32,63 @@ const emit = defineEmits<{ update: [setting: Partial<ResourceSetting>] }>()
 
 const mcpDialogRef = useTemplateRef<InstanceType<typeof McpSettingDialog>>('mcpDialogRef')
 
+const route = useRoute()
+const toolDialogRef = useTemplateRef<InstanceType<typeof SelectToolDialog>>('toolDialogRef')
+const selectingSkills = ref(false)
+const applicationDialogRef = useTemplateRef<InstanceType<typeof SelectApplicationDialog>>('applicationDialogRef')
+const excludedToolIds = computed(() => (typeof route.params.toolId === 'string' ? [route.params.toolId] : []))
+const excludedApplicationIds = computed(() => (typeof route.params.applicationId === 'string' ? [route.params.applicationId] : []))
+
+// 等待标题和类型 Props 更新后再打开，确保查询使用本次选择的资源类型。
+function openToolDialog(skills: boolean) {
+  selectingSkills.value = skills
+  nextTick(() => toolDialogRef.value?.open(skills ? selectedSkills.value : selectedTools.value))
+}
+
+function submitToolDialog(tools: (Partial<ToolItem> & { id: string })[]) {
+  if (selectingSkills.value) submitSkills(tools)
+  else submitTools(tools)
+}
+
+// 同时写回执行所需 ID 和回显快照，关闭后再次打开仍保留选择。
+function submitTools(tools: (Partial<ToolItem> & { id: string })[]) {
+  updateSetting({ tool_ids: tools.map(({ id }) => id), tool_list: cloneDeep(tools) })
+}
+function submitSkills(tools: (Partial<ToolItem> & { id: string })[]) {
+  updateSetting({ skill_tool_ids: tools.map(({ id }) => id), skill_tool_list: cloneDeep(tools) })
+}
+function submitApplications(applications: (Partial<ApplicationDetail> & { id: string })[]) {
+  updateSetting({ application_ids: applications.map(({ id }) => id), application_list: cloneDeep(applications) })
+}
+
+const loadedMcpOptions = ref<ToolItem[]>([])
 const selectedMcpTools = computed(() =>
   props.setting.mcp_tool_ids.map(
-    (id) => props.mcpOptions.find((option) => option.id === id) ?? { id, name: `已选 MCP（${id}）`, tool_type: 'MCP' as const },
+    (id) =>
+      loadedMcpOptions.value.find((option) => option.id === id) ??
+      props.mcpOptions.find((option) => option.id === id) ?? { id, name: `已选 MCP（${id}）`, tool_type: 'MCP' as const },
   ),
 )
 const mcpCount = computed(() => props.setting.mcp_tool_ids.length + Number(Boolean(props.setting.mcp_servers)))
 
 const selectedTools = computed(() =>
-  props.setting.tool_ids.map(
-    (id) => props.toolOptions.find((option) => option.id === id) ?? { id, name: `已选资源（${id}）`, icon: undefined, tool_type: undefined },
-  ),
+  props.setting.tool_ids.map((id) => {
+    const tool = props.toolOptions.find((option) => option.id === id) ?? props.setting.tool_list?.find((option) => option.id === id)
+    return { ...tool, id, icon: tool?.icon, tool_type: tool?.tool_type, name: tool?.name || `已选资源（${id}）` }
+  }),
 )
 const selectedSkills = computed(() =>
-  props.setting.skill_tool_ids.map(
-    (id) => props.skillOptions.find((option) => option.id === id) ?? { id, name: `已选资源（${id}）`, icon: undefined, tool_type: undefined },
-  ),
+  props.setting.skill_tool_ids.map((id) => {
+    const tool = props.skillOptions.find((option) => option.id === id) ?? props.setting.skill_tool_list?.find((option) => option.id === id)
+    return { ...tool, id, icon: tool?.icon, tool_type: tool?.tool_type, name: tool?.name || `已选资源（${id}）` }
+  }),
 )
-const selectedApplications = computed<ApplicationResourceOption[]>(() =>
-  props.setting.application_ids.map((id) => props.applicationOptions.find((option) => option.id === id) ?? { id, name: `已选资源（${id}）` }),
+const selectedApplications = computed(() =>
+  props.setting.application_ids.map((id) => {
+    const application =
+      props.applicationOptions.find((option) => option.id === id) ?? props.setting.application_list?.find((option) => option.id === id)
+    return { ...application, id, icon: application?.icon, name: application?.name || `已选资源（${id}）` }
+  }),
 )
 
 function updateSetting(changes: Partial<ResourceSetting>) {
@@ -52,6 +96,9 @@ function updateSetting(changes: Partial<ResourceSetting>) {
 }
 
 function removeId(field: 'application_ids' | 'mcp_tool_ids' | 'skill_tool_ids' | 'tool_ids', id: string) {
+  if (field === 'tool_ids') return submitTools(selectedTools.value.filter((resource) => resource.id !== id))
+  if (field === 'skill_tool_ids') return submitSkills(selectedSkills.value.filter((resource) => resource.id !== id))
+  if (field === 'application_ids') return submitApplications(selectedApplications.value.filter((resource) => resource.id !== id))
   updateSetting({ [field]: props.setting[field].filter((resourceId) => resourceId !== id) })
 }
 </script>
@@ -97,7 +144,7 @@ function removeId(field: 'application_ids' | 'mcp_tool_ids' | 'skill_tool_ids' |
           <span
             >工具<span v-if="selectedTools.length">（{{ selectedTools.length }}）</span></span
           >
-          <el-button link type="primary" title="添加工具" @click.stop="toolDialogRef?.open(setting.tool_ids)">
+          <el-button text type="primary" title="添加工具" @click.stop="openToolDialog(false)">
             <MkIcon name="icon_add_outlined" />
           </el-button>
         </div>
@@ -122,7 +169,7 @@ function removeId(field: 'application_ids' | 'mcp_tool_ids' | 'skill_tool_ids' |
           <span
             >Skills<span v-if="selectedSkills.length">（{{ selectedSkills.length }}）</span></span
           >
-          <el-button link type="primary" title="添加Skills" @click.stop="skillDialogRef?.open(setting.skill_tool_ids)">
+          <el-button text type="primary" title="添加Skills" @click.stop="openToolDialog(true)">
             <MkIcon name="icon_add_outlined" />
           </el-button>
         </div>
@@ -147,7 +194,7 @@ function removeId(field: 'application_ids' | 'mcp_tool_ids' | 'skill_tool_ids' |
           <span
             >智能体<span v-if="selectedApplications.length">（{{ selectedApplications.length }}）</span></span
           >
-          <el-button link type="primary" title="添加智能体" @click.stop="applicationDialogRef?.open(setting.application_ids)">
+          <el-button text type="primary" title="添加智能体" @click.stop="applicationDialogRef?.open(selectedApplications)">
             <MkIcon name="icon_add_outlined" />
           </el-button>
         </div>
@@ -167,5 +214,13 @@ function removeId(field: 'application_ids' | 'mcp_tool_ids' | 'skill_tool_ids' |
     </MkCollapse>
   </div>
 
-  <!-- <McpSettingDialog ref="mcpDialogRef" :options="mcpOptions" @submit="updateSetting" /> -->
+  <SelectToolDialog
+    ref="toolDialogRef"
+    :title="selectingSkills ? 'Skills' : '工具'"
+    :tool-types="selectingSkills ? [TOOL_TYPE.SKILL] : undefined"
+    :excluded-ids="excludedToolIds"
+    @submit="submitToolDialog"
+  />
+  <SelectApplicationDialog v-if="showApplications" ref="applicationDialogRef" :excluded-ids="excludedApplicationIds" @submit="submitApplications" />
+  <McpSettingDialog ref="mcpDialogRef" @loaded="loadedMcpOptions = $event" @submit="updateSetting" />
 </template>
diff --git a/ui/src/workflow-canvas/nodes/ai-chat-node/types.ts b/ui/src/workflow-canvas/nodes/ai-chat-node/types.ts
index a9029ebc494..107485d0519 100644
--- a/ui/src/workflow-canvas/nodes/ai-chat-node/types.ts
+++ b/ui/src/workflow-canvas/nodes/ai-chat-node/types.ts
@@ -40,6 +40,9 @@ export interface McpSetting {
 }
 
 export interface ResourceSetting extends McpSetting {
+  application_list?: (Partial<ApplicationDetail> & { id: string })[]
+  tool_list?: (Partial<ToolItem> & { id: string })[]
+  skill_tool_list?: (Partial<ToolItem> & { id: string })[]
   application_ids: string[]
   mcp_output_enable: boolean
   skill_tool_ids: string[]
diff --git a/ui/src/workflow-canvas/nodes/mcp-node/index.vue b/ui/src/workflow-canvas/nodes/mcp-node/index.vue
index 6252d7d3258..e0a32d9b6ea 100644
--- a/ui/src/workflow-canvas/nodes/mcp-node/index.vue
+++ b/ui/src/workflow-canvas/nodes/mcp-node/index.vue
@@ -94,6 +94,7 @@
   </NodeContainer>
 </template>
 <script setup lang="ts">
+import { TOOL_TYPE } from '@/api/enums'
 import { computed, inject, onMounted, ref, type Ref, useTemplateRef } from 'vue'
 import { set } from 'lodash'
 import type { BaseNodeModel } from '@logicflow/core'
@@ -385,7 +386,7 @@ const validate = () => {
 }
 
 async function getMcpToolSelectOptions() {
-  const tools = await store.getAllToolList({ folder_id: 'default', tool_type_list: ['MCP'] })
+  const tools = await store.getToolListWithShared({ tool_type: TOOL_TYPE.MCP })
   mcpToolSelectOptions.value = tools.filter((item) => item.is_active)
 }
 
diff --git a/ui/src/workflow-canvas/nodes/reranker-node/component/ParamSettingDialog.vue b/ui/src/workflow-canvas/nodes/reranker-node/component/SearchSetting.vue
similarity index 68%
rename from ui/src/workflow-canvas/nodes/reranker-node/component/ParamSettingDialog.vue
rename to ui/src/workflow-canvas/nodes/reranker-node/component/SearchSetting.vue
index c899e946893..fc1582bc3a4 100644
--- a/ui/src/workflow-canvas/nodes/reranker-node/component/ParamSettingDialog.vue
+++ b/ui/src/workflow-canvas/nodes/reranker-node/component/SearchSetting.vue
@@ -4,8 +4,8 @@ import { cloneDeep } from 'lodash'
 import type { FormInstance } from 'element-plus'
 import type { RerankerSetting } from '../types'
 
-defineOptions({ name: 'RerankerParamSettingDialog' })
-const emit = defineEmits<{ submit: [setting: RerankerSetting] }>()
+defineOptions({ name: 'RerankerSearchSetting' })
+const setting = defineModel<RerankerSetting>({ required: true })
 const visible = ref(false)
 const formRef = useTemplateRef<FormInstance>('formRef')
 const defaultForm: RerankerSetting = { top_n: 3, similarity: 0, max_paragraph_char_number: 5000 }
@@ -15,24 +15,27 @@ function resetData() {
   formData.value = cloneDeep(defaultForm)
   formRef.value?.clearValidate()
 }
-function open(setting: RerankerSetting) {
-  formData.value = { ...cloneDeep(defaultForm), ...cloneDeep(setting) }
+function open() {
+  resetData()
+  formData.value = { ...cloneDeep(defaultForm), ...cloneDeep(setting.value) }
   visible.value = true
 }
 function submit() {
   formRef.value?.validate((valid) => {
     if (!valid) return
-    emit('submit', cloneDeep(formData.value))
+    setting.value = cloneDeep(formData.value)
     visible.value = false
   })
 }
-defineExpose({ open })
 </script>
 
 <template>
-  <MkDialog v-model="visible" title="参数设置" width="550" @closed="resetData">
+  <el-button text type="primary" title="参数设置" @click="open">
+    <MkIcon name="icon-setting" :size="20" />
+  </el-button>
+  <MkDialog v-model="visible" align-center title="参数设置" width="550" @closed="resetData">
     <el-form ref="formRef" :model="formData" label-position="top" @submit.prevent>
-      <div class="grid grid-cols-2 gap-3">
+      <div class="grid grid-cols-2 gap-4">
         <el-form-item>
           <template #label>
             <span class="flex items-center gap-1">
@@ -42,6 +45,7 @@ defineExpose({ open })
           </template>
           <el-input-number
             v-model="formData.similarity"
+            class="w-full!"
             :min="0"
             :max="formData.search_mode === 'blend' ? 2 : 1"
             :precision="3"
@@ -52,15 +56,23 @@ defineExpose({ open })
           />
         </el-form-item>
         <el-form-item label="引用分段数 TOP">
-          <el-input-number v-model="formData.top_n" :min="1" :max="10000" :value-on-clear="1" controls-position="right" align="left" />
+          <el-input-number
+            class="w-full!"
+            v-model="formData.top_n"
+            :min="1"
+            :max="10000"
+            :value-on-clear="1"
+            controls-position="right"
+            align="left"
+          />
         </el-form-item>
       </div>
-      <el-form-item label="最多引用字符数">
+      <el-form-item label="最大引用字符数">
         <MkSlider v-model="formData.max_paragraph_char_number" show-input :min="500" :max="100000" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="visible = false">取消</el-button>
+      <el-button plain @click="visible = false">取消</el-button>
       <el-button type="primary" @click="submit">保存</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/workflow-canvas/nodes/reranker-node/index.vue b/ui/src/workflow-canvas/nodes/reranker-node/index.vue
index a8d2df9691e..1fe4ac87267 100644
--- a/ui/src/workflow-canvas/nodes/reranker-node/index.vue
+++ b/ui/src/workflow-canvas/nodes/reranker-node/index.vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
-import { computed, inject, onBeforeUnmount, onMounted, ref, useTemplateRef } from 'vue'
+import { computed, inject, onMounted, ref, useTemplateRef } from 'vue'
 import { cloneDeep } from 'lodash'
 import type { FormInstance } from 'element-plus'
 import type { ModelItem, ModelProviderItem } from '@/api/types'
-import SelectModel from '@/components/business/select-model/index.vue'
+import MkFormList from '@/components/mk-form-list/index.vue'
+import NodeModelSelect from '@/workflow-canvas/component/node-model-select/index.vue'
+import type { NodeModelData } from '@/workflow-canvas/component/node-model-select/types'
 import NodeContainer from '@/workflow-canvas/core/node-container/index.vue'
 import NodeCascader from '@/workflow-canvas/core/NodeCascader.vue'
 import type { WorkflowNodeModel } from '@/workflow-canvas/core/workflow-node'
-import { createAnchorGuard, handleNodeWheel } from '@/workflow-canvas/core/utils'
 import { useWorkflowStore } from '@/workflow-canvas/store'
-import ParamSettingDialog from './component/ParamSettingDialog.vue'
+import SearchSetting from './component/SearchSetting.vue'
 import type { RerankerSetting } from './types'
 
 defineOptions({ name: 'WorkflowRerankerNode' })
@@ -18,9 +19,6 @@ const apiType = inject<string>('apiType', 'workspace')
 const model = getModel()
 const store = useWorkflowStore(apiType)
 const formRef = useTemplateRef<FormInstance>('formRef')
-const questionCascaderRef = useTemplateRef<InstanceType<typeof NodeCascader>>('questionCascaderRef')
-const modelCascaderRef = useTemplateRef<InstanceType<typeof NodeCascader>>('modelCascaderRef')
-const paramSettingDialogRef = useTemplateRef<InstanceType<typeof ParamSettingDialog>>('paramSettingDialogRef')
 
 interface RerankerForm {
   reranker_reference_list: string[][]
@@ -57,13 +55,10 @@ model.properties.node_data = {
 }
 const formData = computed(() => model.properties.node_data as RerankerForm)
 
-// 重排内容允许删除到空列表，交由必填规则提示。
+// 标题栏添加重排内容，深拷贝回写以保持节点历史记录的数据独立。
 function addReference() {
   formData.value.reranker_reference_list = [...cloneDeep(formData.value.reranker_reference_list), []]
 }
-function removeReference(index: number) {
-  formData.value.reranker_reference_list = cloneDeep(formData.value.reranker_reference_list.filter((_, referenceIndex) => referenceIndex !== index))
-}
 
 // 模型来源与重排参数
 const modelOptions = ref<ModelItem[]>([])
@@ -74,24 +69,17 @@ function refreshModels() {
     modelOptions.value = models
   })
 }
-const defaultModelSetting = computed(() => model.getDefaultModelConfig('RERANKER'))
-function changeModelSource() {
-  formData.value.reranker_model_id_reference = []
-  formRef.value?.clearValidate(['reranker_model_id', 'reranker_model_id_reference'])
-}
-function openParamSetting() {
-  paramSettingDialogRef.value?.open(formData.value.reranker_setting)
+function updateModel(patch: Partial<NodeModelData>) {
+  model.properties.node_data = { ...formData.value, ...patch }
 }
-function updateParamSetting(setting: RerankerSetting) {
-  formData.value.reranker_setting = cloneDeep(setting)
+const settingRows = computed(() => [
+  { label: 'Score 高于', value: formData.value.reranker_setting.similarity.toFixed(3) },
+  { label: '引用分段数 TOP', value: formData.value.reranker_setting.top_n },
+  { label: '最大引用字符数', value: formData.value.reranker_setting.max_paragraph_char_number },
+])
+async function validate() {
+  return formRef.value?.validate().catch((error) => Promise.reject({ node: model, errMessage: error }))
 }
-function validate() {
-  return Promise.all([questionCascaderRef.value?.validate(), modelCascaderRef.value?.validate(), formRef.value?.validate()]).catch((error) =>
-    Promise.reject({ node: model, errMessage: error }),
-  )
-}
-const anchorGuard = createAnchorGuard(model)
-onBeforeUnmount(() => anchorGuard.reset())
 onMounted(() => {
   model.validate = validate
   refreshModels()
@@ -106,6 +94,7 @@ onMounted(() => {
     <h6 class="mk-title-decoration mb-2">节点设置</h6>
     <div class="mk-gray-card">
       <el-form ref="formRef" :model="formData" label-position="top" require-asterisk-position="right" @submit.prevent>
+        <!-- 重排内容 -->
         <el-form-item
           class="mk-hide-asterisk"
           prop="reranker_reference_list"
@@ -114,11 +103,13 @@ onMounted(() => {
           <template #label>
             <div class="flex-between">
               <span class="mk-required">重排内容</span>
-              <el-button link type="primary" title="添加重排内容" @click="addReference"><MkIcon name="icon_add_outlined" /></el-button>
+              <el-button text type="primary" title="添加重排内容" aria-label="添加重排内容" @click="addReference">
+                <MkIcon name="icon_add_outlined" />
+              </el-button>
             </div>
           </template>
-          <div class="flex w-full flex-col gap-2">
-            <div v-for="(_, index) in formData.reranker_reference_list" :key="index" class="flex items-start gap-2">
+          <MkFormList v-model="formData.reranker_reference_list" :default-item="[]" :first-row-has-label="false" :show-add-button="false">
+            <template #default="{ index }">
               <el-form-item
                 class="min-w-0 flex-1"
                 :prop="`reranker_reference_list.${index}`"
@@ -126,90 +117,49 @@ onMounted(() => {
               >
                 <NodeCascader v-model="formData.reranker_reference_list[index]!" :node-model="model" placeholder="请选择重排内容" />
               </el-form-item>
-              <el-button text title="删除重排内容" @click="removeReference(index)"
-                ><MkIcon name="icon_delete-trash_outlined" class="text-N600"
-              /></el-button>
-            </div>
-          </div>
+            </template>
+          </MkFormList>
         </el-form-item>
+        <!-- 检索参数 -->
         <el-form-item>
           <template #label>
             <div class="flex-between">
               <span>检索参数</span>
-              <el-button text type="primary" title="参数设置" @click="openParamSetting"><MkIcon name="icon-setting" /></el-button>
+              <SearchSetting v-model="formData.reranker_setting" />
             </div>
           </template>
-          <div class="grid w-full grid-cols-2 gap-y-1">
-            <span class="text-N600">Score 高于</span><span>{{ formData.reranker_setting.similarity.toFixed(3) }}</span>
-            <span class="text-N600">引用分段数 TOP</span><span>{{ formData.reranker_setting.top_n }}</span>
-            <span class="text-N600">最大引用字符数</span><span>{{ formData.reranker_setting.max_paragraph_char_number }}</span>
+          <div class="mk-white-card w-full">
+            <ul class="space-y-2">
+              <li v-for="row in settingRows" :key="row.label" class="flex gap-4">
+                <span class="w-28 shrink-0 text-N600">{{ row.label }}</span>
+                <span class="min-w-0 flex-1 truncate" :title="String(row.value)">{{ row.value }}</span>
+              </li>
+            </ul>
           </div>
         </el-form-item>
+        <!-- 检索问题 -->
         <el-form-item label="检索问题" prop="question_reference_address" :rules="{ required: true, message: '请选择检索问题', trigger: 'change' }">
           <NodeCascader ref="questionCascaderRef" v-model="formData.question_reference_address" :node-model="model" placeholder="请选择检索问题" />
         </el-form-item>
-        <el-form-item
-          class="mk-hide-asterisk"
-          :prop="formData.reranker_model_id_type === 'reference' ? 'reranker_model_id_reference' : 'reranker_model_id'"
-          :rules="{
-            required: formData.reranker_model_id_type !== 'default',
-            message: formData.reranker_model_id_type === 'reference' ? '请选择引用变量' : '请选择重排模型',
-            trigger: 'change',
-          }"
-        >
-          <template #label>
-            <div class="flex-between">
-              <span class="mk-required">重排模型</span>
-              <el-select
-                v-model="formData.reranker_model_id_type"
-                :teleported="false"
-                class="w-22!"
-                size="small"
-                @change="changeModelSource"
-                @visible-change="anchorGuard.setOverlayVisible('model-source', $event)"
-                @wheel="handleNodeWheel"
-              >
-                <el-option label="默认模型" value="default" /><el-option label="引用变量" value="reference" /><el-option
-                  label="自定义"
-                  value="custom"
-                />
-              </el-select>
-            </div>
-          </template>
-          <SelectModel
-            v-if="formData.reranker_model_id_type === 'custom'"
-            v-model="formData.reranker_model_id"
-            :options="modelOptions"
-            :provider-options="providerOptions"
-            can-add
-            :teleported="false"
-            @visible-change="anchorGuard.setOverlayVisible('model', $event)"
-            @wheel="handleNodeWheel"
-            placeholder="请选择重排模型"
-            @refresh="refreshModels"
-          />
-          <SelectModel
-            v-else-if="formData.reranker_model_id_type === 'default'"
-            :model-value="defaultModelSetting?.model_id ?? ''"
-            :options="modelOptions"
-            :provider-options="providerOptions"
-            disabled
-            placeholder="未配置默认模型"
-          />
-          <NodeCascader
-            v-else
-            ref="modelCascaderRef"
-            v-model="formData.reranker_model_id_reference"
-            :node-model="model"
-            placeholder="请选择引用变量"
-          />
-        </el-form-item>
+        <!-- 重排模型 -->
+        <NodeModelSelect
+          :node-model="model"
+          :form-data="formData"
+          :fields="{ source: 'reranker_model_id_type', id: 'reranker_model_id', reference: 'reranker_model_id_reference' }"
+          model-type="RERANKER"
+          label="重排模型"
+          :options="modelOptions"
+          :provider-options="providerOptions"
+          :can-edit-params="false"
+          can-add
+          @update="updateModel"
+          @refresh="refreshModels"
+        />
         <div class="flex-between">
           <span>结果显示在知识来源中</span>
           <el-switch v-model="formData.show_knowledge" size="small" />
         </div>
       </el-form>
     </div>
-    <ParamSettingDialog ref="paramSettingDialogRef" @submit="updateParamSetting" />
   </NodeContainer>
 </template>
diff --git a/ui/src/workflow-canvas/nodes/search-document-node/constant.ts b/ui/src/workflow-canvas/nodes/search-document-node/constant.ts
new file mode 100644
index 00000000000..61de04e8177
--- /dev/null
+++ b/ui/src/workflow-canvas/nodes/search-document-node/constant.ts
@@ -0,0 +1,9 @@
+import type { SearchCondition } from './types'
+
+export const compareOptions = [
+  { value: 'contain', label: '包含' },
+  { value: 'not_contain', label: '不包含' },
+  { value: 'eq', label: '等于' },
+] satisfies { value: SearchCondition['compare']; label: string }[]
+
+export const defaultSearchCondition: SearchCondition = { key: '', compare: 'contain', value: '' }
diff --git a/ui/src/workflow-canvas/nodes/search-document-node/index.ts b/ui/src/workflow-canvas/nodes/search-document-node/index.ts
index ad52e7df328..9fb1711b05e 100644
--- a/ui/src/workflow-canvas/nodes/search-document-node/index.ts
+++ b/ui/src/workflow-canvas/nodes/search-document-node/index.ts
@@ -8,4 +8,12 @@ class SearchDocumentNodeView extends WorkflowNodeView {
   }
 }
 
-export default { type: WorkflowNodeType.SearchDocument, model: WorkflowNodeModel, view: SearchDocumentNodeView }
+class SearchDocumentNodeModel extends WorkflowNodeModel {
+  override setAttributes() {
+    super.setAttributes()
+    this.width = 455
+    this.properties.width = 455
+  }
+}
+
+export default { type: WorkflowNodeType.SearchDocument, model: SearchDocumentNodeModel, view: SearchDocumentNodeView }
diff --git a/ui/src/workflow-canvas/nodes/search-document-node/index.vue b/ui/src/workflow-canvas/nodes/search-document-node/index.vue
index cfdf233fb13..b1c976ae11f 100644
--- a/ui/src/workflow-canvas/nodes/search-document-node/index.vue
+++ b/ui/src/workflow-canvas/nodes/search-document-node/index.vue
@@ -3,44 +3,23 @@ import { computed, inject, onBeforeUnmount, onMounted, ref, useTemplateRef, watc
 import { cloneDeep } from 'lodash'
 import type { FormInstance } from 'element-plus'
 import type { KnowledgeItem, KnowledgeTagGroup } from '@/api/types'
-import SelectKnowledgeDialog from '@/components/business/select-knowledge-dialog/index.vue'
+import MkFormList from '@/components/mk-form-list/index.vue'
+import NodeSearchScope from '@/workflow-canvas/component/node-search-scope/index.vue'
+import type { NodeSearchScopeData } from '@/workflow-canvas/component/node-search-scope/types'
 import NodeContainer from '@/workflow-canvas/core/node-container/index.vue'
 import NodeCascader from '@/workflow-canvas/core/NodeCascader.vue'
 import type { WorkflowNodeModel } from '@/workflow-canvas/core/workflow-node'
 import { createAnchorGuard, handleNodeWheel } from '@/workflow-canvas/core/utils'
 
+import { compareOptions, defaultSearchCondition } from './constant'
+import type { SearchDocumentForm } from './types'
+
 defineOptions({ name: 'WorkflowSearchDocumentNode' })
 const getModel = inject('getModel') as () => WorkflowNodeModel
 const getKnowledgeTags = inject('getKnowledgeTags') as (knowledgeIds: string[]) => Promise<KnowledgeTagGroup[]>
 const model = getModel()
 const formRef = useTemplateRef<FormInstance>('formRef')
-const scopeCascaderRef = useTemplateRef<InstanceType<typeof NodeCascader>>('scopeCascaderRef')
 const questionCascaderRef = useTemplateRef<InstanceType<typeof NodeCascader>>('questionCascaderRef')
-const knowledgeDialogRef = useTemplateRef<InstanceType<typeof SelectKnowledgeDialog>>('knowledgeDialogRef')
-
-interface SearchCondition {
-  key: string
-  compare: 'contain' | 'not_contain' | 'eq'
-  value: string
-}
-interface SearchDocumentForm {
-  knowledge_id_list: string[]
-  knowledge_list: (Partial<KnowledgeItem> & { id: string })[]
-  search_scope_type: 'custom' | 'referencing'
-  search_scope_source: 'knowledge' | 'document'
-  search_scope_reference: string[]
-  search_mode: 'auto' | 'custom'
-  question_reference: string[]
-  search_condition_type: 'AND' | 'OR'
-  search_condition_list: SearchCondition[]
-  knowledge_tags: KnowledgeTagGroup[]
-}
-const compareOptions = [
-  { value: 'contain', label: '包含' },
-  { value: 'not_contain', label: '不包含' },
-  { value: 'eq', label: '等于' },
-]
-const scopeExample = '示例：\n["019d8ac3-e2c6-7ff2-8956-c9c98f0e11f4", "019d8ac3-e2c6-7ff2-8956-c9c98f0e11f3"]'
 
 // 初始化只补齐缺失数据，保留已保存的检索范围与条件。
 const defaultForm: SearchDocumentForm = {
@@ -73,18 +52,12 @@ const selectedKnowledge = computed(() => {
   const knowledgeById = new Map(formData.value.knowledge_list.map((knowledge) => [knowledge.id, knowledge]))
   return formData.value.knowledge_id_list.map((id) => knowledgeById.get(id) ?? { id })
 })
-function openKnowledgeDialog() {
-  knowledgeDialogRef.value?.open(selectedKnowledge.value)
-}
 function updateKnowledge(knowledge: (Partial<KnowledgeItem> & { id: string })[]) {
   formData.value.knowledge_id_list = knowledge.map(({ id }) => id)
   formData.value.knowledge_list = cloneDeep(knowledge)
 }
-function removeKnowledge(knowledgeId: string) {
-  updateKnowledge(selectedKnowledge.value.filter(({ id }) => id !== knowledgeId))
-}
-function changeScopeSource() {
-  formData.value.search_scope_reference = []
+function updateSearchScope(patch: Partial<NodeSearchScopeData>) {
+  model.properties.node_data = { ...formData.value, ...patch }
 }
 
 // 标签选项随关联知识库刷新；请求过期或节点卸载后不再回写。
@@ -114,15 +87,10 @@ watch(
 function filterTags(keyword: string) {
   formData.value.knowledge_tags = allKnowledgeTags.value.filter((tag) => tag.key.includes(keyword)).slice(0, 100)
 }
-function addCondition() {
-  formData.value.search_condition_list = [...cloneDeep(formData.value.search_condition_list), { key: '', compare: 'contain', value: '' }]
-}
-function removeCondition(index: number) {
-  formData.value.search_condition_list = cloneDeep(formData.value.search_condition_list.filter((_, conditionIndex) => conditionIndex !== index))
-}
 
+// 范围引用由公共组件加入表单校验，自动检索保留问题引用有效性检查。
 function validate() {
-  return Promise.all([scopeCascaderRef.value?.validate(), questionCascaderRef.value?.validate(), formRef.value?.validate()]).catch((error) =>
+  return Promise.all([questionCascaderRef.value?.validate(), formRef.value?.validate()]).catch((error) =>
     Promise.reject({ node: model, errMessage: error }),
   )
 }
@@ -141,72 +109,15 @@ onMounted(() => {
     <h6 class="mk-title-decoration mb-2">节点设置</h6>
     <div class="mk-gray-card">
       <el-form ref="formRef" :model="formData" label-position="top" require-asterisk-position="right" @submit.prevent>
-        <el-form-item>
-          <template #label>
-            <div class="flex-between">
-              <span>检索范围</span>
-              <div class="flex items-center gap-2">
-                <el-button v-if="formData.search_scope_type === 'custom'" link type="primary" title="添加关联知识库" @click="openKnowledgeDialog"
-                  ><MkIcon name="icon_add_outlined"
-                /></el-button>
-                <el-select
-                  v-model="formData.search_scope_type"
-                  :teleported="false"
-                  size="small"
-                  class="w-22!"
-                  @visible-change="anchorGuard.setOverlayVisible('scope-type', $event)"
-                  @wheel="handleNodeWheel"
-                >
-                  <el-option label="引用变量" value="referencing" /><el-option label="自定义" value="custom" />
-                </el-select>
-              </div>
-            </div>
-          </template>
-          <div v-if="formData.search_scope_type === 'custom'" class="w-full">
-            <span v-if="!selectedKnowledge.length" class="text-N600">请选择关联知识库</span>
-            <div v-else class="flex flex-col gap-2">
-              <div v-for="knowledge in selectedKnowledge" :key="knowledge.id" class="flex-between rounded-md border bg-white px-2 py-1">
-                <span class="flex min-w-0 items-center gap-2">
-                  <KnowledgeIcon :type="knowledge.type" :size="20" class="shrink-0" />
-                  <span class="truncate" :title="knowledge.name || knowledge.id">{{ knowledge.name || knowledge.id }}</span>
-                </span>
-                <el-button text title="移除知识库" @click="removeKnowledge(knowledge.id)"><MkIcon name="icon_close_outlined" /></el-button>
-              </div>
-            </div>
-          </div>
-          <el-form-item
-            v-else
-            class="mk-hide-asterisk w-full"
-            prop="search_scope_reference"
-            :rules="{ required: true, message: '请选择引用变量', trigger: 'change' }"
-          >
-            <template #label>
-              <div class="flex-between">
-                <span class="flex items-center gap-1">
-                  <span class="mk-required">选择变量</span>
-                  <el-tooltip placement="right">
-                    <template #content
-                      ><div class="font-mono whitespace-pre-wrap">{{ scopeExample }}</div></template
-                    >
-                    <MkIcon name="icon_info_outlined" class="text-N600!" />
-                  </el-tooltip>
-                </span>
-                <el-select
-                  v-model="formData.search_scope_source"
-                  :teleported="false"
-                  size="small"
-                  class="w-26!"
-                  @change="changeScopeSource"
-                  @visible-change="anchorGuard.setOverlayVisible('scope-source', $event)"
-                  @wheel="handleNodeWheel"
-                >
-                  <el-option label="知识库列表" value="knowledge" /><el-option label="文档列表" value="document" />
-                </el-select>
-              </div>
-            </template>
-            <NodeCascader ref="scopeCascaderRef" v-model="formData.search_scope_reference" :node-model="model" placeholder="请选择引用变量" />
-          </el-form-item>
-        </el-form-item>
+        <!-- 检索范围 -->
+        <NodeSearchScope
+          :node-model="model"
+          :form-data="formData"
+          :selected-knowledge="selectedKnowledge"
+          @update="updateSearchScope"
+          @update:knowledge="updateKnowledge"
+        />
+        <!-- 检索设置 -->
         <el-form-item label="检索设置">
           <el-radio-group v-model="formData.search_mode">
             <el-radio value="auto">
@@ -245,39 +156,45 @@ onMounted(() => {
             </el-select>
             条件
           </div>
-          <div class="flex flex-col gap-2">
-            <div v-for="(condition, index) in formData.search_condition_list" :key="index" class="flex items-start gap-2">
-              <el-select
-                v-model="condition.key"
-                filterable
-                :filter-method="filterTags"
-                :teleported="false"
-                class="min-w-0 flex-1"
-                placeholder="请选择标签"
-                @visible-change="anchorGuard.setOverlayVisible(`tag-${index}`, $event)"
-                @wheel="handleNodeWheel"
-              >
-                <el-option v-for="tag in formData.knowledge_tags" :key="tag.key" :label="tag.key" :value="tag.key" />
-              </el-select>
-              <el-select
-                v-model="condition.compare"
-                :teleported="false"
-                class="w-24!"
-                @visible-change="anchorGuard.setOverlayVisible(`compare-${index}`, $event)"
-                @wheel="handleNodeWheel"
-              >
-                <el-option v-for="option in compareOptions" :key="option.value" :value="option.value" :label="option.label" />
-              </el-select>
-              <el-input v-model="condition.value" placeholder="值或变量" class="min-w-0 flex-1" />
-              <el-button text title="删除条件" @click="removeCondition(index)"
-                ><MkIcon name="icon_delete-trash_outlined" class="text-N600"
-              /></el-button>
-            </div>
-          </div>
-          <el-button link type="primary" class="mt-2" @click="addCondition"><MkIcon name="icon_add_outlined" />添加条件</el-button>
+          <MkFormList
+            v-model="formData.search_condition_list"
+            :default-item="defaultSearchCondition"
+            :min-rows="0"
+            :first-row-has-label="false"
+            add-text="添加条件"
+          >
+            <template #default="{ item: condition, index }">
+              <el-form-item class="min-w-0 flex-1">
+                <el-select
+                  v-model="condition.key"
+                  filterable
+                  :filter-method="filterTags"
+                  :teleported="false"
+                  class="min-w-0 flex-1"
+                  placeholder="请选择标签"
+                  @visible-change="anchorGuard.setOverlayVisible(`tag-${index}`, $event)"
+                  @wheel="handleNodeWheel"
+                >
+                  <el-option v-for="tag in formData.knowledge_tags" :key="tag.key" :label="tag.key" :value="tag.key" />
+                </el-select>
+              </el-form-item>
+              <el-form-item class="w-24 shrink-0">
+                <el-select
+                  v-model="condition.compare"
+                  :teleported="false"
+                  @visible-change="anchorGuard.setOverlayVisible(`compare-${index}`, $event)"
+                  @wheel="handleNodeWheel"
+                >
+                  <el-option v-for="option in compareOptions" :key="option.value" :value="option.value" :label="option.label" />
+                </el-select>
+              </el-form-item>
+              <el-form-item class="min-w-0 flex-1">
+                <el-input v-model="condition.value" placeholder="值或变量" />
+              </el-form-item>
+            </template>
+          </MkFormList>
         </template>
       </el-form>
     </div>
-    <SelectKnowledgeDialog ref="knowledgeDialogRef" @submit="updateKnowledge" />
   </NodeContainer>
 </template>
diff --git a/ui/src/workflow-canvas/nodes/search-document-node/types.ts b/ui/src/workflow-canvas/nodes/search-document-node/types.ts
new file mode 100644
index 00000000000..f214d463076
--- /dev/null
+++ b/ui/src/workflow-canvas/nodes/search-document-node/types.ts
@@ -0,0 +1,18 @@
+import type { KnowledgeItem, KnowledgeTagGroup } from '@/api/types'
+import type { NodeSearchScopeData } from '@/workflow-canvas/component/node-search-scope/types'
+
+export interface SearchCondition {
+  key: string
+  compare: 'contain' | 'not_contain' | 'eq'
+  value: string
+}
+
+export interface SearchDocumentForm extends NodeSearchScopeData {
+  knowledge_id_list: string[]
+  knowledge_list: (Partial<KnowledgeItem> & { id: string })[]
+  search_mode: 'auto' | 'custom'
+  question_reference: string[]
+  search_condition_type: 'AND' | 'OR'
+  search_condition_list: SearchCondition[]
+  knowledge_tags: KnowledgeTagGroup[]
+}
diff --git a/ui/src/workflow-canvas/store/api/workspace/index.ts b/ui/src/workflow-canvas/store/api/workspace/index.ts
index f4a29b740b6..04bc2937802 100644
--- a/ui/src/workflow-canvas/store/api/workspace/index.ts
+++ b/ui/src/workflow-canvas/store/api/workspace/index.ts
@@ -19,6 +19,6 @@ export default {
   getProviderList: providerAPI.getProviderList,
   getModelParamsForm: modelAPI.getModelParamsForm,
   getMcpTools,
-  getAllToolList: toolAPI.getAllTool,
+  getToolListWithShared: toolAPI.getToolListWithShared,
   getToolById: toolAPI.getToolDetail,
 }
diff --git a/ui/src/workflow-canvas/store/index.ts b/ui/src/workflow-canvas/store/index.ts
index f35ed720928..e4083d9ae75 100644
--- a/ui/src/workflow-canvas/store/index.ts
+++ b/ui/src/workflow-canvas/store/index.ts
@@ -13,7 +13,7 @@ type ApiModule = {
   getProviderList: () => Promise<ModelProviderItem[]>
   getModelParamsForm: (modelId: string) => Promise<DynamicFormField[]>
   getMcpTools?: (resourceType: string, resourceId: string, mcpServers: string) => Promise<McpTool[]>
-  getAllToolList?: (query?: Dict<unknown>) => Promise<ToolItem[]>
+  getToolListWithShared?: (query?: Dict<unknown>) => Promise<ToolItem[]>
   getToolById?: (toolId: string) => Promise<ToolItem>
 }
 
@@ -23,7 +23,7 @@ export type WorkflowStoreApi = {
   getProviderList: () => Promise<ModelProviderItem[]>
   getModelParamsForm: (modelId: string) => Promise<DynamicFormField[]>
   getMcpTools: (resourceType: string, resourceId: string, mcpServers: string) => Promise<McpTool[]>
-  getAllToolList: (query?: Dict<unknown>) => Promise<ToolItem[]>
+  getToolListWithShared: (query?: Dict<unknown>) => Promise<ToolItem[]>
   getToolById: (toolId: string) => Promise<ToolItem>
 }
 
@@ -85,9 +85,9 @@ export function useWorkflowStore(apiType: string): WorkflowStore {
         if (!resolvedApi.getMcpTools) return Promise.resolve([])
         return withCache(`mcp-tools:${resourceType}:${resourceId}:${mcpServers}`, () => resolvedApi.getMcpTools!(resourceType, resourceId, mcpServers), force)
       },
-      getAllToolList(query?: Dict<unknown>): Promise<ToolItem[]> {
-        if (!resolvedApi.getAllToolList) return Promise.resolve([])
-        return withCache(`tool-list:${JSON.stringify(query ?? {})}`, () => resolvedApi.getAllToolList!(query), force)
+      getToolListWithShared(query?: Dict<unknown>): Promise<ToolItem[]> {
+        if (!resolvedApi.getToolListWithShared) return Promise.resolve([])
+        return withCache(`tool-list:${JSON.stringify(query ?? {})}`, () => resolvedApi.getToolListWithShared!(query), force)
       },
       getToolById(toolId: string): Promise<ToolItem> {
         if (!resolvedApi.getToolById) return Promise.resolve({} as ToolItem)