From 89ba7abe30fbb9de0c65168836dfd801805955d6 Mon Sep 17 00:00:00 2001
From: Zhichang Yu <yuzhichang@gmail.com>
Date: Wed, 26 Nov 2025 19:26:16 +0800
Subject: [PATCH 01/17] Check if PR is mergeable at first step

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 39c526104..4be4b06be 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
     name: ragflow_tests
     # https://docs.github.com/en/actions/using-jobs/using-conditions-to-control-job-execution
     # https://github.com/orgs/community/discussions/26261
-    if: ${{ github.event_name != 'pull_request_target' || contains(github.event.pull_request.labels.*.name, 'ci') }}
+    if: ${{ github.event_name != 'pull_request_target' || (contains(github.event.pull_request.labels.*.name, 'ci') && github.event.pull_request.mergeable == true) }}
     runs-on: [ "self-hosted", "ragflow-test" ]
     steps:
       # https://github.com/hmarr/debug-action

From 376eb15c638a8b1b960113ce940b418cc09b469c Mon Sep 17 00:00:00 2001
From: chanx <1243304602@qq.com>
Date: Wed, 26 Nov 2025 19:49:21 +0800
Subject: [PATCH 02/17] Fix: Refactoring and enhancing the functionality of the
 delete confirmation dialog component #10703 (#11542)

### What problem does this PR solve?

Fix: Refactoring and enhancing the functionality of the delete
confirmation dialog component

- Refactoring and enhancing the functionality of the delete confirmation
dialog component
- Modifying the style of the user center

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 web/src/components/bulk-operate-bar.tsx       |  15 ++-
 web/src/components/confirm-delete-dialog.tsx  | 110 ++++++++++++++----
 web/src/components/file-uploader.tsx          |   6 +-
 .../originui/select-with-search.tsx           |   4 +-
 web/src/components/ui/button.tsx              |   5 +
 web/src/hooks/common-hooks.tsx                |  15 +--
 web/src/locales/en.ts                         |  22 +++-
 web/src/locales/zh.ts                         |  17 ++-
 web/src/pages/agents/agent-dropdown.tsx       |  18 ++-
 .../dataset/knowledge-graph/force-graph.tsx   |  15 ++-
 web/src/pages/datasets/dataset-dropdown.tsx   |  18 ++-
 web/src/pages/files/action-cell.tsx           |  34 +++++-
 web/src/pages/next-chats/chat-dropdown.tsx    |  18 ++-
 .../pages/next-searches/search-dropdown.tsx   |  20 +++-
 .../component/added-source-card.tsx           |   2 +-
 .../component/delete-source-modal.tsx         |  30 +++--
 .../pages/user-setting/data-source/index.tsx  |   2 +-
 web/src/pages/user-setting/mcp/index.tsx      |  18 ++-
 web/src/pages/user-setting/mcp/mcp-card.tsx   |   2 +-
 .../pages/user-setting/mcp/mcp-operation.tsx  |  28 +++--
 .../setting-model/components/modal-card.tsx   |  37 ++++--
 .../setting-model/components/un-add-model.tsx |  24 ++--
 .../setting-model/{hooks.ts => hooks.tsx}     |   2 +-
 .../pages/user-setting/setting-team/hooks.ts  |   2 +-
 .../user-setting/setting-team/user-table.tsx  |  41 +++++--
 25 files changed, 393 insertions(+), 112 deletions(-)
 rename web/src/pages/user-setting/setting-model/{hooks.ts => hooks.tsx} (99%)

diff --git a/web/src/components/bulk-operate-bar.tsx b/web/src/components/bulk-operate-bar.tsx
index bf13c765d..84e69cfbd 100644
--- a/web/src/components/bulk-operate-bar.tsx
+++ b/web/src/components/bulk-operate-bar.tsx
@@ -1,9 +1,13 @@
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { cn } from '@/lib/utils';
+import { t } from 'i18next';
 import { BrushCleaning } from 'lucide-react';
 import { ReactNode, useCallback } from 'react';
-import { ConfirmDeleteDialog } from './confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from './confirm-delete-dialog';
 import { Separator } from './ui/separator';
 
 export type BulkOperateItemType = {
@@ -45,6 +49,15 @@ export function BulkOperateBar({
               <ConfirmDeleteDialog
                 hidden={!isDeleteItem(x.id)}
                 onOk={x.onClick}
+                title={t('deleteModal.delFiles')}
+                content={{
+                  title: t('common.deleteThem'),
+                  node: (
+                    <ConfirmDeleteDialogNode
+                      name={`${t('deleteModal.delFilesContent', { count })}`}
+                    ></ConfirmDeleteDialogNode>
+                  ),
+                }}
               >
                 <Button
                   variant={'ghost'}
diff --git a/web/src/components/confirm-delete-dialog.tsx b/web/src/components/confirm-delete-dialog.tsx
index 22e777146..cc85e8153 100644
--- a/web/src/components/confirm-delete-dialog.tsx
+++ b/web/src/components/confirm-delete-dialog.tsx
@@ -3,19 +3,30 @@ import {
   AlertDialogAction,
   AlertDialogCancel,
   AlertDialogContent,
+  AlertDialogDescription,
   AlertDialogFooter,
   AlertDialogHeader,
   AlertDialogTitle,
   AlertDialogTrigger,
 } from '@/components/ui/alert-dialog';
+import { AlertDialogOverlay } from '@radix-ui/react-alert-dialog';
 import { DialogProps } from '@radix-ui/react-dialog';
+import { X } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
+import { RAGFlowAvatar } from './ragflow-avatar';
+import { Separator } from './ui/separator';
 
 interface IProps {
   title?: string;
   onOk?: (...args: any[]) => any;
   onCancel?: (...args: any[]) => any;
   hidden?: boolean;
+  content?: {
+    title?: string;
+    node?: React.ReactNode;
+  };
+  okButtonText?: string;
+  cancelButtonText?: string;
 }
 
 export function ConfirmDeleteDialog({
@@ -27,6 +38,9 @@ export function ConfirmDeleteDialog({
   onOpenChange,
   open,
   defaultOpen,
+  content,
+  okButtonText,
+  cancelButtonText,
 }: IProps & DialogProps) {
   const { t } = useTranslation();
 
@@ -41,32 +55,78 @@ export function ConfirmDeleteDialog({
       defaultOpen={defaultOpen}
     >
       <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
-      <AlertDialogContent
-        onSelect={(e) => e.preventDefault()}
-        onClick={(e) => e.stopPropagation()}
-        className="bg-bg-base"
+      <AlertDialogOverlay
+        onClick={(e) => {
+          e.stopPropagation();
+        }}
       >
-        <AlertDialogHeader>
-          <AlertDialogTitle>
-            {title ?? t('common.deleteModalTitle')}
-          </AlertDialogTitle>
-          {/* <AlertDialogDescription>
-            This action cannot be undone. This will permanently delete your
-            account and remove your data from our servers.
-          </AlertDialogDescription> */}
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel onClick={onCancel}>
-            {t('common.no')}
-          </AlertDialogCancel>
-          <AlertDialogAction
-            className="bg-state-error text-text-primary hover:text-text-primary hover:bg-state-error"
-            onClick={onOk}
-          >
-            {t('common.yes')}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
+        <AlertDialogContent
+          onSelect={(e) => e.preventDefault()}
+          onClick={(e) => e.stopPropagation()}
+          className="bg-bg-base "
+        >
+          <AlertDialogHeader className="space-y-5">
+            <AlertDialogTitle>
+              {title ?? t('common.deleteModalTitle')}
+              <AlertDialogCancel
+                onClick={onCancel}
+                className="border-none bg-transparent hover:border-none hover:bg-transparent absolute right-3 top-3 hover:text-text-primary"
+              >
+                <X size={16} />
+              </AlertDialogCancel>
+            </AlertDialogTitle>
+            {content && (
+              <>
+                <Separator className="w-[calc(100%+48px)] -translate-x-6"></Separator>
+                <AlertDialogDescription className="mt-5">
+                  <div className="flex flex-col gap-5  text-base mb-10 px-5">
+                    <div className="text-text-primary">
+                      {content.title || t('common.deleteModalTitle')}
+                    </div>
+                    {content.node}
+                  </div>
+                </AlertDialogDescription>
+              </>
+            )}
+          </AlertDialogHeader>
+          <AlertDialogFooter className="px-5 flex items-center gap-2">
+            <AlertDialogCancel onClick={onCancel}>
+              {okButtonText || t('common.cancel')}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              className="bg-state-error text-text-primary hover:text-text-primary hover:bg-state-error"
+              onClick={onOk}
+            >
+              {cancelButtonText || t('common.delete')}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialogOverlay>
     </AlertDialog>
   );
 }
+
+export const ConfirmDeleteDialogNode = ({
+  avatar,
+  name,
+  children,
+}: {
+  avatar?: { avatar?: string; name?: string; isPerson?: boolean };
+  name?: string;
+  children?: React.ReactNode;
+}) => {
+  return (
+    <div className="flex items-center border-0.5 text-text-secondary border-border-button rounded-lg px-3 py-4">
+      {avatar && (
+        <RAGFlowAvatar
+          className="w-8 h-8"
+          avatar={avatar.avatar}
+          isPerson={avatar.isPerson}
+          name={avatar.name}
+        />
+      )}
+      {name && <div className="ml-3">{name}</div>}
+      {children}
+    </div>
+  );
+};
diff --git a/web/src/components/file-uploader.tsx b/web/src/components/file-uploader.tsx
index 414ab480d..a8860cfe0 100644
--- a/web/src/components/file-uploader.tsx
+++ b/web/src/components/file-uploader.tsx
@@ -274,7 +274,7 @@ export function FileUploader(props: FileUploaderProps) {
             className={cn(
               'group relative grid h-72 w-full cursor-pointer place-items-center rounded-lg border border-dashed border-border-default px-5 py-2.5 text-center transition hover:bg-border-button bg-bg-card',
               'ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
-              isDragActive && 'border-muted-foreground/50',
+              isDragActive && 'border-border-button',
               isDisabled && 'pointer-events-none opacity-60',
               className,
             )}
@@ -285,7 +285,7 @@ export function FileUploader(props: FileUploaderProps) {
               <div className="flex flex-col items-center justify-center gap-4 sm:px-5">
                 <div className="rounded-full border border-dashed p-3">
                   <Upload
-                    className="size-7 text-text-secondary"
+                    className="size-7 text-text-secondary hover:text-text-primary"
                     aria-hidden="true"
                   />
                 </div>
@@ -297,7 +297,7 @@ export function FileUploader(props: FileUploaderProps) {
               <div className="flex flex-col items-center justify-center gap-4 sm:px-5">
                 <div className="rounded-full border border-dashed p-3">
                   <Upload
-                    className="size-7 text-text-secondary"
+                    className="size-7 text-text-secondary hover:text-text-primary"
                     aria-hidden="true"
                   />
                 </div>
diff --git a/web/src/components/originui/select-with-search.tsx b/web/src/components/originui/select-with-search.tsx
index 3434ba36b..d606bf8db 100644
--- a/web/src/components/originui/select-with-search.tsx
+++ b/web/src/components/originui/select-with-search.tsx
@@ -186,7 +186,9 @@ export const SelectWithSearch = forwardRef<
               />
             )}
             <CommandList className="mt-2 outline-none">
-              <CommandEmpty>{emptyData}</CommandEmpty>
+              <CommandEmpty>
+                <div dangerouslySetInnerHTML={{ __html: emptyData }}></div>
+              </CommandEmpty>
               {options.map((group, idx) => {
                 if (group.options) {
                   return (
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
index 2f23249d2..3dd8606bb 100644
--- a/web/src/components/ui/button.tsx
+++ b/web/src/components/ui/button.tsx
@@ -53,6 +53,11 @@ const buttonVariants = cva(
           bg-text-primary text-bg-base border-b-4 border-b-accent-primary
           hover:bg-text-primary/90 focus-visible:bg-text-primary/90
         `,
+        delete: `
+          text-text-secondary
+          hover:bg-state-error-5 hover:text-state-error
+          focus-visible:text-state-error focus-visible:bg-state-error-5
+        `,
       },
       size: {
         default: 'h-8 px-2.5 py-1.5 ',
diff --git a/web/src/hooks/common-hooks.tsx b/web/src/hooks/common-hooks.tsx
index 7f7729ade..7ae9bc017 100644
--- a/web/src/hooks/common-hooks.tsx
+++ b/web/src/hooks/common-hooks.tsx
@@ -76,6 +76,7 @@ export function useDynamicSVGImport(
 }
 
 interface IProps {
+  header?: string | ReactNode;
   title?: string;
   content?: ReactNode;
   onOk?: (...args: any[]) => any;
@@ -85,19 +86,19 @@ interface IProps {
 export const useShowDeleteConfirm = () => {
   const { t } = useTranslation();
   const showDeleteConfirm = useCallback(
-    ({ title, content, onOk, onCancel }: IProps): Promise<number> => {
+    ({ title, content, onOk, onCancel, header }: IProps): Promise<number> => {
       return new Promise((resolve, reject) => {
         Modal.show({
-          // title: title ?? t('common.deleteModalTitle'),
-          closable: false,
+          title: header,
+          closable: !!header,
           visible: true,
           onVisibleChange: () => {
-            Modal.hide();
+            Modal.destroy();
           },
           footer: null,
           maskClosable: false,
-          okText: t('common.yes'),
-          cancelText: t('common.no'),
+          okText: t('common.delete'),
+          cancelText: t('common.cancel'),
           style: {
             width: '450px',
           },
@@ -114,7 +115,7 @@ export const useShowDeleteConfirm = () => {
           },
           onCancel: () => {
             onCancel?.();
-            Modal.hide();
+            Modal.destroy();
           },
           children: (
             <div className="flex flex-col justify-start items-start mt-3">
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 906d1b9ec..225d8c127 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -7,7 +7,8 @@ export default {
       selectPlaceholder: 'select value',
       selectAll: 'Select all',
       delete: 'Delete',
-      deleteModalTitle: 'Are you sure to delete this item?',
+      deleteModalTitle: 'Are you sure to delete it ?',
+      deleteThem: 'Are you sure to delete them ?',
       ok: 'Ok',
       cancel: 'Cancel',
       yes: 'Yes',
@@ -59,6 +60,7 @@ export default {
         urlPlaceholder: 'https://api.example.com/v1/mcp',
         tokenPlaceholder: 'e.g. eyJhbGciOiJIUzI1Ni...',
       },
+      selected: 'Selected',
     },
     login: {
       loginTitle: 'Sign in to Your Account',
@@ -92,7 +94,7 @@ export default {
       home: 'Home',
       setting: 'User settings',
       logout: 'Log out',
-      fileManager: 'File Management',
+      fileManager: 'File',
       flow: 'Agent',
       search: 'Search',
       welcome: 'Welcome to',
@@ -696,8 +698,9 @@ This auto-tagging feature enhances retrieval by adding another layer of domain-s
       tocEnhanceTip: ` During the parsing of the document, table of contents information was generated (see the 'Enable Table of Contents Extraction' option in the General method). This allows the large model to return table of contents items relevant to the user's query, thereby using these items to retrieve related chunks and apply weighting to these chunks during the sorting process. This approach is derived from mimicking the behavioral logic of how humans search for knowledge in books.`,
     },
     setting: {
+      deleteModel: 'Delete model',
       modelEmptyTip:
-        'No models available. Please add models from the panel on the right.',
+        'No models available. <br>Please add models from the panel on the right.',
       sourceEmptyTip: 'No data sources added yet. Select one below to connect.',
       seconds: 'seconds',
       minutes: 'minutes',
@@ -1917,6 +1920,7 @@ Important structured information may include: names, dates, locations, events, k
       editMCP: 'Edit MCP',
       toolsAvailable: 'tools available',
       mcpServers: 'MCP servers',
+      mcpServer: 'MCP server',
       customizeTheListOfMcpServers: 'Customize the list of MCP servers',
       cachedTools: 'cached tools',
       bulkManage: 'Bulk manage',
@@ -2014,6 +2018,18 @@ Important structured information may include: names, dates, locations, events, k
       processingFailedTip: 'Total failed processes',
       processing: 'Processing',
     },
+
+    deleteModal: {
+      delAgent: 'Delete agent',
+      delDataset: 'Delete dataset',
+      delSearch: 'Delete search',
+      delFile: 'Delete file',
+      delFiles: 'Delete files',
+      delFilesContent: 'Selected {{count}} files',
+      delChat: 'Delete chat',
+      delMember: 'Delete member',
+    },
+
     admin: {
       loginTitle: 'Admin Console',
       title: 'RAGFlow',
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index 46db2c2c3..e5b48bf56 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -8,6 +8,7 @@ export default {
       selectAll: '全选',
       delete: '删除',
       deleteModalTitle: '确定删除吗?',
+      deleteThem: '确定要删除吗？',
       ok: '确认',
       cancel: '取消',
       yes: '是',
@@ -51,6 +52,7 @@ export default {
       noDataFound: '没有找到数据。',
       noData: '暂无数据',
       promptPlaceholder: '请输入或使用 / 快速插入变量。',
+      selected: '已选择',
     },
     login: {
       loginTitle: '登录账户',
@@ -685,7 +687,8 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       tocEnhanceTip: `解析文档时生成了目录信息（见General方法的‘启用目录抽取’），让大模型返回和用户问题相关的目录项，从而利用目录项拿到相关chunk，对这些chunk在排序中进行加权。这种方法来源于模仿人类查询书本中知识的行为逻辑`,
     },
     setting: {
-      modelEmptyTip: '暂无可用模型，请先在右侧面板添加模型。',
+      deleteModel: '删除模型',
+      modelEmptyTip: '暂无可用模型,<br>请先在右侧面板添加模型。',
       sourceEmptyTip: '暂未添加任何数据源，请从下方选择一个进行连接。',
       seconds: '秒',
       minutes: '分',
@@ -1770,6 +1773,7 @@ Tokenizer 会根据所选方式将内容存储为对应的数据结构。`,
       editMCP: '编辑 MCP',
       toolsAvailable: '可用的工具',
       mcpServers: 'MCP 服务器',
+      mcpServer: 'MCP 服务器',
       customizeTheListOfMcpServers: '自定义 MCP 服务器列表',
       cachedTools: '缓存工具',
       selected: '已选择',
@@ -1866,5 +1870,16 @@ Tokenizer 会根据所选方式将内容存储为对应的数据结构。`,
       processingSuccessTip: '处理成功的文件总数',
       processingFailedTip: '处理失败的文件总数',
     },
+
+    deleteModal: {
+      delAgent: '删除智能体',
+      delDataset: '删除知识库',
+      delSearch: '删除搜索',
+      delFile: '删除文件',
+      delFiles: '删除文件',
+      delFilesContent: '已选择 {{count}} 个文件',
+      delChat: '删除聊天',
+      delMember: '删除成员',
+    },
   },
 };
diff --git a/web/src/pages/agents/agent-dropdown.tsx b/web/src/pages/agents/agent-dropdown.tsx
index 7a6ca8e3e..e6f54ccaa 100644
--- a/web/src/pages/agents/agent-dropdown.tsx
+++ b/web/src/pages/agents/agent-dropdown.tsx
@@ -1,4 +1,7 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -45,7 +48,18 @@ export function AgentDropdown({
           {t('common.rename')} <PenLine />
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <ConfirmDeleteDialog onOk={handleDelete}>
+        <ConfirmDeleteDialog
+          onOk={handleDelete}
+          title={t('deleteModal.delAgent')}
+          content={{
+            node: (
+              <ConfirmDeleteDialogNode
+                avatar={{ avatar: agent.avatar, name: agent.title }}
+                name={agent.title}
+              />
+            ),
+          }}
+        >
           <DropdownMenuItem
             className="text-state-error"
             onSelect={(e) => {
diff --git a/web/src/pages/dataset/knowledge-graph/force-graph.tsx b/web/src/pages/dataset/knowledge-graph/force-graph.tsx
index d2547e959..13a947e5c 100644
--- a/web/src/pages/dataset/knowledge-graph/force-graph.tsx
+++ b/web/src/pages/dataset/knowledge-graph/force-graph.tsx
@@ -3,6 +3,7 @@ import isEmpty from 'lodash/isEmpty';
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { buildNodesAndCombos } from './util';
 
+import { useIsDarkTheme } from '@/components/theme-provider';
 import styles from './index.less';
 
 const TooltipColorMap = {
@@ -19,7 +20,7 @@ interface IProps {
 const ForceGraph = ({ data, show }: IProps) => {
   const containerRef = useRef<HTMLDivElement>(null);
   const graphRef = useRef<Graph | null>(null);
-
+  const isDark = useIsDarkTheme();
   const nextData = useMemo(() => {
     if (!isEmpty(data)) {
       const graphData = data;
@@ -80,8 +81,13 @@ const ForceGraph = ({ data, show }: IProps) => {
       },
       node: {
         style: {
-          size: 150,
+          size: (d) => {
+            let size = 100 + ((d.rank as number) || 0) * 5;
+            size = size > 300 ? 300 : size;
+            return size;
+          },
           labelText: (d) => d.id,
+          labelFill: isDark ? 'rgba(255,255,255,1)' : 'rgba(0,0,0,1)',
           // labelPadding: 30,
           labelFontSize: 40,
           //   labelOffsetX: 20,
@@ -101,8 +107,9 @@ const ForceGraph = ({ data, show }: IProps) => {
           const weight: number = Number(model?.weight) || 2;
           const lineWeight = weight * 4;
           return {
-            stroke: '#99ADD1',
-            lineWidth: lineWeight > 10 ? 10 : lineWeight,
+            stroke: isDark ? 'rgba(255,255,255,0.5)' : 'rgba(0,0,0,0.5)',
+            lineDash: [10, 10],
+            lineWidth: lineWeight > 8 ? 8 : lineWeight,
           };
         },
       },
diff --git a/web/src/pages/datasets/dataset-dropdown.tsx b/web/src/pages/datasets/dataset-dropdown.tsx
index 774f87866..966ffcd49 100644
--- a/web/src/pages/datasets/dataset-dropdown.tsx
+++ b/web/src/pages/datasets/dataset-dropdown.tsx
@@ -1,4 +1,7 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -45,7 +48,18 @@ export function DatasetDropdown({
           {t('common.rename')} <PenLine />
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <ConfirmDeleteDialog onOk={handleDelete}>
+        <ConfirmDeleteDialog
+          onOk={handleDelete}
+          title={t('deleteModal.delDataset')}
+          content={{
+            node: (
+              <ConfirmDeleteDialogNode
+                avatar={{ avatar: dataset.avatar, name: dataset.name }}
+                name={dataset.name}
+              />
+            ),
+          }}
+        >
           <DropdownMenuItem
             className="text-state-error"
             onSelect={(e) => {
diff --git a/web/src/pages/files/action-cell.tsx b/web/src/pages/files/action-cell.tsx
index e477ed198..490665c11 100644
--- a/web/src/pages/files/action-cell.tsx
+++ b/web/src/pages/files/action-cell.tsx
@@ -1,13 +1,19 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
+import { FileIcon } from '@/components/icon-font';
 import NewDocumentLink from '@/components/new-document-link';
 import { Button } from '@/components/ui/button';
 import { useDownloadFile } from '@/hooks/file-manager-hooks';
 import { IFile } from '@/interfaces/database/file-manager';
+import { cn } from '@/lib/utils';
 import {
   getExtension,
   isSupportedPreviewDocumentType,
 } from '@/utils/document-util';
 import { CellContext } from '@tanstack/react-table';
+import { t } from 'i18next';
 import {
   ArrowDownToLine,
   Eye,
@@ -38,6 +44,9 @@ export function ActionCell({
 }: IProps) {
   const record = row.original;
   const documentId = record.id;
+  const name: string = row.getValue('name');
+  const type = record.type;
+
   const { downloadFile } = useDownloadFile();
   const isFolder = isFolderType(record.type);
   const extension = getExtension(record.name);
@@ -151,7 +160,28 @@ export function ActionCell({
         </DropdownMenuContent>
       </DropdownMenu> */}
       {isKnowledgeBase || (
-        <ConfirmDeleteDialog onOk={onRemoveFile}>
+        <ConfirmDeleteDialog
+          onOk={onRemoveFile}
+          title={t('deleteModal.delFile')}
+          content={{
+            node: (
+              <ConfirmDeleteDialogNode>
+                <div className="flex items-center gap-2 text-text-secondary">
+                  <span className="size-4">
+                    <FileIcon name={name} type={type}></FileIcon>
+                  </span>
+                  <span
+                    className={cn('truncate text-xs', {
+                      ['cursor-pointer']: isFolder,
+                    })}
+                  >
+                    {name}
+                  </span>
+                </div>
+              </ConfirmDeleteDialogNode>
+            ),
+          }}
+        >
           <Button
             variant="transparent"
             className="border-none hover:bg-bg-card text-text-primary"
diff --git a/web/src/pages/next-chats/chat-dropdown.tsx b/web/src/pages/next-chats/chat-dropdown.tsx
index fd8fc691a..540f5ee7b 100644
--- a/web/src/pages/next-chats/chat-dropdown.tsx
+++ b/web/src/pages/next-chats/chat-dropdown.tsx
@@ -1,4 +1,7 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -45,7 +48,18 @@ export function ChatDropdown({
           {t('common.rename')} <PenLine />
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <ConfirmDeleteDialog onOk={handleDelete}>
+        <ConfirmDeleteDialog
+          onOk={handleDelete}
+          title={t('deleteModal.delChat')}
+          content={{
+            node: (
+              <ConfirmDeleteDialogNode
+                avatar={{ avatar: chat.icon, name: chat.name }}
+                name={chat.name}
+              />
+            ),
+          }}
+        >
           <DropdownMenuItem
             className="text-state-error"
             onSelect={(e) => {
diff --git a/web/src/pages/next-searches/search-dropdown.tsx b/web/src/pages/next-searches/search-dropdown.tsx
index fd6b58265..ba890e97c 100644
--- a/web/src/pages/next-searches/search-dropdown.tsx
+++ b/web/src/pages/next-searches/search-dropdown.tsx
@@ -1,4 +1,7 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -41,9 +44,20 @@ export function SearchDropdown({
           {t('common.rename')} <PenLine />
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <ConfirmDeleteDialog onOk={handleDelete}>
+        <ConfirmDeleteDialog
+          onOk={handleDelete}
+          title={t('deleteModal.delSearch')}
+          content={{
+            node: (
+              <ConfirmDeleteDialogNode
+                avatar={{ avatar: dataset.avatar, name: dataset.name }}
+                name={dataset.name}
+              />
+            ),
+          }}
+        >
           <DropdownMenuItem
-            className="text-text-delete-red"
+            className="text-state-error"
             onSelect={(e) => {
               e.preventDefault();
             }}
diff --git a/web/src/pages/user-setting/data-source/component/added-source-card.tsx b/web/src/pages/user-setting/data-source/component/added-source-card.tsx
index 660c4f17a..424d53fa6 100644
--- a/web/src/pages/user-setting/data-source/component/added-source-card.tsx
+++ b/web/src/pages/user-setting/data-source/component/added-source-card.tsx
@@ -31,7 +31,7 @@ export const AddedSourceCard = (props: IAddedSourceCardProps) => {
             key={item.id}
             className="flex flex-row items-center justify-between rounded-md bg-bg-card px-[10px] py-4"
           >
-            <div className="text-sm text-text-secondary ">{item.name}</div>
+            <div className="text-sm text-text-primary ">{item.name}</div>
             <div className="text-sm text-text-secondary  flex gap-2">
               <Button
                 variant={'ghost'}
diff --git a/web/src/pages/user-setting/data-source/component/delete-source-modal.tsx b/web/src/pages/user-setting/data-source/component/delete-source-modal.tsx
index 63d18abad..a9f0f9a22 100644
--- a/web/src/pages/user-setting/data-source/component/delete-source-modal.tsx
+++ b/web/src/pages/user-setting/data-source/component/delete-source-modal.tsx
@@ -21,28 +21,33 @@ export const delSourceModal = <T extends IDataSourceBase>(
         ? t('setting.deleteSourceModalTitle')
         : t('dataflowParser.unlinkSourceModalTitle'),
     content: (
-      <div className="px-2 py-6">
-        <div className="flex items-center gap-1 p-2 border border-border-button rounded-md mb-3">
-          <div className="w-6 h-6 flex-shrink-0">
-            {data?.source ? DataSourceInfo[data?.source].icon : ''}
-          </div>
-          <div>{data?.name}</div>
-        </div>
+      <div className="px-2 space-y-6 pt-5 pb-3">
         {type === 'delete' ? (
           <div
-            className="text-sm text-text-secondary"
+            className="text-base text-text-primary"
             dangerouslySetInnerHTML={{
               __html: t('setting.deleteSourceModalContent'),
             }}
           ></div>
         ) : (
           <div
-            className="text-sm text-text-secondary"
+            className="text-base text-text-primary"
             dangerouslySetInnerHTML={{
               __html: t('dataflowParser.unlinkSourceModalContent'),
             }}
           />
         )}
+        <div className="flex items-center gap-1 p-2 border border-border-button rounded-md mb-3">
+          <div className="w-6 h-6 flex-shrink-0">
+            {data?.source ? DataSourceInfo[data?.source].icon : ''}
+          </div>
+          <div className="flex items-center gap-2 text-text-secondary text-xs">
+            {/* <div className="h-6 flex-shrink-0 text-text-primary text-base">
+              {data?.source ? DataSourceInfo[data?.source].name : ''}
+            </div> */}
+            {data?.name}
+          </div>
+        </div>
       </div>
     ),
     confirmText:
@@ -56,12 +61,13 @@ export const delSourceModal = <T extends IDataSourceBase>(
     ...otherProps,
     title: config.title,
     children: config.content,
+    titleClassName: 'border-b border-border-button',
     onVisibleChange: () => {
-      Modal.hide();
+      Modal.destroy();
     },
     footer: (
       <div className="flex justify-end gap-2">
-        <Button variant={'outline'} onClick={() => Modal.hide()}>
+        <Button variant={'outline'} onClick={() => Modal.destroy()}>
           {t('dataflowParser.changeStepModalCancelText')}
         </Button>
         <Button
@@ -69,7 +75,7 @@ export const delSourceModal = <T extends IDataSourceBase>(
           className="!bg-state-error text-text-base"
           onClick={() => {
             onOk?.(data);
-            Modal.hide();
+            Modal.destroy();
           }}
         >
           {config.confirmText}
diff --git a/web/src/pages/user-setting/data-source/index.tsx b/web/src/pages/user-setting/data-source/index.tsx
index 004b540f7..af7d6c650 100644
--- a/web/src/pages/user-setting/data-source/index.tsx
+++ b/web/src/pages/user-setting/data-source/index.tsx
@@ -84,7 +84,7 @@ const DataSource = () => {
     >
       <Spotlight />
       <div className="relative">
-        <div className=" flex flex-col gap-4 max-h-[calc(100vh-230px)] overflow-y-auto overflow-x-hidden scrollbar-auto">
+        <div className=" flex flex-col gap-4 max-h-[calc(100vh-235px)] overflow-y-auto overflow-x-hidden scrollbar-auto">
           <div className="flex flex-col gap-3">
             {categorizedList?.length <= 0 && (
               <div className="text-text-secondary w-full flex justify-center items-center h-20">
diff --git a/web/src/pages/user-setting/mcp/index.tsx b/web/src/pages/user-setting/mcp/index.tsx
index 7e71ab8c2..e60298e55 100644
--- a/web/src/pages/user-setting/mcp/index.tsx
+++ b/web/src/pages/user-setting/mcp/index.tsx
@@ -1,5 +1,8 @@
 import { CardContainer } from '@/components/card-container';
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import Spotlight from '@/components/spotlight';
 import { Button } from '@/components/ui/button';
 import { Checkbox } from '@/components/ui/checkbox';
@@ -110,7 +113,18 @@ export default function McpServer() {
               <Upload className="size-3.5"></Upload>
               {t('mcp.export')}
             </Button>
-            <ConfirmDeleteDialog onOk={handleDelete}>
+            <ConfirmDeleteDialog
+              onOk={handleDelete}
+              title={t('common.delete') + ' ' + t('mcp.mcpServers')}
+              content={{
+                title: t('common.deleteThem'),
+                node: (
+                  <ConfirmDeleteDialogNode
+                    name={`${t('mcp.selected')} ${selectedList.length} ${t('mcp.mcpServers')}`}
+                  ></ConfirmDeleteDialogNode>
+                ),
+              }}
+            >
               <Button variant={'danger'}>
                 <Trash2 className="size-3.5 cursor-pointer" />
                 {t('common.delete')}
diff --git a/web/src/pages/user-setting/mcp/mcp-card.tsx b/web/src/pages/user-setting/mcp/mcp-card.tsx
index b0cfcd162..a122345c0 100644
--- a/web/src/pages/user-setting/mcp/mcp-card.tsx
+++ b/web/src/pages/user-setting/mcp/mcp-card.tsx
@@ -54,7 +54,7 @@ export function McpCard({
               />
             ) : (
               <McpOperation
-                mcpId={data.id}
+                mcp={data}
                 showEditModal={showEditModal}
               ></McpOperation>
             )}
diff --git a/web/src/pages/user-setting/mcp/mcp-operation.tsx b/web/src/pages/user-setting/mcp/mcp-operation.tsx
index 22033e8b8..da4fee7f8 100644
--- a/web/src/pages/user-setting/mcp/mcp-operation.tsx
+++ b/web/src/pages/user-setting/mcp/mcp-operation.tsx
@@ -1,5 +1,9 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import { useDeleteMcpServer } from '@/hooks/use-mcp-request';
+import { IMcpServer } from '@/interfaces/database/mcp';
 import { PenLine, Trash2, Upload } from 'lucide-react';
 import { MouseEventHandler, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -7,33 +11,41 @@ import { UseEditMcpReturnType } from './use-edit-mcp';
 import { useExportMcp } from './use-export-mcp';
 
 export function McpOperation({
-  mcpId,
+  mcp,
   showEditModal,
-}: { mcpId: string } & Pick<UseEditMcpReturnType, 'showEditModal'>) {
+}: { mcp: IMcpServer } & Pick<UseEditMcpReturnType, 'showEditModal'>) {
   const { t } = useTranslation();
   const { deleteMcpServer } = useDeleteMcpServer();
   const { handleExportMcpJson } = useExportMcp();
 
   const handleDelete: MouseEventHandler<HTMLDivElement> = useCallback(() => {
-    deleteMcpServer([mcpId]);
-  }, [deleteMcpServer, mcpId]);
+    deleteMcpServer([mcp.id]);
+  }, [deleteMcpServer, mcp.id]);
 
   return (
     <div className="hidden gap-1  group-hover:flex text-text-secondary">
       {/* <RAGFlowTooltip tooltip={t('mcp.export')}> */}
       <Upload
         className="size-5 cursor-pointer p-1 rounded-sm hover:text-text-primary hover:bg-bg-card"
-        onClick={handleExportMcpJson([mcpId])}
+        onClick={handleExportMcpJson([mcp.id])}
       />
       {/* </RAGFlowTooltip>
       <RAGFlowTooltip tooltip={t('common.edit')}> */}
       <PenLine
         className="size-5 cursor-pointer p-1 rounded-sm hover:text-text-primary hover:bg-bg-card"
-        onClick={showEditModal(mcpId)}
+        onClick={showEditModal(mcp.id)}
       />
       {/* </RAGFlowTooltip>
       <RAGFlowTooltip tooltip={t('common.delete')}> */}
-      <ConfirmDeleteDialog onOk={handleDelete}>
+      <ConfirmDeleteDialog
+        onOk={handleDelete}
+        title={t('common.delete') + ' ' + t('mcp.mcpServer')}
+        content={{
+          node: (
+            <ConfirmDeleteDialogNode name={mcp.name}></ConfirmDeleteDialogNode>
+          ),
+        }}
+      >
         <Trash2 className="size-5 cursor-pointer p-1 rounded-sm hover:text-state-error hover:bg-state-error-5" />
       </ConfirmDeleteDialog>
       {/* </RAGFlowTooltip> */}
diff --git a/web/src/pages/user-setting/setting-model/components/modal-card.tsx b/web/src/pages/user-setting/setting-model/components/modal-card.tsx
index f9ef62dd1..3c815fde1 100644
--- a/web/src/pages/user-setting/setting-model/components/modal-card.tsx
+++ b/web/src/pages/user-setting/setting-model/components/modal-card.tsx
@@ -1,4 +1,8 @@
 // src/components/ModelProviderCard.tsx
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import { LlmIcon } from '@/components/svg-icon';
 import { Button } from '@/components/ui/button';
 import { Switch } from '@/components/ui/switch';
@@ -54,7 +58,7 @@ export const ModelProviderCard: FC<IModelCardProps> = ({
   const { visible, switchVisible } = useSetModalState();
   const { t } = useTranslate('setting');
   const { handleEnableLlm } = useHandleEnableLlm(item.name);
-  const { handleDeleteFactory } = useHandleDeleteFactory(item.name);
+  const { deleteFactory } = useHandleDeleteFactory(item.name);
 
   const handleApiKeyClick = () => {
     clickApiKey(item.name);
@@ -102,16 +106,31 @@ export const ModelProviderCard: FC<IModelCardProps> = ({
             {!visible ? <ChevronsDown /> : <ChevronsUp />}
           </Button>
 
-          <Button
-            variant={'ghost'}
-            onClick={(e) => {
-              e.stopPropagation();
-              handleDeleteFactory();
+          <ConfirmDeleteDialog
+            onOk={() => deleteFactory({ llm_factory: item.name })}
+            title={t('deleteModel')}
+            content={{
+              node: (
+                <ConfirmDeleteDialogNode>
+                  <div className="flex items-center gap-2">
+                    <LlmIcon name={item.name} />
+                    {item.name}
+                  </div>
+                </ConfirmDeleteDialogNode>
+              ),
             }}
-            className="  hover:text-state-error hover:bg-state-error-5 transition-colors border border-border-default"
           >
-            <Trash2 />
-          </Button>
+            <Button
+              variant={'ghost'}
+              // onClick={(e) => {
+              //   e.stopPropagation();
+              //   handleDeleteFactory(item);
+              // }}
+              className="  hover:text-state-error hover:bg-state-error-5 transition-colors border border-border-default"
+            >
+              <Trash2 />
+            </Button>
+          </ConfirmDeleteDialog>
         </div>
       </div>
 
diff --git a/web/src/pages/user-setting/setting-model/components/un-add-model.tsx b/web/src/pages/user-setting/setting-model/components/un-add-model.tsx
index bdf0a863b..56e299b75 100644
--- a/web/src/pages/user-setting/setting-model/components/un-add-model.tsx
+++ b/web/src/pages/user-setting/setting-model/components/un-add-model.tsx
@@ -1,10 +1,10 @@
 // src/components/AvailableModels.tsx
 import { LlmIcon } from '@/components/svg-icon';
 import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
+import { SearchInput } from '@/components/ui/input';
 import { useTranslate } from '@/hooks/common-hooks';
 import { useSelectLlmList } from '@/hooks/llm-hooks';
-import { Plus, Search } from 'lucide-react';
+import { Plus } from 'lucide-react';
 import { FC, useMemo, useState } from 'react';
 
 type TagType =
@@ -77,16 +77,16 @@ export const AvailableModels: FC<{
       </div>
       {/* Search Bar */}
       <div className="mb-6">
-        <div className="relative">
-          <Input
-            type="text"
-            placeholder={t('search')}
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            className="w-full px-4 py-2 pl-10 bg-bg-input border border-border-default rounded-lg focus:outline-none focus:ring-1 focus:ring-border-button transition-colors"
-          />
-          <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 w-5 h-5 text-text-secondary" />
-        </div>
+        {/* <div className="relative"> */}
+        <SearchInput
+          type="text"
+          placeholder={t('search')}
+          value={searchTerm}
+          onChange={(e) => setSearchTerm(e.target.value)}
+          className="w-full px-4 py-2 pl-10 bg-bg-input border border-border-default rounded-lg focus:outline-none focus:ring-1 focus:ring-border-button transition-colors"
+        />
+        {/* <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 w-5 h-5 text-text-secondary" /> */}
+        {/* </div> */}
       </div>
 
       {/* Tags Filter */}
diff --git a/web/src/pages/user-setting/setting-model/hooks.ts b/web/src/pages/user-setting/setting-model/hooks.tsx
similarity index 99%
rename from web/src/pages/user-setting/setting-model/hooks.ts
rename to web/src/pages/user-setting/setting-model/hooks.tsx
index b509ed863..e50211299 100644
--- a/web/src/pages/user-setting/setting-model/hooks.ts
+++ b/web/src/pages/user-setting/setting-model/hooks.tsx
@@ -457,5 +457,5 @@ export const useHandleDeleteFactory = (llmFactory: string) => {
     });
   };
 
-  return { handleDeleteFactory };
+  return { handleDeleteFactory, deleteFactory };
 };
diff --git a/web/src/pages/user-setting/setting-team/hooks.ts b/web/src/pages/user-setting/setting-team/hooks.ts
index b766d3a71..0cc65add2 100644
--- a/web/src/pages/user-setting/setting-team/hooks.ts
+++ b/web/src/pages/user-setting/setting-team/hooks.ts
@@ -51,7 +51,7 @@ export const useHandleDeleteUser = () => {
     });
   };
 
-  return { handleDeleteTenantUser, loading };
+  return { handleDeleteTenantUser, deleteTenantUser, loading };
 };
 
 export const useHandleAgreeTenant = () => {
diff --git a/web/src/pages/user-setting/setting-team/user-table.tsx b/web/src/pages/user-setting/setting-team/user-table.tsx
index ddf46e438..18664c945 100644
--- a/web/src/pages/user-setting/setting-team/user-table.tsx
+++ b/web/src/pages/user-setting/setting-team/user-table.tsx
@@ -1,3 +1,7 @@
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogNode,
+} from '@/components/confirm-delete-dialog';
 import { RAGFlowAvatar } from '@/components/ragflow-avatar';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
@@ -26,7 +30,7 @@ const ColorMap: Record<string, string> = {
 
 const UserTable = ({ searchUser }: { searchUser: string }) => {
   const { data, loading } = useListTenantUser();
-  const { handleDeleteTenantUser } = useHandleDeleteUser();
+  const { deleteTenantUser } = useHandleDeleteUser();
   const [sortOrder, setSortOrder] = useState<'asc' | 'desc' | null>(null);
   const { t } = useTranslation();
   const sortedData = useMemo(() => {
@@ -134,14 +138,35 @@ const UserTable = ({ searchUser }: { searchUser: string }) => {
                   )}
                 </TableCell>
                 <TableCell className="p-4">
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="h-8 w-8 p-0 hover:bg-state-error-5 hover:text-state-error"
-                    onClick={handleDeleteTenantUser(record.user_id)}
+                  <ConfirmDeleteDialog
+                    title={t('deleteModal.delMember')}
+                    onOk={async () => {
+                      await deleteTenantUser({
+                        userId: record.user_id,
+                      });
+                      return;
+                    }}
+                    content={{
+                      node: (
+                        <ConfirmDeleteDialogNode
+                          avatar={{
+                            avatar: record.avatar,
+                            name: record.nickname,
+                            isPerson: true,
+                          }}
+                          name={record.email}
+                        ></ConfirmDeleteDialogNode>
+                      ),
+                    }}
                   >
-                    <Trash2 className="h-4 w-4" />
-                  </Button>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      className="h-8 w-8 p-0 hover:bg-state-error-5 hover:text-state-error"
+                    >
+                      <Trash2 className="h-4 w-4" />
+                    </Button>
+                  </ConfirmDeleteDialog>
                 </TableCell>
               </TableRow>
             ))

From 12979a3f21f5fe90c514255267f87e56826f5df2 Mon Sep 17 00:00:00 2001
From: Levi <81591061+levischd@users.noreply.github.com>
Date: Wed, 26 Nov 2025 12:55:48 +0100
Subject: [PATCH 03/17] feat: improve metadata handling in connector service
 (#11421)

### What problem does this PR solve?

- Update sync data source to handle metadata properly

### Type of change

- [x] New Feature (non-breaking change which adds functionality)

---------

Co-authored-by: Kevin Hu <kevinhu.sh@gmail.com>
---
 api/db/services/connector_service.py       | 12 ++++++++++++
 common/data_source/confluence_connector.py |  1 +
 common/data_source/discord_connector.py    |  1 +
 common/data_source/models.py               |  1 +
 rag/svr/sync_data_source.py                | 11 +++++++----
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/api/db/services/connector_service.py b/api/db/services/connector_service.py
index db8c713e2..660530c82 100644
--- a/api/db/services/connector_service.py
+++ b/api/db/services/connector_service.py
@@ -214,9 +214,21 @@ class SyncLogsService(CommonService):
         err, doc_blob_pairs = FileService.upload_document(kb, files, tenant_id, src)
         errs.extend(err)
 
+        # Create a mapping from filename to metadata for later use
+        metadata_map = {}
+        for d in docs:
+            if d.get("metadata"):
+                filename = d["semantic_identifier"]+(f"{d['extension']}" if d["semantic_identifier"][::-1].find(d['extension'][::-1])<0 else "")
+                metadata_map[filename] = d["metadata"]
+
         kb_table_num_map = {}
         for doc, _ in doc_blob_pairs:
             doc_ids.append(doc["id"])
+            
+            # Set metadata if available for this document
+            if doc["name"] in metadata_map:
+                DocumentService.update_by_id(doc["id"], {"meta_fields": metadata_map[doc["name"]]})
+            
             if not auto_parse or auto_parse == "0":
                 continue
             DocumentService.run(tenant_id, doc, kb_table_num_map)
diff --git a/common/data_source/confluence_connector.py b/common/data_source/confluence_connector.py
index 821f79862..a7935ff6d 100644
--- a/common/data_source/confluence_connector.py
+++ b/common/data_source/confluence_connector.py
@@ -1562,6 +1562,7 @@ class ConfluenceConnector(
                 size_bytes=len(page_content.encode("utf-8")),  # Calculate size in bytes
                 doc_updated_at=datetime_from_string(page["version"]["when"]),
                 primary_owners=primary_owners if primary_owners else None,
+                metadata=metadata if metadata else None,
             )
         except Exception as e:
             logging.error(f"Error converting page {page.get('id', 'unknown')}: {e}")
diff --git a/common/data_source/discord_connector.py b/common/data_source/discord_connector.py
index 93a0477b0..46b23443c 100644
--- a/common/data_source/discord_connector.py
+++ b/common/data_source/discord_connector.py
@@ -65,6 +65,7 @@ def _convert_message_to_document(
         blob=message.content.encode("utf-8"),
         extension=".txt",
         size_bytes=len(message.content.encode("utf-8")),
+        metadata=metadata if metadata else None,
     )
 
 
diff --git a/common/data_source/models.py b/common/data_source/models.py
index 032f26cc8..e956194b8 100644
--- a/common/data_source/models.py
+++ b/common/data_source/models.py
@@ -94,6 +94,7 @@ class Document(BaseModel):
     blob: bytes
     doc_updated_at: datetime
     size_bytes: int
+    metadata: Optional[dict[str, Any]] = None
 
 
 class BasicExpertInfo(BaseModel):
diff --git a/rag/svr/sync_data_source.py b/rag/svr/sync_data_source.py
index 87e9c2dac..5fb1f198b 100644
--- a/rag/svr/sync_data_source.py
+++ b/rag/svr/sync_data_source.py
@@ -75,8 +75,9 @@ class SyncBase:
                         min_update = min([doc.doc_updated_at for doc in document_batch])
                         max_update = max([doc.doc_updated_at for doc in document_batch])
                         next_update = max([next_update, max_update])
-                        docs = [
-                            {
+                        docs = []
+                        for doc in document_batch:
+                            doc_dict = {
                                 "id": doc.id,
                                 "connector_id": task["connector_id"],
                                 "source": self.SOURCE_NAME,
@@ -86,8 +87,10 @@ class SyncBase:
                                 "doc_updated_at": doc.doc_updated_at,
                                 "blob": doc.blob,
                             }
-                            for doc in document_batch
-                        ]
+                            # Add metadata if present
+                            if doc.metadata:
+                                doc_dict["metadata"] = doc.metadata
+                            docs.append(doc_dict)
 
                         try:
                             e, kb = KnowledgebaseService.get_by_id(task["kb_id"])

From 8c28587821fa8ef5cd8bb24b3e1e3c020987444e Mon Sep 17 00:00:00 2001
From: myoldcat <myoldcat@qq.com>
Date: Thu, 27 Nov 2025 09:40:10 +0800
Subject: [PATCH 04/17] Fix issue where HTML file parsing may lose content.
 (#11536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### What problem does this PR solve?

##### Problem Description
When parsing HTML files, some page content may be lost.
For example, text inside nested `<font>` tags within multiple `<div>`
elements (e.g.,
`<div><font>Text_1</font></div><div><font>Text_2</font></div>`) fails to
be preserved correctly.

###### Root Cause #1: Block ID propagation is interrupted
1. **Block ID generation**: When the parser encounters a `<div>`, it
generates a new `block_id` because `<div>` belongs to `BLOCK_TAGS`.
2. **Recursive processing**: This `block_id` is passed down recursively
to process the `<div>`’s child nodes.
3. **Interruption occurs**: When processing a child `<font>` tag, the
code enters the `else` branch of `read_text_recursively` (since `<font>`
is a Tag).
4. **Bug location**: The first line in this `else` branch explicitly
sets **`block_id = None`**.
- This discards the valid `block_id` inherited from the parent `<div>`.
- Since `<font>` is not in `BLOCK_TAGS`, it does not generate a new
`block_id`, so it passes `None` to its child text nodes.
5. **Consequence**: The extracted text nodes have an empty `block_id` in
their `metadata`. During the subsequent `merge_block_text` step, these
texts cannot be correctly associated with their original `<div>` block
due to the missing ID. As a result, all text from `<font>` tags gets
merged together, which then triggers a second issue during
concatenation.
6. **Solution:** Remove the forced reset of `block_id` to `None`. When
the current tag (e.g., `<font>`) is not a block-level element, it should
inherit the `block_id` passed down from its parent. This ensures
consistent ownership across the hierarchy: `div` → `font` → `text`.

###### Root Cause #2: Data loss during text concatenation
1. The line `current_content += (" " if current_content else "" +
content)` has a misplaced parenthesis. When `current_content` is
non-empty (`True`):
    - The ternary expression evaluates to `" "` (a single space).
    - The code executes `current_content += " "`.
- **Result**: Only a space is appended—**the new `content` string is
completely discarded**.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 deepdoc/parser/html_parser.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deepdoc/parser/html_parser.py b/deepdoc/parser/html_parser.py
index 44ff10389..7e4467c16 100644
--- a/deepdoc/parser/html_parser.py
+++ b/deepdoc/parser/html_parser.py
@@ -138,7 +138,6 @@ class RAGFlowHtmlParser:
                                             "metadata": {"table_id": table_id, "index": table_list.index(t)}})
                 return table_info_list
             else:
-                block_id = None
                 if str.lower(element.name) in BLOCK_TAGS:
                     block_id = str(uuid.uuid1())
                 for child in element.children:
@@ -172,7 +171,7 @@ class RAGFlowHtmlParser:
                 if tag_name == "table":
                     table_info_list.append(item)
                 else:
-                    current_content += (" " if current_content else "" + content)
+                    current_content += (" " if current_content else "") + content
         if current_content:
             block_content.append(current_content)
         return block_content, table_info_list

From a9259917c6f688657cbd1ce4ec1bbb49cd283186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E6=B5=B7=E8=92=BC=E7=81=86?=
 <huangaoqin@tecpie.com>
Date: Thu, 27 Nov 2025 09:41:24 +0800
Subject: [PATCH 05/17] fix(files): replace hard coded status codes with
 constants (#11544)

### What problem does this PR solve?

To solve the problem of error reporting caused by type errors when
various types of exception returns are triggered

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 api/apps/sdk/files.py | 66 +++++++++++++++++++++----------------------
 common/constants.py   |  1 +
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/api/apps/sdk/files.py b/api/apps/sdk/files.py
index 1682a0285..6377ea7c8 100644
--- a/api/apps/sdk/files.py
+++ b/api/apps/sdk/files.py
@@ -31,7 +31,7 @@ from api.db.services.file_service import FileService
 from api.utils.api_utils import get_json_result
 from api.utils.file_utils import filename_type
 from common import settings
-
+from common.constants import RetCode
 
 @manager.route('/file/upload', methods=['POST'])  # noqa: F821
 @token_required
@@ -86,19 +86,19 @@ async def upload(tenant_id):
         pf_id = root_folder["id"]
 
     if 'file' not in files:
-        return get_json_result(data=False, message='No file part!', code=400)
+        return get_json_result(data=False, message='No file part!', code=RetCode.BAD_REQUEST)
     file_objs = files.getlist('file')
 
     for file_obj in file_objs:
         if file_obj.filename == '':
-            return get_json_result(data=False, message='No selected file!', code=400)
+            return get_json_result(data=False, message='No selected file!', code=RetCode.BAD_REQUEST)
 
     file_res = []
 
     try:
         e, pf_folder = FileService.get_by_id(pf_id)
         if not e:
-            return get_json_result(data=False, message="Can't find this folder!", code=404)
+            return get_json_result(data=False, message="Can't find this folder!", code=RetCode.NOT_FOUND)
 
         for file_obj in file_objs:
             # Handle file path
@@ -114,13 +114,13 @@ async def upload(tenant_id):
             if file_len != len_id_list:
                 e, file = FileService.get_by_id(file_id_list[len_id_list - 1])
                 if not e:
-                    return get_json_result(data=False, message="Folder not found!", code=404)
+                    return get_json_result(data=False, message="Folder not found!", code=RetCode.NOT_FOUND)
                 last_folder = FileService.create_folder(file, file_id_list[len_id_list - 1], file_obj_names,
                                                         len_id_list)
             else:
                 e, file = FileService.get_by_id(file_id_list[len_id_list - 2])
                 if not e:
-                    return get_json_result(data=False, message="Folder not found!", code=404)
+                    return get_json_result(data=False, message="Folder not found!", code=RetCode.NOT_FOUND)
                 last_folder = FileService.create_folder(file, file_id_list[len_id_list - 2], file_obj_names,
                                                         len_id_list)
 
@@ -202,7 +202,7 @@ async def create(tenant_id):
 
     try:
         if not FileService.is_parent_folder_exist(pf_id):
-            return get_json_result(data=False, message="Parent Folder Doesn't Exist!", code=400)
+            return get_json_result(data=False, message="Parent Folder Doesn't Exist!", code=RetCode.BAD_REQUEST)
         if FileService.query(name=req["name"], parent_id=pf_id):
             return get_json_result(data=False, message="Duplicated folder name in the same folder.", code=409)
 
@@ -306,13 +306,13 @@ def list_files(tenant_id):
     try:
         e, file = FileService.get_by_id(pf_id)
         if not e:
-            return get_json_result(message="Folder not found!", code=404)
+            return get_json_result(message="Folder not found!", code=RetCode.NOT_FOUND)
 
         files, total = FileService.get_by_pf_id(tenant_id, pf_id, page_number, items_per_page, orderby, desc, keywords)
 
         parent_folder = FileService.get_parent_folder(pf_id)
         if not parent_folder:
-            return get_json_result(message="File not found!", code=404)
+            return get_json_result(message="File not found!", code=RetCode.NOT_FOUND)
 
         return get_json_result(data={"total": total, "files": files, "parent_folder": parent_folder.to_json()})
     except Exception as e:
@@ -392,7 +392,7 @@ def get_parent_folder():
     try:
         e, file = FileService.get_by_id(file_id)
         if not e:
-            return get_json_result(message="Folder not found!", code=404)
+            return get_json_result(message="Folder not found!", code=RetCode.NOT_FOUND)
 
         parent_folder = FileService.get_parent_folder(file_id)
         return get_json_result(data={"parent_folder": parent_folder.to_json()})
@@ -439,7 +439,7 @@ def get_all_parent_folders(tenant_id):
     try:
         e, file = FileService.get_by_id(file_id)
         if not e:
-            return get_json_result(message="Folder not found!", code=404)
+            return get_json_result(message="Folder not found!", code=RetCode.NOT_FOUND)
 
         parent_folders = FileService.get_all_parent_folders(file_id)
         parent_folders_res = [folder.to_json() for folder in parent_folders]
@@ -487,34 +487,34 @@ async def rm(tenant_id):
         for file_id in file_ids:
             e, file = FileService.get_by_id(file_id)
             if not e:
-                return get_json_result(message="File or Folder not found!", code=404)
+                return get_json_result(message="File or Folder not found!", code=RetCode.NOT_FOUND)
             if not file.tenant_id:
-                return get_json_result(message="Tenant not found!", code=404)
+                return get_json_result(message="Tenant not found!", code=RetCode.NOT_FOUND)
 
             if file.type == FileType.FOLDER.value:
                 file_id_list = FileService.get_all_innermost_file_ids(file_id, [])
                 for inner_file_id in file_id_list:
                     e, file = FileService.get_by_id(inner_file_id)
                     if not e:
-                        return get_json_result(message="File not found!", code=404)
+                        return get_json_result(message="File not found!", code=RetCode.NOT_FOUND)
                     settings.STORAGE_IMPL.rm(file.parent_id, file.location)
                 FileService.delete_folder_by_pf_id(tenant_id, file_id)
             else:
                 settings.STORAGE_IMPL.rm(file.parent_id, file.location)
                 if not FileService.delete(file):
-                    return get_json_result(message="Database error (File removal)!", code=500)
+                    return get_json_result(message="Database error (File removal)!", code=RetCode.SERVER_ERROR)
 
             informs = File2DocumentService.get_by_file_id(file_id)
             for inform in informs:
                 doc_id = inform.document_id
                 e, doc = DocumentService.get_by_id(doc_id)
                 if not e:
-                    return get_json_result(message="Document not found!", code=404)
+                    return get_json_result(message="Document not found!", code=RetCode.NOT_FOUND)
                 tenant_id = DocumentService.get_tenant_id(doc_id)
                 if not tenant_id:
-                    return get_json_result(message="Tenant not found!", code=404)
+                    return get_json_result(message="Tenant not found!", code=RetCode.NOT_FOUND)
                 if not DocumentService.remove_document(doc, tenant_id):
-                    return get_json_result(message="Database error (Document removal)!", code=500)
+                    return get_json_result(message="Database error (Document removal)!", code=RetCode.SERVER_ERROR)
             File2DocumentService.delete_by_file_id(file_id)
 
         return get_json_result(data=True)
@@ -560,23 +560,23 @@ async def rename(tenant_id):
     try:
         e, file = FileService.get_by_id(req["file_id"])
         if not e:
-            return get_json_result(message="File not found!", code=404)
+            return get_json_result(message="File not found!", code=RetCode.NOT_FOUND)
 
         if file.type != FileType.FOLDER.value and pathlib.Path(req["name"].lower()).suffix != pathlib.Path(
                 file.name.lower()).suffix:
-            return get_json_result(data=False, message="The extension of file can't be changed", code=400)
+            return get_json_result(data=False, message="The extension of file can't be changed", code=RetCode.BAD_REQUEST)
 
         for existing_file in FileService.query(name=req["name"], pf_id=file.parent_id):
             if existing_file.name == req["name"]:
                 return get_json_result(data=False, message="Duplicated file name in the same folder.", code=409)
 
         if not FileService.update_by_id(req["file_id"], {"name": req["name"]}):
-            return get_json_result(message="Database error (File rename)!", code=500)
+            return get_json_result(message="Database error (File rename)!", code=RetCode.SERVER_ERROR)
 
         informs = File2DocumentService.get_by_file_id(req["file_id"])
         if informs:
             if not DocumentService.update_by_id(informs[0].document_id, {"name": req["name"]}):
-                return get_json_result(message="Database error (Document rename)!", code=500)
+                return get_json_result(message="Database error (Document rename)!", code=RetCode.SERVER_ERROR)
 
         return get_json_result(data=True)
     except Exception as e:
@@ -606,13 +606,13 @@ async def get(tenant_id, file_id):
         description: File stream
         schema:
           type: file
-      404:
+      RetCode.NOT_FOUND:
         description: File not found
     """
     try:
         e, file = FileService.get_by_id(file_id)
         if not e:
-            return get_json_result(message="Document not found!", code=404)
+            return get_json_result(message="Document not found!", code=RetCode.NOT_FOUND)
 
         blob = settings.STORAGE_IMPL.get(file.parent_id, file.location)
         if not blob:
@@ -677,13 +677,13 @@ async def move(tenant_id):
         for file_id in file_ids:
             file = files_dict[file_id]
             if not file:
-                return get_json_result(message="File or Folder not found!", code=404)
+                return get_json_result(message="File or Folder not found!", code=RetCode.NOT_FOUND)
             if not file.tenant_id:
-                return get_json_result(message="Tenant not found!", code=404)
+                return get_json_result(message="Tenant not found!", code=RetCode.NOT_FOUND)
 
         fe, _ = FileService.get_by_id(parent_id)
         if not fe:
-            return get_json_result(message="Parent Folder not found!", code=404)
+            return get_json_result(message="Parent Folder not found!", code=RetCode.NOT_FOUND)
 
         FileService.move_file(file_ids, parent_id)
         return get_json_result(data=True)
@@ -705,7 +705,7 @@ async def convert(tenant_id):
         for file_id in file_ids:
             file = files_set[file_id]
             if not file:
-                return get_json_result(message="File not found!", code=404)
+                return get_json_result(message="File not found!", code=RetCode.NOT_FOUND)
             file_ids_list = [file_id]
             if file.type == FileType.FOLDER.value:
                 file_ids_list = FileService.get_all_innermost_file_ids(file_id, [])
@@ -716,13 +716,13 @@ async def convert(tenant_id):
                     doc_id = inform.document_id
                     e, doc = DocumentService.get_by_id(doc_id)
                     if not e:
-                        return get_json_result(message="Document not found!", code=404)
+                        return get_json_result(message="Document not found!", code=RetCode.NOT_FOUND)
                     tenant_id = DocumentService.get_tenant_id(doc_id)
                     if not tenant_id:
-                        return get_json_result(message="Tenant not found!", code=404)
+                        return get_json_result(message="Tenant not found!", code=RetCode.NOT_FOUND)
                     if not DocumentService.remove_document(doc, tenant_id):
                         return get_json_result(
-                            message="Database error (Document removal)!", code=404)
+                            message="Database error (Document removal)!", code=RetCode.NOT_FOUND)
                 File2DocumentService.delete_by_file_id(id)
 
                 # insert
@@ -730,11 +730,11 @@ async def convert(tenant_id):
                     e, kb = KnowledgebaseService.get_by_id(kb_id)
                     if not e:
                         return get_json_result(
-                            message="Can't find this knowledgebase!", code=404)
+                            message="Can't find this knowledgebase!", code=RetCode.NOT_FOUND)
                     e, file = FileService.get_by_id(id)
                     if not e:
                         return get_json_result(
-                            message="Can't find this file!", code=404)
+                            message="Can't find this file!", code=RetCode.NOT_FOUND)
 
                     doc = DocumentService.insert({
                         "id": get_uuid(),
diff --git a/common/constants.py b/common/constants.py
index a09832eed..574786d00 100644
--- a/common/constants.py
+++ b/common/constants.py
@@ -49,6 +49,7 @@ class RetCode(IntEnum, CustomEnum):
     RUNNING = 106
     PERMISSION_ERROR = 108
     AUTHENTICATION_ERROR = 109
+    BAD_REQUEST = 400
     UNAUTHORIZED = 401
     SERVER_ERROR = 500
     FORBIDDEN = 403

From 7c3c185038d4b9e753ff2089602fe29be572fcea Mon Sep 17 00:00:00 2001
From: writinwaters <93570324+writinwaters@users.noreply.github.com>
Date: Thu, 27 Nov 2025 09:42:06 +0800
Subject: [PATCH 06/17] Minor style changes (#11554)

### What problem does this PR solve?

### Type of change


- [ ] Documentation Update
---
 docs/faq.mdx                                  | 12 ++--
 .../agent/agent_component_reference/agent.mdx |  4 +-
 docs/guides/agent/sandbox_quickstart.md       | 30 ++++-----
 docs/guides/chat/start_chat.md                |  4 +-
 docs/guides/dataset/use_tag_sets.md           |  6 +-
 docs/quickstart.mdx                           | 62 ++++++++++---------
 6 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/docs/faq.mdx b/docs/faq.mdx
index 84203c6a3..3da434c8d 100644
--- a/docs/faq.mdx
+++ b/docs/faq.mdx
@@ -323,9 +323,9 @@ The status of a Docker container status does not necessarily reflect the status
 
 2. Follow [this document](./guides/run_health_check.md) to check the health status of the Elasticsearch service.
 
-:::danger IMPORTANT
-The status of a Docker container status does not necessarily reflect the status of the service. You may find that your services are unhealthy even when the corresponding Docker containers are up running. Possible reasons for this include network failures, incorrect port numbers, or DNS issues.
-:::
+   :::danger IMPORTANT
+   The status of a Docker container status does not necessarily reflect the status of the service. You may find that your services are unhealthy even when the corresponding Docker containers are up running. Possible reasons for this include network failures, incorrect port numbers, or DNS issues.
+   :::
 
 3. If your container keeps restarting, ensure `vm.max_map_count` >= 262144 as per [this README](https://github.com/infiniflow/ragflow?tab=readme-ov-file#-start-up-the-server). Updating the `vm.max_map_count` value in **/etc/sysctl.conf** is required, if you wish to keep your change permanent. Note that this configuration works only for Linux.
 
@@ -456,9 +456,9 @@ To switch your document engine from Elasticsearch to [Infinity](https://github.c
    ```bash
    $ docker compose -f docker/docker-compose.yml down -v
    ```
-:::caution WARNING
-`-v` will delete all Docker container volumes, and the existing data will be cleared.
-:::
+   :::caution WARNING
+   `-v` will delete all Docker container volumes, and the existing data will be cleared.
+   :::
 
 2. In **docker/.env**, set `DOC_ENGINE=${DOC_ENGINE:-infinity}`
 3. Restart your Docker image: 
diff --git a/docs/guides/agent/agent_component_reference/agent.mdx b/docs/guides/agent/agent_component_reference/agent.mdx
index cdd508cce..882c22be1 100644
--- a/docs/guides/agent/agent_component_reference/agent.mdx
+++ b/docs/guides/agent/agent_component_reference/agent.mdx
@@ -22,7 +22,7 @@ An **Agent** component is essential when you need the LLM to assist with summari
 
 1. Ensure you have a chat model properly configured:
 
-![Set default models](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/set_default_models.jpg)
+  ![Set default models](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/set_default_models.jpg)
 
 2. If your Agent involves dataset retrieval, ensure you [have properly configured your target dataset(s)](../../dataset/configure_knowledge_base.md).
 
@@ -91,7 +91,7 @@ Update your MCP server's name, URL (including the API key), server type, and oth
 
    *The target MCP server appears below your Agent component, and your Agent will autonomously decide when to invoke the available tools it offers.*
 
-![](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/choose_tavily_mcp_server.jpg)
+  ![](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/choose_tavily_mcp_server.jpg)
 
 ### 5. Update system prompt to specify trigger conditions (Optional)
 
diff --git a/docs/guides/agent/sandbox_quickstart.md b/docs/guides/agent/sandbox_quickstart.md
index 1e1b9e26b..507f8f6e3 100644
--- a/docs/guides/agent/sandbox_quickstart.md
+++ b/docs/guides/agent/sandbox_quickstart.md
@@ -62,9 +62,9 @@ docker build -t sandbox-executor-manager:latest ./executor_manager
 
 3. Add the following entry to your /etc/hosts file to resolve the executor manager service:
 
-```bash
-127.0.0.1 es01 infinity mysql minio redis sandbox-executor-manager
-```
+    ```bash
+    127.0.0.1 es01 infinity mysql minio redis sandbox-executor-manager
+    ```
 
 4. Start the RAGFlow service as usual.
 
@@ -74,24 +74,24 @@ docker build -t sandbox-executor-manager:latest ./executor_manager
 
 1. Initialize the environment variables:
 
-```bash
-cp .env.example .env
-```
+    ```bash
+    cp .env.example .env
+    ```
 
 2. Launch the sandbox services with Docker Compose:
 
-```bash
-docker compose -f docker-compose.yml up
-```
+    ```bash
+    docker compose -f docker-compose.yml up
+    ```
 
 3. Test the sandbox setup:
 
-```bash
-source .venv/bin/activate
-export PYTHONPATH=$(pwd)
-uv pip install -r executor_manager/requirements.txt
-uv run tests/sandbox_security_tests_full.py
-```
+    ```bash
+    source .venv/bin/activate
+    export PYTHONPATH=$(pwd)
+    uv pip install -r executor_manager/requirements.txt
+    uv run tests/sandbox_security_tests_full.py
+    ```
 
 ### Using Makefile
 
diff --git a/docs/guides/chat/start_chat.md b/docs/guides/chat/start_chat.md
index d057151e2..e31c6b408 100644
--- a/docs/guides/chat/start_chat.md
+++ b/docs/guides/chat/start_chat.md
@@ -83,13 +83,13 @@ You start an AI conversation by creating an assistant.
 
 1. Click the light bulb icon above the answer to view the expanded system prompt:
 
-![prompt_display](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/prompt_display.jpg)
+   ![prompt_display](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/prompt_display.jpg)
 
    *The light bulb icon is available only for the current dialogue.*
 
 2. Scroll down the expanded prompt to view the time consumed for each task:
 
-![time_elapsed](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/time_elapsed.jpg)
+   ![time_elapsed](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/time_elapsed.jpg)
 :::
 
 ## Update settings of an existing chat assistant
diff --git a/docs/guides/dataset/use_tag_sets.md b/docs/guides/dataset/use_tag_sets.md
index e0c359267..389a97b0a 100644
--- a/docs/guides/dataset/use_tag_sets.md
+++ b/docs/guides/dataset/use_tag_sets.md
@@ -56,9 +56,9 @@ Once a tag set is created, you can apply it to your dataset:
 1. Navigate to the **Configuration** page of your dataset.
 2. Select the tag set from the **Tag sets** dropdown and click **Save** to confirm.
 
-:::tip NOTE
-If the tag set is missing from the dropdown, check that it has been created or configured correctly.
-:::
+   :::tip NOTE
+   If the tag set is missing from the dropdown, check that it has been created or configured correctly.
+   :::
 
 3. Re-parse your documents to start the auto-tagging process.  
    _In an AI chat scenario using auto-tagged datasets, each query will be tagged using the corresponding tag set(s) and chunks with these tags will have a higher chance to be retrieved._
diff --git a/docs/quickstart.mdx b/docs/quickstart.mdx
index e8ad550eb..bafaa676b 100644
--- a/docs/quickstart.mdx
+++ b/docs/quickstart.mdx
@@ -39,8 +39,10 @@ If you have not installed Docker on your local machine (Windows, Mac, or Linux),
 
 This section provides instructions on setting up the RAGFlow server on Linux. If you are on a different operating system, no worries. Most steps are alike.
 
+1. Ensure `vm.max_map_count` &ge; 262144.
+
 <details>
-  <summary>1. Ensure <code>vm.max_map_count</code> &ge; 262144:</summary>
+  <summary>Expand to show details:</summary>
 
    `vm.max_map_count`. This value sets the maximum number of memory map areas a process may have. Its default value is 65530. While most applications require fewer than a thousand maps, reducing this value can result in abnormal behaviors, and the system will throw out-of-memory errors when a process reaches the limitation.
 
@@ -194,22 +196,22 @@ This section provides instructions on setting up the RAGFlow server on Linux. If
    $ docker compose -f docker-compose.yml up -d
    ```
 
-```mdx-code-block
-<APITable>
-```
+   ```mdx-code-block
+   <APITable>
+   ```
 
-| RAGFlow image tag   | Image size (GB) | Stable?                  |
-| ------------------- | --------------- | ------------------------ |
-| v0.22.1             | &approx;2       | Stable release           |
-| nightly             | &approx;2       | _Unstable_ nightly build |
+   | RAGFlow image tag   | Image size (GB) | Stable?                  |
+   | ------------------- | --------------- | ------------------------ |
+   | v0.22.1             | &approx;2       | Stable release           |
+   | nightly             | &approx;2       | _Unstable_ nightly build |
 
-```mdx-code-block
-</APITable>
-```
+   ```mdx-code-block
+   </APITable>
+   ```
 
-:::tip NOTE
-The image size shown refers to the size of the *downloaded* Docker image, which is compressed. When Docker runs the image, it unpacks it, resulting in significantly greater disk usage. A Docker image will expand to around 7 GB once unpacked.
-:::
+   :::tip NOTE
+   The image size shown refers to the size of the *downloaded* Docker image, which is compressed. When Docker runs the image, it unpacks it, resulting in significantly greater disk usage. A Docker image will expand to around 7 GB once unpacked.
+   :::
 
 4. Check the server status after having the server up and running:
 
@@ -229,15 +231,15 @@ The image size shown refers to the size of the *downloaded* Docker image, which
     * Running on all addresses (0.0.0.0)
    ```
 
-:::danger IMPORTANT
-If you skip this confirmation step and directly log in to RAGFlow, your browser may prompt a `network anomaly` error because, at that moment, your RAGFlow may not be fully initialized.
-:::  
+   :::danger IMPORTANT
+   If you skip this confirmation step and directly log in to RAGFlow, your browser may prompt a `network anomaly` error because, at that moment, your RAGFlow may not be fully initialized.
+   :::  
 
 5. In your web browser, enter the IP address of your server and log in to RAGFlow.
 
-:::caution WARNING
-With the default settings, you only need to enter `http://IP_OF_YOUR_MACHINE` (**sans** port number) as the default HTTP serving port `80` can be omitted when using the default configurations.
-:::
+   :::caution WARNING
+   With the default settings, you only need to enter `http://IP_OF_YOUR_MACHINE` (**sans** port number) as the default HTTP serving port `80` can be omitted when using the default configurations.
+   :::
 
 ## Configure LLMs
 
@@ -278,9 +280,9 @@ To create your first dataset:
 
 3. RAGFlow offers multiple chunk templates that cater to different document layouts and file formats. Select the embedding model and chunking method (template) for your dataset. 
 
-:::danger IMPORTANT 
-Once you have selected an embedding model and used it to parse a file, you are no longer allowed to change it. The obvious reason is that we must ensure that all files in a specific dataset are parsed using the *same* embedding model (ensure that they are being compared in the same embedding space). 
-:::
+   :::danger IMPORTANT 
+   Once you have selected an embedding model and used it to parse a file, you are no longer allowed to change it. The obvious reason is that we must ensure that all files in a specific dataset are parsed using the *same* embedding model (ensure that they are being compared in the same embedding space). 
+   :::
 
    _You are taken to the **Dataset** page of your dataset._
 
@@ -290,10 +292,10 @@ Once you have selected an embedding model and used it to parse a file, you are n
 
    ![parse file](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/parse_file.jpg)
 
-:::caution NOTE 
-- If your file parsing gets stuck at below 1%, see [this FAQ](./faq.mdx#why-does-my-document-parsing-stall-at-under-one-percent).
-- If your file parsing gets stuck at near completion, see [this FAQ](./faq.mdx#why-does-my-pdf-parsing-stall-near-completion-while-the-log-does-not-show-any-error)
-:::
+   :::caution NOTE 
+   - If your file parsing gets stuck at below 1%, see [this FAQ](./faq.mdx#why-does-my-document-parsing-stall-at-under-one-percent).
+   - If your file parsing gets stuck at near completion, see [this FAQ](./faq.mdx#why-does-my-pdf-parsing-stall-near-completion-while-the-log-does-not-show-any-error)
+   :::
 
 ## Intervene with file parsing
 
@@ -311,9 +313,9 @@ RAGFlow features visibility and explainability, allowing you to view the chunkin
 
    ![update chunk](https://raw.githubusercontent.com/infiniflow/ragflow-docs/main/images/add_keyword_question.jpg)
 
-:::caution NOTE
-You can add keywords or questions to a file chunk to improve its ranking for queries containing those keywords. This action increases its keyword weight and can improve its position in search list.
-:::
+   :::caution NOTE
+   You can add keywords or questions to a file chunk to improve its ranking for queries containing those keywords. This action increases its keyword weight and can improve its position in search list.
+   :::
 
 4. In Retrieval testing, ask a quick question in **Test text** to double check if your configurations work:
 

From 9d8b96c1d036b9061dfe2270a729ddcf61cf77a4 Mon Sep 17 00:00:00 2001
From: Yongteng Lei <yongtengrey@outlook.com>
Date: Thu, 27 Nov 2025 10:21:44 +0800
Subject: [PATCH 07/17] Feat: add context for figure and table (#11547)

### What problem does this PR solve?

Add context for figure table.



![demo_figure_table_context](https://github.com/user-attachments/assets/61b37fac-e22e-40a4-9665-9396c7b4103e)


`==================()` for demonstrating purpose.
### Type of change

- [x] New Feature (non-breaking change which adds functionality)
---
 api/db/db_models.py                 |   4 +-
 api/db/services/document_service.py |   2 +-
 api/utils/api_utils.py              |  15 ++-
 rag/app/book.py                     |   6 +-
 rag/app/manual.py                   |  20 ++-
 rag/app/naive.py                    |   8 +-
 rag/app/paper.py                    |   8 +-
 rag/app/picture.py                  |  21 ++-
 rag/flow/parser/parser.py           | 169 ++++++++++++++++++-------
 rag/nlp/__init__.py                 | 190 ++++++++++++++++++++++++++++
 test/testcases/configs.py           |   4 +-
 11 files changed, 373 insertions(+), 74 deletions(-)

diff --git a/api/db/db_models.py b/api/db/db_models.py
index bd3feea64..e60afbef5 100644
--- a/api/db/db_models.py
+++ b/api/db/db_models.py
@@ -749,7 +749,7 @@ class Knowledgebase(DataBaseModel):
 
     parser_id = CharField(max_length=32, null=False, help_text="default parser ID", default=ParserType.NAIVE.value, index=True)
     pipeline_id = CharField(max_length=32, null=True, help_text="Pipeline ID", index=True)
-    parser_config = JSONField(null=False, default={"pages": [[1, 1000000]]})
+    parser_config = JSONField(null=False, default={"pages": [[1, 1000000]], "table_context_size": 0, "image_context_size": 0})
     pagerank = IntegerField(default=0, index=False)
 
     graphrag_task_id = CharField(max_length=32, null=True, help_text="Graph RAG task ID", index=True)
@@ -774,7 +774,7 @@ class Document(DataBaseModel):
     kb_id = CharField(max_length=256, null=False, index=True)
     parser_id = CharField(max_length=32, null=False, help_text="default parser ID", index=True)
     pipeline_id = CharField(max_length=32, null=True, help_text="pipeline ID", index=True)
-    parser_config = JSONField(null=False, default={"pages": [[1, 1000000]]})
+    parser_config = JSONField(null=False, default={"pages": [[1, 1000000]], "table_context_size": 0, "image_context_size": 0})
     source_type = CharField(max_length=128, null=False, default="local", help_text="where dose this document come from", index=True)
     type = CharField(max_length=32, null=False, help_text="file extension", index=True)
     created_by = CharField(max_length=32, null=False, help_text="who created it", index=True)
diff --git a/api/db/services/document_service.py b/api/db/services/document_service.py
index 514b3fd87..7b7ef53ec 100644
--- a/api/db/services/document_service.py
+++ b/api/db/services/document_service.py
@@ -923,7 +923,7 @@ def doc_upload_and_parse(conversation_id, file_objs, user_id):
         ParserType.AUDIO.value: audio,
         ParserType.EMAIL.value: email
     }
-    parser_config = {"chunk_token_num": 4096, "delimiter": "\n!?;。；！？", "layout_recognize": "Plain Text"}
+    parser_config = {"chunk_token_num": 4096, "delimiter": "\n!?;。；！？", "layout_recognize": "Plain Text", "table_context_size": 0, "image_context_size": 0}
     exe = ThreadPoolExecutor(max_workers=12)
     threads = []
     doc_nm = {}
diff --git a/api/utils/api_utils.py b/api/utils/api_utils.py
index cbd2423f2..314211694 100644
--- a/api/utils/api_utils.py
+++ b/api/utils/api_utils.py
@@ -313,6 +313,10 @@ def get_parser_config(chunk_method, parser_config):
         chunk_method = "naive"
 
     # Define default configurations for each chunking method
+    base_defaults = {
+        "table_context_size": 0,
+        "image_context_size": 0,
+    }
     key_mapping = {
         "naive": {
             "layout_recognize": "DeepDOC",
@@ -365,16 +369,19 @@ def get_parser_config(chunk_method, parser_config):
 
     default_config = key_mapping[chunk_method]
 
-    # If no parser_config provided, return default
+    # If no parser_config provided, return default merged with base defaults
     if not parser_config:
-        return default_config
+        if default_config is None:
+            return deep_merge(base_defaults, {})
+        return deep_merge(base_defaults, default_config)
 
     # If parser_config is provided, merge with defaults to ensure required fields exist
     if default_config is None:
-        return parser_config
+        return deep_merge(base_defaults, parser_config)
 
     # Ensure raptor and graphrag fields have default values if not provided
-    merged_config = deep_merge(default_config, parser_config)
+    merged_config = deep_merge(base_defaults, default_config)
+    merged_config = deep_merge(merged_config, parser_config)
 
     return merged_config
 
diff --git a/rag/app/book.py b/rag/app/book.py
index 5bdaec72d..ca91be149 100644
--- a/rag/app/book.py
+++ b/rag/app/book.py
@@ -23,7 +23,7 @@ from rag.app import naive
 from rag.app.naive import by_plaintext, PARSERS
 from rag.nlp import bullets_category, is_english,remove_contents_table, \
     hierarchical_merge, make_colon_as_title, naive_merge, random_choices, tokenize_table, \
-    tokenize_chunks
+    tokenize_chunks, attach_media_context
 from rag.nlp import rag_tokenizer
 from deepdoc.parser import PdfParser, HtmlParser
 from deepdoc.parser.figure_parser import vision_figure_parser_docx_wrapper
@@ -175,6 +175,10 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
 
     res = tokenize_table(tbls, doc, eng)
     res.extend(tokenize_chunks(chunks, doc, eng, pdf_parser))
+    table_ctx = max(0, int(parser_config.get("table_context_size", 0) or 0))
+    image_ctx = max(0, int(parser_config.get("image_context_size", 0) or 0))
+    if table_ctx or image_ctx:
+        attach_media_context(res, table_ctx, image_ctx)
 
     return res
 
diff --git a/rag/app/manual.py b/rag/app/manual.py
index b3a4ae38d..1eb86a043 100644
--- a/rag/app/manual.py
+++ b/rag/app/manual.py
@@ -20,7 +20,7 @@ import re
 
 from common.constants import ParserType
 from io import BytesIO
-from rag.nlp import rag_tokenizer, tokenize, tokenize_table, bullets_category, title_frequency, tokenize_chunks, docx_question_level
+from rag.nlp import rag_tokenizer, tokenize, tokenize_table, bullets_category, title_frequency, tokenize_chunks, docx_question_level, attach_media_context
 from common.token_utils import num_tokens_from_string
 from deepdoc.parser import PdfParser, DocxParser
 from deepdoc.parser.figure_parser import vision_figure_parser_pdf_wrapper,vision_figure_parser_docx_wrapper
@@ -155,7 +155,7 @@ class Docx(DocxParser):
             sum_question = '\n'.join(question_stack)
             if sum_question:
                 ti_list.append((f'{sum_question}\n{last_answer}', last_image))
-                
+
         tbls = []
         for tb in self.doc.tables:
             html= "<table>"
@@ -231,14 +231,14 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
             if isinstance(poss, str):
                 poss = pdf_parser.extract_positions(poss)
                 first = poss[0]          # tuple: ([pn], x1, x2, y1, y2)
-                pn = first[0]           
+                pn = first[0]
 
                 if isinstance(pn, list):
                     pn = pn[0]           # [pn] -> pn
                     poss[0] = (pn, *first[1:])
 
             return (txt, layoutno, poss)
-        
+
 
         sections = [_normalize_section(sec) for sec in sections]
 
@@ -247,7 +247,7 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
 
         if name in ["tcadp", "docling", "mineru"]:
             parser_config["chunk_token_num"] = 0
-        
+
         callback(0.8, "Finish parsing.")
 
         if len(sections) > 0 and len(pdf_parser.outlines) / len(sections) > 0.03:
@@ -310,6 +310,10 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
         tbls=vision_figure_parser_pdf_wrapper(tbls=tbls,callback=callback,**kwargs)
         res = tokenize_table(tbls, doc, eng)
         res.extend(tokenize_chunks(chunks, doc, eng, pdf_parser))
+        table_ctx = max(0, int(parser_config.get("table_context_size", 0) or 0))
+        image_ctx = max(0, int(parser_config.get("image_context_size", 0) or 0))
+        if table_ctx or image_ctx:
+            attach_media_context(res, table_ctx, image_ctx)
         return res
 
     elif re.search(r"\.docx?$", filename, re.IGNORECASE):
@@ -325,10 +329,14 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
                 d["doc_type_kwd"] = "image"
             tokenize(d, text, eng)
             res.append(d)
+        table_ctx = max(0, int(parser_config.get("table_context_size", 0) or 0))
+        image_ctx = max(0, int(parser_config.get("image_context_size", 0) or 0))
+        if table_ctx or image_ctx:
+            attach_media_context(res, table_ctx, image_ctx)
         return res
     else:
         raise NotImplementedError("file type not supported yet(pdf and docx supported)")
-    
+
 
 if __name__ == "__main__":
     import sys
diff --git a/rag/app/naive.py b/rag/app/naive.py
index 0496c7507..7872ebc22 100644
--- a/rag/app/naive.py
+++ b/rag/app/naive.py
@@ -37,7 +37,7 @@ from deepdoc.parser.pdf_parser import PlainParser, VisionParser
 from deepdoc.parser.mineru_parser import MinerUParser
 from deepdoc.parser.docling_parser import DoclingParser
 from deepdoc.parser.tcadp_parser import TCADPParser
-from rag.nlp import concat_img, find_codec, naive_merge, naive_merge_with_images, naive_merge_docx, rag_tokenizer, tokenize_chunks, tokenize_chunks_with_images, tokenize_table
+from rag.nlp import concat_img, find_codec, naive_merge, naive_merge_with_images, naive_merge_docx, rag_tokenizer, tokenize_chunks, tokenize_chunks_with_images, tokenize_table, attach_media_context
 
 def by_deepdoc(filename, binary=None, from_page=0, to_page=100000, lang="Chinese", callback=None, pdf_cls = None ,**kwargs):
     callback = callback
@@ -616,6 +616,8 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
     parser_config = kwargs.get(
         "parser_config", {
             "chunk_token_num": 512, "delimiter": "\n!?。；！？", "layout_recognize": "DeepDOC", "analyze_hyperlink": True})
+    table_context_size = max(0, int(parser_config.get("table_context_size", 0) or 0))
+    image_context_size = max(0, int(parser_config.get("image_context_size", 0) or 0))
     final_sections = False
     doc = {
         "docnm_kwd": filename,
@@ -686,6 +688,8 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
         logging.info("naive_merge({}): {}".format(filename, timer() - st))
         res.extend(embed_res)
         res.extend(url_res)
+        if table_context_size or image_context_size:
+            attach_media_context(res, table_context_size, image_context_size)
         return res
 
     elif re.search(r"\.pdf$", filename, re.IGNORECASE):
@@ -947,6 +951,8 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
         res.extend(embed_res)
     if url_res:
         res.extend(url_res)
+    if table_context_size or image_context_size:
+        attach_media_context(res, table_context_size, image_context_size)
     return res
 
 
diff --git a/rag/app/paper.py b/rag/app/paper.py
index 222be0762..d84d5645d 100644
--- a/rag/app/paper.py
+++ b/rag/app/paper.py
@@ -20,7 +20,7 @@ import re
 
 from deepdoc.parser.figure_parser import vision_figure_parser_pdf_wrapper
 from common.constants import ParserType
-from rag.nlp import rag_tokenizer, tokenize, tokenize_table, add_positions, bullets_category, title_frequency, tokenize_chunks
+from rag.nlp import rag_tokenizer, tokenize, tokenize_table, add_positions, bullets_category, title_frequency, tokenize_chunks, attach_media_context
 from deepdoc.parser import PdfParser
 import numpy as np
 from rag.app.naive import by_plaintext, PARSERS
@@ -150,7 +150,7 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
             "chunk_token_num": 512, "delimiter": "\n!?。；！？", "layout_recognize": "DeepDOC"})
     if re.search(r"\.pdf$", filename, re.IGNORECASE):
         layout_recognizer = parser_config.get("layout_recognize", "DeepDOC")
-        
+
         if isinstance(layout_recognizer, bool):
             layout_recognizer = "DeepDOC" if layout_recognizer else "Plain Text"
 
@@ -234,6 +234,10 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
         chunks.append(txt)
         last_sid = sec_id
     res.extend(tokenize_chunks(chunks, doc, eng, pdf_parser))
+    table_ctx = max(0, int(parser_config.get("table_context_size", 0) or 0))
+    image_ctx = max(0, int(parser_config.get("image_context_size", 0) or 0))
+    if table_ctx or image_ctx:
+        attach_media_context(res, table_ctx, image_ctx)
     return res
 
 
diff --git a/rag/app/picture.py b/rag/app/picture.py
index f260104f7..8e7aa4bce 100644
--- a/rag/app/picture.py
+++ b/rag/app/picture.py
@@ -20,11 +20,11 @@ import re
 import numpy as np
 from PIL import Image
 
-from common.constants import LLMType
 from api.db.services.llm_service import LLMBundle
-from deepdoc.vision import OCR
-from rag.nlp import rag_tokenizer, tokenize
+from common.constants import LLMType
 from common.string_utils import clean_markdown_block
+from deepdoc.vision import OCR
+from rag.nlp import attach_media_context, rag_tokenizer, tokenize
 
 ocr = OCR()
 
@@ -39,9 +39,16 @@ def chunk(filename, binary, tenant_id, lang, callback=None, **kwargs):
     }
     eng = lang.lower() == "english"
 
+    parser_config = kwargs.get("parser_config", {}) or {}
+    image_ctx = max(0, int(parser_config.get("image_context_size", 0) or 0))
+
     if any(filename.lower().endswith(ext) for ext in VIDEO_EXTS):
         try:
-            doc.update({"doc_type_kwd": "video"})
+            doc.update(
+                {
+                    "doc_type_kwd": "video",
+                }
+            )
             cv_mdl = LLMBundle(tenant_id, llm_type=LLMType.IMAGE2TEXT, lang=lang)
             ans = cv_mdl.chat(system="", history=[], gen_conf={}, video_bytes=binary, filename=filename)
             callback(0.8, "CV LLM respond: %s ..." % ans[:32])
@@ -64,7 +71,7 @@ def chunk(filename, binary, tenant_id, lang, callback=None, **kwargs):
         if (eng and len(txt.split()) > 32) or len(txt) > 32:
             tokenize(doc, txt, eng)
             callback(0.8, "OCR results is too long to use CV LLM.")
-            return [doc]
+            return attach_media_context([doc], 0, image_ctx)
 
         try:
             callback(0.4, "Use CV LLM to describe the picture.")
@@ -76,7 +83,7 @@ def chunk(filename, binary, tenant_id, lang, callback=None, **kwargs):
             callback(0.8, "CV LLM respond: %s ..." % ans[:32])
             txt += "\n" + ans
             tokenize(doc, txt, eng)
-            return [doc]
+            return attach_media_context([doc], 0, image_ctx)
         except Exception as e:
             callback(prog=-1, msg=str(e))
 
@@ -103,7 +110,7 @@ def vision_llm_chunk(binary, vision_model, prompt=None, callback=None):
                 img_binary.seek(0)
                 img_binary.truncate()
                 img.save(img_binary, format="PNG")
-                
+
             img_binary.seek(0)
             ans = clean_markdown_block(vision_model.describe_with_prompt(img_binary.read(), prompt))
             txt += "\n" + ans
diff --git a/rag/flow/parser/parser.py b/rag/flow/parser/parser.py
index 1a111cc3a..7747448ad 100644
--- a/rag/flow/parser/parser.py
+++ b/rag/flow/parser/parser.py
@@ -19,16 +19,16 @@ import random
 import re
 from functools import partial
 
-import trio
 import numpy as np
+import trio
 from PIL import Image
 
-from common.constants import LLMType
 from api.db.services.file2document_service import File2DocumentService
 from api.db.services.file_service import FileService
 from api.db.services.llm_service import LLMBundle
+from common import settings
+from common.constants import LLMType
 from common.misc_utils import get_uuid
-from rag.utils.base64_image import image2id
 from deepdoc.parser import ExcelParser
 from deepdoc.parser.mineru_parser import MinerUParser
 from deepdoc.parser.pdf_parser import PlainParser, RAGFlowPdfParser, VisionParser
@@ -37,7 +37,8 @@ from rag.app.naive import Docx
 from rag.flow.base import ProcessBase, ProcessParamBase
 from rag.flow.parser.schema import ParserFromUpstream
 from rag.llm.cv_model import Base as VLM
-from common import settings
+from rag.nlp import attach_media_context
+from rag.utils.base64_image import image2id
 
 
 class ParserParam(ProcessParamBase):
@@ -61,15 +62,18 @@ class ParserParam(ProcessParamBase):
                 "json",
             ],
             "image": [
-                "text"
+                "text",
+            ],
+            "email": [
+                "text",
+                "json",
             ],
-            "email": ["text", "json"],
             "text&markdown": [
                 "text",
-                "json"
+                "json",
             ],
             "audio": [
-                "json"
+                "json",
             ],
             "video": [],
         }
@@ -82,6 +86,8 @@ class ParserParam(ProcessParamBase):
                     "pdf",
                 ],
                 "output_format": "json",
+                "table_context_size": 0,
+                "image_context_size": 0,
             },
             "spreadsheet": {
                 "parse_method": "deepdoc",  # deepdoc/tcadp_parser
@@ -91,6 +97,8 @@ class ParserParam(ProcessParamBase):
                     "xlsx",
                     "csv",
                 ],
+                "table_context_size": 0,
+                "image_context_size": 0,
             },
             "word": {
                 "suffix": [
@@ -98,18 +106,24 @@ class ParserParam(ProcessParamBase):
                     "docx",
                 ],
                 "output_format": "json",
+                "table_context_size": 0,
+                "image_context_size": 0,
             },
             "text&markdown": {
                 "suffix": ["md", "markdown", "mdx", "txt"],
                 "output_format": "json",
+                "table_context_size": 0,
+                "image_context_size": 0,
             },
             "slides": {
                 "parse_method": "deepdoc",  # deepdoc/tcadp_parser
                 "suffix": [
                     "pptx",
-                    "ppt"
+                    "ppt",
                 ],
                 "output_format": "json",
+                "table_context_size": 0,
+                "image_context_size": 0,
             },
             "image": {
                 "parse_method": "ocr",
@@ -121,13 +135,14 @@ class ParserParam(ProcessParamBase):
             },
             "email": {
                 "suffix": [
-                  "eml", "msg"
+                    "eml",
+                    "msg",
                 ],
                 "fields": ["from", "to", "cc", "bcc", "date", "subject", "body", "attachments", "metadata"],
                 "output_format": "json",
             },
             "audio": {
-                "suffix":[
+                "suffix": [
                     "da",
                     "wave",
                     "wav",
@@ -142,15 +157,15 @@ class ParserParam(ProcessParamBase):
                     "realaudio",
                     "vqf",
                     "oggvorbis",
-                    "ape"
+                    "ape",
                 ],
                 "output_format": "text",
             },
             "video": {
-                "suffix":[
+                "suffix": [
                     "mp4",
                     "avi",
-                    "mkv"
+                    "mkv",
                 ],
                 "output_format": "text",
             },
@@ -253,7 +268,7 @@ class Parser(ProcessBase):
             markdown_image_response_type = conf.get("markdown_image_response_type", "1")
             tcadp_parser = TCADPParser(
                 table_result_type=table_result_type,
-                markdown_image_response_type=markdown_image_response_type
+                markdown_image_response_type=markdown_image_response_type,
             )
             sections, _ = tcadp_parser.parse_pdf(
                 filepath=name,
@@ -261,7 +276,7 @@ class Parser(ProcessBase):
                 callback=self.callback,
                 file_type="PDF",
                 file_start_page=1,
-                file_end_page=1000
+                file_end_page=1000,
             )
             bboxes = []
             for section, position_tag in sections:
@@ -269,17 +284,20 @@ class Parser(ProcessBase):
                     # Extract position information from TCADP's position tag
                     # Format: @@{page_number}\t{x0}\t{x1}\t{top}\t{bottom}##
                     import re
+
                     match = re.match(r"@@([0-9-]+)\t([0-9.]+)\t([0-9.]+)\t([0-9.]+)\t([0-9.]+)##", position_tag)
                     if match:
                         pn, x0, x1, top, bott = match.groups()
-                        bboxes.append({
-                            "page_number": int(pn.split('-')[0]),  # Take the first page number
-                            "x0": float(x0),
-                            "x1": float(x1),
-                            "top": float(top),
-                            "bottom": float(bott),
-                            "text": section
-                        })
+                        bboxes.append(
+                            {
+                                "page_number": int(pn.split("-")[0]),  # Take the first page number
+                                "x0": float(x0),
+                                "x1": float(x1),
+                                "top": float(top),
+                                "bottom": float(bott),
+                                "text": section,
+                            }
+                        )
                     else:
                         # If no position info, add as text without position
                         bboxes.append({"text": section})
@@ -291,7 +309,30 @@ class Parser(ProcessBase):
             bboxes = []
             for t, poss in lines:
                 for pn, x0, x1, top, bott in RAGFlowPdfParser.extract_positions(poss):
-                    bboxes.append({"page_number": int(pn[0]), "x0": float(x0), "x1": float(x1), "top": float(top), "bottom": float(bott), "text": t})
+                    bboxes.append(
+                        {
+                            "page_number": int(pn[0]),
+                            "x0": float(x0),
+                            "x1": float(x1),
+                            "top": float(top),
+                            "bottom": float(bott),
+                            "text": t,
+                        }
+                    )
+
+        for b in bboxes:
+            text_val = b.get("text", "")
+            has_text = isinstance(text_val, str) and text_val.strip()
+            layout = b.get("layout_type")
+            if layout == "figure" or (b.get("image") and not has_text):
+                b["doc_type_kwd"] = "image"
+            elif layout == "table":
+                b["doc_type_kwd"] = "table"
+
+        table_ctx = conf.get("table_context_size", 0) or 0
+        image_ctx = conf.get("image_context_size", 0) or 0
+        if table_ctx or image_ctx:
+            bboxes = attach_media_context(bboxes, table_ctx, image_ctx)
 
         if conf.get("output_format") == "json":
             self.set_output("json", bboxes)
@@ -319,7 +360,7 @@ class Parser(ProcessBase):
             markdown_image_response_type = conf.get("markdown_image_response_type", "1")
             tcadp_parser = TCADPParser(
                 table_result_type=table_result_type,
-                markdown_image_response_type=markdown_image_response_type
+                markdown_image_response_type=markdown_image_response_type,
             )
             if not tcadp_parser.check_installation():
                 raise RuntimeError("TCADP parser not available. Please check Tencent Cloud API configuration.")
@@ -337,7 +378,7 @@ class Parser(ProcessBase):
                 callback=self.callback,
                 file_type=file_type,
                 file_start_page=1,
-                file_end_page=1000
+                file_end_page=1000,
             )
 
             # Process TCADP parser output based on configured output_format
@@ -365,7 +406,12 @@ class Parser(ProcessBase):
                 # Add tables as text
                 for table in tables:
                     if table:
-                        result.append({"text": table})
+                        result.append({"text": table, "doc_type_kwd": "table"})
+
+                table_ctx = conf.get("table_context_size", 0) or 0
+                image_ctx = conf.get("image_context_size", 0) or 0
+                if table_ctx or image_ctx:
+                    result = attach_media_context(result, table_ctx, image_ctx)
 
                 self.set_output("json", result)
 
@@ -400,7 +446,13 @@ class Parser(ProcessBase):
         if conf.get("output_format") == "json":
             sections, tbls = docx_parser(name, binary=blob)
             sections = [{"text": section[0], "image": section[1]} for section in sections if section]
-            sections.extend([{"text": tb, "image": None} for ((_,tb), _) in tbls])
+            sections.extend([{"text": tb, "image": None, "doc_type_kwd": "table"} for ((_, tb), _) in tbls])
+
+            table_ctx = conf.get("table_context_size", 0) or 0
+            image_ctx = conf.get("image_context_size", 0) or 0
+            if table_ctx or image_ctx:
+                sections = attach_media_context(sections, table_ctx, image_ctx)
+
             self.set_output("json", sections)
         elif conf.get("output_format") == "markdown":
             markdown_text = docx_parser.to_markdown(name, binary=blob)
@@ -420,7 +472,7 @@ class Parser(ProcessBase):
             markdown_image_response_type = conf.get("markdown_image_response_type", "1")
             tcadp_parser = TCADPParser(
                 table_result_type=table_result_type,
-                markdown_image_response_type=markdown_image_response_type
+                markdown_image_response_type=markdown_image_response_type,
             )
             if not tcadp_parser.check_installation():
                 raise RuntimeError("TCADP parser not available. Please check Tencent Cloud API configuration.")
@@ -439,7 +491,7 @@ class Parser(ProcessBase):
                 callback=self.callback,
                 file_type=file_type,
                 file_start_page=1,
-                file_end_page=1000
+                file_end_page=1000,
             )
 
             # Process TCADP parser output - PPT only supports json format
@@ -454,7 +506,12 @@ class Parser(ProcessBase):
                 # Add tables as text
                 for table in tables:
                     if table:
-                        result.append({"text": table})
+                        result.append({"text": table, "doc_type_kwd": "table"})
+
+                table_ctx = conf.get("table_context_size", 0) or 0
+                image_ctx = conf.get("image_context_size", 0) or 0
+                if table_ctx or image_ctx:
+                    result = attach_media_context(result, table_ctx, image_ctx)
 
                 self.set_output("json", result)
         else:
@@ -469,6 +526,10 @@ class Parser(ProcessBase):
             # json
             assert conf.get("output_format") == "json", "have to be json for ppt"
             if conf.get("output_format") == "json":
+                table_ctx = conf.get("table_context_size", 0) or 0
+                image_ctx = conf.get("image_context_size", 0) or 0
+                if table_ctx or image_ctx:
+                    sections = attach_media_context(sections, table_ctx, image_ctx)
                 self.set_output("json", sections)
 
     def _markdown(self, name, blob):
@@ -508,11 +569,15 @@ class Parser(ProcessBase):
 
                 json_results.append(json_result)
 
+            table_ctx = conf.get("table_context_size", 0) or 0
+            image_ctx = conf.get("image_context_size", 0) or 0
+            if table_ctx or image_ctx:
+                json_results = attach_media_context(json_results, table_ctx, image_ctx)
+
             self.set_output("json", json_results)
         else:
             self.set_output("text", "\n".join([section_text for section_text, _ in sections]))
 
-
     def _image(self, name, blob):
         from deepdoc.vision import OCR
 
@@ -588,7 +653,7 @@ class Parser(ProcessBase):
             from email.parser import BytesParser
 
             msg = BytesParser(policy=policy.default).parse(io.BytesIO(blob))
-            email_content['metadata'] = {}
+            email_content["metadata"] = {}
             # handle header info
             for header, value in msg.items():
                 # get fields like from, to, cc, bcc, date, subject
@@ -600,6 +665,7 @@ class Parser(ProcessBase):
             # get body
             if "body" in target_fields:
                 body_text, body_html = [], []
+
                 def _add_content(m, content_type):
                     def _decode_payload(payload, charset, target_list):
                         try:
@@ -641,14 +707,17 @@ class Parser(ProcessBase):
                         if dispositions[0].lower() == "attachment":
                             filename = part.get_filename()
                             payload = part.get_payload(decode=True).decode(part.get_content_charset())
-                            attachments.append({
-                                "filename": filename,
-                                "payload": payload,
-                            })
+                            attachments.append(
+                                {
+                                    "filename": filename,
+                                    "payload": payload,
+                                }
+                            )
                 email_content["attachments"] = attachments
         else:
             # handle msg file
             import extract_msg
+
             print("handle a msg file.")
             msg = extract_msg.Message(blob)
             # handle header info
@@ -662,9 +731,9 @@ class Parser(ProcessBase):
             }
             email_content.update({k: v for k, v in basic_content.items() if k in target_fields})
             # get metadata
-            email_content['metadata'] = {
-                'message_id': msg.messageId,
-                'in_reply_to': msg.inReplyTo,
+            email_content["metadata"] = {
+                "message_id": msg.messageId,
+                "in_reply_to": msg.inReplyTo,
             }
             # get body
             if "body" in target_fields:
@@ -675,29 +744,31 @@ class Parser(ProcessBase):
             if "attachments" in target_fields:
                 attachments = []
                 for t in msg.attachments:
-                    attachments.append({
-                        "filename": t.name,
-                        "payload": t.data.decode("utf-8")
-                    })
+                    attachments.append(
+                        {
+                            "filename": t.name,
+                            "payload": t.data.decode("utf-8"),
+                        }
+                    )
                 email_content["attachments"] = attachments
 
         if conf["output_format"] == "json":
             self.set_output("json", [email_content])
         else:
-            content_txt = ''
+            content_txt = ""
             for k, v in email_content.items():
                 if isinstance(v, str):
                     # basic info
-                    content_txt += f'{k}:{v}' + "\n"
+                    content_txt += f"{k}:{v}" + "\n"
                 elif isinstance(v, dict):
                     # metadata
-                    content_txt += f'{k}:{json.dumps(v)}' + "\n"
+                    content_txt += f"{k}:{json.dumps(v)}" + "\n"
                 elif isinstance(v, list):
                     # attachments or others
                     for fb in v:
                         if isinstance(fb, dict):
                             # attachments
-                            content_txt += f'{fb["filename"]}:{fb["payload"]}' + "\n"
+                            content_txt += f"{fb['filename']}:{fb['payload']}" + "\n"
                         else:
                             # str, usually plain text
                             content_txt += fb
diff --git a/rag/nlp/__init__.py b/rag/nlp/__init__.py
index 0624309ee..6f36a927a 100644
--- a/rag/nlp/__init__.py
+++ b/rag/nlp/__init__.py
@@ -318,6 +318,7 @@ def tokenize_table(tbls, doc, eng, batch_size=10):
             d = copy.deepcopy(doc)
             tokenize(d, rows, eng)
             d["content_with_weight"] = rows
+            d["doc_type_kwd"] = "table"
             if img:
                 d["image"] = img
                 d["doc_type_kwd"] = "image"
@@ -330,6 +331,7 @@ def tokenize_table(tbls, doc, eng, batch_size=10):
             d = copy.deepcopy(doc)
             r = de.join(rows[i:i + batch_size])
             tokenize(d, r, eng)
+            d["doc_type_kwd"] = "table"
             if img:
                 d["image"] = img
                 d["doc_type_kwd"] = "image"
@@ -338,6 +340,194 @@ def tokenize_table(tbls, doc, eng, batch_size=10):
     return res
 
 
+def attach_media_context(chunks, table_context_size=0, image_context_size=0):
+    """
+    Attach surrounding text chunk content to media chunks (table/image).
+    Best-effort ordering: if positional info exists on any chunk, use it to
+    order chunks before collecting context; otherwise keep original order.
+    """
+    if not chunks or (table_context_size <= 0 and image_context_size <= 0):
+        return chunks
+
+    def is_image_chunk(ck):
+        if ck.get("doc_type_kwd") == "image":
+            return True
+
+        text_val = ck.get("content_with_weight") if isinstance(ck.get("content_with_weight"), str) else ck.get("text")
+        has_text = isinstance(text_val, str) and text_val.strip()
+        return bool(ck.get("image")) and not has_text
+
+    def is_table_chunk(ck):
+        return ck.get("doc_type_kwd") == "table"
+
+    def is_text_chunk(ck):
+        return not is_image_chunk(ck) and not is_table_chunk(ck)
+
+    def get_text(ck):
+        if isinstance(ck.get("content_with_weight"), str):
+            return ck["content_with_weight"]
+        if isinstance(ck.get("text"), str):
+            return ck["text"]
+        return ""
+
+    def split_sentences(text):
+        pattern = r"([.。！？!?；;：:\n])"
+        parts = re.split(pattern, text)
+        sentences = []
+        buf = ""
+        for p in parts:
+            if not p:
+                continue
+            if re.fullmatch(pattern, p):
+                buf += p
+                sentences.append(buf)
+                buf = ""
+            else:
+                buf += p
+        if buf:
+            sentences.append(buf)
+        return sentences
+
+    def trim_to_tokens(text, token_budget, from_tail=False):
+        if token_budget <= 0 or not text:
+            return ""
+        sentences = split_sentences(text)
+        if not sentences:
+            return ""
+
+        collected = []
+        remaining = token_budget
+        seq = reversed(sentences) if from_tail else sentences
+        for s in seq:
+            tks = num_tokens_from_string(s)
+            if tks <= 0:
+                continue
+            if tks > remaining:
+                collected.append(s)
+                break
+            collected.append(s)
+            remaining -= tks
+
+        if from_tail:
+            collected = list(reversed(collected))
+        return "".join(collected)
+
+    def extract_position(ck):
+        pn = None
+        top = None
+        left = None
+        try:
+            if ck.get("page_num_int"):
+                pn = ck["page_num_int"][0]
+            elif ck.get("page_number") is not None:
+                pn = ck.get("page_number")
+
+            if ck.get("top_int"):
+                top = ck["top_int"][0]
+            elif ck.get("top") is not None:
+                top = ck.get("top")
+
+            if ck.get("position_int"):
+                left = ck["position_int"][0][1]
+            elif ck.get("x0") is not None:
+                left = ck.get("x0")
+        except Exception:
+            pn = top = left = None
+        return pn, top, left
+
+    indexed = list(enumerate(chunks))
+    positioned_indices = []
+    unpositioned_indices = []
+    for idx, ck in indexed:
+        pn, top, left = extract_position(ck)
+        if pn is not None and top is not None:
+            positioned_indices.append((idx, pn, top, left if left is not None else 0))
+        else:
+            unpositioned_indices.append(idx)
+
+    if positioned_indices:
+        positioned_indices.sort(key=lambda x: (int(x[1]), int(x[2]), int(x[3]), x[0]))
+        ordered_indices = [i for i, _, _, _ in positioned_indices] + unpositioned_indices
+    else:
+        ordered_indices = [idx for idx, _ in indexed]
+
+    total = len(ordered_indices)
+    for sorted_pos, idx in enumerate(ordered_indices):
+        ck = chunks[idx]
+        token_budget = image_context_size if is_image_chunk(ck) else table_context_size if is_table_chunk(ck) else 0
+        if token_budget <= 0:
+            continue
+
+        prev_ctx = []
+        remaining_prev = token_budget
+        for prev_idx in range(sorted_pos - 1, -1, -1):
+            if remaining_prev <= 0:
+                break
+            neighbor_idx = ordered_indices[prev_idx]
+            if not is_text_chunk(chunks[neighbor_idx]):
+                break
+            txt = get_text(chunks[neighbor_idx])
+            if not txt:
+                continue
+            tks = num_tokens_from_string(txt)
+            if tks <= 0:
+                continue
+            if tks > remaining_prev:
+                txt = trim_to_tokens(txt, remaining_prev, from_tail=True)
+                tks = num_tokens_from_string(txt)
+            prev_ctx.append(txt)
+            remaining_prev -= tks
+        prev_ctx.reverse()
+
+        next_ctx = []
+        remaining_next = token_budget
+        for next_idx in range(sorted_pos + 1, total):
+            if remaining_next <= 0:
+                break
+            neighbor_idx = ordered_indices[next_idx]
+            if not is_text_chunk(chunks[neighbor_idx]):
+                break
+            txt = get_text(chunks[neighbor_idx])
+            if not txt:
+                continue
+            tks = num_tokens_from_string(txt)
+            if tks <= 0:
+                continue
+            if tks > remaining_next:
+                txt = trim_to_tokens(txt, remaining_next, from_tail=False)
+                tks = num_tokens_from_string(txt)
+            next_ctx.append(txt)
+            remaining_next -= tks
+
+        if not prev_ctx and not next_ctx:
+            continue
+
+        self_text = get_text(ck)
+        pieces = [*prev_ctx]
+        if self_text:
+            pieces.append(self_text)
+        pieces.extend(next_ctx)
+        combined = "\n".join(pieces)
+
+        original = ck.get("content_with_weight")
+        if "content_with_weight" in ck:
+            ck["content_with_weight"] = combined
+        elif "text" in ck:
+            original = ck.get("text")
+            ck["text"] = combined
+
+        if combined != original:
+            if "content_ltks" in ck:
+                ck["content_ltks"] = rag_tokenizer.tokenize(combined)
+            if "content_sm_ltks" in ck:
+                ck["content_sm_ltks"] = rag_tokenizer.fine_grained_tokenize(ck.get("content_ltks", rag_tokenizer.tokenize(combined)))
+
+    if positioned_indices:
+        chunks[:] = [chunks[i] for i in ordered_indices]
+
+    return chunks
+
+
 def add_positions(d, poss):
     if not poss:
         return
diff --git a/test/testcases/configs.py b/test/testcases/configs.py
index 992e98d5b..a94a627b7 100644
--- a/test/testcases/configs.py
+++ b/test/testcases/configs.py
@@ -42,6 +42,8 @@ DEFAULT_PARSER_CONFIG = {
     "auto_keywords": 0,
     "auto_questions": 0,
     "html4excel": False,
+    "image_context_size": 0,
+    "table_context_size": 0,
     "topn_tags": 3,
     "raptor": {
         "use_raptor": True,
@@ -62,4 +64,4 @@ DEFAULT_PARSER_CONFIG = {
         ],
         "method": "light",
     },
-}
\ No newline at end of file
+}

From 856201c0f27bf94fe61dfee44b1e81cdc5f09729 Mon Sep 17 00:00:00 2001
From: Zhichang Yu <yuzhichang@gmail.com>
Date: Thu, 27 Nov 2025 10:26:08 +0800
Subject: [PATCH 08/17] Fix ft_title_rag_fine (#11555)

### What problem does this PR solve?

Fix ft_title_rag_fine

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 rag/utils/infinity_conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rag/utils/infinity_conn.py b/rag/utils/infinity_conn.py
index 0d17d722a..939ad17d2 100644
--- a/rag/utils/infinity_conn.py
+++ b/rag/utils/infinity_conn.py
@@ -69,7 +69,7 @@ def convert_matching_field(field_weightstr: str) -> str:
     if field == "docnm_kwd" or field == "title_tks":
         field = "docnm@ft_docnm_rag_coarse"
     elif field == "title_sm_tks":
-        field = "docnm@ft_title_rag_fine"
+        field = "docnm@ft_docnm_rag_fine"
     elif field == "important_kwd":
         field = "important_keywords@ft_important_keywords_rag_coarse"
     elif field == "important_tks":

From b6314164c51ca54c638b10c507a15cee3b140243 Mon Sep 17 00:00:00 2001
From: buua436 <66937541+buua436@users.noreply.github.com>
Date: Thu, 27 Nov 2025 15:55:32 +0800
Subject: [PATCH 09/17] Feat:new component Loop (#11447)

### What problem does this PR solve?
issue:
#10427
change:
new component Loop

### Type of change

- [x] New Feature (non-breaking change which adds functionality)
---
 agent/canvas.py              |  39 ++++++++-
 agent/component/exit_loop.py |  32 +++++++
 agent/component/loop.py      |  80 +++++++++++++++++
 agent/component/loopitem.py  | 163 +++++++++++++++++++++++++++++++++++
 deepdoc/parser/pdf_parser.py |   1 -
 5 files changed, 310 insertions(+), 5 deletions(-)
 create mode 100644 agent/component/exit_loop.py
 create mode 100644 agent/component/loop.py
 create mode 100644 agent/component/loopitem.py

diff --git a/agent/canvas.py b/agent/canvas.py
index 3e15814aa..9e95a5611 100644
--- a/agent/canvas.py
+++ b/agent/canvas.py
@@ -281,6 +281,7 @@ class Canvas(Graph):
             "sys.conversation_turns": 0,
             "sys.files": []
         }
+        self.variables = {}
         super().__init__(dsl, tenant_id, task_id)
 
     def load(self):
@@ -295,6 +296,10 @@ class Canvas(Graph):
             "sys.conversation_turns": 0,
             "sys.files": []
         }
+        if "variables" in self.dsl:
+            self.variables = self.dsl["variables"]
+        else:
+            self.variables = {}
 
         self.retrieval = self.dsl["retrieval"]
         self.memory = self.dsl.get("memory", [])
@@ -311,8 +316,9 @@ class Canvas(Graph):
             self.history = []
             self.retrieval = []
             self.memory = []
+        print(self.variables)
         for k in self.globals.keys():
-            if k.startswith("sys.") or k.startswith("env."):
+            if k.startswith("sys."):
                 if isinstance(self.globals[k], str):
                     self.globals[k] = ""
                 elif isinstance(self.globals[k], int):
@@ -325,6 +331,29 @@ class Canvas(Graph):
                     self.globals[k] = {}
                 else:
                     self.globals[k] = None
+            if k.startswith("env."):
+                key = k[4:]
+                if key in self.variables:
+                    variable = self.variables[key]
+                    if variable["value"]:
+                        self.globals[k] = variable["value"]
+                    else:
+                        if variable["type"] == "string":
+                            self.globals[k] = ""
+                        elif variable["type"] == "number":
+                            self.globals[k] = 0
+                        elif variable["type"] == "boolean":
+                            self.globals[k] = False
+                        elif variable["type"] == "object":
+                            self.globals[k] = {}
+                        elif variable["type"].startswith("array"):
+                            self.globals[k] = []
+                        else:
+                            self.globals[k] = ""
+                else:
+                    self.globals[k] = ""
+        print(self.globals)
+                
 
     async def run(self, **kwargs):
         st = time.perf_counter()
@@ -473,7 +502,7 @@ class Canvas(Graph):
                     else:
                         self.error = cpn_obj.error()
 
-                if cpn_obj.component_name.lower() != "iteration":
+                if cpn_obj.component_name.lower() not in ("iteration","loop"):
                     if isinstance(cpn_obj.output("content"), partial):
                         if self.error:
                             cpn_obj.set_output("content", None)
@@ -498,14 +527,16 @@ class Canvas(Graph):
                     for cpn_id in cpn_ids:
                         _append_path(cpn_id)
 
-                if cpn_obj.component_name.lower() == "iterationitem" and cpn_obj.end():
+                if cpn_obj.component_name.lower() in ("iterationitem","loopitem") and cpn_obj.end():
                     iter = cpn_obj.get_parent()
                     yield _node_finished(iter)
                     _extend_path(self.get_component(cpn["parent_id"])["downstream"])
                 elif cpn_obj.component_name.lower() in ["categorize", "switch"]:
                     _extend_path(cpn_obj.output("_next"))
-                elif cpn_obj.component_name.lower() == "iteration":
+                elif cpn_obj.component_name.lower() in ("iteration", "loop"):
                     _append_path(cpn_obj.get_start())
+                elif cpn_obj.component_name.lower() == "exitloop" and cpn_obj.get_parent().component_name.lower() == "loop":
+                    _extend_path(self.get_component(cpn["parent_id"])["downstream"])
                 elif not cpn["downstream"] and cpn_obj.get_parent():
                     _append_path(cpn_obj.get_parent().get_start())
                 else:
diff --git a/agent/component/exit_loop.py b/agent/component/exit_loop.py
new file mode 100644
index 000000000..9dc044912
--- /dev/null
+++ b/agent/component/exit_loop.py
@@ -0,0 +1,32 @@
+#
+#  Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from abc import ABC
+from agent.component.base import ComponentBase, ComponentParamBase
+
+
+class ExitLoopParam(ComponentParamBase, ABC):
+    def check(self):
+        return True
+
+
+class ExitLoop(ComponentBase, ABC):
+    component_name = "ExitLoop"
+
+    def _invoke(self, **kwargs):
+        pass
+
+    def thoughts(self) -> str:
+        return ""
\ No newline at end of file
diff --git a/agent/component/loop.py b/agent/component/loop.py
new file mode 100644
index 000000000..484dfae82
--- /dev/null
+++ b/agent/component/loop.py
@@ -0,0 +1,80 @@
+#
+#  Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from abc import ABC
+from agent.component.base import ComponentBase, ComponentParamBase
+
+
+class LoopParam(ComponentParamBase):
+    """
+    Define the Loop component parameters.
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.loop_variables = []
+        self.loop_termination_condition=[]
+        self.maximum_loop_count = 0
+
+    def get_input_form(self) -> dict[str, dict]:
+        return {
+            "items": {
+                "type": "json",
+                "name": "Items"
+            }
+        }
+
+    def check(self):
+        return True
+
+
+class Loop(ComponentBase, ABC):
+    component_name = "Loop"
+
+    def get_start(self):
+        for cid in self._canvas.components.keys():
+            if self._canvas.get_component(cid)["obj"].component_name.lower() != "loopitem":
+                continue
+            if self._canvas.get_component(cid)["parent_id"] == self._id:
+                return cid
+
+    def _invoke(self, **kwargs):
+        if self.check_if_canceled("Loop processing"):
+            return
+
+        for item in self._param.loop_variables:
+            if any([not item.get("variable"), not item.get("input_mode"), not item.get("value"),not item.get("type")]):
+                assert "Loop Variable is not complete."
+            if item["input_mode"]=="variable":
+                self.set_output(item["variable"],self._canvas.get_variable_value(item["value"]))
+            elif item["input_mode"]=="constant":
+                self.set_output(item["variable"],item["value"])
+            else:
+                if item["type"] == "number":
+                    self.set_output(item["variable"], 0)
+                elif item["type"] == "string":
+                    self.set_output(item["variable"], "")
+                elif item["type"] == "boolean":
+                    self.set_output(item["variable"], False)
+                elif item["type"].startswith("object"):
+                    self.set_output(item["variable"], {})
+                elif item["type"].startswith("array"):
+                    self.set_output(item["variable"], [])
+                else:
+                    self.set_output(item["variable"], "")
+
+
+    def thoughts(self) -> str:
+        return "Loop from canvas."
\ No newline at end of file
diff --git a/agent/component/loopitem.py b/agent/component/loopitem.py
new file mode 100644
index 000000000..71b91c810
--- /dev/null
+++ b/agent/component/loopitem.py
@@ -0,0 +1,163 @@
+#
+#  Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from abc import ABC
+from agent.component.base import ComponentBase, ComponentParamBase
+
+
+class LoopItemParam(ComponentParamBase):
+    """
+    Define the LoopItem component parameters.
+    """
+    def check(self):
+        return True
+
+class LoopItem(ComponentBase, ABC):
+    component_name = "LoopItem"
+
+    def __init__(self, canvas, id, param: ComponentParamBase):
+        super().__init__(canvas, id, param)
+        self._idx = 0
+
+
+    def _invoke(self, **kwargs):
+        if self.check_if_canceled("LoopItem processing"):
+            return
+        parent = self.get_parent()
+        maximum_loop_count = parent._param.maximum_loop_count
+        if self._idx >= maximum_loop_count:
+            self._idx = -1
+            return
+        if self._idx > 0:
+            if self.check_if_canceled("LoopItem processing"):
+                return
+        self._idx += 1
+
+    def evaluate_condition(self,var, operator, value):
+        if isinstance(var, str):
+            if operator == "contains":
+                return value in var
+            elif operator == "not contains":
+                return value not in var
+            elif operator == "start with":
+                return var.startswith(value)
+            elif operator == "end with":
+                return var.endswith(value)
+            elif operator == "is":
+                return var == value
+            elif operator == "is not":
+                return var != value
+            elif operator == "empty":
+                return var == ""
+            elif operator == "not empty":
+                return var != ""
+
+        elif isinstance(var, (int, float)):
+            if operator == "=":
+                return var == value
+            elif operator == "≠":
+                return var != value
+            elif operator == ">":
+                return var > value
+            elif operator == "<":
+                return var < value
+            elif operator == "≥":
+                return var >= value
+            elif operator == "≤":
+                return var <= value
+            elif operator == "empty":
+                return var is None
+            elif operator == "not empty":
+                return var is not None
+
+        elif isinstance(var, bool):
+            if operator == "is":
+                return var is value
+            elif operator == "is not":
+                return var is not value
+            elif operator == "empty":
+                return var is None
+            elif operator == "not empty":
+                return var is not None
+
+        elif isinstance(var, dict):
+            if operator == "empty":
+                return len(var) == 0
+            elif operator == "not empty":
+                return len(var) > 0
+
+        elif isinstance(var, list):
+            if operator == "contains":
+                return value in var
+            elif operator == "not contains":
+                return value not in var
+
+            elif operator == "is":
+                return var == value
+            elif operator == "is not":
+                return var != value
+
+            elif operator == "empty":
+                return len(var) == 0
+            elif operator == "not empty":
+                return len(var) > 0
+
+        raise Exception(f"Invalid operator: {operator}")
+
+    def end(self):
+        if self._idx == -1:
+            return True
+        parent = self.get_parent()
+        logical_operator = parent._param.logical_operator if hasattr(parent._param, "logical_operator") else "and"
+        conditions = []
+        for item in parent._param.loop_termination_condition:
+            if not item.get("variable") or not item.get("operator"):
+                raise ValueError("Loop condition is incomplete.")
+            var = self._canvas.get_variable_value(item["variable"])
+            operator = item["operator"]
+            input_mode = item.get("input_mode", "constant")
+
+            if input_mode == "variable":
+                value = self._canvas.get_variable_value(item.get("value", ""))
+            elif input_mode == "constant":
+                value = item.get("value", "")
+            else:
+                raise ValueError("Invalid input mode.")
+            conditions.append(self.evaluate_condition(var, operator, value))
+        should_end = (
+            all(conditions) if logical_operator == "and"
+            else any(conditions) if logical_operator == "or"
+            else None
+        )
+        if should_end is None:
+            raise ValueError("Invalid logical operator,should be 'and' or 'or'.")
+
+        if should_end:
+            self._idx = -1
+            return True
+
+        return False
+
+    def next(self):
+        if self._idx == -1:
+            self._idx = 0
+        else:
+            self._idx += 1
+            if self._idx >= len(self._items):
+                self._idx = -1
+        return False
+
+    def thoughts(self) -> str:
+        return "Next turn..."
\ No newline at end of file
diff --git a/deepdoc/parser/pdf_parser.py b/deepdoc/parser/pdf_parser.py
index f6613c2f5..a6c370a7e 100644
--- a/deepdoc/parser/pdf_parser.py
+++ b/deepdoc/parser/pdf_parser.py
@@ -402,7 +402,6 @@ class RAGFlowPdfParser:
                         continue
                 else:
                     score = 0
-                print(f"{k=},{score=}",flush=True)
                 if score > best_score:
                     best_score = score
                     best_k = k

From f57f32cf3a6394ed1e73487b31c1da4078b0f44b Mon Sep 17 00:00:00 2001
From: balibabu <cike8899@users.noreply.github.com>
Date: Thu, 27 Nov 2025 15:55:46 +0800
Subject: [PATCH 10/17] Feat: Add loop operator node. #10427 (#11449)

### What problem does this PR solve?

Feat: Add loop operator node. #10427

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
---
 web/src/components/bool-segmented.tsx         |  18 +
 web/src/components/logical-operator.tsx       |  24 ++
 .../metadata-filter-conditions.tsx            |  27 +-
 web/src/constants/agent.tsx                   |   8 +-
 web/src/locales/en.ts                         |  20 +-
 web/src/locales/zh.ts                         |  14 +-
 web/src/pages/agent/canvas/index.tsx          |   5 +
 web/src/pages/agent/canvas/node/dropdown.tsx  |  58 ----
 .../node/dropdown/accordion-operators.tsx     |  14 +
 .../node/dropdown/next-step-dropdown.tsx      |   7 +-
 .../agent/canvas/node/exit-loop-node.tsx      |  23 ++
 .../agent/canvas/node/iteration-node.tsx      |   2 +-
 .../agent/canvas/node/labeled-group-node.tsx  |  75 +++++
 web/src/pages/agent/canvas/node/loop-node.tsx |  16 +
 .../agent/canvas/node/retrieval-node.tsx      |   2 +-
 .../pages/agent/canvas/node/switch-node.tsx   |   2 +-
 web/src/pages/agent/canvas/node/toolbar.tsx   |   2 +-
 web/src/pages/agent/constant/index.tsx        | 142 +++++---
 .../agent/form-sheet/form-config-map.tsx      |  28 +-
 .../pages/agent/form/akshare-form/index.tsx   |  22 --
 .../components/dynamic-input-variable.tsx     | 127 -------
 .../next-dynamic-input-variable.tsx           | 135 --------
 .../prompt-editor/variable-picker-plugin.tsx  |   2 +-
 .../form/components/query-variable-list.tsx   |   2 +-
 .../agent/form/components/query-variable.tsx  |  15 +-
 .../agent/form/invoke-form/variable-table.tsx |   2 +-
 .../form/iteration-form/dynamic-output.tsx    |  69 ++--
 .../pages/agent/form/iteration-form/index.tsx |   2 -
 .../form/iteration-form/use-build-options.ts  |  31 --
 web/src/pages/agent/form/jin10-form/index.tsx | 145 --------
 .../agent/form/keyword-extract-form/index.tsx |  48 ---
 .../dynamic-variables.tsx                     |  84 ++---
 web/src/pages/agent/form/loop-form/index.tsx  |  52 +++
 .../loop-form/loop-termination-condition.tsx  | 316 ++++++++++++++++++
 web/src/pages/agent/form/loop-form/schema.ts  |  24 ++
 .../loop-form/use-build-logical-options.ts    |  27 ++
 .../pages/agent/form/loop-form/use-values.ts  |  20 ++
 .../form/loop-form/use-watch-form-change.ts   | 116 +++++++
 .../pages/agent/form/qweather-form/index.tsx  | 157 ---------
 .../pages/agent/form/tool-form/constant.tsx   |   2 -
 .../pages/agent/form/tushare-form/index.tsx   |  83 -----
 .../hooks/use-object-fields.tsx               |   6 +-
 web/src/pages/agent/hooks/use-add-node.ts     | 105 +++---
 .../pages/agent/hooks/use-build-options.tsx   |   4 +-
 .../agent/hooks/use-filter-child-node-ids.ts  |  10 +
 .../pages/agent/hooks/use-get-begin-query.tsx | 186 ++++++++---
 web/src/pages/agent/hooks/use-show-drawer.tsx |  11 +-
 web/src/pages/agent/interface.ts              |   8 +
 web/src/pages/agent/operator-icon.tsx         |   9 +-
 web/src/pages/agent/utils.ts                  |   5 +-
 web/src/utils/canvas-util.tsx                 |  72 ++--
 51 files changed, 1246 insertions(+), 1138 deletions(-)
 create mode 100644 web/src/components/bool-segmented.tsx
 create mode 100644 web/src/components/logical-operator.tsx
 delete mode 100644 web/src/pages/agent/canvas/node/dropdown.tsx
 create mode 100644 web/src/pages/agent/canvas/node/exit-loop-node.tsx
 create mode 100644 web/src/pages/agent/canvas/node/labeled-group-node.tsx
 create mode 100644 web/src/pages/agent/canvas/node/loop-node.tsx
 delete mode 100644 web/src/pages/agent/form/akshare-form/index.tsx
 delete mode 100644 web/src/pages/agent/form/components/dynamic-input-variable.tsx
 delete mode 100644 web/src/pages/agent/form/components/next-dynamic-input-variable.tsx
 delete mode 100644 web/src/pages/agent/form/iteration-form/use-build-options.ts
 delete mode 100644 web/src/pages/agent/form/jin10-form/index.tsx
 delete mode 100644 web/src/pages/agent/form/keyword-extract-form/index.tsx
 rename web/src/pages/agent/form/{iteration-form => loop-form}/dynamic-variables.tsx (79%)
 create mode 100644 web/src/pages/agent/form/loop-form/index.tsx
 create mode 100644 web/src/pages/agent/form/loop-form/loop-termination-condition.tsx
 create mode 100644 web/src/pages/agent/form/loop-form/schema.ts
 create mode 100644 web/src/pages/agent/form/loop-form/use-build-logical-options.ts
 create mode 100644 web/src/pages/agent/form/loop-form/use-values.ts
 create mode 100644 web/src/pages/agent/form/loop-form/use-watch-form-change.ts
 delete mode 100644 web/src/pages/agent/form/qweather-form/index.tsx
 delete mode 100644 web/src/pages/agent/form/tushare-form/index.tsx
 create mode 100644 web/src/pages/agent/hooks/use-filter-child-node-ids.ts

diff --git a/web/src/components/bool-segmented.tsx b/web/src/components/bool-segmented.tsx
new file mode 100644
index 000000000..3d84e38a7
--- /dev/null
+++ b/web/src/components/bool-segmented.tsx
@@ -0,0 +1,18 @@
+import { omit } from 'lodash';
+import { Segmented, SegmentedProps } from './ui/segmented';
+
+export function BoolSegmented({ ...props }: Omit<SegmentedProps, 'options'>) {
+  return (
+    <Segmented
+      options={
+        [
+          { value: true, label: 'True' },
+          { value: false, label: 'False' },
+        ] as any
+      }
+      sizeType="sm"
+      itemClassName="justify-center flex-1"
+      {...omit(props, 'options')}
+    ></Segmented>
+  );
+}
diff --git a/web/src/components/logical-operator.tsx b/web/src/components/logical-operator.tsx
new file mode 100644
index 000000000..7b37a2567
--- /dev/null
+++ b/web/src/components/logical-operator.tsx
@@ -0,0 +1,24 @@
+import { useBuildSwitchLogicOperatorOptions } from '@/hooks/logic-hooks/use-build-options';
+import { RAGFlowFormItem } from './ragflow-form';
+import { RAGFlowSelect } from './ui/select';
+
+type LogicalOperatorProps = { name: string };
+
+export function LogicalOperator({ name }: LogicalOperatorProps) {
+  const switchLogicOperatorOptions = useBuildSwitchLogicOperatorOptions();
+
+  return (
+    <div className="relative min-w-14">
+      <RAGFlowFormItem
+        name={name}
+        className="absolute top-1/2 -translate-y-1/2 right-1 left-0 z-10 bg-bg-base"
+      >
+        <RAGFlowSelect
+          options={switchLogicOperatorOptions}
+          triggerClassName="w-full text-xs px-1 py-0 h-6"
+        ></RAGFlowSelect>
+      </RAGFlowFormItem>
+      <div className="absolute border-l border-y w-5 right-0 top-4 bottom-4 rounded-l-lg"></div>
+    </div>
+  );
+}
diff --git a/web/src/components/metadata-filter/metadata-filter-conditions.tsx b/web/src/components/metadata-filter/metadata-filter-conditions.tsx
index aee103a1f..599a6ed80 100644
--- a/web/src/components/metadata-filter/metadata-filter-conditions.tsx
+++ b/web/src/components/metadata-filter/metadata-filter-conditions.tsx
@@ -17,15 +17,13 @@ import { Input } from '@/components/ui/input';
 import { Separator } from '@/components/ui/separator';
 import { SwitchLogicOperator, SwitchOperatorOptions } from '@/constants/agent';
 import { useBuildSwitchOperatorOptions } from '@/hooks/logic-hooks/use-build-operator-options';
-import { useBuildSwitchLogicOperatorOptions } from '@/hooks/logic-hooks/use-build-options';
 import { useFetchKnowledgeMetadata } from '@/hooks/use-knowledge-request';
 import { PromptEditor } from '@/pages/agent/form/components/prompt-editor';
 import { Plus, X } from 'lucide-react';
 import { useCallback } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { RAGFlowFormItem } from '../ragflow-form';
-import { RAGFlowSelect } from '../ui/select';
+import { LogicalOperator } from '../logical-operator';
 
 export function MetadataFilterConditions({
   kbIds,
@@ -44,8 +42,6 @@ export function MetadataFilterConditions({
 
   const switchOperatorOptions = useBuildSwitchOperatorOptions();
 
-  const switchLogicOperatorOptions = useBuildSwitchLogicOperatorOptions();
-
   const { fields, remove, append } = useFieldArray({
     name,
     control: form.control,
@@ -53,14 +49,16 @@ export function MetadataFilterConditions({
 
   const add = useCallback(
     (key: string) => () => {
-      form.setValue(logic, SwitchLogicOperator.And);
+      if (fields.length === 1) {
+        form.setValue(logic, SwitchLogicOperator.And);
+      }
       append({
         key,
         value: '',
         op: SwitchOperatorOptions[0].value,
       });
     },
-    [append, form, logic],
+    [append, fields.length, form, logic],
   );
 
   return (
@@ -85,20 +83,7 @@ export function MetadataFilterConditions({
         </DropdownMenu>
       </div>
       <section className="flex">
-        {fields.length > 1 && (
-          <div className="relative min-w-14">
-            <RAGFlowFormItem
-              name={logic}
-              className="absolute top-1/2 -translate-y-1/2 right-1 left-0 z-10 bg-bg-base"
-            >
-              <RAGFlowSelect
-                options={switchLogicOperatorOptions}
-                triggerClassName="w-full text-xs px-1 py-0 h-6"
-              ></RAGFlowSelect>
-            </RAGFlowFormItem>
-            <div className="absolute border-l border-y w-5 right-0 top-4 bottom-4 rounded-l-lg"></div>
-          </div>
-        )}
+        {fields.length > 1 && <LogicalOperator name={logic}></LogicalOperator>}
         <div className="space-y-5 flex-1">
           {fields.map((field, index) => {
             const typeField = `${name}.${index}.key`;
diff --git a/web/src/constants/agent.tsx b/web/src/constants/agent.tsx
index e1c1574d5..ee10e3a29 100644
--- a/web/src/constants/agent.tsx
+++ b/web/src/constants/agent.tsx
@@ -75,7 +75,6 @@ export enum Operator {
   Message = 'Message',
   Relevant = 'Relevant',
   RewriteQuestion = 'RewriteQuestion',
-  KeywordExtract = 'KeywordExtract',
   DuckDuckGo = 'DuckDuckGo',
   Wikipedia = 'Wikipedia',
   PubMed = 'PubMed',
@@ -84,14 +83,10 @@ export enum Operator {
   Bing = 'Bing',
   GoogleScholar = 'GoogleScholar',
   GitHub = 'GitHub',
-  QWeather = 'QWeather',
   ExeSQL = 'ExeSQL',
   Switch = 'Switch',
   WenCai = 'WenCai',
-  AkShare = 'AkShare',
   YahooFinance = 'YahooFinance',
-  Jin10 = 'Jin10',
-  TuShare = 'TuShare',
   Note = 'Note',
   Crawler = 'Crawler',
   Invoke = 'Invoke',
@@ -118,6 +113,9 @@ export enum Operator {
   Splitter = 'Splitter',
   HierarchicalMerger = 'HierarchicalMerger',
   Extractor = 'Extractor',
+  Loop = 'Loop',
+  LoopStart = 'LoopItem',
+  ExitLoop = 'ExitLoop',
 }
 
 export enum ComparisonOperator {
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 225d8c127..59f2bf73c 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -1170,8 +1170,13 @@ Example: Virtual Hosted Style`,
       addField: 'Add option',
       addMessage: 'Add message',
       loop: 'Loop',
-      loopTip:
+      loopDescription:
         'Loop is the upper limit of the number of loops of the current component, when the number of loops exceeds the value of loop, it means that the component can not complete the current task, please re-optimize agent',
+      exitLoop: 'Exit loop',
+      exitLoopDescription: `Equivalent to "break". This node has no configuration items. When the loop body reaches this node, the loop terminates.`,
+      loopVariables: 'Loop Variables',
+      maximumLoopCount: 'Maximum loop count',
+      loopTerminationCondition: 'Loop termination condition',
       yes: 'Yes',
       no: 'No',
       key: 'Key',
@@ -1655,9 +1660,8 @@ This delimiter is used to split the input text into several text pieces echo of
       variableAssignerDescription:
         'This component performs operations on Data objects, including extracting, filtering, and editing keys and values in the Data.',
       variableAggregator: 'Variable aggregator',
-      variableAggregatorDescription: `This process aggregates variables from multiple branches into a single variable to achieve unified configuration for downstream nodes.
-
-The variable aggregation node (originally the variable assignment node) is a crucial node in the workflow. It is responsible for integrating the output results of different branches, ensuring that regardless of which branch is executed, its result can be referenced and accessed through a unified variable. This is extremely useful in multi-branch scenarios, as it maps variables with the same function across different branches to a single output variable, avoiding redundant definitions in downstream nodes.`,
+      variableAggregatorDescription: `
+This process aggregates variables from multiple branches into a single variable to achieve unified configuration for downstream nodes.`,
       inputVariables: 'Input variables',
       runningHintText: 'is running...🕞',
       openingSwitch: 'Opening switch',
@@ -1886,10 +1890,10 @@ Important structured information may include: names, dates, locations, events, k
         overwrite: 'Overwritten By',
         clear: 'Clear',
         set: 'Set',
-        '+=': 'Add',
-        '-=': 'Subtract',
-        '*=': 'Multiply',
-        '/=': 'Divide',
+        add: 'Add',
+        subtract: 'Subtract',
+        multiply: 'Multiply',
+        divide: 'Divide',
         append: 'Append',
         extend: 'Extend',
         removeFirst: 'Remove first',
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index e5b48bf56..4156e5b34 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -1102,9 +1102,14 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       messageMsg: '请输入消息或删除此字段。',
       addField: '新增字段',
       addMessage: '新增消息',
-      loop: '循环上限',
-      loopTip:
+      loop: '循环',
+      loopDescription:
         'loop为当前组件循环次数上限，当循环次数超过loop的值时，说明组件不能完成当前任务，请重新优化agent',
+      exitLoop: '退出循环',
+      exitLoopDescription: `等同于 "break"。此节点没有配置项。当循环体到达此节点时，循环终止。`,
+      loopVariables: '循环变量',
+      maximumLoopCount: '最大循环次数',
+      loopTerminationCondition: '循环终止条件',
       yes: '是',
       no: '否',
       key: '键',
@@ -1499,7 +1504,7 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       contentTip: 'content: 邮件内容(可选)',
       jsonUploadTypeErrorMessage: '请上传json文件',
       jsonUploadContentErrorMessage: 'json 文件错误',
-      iteration: '循环',
+      iteration: '迭代',
       iterationDescription: `该组件负责迭代生成新的内容，对列表对象执行多次步骤直至输出所有结果。`,
       delimiterTip: `该分隔符用于将输入文本分割成几个文本片段，每个文本片段的回显将作为每次迭代的输入项。`,
       delimiterOptions: {
@@ -1545,8 +1550,7 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       variableAssignerDescription:
         '此组件对数据对象执行操作，包括提取、筛选和编辑数据中的键和值。',
       variableAggregator: '变量聚合',
-      variableAggregatorDescription: `将多路分支的变量聚合为一个变量，以实现下游节点统一配置。
-变量聚合节点（原变量赋值节点）是工作流程中的一个关键节点，它负责整合不同分支的输出结果，确保无论哪个分支被执行，其结果都能通过一个统一的变量来引用和访问。这在多分支的情况下非常有用，可将不同分支下相同作用的变量映射为一个输出变量，避免下游节点重复定义。`,
+      variableAggregatorDescription: `该过程将来自多个分支的变量聚合到一个变量中，以实现下游节点的统一配置。`,
       inputVariables: '输入变量',
       addVariable: '新增变量',
       runningHintText: '正在运行中...🕞',
diff --git a/web/src/pages/agent/canvas/index.tsx b/web/src/pages/agent/canvas/index.tsx
index f2fc983e2..6c088809d 100644
--- a/web/src/pages/agent/canvas/index.tsx
+++ b/web/src/pages/agent/canvas/index.tsx
@@ -56,12 +56,14 @@ import { BeginNode } from './node/begin-node';
 import { CategorizeNode } from './node/categorize-node';
 import { DataOperationsNode } from './node/data-operations-node';
 import { NextStepDropdown } from './node/dropdown/next-step-dropdown';
+import { ExitLoopNode } from './node/exit-loop-node';
 import { ExtractorNode } from './node/extractor-node';
 import { FileNode } from './node/file-node';
 import { InvokeNode } from './node/invoke-node';
 import { IterationNode, IterationStartNode } from './node/iteration-node';
 import { KeywordNode } from './node/keyword-node';
 import { ListOperationsNode } from './node/list-operations-node';
+import { LoopNode, LoopStartNode } from './node/loop-node';
 import { MessageNode } from './node/message-node';
 import NoteNode from './node/note-node';
 import ParserNode from './node/parser-node';
@@ -105,6 +107,9 @@ export const nodeTypes: NodeTypes = {
   listOperationsNode: ListOperationsNode,
   variableAssignerNode: VariableAssignerNode,
   variableAggregatorNode: VariableAggregatorNode,
+  loopNode: LoopNode,
+  loopStartNode: LoopStartNode,
+  exitLoopNode: ExitLoopNode,
 };
 
 const edgeTypes = {
diff --git a/web/src/pages/agent/canvas/node/dropdown.tsx b/web/src/pages/agent/canvas/node/dropdown.tsx
deleted file mode 100644
index dd5263abc..000000000
--- a/web/src/pages/agent/canvas/node/dropdown.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import OperateDropdown from '@/components/operate-dropdown';
-import { CopyOutlined } from '@ant-design/icons';
-import { Flex, MenuProps } from 'antd';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Operator } from '../../constant';
-import { useDuplicateNode } from '../../hooks';
-import useGraphStore from '../../store';
-
-interface IProps {
-  id: string;
-  iconFontColor?: string;
-  label: string;
-}
-
-const NodeDropdown = ({ id, iconFontColor, label }: IProps) => {
-  const { t } = useTranslation();
-  const deleteNodeById = useGraphStore((store) => store.deleteNodeById);
-  const deleteIterationNodeById = useGraphStore(
-    (store) => store.deleteIterationNodeById,
-  );
-
-  const deleteNode = useCallback(() => {
-    if (label === Operator.Iteration) {
-      deleteIterationNodeById(id);
-    } else {
-      deleteNodeById(id);
-    }
-  }, [label, deleteIterationNodeById, id, deleteNodeById]);
-
-  const duplicateNode = useDuplicateNode();
-
-  const items: MenuProps['items'] = [
-    {
-      key: '2',
-      onClick: () => duplicateNode(id, label),
-      label: (
-        <Flex justify={'space-between'}>
-          {t('common.copy')}
-          <CopyOutlined />
-        </Flex>
-      ),
-    },
-  ];
-
-  return (
-    <OperateDropdown
-      iconFontSize={22}
-      height={14}
-      deleteItem={deleteNode}
-      items={items}
-      needsDeletionValidation={false}
-      iconFontColor={iconFontColor}
-    ></OperateDropdown>
-  );
-};
-
-export default NodeDropdown;
diff --git a/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx b/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx
index 6021420c5..5aa5c2873 100644
--- a/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx
+++ b/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx
@@ -21,11 +21,23 @@ function OperatorAccordionTrigger({ children }: PropsWithChildren) {
 export function AccordionOperators({
   isCustomDropdown = false,
   mousePosition,
+  nodeId,
 }: {
   isCustomDropdown?: boolean;
   mousePosition?: { x: number; y: number };
+  nodeId?: string;
 }) {
   const { t } = useTranslation();
+  const { getOperatorTypeFromId, getParentIdById } = useGraphStore(
+    (state) => state,
+  );
+
+  const exitLoopList = useMemo(() => {
+    if (getOperatorTypeFromId(getParentIdById(nodeId)) === Operator.Loop) {
+      return [Operator.ExitLoop];
+    }
+    return [];
+  }, [getOperatorTypeFromId, getParentIdById, nodeId]);
 
   return (
     <Accordion
@@ -62,6 +74,8 @@ export function AccordionOperators({
             operators={[
               Operator.Switch,
               Operator.Iteration,
+              Operator.Loop,
+              ...exitLoopList,
               Operator.Categorize,
             ]}
             isCustomDropdown={isCustomDropdown}
diff --git a/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx b/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
index 3b7acfc71..43ddb2c59 100644
--- a/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
+++ b/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
@@ -73,6 +73,7 @@ export function InnerNextStepDropdown({
                 <AccordionOperators
                   isCustomDropdown={true}
                   mousePosition={position}
+                  nodeId={nodeId}
                 ></AccordionOperators>
               )}
             </OnNodeCreatedContext.Provider>
@@ -101,9 +102,11 @@ export function InnerNextStepDropdown({
         </DropdownMenuLabel>
         <HideModalContext.Provider value={hideModal}>
           {isPipeline ? (
-            <PipelineAccordionOperators></PipelineAccordionOperators>
+            <PipelineAccordionOperators
+              nodeId={nodeId}
+            ></PipelineAccordionOperators>
           ) : (
-            <AccordionOperators></AccordionOperators>
+            <AccordionOperators nodeId={nodeId}></AccordionOperators>
           )}
         </HideModalContext.Provider>
       </DropdownMenuContent>
diff --git a/web/src/pages/agent/canvas/node/exit-loop-node.tsx b/web/src/pages/agent/canvas/node/exit-loop-node.tsx
new file mode 100644
index 000000000..e6bd6ba3d
--- /dev/null
+++ b/web/src/pages/agent/canvas/node/exit-loop-node.tsx
@@ -0,0 +1,23 @@
+import { BaseNode } from '@/interfaces/database/agent';
+import { NodeProps } from '@xyflow/react';
+import { LeftEndHandle } from './handle';
+import NodeHeader from './node-header';
+import { NodeWrapper } from './node-wrapper';
+import { ToolBar } from './toolbar';
+
+export function ExitLoopNode({ id, data, selected }: NodeProps<BaseNode<any>>) {
+  return (
+    <ToolBar
+      selected={selected}
+      id={id}
+      label={data.label}
+      showRun={false}
+      showCopy={false}
+    >
+      <NodeWrapper selected={selected}>
+        <LeftEndHandle></LeftEndHandle>
+        <NodeHeader id={id} name={data.name} label={data.label}></NodeHeader>
+      </NodeWrapper>
+    </ToolBar>
+  );
+}
diff --git a/web/src/pages/agent/canvas/node/iteration-node.tsx b/web/src/pages/agent/canvas/node/iteration-node.tsx
index a11da33dc..c893e7723 100644
--- a/web/src/pages/agent/canvas/node/iteration-node.tsx
+++ b/web/src/pages/agent/canvas/node/iteration-node.tsx
@@ -56,7 +56,7 @@ export function InnerIterationNode({
   );
 }
 
-function InnerIterationStartNode({
+export function InnerIterationStartNode({
   isConnectable = true,
   id,
   selected,
diff --git a/web/src/pages/agent/canvas/node/labeled-group-node.tsx b/web/src/pages/agent/canvas/node/labeled-group-node.tsx
new file mode 100644
index 000000000..b7f4f1d75
--- /dev/null
+++ b/web/src/pages/agent/canvas/node/labeled-group-node.tsx
@@ -0,0 +1,75 @@
+import { Panel, type NodeProps, type PanelPosition } from '@xyflow/react';
+import { type ComponentProps, type ReactNode } from 'react';
+
+import { BaseNode } from '@/components/xyflow/base-node';
+import { cn } from '@/lib/utils';
+
+/* GROUP NODE Label ------------------------------------------------------- */
+
+export type GroupNodeLabelProps = ComponentProps<'div'>;
+
+export function GroupNodeLabel({
+  children,
+  className,
+  ...props
+}: GroupNodeLabelProps) {
+  return (
+    <div className="h-full w-full" {...props}>
+      <div
+        className={cn(
+          'text-card-foreground bg-secondary w-fit p-2 text-xs',
+          className,
+        )}
+      >
+        {children}
+      </div>
+    </div>
+  );
+}
+
+export type GroupNodeProps = Partial<NodeProps> & {
+  label?: ReactNode;
+  position?: PanelPosition;
+};
+
+/* GROUP NODE -------------------------------------------------------------- */
+
+export function LabeledGroupNode({
+  label = '',
+  position,
+  ...props
+}: GroupNodeProps) {
+  const getLabelClassName = (position?: PanelPosition) => {
+    switch (position) {
+      case 'top-left':
+        return 'rounded-br-sm';
+      case 'top-center':
+        return 'rounded-b-sm';
+      case 'top-right':
+        return 'rounded-bl-sm';
+      case 'bottom-left':
+        return 'rounded-tr-sm';
+      case 'bottom-right':
+        return 'rounded-tl-sm';
+      case 'bottom-center':
+        return 'rounded-t-sm';
+      default:
+        return 'rounded-br-sm';
+    }
+  };
+
+  return (
+    <BaseNode
+      className="bg-opacity-50 h-full overflow-hidden rounded-sm"
+      {...props}
+    >
+      <Panel className="m-0 p-0" position={position}>
+        {label && (
+          <GroupNodeLabel className={getLabelClassName(position)}>
+            {label}
+          </GroupNodeLabel>
+        )}
+      </Panel>
+    </BaseNode>
+  );
+}
diff --git a/web/src/pages/agent/canvas/node/loop-node.tsx b/web/src/pages/agent/canvas/node/loop-node.tsx
new file mode 100644
index 000000000..6afbe841a
--- /dev/null
+++ b/web/src/pages/agent/canvas/node/loop-node.tsx
@@ -0,0 +1,16 @@
+import { BaseNode } from '@/interfaces/database/agent';
+import { NodeProps } from '@xyflow/react';
+import { memo } from 'react';
+import { InnerIterationNode, InnerIterationStartNode } from './iteration-node';
+
+export function InnerLoopNode({ ...props }: NodeProps<BaseNode<any>>) {
+  return <InnerIterationNode {...props}></InnerIterationNode>;
+}
+
+export const LoopNode = memo(InnerLoopNode);
+
+export function InnerLoopStartNode({ ...props }: NodeProps<BaseNode<any>>) {
+  return <InnerIterationStartNode {...props}></InnerIterationStartNode>;
+}
+
+export const LoopStartNode = memo(InnerLoopStartNode);
diff --git a/web/src/pages/agent/canvas/node/retrieval-node.tsx b/web/src/pages/agent/canvas/node/retrieval-node.tsx
index 068c81735..9c6b76110 100644
--- a/web/src/pages/agent/canvas/node/retrieval-node.tsx
+++ b/web/src/pages/agent/canvas/node/retrieval-node.tsx
@@ -23,7 +23,7 @@ function InnerRetrievalNode({
   const knowledgeBaseIds: string[] = get(data, 'form.kb_ids', []);
   const { list: knowledgeList } = useFetchKnowledgeList(true);
 
-  const { getLabel } = useGetVariableLabelOrTypeByValue(id);
+  const { getLabel } = useGetVariableLabelOrTypeByValue({ nodeId: id });
 
   return (
     <ToolBar selected={selected} id={id} label={data.label}>
diff --git a/web/src/pages/agent/canvas/node/switch-node.tsx b/web/src/pages/agent/canvas/node/switch-node.tsx
index 006afd843..7b15c02b3 100644
--- a/web/src/pages/agent/canvas/node/switch-node.tsx
+++ b/web/src/pages/agent/canvas/node/switch-node.tsx
@@ -27,7 +27,7 @@ const ConditionBlock = ({
   nodeId,
 }: { condition: ISwitchCondition } & { nodeId: string }) => {
   const items = condition?.items ?? [];
-  const { getLabel } = useGetVariableLabelOrTypeByValue(nodeId);
+  const { getLabel } = useGetVariableLabelOrTypeByValue({ nodeId });
 
   const renderOperatorIcon = useCallback((operator?: string) => {
     const item = SwitchOperatorOptions.find((x) => x.value === operator);
diff --git a/web/src/pages/agent/canvas/node/toolbar.tsx b/web/src/pages/agent/canvas/node/toolbar.tsx
index 74f6ae3db..775ba228d 100644
--- a/web/src/pages/agent/canvas/node/toolbar.tsx
+++ b/web/src/pages/agent/canvas/node/toolbar.tsx
@@ -58,7 +58,7 @@ export function ToolBar({
   const deleteNode: MouseEventHandler<HTMLDivElement> = useCallback(
     (e) => {
       e.stopPropagation();
-      if (label === Operator.Iteration) {
+      if ([Operator.Iteration, Operator.Loop].includes(label as Operator)) {
         deleteIterationNodeById(id);
       } else {
         deleteNodeById(id);
diff --git a/web/src/pages/agent/constant/index.tsx b/web/src/pages/agent/constant/index.tsx
index 4a442271b..283a3d718 100644
--- a/web/src/pages/agent/constant/index.tsx
+++ b/web/src/pages/agent/constant/index.tsx
@@ -61,7 +61,6 @@ export const AgentOperatorList = [
   Operator.Categorize,
   Operator.Message,
   Operator.RewriteQuestion,
-  Operator.KeywordExtract,
   Operator.Switch,
   Operator.Iteration,
   Operator.WaitingDialogue,
@@ -79,10 +78,6 @@ export const DataOperationsOperatorOptions = [
 
 export const SwitchElseTo = 'end_cpn_ids';
 
-const initialQueryBaseValues = {
-  query: [],
-};
-
 export const initialRetrievalValues = {
   query: AgentGlobalsSysQueryWithBrace,
   top_n: 8,
@@ -139,11 +134,6 @@ export const initialMessageValues = {
   content: [''],
 };
 
-export const initialKeywordExtractValues = {
-  ...initialLlmBaseValues,
-  top_n: 3,
-  ...initialQueryBaseValues,
-};
 export const initialDuckValues = {
   top_n: 10,
   channel: Channel.Text,
@@ -275,14 +265,6 @@ export const initialGithubValues = {
   },
 };
 
-export const initialQWeatherValues = {
-  web_apikey: 'xxx',
-  type: 'weather',
-  user_type: 'free',
-  time_period: 'now',
-  ...initialQueryBaseValues,
-};
-
 export const initialExeSqlValues = {
   sql: '',
   db_type: 'mysql',
@@ -331,8 +313,6 @@ export const initialWenCaiValues = {
   },
 };
 
-export const initialAkShareValues = { top_n: 10, ...initialQueryBaseValues };
-
 export const initialYahooFinanceValues = {
   stock_code: '',
   info: true,
@@ -349,22 +329,6 @@ export const initialYahooFinanceValues = {
   },
 };
 
-export const initialJin10Values = {
-  type: 'flash',
-  secret_key: 'xxx',
-  flash_type: '1',
-  contain: '',
-  filter: '',
-  ...initialQueryBaseValues,
-};
-
-export const initialTuShareValues = {
-  token: 'xxx',
-  src: 'eastmoney',
-  start_date: '2024-01-01 09:00:00',
-  ...initialQueryBaseValues,
-};
-
 export const initialNoteValues = {
   text: '',
 };
@@ -624,6 +588,13 @@ export const initialVariableAssignerValues = {};
 
 export const initialVariableAggregatorValues = { outputs: {}, groups: [] };
 
+export const initialLoopValues = {
+  loop_variables: [],
+  loop_termination_condition: [],
+  maximum_loop_count: 10,
+  outputs: {},
+};
+
 export const CategorizeAnchorPointPositions = [
   { top: 1, right: 34 },
   { top: 8, right: 18 },
@@ -659,11 +630,6 @@ export const RestrictedUpstreamMap = {
     Operator.RewriteQuestion,
     Operator.Relevant,
   ],
-  [Operator.KeywordExtract]: [
-    Operator.Begin,
-    Operator.Message,
-    Operator.Relevant,
-  ],
   [Operator.DuckDuckGo]: [Operator.Begin, Operator.Retrieval],
   [Operator.Wikipedia]: [Operator.Begin, Operator.Retrieval],
   [Operator.PubMed]: [Operator.Begin, Operator.Retrieval],
@@ -672,15 +638,11 @@ export const RestrictedUpstreamMap = {
   [Operator.Bing]: [Operator.Begin, Operator.Retrieval],
   [Operator.GoogleScholar]: [Operator.Begin, Operator.Retrieval],
   [Operator.GitHub]: [Operator.Begin, Operator.Retrieval],
-  [Operator.QWeather]: [Operator.Begin, Operator.Retrieval],
   [Operator.SearXNG]: [Operator.Begin, Operator.Retrieval],
   [Operator.ExeSQL]: [Operator.Begin],
   [Operator.Switch]: [Operator.Begin],
   [Operator.WenCai]: [Operator.Begin],
-  [Operator.AkShare]: [Operator.Begin],
   [Operator.YahooFinance]: [Operator.Begin],
-  [Operator.Jin10]: [Operator.Begin],
-  [Operator.TuShare]: [Operator.Begin],
   [Operator.Crawler]: [Operator.Begin],
   [Operator.Note]: [],
   [Operator.Invoke]: [Operator.Begin],
@@ -706,6 +668,9 @@ export const RestrictedUpstreamMap = {
   [Operator.Tokenizer]: [Operator.Begin],
   [Operator.Extractor]: [Operator.Begin],
   [Operator.File]: [Operator.Begin],
+  [Operator.Loop]: [Operator.Begin],
+  [Operator.LoopStart]: [Operator.Begin],
+  [Operator.ExitLoop]: [Operator.Begin],
 };
 
 export const NodeMap = {
@@ -715,7 +680,6 @@ export const NodeMap = {
   [Operator.Message]: 'messageNode',
   [Operator.Relevant]: 'relevantNode',
   [Operator.RewriteQuestion]: 'rewriteNode',
-  [Operator.KeywordExtract]: 'keywordNode',
   [Operator.DuckDuckGo]: 'ragNode',
   [Operator.Wikipedia]: 'ragNode',
   [Operator.PubMed]: 'ragNode',
@@ -724,15 +688,11 @@ export const NodeMap = {
   [Operator.Bing]: 'ragNode',
   [Operator.GoogleScholar]: 'ragNode',
   [Operator.GitHub]: 'ragNode',
-  [Operator.QWeather]: 'ragNode',
   [Operator.SearXNG]: 'ragNode',
   [Operator.ExeSQL]: 'ragNode',
   [Operator.Switch]: 'switchNode',
   [Operator.WenCai]: 'ragNode',
-  [Operator.AkShare]: 'ragNode',
   [Operator.YahooFinance]: 'ragNode',
-  [Operator.Jin10]: 'ragNode',
-  [Operator.TuShare]: 'ragNode',
   [Operator.Note]: 'noteNode',
   [Operator.Crawler]: 'ragNode',
   [Operator.Invoke]: 'ragNode',
@@ -758,6 +718,9 @@ export const NodeMap = {
   [Operator.ListOperations]: 'listOperationsNode',
   [Operator.VariableAssigner]: 'variableAssignerNode',
   [Operator.VariableAggregator]: 'variableAggregatorNode',
+  [Operator.Loop]: 'loopNode',
+  [Operator.LoopStart]: 'loopStartNode',
+  [Operator.ExitLoop]: 'exitLoopNode',
 };
 
 export enum BeginQueryType {
@@ -891,3 +854,82 @@ export const ArrayFields = [
   TypesWithArray.ArrayString,
   TypesWithArray.ArrayObject,
 ];
+
+export enum InputMode {
+  Constant = 'constant',
+  Variable = 'variable',
+}
+
+export enum LoopTerminationComparisonOperator {
+  Contains = ComparisonOperator.Contains,
+  NotContains = ComparisonOperator.NotContains,
+  StartWith = ComparisonOperator.StartWith,
+  EndWith = ComparisonOperator.EndWith,
+  Is = 'is',
+  IsNot = 'is not',
+}
+
+export const LoopTerminationStringComparisonOperator = [
+  LoopTerminationComparisonOperator.Contains,
+  LoopTerminationComparisonOperator.NotContains,
+  LoopTerminationComparisonOperator.StartWith,
+  LoopTerminationComparisonOperator.EndWith,
+  LoopTerminationComparisonOperator.Is,
+  LoopTerminationComparisonOperator.IsNot,
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+
+export const LoopTerminationBooleanComparisonOperator = [
+  LoopTerminationComparisonOperator.Is,
+  LoopTerminationComparisonOperator.IsNot,
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+// object or object array
+export const LoopTerminationObjectComparisonOperator = [
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+
+// string array or number array
+export const LoopTerminationStringArrayComparisonOperator = [
+  LoopTerminationComparisonOperator.Contains,
+  LoopTerminationComparisonOperator.NotContains,
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+
+export const LoopTerminationBooleanArrayComparisonOperator = [
+  LoopTerminationComparisonOperator.Is,
+  LoopTerminationComparisonOperator.IsNot,
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+
+export const LoopTerminationNumberComparisonOperator = [
+  ComparisonOperator.Equal,
+  ComparisonOperator.NotEqual,
+  ComparisonOperator.GreatThan,
+  ComparisonOperator.LessThan,
+  ComparisonOperator.GreatEqual,
+  ComparisonOperator.LessEqual,
+  ComparisonOperator.Empty,
+  ComparisonOperator.NotEmpty,
+];
+
+export const LoopTerminationStringComparisonOperatorMap = {
+  [TypesWithArray.String]: LoopTerminationStringComparisonOperator,
+  [TypesWithArray.Number]: LoopTerminationNumberComparisonOperator,
+  [TypesWithArray.Boolean]: LoopTerminationBooleanComparisonOperator,
+  [TypesWithArray.Object]: LoopTerminationObjectComparisonOperator,
+  [TypesWithArray.ArrayString]: LoopTerminationStringArrayComparisonOperator,
+  [TypesWithArray.ArrayNumber]: LoopTerminationStringArrayComparisonOperator,
+  [TypesWithArray.ArrayBoolean]: LoopTerminationBooleanArrayComparisonOperator,
+  [TypesWithArray.ArrayObject]: LoopTerminationObjectComparisonOperator,
+};
+
+export enum AgentVariableType {
+  Begin = 'begin',
+  Conversation = 'conversation',
+}
diff --git a/web/src/pages/agent/form-sheet/form-config-map.tsx b/web/src/pages/agent/form-sheet/form-config-map.tsx
index 37ab4cf2f..a1a68bb21 100644
--- a/web/src/pages/agent/form-sheet/form-config-map.tsx
+++ b/web/src/pages/agent/form-sheet/form-config-map.tsx
@@ -1,6 +1,5 @@
 import { Operator } from '../constant';
 import AgentForm from '../form/agent-form';
-import AkShareForm from '../form/akshare-form';
 import ArXivForm from '../form/arxiv-form';
 import BeginForm from '../form/begin-form';
 import BingForm from '../form/bing-form';
@@ -19,13 +18,11 @@ import HierarchicalMergerForm from '../form/hierarchical-merger-form';
 import InvokeForm from '../form/invoke-form';
 import IterationForm from '../form/iteration-form';
 import IterationStartForm from '../form/iteration-start-from';
-import Jin10Form from '../form/jin10-form';
-import KeywordExtractForm from '../form/keyword-extract-form';
 import ListOperationsForm from '../form/list-operations-form';
+import LoopForm from '../form/loop-form';
 import MessageForm from '../form/message-form';
 import ParserForm from '../form/parser-form';
 import PubMedForm from '../form/pubmed-form';
-import QWeatherForm from '../form/qweather-form';
 import RelevantForm from '../form/relevant-form';
 import RetrievalForm from '../form/retrieval-form/next';
 import RewriteQuestionForm from '../form/rewrite-question-form';
@@ -37,7 +34,6 @@ import TavilyExtractForm from '../form/tavily-extract-form';
 import TavilyForm from '../form/tavily-form';
 import TokenizerForm from '../form/tokenizer-form';
 import ToolForm from '../form/tool-form';
-import TuShareForm from '../form/tushare-form';
 import UserFillUpForm from '../form/user-fill-up-form';
 import VariableAggregatorForm from '../form/variable-aggregator-form';
 import VariableAssignerForm from '../form/variable-assigner-form';
@@ -76,9 +72,6 @@ export const FormConfigMap = {
   [Operator.DuckDuckGo]: {
     component: DuckDuckGoForm,
   },
-  [Operator.KeywordExtract]: {
-    component: KeywordExtractForm,
-  },
   [Operator.Wikipedia]: {
     component: WikipediaForm,
   },
@@ -100,9 +93,6 @@ export const FormConfigMap = {
   [Operator.GitHub]: {
     component: GithubForm,
   },
-  [Operator.QWeather]: {
-    component: QWeatherForm,
-  },
   [Operator.ExeSQL]: {
     component: ExeSQLForm,
   },
@@ -112,18 +102,9 @@ export const FormConfigMap = {
   [Operator.WenCai]: {
     component: WenCaiForm,
   },
-  [Operator.AkShare]: {
-    component: AkShareForm,
-  },
   [Operator.YahooFinance]: {
     component: YahooFinanceForm,
   },
-  [Operator.Jin10]: {
-    component: Jin10Form,
-  },
-  [Operator.TuShare]: {
-    component: TuShareForm,
-  },
   [Operator.Crawler]: {
     component: CrawlerForm,
   },
@@ -191,8 +172,13 @@ export const FormConfigMap = {
   [Operator.VariableAssigner]: {
     component: VariableAssignerForm,
   },
-
   [Operator.VariableAggregator]: {
     component: VariableAggregatorForm,
   },
+  [Operator.Loop]: {
+    component: LoopForm,
+  },
+  [Operator.ExitLoop]: {
+    component: () => <></>,
+  },
 };
diff --git a/web/src/pages/agent/form/akshare-form/index.tsx b/web/src/pages/agent/form/akshare-form/index.tsx
deleted file mode 100644
index 1cfd554b1..000000000
--- a/web/src/pages/agent/form/akshare-form/index.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { TopNFormField } from '@/components/top-n-item';
-import { Form } from '@/components/ui/form';
-import { INextOperatorForm } from '../../interface';
-import { DynamicInputVariable } from '../components/next-dynamic-input-variable';
-
-const AkShareForm = ({ form, node }: INextOperatorForm) => {
-  return (
-    <Form {...form}>
-      <form
-        className="space-y-6"
-        onSubmit={(e) => {
-          e.preventDefault();
-        }}
-      >
-        <DynamicInputVariable node={node}></DynamicInputVariable>
-        <TopNFormField max={99}></TopNFormField>
-      </form>
-    </Form>
-  );
-};
-
-export default AkShareForm;
diff --git a/web/src/pages/agent/form/components/dynamic-input-variable.tsx b/web/src/pages/agent/form/components/dynamic-input-variable.tsx
deleted file mode 100644
index a5781fd16..000000000
--- a/web/src/pages/agent/form/components/dynamic-input-variable.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { RAGFlowNodeType } from '@/interfaces/database/flow';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Collapse, Flex, Form, Input, Select } from 'antd';
-import { PropsWithChildren, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useBuildVariableOptions } from '../../hooks/use-get-begin-query';
-
-import styles from './index.less';
-
-interface IProps {
-  node?: RAGFlowNodeType;
-}
-
-enum VariableType {
-  Reference = 'reference',
-  Input = 'input',
-}
-
-const getVariableName = (type: string) =>
-  type === VariableType.Reference ? 'component_id' : 'value';
-
-const DynamicVariableForm = ({ node }: IProps) => {
-  const { t } = useTranslation();
-  const valueOptions = useBuildVariableOptions(node?.id, node?.parentId);
-  const form = Form.useFormInstance();
-
-  const options = [
-    { value: VariableType.Reference, label: t('flow.reference') },
-    { value: VariableType.Input, label: t('flow.text') },
-  ];
-
-  const handleTypeChange = useCallback(
-    (name: number) => () => {
-      setTimeout(() => {
-        form.setFieldValue(['query', name, 'component_id'], undefined);
-        form.setFieldValue(['query', name, 'value'], undefined);
-      }, 0);
-    },
-    [form],
-  );
-
-  return (
-    <Form.List name="query">
-      {(fields, { add, remove }) => (
-        <>
-          {fields.map(({ key, name, ...restField }) => (
-            <Flex key={key} gap={10} align={'baseline'}>
-              <Form.Item
-                {...restField}
-                name={[name, 'type']}
-                className={styles.variableType}
-              >
-                <Select
-                  options={options}
-                  onChange={handleTypeChange(name)}
-                ></Select>
-              </Form.Item>
-              <Form.Item noStyle dependencies={[name, 'type']}>
-                {({ getFieldValue }) => {
-                  const type = getFieldValue(['query', name, 'type']);
-                  return (
-                    <Form.Item
-                      {...restField}
-                      name={[name, getVariableName(type)]}
-                      className={styles.variableValue}
-                    >
-                      {type === VariableType.Reference ? (
-                        <Select
-                          placeholder={t('common.pleaseSelect')}
-                          options={valueOptions}
-                        ></Select>
-                      ) : (
-                        <Input placeholder={t('common.pleaseInput')} />
-                      )}
-                    </Form.Item>
-                  );
-                }}
-              </Form.Item>
-              <MinusCircleOutlined onClick={() => remove(name)} />
-            </Flex>
-          ))}
-          <Form.Item>
-            <Button
-              type="dashed"
-              onClick={() => add({ type: VariableType.Reference })}
-              block
-              icon={<PlusOutlined />}
-              className={styles.addButton}
-            >
-              {t('flow.addVariable')}
-            </Button>
-          </Form.Item>
-        </>
-      )}
-    </Form.List>
-  );
-};
-
-export function FormCollapse({
-  children,
-  title,
-}: PropsWithChildren<{ title: string }>) {
-  return (
-    <Collapse
-      className={styles.dynamicInputVariable}
-      defaultActiveKey={['1']}
-      items={[
-        {
-          key: '1',
-          label: <span className={styles.title}>{title}</span>,
-          children,
-        },
-      ]}
-    />
-  );
-}
-
-const DynamicInputVariable = ({ node }: IProps) => {
-  const { t } = useTranslation();
-  return (
-    <FormCollapse title={t('flow.input')}>
-      <DynamicVariableForm node={node}></DynamicVariableForm>
-    </FormCollapse>
-  );
-};
-
-export default DynamicInputVariable;
diff --git a/web/src/pages/agent/form/components/next-dynamic-input-variable.tsx b/web/src/pages/agent/form/components/next-dynamic-input-variable.tsx
deleted file mode 100644
index 8b4cbd8a9..000000000
--- a/web/src/pages/agent/form/components/next-dynamic-input-variable.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-'use client';
-
-import { SideDown } from '@/assets/icon/next-icon';
-import { Button } from '@/components/ui/button';
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from '@/components/ui/collapsible';
-import {
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { RAGFlowSelect } from '@/components/ui/select';
-import { RAGFlowNodeType } from '@/interfaces/database/flow';
-import { Plus, Trash2 } from 'lucide-react';
-import { useFieldArray, useFormContext } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { useBuildVariableOptions } from '../../hooks/use-get-begin-query';
-
-interface IProps {
-  node?: RAGFlowNodeType;
-}
-
-enum VariableType {
-  Reference = 'reference',
-  Input = 'input',
-}
-
-const getVariableName = (type: string) =>
-  type === VariableType.Reference ? 'component_id' : 'value';
-
-export function DynamicVariableForm({ node }: IProps) {
-  const { t } = useTranslation();
-  const form = useFormContext();
-  const { fields, remove, append } = useFieldArray({
-    name: 'query',
-    control: form.control,
-  });
-
-  const valueOptions = useBuildVariableOptions(node?.id, node?.parentId);
-
-  const options = [
-    { value: VariableType.Reference, label: t('flow.reference') },
-    { value: VariableType.Input, label: t('flow.text') },
-  ];
-
-  return (
-    <div>
-      {fields.map((field, index) => {
-        const typeField = `query.${index}.type`;
-        const typeValue = form.watch(typeField);
-        return (
-          <div key={field.id} className="flex items-center gap-1">
-            <FormField
-              control={form.control}
-              name={typeField}
-              render={({ field }) => (
-                <FormItem className="w-2/5">
-                  <FormDescription />
-                  <FormControl>
-                    <RAGFlowSelect
-                      {...field}
-                      placeholder={t('common.pleaseSelect')}
-                      options={options}
-                      onChange={(val) => {
-                        field.onChange(val);
-                        form.resetField(`query.${index}.value`);
-                        form.resetField(`query.${index}.component_id`);
-                      }}
-                    ></RAGFlowSelect>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name={`query.${index}.${getVariableName(typeValue)}`}
-              render={({ field }) => (
-                <FormItem className="flex-1">
-                  <FormDescription />
-                  <FormControl>
-                    {typeValue === VariableType.Reference ? (
-                      <RAGFlowSelect
-                        placeholder={t('common.pleaseSelect')}
-                        {...field}
-                        options={valueOptions}
-                      ></RAGFlowSelect>
-                    ) : (
-                      <Input placeholder={t('common.pleaseInput')} {...field} />
-                    )}
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <Trash2
-              className="cursor-pointer mx-3 size-4 text-colors-text-functional-danger"
-              onClick={() => remove(index)}
-            />
-          </div>
-        );
-      })}
-      <Button onClick={append} className="mt-4" variant={'outline'} size={'sm'}>
-        <Plus />
-        {t('flow.addVariable')}
-      </Button>
-    </div>
-  );
-}
-
-export function DynamicInputVariable({ node }: IProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Collapsible defaultOpen className="group/collapsible">
-      <CollapsibleTrigger className="flex justify-between w-full pb-2">
-        <span className="font-bold text-2xl text-colors-text-neutral-strong">
-          {t('flow.input')}
-        </span>
-        <Button variant={'icon'} size={'icon'}>
-          <SideDown />
-        </Button>
-      </CollapsibleTrigger>
-      <CollapsibleContent>
-        <DynamicVariableForm node={node}></DynamicVariableForm>
-      </CollapsibleContent>
-    </Collapsible>
-  );
-}
diff --git a/web/src/pages/agent/form/components/prompt-editor/variable-picker-plugin.tsx b/web/src/pages/agent/form/components/prompt-editor/variable-picker-plugin.tsx
index d80d0c2df..7b86a90e9 100644
--- a/web/src/pages/agent/form/components/prompt-editor/variable-picker-plugin.tsx
+++ b/web/src/pages/agent/form/components/prompt-editor/variable-picker-plugin.tsx
@@ -192,7 +192,7 @@ export default function VariablePickerMenuPlugin({
 
   const [queryString, setQueryString] = React.useState<string | null>('');
 
-  let options = useFilterQueryVariableOptionsByTypes(types);
+  let options = useFilterQueryVariableOptionsByTypes({ types });
 
   if (baseOptions) {
     options = baseOptions as typeof options;
diff --git a/web/src/pages/agent/form/components/query-variable-list.tsx b/web/src/pages/agent/form/components/query-variable-list.tsx
index a4a76781d..d2ed52fce 100644
--- a/web/src/pages/agent/form/components/query-variable-list.tsx
+++ b/web/src/pages/agent/form/components/query-variable-list.tsx
@@ -20,7 +20,7 @@ export function QueryVariableList({
   const form = useFormContext();
   const name = 'query';
 
-  let options = useFilterQueryVariableOptionsByTypes(types);
+  let options = useFilterQueryVariableOptionsByTypes({ types });
 
   const secondOptions = flatOptions(options);
 
diff --git a/web/src/pages/agent/form/components/query-variable.tsx b/web/src/pages/agent/form/components/query-variable.tsx
index fc76c2554..8c8f8d08f 100644
--- a/web/src/pages/agent/form/components/query-variable.tsx
+++ b/web/src/pages/agent/form/components/query-variable.tsx
@@ -9,7 +9,10 @@ import { ReactNode } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { JsonSchemaDataType } from '../../constant';
-import { useFilterQueryVariableOptionsByTypes } from '../../hooks/use-get-begin-query';
+import {
+  BuildQueryVariableOptions,
+  useFilterQueryVariableOptionsByTypes,
+} from '../../hooks/use-get-begin-query';
 import { GroupedSelectWithSecondaryMenu } from './select-with-secondary-menu';
 
 type QueryVariableProps = {
@@ -21,7 +24,7 @@ type QueryVariableProps = {
   onChange?: (value: string) => void;
   pureQuery?: boolean;
   value?: string;
-};
+} & BuildQueryVariableOptions;
 
 export function QueryVariable({
   name = 'query',
@@ -32,11 +35,17 @@ export function QueryVariable({
   onChange,
   pureQuery = false,
   value,
+  nodeIds = [],
+  variablesExceptOperatorOutputs,
 }: QueryVariableProps) {
   const { t } = useTranslation();
   const form = useFormContext();
 
-  const finalOptions = useFilterQueryVariableOptionsByTypes(types);
+  const finalOptions = useFilterQueryVariableOptionsByTypes({
+    types,
+    nodeIds,
+    variablesExceptOperatorOutputs,
+  });
 
   const renderWidget = (
     value?: string,
diff --git a/web/src/pages/agent/form/invoke-form/variable-table.tsx b/web/src/pages/agent/form/invoke-form/variable-table.tsx
index 8ca794bde..68fbf0a9c 100644
--- a/web/src/pages/agent/form/invoke-form/variable-table.tsx
+++ b/web/src/pages/agent/form/invoke-form/variable-table.tsx
@@ -49,7 +49,7 @@ export function VariableTable({
   nodeId,
 }: IProps) {
   const { t } = useTranslation();
-  const { getLabel } = useGetVariableLabelOrTypeByValue(nodeId!);
+  const { getLabel } = useGetVariableLabelOrTypeByValue({ nodeId: nodeId! });
 
   const [sorting, setSorting] = React.useState<SortingState>([]);
   const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
diff --git a/web/src/pages/agent/form/iteration-form/dynamic-output.tsx b/web/src/pages/agent/form/iteration-form/dynamic-output.tsx
index 2bc4ab6f4..8cb8a4b48 100644
--- a/web/src/pages/agent/form/iteration-form/dynamic-output.tsx
+++ b/web/src/pages/agent/form/iteration-form/dynamic-output.tsx
@@ -2,7 +2,6 @@
 
 import { FormContainer } from '@/components/form-container';
 import { KeyInput } from '@/components/key-input';
-import { SelectWithSearch } from '@/components/originui/select-with-search';
 import { BlockButton, Button } from '@/components/ui/button';
 import {
   FormControl,
@@ -11,13 +10,17 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { Separator } from '@/components/ui/separator';
+import { Operator } from '@/constants/agent';
 import { RAGFlowNodeType } from '@/interfaces/database/flow';
 import { t } from 'i18next';
+import { isEmpty } from 'lodash';
 import { X } from 'lucide-react';
-import { ReactNode, useCallback, useMemo } from 'react';
+import { ReactNode } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { useBuildSubNodeOutputOptions } from './use-build-options';
+import { useGetVariableLabelOrTypeByValue } from '../../hooks/use-get-begin-query';
+import useGraphStore from '../../store';
+import { QueryVariable } from '../components/query-variable';
 
 interface IProps {
   node?: RAGFlowNodeType;
@@ -26,28 +29,22 @@ interface IProps {
 export function DynamicOutputForm({ node }: IProps) {
   const { t } = useTranslation();
   const form = useFormContext();
-  const options = useBuildSubNodeOutputOptions(node?.id);
+  const { nodes } = useGraphStore((state) => state);
+
+  const childNodeIds = nodes
+    .filter(
+      (x) =>
+        x.parentId === node?.id &&
+        x.data.label !== Operator.IterationStart &&
+        !isEmpty(x.data?.form?.outputs),
+    )
+    .map((x) => x.id);
+
   const name = 'outputs';
 
-  const flatOptions = useMemo(() => {
-    return options.reduce<{ label: string; value: string; type: string }[]>(
-      (pre, cur) => {
-        pre.push(...cur.options);
-        return pre;
-      },
-      [],
-    );
-  }, [options]);
-
-  const findType = useCallback(
-    (val: string) => {
-      const type = flatOptions.find((x) => x.value === val)?.type;
-      if (type) {
-        return `Array<${type}>`;
-      }
-    },
-    [flatOptions],
-  );
+  const { getType } = useGetVariableLabelOrTypeByValue({
+    nodeIds: childNodeIds,
+  });
 
   const { fields, remove, append } = useFieldArray({
     name: name,
@@ -77,25 +74,15 @@ export function DynamicOutputForm({ node }: IProps) {
               )}
             />
             <Separator className="w-3 text-text-secondary" />
-            <FormField
-              control={form.control}
+            <QueryVariable
               name={`${name}.${index}.ref`}
-              render={({ field }) => (
-                <FormItem className="w-2/5">
-                  <FormControl>
-                    <SelectWithSearch
-                      options={options}
-                      {...field}
-                      onChange={(val) => {
-                        form.setValue(typeField, findType(val));
-                        field.onChange(val);
-                      }}
-                    ></SelectWithSearch>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
+              hideLabel
+              className="w-2/5"
+              onChange={(val) => {
+                form.setValue(typeField, `Array<${getType(val)}>`);
+              }}
+              nodeIds={childNodeIds}
+            ></QueryVariable>
             <FormField
               control={form.control}
               name={typeField}
diff --git a/web/src/pages/agent/form/iteration-form/index.tsx b/web/src/pages/agent/form/iteration-form/index.tsx
index c528fa720..61e16277d 100644
--- a/web/src/pages/agent/form/iteration-form/index.tsx
+++ b/web/src/pages/agent/form/iteration-form/index.tsx
@@ -9,7 +9,6 @@ import { FormWrapper } from '../components/form-wrapper';
 import { Output } from '../components/output';
 import { QueryVariable } from '../components/query-variable';
 import { DynamicOutput } from './dynamic-output';
-import { DynamicVariables } from './dynamic-variables';
 import { OutputArray } from './interface';
 import { useValues } from './use-values';
 import { useWatchFormChange } from './use-watch-form-change';
@@ -53,7 +52,6 @@ function IterationForm({ node }: INextOperatorForm) {
           name="items_ref"
           types={ArrayFields as any[]}
         ></QueryVariable>
-        <DynamicVariables name="variables" label="Variables"></DynamicVariables>
         <DynamicOutput node={node}></DynamicOutput>
         <Output list={outputList}></Output>
       </FormWrapper>
diff --git a/web/src/pages/agent/form/iteration-form/use-build-options.ts b/web/src/pages/agent/form/iteration-form/use-build-options.ts
deleted file mode 100644
index 46fa7ee30..000000000
--- a/web/src/pages/agent/form/iteration-form/use-build-options.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { buildOutputOptions } from '@/utils/canvas-util';
-import { isEmpty } from 'lodash';
-import { useMemo } from 'react';
-import { Operator } from '../../constant';
-import useGraphStore from '../../store';
-
-export function useBuildSubNodeOutputOptions(nodeId?: string) {
-  const { nodes } = useGraphStore((state) => state);
-
-  const nodeOutputOptions = useMemo(() => {
-    if (!nodeId) {
-      return [];
-    }
-
-    const subNodeWithOutputList = nodes.filter(
-      (x) =>
-        x.parentId === nodeId &&
-        x.data.label !== Operator.IterationStart &&
-        !isEmpty(x.data?.form?.outputs),
-    );
-
-    return subNodeWithOutputList.map((x) => ({
-      label: x.data.name,
-      value: x.id,
-      title: x.data.name,
-      options: buildOutputOptions(x.data.form.outputs, x.id),
-    }));
-  }, [nodeId, nodes]);
-
-  return nodeOutputOptions;
-}
diff --git a/web/src/pages/agent/form/jin10-form/index.tsx b/web/src/pages/agent/form/jin10-form/index.tsx
deleted file mode 100644
index 2bc6d774a..000000000
--- a/web/src/pages/agent/form/jin10-form/index.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Input, Select } from 'antd';
-import { useMemo } from 'react';
-import { IOperatorForm } from '../../interface';
-import {
-  Jin10CalendarDatashapeOptions,
-  Jin10CalendarTypeOptions,
-  Jin10FlashTypeOptions,
-  Jin10SymbolsDatatypeOptions,
-  Jin10SymbolsTypeOptions,
-  Jin10TypeOptions,
-} from '../../options';
-import DynamicInputVariable from '../components/dynamic-input-variable';
-
-const Jin10Form = ({ onValuesChange, form, node }: IOperatorForm) => {
-  const { t } = useTranslate('flow');
-
-  const jin10TypeOptions = useMemo(() => {
-    return Jin10TypeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10TypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const jin10FlashTypeOptions = useMemo(() => {
-    return Jin10FlashTypeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10FlashTypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const jin10CalendarTypeOptions = useMemo(() => {
-    return Jin10CalendarTypeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10CalendarTypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const jin10CalendarDatashapeOptions = useMemo(() => {
-    return Jin10CalendarDatashapeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10CalendarDatashapeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const jin10SymbolsTypeOptions = useMemo(() => {
-    return Jin10SymbolsTypeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10SymbolsTypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const jin10SymbolsDatatypeOptions = useMemo(() => {
-    return Jin10SymbolsDatatypeOptions.map((x) => ({
-      value: x,
-      label: t(`jin10SymbolsDatatypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  return (
-    <Form
-      name="basic"
-      autoComplete="off"
-      form={form}
-      onValuesChange={onValuesChange}
-      layout={'vertical'}
-    >
-      <DynamicInputVariable node={node}></DynamicInputVariable>
-      <Form.Item label={t('type')} name={'type'} initialValue={'flash'}>
-        <Select options={jin10TypeOptions}></Select>
-      </Form.Item>
-      <Form.Item label={t('secretKey')} name={'secret_key'}>
-        <Input></Input>
-      </Form.Item>
-      <Form.Item noStyle dependencies={['type']}>
-        {({ getFieldValue }) => {
-          const type = getFieldValue('type');
-          switch (type) {
-            case 'flash':
-              return (
-                <>
-                  <Form.Item label={t('flashType')} name={'flash_type'}>
-                    <Select options={jin10FlashTypeOptions}></Select>
-                  </Form.Item>
-                  <Form.Item label={t('contain')} name={'contain'}>
-                    <Input></Input>
-                  </Form.Item>
-                  <Form.Item label={t('filter')} name={'filter'}>
-                    <Input></Input>
-                  </Form.Item>
-                </>
-              );
-
-            case 'calendar':
-              return (
-                <>
-                  <Form.Item label={t('calendarType')} name={'calendar_type'}>
-                    <Select options={jin10CalendarTypeOptions}></Select>
-                  </Form.Item>
-                  <Form.Item
-                    label={t('calendarDatashape')}
-                    name={'calendar_datashape'}
-                  >
-                    <Select options={jin10CalendarDatashapeOptions}></Select>
-                  </Form.Item>
-                </>
-              );
-
-            case 'symbols':
-              return (
-                <>
-                  <Form.Item label={t('symbolsType')} name={'symbols_type'}>
-                    <Select options={jin10SymbolsTypeOptions}></Select>
-                  </Form.Item>
-                  <Form.Item
-                    label={t('symbolsDatatype')}
-                    name={'symbols_datatype'}
-                  >
-                    <Select options={jin10SymbolsDatatypeOptions}></Select>
-                  </Form.Item>
-                </>
-              );
-
-            case 'news':
-              return (
-                <>
-                  <Form.Item label={t('contain')} name={'contain'}>
-                    <Input></Input>
-                  </Form.Item>
-                  <Form.Item label={t('filter')} name={'filter'}>
-                    <Input></Input>
-                  </Form.Item>
-                </>
-              );
-
-            default:
-              return <></>;
-          }
-        }}
-      </Form.Item>
-    </Form>
-  );
-};
-
-export default Jin10Form;
diff --git a/web/src/pages/agent/form/keyword-extract-form/index.tsx b/web/src/pages/agent/form/keyword-extract-form/index.tsx
deleted file mode 100644
index bda5d44f5..000000000
--- a/web/src/pages/agent/form/keyword-extract-form/index.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { NextLLMSelect } from '@/components/llm-select/next';
-import { TopNFormField } from '@/components/top-n-item';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { useTranslation } from 'react-i18next';
-import { INextOperatorForm } from '../../interface';
-import { DynamicInputVariable } from '../components/next-dynamic-input-variable';
-
-const KeywordExtractForm = ({ form, node }: INextOperatorForm) => {
-  const { t } = useTranslation();
-
-  return (
-    <Form {...form}>
-      <form
-        className="space-y-6"
-        onSubmit={(e) => {
-          e.preventDefault();
-        }}
-      >
-        <DynamicInputVariable node={node}></DynamicInputVariable>
-        <FormField
-          control={form.control}
-          name="llm_id"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel tooltip={t('chat.modelTip')}>
-                {t('chat.model')}
-              </FormLabel>
-              <FormControl>
-                <NextLLMSelect {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <TopNFormField></TopNFormField>
-      </form>
-    </Form>
-  );
-};
-
-export default KeywordExtractForm;
diff --git a/web/src/pages/agent/form/iteration-form/dynamic-variables.tsx b/web/src/pages/agent/form/loop-form/dynamic-variables.tsx
similarity index 79%
rename from web/src/pages/agent/form/iteration-form/dynamic-variables.tsx
rename to web/src/pages/agent/form/loop-form/dynamic-variables.tsx
index 62840d5a7..04318af10 100644
--- a/web/src/pages/agent/form/iteration-form/dynamic-variables.tsx
+++ b/web/src/pages/agent/form/loop-form/dynamic-variables.tsx
@@ -1,33 +1,27 @@
+import { BoolSegmented } from '@/components/bool-segmented';
 import { KeyInput } from '@/components/key-input';
 import { SelectWithSearch } from '@/components/originui/select-with-search';
 import { RAGFlowFormItem } from '@/components/ragflow-form';
 import { useIsDarkTheme } from '@/components/theme-provider';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
 import { Separator } from '@/components/ui/separator';
 import { Textarea } from '@/components/ui/textarea';
-import { buildOptions } from '@/utils/form';
 import { Editor, loader } from '@monaco-editor/react';
-import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
 import { X } from 'lucide-react';
 import { ReactNode, useCallback } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
-import { TypesWithArray } from '../../constant';
-import { buildConversationVariableSelectOptions } from '../../utils';
+import { InputMode, TypesWithArray } from '../../constant';
+import {
+  InputModeOptions,
+  buildConversationVariableSelectOptions,
+} from '../../utils';
 import { DynamicFormHeader } from '../components/dynamic-fom-header';
 import { QueryVariable } from '../components/query-variable';
+import { useInitializeConditions } from './use-watch-form-change';
 
 loader.config({ paths: { vs: '/vs' } });
 
-enum InputMode {
-  Constant = 'constant',
-  Variable = 'variable',
-}
-
-const InputModeOptions = buildOptions(InputMode);
-
 type SelectKeysProps = {
   name: string;
   label: ReactNode;
@@ -35,42 +29,15 @@ type SelectKeysProps = {
   keyField?: string;
   valueField?: string;
   operatorField?: string;
+  nodeId?: string;
 };
 
-type RadioGroupProps = React.ComponentProps<typeof RadioGroupPrimitive.Root>;
-
-type RadioButtonProps = Partial<
-  Omit<RadioGroupProps, 'onValueChange'> & {
-    onChange: RadioGroupProps['onValueChange'];
-  }
->;
-
-function RadioButton({ value, onChange }: RadioButtonProps) {
-  return (
-    <RadioGroup
-      defaultValue="yes"
-      className="flex"
-      value={value}
-      onValueChange={onChange}
-    >
-      <div className="flex items-center gap-3">
-        <RadioGroupItem value="yes" id="r1" />
-        <Label htmlFor="r1">Yes</Label>
-      </div>
-      <div className="flex items-center gap-3">
-        <RadioGroupItem value="no" id="r2" />
-        <Label htmlFor="r2">No</Label>
-      </div>
-    </RadioGroup>
-  );
-}
-
 const VariableTypeOptions = buildConversationVariableSelectOptions();
 
-const modeField = 'mode';
+const modeField = 'input_mode';
 
 const ConstantValueMap = {
-  [TypesWithArray.Boolean]: 'yes',
+  [TypesWithArray.Boolean]: true,
   [TypesWithArray.Number]: 0,
   [TypesWithArray.String]: '',
   [TypesWithArray.ArrayBoolean]: '[]',
@@ -85,8 +52,9 @@ export function DynamicVariables({
   label,
   tooltip,
   keyField = 'variable',
-  valueField = 'parameter',
-  operatorField = 'operator',
+  valueField = 'value',
+  operatorField = 'type',
+  nodeId,
 }: SelectKeysProps) {
   const form = useFormContext();
   const isDarkTheme = useIsDarkTheme();
@@ -96,6 +64,9 @@ export function DynamicVariables({
     control: form.control,
   });
 
+  const { initializeVariableRelatedConditions } =
+    useInitializeConditions(nodeId);
+
   const initializeValue = useCallback(
     (mode: string, variableType: string, valueFieldAlias: string) => {
       if (mode === InputMode.Variable) {
@@ -112,23 +83,27 @@ export function DynamicVariables({
     (mode: string, valueFieldAlias: string, operatorFieldAlias: string) => {
       const variableType = form.getValues(operatorFieldAlias);
       initializeValue(mode, variableType, valueFieldAlias);
-      // if (mode === InputMode.Variable) {
-      //   form.setValue(valueFieldAlias, '');
-      // } else {
-      //   const val = ConstantValueMap[variableType as TypesWithArray];
-      //   form.setValue(valueFieldAlias, val);
-      // }
     },
     [form, initializeValue],
   );
 
   const handleVariableTypeChange = useCallback(
-    (variableType: string, valueFieldAlias: string, modeFieldAlias: string) => {
+    (
+      variableType: string,
+      valueFieldAlias: string,
+      modeFieldAlias: string,
+      keyFieldAlias: string,
+    ) => {
       const mode = form.getValues(modeFieldAlias);
 
+      initializeVariableRelatedConditions(
+        form.getValues(keyFieldAlias),
+        variableType,
+      );
+
       initializeValue(mode, variableType, valueFieldAlias);
     },
-    [form, initializeValue],
+    [form, initializeValue, initializeVariableRelatedConditions],
   );
 
   const renderParameter = useCallback(
@@ -138,7 +113,7 @@ export function DynamicVariables({
 
       if (mode === InputMode.Constant) {
         if (logicalOperator === TypesWithArray.Boolean) {
-          return <RadioButton></RadioButton>;
+          return <BoolSegmented></BoolSegmented>;
         }
 
         if (logicalOperator === TypesWithArray.Number) {
@@ -211,6 +186,7 @@ export function DynamicVariables({
                             val,
                             valueFieldAlias,
                             modeFieldAlias,
+                            keyFieldAlias,
                           );
                           field.onChange(val);
                         }}
diff --git a/web/src/pages/agent/form/loop-form/index.tsx b/web/src/pages/agent/form/loop-form/index.tsx
new file mode 100644
index 000000000..6a5e30f38
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/index.tsx
@@ -0,0 +1,52 @@
+import { SliderInputFormField } from '@/components/slider-input-form-field';
+import { Form } from '@/components/ui/form';
+import { FormLayout } from '@/constants/form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { memo } from 'react';
+import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { initialLoopValues } from '../../constant';
+import { INextOperatorForm } from '../../interface';
+import { FormWrapper } from '../components/form-wrapper';
+import { DynamicVariables } from './dynamic-variables';
+import { LoopTerminationCondition } from './loop-termination-condition';
+import { FormSchema, LoopFormSchemaType } from './schema';
+import { useFormValues } from './use-values';
+import { useWatchFormChange } from './use-watch-form-change';
+
+function LoopForm({ node }: INextOperatorForm) {
+  const defaultValues = useFormValues(initialLoopValues, node);
+  const { t } = useTranslation();
+
+  const form = useForm<LoopFormSchemaType>({
+    defaultValues: defaultValues,
+    resolver: zodResolver(FormSchema),
+  });
+
+  useWatchFormChange(node?.id, form);
+
+  return (
+    <Form {...form}>
+      <FormWrapper>
+        <DynamicVariables
+          name="loop_variables"
+          label={t('flow.loopVariables')}
+          nodeId={node?.id}
+        ></DynamicVariables>
+        <LoopTerminationCondition
+          label={t('flow.loopTerminationCondition')}
+          nodeId={node?.id}
+        ></LoopTerminationCondition>
+        <SliderInputFormField
+          min={1}
+          max={100}
+          name="maximum_loop_count"
+          label={t('flow.maximumLoopCount')}
+          layout={FormLayout.Vertical}
+        ></SliderInputFormField>
+      </FormWrapper>
+    </Form>
+  );
+}
+
+export default memo(LoopForm);
diff --git a/web/src/pages/agent/form/loop-form/loop-termination-condition.tsx b/web/src/pages/agent/form/loop-form/loop-termination-condition.tsx
new file mode 100644
index 000000000..52d598711
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/loop-termination-condition.tsx
@@ -0,0 +1,316 @@
+import { BoolSegmented } from '@/components/bool-segmented';
+import { LogicalOperator } from '@/components/logical-operator';
+import { SelectWithSearch } from '@/components/originui/select-with-search';
+import { RAGFlowFormItem } from '@/components/ragflow-form';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Separator } from '@/components/ui/separator';
+import { ComparisonOperator, SwitchLogicOperator } from '@/constants/agent';
+import { loader } from '@monaco-editor/react';
+import { toLower } from 'lodash';
+import { X } from 'lucide-react';
+import { ReactNode, useCallback, useMemo } from 'react';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import {
+  AgentVariableType,
+  InputMode,
+  JsonSchemaDataType,
+} from '../../constant';
+import { useFilterChildNodeIds } from '../../hooks/use-filter-child-node-ids';
+import { useGetVariableLabelOrTypeByValue } from '../../hooks/use-get-begin-query';
+import { InputModeOptions } from '../../utils';
+import { DynamicFormHeader } from '../components/dynamic-fom-header';
+import { QueryVariable } from '../components/query-variable';
+import { LoopFormSchemaType } from './schema';
+import { useBuildLogicalOptions } from './use-build-logical-options';
+import {
+  ConditionKeyType,
+  ConditionModeType,
+  ConditionOperatorType,
+  ConditionValueType,
+  useInitializeConditions,
+} from './use-watch-form-change';
+
+loader.config({ paths: { vs: '/vs' } });
+
+const VariablesExceptOperatorOutputs = [AgentVariableType.Conversation];
+
+type LoopTerminationConditionProps = {
+  label: ReactNode;
+  tooltip?: string;
+  keyField?: string;
+  valueField?: string;
+  operatorField?: string;
+  modeField?: string;
+  nodeId?: string;
+};
+
+const EmptyFields = [ComparisonOperator.Empty, ComparisonOperator.NotEmpty];
+
+const LogicalOperatorFieldName = 'logical_operator';
+
+const name = 'loop_termination_condition';
+
+export function LoopTerminationCondition({
+  label,
+  tooltip,
+  keyField = 'variable',
+  valueField = 'value',
+  operatorField = 'operator',
+  modeField = 'input_mode',
+  nodeId,
+}: LoopTerminationConditionProps) {
+  const form = useFormContext<LoopFormSchemaType>();
+  const childNodeIds = useFilterChildNodeIds(nodeId);
+
+  const nodeIds = useMemo(() => {
+    if (!nodeId) return [];
+    return [nodeId, ...childNodeIds];
+  }, [childNodeIds, nodeId]);
+
+  const { getType } = useGetVariableLabelOrTypeByValue({
+    nodeIds: nodeIds,
+    variablesExceptOperatorOutputs: VariablesExceptOperatorOutputs,
+  });
+
+  const {
+    initializeConditionMode,
+    initializeConditionOperator,
+    initializeConditionValue,
+  } = useInitializeConditions(nodeId);
+
+  const { fields, remove, append } = useFieldArray({
+    name: name,
+    control: form.control,
+  });
+
+  const { buildLogicalOptions } = useBuildLogicalOptions();
+
+  const getVariableType = useCallback(
+    (keyFieldName: ConditionKeyType) => {
+      const key = form.getValues(keyFieldName);
+      return toLower(getType(key));
+    },
+    [form, getType],
+  );
+
+  const initializeMode = useCallback(
+    (modeFieldAlias: ConditionModeType, keyFieldAlias: ConditionKeyType) => {
+      const keyType = getVariableType(keyFieldAlias);
+
+      initializeConditionMode(modeFieldAlias, keyType);
+    },
+    [getVariableType, initializeConditionMode],
+  );
+
+  const initializeValue = useCallback(
+    (valueFieldAlias: ConditionValueType, keyFieldAlias: ConditionKeyType) => {
+      const keyType = getVariableType(keyFieldAlias);
+
+      initializeConditionValue(valueFieldAlias, keyType);
+    },
+    [getVariableType, initializeConditionValue],
+  );
+
+  const handleVariableChange = useCallback(
+    (
+      operatorFieldAlias: ConditionOperatorType,
+      valueFieldAlias: ConditionValueType,
+      keyFieldAlias: ConditionKeyType,
+      modeFieldAlias: ConditionModeType,
+    ) => {
+      return () => {
+        initializeConditionOperator(
+          operatorFieldAlias,
+          getVariableType(keyFieldAlias),
+        );
+
+        initializeMode(modeFieldAlias, keyFieldAlias);
+
+        initializeValue(valueFieldAlias, keyFieldAlias);
+      };
+    },
+    [
+      getVariableType,
+      initializeConditionOperator,
+      initializeMode,
+      initializeValue,
+    ],
+  );
+
+  const handleOperatorChange = useCallback(
+    (
+      valueFieldAlias: ConditionValueType,
+      keyFieldAlias: ConditionKeyType,
+      modeFieldAlias: ConditionModeType,
+    ) => {
+      initializeMode(modeFieldAlias, keyFieldAlias);
+      initializeValue(valueFieldAlias, keyFieldAlias);
+    },
+    [initializeMode, initializeValue],
+  );
+
+  const handleModeChange = useCallback(
+    (mode: string, valueFieldAlias: ConditionValueType) => {
+      form.setValue(valueFieldAlias, mode === InputMode.Constant ? 0 : '', {
+        shouldDirty: true,
+      });
+    },
+    [form],
+  );
+
+  const renderParameterPanel = useCallback(
+    (
+      keyFieldName: ConditionKeyType,
+      valueFieldAlias: ConditionValueType,
+      modeFieldAlias: ConditionModeType,
+      operatorFieldAlias: ConditionOperatorType,
+    ) => {
+      const type = getVariableType(keyFieldName);
+      const mode = form.getValues(modeFieldAlias);
+      const operator = form.getValues(operatorFieldAlias);
+
+      if (EmptyFields.includes(operator as ComparisonOperator)) {
+        return null;
+      }
+
+      if (type === JsonSchemaDataType.Number) {
+        return (
+          <section className="flex items-center gap-1">
+            <RAGFlowFormItem name={modeFieldAlias}>
+              {(field) => (
+                <SelectWithSearch
+                  value={field.value}
+                  onChange={(val) => {
+                    handleModeChange(val, valueFieldAlias);
+                    field.onChange(val);
+                  }}
+                  options={InputModeOptions}
+                ></SelectWithSearch>
+              )}
+            </RAGFlowFormItem>
+            <Separator className="w-2" />
+            {mode === InputMode.Constant ? (
+              <RAGFlowFormItem name={valueFieldAlias}>
+                <Input type="number" />
+              </RAGFlowFormItem>
+            ) : (
+              <QueryVariable
+                types={[JsonSchemaDataType.Number]}
+                hideLabel
+                pureQuery
+                name={valueFieldAlias}
+                className="flex-1 min-w-0"
+              ></QueryVariable>
+            )}
+          </section>
+        );
+      }
+
+      if (type === JsonSchemaDataType.Boolean) {
+        return (
+          <RAGFlowFormItem name={valueFieldAlias} className="w-full">
+            <BoolSegmented></BoolSegmented>
+          </RAGFlowFormItem>
+        );
+      }
+
+      return (
+        <RAGFlowFormItem name={valueFieldAlias} className="w-full">
+          <Input />
+        </RAGFlowFormItem>
+      );
+    },
+    [form, getVariableType, handleModeChange],
+  );
+
+  return (
+    <section className="space-y-2">
+      <DynamicFormHeader
+        label={label}
+        tooltip={tooltip}
+        onClick={() => {
+          if (fields.length === 1) {
+            form.setValue(LogicalOperatorFieldName, SwitchLogicOperator.And);
+          }
+          append({ [keyField]: '', [valueField]: '' });
+        }}
+      ></DynamicFormHeader>
+      <section className="flex">
+        {fields.length > 1 && (
+          <LogicalOperator name={LogicalOperatorFieldName}></LogicalOperator>
+        )}
+        <div className="space-y-5 flex-1 min-w-0">
+          {fields.map((field, index) => {
+            const keyFieldAlias =
+              `${name}.${index}.${keyField}` as ConditionKeyType;
+            const valueFieldAlias =
+              `${name}.${index}.${valueField}` as ConditionValueType;
+            const operatorFieldAlias =
+              `${name}.${index}.${operatorField}` as ConditionOperatorType;
+            const modeFieldAlias =
+              `${name}.${index}.${modeField}` as ConditionModeType;
+
+            return (
+              <section key={field.id} className="flex gap-2">
+                <div className="flex-1 space-y-3 min-w-0">
+                  <div className="flex items-center">
+                    <QueryVariable
+                      name={keyFieldAlias}
+                      hideLabel
+                      className="flex-1 min-w-0"
+                      onChange={handleVariableChange(
+                        operatorFieldAlias,
+                        valueFieldAlias,
+                        keyFieldAlias,
+                        modeFieldAlias,
+                      )}
+                      nodeIds={nodeIds}
+                      variablesExceptOperatorOutputs={
+                        VariablesExceptOperatorOutputs
+                      }
+                    ></QueryVariable>
+
+                    <Separator className="w-2" />
+
+                    <RAGFlowFormItem
+                      name={operatorFieldAlias}
+                      className="w-1/3"
+                    >
+                      {({ onChange, value }) => (
+                        <SelectWithSearch
+                          value={value}
+                          onChange={(val) => {
+                            handleOperatorChange(
+                              valueFieldAlias,
+                              keyFieldAlias,
+                              modeFieldAlias,
+                            );
+                            onChange(val);
+                          }}
+                          options={buildLogicalOptions(
+                            getVariableType(keyFieldAlias),
+                          )}
+                        ></SelectWithSearch>
+                      )}
+                    </RAGFlowFormItem>
+                  </div>
+                  {renderParameterPanel(
+                    keyFieldAlias,
+                    valueFieldAlias,
+                    modeFieldAlias,
+                    operatorFieldAlias,
+                  )}
+                </div>
+
+                <Button variant={'ghost'} onClick={() => remove(index)}>
+                  <X />
+                </Button>
+              </section>
+            );
+          })}
+        </div>
+      </section>
+    </section>
+  );
+}
diff --git a/web/src/pages/agent/form/loop-form/schema.ts b/web/src/pages/agent/form/loop-form/schema.ts
new file mode 100644
index 000000000..982cbb305
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/schema.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod';
+
+export const FormSchema = z.object({
+  loop_variables: z.array(
+    z.object({
+      variable: z.string().optional(),
+      type: z.string().optional(),
+      value: z.string().or(z.number()).or(z.boolean()).optional(),
+      input_mode: z.string(),
+    }),
+  ),
+  logical_operator: z.string(),
+  loop_termination_condition: z.array(
+    z.object({
+      variable: z.string().optional(),
+      operator: z.string().optional(),
+      value: z.string().or(z.number()).or(z.boolean()).optional(),
+      input_mode: z.string().optional(),
+    }),
+  ),
+  maximum_loop_count: z.number(),
+});
+
+export type LoopFormSchemaType = z.infer<typeof FormSchema>;
diff --git a/web/src/pages/agent/form/loop-form/use-build-logical-options.ts b/web/src/pages/agent/form/loop-form/use-build-logical-options.ts
new file mode 100644
index 000000000..35aae3f8d
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/use-build-logical-options.ts
@@ -0,0 +1,27 @@
+import { SwitchOperatorOptions } from '@/constants/agent';
+import { camelCase, toLower } from 'lodash';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { LoopTerminationStringComparisonOperatorMap } from '../../constant';
+
+export function useBuildLogicalOptions() {
+  const { t } = useTranslation();
+
+  const buildLogicalOptions = useCallback(
+    (type: string) => {
+      return LoopTerminationStringComparisonOperatorMap[
+        toLower(type) as keyof typeof LoopTerminationStringComparisonOperatorMap
+      ]?.map((x) => ({
+        label: t(
+          `flow.switchOperatorOptions.${camelCase(SwitchOperatorOptions.find((y) => y.value === x)?.label || x)}`,
+        ),
+        value: x,
+      }));
+    },
+    [t],
+  );
+
+  return {
+    buildLogicalOptions,
+  };
+}
diff --git a/web/src/pages/agent/form/loop-form/use-values.ts b/web/src/pages/agent/form/loop-form/use-values.ts
new file mode 100644
index 000000000..cf7a1054a
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/use-values.ts
@@ -0,0 +1,20 @@
+import { RAGFlowNodeType } from '@/interfaces/database/flow';
+import { isEmpty, omit } from 'lodash';
+import { useMemo } from 'react';
+
+export function useFormValues(
+  defaultValues: Record<string, any>,
+  node?: RAGFlowNodeType,
+) {
+  const values = useMemo(() => {
+    const formData = node?.data?.form;
+
+    if (isEmpty(formData)) {
+      return omit(defaultValues, 'outputs');
+    }
+
+    return omit(formData, 'outputs');
+  }, [defaultValues, node?.data?.form]);
+
+  return values;
+}
diff --git a/web/src/pages/agent/form/loop-form/use-watch-form-change.ts b/web/src/pages/agent/form/loop-form/use-watch-form-change.ts
new file mode 100644
index 000000000..f3b707c44
--- /dev/null
+++ b/web/src/pages/agent/form/loop-form/use-watch-form-change.ts
@@ -0,0 +1,116 @@
+import { JsonSchemaDataType } from '@/constants/agent';
+import { buildVariableValue } from '@/utils/canvas-util';
+import { useCallback, useEffect } from 'react';
+import { UseFormReturn, useFormContext, useWatch } from 'react-hook-form';
+import { InputMode } from '../../constant';
+import { IOutputs } from '../../interface';
+import useGraphStore from '../../store';
+import { LoopFormSchemaType } from './schema';
+import { useBuildLogicalOptions } from './use-build-logical-options';
+
+export function useWatchFormChange(
+  id?: string,
+  form?: UseFormReturn<LoopFormSchemaType>,
+) {
+  let values = useWatch({ control: form?.control });
+  const { replaceNodeForm } = useGraphStore((state) => state);
+
+  useEffect(() => {
+    if (id) {
+      let nextValues = {
+        ...values,
+        outputs: values.loop_variables?.reduce((pre, cur) => {
+          const variable = cur.variable;
+          if (variable) {
+            pre[variable] = {
+              type: cur.type,
+              value: '',
+            };
+          }
+          return pre;
+        }, {} as IOutputs),
+      };
+
+      replaceNodeForm(id, nextValues);
+    }
+  }, [form?.formState.isDirty, id, replaceNodeForm, values]);
+}
+
+type ConditionPrefixType = `loop_termination_condition.${number}.`;
+export type ConditionKeyType = `${ConditionPrefixType}variable`;
+export type ConditionModeType = `${ConditionPrefixType}input_mode`;
+export type ConditionValueType = `${ConditionPrefixType}value`;
+export type ConditionOperatorType = `${ConditionPrefixType}operator`;
+export function useInitializeConditions(id?: string) {
+  const form = useFormContext<LoopFormSchemaType>();
+  const { buildLogicalOptions } = useBuildLogicalOptions();
+
+  const initializeConditionMode = useCallback(
+    (modeFieldAlias: ConditionModeType, keyType: string) => {
+      if (keyType === JsonSchemaDataType.Number) {
+        form.setValue(modeFieldAlias, InputMode.Constant, {
+          shouldDirty: true,
+          shouldValidate: true,
+        });
+      }
+    },
+    [form],
+  );
+
+  const initializeConditionValue = useCallback(
+    (valueFieldAlias: ConditionValueType, keyType: string) => {
+      let initialValue: string | boolean | number = '';
+
+      if (keyType === JsonSchemaDataType.Number) {
+        initialValue = 0;
+      } else if (keyType === JsonSchemaDataType.Boolean) {
+        initialValue = true;
+      }
+
+      form.setValue(valueFieldAlias, initialValue, {
+        shouldDirty: true,
+        shouldValidate: true,
+      });
+    },
+    [form],
+  );
+
+  const initializeConditionOperator = useCallback(
+    (operatorFieldAlias: ConditionOperatorType, keyType: string) => {
+      const logicalOptions = buildLogicalOptions(keyType);
+
+      form.setValue(operatorFieldAlias, logicalOptions?.at(0)?.value, {
+        shouldDirty: true,
+        shouldValidate: true,
+      });
+    },
+    [buildLogicalOptions, form],
+  );
+
+  const initializeVariableRelatedConditions = useCallback(
+    (variable: string, variableType: string) => {
+      form?.getValues('loop_termination_condition').forEach((x, idx) => {
+        if (variable && x.variable === buildVariableValue(variable, id)) {
+          const prefix: ConditionPrefixType = `loop_termination_condition.${idx}.`;
+          initializeConditionMode(`${prefix}input_mode`, variableType);
+          initializeConditionValue(`${prefix}value`, variableType);
+          initializeConditionOperator(`${prefix}operator`, variableType);
+        }
+      });
+    },
+    [
+      form,
+      id,
+      initializeConditionMode,
+      initializeConditionOperator,
+      initializeConditionValue,
+    ],
+  );
+
+  return {
+    initializeVariableRelatedConditions,
+    initializeConditionMode,
+    initializeConditionValue,
+    initializeConditionOperator,
+  };
+}
diff --git a/web/src/pages/agent/form/qweather-form/index.tsx b/web/src/pages/agent/form/qweather-form/index.tsx
deleted file mode 100644
index eee088762..000000000
--- a/web/src/pages/agent/form/qweather-form/index.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { RAGFlowSelect } from '@/components/ui/select';
-import { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { INextOperatorForm } from '../../interface';
-import {
-  QWeatherLangOptions,
-  QWeatherTimePeriodOptions,
-  QWeatherTypeOptions,
-  QWeatherUserTypeOptions,
-} from '../../options';
-import { DynamicInputVariable } from '../components/next-dynamic-input-variable';
-
-enum FormFieldName {
-  Type = 'type',
-  UserType = 'user_type',
-}
-
-const QWeatherForm = ({ form, node }: INextOperatorForm) => {
-  const { t } = useTranslation();
-  const typeValue = form.watch(FormFieldName.Type);
-
-  const qWeatherLangOptions = useMemo(() => {
-    return QWeatherLangOptions.map((x) => ({
-      value: x,
-      label: t(`flow.qWeatherLangOptions.${x}`),
-    }));
-  }, [t]);
-
-  const qWeatherTypeOptions = useMemo(() => {
-    return QWeatherTypeOptions.map((x) => ({
-      value: x,
-      label: t(`flow.qWeatherTypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const qWeatherUserTypeOptions = useMemo(() => {
-    return QWeatherUserTypeOptions.map((x) => ({
-      value: x,
-      label: t(`flow.qWeatherUserTypeOptions.${x}`),
-    }));
-  }, [t]);
-
-  const getQWeatherTimePeriodOptions = useCallback(() => {
-    let options = QWeatherTimePeriodOptions;
-    const userType = form.getValues(FormFieldName.UserType);
-    if (userType === 'free') {
-      options = options.slice(0, 3);
-    }
-    return options.map((x) => ({
-      value: x,
-      label: t(`flow.qWeatherTimePeriodOptions.${x}`),
-    }));
-  }, [form, t]);
-
-  return (
-    <Form {...form}>
-      <form
-        className="space-y-6"
-        onSubmit={(e) => {
-          e.preventDefault();
-        }}
-      >
-        <DynamicInputVariable node={node}></DynamicInputVariable>
-        <FormField
-          control={form.control}
-          name="web_apikey"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t('flow.webApiKey')}</FormLabel>
-              <FormControl>
-                <Input {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <FormField
-          control={form.control}
-          name="lang"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t('flow.lang')}</FormLabel>
-              <FormControl>
-                <RAGFlowSelect
-                  {...field}
-                  options={qWeatherLangOptions}
-                ></RAGFlowSelect>
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <FormField
-          control={form.control}
-          name={FormFieldName.Type}
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t('flow.type')}</FormLabel>
-              <FormControl>
-                <RAGFlowSelect
-                  {...field}
-                  options={qWeatherTypeOptions}
-                ></RAGFlowSelect>
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <FormField
-          control={form.control}
-          name={FormFieldName.UserType}
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t('flow.userType')}</FormLabel>
-              <FormControl>
-                <RAGFlowSelect
-                  {...field}
-                  options={qWeatherUserTypeOptions}
-                ></RAGFlowSelect>
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        {typeValue === 'weather' && (
-          <FormField
-            control={form.control}
-            name={'time_period'}
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t('flow.timePeriod')}</FormLabel>
-                <FormControl>
-                  <RAGFlowSelect
-                    {...field}
-                    options={getQWeatherTimePeriodOptions()}
-                  ></RAGFlowSelect>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        )}
-      </form>
-    </Form>
-  );
-};
-
-export default QWeatherForm;
diff --git a/web/src/pages/agent/form/tool-form/constant.tsx b/web/src/pages/agent/form/tool-form/constant.tsx
index fc5f4e94c..4f93ddb50 100644
--- a/web/src/pages/agent/form/tool-form/constant.tsx
+++ b/web/src/pages/agent/form/tool-form/constant.tsx
@@ -1,5 +1,4 @@
 import { Operator } from '../../constant';
-import AkShareForm from '../akshare-form';
 import ArXivForm from './arxiv-form';
 import BingForm from './bing-form';
 import CrawlerForm from './crawler-form';
@@ -29,7 +28,6 @@ export const ToolFormConfigMap = {
   [Operator.GoogleScholar]: GoogleScholarForm,
   [Operator.GitHub]: GithubForm,
   [Operator.ExeSQL]: ExeSQLForm,
-  [Operator.AkShare]: AkShareForm,
   [Operator.YahooFinance]: YahooFinanceForm,
   [Operator.Crawler]: CrawlerForm,
   [Operator.Email]: EmailForm,
diff --git a/web/src/pages/agent/form/tushare-form/index.tsx b/web/src/pages/agent/form/tushare-form/index.tsx
deleted file mode 100644
index a64bf25bf..000000000
--- a/web/src/pages/agent/form/tushare-form/index.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import { DatePicker, DatePickerProps, Form, Input, Select } from 'antd';
-import dayjs from 'dayjs';
-import { useCallback, useMemo } from 'react';
-import { IOperatorForm } from '../../interface';
-import { TuShareSrcOptions } from '../../options';
-import DynamicInputVariable from '../components/dynamic-input-variable';
-
-const DateTimePicker = ({
-  onChange,
-  value,
-}: {
-  onChange?: (val: number | undefined) => void;
-  value?: number | undefined;
-}) => {
-  const handleChange: DatePickerProps['onChange'] = useCallback(
-    (val: any) => {
-      const nextVal = val?.format('YYYY-MM-DD HH:mm:ss');
-      onChange?.(nextVal ? nextVal : undefined);
-    },
-    [onChange],
-  );
-  // The value needs to be converted into a string and saved to the backend
-  const nextValue = useMemo(() => {
-    if (value) {
-      return dayjs(value);
-    }
-    return undefined;
-  }, [value]);
-
-  return (
-    <DatePicker
-      showTime
-      format="YYYY-MM-DD HH:mm:ss"
-      onChange={handleChange}
-      value={nextValue}
-    />
-  );
-};
-
-const TuShareForm = ({ onValuesChange, form, node }: IOperatorForm) => {
-  const { t } = useTranslate('flow');
-
-  const tuShareSrcOptions = useMemo(() => {
-    return TuShareSrcOptions.map((x) => ({
-      value: x,
-      label: t(`tuShareSrcOptions.${x}`),
-    }));
-  }, [t]);
-
-  return (
-    <Form
-      name="basic"
-      autoComplete="off"
-      form={form}
-      onValuesChange={onValuesChange}
-      layout={'vertical'}
-    >
-      <DynamicInputVariable node={node}></DynamicInputVariable>
-      <Form.Item
-        label={t('token')}
-        name={'token'}
-        tooltip={'Get from https://tushare.pro/'}
-      >
-        <Input></Input>
-      </Form.Item>
-      <Form.Item label={t('src')} name={'src'}>
-        <Select options={tuShareSrcOptions}></Select>
-      </Form.Item>
-      <Form.Item label={t('startDate')} name={'start_date'}>
-        <DateTimePicker />
-      </Form.Item>
-      <Form.Item label={t('endDate')} name={'end_date'}>
-        <DateTimePicker />
-      </Form.Item>
-      <Form.Item label={t('keyword')} name={'keyword'}>
-        <Input></Input>
-      </Form.Item>
-    </Form>
-  );
-};
-
-export default TuShareForm;
diff --git a/web/src/pages/agent/gobal-variable-sheet/hooks/use-object-fields.tsx b/web/src/pages/agent/gobal-variable-sheet/hooks/use-object-fields.tsx
index c41e766f2..07cc48764 100644
--- a/web/src/pages/agent/gobal-variable-sheet/hooks/use-object-fields.tsx
+++ b/web/src/pages/agent/gobal-variable-sheet/hooks/use-object-fields.tsx
@@ -1,7 +1,7 @@
+import { BoolSegmented } from '@/components/bool-segmented';
 import JsonEditor from '@/components/json-edit';
 import { BlockButton, Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
-import { Segmented } from '@/components/ui/segmented';
 import { t } from 'i18next';
 import { isEmpty } from 'lodash';
 import { Trash2, X } from 'lucide-react';
@@ -15,7 +15,7 @@ export const useObjectFields = () => {
     (field: FieldValues, className?: string) => {
       const fieldValue = field.value ? true : false;
       return (
-        <Segmented
+        <BoolSegmented
           options={
             [
               { value: true, label: 'True' },
@@ -27,7 +27,7 @@ export const useObjectFields = () => {
           onChange={field.onChange}
           className={className}
           itemClassName="justify-center flex-1"
-        ></Segmented>
+        ></BoolSegmented>
       );
     },
     [],
diff --git a/web/src/pages/agent/hooks/use-add-node.ts b/web/src/pages/agent/hooks/use-add-node.ts
index 44091f1b1..36aae5d4f 100644
--- a/web/src/pages/agent/hooks/use-add-node.ts
+++ b/web/src/pages/agent/hooks/use-add-node.ts
@@ -10,7 +10,6 @@ import {
   NodeMap,
   Operator,
   initialAgentValues,
-  initialAkShareValues,
   initialArXivValues,
   initialBeginValues,
   initialBingValues,
@@ -29,14 +28,12 @@ import {
   initialInvokeValues,
   initialIterationStartValues,
   initialIterationValues,
-  initialJin10Values,
-  initialKeywordExtractValues,
   initialListOperationsValues,
+  initialLoopValues,
   initialMessageValues,
   initialNoteValues,
   initialParserValues,
   initialPubMedValues,
-  initialQWeatherValues,
   initialRelevantValues,
   initialRetrievalValues,
   initialRewriteQuestionValues,
@@ -47,7 +44,6 @@ import {
   initialTavilyExtractValues,
   initialTavilyValues,
   initialTokenizerValues,
-  initialTuShareValues,
   initialUserFillUpValues,
   initialVariableAggregatorValues,
   initialVariableAssignerValues,
@@ -68,6 +64,63 @@ function isBottomSubAgent(type: string, position: Position) {
     type === Operator.Tool
   );
 }
+
+const GroupStartNodeMap = {
+  [Operator.Iteration]: {
+    id: `${Operator.IterationStart}:${humanId()}`,
+    type: 'iterationStartNode',
+    position: { x: 50, y: 100 },
+    data: {
+      label: Operator.IterationStart,
+      name: Operator.IterationStart,
+      form: initialIterationStartValues,
+    },
+    extent: 'parent' as 'parent',
+  },
+  [Operator.Loop]: {
+    id: `${Operator.LoopStart}:${humanId()}`,
+    type: 'loopStartNode',
+    position: { x: 50, y: 100 },
+    data: {
+      label: Operator.LoopStart,
+      name: Operator.LoopStart,
+      form: {},
+    },
+    extent: 'parent' as 'parent',
+  },
+};
+
+function useAddGroupNode() {
+  const { addEdge, addNode } = useGraphStore((state) => state);
+
+  const addGroupNode = useCallback(
+    (operatorType: string, newNode: Node<any>, nodeId?: string) => {
+      newNode.width = 500;
+      newNode.height = 250;
+
+      const startNode: Node<any> =
+        GroupStartNodeMap[operatorType as keyof typeof GroupStartNodeMap];
+
+      startNode.parentId = newNode.id;
+
+      addNode(newNode);
+      addNode(startNode);
+
+      if (nodeId) {
+        addEdge({
+          source: nodeId,
+          target: newNode.id,
+          sourceHandle: NodeHandleId.Start,
+          targetHandle: NodeHandleId.End,
+        });
+      }
+      return newNode.id;
+    },
+    [addEdge, addNode],
+  );
+
+  return { addGroupNode };
+}
 export const useInitializeOperatorParams = () => {
   const llmId = useFetchModelId();
 
@@ -82,10 +135,6 @@ export const useInitializeOperatorParams = () => {
         llm_id: llmId,
       },
       [Operator.Message]: initialMessageValues,
-      [Operator.KeywordExtract]: {
-        ...initialKeywordExtractValues,
-        llm_id: llmId,
-      },
       [Operator.DuckDuckGo]: initialDuckValues,
       [Operator.Wikipedia]: initialWikipediaValues,
       [Operator.PubMed]: initialPubMedValues,
@@ -95,14 +144,10 @@ export const useInitializeOperatorParams = () => {
       [Operator.GoogleScholar]: initialGoogleScholarValues,
       [Operator.SearXNG]: initialSearXNGValues,
       [Operator.GitHub]: initialGithubValues,
-      [Operator.QWeather]: initialQWeatherValues,
       [Operator.ExeSQL]: initialExeSqlValues,
       [Operator.Switch]: initialSwitchValues,
       [Operator.WenCai]: initialWenCaiValues,
-      [Operator.AkShare]: initialAkShareValues,
       [Operator.YahooFinance]: initialYahooFinanceValues,
-      [Operator.Jin10]: initialJin10Values,
-      [Operator.TuShare]: initialTuShareValues,
       [Operator.Note]: initialNoteValues,
       [Operator.Crawler]: initialCrawlerValues,
       [Operator.Invoke]: initialInvokeValues,
@@ -133,6 +178,9 @@ export const useInitializeOperatorParams = () => {
       [Operator.ListOperations]: initialListOperationsValues,
       [Operator.VariableAssigner]: initialVariableAssignerValues,
       [Operator.VariableAggregator]: initialVariableAggregatorValues,
+      [Operator.Loop]: initialLoopValues,
+      [Operator.LoopStart]: {},
+      [Operator.ExitLoop]: {},
     };
   }, [llmId]);
 
@@ -311,6 +359,7 @@ export function useAddNode(reactFlowInstance?: ReactFlowInstance<any, any>) {
   const { addChildEdge } = useAddChildEdge();
   const { addToolNode } = useAddToolNode();
   const { resizeIterationNode } = useResizeIterationNode();
+  const { addGroupNode } = useAddGroupNode();
   //   const [reactFlowInstance, setReactFlowInstance] =
   //     useState<ReactFlowInstance<any, any>>();
 
@@ -376,33 +425,8 @@ export function useAddNode(reactFlowInstance?: ReactFlowInstance<any, any>) {
           }
         }
 
-        if (type === Operator.Iteration) {
-          newNode.width = 500;
-          newNode.height = 250;
-          const iterationStartNode: Node<any> = {
-            id: `${Operator.IterationStart}:${humanId()}`,
-            type: 'iterationStartNode',
-            position: { x: 50, y: 100 },
-            // draggable: false,
-            data: {
-              label: Operator.IterationStart,
-              name: Operator.IterationStart,
-              form: initialIterationStartValues,
-            },
-            parentId: newNode.id,
-            extent: 'parent',
-          };
-          addNode(newNode);
-          addNode(iterationStartNode);
-          if (nodeId) {
-            addEdge({
-              source: nodeId,
-              target: newNode.id,
-              sourceHandle: NodeHandleId.Start,
-              targetHandle: NodeHandleId.End,
-            });
-          }
-          return newNode.id;
+        if ([Operator.Iteration, Operator.Loop].includes(type as Operator)) {
+          return addGroupNode(type, newNode, nodeId);
         } else if (
           type === Operator.Agent &&
           params.position === Position.Bottom
@@ -456,6 +480,7 @@ export function useAddNode(reactFlowInstance?: ReactFlowInstance<any, any>) {
     [
       addChildEdge,
       addEdge,
+      addGroupNode,
       addNode,
       addToolNode,
       calculateNewlyBackChildPosition,
diff --git a/web/src/pages/agent/hooks/use-build-options.tsx b/web/src/pages/agent/hooks/use-build-options.tsx
index d1214f729..10523178b 100644
--- a/web/src/pages/agent/hooks/use-build-options.tsx
+++ b/web/src/pages/agent/hooks/use-build-options.tsx
@@ -1,4 +1,4 @@
-import { buildNodeOutputOptions } from '@/utils/canvas-util';
+import { buildUpstreamNodeOutputOptions } from '@/utils/canvas-util';
 import { useMemo } from 'react';
 import { Operator } from '../constant';
 import OperatorIcon from '../operator-icon';
@@ -9,7 +9,7 @@ export function useBuildNodeOutputOptions(nodeId?: string) {
   const edges = useGraphStore((state) => state.edges);
 
   return useMemo(() => {
-    return buildNodeOutputOptions({
+    return buildUpstreamNodeOutputOptions({
       nodes,
       edges,
       nodeId,
diff --git a/web/src/pages/agent/hooks/use-filter-child-node-ids.ts b/web/src/pages/agent/hooks/use-filter-child-node-ids.ts
new file mode 100644
index 000000000..a60622a70
--- /dev/null
+++ b/web/src/pages/agent/hooks/use-filter-child-node-ids.ts
@@ -0,0 +1,10 @@
+import { filterChildNodeIds } from '@/utils/canvas-util';
+import useGraphStore from '../store';
+
+export function useFilterChildNodeIds(nodeId?: string) {
+  const nodes = useGraphStore((state) => state.nodes);
+
+  const childNodeIds = filterChildNodeIds(nodes, nodeId);
+
+  return childNodeIds ?? [];
+}
diff --git a/web/src/pages/agent/hooks/use-get-begin-query.tsx b/web/src/pages/agent/hooks/use-get-begin-query.tsx
index 3826f318e..c18a72029 100644
--- a/web/src/pages/agent/hooks/use-get-begin-query.tsx
+++ b/web/src/pages/agent/hooks/use-get-begin-query.tsx
@@ -1,15 +1,21 @@
 import { AgentGlobals, AgentStructuredOutputField } from '@/constants/agent';
 import { useFetchAgent } from '@/hooks/use-agent-request';
 import { RAGFlowNodeType } from '@/interfaces/database/flow';
-import { buildNodeOutputOptions, isAgentStructured } from '@/utils/canvas-util';
+import {
+  buildNodeOutputOptions,
+  buildOutputOptions,
+  buildUpstreamNodeOutputOptions,
+  isAgentStructured,
+} from '@/utils/canvas-util';
 import { DefaultOptionType } from 'antd/es/select';
 import { t } from 'i18next';
-import { isEmpty, toLower } from 'lodash';
+import { flatten, isEmpty, toLower } from 'lodash';
 import get from 'lodash/get';
 import { MessageSquareCode } from 'lucide-react';
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import {
   AgentDialogueMode,
+  AgentVariableType,
   BeginId,
   BeginQueryType,
   JsonSchemaDataType,
@@ -85,20 +91,39 @@ export const useGetBeginNodeDataQueryIsSafe = () => {
   return isBeginNodeDataQuerySafe;
 };
 
-export function useBuildNodeOutputOptions(nodeId?: string) {
+export function useBuildUpstreamNodeOutputOptions(nodeId?: string) {
   const nodes = useGraphStore((state) => state.nodes);
   const edges = useGraphStore((state) => state.edges);
 
   return useMemo(() => {
-    return buildNodeOutputOptions({
+    return buildUpstreamNodeOutputOptions({
       nodes,
       edges,
       nodeId,
-      Icon: ({ name }) => <OperatorIcon name={name as Operator}></OperatorIcon>,
     });
   }, [edges, nodeId, nodes]);
 }
 
+export function useBuildParentOutputOptions(parentId?: string) {
+  const { getNode, getOperatorTypeFromId } = useGraphStore((state) => state);
+  const parentNode = getNode(parentId);
+
+  const parentType = getOperatorTypeFromId(parentId);
+
+  if (
+    parentType &&
+    [Operator.Loop].includes(parentType as Operator) &&
+    parentNode
+  ) {
+    const options = buildOutputOptions(parentNode);
+    if (options) {
+      return [options];
+    }
+  }
+
+  return [];
+}
+
 // exclude nodes with branches
 const ExcludedNodes = [
   Operator.Categorize,
@@ -120,7 +145,7 @@ function transferToVariableType(type: string) {
   return type;
 }
 
-export function useBuildBeginVariableOptions() {
+export function useBuildBeginDynamicVariableOptions() {
   const inputs = useSelectBeginNodeDataInputs();
 
   const options = useMemo(() => {
@@ -144,6 +169,30 @@ export function useBuildBeginVariableOptions() {
 
 const Env = 'env.';
 
+export function useBuildGlobalWithBeginVariableOptions() {
+  const { data } = useFetchAgent();
+  const dynamicBeginOptions = useBuildBeginDynamicVariableOptions();
+  const globals = data?.dsl?.globals ?? {};
+  const globalOptions = Object.entries(globals)
+    .filter(([key]) => !key.startsWith(Env))
+    .map(([key, value]) => ({
+      label: key,
+      value: key,
+      icon: <OperatorIcon name={Operator.Begin} className="block" />,
+      parentLabel: <span>{t('flow.beginInput')}</span>,
+      type: Array.isArray(value)
+        ? `${VariableType.Array}${key === AgentGlobals.SysFiles ? '<file>' : ''}`
+        : typeof value,
+    }));
+
+  return [
+    {
+      ...dynamicBeginOptions[0],
+      options: [...(dynamicBeginOptions[0]?.options ?? []), ...globalOptions],
+    },
+  ];
+}
+
 export function useBuildConversationVariableOptions() {
   const { data } = useFetchAgent();
 
@@ -175,55 +224,88 @@ export function useBuildConversationVariableOptions() {
 }
 
 export const useBuildVariableOptions = (nodeId?: string, parentId?: string) => {
-  const nodeOutputOptions = useBuildNodeOutputOptions(nodeId);
-  const parentNodeOutputOptions = useBuildNodeOutputOptions(parentId);
-  const beginOptions = useBuildBeginVariableOptions();
+  const upstreamNodeOutputOptions = useBuildUpstreamNodeOutputOptions(nodeId);
+  const parentNodeOutputOptions = useBuildParentOutputOptions(parentId);
+  const parentUpstreamNodeOutputOptions =
+    useBuildUpstreamNodeOutputOptions(parentId);
 
   const options = useMemo(() => {
-    return [...beginOptions, ...nodeOutputOptions, ...parentNodeOutputOptions];
-  }, [beginOptions, nodeOutputOptions, parentNodeOutputOptions]);
+    return [
+      ...upstreamNodeOutputOptions,
+      ...parentNodeOutputOptions,
+      ...parentUpstreamNodeOutputOptions,
+    ];
+  }, [
+    upstreamNodeOutputOptions,
+    parentNodeOutputOptions,
+    parentUpstreamNodeOutputOptions,
+  ]);
 
   return options;
 };
 
-export function useBuildQueryVariableOptions(n?: RAGFlowNodeType) {
-  const { data } = useFetchAgent();
+export type BuildQueryVariableOptions = {
+  nodeIds?: string[];
+  variablesExceptOperatorOutputs?: AgentVariableType[];
+};
+
+export function useBuildQueryVariableOptions({
+  n,
+  nodeIds = [],
+  variablesExceptOperatorOutputs, // Variables other than operator output variables
+}: {
+  n?: RAGFlowNodeType;
+} & BuildQueryVariableOptions = {}) {
   const node = useContext(AgentFormContext) || n;
+  const nodes = useGraphStore((state) => state.nodes);
+
   const options = useBuildVariableOptions(node?.id, node?.parentId);
 
   const conversationOptions = useBuildConversationVariableOptions();
 
+  const globalWithBeginVariableOptions =
+    useBuildGlobalWithBeginVariableOptions();
+
+  const AgentVariableOptionsMap = {
+    [AgentVariableType.Begin]: globalWithBeginVariableOptions,
+    [AgentVariableType.Conversation]: conversationOptions,
+  };
+
   const nextOptions = useMemo(() => {
-    const globals = data?.dsl?.globals ?? {};
-    const globalOptions = Object.entries(globals)
-      .filter(([key]) => !key.startsWith(Env))
-      .map(([key, value]) => ({
-        label: key,
-        value: key,
-        icon: <OperatorIcon name={Operator.Begin} className="block" />,
-        parentLabel: <span>{t('flow.beginInput')}</span>,
-        type: Array.isArray(value)
-          ? `${VariableType.Array}${key === AgentGlobals.SysFiles ? '<file>' : ''}`
-          : typeof value,
-      }));
+    return [
+      ...globalWithBeginVariableOptions,
+      ...conversationOptions,
+      ...options,
+    ];
+  }, [conversationOptions, globalWithBeginVariableOptions, options]);
+
+  // Which options are entirely under external control?
+  if (!isEmpty(nodeIds) || !isEmpty(variablesExceptOperatorOutputs)) {
+    const nodeOutputOptions = buildNodeOutputOptions({ nodes, nodeIds });
+
+    const variablesExceptOperatorOutputsOptions =
+      variablesExceptOperatorOutputs?.map((x) => AgentVariableOptionsMap[x]) ??
+      [];
 
     return [
-      {
-        ...options[0],
-        options: [...options[0]?.options, ...globalOptions],
-      },
-      ...options.slice(1),
-      ...conversationOptions,
+      ...flatten(variablesExceptOperatorOutputsOptions),
+      ...nodeOutputOptions,
     ];
-  }, [conversationOptions, data?.dsl?.globals, options]);
-
+  }
   return nextOptions;
 }
 
-export function useFilterQueryVariableOptionsByTypes(
-  types?: JsonSchemaDataType[],
-) {
-  const nextOptions = useBuildQueryVariableOptions();
+export function useFilterQueryVariableOptionsByTypes({
+  types,
+  nodeIds = [],
+  variablesExceptOperatorOutputs,
+}: {
+  types?: JsonSchemaDataType[];
+} & BuildQueryVariableOptions) {
+  const nextOptions = useBuildQueryVariableOptions({
+    nodeIds,
+    variablesExceptOperatorOutputs,
+  });
 
   const filteredOptions = useMemo(() => {
     return !isEmpty(types)
@@ -294,7 +376,7 @@ export function useBuildComponentIdAndBeginOptions(
   parentId?: string,
 ) {
   const componentIdOptions = useBuildComponentIdOptions(nodeId, parentId);
-  const beginOptions = useBuildBeginVariableOptions();
+  const beginOptions = useBuildBeginDynamicVariableOptions();
 
   return [...beginOptions, ...componentIdOptions];
 }
@@ -323,9 +405,19 @@ export function flatOptions(options: DefaultOptionType[]) {
   }, []);
 }
 
-export function useFlattenQueryVariableOptions(nodeId?: string) {
+export function useFlattenQueryVariableOptions({
+  nodeId,
+  nodeIds = [],
+  variablesExceptOperatorOutputs,
+}: {
+  nodeId?: string;
+} & BuildQueryVariableOptions = {}) {
   const { getNode } = useGraphStore((state) => state);
-  const nextOptions = useBuildQueryVariableOptions(getNode(nodeId));
+  const nextOptions = useBuildQueryVariableOptions({
+    n: getNode(nodeId),
+    nodeIds,
+    variablesExceptOperatorOutputs,
+  });
 
   const flattenOptions = useMemo(() => {
     return flatOptions(nextOptions);
@@ -334,8 +426,18 @@ export function useFlattenQueryVariableOptions(nodeId?: string) {
   return flattenOptions;
 }
 
-export function useGetVariableLabelOrTypeByValue(nodeId?: string) {
-  const flattenOptions = useFlattenQueryVariableOptions(nodeId);
+export function useGetVariableLabelOrTypeByValue({
+  nodeId,
+  nodeIds = [],
+  variablesExceptOperatorOutputs,
+}: {
+  nodeId?: string;
+} & BuildQueryVariableOptions = {}) {
+  const flattenOptions = useFlattenQueryVariableOptions({
+    nodeId,
+    nodeIds,
+    variablesExceptOperatorOutputs,
+  });
   const findAgentStructuredOutputTypeByValue =
     useFindAgentStructuredOutputTypeByValue();
   const findAgentStructuredOutputLabel =
diff --git a/web/src/pages/agent/hooks/use-show-drawer.tsx b/web/src/pages/agent/hooks/use-show-drawer.tsx
index a350af074..8804c6a21 100644
--- a/web/src/pages/agent/hooks/use-show-drawer.tsx
+++ b/web/src/pages/agent/hooks/use-show-drawer.tsx
@@ -14,6 +14,7 @@ export const useShowFormDrawer = () => {
     setClickedNodeId,
     getNode,
     setClickedToolId,
+    getOperatorTypeFromId,
   } = useGraphStore((state) => state);
   const {
     visible: formDrawerVisible,
@@ -25,14 +26,20 @@ export const useShowFormDrawer = () => {
     (e: React.MouseEvent<Element>, nodeId: string) => {
       const tool = get(e.target, 'dataset.tool');
       // TODO: Operator type judgment should be used
-      if (nodeId.startsWith(Operator.Tool) && !tool) {
+      const operatorType = getOperatorTypeFromId(nodeId);
+      if (
+        (operatorType === Operator.Tool && !tool) ||
+        [Operator.LoopStart, Operator.ExitLoop].includes(
+          operatorType as Operator,
+        )
+      ) {
         return;
       }
       setClickedNodeId(nodeId);
       setClickedToolId(tool);
       showFormDrawer();
     },
-    [setClickedNodeId, setClickedToolId, showFormDrawer],
+    [getOperatorTypeFromId, setClickedNodeId, setClickedToolId, showFormDrawer],
   );
 
   return {
diff --git a/web/src/pages/agent/interface.ts b/web/src/pages/agent/interface.ts
index 0a6cba2f0..ed823535b 100644
--- a/web/src/pages/agent/interface.ts
+++ b/web/src/pages/agent/interface.ts
@@ -41,3 +41,11 @@ export type IInputs = {
   prologue: string;
   mode: string;
 };
+
+export type IOutputs = Record<
+  string,
+  {
+    type?: string;
+    value?: string;
+  }
+>;
diff --git a/web/src/pages/agent/operator-icon.tsx b/web/src/pages/agent/operator-icon.tsx
index bca93d7fa..b390507a4 100644
--- a/web/src/pages/agent/operator-icon.tsx
+++ b/web/src/pages/agent/operator-icon.tsx
@@ -14,7 +14,12 @@ import { ReactComponent as YahooFinanceIcon } from '@/assets/svg/yahoo-finance.s
 
 import { IconFontFill } from '@/components/icon-font';
 import { cn } from '@/lib/utils';
-import { FileCode, HousePlus } from 'lucide-react';
+import {
+  FileCode,
+  HousePlus,
+  Infinity as InfinityIcon,
+  LogOut,
+} from 'lucide-react';
 import { Operator } from './constant';
 
 interface IProps {
@@ -60,6 +65,8 @@ export const SVGIconMap = {
 };
 export const LucideIconMap = {
   [Operator.DataOperations]: FileCode,
+  [Operator.Loop]: InfinityIcon,
+  [Operator.ExitLoop]: LogOut,
 };
 
 const Empty = () => {
diff --git a/web/src/pages/agent/utils.ts b/web/src/pages/agent/utils.ts
index 6ae2935b4..da2fbf267 100644
--- a/web/src/pages/agent/utils.ts
+++ b/web/src/pages/agent/utils.ts
@@ -8,7 +8,7 @@ import {
 } from '@/interfaces/database/agent';
 import { DSLComponents, RAGFlowNodeType } from '@/interfaces/database/flow';
 import { buildSelectOptions } from '@/utils/component-util';
-import { removeUselessFieldsFromValues } from '@/utils/form';
+import { buildOptions, removeUselessFieldsFromValues } from '@/utils/form';
 import { Edge, Node, XYPosition } from '@xyflow/react';
 import { FormInstance, FormListFieldData } from 'antd';
 import { humanId } from 'human-id';
@@ -27,6 +27,7 @@ import {
   CategorizeAnchorPointPositions,
   FileType,
   FileTypeSuffixMap,
+  InputMode,
   NoCopyOperatorsList,
   NoDebugOperatorsList,
   NodeHandleId,
@@ -772,3 +773,5 @@ export function getArrayElementType(type: string) {
 export function buildConversationVariableSelectOptions() {
   return buildSelectOptions(Object.values(TypesWithArray));
 }
+
+export const InputModeOptions = buildOptions(InputMode);
diff --git a/web/src/utils/canvas-util.tsx b/web/src/utils/canvas-util.tsx
index d55862d3e..d3b825607 100644
--- a/web/src/utils/canvas-util.tsx
+++ b/web/src/utils/canvas-util.tsx
@@ -4,10 +4,11 @@ import {
   Operator,
 } from '@/constants/agent';
 import { BaseNode } from '@/interfaces/database/agent';
+import OperatorIcon from '@/pages/agent/operator-icon';
 
 import { Edge } from '@xyflow/react';
 import { get, isEmpty } from 'lodash';
-import { ComponentType, ReactNode } from 'react';
+import { ReactNode } from 'react';
 
 export function filterAllUpstreamNodeIds(edges: Edge[], nodeIds: string[]) {
   return nodeIds.reduce<string[]>((pre, nodeId) => {
@@ -29,13 +30,21 @@ export function filterAllUpstreamNodeIds(edges: Edge[], nodeIds: string[]) {
   }, []);
 }
 
+export function filterChildNodeIds(nodes: BaseNode[], nodeId?: string) {
+  return nodes.filter((x) => x.parentId === nodeId).map((x) => x.id);
+}
+
 export function isAgentStructured(id?: string, label?: string) {
   return (
     label === AgentStructuredOutputField && id?.startsWith(`${Operator.Agent}:`)
   );
 }
 
-export function buildOutputOptions(
+export function buildVariableValue(value: string, nodeId?: string) {
+  return `${nodeId}@${value}`;
+}
+
+export function buildSecondaryOutputOptions(
   outputs: Record<string, any> = {},
   nodeId?: string,
   parentLabel?: string | ReactNode,
@@ -43,7 +52,7 @@ export function buildOutputOptions(
 ) {
   return Object.keys(outputs).map((x) => ({
     label: x,
-    value: `${nodeId}@${x}`,
+    value: buildVariableValue(x, nodeId),
     parentLabel,
     icon,
     type: isAgentStructured(nodeId, x)
@@ -52,40 +61,63 @@ export function buildOutputOptions(
   }));
 }
 
+export function buildOutputOptions(x: BaseNode) {
+  return {
+    label: x.data.name,
+    value: x.id,
+    title: x.data.name,
+    options: buildSecondaryOutputOptions(
+      x.data.form.outputs,
+      x.id,
+      x.data.name,
+      <OperatorIcon name={x.data.label as Operator} />,
+    ),
+  };
+}
+
 export function buildNodeOutputOptions({
+  nodes, // all nodes
+  nodeIds, // Need to obtain the output node IDs
+}: {
+  nodes: BaseNode[];
+  nodeIds: string[];
+}) {
+  const nodeWithOutputList = nodes.filter(
+    (x) => nodeIds.some((y) => y === x.id) && !isEmpty(x.data?.form?.outputs),
+  );
+
+  return nodeWithOutputList.map((x) => buildOutputOptions(x));
+}
+
+export function buildUpstreamNodeOutputOptions({
   nodes,
   edges,
   nodeId,
-  Icon,
 }: {
   nodes: BaseNode[];
   edges: Edge[];
   nodeId?: string;
-  Icon: ComponentType<{ name: string }>;
 }) {
   if (!nodeId) {
     return [];
   }
   const upstreamIds = filterAllUpstreamNodeIds(edges, [nodeId]);
 
+  return buildNodeOutputOptions({ nodes, nodeIds: upstreamIds });
+}
+
+export function buildChildOutputOptions({
+  nodes,
+  nodeId,
+}: {
+  nodes: BaseNode[];
+  nodeId?: string;
+}) {
   const nodeWithOutputList = nodes.filter(
-    (x) =>
-      upstreamIds.some((y) => y === x.id) && !isEmpty(x.data?.form?.outputs),
+    (x) => x.parentId === nodeId && !isEmpty(x.data?.form?.outputs),
   );
 
-  return nodeWithOutputList
-    .filter((x) => x.id !== nodeId)
-    .map((x) => ({
-      label: x.data.name,
-      value: x.id,
-      title: x.data.name,
-      options: buildOutputOptions(
-        x.data.form.outputs,
-        x.id,
-        x.data.name,
-        <Icon name={x.data.name} />,
-      ),
-    }));
+  return nodeWithOutputList.map((x) => buildOutputOptions(x));
 }
 
 export function getStructuredDatatype(value: Record<string, any> | unknown) {

From c71d25f74447f11188d06d5b19b945b56310d3db Mon Sep 17 00:00:00 2001
From: buua436 <66937541+buua436@users.noreply.github.com>
Date: Thu, 27 Nov 2025 16:00:56 +0800
Subject: [PATCH 11/17] Fix: enable structured output for agent with tool
 (#11558)

### What problem does this PR solve?

issue:
[#11541](https://github.com/infiniflow/ragflow/issues/11541)
change:
enable structured output for agent with tool

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 agent/component/agent_with_tools.py | 69 ++++++++++++++++++++++++++---
 agent/component/llm.py              |  2 +-
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/agent/component/agent_with_tools.py b/agent/component/agent_with_tools.py
index b3470d6aa..979b636af 100644
--- a/agent/component/agent_with_tools.py
+++ b/agent/component/agent_with_tools.py
@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+import json
 import logging
 import os
 import re
@@ -29,7 +30,7 @@ from api.db.services.tenant_llm_service import TenantLLMService
 from api.db.services.mcp_server_service import MCPServerService
 from common.connection_utils import timeout
 from rag.prompts.generator import next_step, COMPLETE_TASK, analyze_task, \
-    citation_prompt, reflect, rank_memories, kb_prompt, citation_plus, full_question, message_fit_in
+    citation_prompt, reflect, rank_memories, kb_prompt, citation_plus, full_question, message_fit_in, structured_output_prompt
 from common.mcp_tool_call_conn import MCPToolCallSession, mcp_tool_metadata_to_openai_tool
 from agent.component.llm import LLMParam, LLM
 
@@ -137,6 +138,29 @@ class Agent(LLM, ToolBase):
             res.update(cpn.get_input_form())
         return res
 
+    def _get_output_schema(self):
+        try:
+            cand = self._param.outputs.get("structured")
+        except Exception:
+            return None
+
+        if isinstance(cand, dict):
+            if isinstance(cand.get("properties"), dict) and len(cand["properties"]) > 0:
+                return cand
+            for k in ("schema", "structured"):
+                if isinstance(cand.get(k), dict) and isinstance(cand[k].get("properties"), dict) and len(cand[k]["properties"]) > 0:
+                    return cand[k]
+
+        return None
+
+    def _force_format_to_schema(self, text: str, schema_prompt: str) -> str:
+        fmt_msgs = [
+            {"role": "system", "content": schema_prompt + "\nIMPORTANT: Output ONLY valid JSON. No markdown, no extra text."},
+            {"role": "user", "content": text},
+        ]
+        _, fmt_msgs = message_fit_in(fmt_msgs, int(self.chat_mdl.max_length * 0.97))
+        return self._generate(fmt_msgs)
+
     @timeout(int(os.environ.get("COMPONENT_EXEC_TIMEOUT", 20*60)))
     def _invoke(self, **kwargs):
         if self.check_if_canceled("Agent processing"):
@@ -160,17 +184,22 @@ class Agent(LLM, ToolBase):
             return LLM._invoke(self, **kwargs)
 
         prompt, msg, user_defined_prompt = self._prepare_prompt_variables()
+        output_schema = self._get_output_schema()
+        schema_prompt = ""
+        if output_schema:
+            schema = json.dumps(output_schema, ensure_ascii=False, indent=2)
+            schema_prompt = structured_output_prompt(schema)
 
         downstreams = self._canvas.get_component(self._id)["downstream"] if self._canvas.get_component(self._id) else []
         ex = self.exception_handler()
-        if any([self._canvas.get_component_obj(cid).component_name.lower()=="message" for cid in downstreams]) and not (ex and ex["goto"]):
+        if any([self._canvas.get_component_obj(cid).component_name.lower()=="message" for cid in downstreams]) and not (ex and ex["goto"]) and not output_schema:
             self.set_output("content", partial(self.stream_output_with_tools, prompt, msg, user_defined_prompt))
             return
 
         _, msg = message_fit_in([{"role": "system", "content": prompt}, *msg], int(self.chat_mdl.max_length * 0.97))
         use_tools = []
         ans = ""
-        for delta_ans, tk in self._react_with_tools_streamly(prompt, msg, use_tools, user_defined_prompt):
+        for delta_ans, tk in self._react_with_tools_streamly(prompt, msg, use_tools, user_defined_prompt,schema_prompt=schema_prompt):
             if self.check_if_canceled("Agent processing"):
                 return
             ans += delta_ans
@@ -183,6 +212,28 @@ class Agent(LLM, ToolBase):
                 self.set_output("_ERROR", ans)
             return
 
+        if output_schema:
+            error = ""
+            for _ in range(self._param.max_retries + 1):
+                try:
+                    def clean_formated_answer(ans: str) -> str:
+                        ans = re.sub(r"^.*</think>", "", ans, flags=re.DOTALL)
+                        ans = re.sub(r"^.*```json", "", ans, flags=re.DOTALL)
+                        return re.sub(r"```\n*$", "", ans, flags=re.DOTALL)
+                    obj = json_repair.loads(clean_formated_answer(ans))
+                    self.set_output("structured", obj)
+                    if use_tools:
+                        self.set_output("use_tools", use_tools)
+                    return obj
+                except Exception:
+                    error = "The answer cannot be parsed as JSON"
+                    ans = self._force_format_to_schema(ans, schema_prompt)
+                    if ans.find("**ERROR**") >= 0:
+                        continue
+
+            self.set_output("_ERROR", error)
+            return
+
         self.set_output("content", ans)
         if use_tools:
             self.set_output("use_tools", use_tools)
@@ -219,7 +270,7 @@ class Agent(LLM, ToolBase):
                                                   ]):
             yield delta_ans
 
-    def _react_with_tools_streamly(self, prompt, history: list[dict], use_tools, user_defined_prompt={}):
+    def _react_with_tools_streamly(self, prompt, history: list[dict], use_tools, user_defined_prompt={}, schema_prompt: str = ""):
         token_count = 0
         tool_metas = self.tool_meta
         hist = deepcopy(history)
@@ -256,9 +307,13 @@ class Agent(LLM, ToolBase):
         def complete():
             nonlocal hist
             need2cite = self._param.cite and self._canvas.get_reference()["chunks"] and self._id.find("-->") < 0
+            if schema_prompt:
+                need2cite = False
             cited = False
-            if hist[0]["role"] == "system" and need2cite:
-                if len(hist) < 7:
+            if hist and hist[0]["role"] == "system":
+                if schema_prompt:
+                    hist[0]["content"] += "\n" + schema_prompt
+                if need2cite and len(hist) < 7:
                     hist[0]["content"] += citation_prompt()
                     cited = True
             yield "", token_count
@@ -369,7 +424,7 @@ Respond immediately with your final comprehensive answer.
         """
         for k in self._param.outputs.keys():
             self._param.outputs[k]["value"] = None
-            
+
         for k, cpn in self.tools.items():
             if hasattr(cpn, "reset") and callable(cpn.reset):
                 cpn.reset()
diff --git a/agent/component/llm.py b/agent/component/llm.py
index 807bbc288..0f5317676 100644
--- a/agent/component/llm.py
+++ b/agent/component/llm.py
@@ -222,7 +222,7 @@ class LLM(ComponentBase):
             output_structure = self._param.outputs['structured']
         except Exception:
             pass
-        if output_structure and isinstance(output_structure, dict) and output_structure.get("properties"):
+        if output_structure and isinstance(output_structure, dict) and output_structure.get("properties") and len(output_structure["properties"]) > 0:
             schema=json.dumps(output_structure, ensure_ascii=False, indent=2)
             prompt += structured_output_prompt(schema)
             for _ in range(self._param.max_retries+1):

From 89d82ff031afdaefada3702c4b54fc2a024ac450 Mon Sep 17 00:00:00 2001
From: balibabu <cike8899@users.noreply.github.com>
Date: Thu, 27 Nov 2025 17:54:27 +0800
Subject: [PATCH 12/17] Feat: Delete useless knowledge base, chat, and search
 files.  #10427 (#11568)

### What problem does this PR solve?

Feat: Delete useless knowledge base, chat, and search files.  #10427
### Type of change


- [x] New Feature (non-breaking change which adds functionality)
---
 .../floating-chat-widget-markdown.tsx         |   3 +-
 .../markdown-content/index.less               |   0
 .../markdown-content/index.tsx                |   3 +-
 web/src/components/message-item/index.tsx     |   9 +-
 .../next-markdown-content/index.tsx           |   3 +-
 .../components/next-message-item/index.tsx    |   7 +-
 web/src/components/rename-dialog/index.tsx    |   2 +-
 .../components/rename-dialog/rename-form.tsx  |   2 +-
 web/src/constants/knowledge.ts                |   2 +
 web/src/hooks/chat-hooks.ts                   |   4 +-
 web/src/hooks/flow-hooks.ts                   |   2 +-
 web/src/hooks/logic-hooks.ts                  |   8 +-
 web/src/hooks/use-agent-request.ts            |   2 +-
 web/src/hooks/use-chat-request.ts             |   2 +-
 web/src/interfaces/database/chat.ts           |   9 +
 .../components/chunk-card/index.less          |  34 -
 .../components/chunk-card/index.tsx           | 101 ---
 .../components/chunk-creating-modal/index.tsx | 140 ----
 .../chunk-creating-modal/tag-feature-item.tsx | 107 ---
 .../components/chunk-toolbar/index.tsx        | 221 -------
 .../components/document-preview/hooks.ts      |  55 --
 .../components/document-preview/index.less    |  12 -
 .../components/document-preview/preview.tsx   | 121 ----
 .../components/knowledge-chunk/constant.ts    |   4 -
 .../components/knowledge-chunk/hooks.ts       | 129 ----
 .../components/knowledge-chunk/index.less     |  92 ---
 .../components/knowledge-chunk/index.tsx      | 202 ------
 .../components/knowledge-chunk/utils.ts       |  24 -
 .../components/knowledge-dataset/index.less   |   0
 .../components/knowledge-dataset/index.tsx    |   7 -
 .../components/knowledge-file/constant.ts     |  17 -
 .../knowledge-file/create-file-modal.tsx      |  49 --
 .../knowledge-file/document-toolbar.tsx       | 240 -------
 .../components/knowledge-file/hooks.ts        | 364 ----------
 .../components/knowledge-file/index.less      |  54 --
 .../components/knowledge-file/index.tsx       | 275 --------
 .../parsing-action-cell/index.less            |   3 -
 .../parsing-action-cell/index.tsx             | 149 -----
 .../parsing-status-cell/index.less            |  36 -
 .../parsing-status-cell/index.tsx             | 143 ----
 .../knowledge-file/rename-modal/index.tsx     |  75 ---
 .../knowledge-file/set-meta-modal/index.tsx   |  81 ---
 .../components/knowledge-file/utils.ts        |   6 -
 .../knowledge-file/web-crawl-modal.tsx        |  67 --
 .../components/knowledge-graph/constant.ts    | 241 -------
 .../knowledge-graph/force-graph.tsx           | 141 ----
 .../components/knowledge-graph/index.less     |   5 -
 .../components/knowledge-graph/index.tsx      |  31 -
 .../knowledge-graph/use-delete-graph.ts       |  21 -
 .../components/knowledge-graph/util.ts        |  94 ---
 .../knowledge-setting/category-panel.tsx      |  77 ---
 .../knowledge-setting/configuration/audio.tsx |  31 -
 .../knowledge-setting/configuration/book.tsx  |  33 -
 .../configuration/common-item.tsx             |  52 --
 .../knowledge-setting/configuration/email.tsx |  31 -
 .../knowledge-setting/configuration/index.tsx | 133 ----
 .../configuration/knowledge-graph.tsx         |  22 -
 .../knowledge-setting/configuration/laws.tsx  |  33 -
 .../configuration/manual.tsx                  |  33 -
 .../knowledge-setting/configuration/naive.tsx |  43 --
 .../knowledge-setting/configuration/one.tsx   |  30 -
 .../knowledge-setting/configuration/paper.tsx |  33 -
 .../configuration/picture.tsx                 |  24 -
 .../configuration/presentation.tsx            |  33 -
 .../knowledge-setting/configuration/qa.tsx    |  16 -
 .../configuration/resume.tsx                  |  16 -
 .../knowledge-setting/configuration/table.tsx |  13 -
 .../knowledge-setting/configuration/tag.tsx   |  13 -
 .../components/knowledge-setting/hooks.ts     | 121 ----
 .../components/knowledge-setting/index.less   |  45 --
 .../components/knowledge-setting/index.tsx    |  40 --
 .../components/knowledge-setting/tag-item.tsx |  90 ---
 .../knowledge-setting/tag-table/index.tsx     | 307 ---------
 .../tag-table/rename-dialog/index.tsx         |  40 --
 .../tag-table/rename-dialog/rename-form.tsx   |  83 ---
 .../components/knowledge-setting/tag-tabs.tsx |  40 --
 .../knowledge-setting/tag-word-cloud.tsx      |  62 --
 .../components/knowledge-setting/utils.ts     |  20 -
 .../components/knowledge-sidebar/index.less   |  63 --
 .../components/knowledge-sidebar/index.tsx    | 135 ----
 .../components/knowledge-testing/index.less   |   4 -
 .../components/knowledge-testing/index.tsx    |  68 --
 .../testing-control/index.less                |  29 -
 .../testing-control/index.tsx                 | 109 ---
 .../testing-control/label-word-cloud.tsx      |  59 --
 .../testing-result/index.less                 |  46 --
 .../testing-result/index.tsx                  | 147 -----
 .../testing-result/select-files.tsx           |  73 ---
 web/src/pages/add-knowledge/constant.ts       |  21 -
 web/src/pages/add-knowledge/index.less        |  19 -
 web/src/pages/add-knowledge/index.tsx         |  74 ---
 web/src/pages/agent/chat/box.tsx              |   2 +-
 .../pages/agent/chat/use-get-file-icon.tsx    |  12 +
 web/src/pages/agent/debug-content/index.tsx   |   2 +-
 web/src/pages/agent/hooks/use-chat-logic.ts   |   3 +-
 web/src/pages/agent/share/index.tsx           |   2 +-
 web/src/pages/agent/utils/chat.ts             |   3 +-
 .../pages/agents/agent-log-detail-modal.tsx   |   7 +-
 web/src/pages/agents/create-agent-dialog.tsx  |   2 +-
 web/src/pages/agents/create-agent-form.tsx    |   2 +-
 .../agents/upload-agent-dialog/index.tsx      |   2 +-
 .../upload-agent-dialog/upload-agent-form.tsx |   2 +-
 .../assistant-setting.tsx                     | 193 ------
 .../editable-cell.tsx                         | 101 ---
 .../chat/chat-configuration-modal/index.less  |  57 --
 .../chat/chat-configuration-modal/index.tsx   | 207 ------
 .../metadata-filter-conditions.tsx            |  88 ---
 .../model-setting.tsx                         |  55 --
 .../prompt-engine.tsx                         | 222 -------
 web/src/pages/chat/chat-container/index.less  |   7 -
 web/src/pages/chat/chat-container/index.tsx   | 125 ----
 web/src/pages/chat/chat-id-modal/index.less   |   3 -
 web/src/pages/chat/chat-id-modal/index.tsx    |  38 --
 web/src/pages/chat/constants.ts               |   1 -
 web/src/pages/chat/context.ts                 |   5 -
 web/src/pages/chat/hooks.ts                   | 620 ------------------
 web/src/pages/chat/index.less                 |  82 ---
 web/src/pages/chat/index.tsx                  | 393 -----------
 web/src/pages/chat/interface.ts               |  33 -
 web/src/pages/chat/share/index.less           |  13 -
 web/src/pages/chat/share/index.tsx            |  13 -
 web/src/pages/chat/share/large.tsx            | 124 ----
 web/src/pages/chat/shared-hooks.ts            | 149 -----
 web/src/pages/chat/utils.ts                   |  53 --
 .../parsed-result/add-knowledge/constant.ts   |  17 -
 web/src/pages/data-flow/constant.tsx          |   0
 .../data-flow/form/parser-form/index.tsx      |   0
 .../form/parser-form/pdf-form-fields.tsx      |   0
 .../form/parser-form/ppt-form-fields.tsx      |  40 --
 .../parser-form/spreadsheet-form-fields.tsx   |  40 --
 web/src/pages/data-flow/utils.ts              |   0
 web/src/pages/data-flows/index.tsx            |   3 -
 .../tag-table/rename-dialog/index.tsx         |   2 +-
 .../tag-table/rename-dialog/rename-form.tsx   |   2 +-
 .../pages/dataset/dataset/set-meta-dialog.tsx |   2 +-
 .../pages/file-manager/action-cell/index.tsx  | 141 ----
 .../connect-to-knowledge-modal/index.tsx      |  62 --
 web/src/pages/file-manager/file-toolbar.tsx   | 191 ------
 .../folder-create-modal/index.tsx             |  53 --
 web/src/pages/file-manager/hooks.ts           | 294 ---------
 web/src/pages/file-manager/index.less         |  29 -
 web/src/pages/file-manager/index.tsx          | 216 ------
 .../move-file-modal/async-tree-select.tsx     |  69 --
 .../file-manager/move-file-modal/index.tsx    |  54 --
 .../create-folder-form.tsx                    |   2 +-
 .../files/create-folder-dialog/index.tsx      |   2 +-
 web/src/pages/knowledge/hooks.ts              |  47 --
 web/src/pages/knowledge/index.less            |  50 --
 web/src/pages/knowledge/index.tsx             | 132 ----
 .../pages/knowledge/knowledge-card/index.less | 133 ----
 .../pages/knowledge/knowledge-card/index.tsx  | 112 ----
 .../knowledge-creating-modal/index.tsx        |  63 --
 web/src/pages/next-chats/chat/interface.ts    |  10 -
 .../next-chats/hooks/use-send-chat-message.ts |   3 +-
 .../hooks/use-send-multiple-message.ts        |   3 +-
 web/src/pages/next-chats/share/index.tsx      |   2 +-
 web/src/pages/next-chats/utils.ts             |  17 +-
 web/src/pages/next-search/hooks.ts            |  65 +-
 .../next-search/markdown-content/index.tsx    |   3 +-
 web/src/pages/next-search/mindmap-drawer.tsx  |   2 +-
 .../mcp/import-mcp-dialog/import-mcp-form.tsx |   2 +-
 .../mcp/import-mcp-dialog/index.tsx           |   2 +-
 web/src/pages/search/hooks.ts                 | 278 --------
 web/src/pages/search/index.less               | 191 ------
 web/src/pages/search/index.tsx                | 284 --------
 web/src/pages/search/mindmap-drawer.tsx       |  36 -
 web/src/pages/search/sidebar.tsx              | 162 -----
 .../mcp/import-mcp-dialog/import-mcp-form.tsx |   2 +-
 .../mcp/import-mcp-dialog/index.tsx           |   2 +-
 web/src/routes.ts                             |  59 --
 web/src/utils/chat.ts                         |  13 +-
 171 files changed, 161 insertions(+), 11112 deletions(-)
 rename web/src/{pages/chat => components}/markdown-content/index.less (100%)
 rename web/src/{pages/chat => components}/markdown-content/index.tsx (99%)
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/tag-feature-item.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/hooks.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/constant.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/hooks.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-chunk/utils.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-dataset/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-dataset/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/constant.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/create-file-modal.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/document-toolbar.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/hooks.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/rename-modal/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/set-meta-modal/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/utils.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-file/web-crawl-modal.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/constant.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/force-graph.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/use-delete-graph.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-graph/util.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/audio.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/book.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/common-item.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/email.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/knowledge-graph.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/laws.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/manual.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/naive.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/one.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/paper.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/picture.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/presentation.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/qa.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/resume.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/table.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/configuration/tag.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/hooks.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-item.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-table/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/rename-form.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-tabs.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/tag-word-cloud.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-sidebar/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-control/label-word-cloud.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.less
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.tsx
 delete mode 100644 web/src/pages/add-knowledge/components/knowledge-testing/testing-result/select-files.tsx
 delete mode 100644 web/src/pages/add-knowledge/constant.ts
 delete mode 100644 web/src/pages/add-knowledge/index.less
 delete mode 100644 web/src/pages/add-knowledge/index.tsx
 create mode 100644 web/src/pages/agent/chat/use-get-file-icon.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/editable-cell.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/index.less
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/index.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/metadata-filter-conditions.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/model-setting.tsx
 delete mode 100644 web/src/pages/chat/chat-configuration-modal/prompt-engine.tsx
 delete mode 100644 web/src/pages/chat/chat-container/index.less
 delete mode 100644 web/src/pages/chat/chat-container/index.tsx
 delete mode 100644 web/src/pages/chat/chat-id-modal/index.less
 delete mode 100644 web/src/pages/chat/chat-id-modal/index.tsx
 delete mode 100644 web/src/pages/chat/constants.ts
 delete mode 100644 web/src/pages/chat/context.ts
 delete mode 100644 web/src/pages/chat/hooks.ts
 delete mode 100644 web/src/pages/chat/index.less
 delete mode 100644 web/src/pages/chat/index.tsx
 delete mode 100644 web/src/pages/chat/interface.ts
 delete mode 100644 web/src/pages/chat/share/index.less
 delete mode 100644 web/src/pages/chat/share/index.tsx
 delete mode 100644 web/src/pages/chat/share/large.tsx
 delete mode 100644 web/src/pages/chat/shared-hooks.ts
 delete mode 100644 web/src/pages/chat/utils.ts
 delete mode 100644 web/src/pages/data-flow/constant.tsx
 delete mode 100644 web/src/pages/data-flow/form/parser-form/index.tsx
 delete mode 100644 web/src/pages/data-flow/form/parser-form/pdf-form-fields.tsx
 delete mode 100644 web/src/pages/data-flow/form/parser-form/ppt-form-fields.tsx
 delete mode 100644 web/src/pages/data-flow/form/parser-form/spreadsheet-form-fields.tsx
 delete mode 100644 web/src/pages/data-flow/utils.ts
 delete mode 100644 web/src/pages/data-flows/index.tsx
 delete mode 100644 web/src/pages/file-manager/action-cell/index.tsx
 delete mode 100644 web/src/pages/file-manager/connect-to-knowledge-modal/index.tsx
 delete mode 100644 web/src/pages/file-manager/file-toolbar.tsx
 delete mode 100644 web/src/pages/file-manager/folder-create-modal/index.tsx
 delete mode 100644 web/src/pages/file-manager/hooks.ts
 delete mode 100644 web/src/pages/file-manager/index.less
 delete mode 100644 web/src/pages/file-manager/index.tsx
 delete mode 100644 web/src/pages/file-manager/move-file-modal/async-tree-select.tsx
 delete mode 100644 web/src/pages/file-manager/move-file-modal/index.tsx
 delete mode 100644 web/src/pages/knowledge/hooks.ts
 delete mode 100644 web/src/pages/knowledge/index.less
 delete mode 100644 web/src/pages/knowledge/index.tsx
 delete mode 100644 web/src/pages/knowledge/knowledge-card/index.less
 delete mode 100644 web/src/pages/knowledge/knowledge-card/index.tsx
 delete mode 100644 web/src/pages/knowledge/knowledge-creating-modal/index.tsx
 delete mode 100644 web/src/pages/search/hooks.ts
 delete mode 100644 web/src/pages/search/index.less
 delete mode 100644 web/src/pages/search/index.tsx
 delete mode 100644 web/src/pages/search/mindmap-drawer.tsx
 delete mode 100644 web/src/pages/search/sidebar.tsx

diff --git a/web/src/components/floating-chat-widget-markdown.tsx b/web/src/components/floating-chat-widget-markdown.tsx
index 58e7bbd04..04e066c21 100644
--- a/web/src/components/floating-chat-widget-markdown.tsx
+++ b/web/src/components/floating-chat-widget-markdown.tsx
@@ -6,7 +6,9 @@ import {
 } from '@/hooks/document-hooks';
 import { IReference, IReferenceChunk } from '@/interfaces/database/chat';
 import {
+  currentReg,
   preprocessLaTeX,
+  replaceTextByOldReg,
   replaceThinkToSection,
   showImage,
 } from '@/utils/chat';
@@ -32,7 +34,6 @@ import rehypeRaw from 'rehype-raw';
 import remarkGfm from 'remark-gfm';
 import remarkMath from 'remark-math';
 import { visitParents } from 'unist-util-visit-parents';
-import { currentReg, replaceTextByOldReg } from '../pages/next-chats/utils';
 import styles from './floating-chat-widget-markdown.less';
 import { useIsDarkTheme } from './theme-provider';
 
diff --git a/web/src/pages/chat/markdown-content/index.less b/web/src/components/markdown-content/index.less
similarity index 100%
rename from web/src/pages/chat/markdown-content/index.less
rename to web/src/components/markdown-content/index.less
diff --git a/web/src/pages/chat/markdown-content/index.tsx b/web/src/components/markdown-content/index.tsx
similarity index 99%
rename from web/src/pages/chat/markdown-content/index.tsx
rename to web/src/components/markdown-content/index.tsx
index adc4f15c8..acf5e6f29 100644
--- a/web/src/pages/chat/markdown-content/index.tsx
+++ b/web/src/components/markdown-content/index.tsx
@@ -21,11 +21,12 @@ import { useTranslation } from 'react-i18next';
 import 'katex/dist/katex.min.css'; // `rehype-katex` does not import the CSS for you
 
 import {
+  currentReg,
   preprocessLaTeX,
+  replaceTextByOldReg,
   replaceThinkToSection,
   showImage,
 } from '@/utils/chat';
-import { currentReg, replaceTextByOldReg } from '../utils';
 
 import classNames from 'classnames';
 import { omit } from 'lodash';
diff --git a/web/src/components/message-item/index.tsx b/web/src/components/message-item/index.tsx
index 6a9432465..ff5b08b7d 100644
--- a/web/src/components/message-item/index.tsx
+++ b/web/src/components/message-item/index.tsx
@@ -1,6 +1,10 @@
 import { ReactComponent as AssistantIcon } from '@/assets/svg/assistant.svg';
 import { MessageType } from '@/constants/chat';
-import { IReference, IReferenceChunk } from '@/interfaces/database/chat';
+import {
+  IMessage,
+  IReference,
+  IReferenceChunk,
+} from '@/interfaces/database/chat';
 import classNames from 'classnames';
 import { memo, useCallback, useEffect, useMemo } from 'react';
 
@@ -10,9 +14,8 @@ import {
 } from '@/hooks/document-hooks';
 import { IRegenerateMessage, IRemoveMessageById } from '@/hooks/logic-hooks';
 import { cn } from '@/lib/utils';
-import { IMessage } from '@/pages/chat/interface';
-import MarkdownContent from '@/pages/chat/markdown-content';
 import { Avatar, Flex, Space } from 'antd';
+import MarkdownContent from '../markdown-content';
 import { ReferenceDocumentList } from '../next-message-item/reference-document-list';
 import { InnerUploadedMessageFiles } from '../next-message-item/uploaded-message-files';
 import { useTheme } from '../theme-provider';
diff --git a/web/src/components/next-markdown-content/index.tsx b/web/src/components/next-markdown-content/index.tsx
index b841cd446..20466bc48 100644
--- a/web/src/components/next-markdown-content/index.tsx
+++ b/web/src/components/next-markdown-content/index.tsx
@@ -19,13 +19,14 @@ import { useTranslation } from 'react-i18next';
 import 'katex/dist/katex.min.css'; // `rehype-katex` does not import the CSS for you
 
 import {
+  currentReg,
   preprocessLaTeX,
+  replaceTextByOldReg,
   replaceThinkToSection,
   showImage,
 } from '@/utils/chat';
 
 import { cn } from '@/lib/utils';
-import { currentReg, replaceTextByOldReg } from '@/pages/chat/utils';
 import classNames from 'classnames';
 import { omit } from 'lodash';
 import { pipe } from 'lodash/fp';
diff --git a/web/src/components/next-message-item/index.tsx b/web/src/components/next-message-item/index.tsx
index 706553b67..3f3ce6879 100644
--- a/web/src/components/next-message-item/index.tsx
+++ b/web/src/components/next-message-item/index.tsx
@@ -1,6 +1,10 @@
 import { ReactComponent as AssistantIcon } from '@/assets/svg/assistant.svg';
 import { MessageType } from '@/constants/chat';
-import { IReferenceChunk, IReferenceObject } from '@/interfaces/database/chat';
+import {
+  IMessage,
+  IReferenceChunk,
+  IReferenceObject,
+} from '@/interfaces/database/chat';
 import classNames from 'classnames';
 import {
   PropsWithChildren,
@@ -17,7 +21,6 @@ import { INodeEvent, MessageEventType } from '@/hooks/use-send-message';
 import { cn } from '@/lib/utils';
 import { AgentChatContext } from '@/pages/agent/context';
 import { WorkFlowTimeline } from '@/pages/agent/log-sheet/workflow-timeline';
-import { IMessage } from '@/pages/chat/interface';
 import { downloadFile } from '@/services/file-manager-service';
 import { downloadFileFromBlob } from '@/utils/file-util';
 import { isEmpty } from 'lodash';
diff --git a/web/src/components/rename-dialog/index.tsx b/web/src/components/rename-dialog/index.tsx
index 999760d00..27f50a015 100644
--- a/web/src/components/rename-dialog/index.tsx
+++ b/web/src/components/rename-dialog/index.tsx
@@ -5,8 +5,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ButtonLoading } from '../ui/button';
diff --git a/web/src/components/rename-dialog/rename-form.tsx b/web/src/components/rename-dialog/rename-form.tsx
index e1b3c285f..3dc543d53 100644
--- a/web/src/components/rename-dialog/rename-form.tsx
+++ b/web/src/components/rename-dialog/rename-form.tsx
@@ -13,8 +13,8 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/web/src/constants/knowledge.ts b/web/src/constants/knowledge.ts
index a08aac2c5..130b7ed91 100644
--- a/web/src/constants/knowledge.ts
+++ b/web/src/constants/knowledge.ts
@@ -92,3 +92,5 @@ export enum DocumentParserType {
   Tag = 'tag',
   KnowledgeGraph = 'knowledge_graph',
 }
+
+export const TagRenameId = 'tagRename';
diff --git a/web/src/hooks/chat-hooks.ts b/web/src/hooks/chat-hooks.ts
index 599944d27..a8e1509a3 100644
--- a/web/src/hooks/chat-hooks.ts
+++ b/web/src/hooks/chat-hooks.ts
@@ -1,5 +1,6 @@
 import { ChatSearchParams } from '@/constants/chat';
 import {
+  IClientConversation,
   IConversation,
   IDialog,
   IStats,
@@ -10,8 +11,7 @@ import {
   IFeedbackRequestBody,
 } from '@/interfaces/request/chat';
 import i18n from '@/locales/config';
-import { IClientConversation } from '@/pages/chat/interface';
-import { useGetSharedChatSearchParams } from '@/pages/chat/shared-hooks';
+import { useGetSharedChatSearchParams } from '@/pages/next-chats/hooks/use-send-shared-message';
 import chatService from '@/services/chat-service';
 import {
   buildMessageListWithUuid,
diff --git a/web/src/hooks/flow-hooks.ts b/web/src/hooks/flow-hooks.ts
index 5acfd0649..d65452181 100644
--- a/web/src/hooks/flow-hooks.ts
+++ b/web/src/hooks/flow-hooks.ts
@@ -1,7 +1,7 @@
 import { DSL, IFlow } from '@/interfaces/database/flow';
 import { IDebugSingleRequestBody } from '@/interfaces/request/flow';
 import i18n from '@/locales/config';
-import { useGetSharedChatSearchParams } from '@/pages/chat/shared-hooks';
+import { useGetSharedChatSearchParams } from '@/pages/next-chats/hooks/use-send-shared-message';
 import flowService from '@/services/flow-service';
 import { buildMessageListWithUuid } from '@/utils/chat';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
diff --git a/web/src/hooks/logic-hooks.ts b/web/src/hooks/logic-hooks.ts
index d7afe6347..d2fb2cd50 100644
--- a/web/src/hooks/logic-hooks.ts
+++ b/web/src/hooks/logic-hooks.ts
@@ -2,9 +2,13 @@ import { Authorization } from '@/constants/authorization';
 import { MessageType } from '@/constants/chat';
 import { LanguageTranslationMap } from '@/constants/common';
 import { ResponseType } from '@/interfaces/database/base';
-import { IAnswer, Message } from '@/interfaces/database/chat';
+import {
+  IAnswer,
+  IClientConversation,
+  IMessage,
+  Message,
+} from '@/interfaces/database/chat';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
-import { IClientConversation, IMessage } from '@/pages/chat/interface';
 import api from '@/utils/api';
 import { getAuthorization } from '@/utils/authorization-util';
 import { buildMessageUuid } from '@/utils/chat';
diff --git a/web/src/hooks/use-agent-request.ts b/web/src/hooks/use-agent-request.ts
index 4f8d8c538..bbddf50d7 100644
--- a/web/src/hooks/use-agent-request.ts
+++ b/web/src/hooks/use-agent-request.ts
@@ -14,7 +14,7 @@ import { IDebugSingleRequestBody } from '@/interfaces/request/agent';
 import i18n from '@/locales/config';
 import { BeginId } from '@/pages/agent/constant';
 import { IInputs } from '@/pages/agent/interface';
-import { useGetSharedChatSearchParams } from '@/pages/chat/shared-hooks';
+import { useGetSharedChatSearchParams } from '@/pages/next-chats/hooks/use-send-shared-message';
 import agentService, {
   fetchAgentLogsByCanvasId,
   fetchPipeLineList,
diff --git a/web/src/hooks/use-chat-request.ts b/web/src/hooks/use-chat-request.ts
index 127b0e54b..25155e1fc 100644
--- a/web/src/hooks/use-chat-request.ts
+++ b/web/src/hooks/use-chat-request.ts
@@ -2,12 +2,12 @@ import { FileUploadProps } from '@/components/file-upload';
 import message from '@/components/ui/message';
 import { ChatSearchParams } from '@/constants/chat';
 import {
+  IClientConversation,
   IConversation,
   IDialog,
   IExternalChatInfo,
 } from '@/interfaces/database/chat';
 import { IAskRequestBody } from '@/interfaces/request/chat';
-import { IClientConversation } from '@/pages/next-chats/chat/interface';
 import { useGetSharedChatSearchParams } from '@/pages/next-chats/hooks/use-send-shared-message';
 import { isConversationIdExist } from '@/pages/next-chats/utils';
 import chatService from '@/services/next-chat-service';
diff --git a/web/src/interfaces/database/chat.ts b/web/src/interfaces/database/chat.ts
index eb6eebe89..fb409b05e 100644
--- a/web/src/interfaces/database/chat.ts
+++ b/web/src/interfaces/database/chat.ts
@@ -183,3 +183,12 @@ export interface IExternalChatInfo {
   title: string;
   prologue?: string;
 }
+
+export interface IMessage extends Message {
+  id: string;
+  reference?: IReference; // the latest news has reference
+}
+
+export interface IClientConversation extends IConversation {
+  message: IMessage[];
+}
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.less b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.less
deleted file mode 100644
index 127a5c790..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.less
+++ /dev/null
@@ -1,34 +0,0 @@
-.image {
-  width: 100px !important;
-  object-fit: contain;
-}
-
-.imagePreview {
-  max-width: 50vw;
-  max-height: 50vh;
-  object-fit: contain;
-}
-
-.content {
-  flex: 1;
-  .chunkText;
-}
-
-.contentEllipsis {
-  .multipleLineEllipsis(3);
-}
-
-.contentText {
-  word-break: break-all !important;
-}
-
-.chunkCard {
-  width: 100%;
-}
-
-.cardSelected {
-  background-color: @selectedBackgroundColor;
-}
-.cardSelectedDark {
-  background-color: #ffffff2f;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.tsx
deleted file mode 100644
index b7e61e06a..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-card/index.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import Image from '@/components/image';
-import { IChunk } from '@/interfaces/database/knowledge';
-import { Card, Checkbox, CheckboxProps, Flex, Popover, Switch } from 'antd';
-import classNames from 'classnames';
-import DOMPurify from 'dompurify';
-import { useEffect, useState } from 'react';
-
-import { useTheme } from '@/components/theme-provider';
-import { ChunkTextMode } from '../../constant';
-import styles from './index.less';
-
-interface IProps {
-  item: IChunk;
-  checked: boolean;
-  switchChunk: (available?: number, chunkIds?: string[]) => void;
-  editChunk: (chunkId: string) => void;
-  handleCheckboxClick: (chunkId: string, checked: boolean) => void;
-  selected: boolean;
-  clickChunkCard: (chunkId: string) => void;
-  textMode: ChunkTextMode;
-}
-
-const ChunkCard = ({
-  item,
-  checked,
-  handleCheckboxClick,
-  editChunk,
-  switchChunk,
-  selected,
-  clickChunkCard,
-  textMode,
-}: IProps) => {
-  const available = Number(item.available_int);
-  const [enabled, setEnabled] = useState(false);
-  const { theme } = useTheme();
-
-  const onChange = (checked: boolean) => {
-    setEnabled(checked);
-    switchChunk(available === 0 ? 1 : 0, [item.chunk_id]);
-  };
-
-  const handleCheck: CheckboxProps['onChange'] = (e) => {
-    handleCheckboxClick(item.chunk_id, e.target.checked);
-  };
-
-  const handleContentDoubleClick = () => {
-    editChunk(item.chunk_id);
-  };
-
-  const handleContentClick = () => {
-    clickChunkCard(item.chunk_id);
-  };
-
-  useEffect(() => {
-    setEnabled(available === 1);
-  }, [available]);
-
-  return (
-    <Card
-      className={classNames(styles.chunkCard, {
-        [`${theme === 'dark' ? styles.cardSelectedDark : styles.cardSelected}`]:
-          selected,
-      })}
-    >
-      <Flex gap={'middle'} justify={'space-between'}>
-        <Checkbox onChange={handleCheck} checked={checked}></Checkbox>
-        {item.image_id && (
-          <Popover
-            placement="right"
-            content={
-              <Image id={item.image_id} className={styles.imagePreview}></Image>
-            }
-          >
-            <Image id={item.image_id} className={styles.image}></Image>
-          </Popover>
-        )}
-
-        <section
-          onDoubleClick={handleContentDoubleClick}
-          onClick={handleContentClick}
-          className={styles.content}
-        >
-          <div
-            dangerouslySetInnerHTML={{
-              __html: DOMPurify.sanitize(item.content_with_weight),
-            }}
-            className={classNames(styles.contentText, {
-              [styles.contentEllipsis]: textMode === ChunkTextMode.Ellipse,
-            })}
-          ></div>
-        </section>
-
-        <div>
-          <Switch checked={enabled} onChange={onChange} />
-        </div>
-      </Flex>
-    </Card>
-  );
-};
-
-export default ChunkCard;
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/index.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/index.tsx
deleted file mode 100644
index abcf1742c..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/index.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import EditTag from '@/components/edit-tag';
-import { useFetchChunk } from '@/hooks/chunk-hooks';
-import { IModalProps } from '@/interfaces/common';
-import { IChunk } from '@/interfaces/database/knowledge';
-import { DeleteOutlined } from '@ant-design/icons';
-import { Divider, Form, Input, Modal, Space, Switch } from 'antd';
-import React, { useCallback, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useDeleteChunkByIds } from '../../hooks';
-import {
-  transformTagFeaturesArrayToObject,
-  transformTagFeaturesObjectToArray,
-} from '../../utils';
-import { TagFeatureItem } from './tag-feature-item';
-
-type FieldType = Pick<
-  IChunk,
-  'content_with_weight' | 'tag_kwd' | 'question_kwd' | 'important_kwd'
->;
-
-interface kFProps {
-  doc_id: string;
-  chunkId: string | undefined;
-  parserId: string;
-}
-
-const ChunkCreatingModal: React.FC<IModalProps<any> & kFProps> = ({
-  doc_id,
-  chunkId,
-  hideModal,
-  onOk,
-  loading,
-  parserId,
-}) => {
-  const [form] = Form.useForm();
-  const [checked, setChecked] = useState(false);
-  const { removeChunk } = useDeleteChunkByIds();
-  const { data } = useFetchChunk(chunkId);
-  const { t } = useTranslation();
-
-  const isTagParser = parserId === 'tag';
-
-  const handleOk = useCallback(async () => {
-    try {
-      const values = await form.validateFields();
-      console.log('🚀 ~ handleOk ~ values:', values);
-
-      onOk?.({
-        ...values,
-        tag_feas: transformTagFeaturesArrayToObject(values.tag_feas),
-        available_int: checked ? 1 : 0, // available_int
-      });
-    } catch (errorInfo) {
-      console.log('Failed:', errorInfo);
-    }
-  }, [checked, form, onOk]);
-
-  const handleRemove = useCallback(() => {
-    if (chunkId) {
-      return removeChunk([chunkId], doc_id);
-    }
-  }, [chunkId, doc_id, removeChunk]);
-
-  const handleCheck = useCallback(() => {
-    setChecked(!checked);
-  }, [checked]);
-
-  useEffect(() => {
-    if (data?.code === 0) {
-      const { available_int, tag_feas } = data.data;
-      form.setFieldsValue({
-        ...(data.data || {}),
-        tag_feas: transformTagFeaturesObjectToArray(tag_feas),
-      });
-
-      setChecked(available_int !== 0);
-    }
-  }, [data, form, chunkId]);
-
-  return (
-    <Modal
-      title={`${chunkId ? t('common.edit') : t('common.create')} ${t('chunk.chunk')}`}
-      open={true}
-      onOk={handleOk}
-      onCancel={hideModal}
-      okButtonProps={{ loading }}
-      destroyOnClose
-    >
-      <Form form={form} autoComplete="off" layout={'vertical'}>
-        <Form.Item<FieldType>
-          label={t('chunk.chunk')}
-          name="content_with_weight"
-          rules={[{ required: true, message: t('chunk.chunkMessage') }]}
-        >
-          <Input.TextArea autoSize={{ minRows: 4, maxRows: 10 }} />
-        </Form.Item>
-
-        <Form.Item<FieldType> label={t('chunk.keyword')} name="important_kwd">
-          <EditTag></EditTag>
-        </Form.Item>
-        <Form.Item<FieldType>
-          label={t('chunk.question')}
-          name="question_kwd"
-          tooltip={t('chunk.questionTip')}
-        >
-          <EditTag></EditTag>
-        </Form.Item>
-        {isTagParser && (
-          <Form.Item<FieldType>
-            label={t('knowledgeConfiguration.tagName')}
-            name="tag_kwd"
-          >
-            <EditTag></EditTag>
-          </Form.Item>
-        )}
-
-        {!isTagParser && <TagFeatureItem></TagFeatureItem>}
-      </Form>
-
-      {chunkId && (
-        <section>
-          <Divider></Divider>
-          <Space size={'large'}>
-            <Switch
-              checkedChildren={t('chunk.enabled')}
-              unCheckedChildren={t('chunk.disabled')}
-              onChange={handleCheck}
-              checked={checked}
-            />
-
-            <span onClick={handleRemove}>
-              <DeleteOutlined /> {t('common.delete')}
-            </span>
-          </Space>
-        </section>
-      )}
-    </Modal>
-  );
-};
-export default ChunkCreatingModal;
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/tag-feature-item.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/tag-feature-item.tsx
deleted file mode 100644
index 64c192eb7..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-creating-modal/tag-feature-item.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import {
-  useFetchKnowledgeBaseConfiguration,
-  useFetchTagListByKnowledgeIds,
-} from '@/hooks/knowledge-hooks';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Form, InputNumber, Select } from 'antd';
-import { useCallback, useEffect, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { FormListItem } from '../../utils';
-
-const FieldKey = 'tag_feas';
-
-export const TagFeatureItem = () => {
-  const form = Form.useFormInstance();
-  const { t } = useTranslation();
-  const { data: knowledgeConfiguration } = useFetchKnowledgeBaseConfiguration();
-
-  const { setKnowledgeIds, list } = useFetchTagListByKnowledgeIds();
-
-  const tagKnowledgeIds = useMemo(() => {
-    return knowledgeConfiguration?.parser_config?.tag_kb_ids ?? [];
-  }, [knowledgeConfiguration?.parser_config?.tag_kb_ids]);
-
-  const options = useMemo(() => {
-    return list.map((x) => ({
-      value: x[0],
-      label: x[0],
-    }));
-  }, [list]);
-
-  const filterOptions = useCallback(
-    (index: number) => {
-      const tags: FormListItem[] = form.getFieldValue(FieldKey) ?? [];
-
-      // Exclude it's own current data
-      const list = tags
-        .filter((x, idx) => x && index !== idx)
-        .map((x) => x.tag);
-
-      // Exclude the selected data from other options from one's own options.
-      return options.filter((x) => !list.some((y) => x.value === y));
-    },
-    [form, options],
-  );
-
-  useEffect(() => {
-    setKnowledgeIds(tagKnowledgeIds);
-  }, [setKnowledgeIds, tagKnowledgeIds]);
-
-  return (
-    <Form.Item label={t('knowledgeConfiguration.tags')}>
-      <Form.List name={FieldKey} initialValue={[]}>
-        {(fields, { add, remove }) => (
-          <>
-            {fields.map(({ key, name, ...restField }) => (
-              <div key={key} className="flex gap-3 items-center">
-                <div className="flex flex-1  gap-8">
-                  <Form.Item
-                    {...restField}
-                    name={[name, 'tag']}
-                    rules={[
-                      { required: true, message: t('common.pleaseSelect') },
-                    ]}
-                    className="w-2/3"
-                  >
-                    <Select
-                      showSearch
-                      placeholder={t('knowledgeConfiguration.tagName')}
-                      options={filterOptions(name)}
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    {...restField}
-                    name={[name, 'frequency']}
-                    rules={[
-                      { required: true, message: t('common.pleaseInput') },
-                    ]}
-                  >
-                    <InputNumber
-                      placeholder={t('knowledgeConfiguration.frequency')}
-                      max={10}
-                      min={0}
-                    />
-                  </Form.Item>
-                </div>
-                <MinusCircleOutlined
-                  onClick={() => remove(name)}
-                  className="mb-6"
-                />
-              </div>
-            ))}
-            <Form.Item>
-              <Button
-                type="dashed"
-                onClick={() => add()}
-                block
-                icon={<PlusOutlined />}
-              >
-                {t('knowledgeConfiguration.addTag')}
-              </Button>
-            </Form.Item>
-          </>
-        )}
-      </Form.List>
-    </Form.Item>
-  );
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx
deleted file mode 100644
index 6a513ba78..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import { ReactComponent as FilterIcon } from '@/assets/filter.svg';
-import { KnowledgeRouteKey } from '@/constants/knowledge';
-import { IChunkListResult, useSelectChunkList } from '@/hooks/chunk-hooks';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useKnowledgeBaseId } from '@/hooks/knowledge-hooks';
-import {
-  ArrowLeftOutlined,
-  CheckCircleOutlined,
-  CloseCircleOutlined,
-  DeleteOutlined,
-  DownOutlined,
-  FilePdfOutlined,
-  PlusOutlined,
-  SearchOutlined,
-} from '@ant-design/icons';
-import {
-  Button,
-  Checkbox,
-  Flex,
-  Input,
-  Menu,
-  MenuProps,
-  Popover,
-  Radio,
-  RadioChangeEvent,
-  Segmented,
-  SegmentedProps,
-  Space,
-  Typography,
-} from 'antd';
-import { useCallback, useMemo, useState } from 'react';
-import { Link } from 'umi';
-import { ChunkTextMode } from '../../constant';
-
-const { Text } = Typography;
-
-interface IProps
-  extends Pick<
-    IChunkListResult,
-    'searchString' | 'handleInputChange' | 'available' | 'handleSetAvailable'
-  > {
-  checked: boolean;
-  selectAllChunk: (checked: boolean) => void;
-  createChunk: () => void;
-  removeChunk: () => void;
-  switchChunk: (available: number) => void;
-  changeChunkTextMode(mode: ChunkTextMode): void;
-}
-
-const ChunkToolBar = ({
-  selectAllChunk,
-  checked,
-  createChunk,
-  removeChunk,
-  switchChunk,
-  changeChunkTextMode,
-  available,
-  handleSetAvailable,
-  searchString,
-  handleInputChange,
-}: IProps) => {
-  const data = useSelectChunkList();
-  const documentInfo = data?.documentInfo;
-  const knowledgeBaseId = useKnowledgeBaseId();
-  const [isShowSearchBox, setIsShowSearchBox] = useState(false);
-  const { t } = useTranslate('chunk');
-
-  const handleSelectAllCheck = useCallback(
-    (e: any) => {
-      selectAllChunk(e.target.checked);
-    },
-    [selectAllChunk],
-  );
-
-  const handleSearchIconClick = () => {
-    setIsShowSearchBox(true);
-  };
-
-  const handleSearchBlur = () => {
-    if (!searchString?.trim()) {
-      setIsShowSearchBox(false);
-    }
-  };
-
-  const handleDelete = useCallback(() => {
-    removeChunk();
-  }, [removeChunk]);
-
-  const handleEnabledClick = useCallback(() => {
-    switchChunk(1);
-  }, [switchChunk]);
-
-  const handleDisabledClick = useCallback(() => {
-    switchChunk(0);
-  }, [switchChunk]);
-
-  const items: MenuProps['items'] = useMemo(() => {
-    return [
-      {
-        key: '1',
-        label: (
-          <>
-            <Checkbox onChange={handleSelectAllCheck} checked={checked}>
-              <b>{t('selectAll')}</b>
-            </Checkbox>
-          </>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '2',
-        label: (
-          <Space onClick={handleEnabledClick}>
-            <CheckCircleOutlined />
-            <b>{t('enabledSelected')}</b>
-          </Space>
-        ),
-      },
-      {
-        key: '3',
-        label: (
-          <Space onClick={handleDisabledClick}>
-            <CloseCircleOutlined />
-            <b>{t('disabledSelected')}</b>
-          </Space>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '4',
-        label: (
-          <Space onClick={handleDelete}>
-            <DeleteOutlined />
-            <b>{t('deleteSelected')}</b>
-          </Space>
-        ),
-      },
-    ];
-  }, [
-    checked,
-    handleSelectAllCheck,
-    handleDelete,
-    handleEnabledClick,
-    handleDisabledClick,
-    t,
-  ]);
-
-  const content = (
-    <Menu style={{ width: 200 }} items={items} selectable={false} />
-  );
-
-  const handleFilterChange = (e: RadioChangeEvent) => {
-    selectAllChunk(false);
-    handleSetAvailable(e.target.value);
-  };
-
-  const filterContent = (
-    <Radio.Group onChange={handleFilterChange} value={available}>
-      <Space direction="vertical">
-        <Radio value={undefined}>{t('all')}</Radio>
-        <Radio value={1}>{t('enabled')}</Radio>
-        <Radio value={0}>{t('disabled')}</Radio>
-      </Space>
-    </Radio.Group>
-  );
-
-  return (
-    <Flex justify="space-between" align="center">
-      <Space size={'middle'}>
-        <Link
-          to={`/knowledge/${KnowledgeRouteKey.Dataset}?id=${knowledgeBaseId}`}
-        >
-          <ArrowLeftOutlined />
-        </Link>
-        <FilePdfOutlined />
-        <Text ellipsis={{ tooltip: documentInfo?.name }} style={{ width: 150 }}>
-          {documentInfo?.name}
-        </Text>
-      </Space>
-      <Space>
-        <Segmented
-          options={[
-            { label: t(ChunkTextMode.Full), value: ChunkTextMode.Full },
-            { label: t(ChunkTextMode.Ellipse), value: ChunkTextMode.Ellipse },
-          ]}
-          onChange={changeChunkTextMode as SegmentedProps['onChange']}
-        />
-        <Popover content={content} placement="bottom" arrow={false}>
-          <Button>
-            {t('bulk')}
-            <DownOutlined />
-          </Button>
-        </Popover>
-        {isShowSearchBox ? (
-          <Input
-            size="middle"
-            placeholder={t('search')}
-            prefix={<SearchOutlined />}
-            allowClear
-            onChange={handleInputChange}
-            onBlur={handleSearchBlur}
-            value={searchString}
-          />
-        ) : (
-          <Button icon={<SearchOutlined />} onClick={handleSearchIconClick} />
-        )}
-
-        <Popover content={filterContent} placement="bottom" arrow={false}>
-          <Button icon={<FilterIcon />} />
-        </Popover>
-        <Button
-          icon={<PlusOutlined />}
-          type="primary"
-          onClick={() => createChunk()}
-        />
-      </Space>
-    </Flex>
-  );
-};
-
-export default ChunkToolBar;
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/hooks.ts
deleted file mode 100644
index fcf6a01ba..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/hooks.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useGetKnowledgeSearchParams } from '@/hooks/route-hook';
-import { api_host } from '@/utils/api';
-import { useSize } from 'ahooks';
-import { CustomTextRenderer } from 'node_modules/react-pdf/dist/esm/shared/types';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-
-export const useDocumentResizeObserver = () => {
-  const [containerWidth, setContainerWidth] = useState<number>();
-  const [containerRef, setContainerRef] = useState<HTMLElement | null>(null);
-  const size = useSize(containerRef);
-
-  const onResize = useCallback((width?: number) => {
-    if (width) {
-      setContainerWidth(width);
-    }
-  }, []);
-
-  useEffect(() => {
-    onResize(size?.width);
-  }, [size?.width, onResize]);
-
-  return { containerWidth, setContainerRef };
-};
-
-function highlightPattern(text: string, pattern: string, pageNumber: number) {
-  if (pageNumber === 2) {
-    return `<mark>${text}</mark>`;
-  }
-  if (text.trim() !== '' && pattern.match(text)) {
-    // return pattern.replace(text, (value) => `<mark>${value}</mark>`);
-    return `<mark>${text}</mark>`;
-  }
-  return text.replace(pattern, (value) => `<mark>${value}</mark>`);
-}
-
-export const useHighlightText = (searchText: string = '') => {
-  const textRenderer: CustomTextRenderer = useCallback(
-    (textItem) => {
-      return highlightPattern(textItem.str, searchText, textItem.pageNumber);
-    },
-    [searchText],
-  );
-
-  return textRenderer;
-};
-
-export const useGetDocumentUrl = () => {
-  const { documentId } = useGetKnowledgeSearchParams();
-
-  const url = useMemo(() => {
-    return `${api_host}/document/get/${documentId}`;
-  }, [documentId]);
-
-  return url;
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/index.less b/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/index.less
deleted file mode 100644
index 11283f2c7..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/index.less
+++ /dev/null
@@ -1,12 +0,0 @@
-.documentContainer {
-  width: 100%;
-  height: calc(100vh - 284px);
-  position: relative;
-  :global(.PdfHighlighter) {
-    overflow-x: hidden;
-  }
-  :global(.Highlight--scrolledTo .Highlight__part) {
-    overflow-x: hidden;
-    background-color: rgba(255, 226, 143, 1);
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
deleted file mode 100644
index 6bce02396..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Skeleton } from 'antd';
-import { memo, useEffect, useRef } from 'react';
-import {
-  AreaHighlight,
-  Highlight,
-  IHighlight,
-  PdfHighlighter,
-  PdfLoader,
-  Popup,
-} from 'react-pdf-highlighter';
-import { useGetDocumentUrl } from './hooks';
-
-import { useCatchDocumentError } from '@/components/pdf-previewer/hooks';
-import FileError from '@/pages/document-viewer/file-error';
-import styles from './index.less';
-
-interface IProps {
-  highlights: IHighlight[];
-  setWidthAndHeight: (width: number, height: number) => void;
-}
-const HighlightPopup = ({
-  comment,
-}: {
-  comment: { text: string; emoji: string };
-}) =>
-  comment.text ? (
-    <div className="Highlight__popup">
-      {comment.emoji} {comment.text}
-    </div>
-  ) : null;
-
-// TODO: merge with DocumentPreviewer
-const Preview = ({ highlights: state, setWidthAndHeight }: IProps) => {
-  const url = useGetDocumentUrl();
-
-  const ref = useRef<(highlight: IHighlight) => void>(() => {});
-  const error = useCatchDocumentError(url);
-
-  const resetHash = () => {};
-
-  useEffect(() => {
-    if (state.length > 0) {
-      ref?.current(state[0]);
-    }
-  }, [state]);
-
-  return (
-    <div className={styles.documentContainer}>
-      <PdfLoader
-        url={url}
-        beforeLoad={<Skeleton active />}
-        workerSrc="/pdfjs-dist/pdf.worker.min.js"
-        errorMessage={<FileError>{error}</FileError>}
-      >
-        {(pdfDocument) => {
-          pdfDocument.getPage(1).then((page) => {
-            const viewport = page.getViewport({ scale: 1 });
-            const width = viewport.width;
-            const height = viewport.height;
-            setWidthAndHeight(width, height);
-          });
-
-          return (
-            <PdfHighlighter
-              pdfDocument={pdfDocument}
-              enableAreaSelection={(event) => event.altKey}
-              onScrollChange={resetHash}
-              scrollRef={(scrollTo) => {
-                ref.current = scrollTo;
-              }}
-              onSelectionFinished={() => null}
-              highlightTransform={(
-                highlight,
-                index,
-                setTip,
-                hideTip,
-                viewportToScaled,
-                screenshot,
-                isScrolledTo,
-              ) => {
-                const isTextHighlight = !Boolean(
-                  highlight.content && highlight.content.image,
-                );
-
-                const component = isTextHighlight ? (
-                  <Highlight
-                    isScrolledTo={isScrolledTo}
-                    position={highlight.position}
-                    comment={highlight.comment}
-                  />
-                ) : (
-                  <AreaHighlight
-                    isScrolledTo={isScrolledTo}
-                    highlight={highlight}
-                    onChange={() => {}}
-                  />
-                );
-
-                return (
-                  <Popup
-                    popupContent={<HighlightPopup {...highlight} />}
-                    onMouseOver={(popupContent) =>
-                      setTip(highlight, () => popupContent)
-                    }
-                    onMouseOut={hideTip}
-                    key={index}
-                  >
-                    {component}
-                  </Popup>
-                );
-              }}
-              highlights={state}
-            />
-          );
-        }}
-      </PdfLoader>
-    </div>
-  );
-};
-
-export default memo(Preview);
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/constant.ts b/web/src/pages/add-knowledge/components/knowledge-chunk/constant.ts
deleted file mode 100644
index 2093acb8d..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/constant.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum ChunkTextMode {
-  Full = 'full',
-  Ellipse = 'ellipse',
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-chunk/hooks.ts
deleted file mode 100644
index cb546b226..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/hooks.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import {
-  useCreateChunk,
-  useDeleteChunk,
-  useSelectChunkList,
-} from '@/hooks/chunk-hooks';
-import { useSetModalState, useShowDeleteConfirm } from '@/hooks/common-hooks';
-import { useGetKnowledgeSearchParams } from '@/hooks/route-hook';
-import { IChunk } from '@/interfaces/database/knowledge';
-import { buildChunkHighlights } from '@/utils/document-util';
-import { useCallback, useMemo, useState } from 'react';
-import { IHighlight } from 'react-pdf-highlighter';
-import { ChunkTextMode } from './constant';
-
-export const useHandleChunkCardClick = () => {
-  const [selectedChunkId, setSelectedChunkId] = useState<string>('');
-
-  const handleChunkCardClick = useCallback((chunkId: string) => {
-    setSelectedChunkId(chunkId);
-  }, []);
-
-  return { handleChunkCardClick, selectedChunkId };
-};
-
-export const useGetSelectedChunk = (selectedChunkId: string) => {
-  const data = useSelectChunkList();
-  return (
-    data?.data?.find((x) => x.chunk_id === selectedChunkId) ?? ({} as IChunk)
-  );
-};
-
-export const useGetChunkHighlights = (selectedChunkId: string) => {
-  const [size, setSize] = useState({ width: 849, height: 1200 });
-  const selectedChunk: IChunk = useGetSelectedChunk(selectedChunkId);
-
-  const highlights: IHighlight[] = useMemo(() => {
-    return buildChunkHighlights(selectedChunk, size);
-  }, [selectedChunk, size]);
-
-  const setWidthAndHeight = useCallback((width: number, height: number) => {
-    setSize((pre) => {
-      if (pre.height !== height || pre.width !== width) {
-        return { height, width };
-      }
-      return pre;
-    });
-  }, []);
-
-  return { highlights, setWidthAndHeight };
-};
-
-// Switch chunk text to be fully displayed or ellipse
-export const useChangeChunkTextMode = () => {
-  const [textMode, setTextMode] = useState<ChunkTextMode>(ChunkTextMode.Full);
-
-  const changeChunkTextMode = useCallback((mode: ChunkTextMode) => {
-    setTextMode(mode);
-  }, []);
-
-  return { textMode, changeChunkTextMode };
-};
-
-export const useDeleteChunkByIds = (): {
-  removeChunk: (chunkIds: string[], documentId: string) => Promise<number>;
-} => {
-  const { deleteChunk } = useDeleteChunk();
-  const showDeleteConfirm = useShowDeleteConfirm();
-
-  const removeChunk = useCallback(
-    (chunkIds: string[], documentId: string) => () => {
-      return deleteChunk({ chunkIds, doc_id: documentId });
-    },
-    [deleteChunk],
-  );
-
-  const onRemoveChunk = useCallback(
-    (chunkIds: string[], documentId: string): Promise<number> => {
-      return showDeleteConfirm({ onOk: removeChunk(chunkIds, documentId) });
-    },
-    [removeChunk, showDeleteConfirm],
-  );
-
-  return {
-    removeChunk: onRemoveChunk,
-  };
-};
-
-export const useUpdateChunk = () => {
-  const [chunkId, setChunkId] = useState<string | undefined>('');
-  const {
-    visible: chunkUpdatingVisible,
-    hideModal: hideChunkUpdatingModal,
-    showModal,
-  } = useSetModalState();
-  const { createChunk, loading } = useCreateChunk();
-  const { documentId } = useGetKnowledgeSearchParams();
-
-  const onChunkUpdatingOk = useCallback(
-    async (params: IChunk) => {
-      const code = await createChunk({
-        ...params,
-        doc_id: documentId,
-        chunk_id: chunkId,
-      });
-
-      if (code === 0) {
-        hideChunkUpdatingModal();
-      }
-    },
-    [createChunk, hideChunkUpdatingModal, chunkId, documentId],
-  );
-
-  const handleShowChunkUpdatingModal = useCallback(
-    async (id?: string) => {
-      setChunkId(id);
-      showModal();
-    },
-    [showModal],
-  );
-
-  return {
-    chunkUpdatingLoading: loading,
-    onChunkUpdatingOk,
-    chunkUpdatingVisible,
-    hideChunkUpdatingModal,
-    showChunkUpdatingModal: handleShowChunkUpdatingModal,
-    chunkId,
-    documentId,
-  };
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/index.less b/web/src/pages/add-knowledge/components/knowledge-chunk/index.less
deleted file mode 100644
index a41a35a81..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/index.less
+++ /dev/null
@@ -1,92 +0,0 @@
-.chunkPage {
-  padding: 24px;
-
-  display: flex;
-  // height: calc(100vh - 112px);
-  flex-direction: column;
-
-  .filter {
-    margin: 10px 0;
-    display: flex;
-    height: 32px;
-    justify-content: space-between;
-  }
-
-  .pagePdfWrapper {
-    width: 60%;
-  }
-
-  .pageWrapper {
-    width: 100%;
-  }
-
-  .pageContent {
-    flex: 1;
-    width: 100%;
-    padding-right: 12px;
-    overflow-y: auto;
-
-    .spin {
-      min-height: 400px;
-    }
-  }
-
-  .documentPreview {
-    width: 40%;
-    height: 100%;
-  }
-
-  .chunkContainer {
-    display: flex;
-    height: calc(100vh - 332px);
-  }
-
-  .chunkOtherContainer {
-    width: 100%;
-  }
-
-  .pageFooter {
-    padding-top: 10px;
-    height: 32px;
-  }
-}
-
-.container {
-  height: 100px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-
-  .content {
-    display: flex;
-    justify-content: space-between;
-
-    .context {
-      flex: 1;
-      // width: 207px;
-      height: 88px;
-      overflow: hidden;
-    }
-  }
-
-  .footer {
-    height: 20px;
-
-    .text {
-      margin-left: 10px;
-    }
-  }
-}
-
-.card {
-  :global {
-    .ant-card-body {
-      padding: 10px;
-      margin: 0;
-    }
-
-    margin-bottom: 10px;
-  }
-
-  cursor: pointer;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/index.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/index.tsx
deleted file mode 100644
index 6bce60142..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/index.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { useFetchNextChunkList, useSwitchChunk } from '@/hooks/chunk-hooks';
-import type { PaginationProps } from 'antd';
-import { Divider, Flex, Pagination, Space, Spin, message } from 'antd';
-import classNames from 'classnames';
-import { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import ChunkCard from './components/chunk-card';
-import CreatingModal from './components/chunk-creating-modal';
-import ChunkToolBar from './components/chunk-toolbar';
-import DocumentPreview from './components/document-preview/preview';
-import {
-  useChangeChunkTextMode,
-  useDeleteChunkByIds,
-  useGetChunkHighlights,
-  useHandleChunkCardClick,
-  useUpdateChunk,
-} from './hooks';
-
-import styles from './index.less';
-
-const Chunk = () => {
-  const [selectedChunkIds, setSelectedChunkIds] = useState<string[]>([]);
-  const { removeChunk } = useDeleteChunkByIds();
-  const {
-    data: { documentInfo, data = [], total },
-    pagination,
-    loading,
-    searchString,
-    handleInputChange,
-    available,
-    handleSetAvailable,
-  } = useFetchNextChunkList();
-  const { handleChunkCardClick, selectedChunkId } = useHandleChunkCardClick();
-  const isPdf = documentInfo?.type === 'pdf';
-
-  const { t } = useTranslation();
-  const { changeChunkTextMode, textMode } = useChangeChunkTextMode();
-  const { switchChunk } = useSwitchChunk();
-  const {
-    chunkUpdatingLoading,
-    onChunkUpdatingOk,
-    showChunkUpdatingModal,
-    hideChunkUpdatingModal,
-    chunkId,
-    chunkUpdatingVisible,
-    documentId,
-  } = useUpdateChunk();
-
-  const onPaginationChange: PaginationProps['onShowSizeChange'] = (
-    page,
-    size,
-  ) => {
-    setSelectedChunkIds([]);
-    pagination.onChange?.(page, size);
-  };
-
-  const selectAllChunk = useCallback(
-    (checked: boolean) => {
-      setSelectedChunkIds(checked ? data.map((x) => x.chunk_id) : []);
-    },
-    [data],
-  );
-
-  const handleSingleCheckboxClick = useCallback(
-    (chunkId: string, checked: boolean) => {
-      setSelectedChunkIds((previousIds) => {
-        const idx = previousIds.findIndex((x) => x === chunkId);
-        const nextIds = [...previousIds];
-        if (checked && idx === -1) {
-          nextIds.push(chunkId);
-        } else if (!checked && idx !== -1) {
-          nextIds.splice(idx, 1);
-        }
-        return nextIds;
-      });
-    },
-    [],
-  );
-
-  const showSelectedChunkWarning = useCallback(() => {
-    message.warning(t('message.pleaseSelectChunk'));
-  }, [t]);
-
-  const handleRemoveChunk = useCallback(async () => {
-    if (selectedChunkIds.length > 0) {
-      const resCode: number = await removeChunk(selectedChunkIds, documentId);
-      if (resCode === 0) {
-        setSelectedChunkIds([]);
-      }
-    } else {
-      showSelectedChunkWarning();
-    }
-  }, [selectedChunkIds, documentId, removeChunk, showSelectedChunkWarning]);
-
-  const handleSwitchChunk = useCallback(
-    async (available?: number, chunkIds?: string[]) => {
-      let ids = chunkIds;
-      if (!chunkIds) {
-        ids = selectedChunkIds;
-        if (selectedChunkIds.length === 0) {
-          showSelectedChunkWarning();
-          return;
-        }
-      }
-
-      const resCode: number = await switchChunk({
-        chunk_ids: ids,
-        available_int: available,
-        doc_id: documentId,
-      });
-      if (!chunkIds && resCode === 0) {
-      }
-    },
-    [switchChunk, documentId, selectedChunkIds, showSelectedChunkWarning],
-  );
-
-  const { highlights, setWidthAndHeight } =
-    useGetChunkHighlights(selectedChunkId);
-
-  return (
-    <>
-      <div className={styles.chunkPage}>
-        <ChunkToolBar
-          selectAllChunk={selectAllChunk}
-          createChunk={showChunkUpdatingModal}
-          removeChunk={handleRemoveChunk}
-          checked={selectedChunkIds.length === data.length}
-          switchChunk={handleSwitchChunk}
-          changeChunkTextMode={changeChunkTextMode}
-          searchString={searchString}
-          handleInputChange={handleInputChange}
-          available={available}
-          handleSetAvailable={handleSetAvailable}
-        ></ChunkToolBar>
-        <Divider></Divider>
-        <Flex flex={1} gap={'middle'}>
-          <Flex
-            vertical
-            className={isPdf ? styles.pagePdfWrapper : styles.pageWrapper}
-          >
-            <Spin spinning={loading} className={styles.spin} size="large">
-              <div className={styles.pageContent}>
-                <Space
-                  direction="vertical"
-                  size={'middle'}
-                  className={classNames(styles.chunkContainer, {
-                    [styles.chunkOtherContainer]: !isPdf,
-                  })}
-                >
-                  {data.map((item) => (
-                    <ChunkCard
-                      item={item}
-                      key={item.chunk_id}
-                      editChunk={showChunkUpdatingModal}
-                      checked={selectedChunkIds.some(
-                        (x) => x === item.chunk_id,
-                      )}
-                      handleCheckboxClick={handleSingleCheckboxClick}
-                      switchChunk={handleSwitchChunk}
-                      clickChunkCard={handleChunkCardClick}
-                      selected={item.chunk_id === selectedChunkId}
-                      textMode={textMode}
-                    ></ChunkCard>
-                  ))}
-                </Space>
-              </div>
-            </Spin>
-            <div className={styles.pageFooter}>
-              <Pagination
-                {...pagination}
-                total={total}
-                size={'small'}
-                onChange={onPaginationChange}
-              />
-            </div>
-          </Flex>
-          {isPdf && (
-            <section className={styles.documentPreview}>
-              <DocumentPreview
-                highlights={highlights}
-                setWidthAndHeight={setWidthAndHeight}
-              ></DocumentPreview>
-            </section>
-          )}
-        </Flex>
-      </div>
-      {chunkUpdatingVisible && (
-        <CreatingModal
-          doc_id={documentId}
-          chunkId={chunkId}
-          hideModal={hideChunkUpdatingModal}
-          visible={chunkUpdatingVisible}
-          loading={chunkUpdatingLoading}
-          onOk={onChunkUpdatingOk}
-          parserId={documentInfo.parser_id}
-        />
-      )}
-    </>
-  );
-};
-
-export default Chunk;
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/utils.ts b/web/src/pages/add-knowledge/components/knowledge-chunk/utils.ts
deleted file mode 100644
index 9284828a7..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export type FormListItem = {
-  frequency: number;
-  tag: string;
-};
-
-export function transformTagFeaturesArrayToObject(
-  list: Array<FormListItem> = [],
-) {
-  return list.reduce<Record<string, number>>((pre, cur) => {
-    pre[cur.tag] = cur.frequency;
-
-    return pre;
-  }, {});
-}
-
-export function transformTagFeaturesObjectToArray(
-  object: Record<string, number> = {},
-) {
-  return Object.keys(object).reduce<Array<FormListItem>>((pre, key) => {
-    pre.push({ frequency: object[key], tag: key });
-
-    return pre;
-  }, []);
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-dataset/index.less b/web/src/pages/add-knowledge/components/knowledge-dataset/index.less
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/src/pages/add-knowledge/components/knowledge-dataset/index.tsx b/web/src/pages/add-knowledge/components/knowledge-dataset/index.tsx
deleted file mode 100644
index 15328dee4..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-dataset/index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Outlet } from 'umi';
-
-export const KnowledgeDataset = () => {
-  return <Outlet></Outlet>;
-};
-
-export default KnowledgeDataset;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/constant.ts b/web/src/pages/add-knowledge/components/knowledge-file/constant.ts
deleted file mode 100644
index 426a8ebf7..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/constant.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RunningStatus } from '@/constants/knowledge';
-
-export const RunningStatusMap = {
-  [RunningStatus.UNSTART]: {
-    label: 'UNSTART',
-    color: 'cyan',
-  },
-  [RunningStatus.RUNNING]: {
-    label: 'Parsing',
-    color: 'blue',
-  },
-  [RunningStatus.CANCEL]: { label: 'CANCEL', color: 'orange' },
-  [RunningStatus.DONE]: { label: 'SUCCESS', color: 'geekblue' },
-  [RunningStatus.FAIL]: { label: 'FAIL', color: 'red' },
-};
-
-export * from '@/constants/knowledge';
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/create-file-modal.tsx b/web/src/pages/add-knowledge/components/knowledge-file/create-file-modal.tsx
deleted file mode 100644
index 8e23d426d..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/create-file-modal.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { Form, Input, Modal } from 'antd';
-import React from 'react';
-
-type FieldType = {
-  name?: string;
-};
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  onOk: (name: string) => void;
-  showModal?(): void;
-}
-
-const FileCreatingModal: React.FC<IProps> = ({ visible, hideModal, onOk }) => {
-  const [form] = Form.useForm();
-
-  const handleOk = async () => {
-    const values = await form.validateFields();
-    onOk(values.name);
-  };
-
-  return (
-    <Modal
-      title="File Name"
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-    >
-      <Form
-        form={form}
-        name="validateOnly"
-        labelCol={{ span: 4 }}
-        wrapperCol={{ span: 20 }}
-        style={{ maxWidth: 600 }}
-        autoComplete="off"
-      >
-        <Form.Item<FieldType>
-          label="File Name"
-          name="name"
-          rules={[{ required: true, message: 'Please input name!' }]}
-        >
-          <Input />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-export default FileCreatingModal;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/document-toolbar.tsx b/web/src/pages/add-knowledge/components/knowledge-file/document-toolbar.tsx
deleted file mode 100644
index f55b0d6f1..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/document-toolbar.tsx
+++ /dev/null
@@ -1,240 +0,0 @@
-import { ReactComponent as CancelIcon } from '@/assets/svg/cancel.svg';
-import { ReactComponent as DeleteIcon } from '@/assets/svg/delete.svg';
-import { ReactComponent as DisableIcon } from '@/assets/svg/disable.svg';
-import { ReactComponent as EnableIcon } from '@/assets/svg/enable.svg';
-import { ReactComponent as RunIcon } from '@/assets/svg/run.svg';
-import { useShowDeleteConfirm, useTranslate } from '@/hooks/common-hooks';
-import {
-  useRemoveNextDocument,
-  useRunNextDocument,
-  useSetNextDocumentStatus,
-} from '@/hooks/document-hooks';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import {
-  DownOutlined,
-  FileOutlined,
-  FileTextOutlined,
-  PlusOutlined,
-  SearchOutlined,
-} from '@ant-design/icons';
-import { Button, Dropdown, Flex, Input, MenuProps, Space } from 'antd';
-import { useCallback, useMemo } from 'react';
-import { toast } from 'sonner';
-import { RunningStatus } from './constant';
-
-import styles from './index.less';
-
-interface IProps {
-  selectedRowKeys: string[];
-  showCreateModal(): void;
-  showWebCrawlModal(): void;
-  showDocumentUploadModal(): void;
-  searchString: string;
-  handleInputChange: React.ChangeEventHandler<HTMLInputElement>;
-  documents: IDocumentInfo[];
-}
-
-const DocumentToolbar = ({
-  searchString,
-  selectedRowKeys,
-  showCreateModal,
-  showDocumentUploadModal,
-  handleInputChange,
-  documents,
-}: IProps) => {
-  const { t } = useTranslate('knowledgeDetails');
-  const { removeDocument } = useRemoveNextDocument();
-  const showDeleteConfirm = useShowDeleteConfirm();
-  const { runDocumentByIds } = useRunNextDocument();
-  const { setDocumentStatus } = useSetNextDocumentStatus();
-
-  const actionItems: MenuProps['items'] = useMemo(() => {
-    return [
-      {
-        key: '1',
-        onClick: showDocumentUploadModal,
-        label: (
-          <div>
-            <Button type="link">
-              <Space>
-                <FileTextOutlined />
-                {t('localFiles')}
-              </Space>
-            </Button>
-          </div>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '3',
-        onClick: showCreateModal,
-        label: (
-          <div>
-            <Button type="link">
-              <FileOutlined />
-              {t('emptyFiles')}
-            </Button>
-          </div>
-        ),
-      },
-    ];
-  }, [showDocumentUploadModal, showCreateModal, t]);
-
-  const handleDelete = useCallback(() => {
-    const deletedKeys = selectedRowKeys.filter(
-      (x) =>
-        !documents
-          .filter((y) => y.run === RunningStatus.RUNNING)
-          .some((y) => y.id === x),
-    );
-    if (deletedKeys.length === 0) {
-      toast.error(t('theDocumentBeingParsedCannotBeDeleted'));
-      return;
-    }
-    showDeleteConfirm({
-      onOk: () => {
-        removeDocument(deletedKeys);
-      },
-    });
-  }, [selectedRowKeys, showDeleteConfirm, documents, t, removeDocument]);
-
-  const runDocument = useCallback(
-    (run: number) => {
-      runDocumentByIds({
-        documentIds: selectedRowKeys,
-        run,
-        shouldDelete: false,
-      });
-    },
-    [runDocumentByIds, selectedRowKeys],
-  );
-
-  const handleRunClick = useCallback(() => {
-    runDocument(1);
-  }, [runDocument]);
-
-  const handleCancelClick = useCallback(() => {
-    runDocument(2);
-  }, [runDocument]);
-
-  const onChangeStatus = useCallback(
-    (enabled: boolean) => {
-      selectedRowKeys.forEach((id) => {
-        setDocumentStatus({ status: enabled, documentId: id });
-      });
-    },
-    [selectedRowKeys, setDocumentStatus],
-  );
-
-  const handleEnableClick = useCallback(() => {
-    onChangeStatus(true);
-  }, [onChangeStatus]);
-
-  const handleDisableClick = useCallback(() => {
-    onChangeStatus(false);
-  }, [onChangeStatus]);
-
-  const disabled = selectedRowKeys.length === 0;
-
-  const items: MenuProps['items'] = useMemo(() => {
-    return [
-      {
-        key: '0',
-        onClick: handleEnableClick,
-        label: (
-          <Flex gap={10}>
-            <EnableIcon></EnableIcon>
-            <b>{t('enabled')}</b>
-          </Flex>
-        ),
-      },
-      {
-        key: '1',
-        onClick: handleDisableClick,
-        label: (
-          <Flex gap={10}>
-            <DisableIcon></DisableIcon>
-            <b>{t('disabled')}</b>
-          </Flex>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '2',
-        onClick: handleRunClick,
-        label: (
-          <Flex gap={10}>
-            <RunIcon></RunIcon>
-            <b>{t('run')}</b>
-          </Flex>
-        ),
-      },
-      {
-        key: '3',
-        onClick: handleCancelClick,
-        label: (
-          <Flex gap={10}>
-            <CancelIcon />
-            <b>{t('cancel')}</b>
-          </Flex>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '4',
-        onClick: handleDelete,
-        label: (
-          <Flex gap={10}>
-            <span className={styles.deleteIconWrapper}>
-              <DeleteIcon width={18} />
-            </span>
-            <b>{t('delete', { keyPrefix: 'common' })}</b>
-          </Flex>
-        ),
-      },
-    ];
-  }, [
-    handleDelete,
-    handleRunClick,
-    handleCancelClick,
-    t,
-    handleDisableClick,
-    handleEnableClick,
-  ]);
-
-  return (
-    <div className={styles.filter}>
-      <Dropdown
-        menu={{ items }}
-        placement="bottom"
-        arrow={false}
-        disabled={disabled}
-      >
-        <Button>
-          <Space>
-            <b> {t('bulk')}</b>
-            <DownOutlined />
-          </Space>
-        </Button>
-      </Dropdown>
-      <Space>
-        <Input
-          placeholder={t('searchFiles')}
-          value={searchString}
-          style={{ width: 220 }}
-          allowClear
-          onChange={handleInputChange}
-          prefix={<SearchOutlined />}
-        />
-
-        <Dropdown menu={{ items: actionItems }} trigger={['click']}>
-          <Button type="primary" icon={<PlusOutlined />}>
-            {t('addFile')}
-          </Button>
-        </Dropdown>
-      </Space>
-    </div>
-  );
-};
-
-export default DocumentToolbar;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts
deleted file mode 100644
index 49eccb7eb..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-import { useSetModalState } from '@/hooks/common-hooks';
-import {
-  useCreateNextDocument,
-  useNextWebCrawl,
-  useRunNextDocument,
-  useSaveNextDocumentName,
-  useSetDocumentMeta,
-  useSetNextDocumentParser,
-  useUploadNextDocument,
-} from '@/hooks/document-hooks';
-import { useGetKnowledgeSearchParams } from '@/hooks/route-hook';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
-import { UploadFile } from 'antd';
-import { TableRowSelection } from 'antd/es/table/interface';
-import { useCallback, useState } from 'react';
-import { useNavigate } from 'umi';
-import { KnowledgeRouteKey } from './constant';
-
-export const useNavigateToOtherPage = () => {
-  const navigate = useNavigate();
-  const { knowledgeId } = useGetKnowledgeSearchParams();
-
-  const linkToUploadPage = useCallback(() => {
-    navigate(`/knowledge/dataset/upload?id=${knowledgeId}`);
-  }, [navigate, knowledgeId]);
-
-  const toChunk = useCallback(
-    (id: string) => {
-      navigate(
-        `/knowledge/${KnowledgeRouteKey.Dataset}/chunk?id=${knowledgeId}&doc_id=${id}`,
-      );
-    },
-    [navigate, knowledgeId],
-  );
-
-  return { linkToUploadPage, toChunk };
-};
-
-export const useRenameDocument = (documentId: string) => {
-  const { saveName, loading } = useSaveNextDocumentName();
-
-  const {
-    visible: renameVisible,
-    hideModal: hideRenameModal,
-    showModal: showRenameModal,
-  } = useSetModalState();
-
-  const onRenameOk = useCallback(
-    async (name: string) => {
-      const ret = await saveName({ documentId, name });
-      if (ret === 0) {
-        hideRenameModal();
-      }
-    },
-    [hideRenameModal, saveName, documentId],
-  );
-
-  return {
-    renameLoading: loading,
-    onRenameOk,
-    renameVisible,
-    hideRenameModal,
-    showRenameModal,
-  };
-};
-
-export const useCreateEmptyDocument = () => {
-  const { createDocument, loading } = useCreateNextDocument();
-
-  const {
-    visible: createVisible,
-    hideModal: hideCreateModal,
-    showModal: showCreateModal,
-  } = useSetModalState();
-
-  const onCreateOk = useCallback(
-    async (name: string) => {
-      const ret = await createDocument(name);
-      if (ret === 0) {
-        hideCreateModal();
-      }
-    },
-    [hideCreateModal, createDocument],
-  );
-
-  return {
-    createLoading: loading,
-    onCreateOk,
-    createVisible,
-    hideCreateModal,
-    showCreateModal,
-  };
-};
-
-export const useChangeDocumentParser = (documentId: string) => {
-  const { setDocumentParser, loading } = useSetNextDocumentParser();
-
-  const {
-    visible: changeParserVisible,
-    hideModal: hideChangeParserModal,
-    showModal: showChangeParserModal,
-  } = useSetModalState();
-
-  const onChangeParserOk = useCallback(
-    async (parserId: string, parserConfig: IChangeParserConfigRequestBody) => {
-      const ret = await setDocumentParser({
-        parserId,
-        documentId,
-        parserConfig,
-      });
-      if (ret === 0) {
-        hideChangeParserModal();
-      }
-    },
-    [hideChangeParserModal, setDocumentParser, documentId],
-  );
-
-  return {
-    changeParserLoading: loading,
-    onChangeParserOk,
-    changeParserVisible,
-    hideChangeParserModal,
-    showChangeParserModal,
-  };
-};
-
-export const useGetRowSelection = () => {
-  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
-
-  const rowSelection: TableRowSelection<IDocumentInfo> = {
-    selectedRowKeys,
-    onChange: (newSelectedRowKeys: React.Key[]) => {
-      setSelectedRowKeys(newSelectedRowKeys);
-    },
-  };
-
-  return rowSelection;
-};
-
-export const useHandleUploadDocument = () => {
-  const {
-    visible: documentUploadVisible,
-    hideModal: hideDocumentUploadModal,
-    showModal: showDocumentUploadModal,
-  } = useSetModalState();
-  const [fileList, setFileList] = useState<UploadFile[]>([]);
-  const [uploadProgress, setUploadProgress] = useState<number>(0);
-  const { uploadDocument, loading } = useUploadNextDocument();
-  const { runDocumentByIds } = useRunNextDocument();
-
-  const onDocumentUploadOk = useCallback(
-    async ({
-      parseOnCreation,
-      directoryFileList,
-    }: {
-      directoryFileList: UploadFile[];
-      parseOnCreation: boolean;
-    }): Promise<number | undefined> => {
-      const processFileGroup = async (filesPart: UploadFile[]) => {
-        // set status to uploading on files
-        setFileList(
-          fileList.map((file) => {
-            if (!filesPart.includes(file)) {
-              return file;
-            }
-
-            let newFile = file;
-            newFile.status = 'uploading';
-            newFile.percent = 1;
-            return newFile;
-          }),
-        );
-
-        const ret = await uploadDocument(filesPart);
-
-        const files = ret?.data || [];
-        const successfulFilenames = files.map((file: any) => file.name);
-
-        // set status to done or error on files (based on response)
-        setFileList(
-          fileList.map((file) => {
-            if (!filesPart.includes(file)) {
-              return file;
-            }
-
-            let newFile = file;
-            newFile.status = successfulFilenames.includes(file.name)
-              ? 'done'
-              : 'error';
-            newFile.percent = 100;
-            newFile.response = ret.message;
-            return newFile;
-          }),
-        );
-
-        return {
-          code: ret?.code,
-          fileIds: files.map((file: any) => file.id),
-          totalSuccess: successfulFilenames.length,
-        };
-      };
-      const totalFiles = fileList.length;
-
-      if (directoryFileList.length > 0) {
-        const ret = await uploadDocument(directoryFileList);
-        if (ret?.code === 0) {
-          hideDocumentUploadModal();
-        }
-        if (totalFiles === 0) {
-          return 0;
-        }
-      }
-
-      if (totalFiles === 0) {
-        console.log('No files to upload');
-        hideDocumentUploadModal();
-        return 0;
-      }
-
-      let totalSuccess = 0;
-      let codes = [];
-      let toRunFileIds: any[] = [];
-      for (let i = 0; i < totalFiles; i += 10) {
-        setUploadProgress(Math.floor((i / totalFiles) * 100));
-        const files = fileList.slice(i, i + 10);
-        const {
-          code,
-          totalSuccess: count,
-          fileIds,
-        } = await processFileGroup(files);
-        codes.push(code);
-        totalSuccess += count;
-        toRunFileIds = toRunFileIds.concat(fileIds);
-      }
-
-      const allSuccess = codes.every((code) => code === 0);
-      const any500 = codes.some((code) => code === 500);
-
-      let code = 500;
-      if (allSuccess || (any500 && totalSuccess === totalFiles)) {
-        code = 0;
-        hideDocumentUploadModal();
-      }
-
-      if (parseOnCreation) {
-        await runDocumentByIds({
-          documentIds: toRunFileIds,
-          run: 1,
-          shouldDelete: false,
-        });
-      }
-
-      setUploadProgress(100);
-
-      return code;
-    },
-    [fileList, uploadDocument, hideDocumentUploadModal, runDocumentByIds],
-  );
-
-  return {
-    documentUploadLoading: loading,
-    onDocumentUploadOk,
-    documentUploadVisible,
-    hideDocumentUploadModal,
-    showDocumentUploadModal,
-    uploadFileList: fileList,
-    setUploadFileList: setFileList,
-    uploadProgress,
-    setUploadProgress,
-  };
-};
-
-export const useHandleWebCrawl = () => {
-  const {
-    visible: webCrawlUploadVisible,
-    hideModal: hideWebCrawlUploadModal,
-    showModal: showWebCrawlUploadModal,
-  } = useSetModalState();
-  const { webCrawl, loading } = useNextWebCrawl();
-
-  const onWebCrawlUploadOk = useCallback(
-    async (name: string, url: string) => {
-      const ret = await webCrawl({ name, url });
-      if (ret === 0) {
-        hideWebCrawlUploadModal();
-        return 0;
-      }
-      return -1;
-    },
-    [webCrawl, hideWebCrawlUploadModal],
-  );
-
-  return {
-    webCrawlUploadLoading: loading,
-    onWebCrawlUploadOk,
-    webCrawlUploadVisible,
-    hideWebCrawlUploadModal,
-    showWebCrawlUploadModal,
-  };
-};
-
-export const useHandleRunDocumentByIds = (id: string) => {
-  const { runDocumentByIds, loading } = useRunNextDocument();
-  const [currentId, setCurrentId] = useState<string>('');
-  const isLoading = loading && currentId !== '' && currentId === id;
-
-  const handleRunDocumentByIds = async (
-    documentId: string,
-    isRunning: boolean,
-    shouldDelete: boolean = false,
-  ) => {
-    if (isLoading) {
-      return;
-    }
-    setCurrentId(documentId);
-    try {
-      await runDocumentByIds({
-        documentIds: [documentId],
-        run: isRunning ? 2 : 1,
-        shouldDelete,
-      });
-      setCurrentId('');
-    } catch (error) {
-      setCurrentId('');
-    }
-  };
-
-  return {
-    handleRunDocumentByIds,
-    loading: isLoading,
-  };
-};
-
-export const useShowMetaModal = (documentId: string) => {
-  const { setDocumentMeta, loading } = useSetDocumentMeta();
-
-  const {
-    visible: setMetaVisible,
-    hideModal: hideSetMetaModal,
-    showModal: showSetMetaModal,
-  } = useSetModalState();
-
-  const onSetMetaModalOk = useCallback(
-    async (meta: string) => {
-      const ret = await setDocumentMeta({
-        documentId,
-        meta,
-      });
-      if (ret === 0) {
-        hideSetMetaModal();
-      }
-    },
-    [setDocumentMeta, documentId, hideSetMetaModal],
-  );
-
-  return {
-    setMetaLoading: loading,
-    onSetMetaModalOk,
-    setMetaVisible,
-    hideSetMetaModal,
-    showSetMetaModal,
-  };
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/index.less b/web/src/pages/add-knowledge/components/knowledge-file/index.less
deleted file mode 100644
index 6962a8929..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/index.less
+++ /dev/null
@@ -1,54 +0,0 @@
-.datasetWrapper {
-  padding: 30px 30px 0;
-  height: 100%;
-}
-
-.documentTable {
-  tbody {
-    // height: calc(100vh - 508px);
-  }
-}
-
-.filter {
-  height: 32px;
-  display: flex;
-  margin: 10px 0;
-  justify-content: space-between;
-  padding: 24px 0;
-  align-items: center;
-}
-
-.deleteIconWrapper {
-  width: 22px;
-  text-align: center;
-}
-
-.img {
-  height: 24px;
-  width: 24px;
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.column {
-  min-width: 200px;
-}
-
-.toChunks {
-  cursor: pointer;
-}
-
-.pageInputNumber {
-  width: 220px;
-}
-
-.questionIcon {
-  margin-inline-start: 4px;
-  color: rgba(0, 0, 0, 0.45);
-  cursor: help;
-  writing-mode: horizontal-tb;
-}
-
-.nameText {
-  color: #1677ff;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx
deleted file mode 100644
index 2787ce476..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import ChunkMethodModal from '@/components/chunk-method-modal';
-import SvgIcon from '@/components/svg-icon';
-import {
-  useFetchNextDocumentList,
-  useSetNextDocumentStatus,
-} from '@/hooks/document-hooks';
-import { useSetSelectedRecord } from '@/hooks/logic-hooks';
-import { useSelectParserList } from '@/hooks/user-setting-hooks';
-import { getExtension } from '@/utils/document-util';
-import { Divider, Flex, Switch, Table, Tooltip, Typography } from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import { useTranslation } from 'react-i18next';
-import CreateFileModal from './create-file-modal';
-import DocumentToolbar from './document-toolbar';
-import {
-  useChangeDocumentParser,
-  useCreateEmptyDocument,
-  useGetRowSelection,
-  useHandleUploadDocument,
-  useHandleWebCrawl,
-  useNavigateToOtherPage,
-  useRenameDocument,
-  useShowMetaModal,
-} from './hooks';
-import ParsingActionCell from './parsing-action-cell';
-import ParsingStatusCell from './parsing-status-cell';
-import RenameModal from './rename-modal';
-import WebCrawlModal from './web-crawl-modal';
-
-import FileUploadModal from '@/components/file-upload-modal';
-import { RunningStatus } from '@/constants/knowledge';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import { formatDate } from '@/utils/date';
-import { CircleHelp } from 'lucide-react';
-import styles from './index.less';
-import { SetMetaModal } from './set-meta-modal';
-
-const { Text } = Typography;
-
-const KnowledgeFile = () => {
-  const { searchString, documents, pagination, handleInputChange } =
-    useFetchNextDocumentList();
-  const parserList = useSelectParserList();
-  const { setDocumentStatus } = useSetNextDocumentStatus();
-  const { toChunk } = useNavigateToOtherPage();
-  const { currentRecord, setRecord } = useSetSelectedRecord<IDocumentInfo>();
-  const {
-    renameLoading,
-    onRenameOk,
-    renameVisible,
-    hideRenameModal,
-    showRenameModal,
-  } = useRenameDocument(currentRecord.id);
-  const {
-    createLoading,
-    onCreateOk,
-    createVisible,
-    hideCreateModal,
-    showCreateModal,
-  } = useCreateEmptyDocument();
-  const {
-    changeParserLoading,
-    onChangeParserOk,
-    changeParserVisible,
-    hideChangeParserModal,
-    showChangeParserModal,
-  } = useChangeDocumentParser(currentRecord.id);
-  const {
-    documentUploadVisible,
-    hideDocumentUploadModal,
-    showDocumentUploadModal,
-    onDocumentUploadOk,
-    documentUploadLoading,
-    uploadFileList,
-    setUploadFileList,
-    uploadProgress,
-    setUploadProgress,
-  } = useHandleUploadDocument();
-  const {
-    webCrawlUploadVisible,
-    hideWebCrawlUploadModal,
-    showWebCrawlUploadModal,
-    onWebCrawlUploadOk,
-    webCrawlUploadLoading,
-  } = useHandleWebCrawl();
-  const { t } = useTranslation('translation', {
-    keyPrefix: 'knowledgeDetails',
-  });
-
-  const {
-    showSetMetaModal,
-    hideSetMetaModal,
-    setMetaVisible,
-    setMetaLoading,
-    onSetMetaModalOk,
-  } = useShowMetaModal(currentRecord.id);
-
-  const rowSelection = useGetRowSelection();
-
-  const columns: ColumnsType<IDocumentInfo> = [
-    {
-      title: t('name'),
-      dataIndex: 'name',
-      key: 'name',
-      fixed: 'left',
-      render: (text: any, { id, thumbnail, name }) => (
-        <div className={styles.toChunks} onClick={() => toChunk(id)}>
-          <Flex gap={10} align="center">
-            {thumbnail ? (
-              <img className={styles.img} src={thumbnail} alt="" />
-            ) : (
-              <SvgIcon
-                name={`file-icon/${getExtension(name)}`}
-                width={24}
-              ></SvgIcon>
-            )}
-            <Text ellipsis={{ tooltip: text }} className={styles.nameText}>
-              {text}
-            </Text>
-          </Flex>
-        </div>
-      ),
-    },
-    {
-      title: t('chunkNumber'),
-      dataIndex: 'chunk_num',
-      key: 'chunk_num',
-    },
-    {
-      title: t('uploadDate'),
-      dataIndex: 'create_time',
-      key: 'create_time',
-      render(value) {
-        return formatDate(value);
-      },
-    },
-    {
-      title: t('chunkMethod'),
-      dataIndex: 'parser_id',
-      key: 'parser_id',
-      render: (text) => {
-        return parserList.find((x) => x.value === text)?.label;
-      },
-    },
-    {
-      title: t('enabled'),
-      key: 'status',
-      dataIndex: 'status',
-      render: (_, { status, id }) => (
-        <>
-          <Switch
-            checked={status === '1'}
-            onChange={(e) => {
-              setDocumentStatus({ status: e, documentId: id });
-            }}
-          />
-        </>
-      ),
-    },
-    {
-      title: (
-        <span className="flex items-center gap-2">
-          {t('parsingStatus')}
-          <Tooltip title={t('parsingStatusTip')}>
-            <CircleHelp className="size-3" />
-          </Tooltip>
-        </span>
-      ),
-      dataIndex: 'run',
-      key: 'run',
-      filters: Object.values(RunningStatus).map((value) => ({
-        text: t(`runningStatus${value}`),
-        value: value,
-      })),
-      onFilter: (value, record: IDocumentInfo) => record.run === value,
-      render: (text, record) => {
-        return <ParsingStatusCell record={record}></ParsingStatusCell>;
-      },
-    },
-    {
-      title: t('action'),
-      key: 'action',
-      render: (_, record) => (
-        <ParsingActionCell
-          setCurrentRecord={setRecord}
-          showRenameModal={showRenameModal}
-          showChangeParserModal={showChangeParserModal}
-          showSetMetaModal={showSetMetaModal}
-          record={record}
-        ></ParsingActionCell>
-      ),
-    },
-  ];
-
-  const finalColumns = columns.map((x) => ({
-    ...x,
-    className: `${styles.column}`,
-  }));
-
-  return (
-    <div className={styles.datasetWrapper}>
-      <h3>{t('dataset')}</h3>
-      <p>{t('datasetDescription')}</p>
-      <Divider></Divider>
-      <DocumentToolbar
-        selectedRowKeys={rowSelection.selectedRowKeys as string[]}
-        showCreateModal={showCreateModal}
-        showWebCrawlModal={showWebCrawlUploadModal}
-        showDocumentUploadModal={showDocumentUploadModal}
-        searchString={searchString}
-        handleInputChange={handleInputChange}
-        documents={documents}
-      ></DocumentToolbar>
-      <Table
-        rowKey="id"
-        columns={finalColumns}
-        dataSource={documents}
-        pagination={pagination}
-        rowSelection={rowSelection}
-        className={styles.documentTable}
-        scroll={{ scrollToFirstRowOnChange: true, x: 1300 }}
-      />
-      <CreateFileModal
-        visible={createVisible}
-        hideModal={hideCreateModal}
-        loading={createLoading}
-        onOk={onCreateOk}
-      />
-      <ChunkMethodModal
-        documentId={currentRecord.id}
-        parserId={currentRecord.parser_id}
-        parserConfig={currentRecord.parser_config}
-        documentExtension={getExtension(currentRecord.name)}
-        onOk={onChangeParserOk}
-        visible={changeParserVisible}
-        hideModal={hideChangeParserModal}
-        loading={changeParserLoading}
-      />
-      <RenameModal
-        visible={renameVisible}
-        onOk={onRenameOk}
-        loading={renameLoading}
-        hideModal={hideRenameModal}
-        initialName={currentRecord.name}
-      ></RenameModal>
-      <FileUploadModal
-        visible={documentUploadVisible}
-        hideModal={hideDocumentUploadModal}
-        loading={documentUploadLoading}
-        onOk={onDocumentUploadOk}
-        uploadFileList={uploadFileList}
-        setUploadFileList={setUploadFileList}
-        uploadProgress={uploadProgress}
-        setUploadProgress={setUploadProgress}
-      ></FileUploadModal>
-      <WebCrawlModal
-        visible={webCrawlUploadVisible}
-        hideModal={hideWebCrawlUploadModal}
-        loading={webCrawlUploadLoading}
-        onOk={onWebCrawlUploadOk}
-      ></WebCrawlModal>
-      {setMetaVisible && (
-        <SetMetaModal
-          visible={setMetaVisible}
-          hideModal={hideSetMetaModal}
-          onOk={onSetMetaModalOk}
-          loading={setMetaLoading}
-          initialMetaData={currentRecord.meta_fields}
-        ></SetMetaModal>
-      )}
-    </div>
-  );
-};
-
-export default KnowledgeFile;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.less b/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.less
deleted file mode 100644
index 6353670fa..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.iconButton {
-  padding: 4px 8px;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx
deleted file mode 100644
index ac5f1eec8..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { useShowDeleteConfirm, useTranslate } from '@/hooks/common-hooks';
-import { useRemoveNextDocument } from '@/hooks/document-hooks';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import { downloadDocument } from '@/utils/file-util';
-import {
-  DeleteOutlined,
-  DownloadOutlined,
-  EditOutlined,
-  ToolOutlined,
-} from '@ant-design/icons';
-import { Button, Dropdown, MenuProps, Space, Tooltip } from 'antd';
-import { isParserRunning } from '../utils';
-
-import { useCallback } from 'react';
-import { DocumentType } from '../constant';
-import styles from './index.less';
-
-interface IProps {
-  record: IDocumentInfo;
-  setCurrentRecord: (record: IDocumentInfo) => void;
-  showRenameModal: () => void;
-  showChangeParserModal: () => void;
-  showSetMetaModal: () => void;
-}
-
-const ParsingActionCell = ({
-  record,
-  setCurrentRecord,
-  showRenameModal,
-  showChangeParserModal,
-  showSetMetaModal,
-}: IProps) => {
-  const documentId = record.id;
-  const isRunning = isParserRunning(record.run);
-  const { t } = useTranslate('knowledgeDetails');
-  const { removeDocument } = useRemoveNextDocument();
-  const showDeleteConfirm = useShowDeleteConfirm();
-  const isVirtualDocument = record.type === DocumentType.Virtual;
-
-  const onRmDocument = () => {
-    if (!isRunning) {
-      showDeleteConfirm({
-        onOk: () => removeDocument([documentId]),
-        content: record?.parser_config?.graphrag?.use_graphrag
-          ? t('deleteDocumentConfirmContent')
-          : '',
-      });
-    }
-  };
-
-  const onDownloadDocument = () => {
-    downloadDocument({
-      id: documentId,
-      filename: record.name,
-    });
-  };
-
-  const setRecord = useCallback(() => {
-    setCurrentRecord(record);
-  }, [record, setCurrentRecord]);
-
-  const onShowRenameModal = () => {
-    setRecord();
-    showRenameModal();
-  };
-  const onShowChangeParserModal = () => {
-    setRecord();
-    showChangeParserModal();
-  };
-
-  const onShowSetMetaModal = useCallback(() => {
-    setRecord();
-    showSetMetaModal();
-  }, [setRecord, showSetMetaModal]);
-
-  const chunkItems: MenuProps['items'] = [
-    {
-      key: '1',
-      label: (
-        <div className="flex flex-col">
-          <Button type="link" onClick={onShowChangeParserModal}>
-            {t('chunkMethod')}
-          </Button>
-        </div>
-      ),
-    },
-    { type: 'divider' },
-    {
-      key: '2',
-      label: (
-        <div className="flex flex-col">
-          <Button type="link" onClick={onShowSetMetaModal}>
-            {t('setMetaData')}
-          </Button>
-        </div>
-      ),
-    },
-  ];
-
-  return (
-    <Space size={0}>
-      {isVirtualDocument || (
-        <Dropdown
-          menu={{ items: chunkItems }}
-          trigger={['click']}
-          disabled={isRunning || record.parser_id === 'tag'}
-        >
-          <Button type="text" className={styles.iconButton}>
-            <ToolOutlined size={20} />
-          </Button>
-        </Dropdown>
-      )}
-      <Tooltip title={t('rename', { keyPrefix: 'common' })}>
-        <Button
-          type="text"
-          disabled={isRunning}
-          onClick={onShowRenameModal}
-          className={styles.iconButton}
-        >
-          <EditOutlined size={20} />
-        </Button>
-      </Tooltip>
-      <Tooltip title={t('delete', { keyPrefix: 'common' })}>
-        <Button
-          type="text"
-          disabled={isRunning}
-          onClick={onRmDocument}
-          className={styles.iconButton}
-        >
-          <DeleteOutlined size={20} />
-        </Button>
-      </Tooltip>
-      {isVirtualDocument || (
-        <Tooltip title={t('download', { keyPrefix: 'common' })}>
-          <Button
-            type="text"
-            disabled={isRunning}
-            onClick={onDownloadDocument}
-            className={styles.iconButton}
-          >
-            <DownloadOutlined size={20} />
-          </Button>
-        </Tooltip>
-      )}
-    </Space>
-  );
-};
-
-export default ParsingActionCell;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.less b/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.less
deleted file mode 100644
index 7ca657a6c..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.popoverContent {
-  width: 40vw;
-
-  .popoverContentItem {
-    display: flex;
-    gap: 10px;
-  }
-
-  .popoverContentText {
-    white-space: pre-line;
-    max-height: 50vh;
-    overflow: auto;
-    .popoverContentErrorLabel {
-      color: red;
-    }
-  }
-}
-
-.operationIcon {
-  text-align: center;
-  display: flex;
-  &:hover {
-    cursor: pointer;
-  }
-}
-.operationIconSpin {
-  animation: spin 1s linear infinite;
-  @keyframes spin {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx
deleted file mode 100644
index 184ea6e2f..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { ReactComponent as CancelIcon } from '@/assets/svg/cancel.svg';
-import { ReactComponent as RefreshIcon } from '@/assets/svg/refresh.svg';
-import { ReactComponent as RunIcon } from '@/assets/svg/run.svg';
-import { useTranslate } from '@/hooks/common-hooks';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import {
-  Badge,
-  DescriptionsProps,
-  Flex,
-  Popconfirm,
-  Popover,
-  Space,
-  Tag,
-} from 'antd';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import reactStringReplace from 'react-string-replace';
-import { DocumentType, RunningStatus, RunningStatusMap } from '../constant';
-import { useHandleRunDocumentByIds } from '../hooks';
-import { isParserRunning } from '../utils';
-import styles from './index.less';
-
-const iconMap = {
-  [RunningStatus.UNSTART]: RunIcon,
-  [RunningStatus.RUNNING]: CancelIcon,
-  [RunningStatus.CANCEL]: RefreshIcon,
-  [RunningStatus.DONE]: RefreshIcon,
-  [RunningStatus.FAIL]: RefreshIcon,
-};
-
-interface IProps {
-  record: IDocumentInfo;
-}
-
-const PopoverContent = ({ record }: IProps) => {
-  const { t } = useTranslate('knowledgeDetails');
-
-  const replaceText = (text: string) => {
-    // Remove duplicate \n
-    const nextText = text.replace(/(\n)\1+/g, '$1');
-
-    const replacedText = reactStringReplace(
-      nextText,
-      /(\[ERROR\].+\s)/g,
-      (match, i) => {
-        return (
-          <span key={i} className={styles.popoverContentErrorLabel}>
-            {match}
-          </span>
-        );
-      },
-    );
-
-    return replacedText;
-  };
-
-  const items: DescriptionsProps['items'] = [
-    {
-      key: 'process_begin_at',
-      label: t('processBeginAt'),
-      children: record.process_begin_at,
-    },
-    {
-      key: 'process_duration',
-      label: t('processDuration'),
-      children: `${record.process_duration.toFixed(2)} s`,
-    },
-    {
-      key: 'progress_msg',
-      label: t('progressMsg'),
-      children: replaceText(record.progress_msg.trim()),
-    },
-  ];
-
-  return (
-    <Flex vertical className={styles.popoverContent}>
-      {items.map((x, idx) => {
-        return (
-          <div key={x.key} className={idx < 2 ? styles.popoverContentItem : ''}>
-            <b>{x.label}:</b>
-            <div className={styles.popoverContentText}>{x.children}</div>
-          </div>
-        );
-      })}
-    </Flex>
-  );
-};
-
-export const ParsingStatusCell = ({ record }: IProps) => {
-  const text = record.run;
-  const runningStatus = RunningStatusMap[text];
-  const { t } = useTranslation();
-  const { handleRunDocumentByIds } = useHandleRunDocumentByIds(record.id);
-
-  const isRunning = isParserRunning(text);
-
-  const OperationIcon = iconMap[text];
-
-  const label = t(`knowledgeDetails.runningStatus${text}`);
-
-  const handleOperationIconClick =
-    (shouldDelete: boolean = false) =>
-    () => {
-      handleRunDocumentByIds(record.id, isRunning, shouldDelete);
-    };
-
-  return record.type === DocumentType.Virtual ? null : (
-    <Flex justify={'space-between'} align="center">
-      <Popover content={<PopoverContent record={record}></PopoverContent>}>
-        <Tag color={runningStatus.color}>
-          {isRunning ? (
-            <Space>
-              <Badge color={runningStatus.color} />
-              {label}
-              <span>{(record.progress * 100).toFixed(2)}%</span>
-            </Space>
-          ) : (
-            label
-          )}
-        </Tag>
-      </Popover>
-      <Popconfirm
-        title={t(`knowledgeDetails.redo`, { chunkNum: record.chunk_num })}
-        onConfirm={handleOperationIconClick(true)}
-        onCancel={handleOperationIconClick(false)}
-        disabled={record.chunk_num === 0}
-        okText={t('common.yes')}
-        cancelText={t('common.no')}
-      >
-        <div
-          className={classNames(styles.operationIcon)}
-          onClick={
-            record.chunk_num === 0 ? handleOperationIconClick(false) : () => {}
-          }
-        >
-          <OperationIcon />
-        </div>
-      </Popconfirm>
-    </Flex>
-  );
-};
-
-export default ParsingStatusCell;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/rename-modal/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/rename-modal/index.tsx
deleted file mode 100644
index 7ff590e61..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/rename-modal/index.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Input, Modal } from 'antd';
-import { useEffect } from 'react';
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  initialName: string;
-  onOk: (name: string) => void;
-  showModal?(): void;
-}
-
-const RenameModal = ({
-  visible,
-  onOk,
-  loading,
-  initialName,
-  hideModal,
-}: IProps) => {
-  const [form] = Form.useForm();
-  const { t } = useTranslate('common');
-  type FieldType = {
-    name?: string;
-  };
-
-  const handleOk = async () => {
-    const ret = await form.validateFields();
-    onOk(ret.name);
-  };
-
-  const onFinish = (values: any) => {
-    console.log('Success:', values);
-  };
-
-  const onFinishFailed = (errorInfo: any) => {
-    console.log('Failed:', errorInfo);
-  };
-
-  useEffect(() => {
-    if (visible) {
-      form.setFieldValue('name', initialName);
-    }
-  }, [initialName, form, visible]);
-
-  return (
-    <Modal
-      title={t('rename')}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      okButtonProps={{ loading }}
-    >
-      <Form
-        name="basic"
-        labelCol={{ span: 4 }}
-        wrapperCol={{ span: 20 }}
-        style={{ maxWidth: 600 }}
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-        autoComplete="off"
-        form={form}
-      >
-        <Form.Item<FieldType>
-          label={t('name')}
-          name="name"
-          rules={[{ required: true, message: t('namePlaceholder') }]}
-        >
-          <Input />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default RenameModal;
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/set-meta-modal/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/set-meta-modal/index.tsx
deleted file mode 100644
index c51ac8cb6..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/set-meta-modal/index.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { IModalProps } from '@/interfaces/common';
-import { IDocumentInfo } from '@/interfaces/database/document';
-import Editor, { loader } from '@monaco-editor/react';
-
-import { Form, Modal } from 'antd';
-import DOMPurify from 'dompurify';
-import { useCallback, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-
-loader.config({ paths: { vs: '/vs' } });
-
-type FieldType = {
-  meta?: string;
-};
-
-export function SetMetaModal({
-  visible,
-  hideModal,
-  onOk,
-  initialMetaData,
-}: IModalProps<any> & { initialMetaData?: IDocumentInfo['meta_fields'] }) {
-  const { t } = useTranslation();
-  const [form] = Form.useForm();
-
-  const handleOk = useCallback(async () => {
-    const values = await form.validateFields();
-    onOk?.(values.meta);
-  }, [form, onOk]);
-
-  useEffect(() => {
-    form.setFieldValue('meta', JSON.stringify(initialMetaData, null, 4));
-  }, [form, initialMetaData]);
-
-  return (
-    <Modal
-      title={t('knowledgeDetails.setMetaData')}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-    >
-      <Form
-        name="basic"
-        initialValues={{ remember: true }}
-        autoComplete="off"
-        layout={'vertical'}
-        form={form}
-      >
-        <Form.Item<FieldType>
-          label={t('knowledgeDetails.metaData')}
-          name="meta"
-          rules={[
-            {
-              required: true,
-              validator(rule, value) {
-                try {
-                  JSON.parse(value);
-                  return Promise.resolve();
-                } catch (error) {
-                  return Promise.reject(
-                    new Error(t('knowledgeDetails.pleaseInputJson')),
-                  );
-                }
-              },
-            },
-          ]}
-          tooltip={
-            <div
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(
-                  t('knowledgeDetails.documentMetaTips'),
-                ),
-              }}
-            ></div>
-          }
-        >
-          <Editor height={200} defaultLanguage="json" theme="vs-dark" />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/utils.ts b/web/src/pages/add-knowledge/components/knowledge-file/utils.ts
deleted file mode 100644
index 0965ffdb9..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RunningStatus } from './constant';
-
-export const isParserRunning = (text: RunningStatus) => {
-  const isRunning = text === RunningStatus.RUNNING;
-  return isRunning;
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/web-crawl-modal.tsx b/web/src/pages/add-knowledge/components/knowledge-file/web-crawl-modal.tsx
deleted file mode 100644
index d8617e29e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-file/web-crawl-modal.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Input, Modal } from 'antd';
-import React from 'react';
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  onOk: (name: string, url: string) => void;
-  showModal?(): void;
-}
-
-const WebCrawlModal: React.FC<IProps> = ({ visible, hideModal, onOk }) => {
-  const [form] = Form.useForm();
-  const { t } = useTranslate('knowledgeDetails');
-  const handleOk = async () => {
-    const values = await form.validateFields();
-    onOk(values.name, values.url);
-  };
-
-  return (
-    <Modal
-      title={t('webCrawl')}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-    >
-      <Form
-        form={form}
-        name="validateOnly"
-        labelCol={{ span: 4 }}
-        wrapperCol={{ span: 20 }}
-        style={{ maxWidth: 600 }}
-        autoComplete="off"
-      >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            { required: true, message: 'Please input name!' },
-            {
-              max: 10,
-              message: 'The maximum length of name is 128 characters',
-            },
-          ]}
-        >
-          <Input placeholder="Document name" />
-        </Form.Item>
-        <Form.Item
-          label="URL"
-          name="url"
-          rules={[
-            { required: true, message: 'Please input url!' },
-            {
-              pattern: new RegExp(
-                '(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]',
-              ),
-              message: 'Please enter a valid URL!',
-            },
-          ]}
-        >
-          <Input placeholder="https://www.baidu.com" />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-export default WebCrawlModal;
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/constant.ts b/web/src/pages/add-knowledge/components/knowledge-graph/constant.ts
deleted file mode 100644
index fc7d3561f..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/constant.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-const nodes = [
-  {
-    type: '"ORGANIZATION"',
-    description:
-      '"厦门象屿是一家公司，其营业收入和市场占有率在2018年至2022年间有所变化。"',
-    source_id: '0',
-    id: '"厦门象屿"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"2018年是一个时间点，标志着厦门象屿营业收入和市场占有率的记录开始。"',
-    source_id: '0',
-    entity_type: '"EVENT"',
-    id: '"2018"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"2019年是一个时间点，厦门象屿的营业收入和市场占有率在此期间有所变化。"',
-    source_id: '0',
-    entity_type: '"EVENT"',
-    id: '"2019"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"2020年是一个时间点，厦门象屿的营业收入和市场占有率在此期间有所变化。"',
-    source_id: '0',
-    entity_type: '"EVENT"',
-    id: '"2020"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"2021年是一个时间点，厦门象屿的营业收入和市场占有率在此期间有所变化。"',
-    source_id: '0',
-    entity_type: '"EVENT"',
-    id: '"2021"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"2022年是一个时间点，厦门象屿的营业收入和市场占有率在此期间有所变化。"',
-    source_id: '0',
-    entity_type: '"EVENT"',
-    id: '"2022"',
-  },
-  {
-    type: '"ORGANIZATION"',
-    description:
-      '"厦门象屿股份有限公司是一家公司，中文简称为厦门象屿，外文名称为Xiamen Xiangyu Co.,Ltd.，外文名称缩写为Xiangyu，法定代表人为邓启东。"',
-    source_id: '1',
-    id: '"厦门象屿股份有限公司"',
-  },
-  {
-    type: '"PERSON"',
-    description: '"邓启东是厦门象屿股份有限公司的法定代表人。"',
-    source_id: '1',
-    entity_type: '"PERSON"',
-    id: '"邓启东"',
-  },
-  {
-    type: '"GEO"',
-    description: '"厦门是一个地理位置，与厦门象屿股份有限公司相关。"',
-    source_id: '1',
-    entity_type: '"GEO"',
-    id: '"厦门"',
-  },
-  {
-    type: '"PERSON"',
-    description:
-      '"廖杰 is the Board Secretary, responsible for handling board-related matters and communications."',
-    source_id: '2',
-    id: '"廖杰"',
-  },
-  {
-    type: '"PERSON"',
-    description:
-      '"史经洋 is the Securities Affairs Representative, responsible for handling securities-related matters and communications."',
-    source_id: '2',
-    entity_type: '"PERSON"',
-    id: '"史经洋"',
-  },
-  {
-    type: '"GEO"',
-    description:
-      '"A geographic location in Xiamen, specifically in the Free Trade Zone, where the company\'s office is situated."',
-    source_id: '2',
-    entity_type: '"GEO"',
-    id: '"厦门市湖里区自由贸易试验区厦门片区"',
-  },
-  {
-    type: '"GEO"',
-    description:
-      '"The building where the company\'s office is located, situated at Xiangyu Road, Xiamen."',
-    source_id: '2',
-    entity_type: '"GEO"',
-    id: '"象屿集团大厦"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"Refers to the year 2021, used for comparing financial metrics with the year 2022."',
-    source_id: '3',
-    id: '"2021年"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"Refers to the year 2022, used for presenting current financial metrics and comparing them with the year 2021."',
-    source_id: '3',
-    entity_type: '"EVENT"',
-    id: '"2022年"',
-  },
-  {
-    type: '"EVENT"',
-    description:
-      '"Indicates the focus on key financial metrics in the table, such as weighted averages and percentages."',
-    source_id: '3',
-    entity_type: '"EVENT"',
-    id: '"主要财务指标"',
-  },
-].map(({ type, ...x }) => ({ ...x }));
-
-const edges = [
-  {
-    weight: 2.0,
-    description: '"厦门象屿在2018年的营业收入和市场占有率被记录。"',
-    source_id: '0',
-    source: '"厦门象屿"',
-    target: '"2018"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿在2019年的营业收入和市场占有率有所变化。"',
-    source_id: '0',
-    source: '"厦门象屿"',
-    target: '"2019"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿在2020年的营业收入和市场占有率有所变化。"',
-    source_id: '0',
-    source: '"厦门象屿"',
-    target: '"2020"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿在2021年的营业收入和市场占有率有所变化。"',
-    source_id: '0',
-    source: '"厦门象屿"',
-    target: '"2021"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿在2022年的营业收入和市场占有率有所变化。"',
-    source_id: '0',
-    source: '"厦门象屿"',
-    target: '"2022"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿股份有限公司的法定代表人是邓启东。"',
-    source_id: '1',
-    source: '"厦门象屿股份有限公司"',
-    target: '"邓启东"',
-  },
-  {
-    weight: 2.0,
-    description: '"厦门象屿股份有限公司位于厦门。"',
-    source_id: '1',
-    source: '"厦门象屿股份有限公司"',
-    target: '"厦门"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"廖杰\'s office is located in the Xiangyu Group Building, indicating his workplace."',
-    source_id: '2',
-    source: '"廖杰"',
-    target: '"象屿集团大厦"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"廖杰 works in the Xiamen Free Trade Zone, a specific area within Xiamen."',
-    source_id: '2',
-    source: '"廖杰"',
-    target: '"厦门市湖里区自由贸易试验区厦门片区"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"史经洋\'s office is also located in the Xiangyu Group Building, indicating his workplace."',
-    source_id: '2',
-    source: '"史经洋"',
-    target: '"象屿集团大厦"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"史经洋 works in the Xiamen Free Trade Zone, a specific area within Xiamen."',
-    source_id: '2',
-    source: '"史经洋"',
-    target: '"厦门市湖里区自由贸易试验区厦门片区"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"The years 2021 and 2022 are related as they are used for comparing financial metrics, showing changes and adjustments over time."',
-    source_id: '3',
-    source: '"2021年"',
-    target: '"2022年"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"The \'主要财务指标\' is related to the year 2021 as it provides the basis for financial comparisons and adjustments."',
-    source_id: '3',
-    source: '"2021年"',
-    target: '"主要财务指标"',
-  },
-  {
-    weight: 2.0,
-    description:
-      '"The \'主要财务指标\' is related to the year 2022 as it presents the current financial metrics and their changes compared to 2021."',
-    source_id: '3',
-    source: '"2022年"',
-    target: '"主要财务指标"',
-  },
-];
-
-export const graphData = {
-  directed: false,
-  multigraph: false,
-  graph: {},
-  nodes,
-  edges,
-  combos: [],
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/force-graph.tsx b/web/src/pages/add-knowledge/components/knowledge-graph/force-graph.tsx
deleted file mode 100644
index d2547e959..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/force-graph.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { ElementDatum, Graph, IElementEvent } from '@antv/g6';
-import isEmpty from 'lodash/isEmpty';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
-import { buildNodesAndCombos } from './util';
-
-import styles from './index.less';
-
-const TooltipColorMap = {
-  combo: 'red',
-  node: 'black',
-  edge: 'blue',
-};
-
-interface IProps {
-  data: any;
-  show: boolean;
-}
-
-const ForceGraph = ({ data, show }: IProps) => {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const graphRef = useRef<Graph | null>(null);
-
-  const nextData = useMemo(() => {
-    if (!isEmpty(data)) {
-      const graphData = data;
-      const mi = buildNodesAndCombos(graphData.nodes);
-      return { edges: graphData.edges, ...mi };
-    }
-    return { nodes: [], edges: [] };
-  }, [data]);
-
-  const render = useCallback(() => {
-    const graph = new Graph({
-      container: containerRef.current!,
-      autoFit: 'view',
-      autoResize: true,
-      behaviors: [
-        'drag-element',
-        'drag-canvas',
-        'zoom-canvas',
-        'collapse-expand',
-        {
-          type: 'hover-activate',
-          degree: 1, // 👈🏻 Activate relations.
-        },
-      ],
-      plugins: [
-        {
-          type: 'tooltip',
-          enterable: true,
-          getContent: (e: IElementEvent, items: ElementDatum) => {
-            if (Array.isArray(items)) {
-              if (items.some((x) => x?.isCombo)) {
-                return `<p style="font-weight:600;color:red">${items?.[0]?.data?.label}</p>`;
-              }
-              let result = ``;
-              items.forEach((item) => {
-                result += `<section style="color:${TooltipColorMap[e['targetType'] as keyof typeof TooltipColorMap]};"><h3>${item?.id}</h3>`;
-                if (item?.entity_type) {
-                  result += `<div style="padding-bottom: 6px;"><b>Entity type: </b>${item?.entity_type}</div>`;
-                }
-                if (item?.weight) {
-                  result += `<div><b>Weight: </b>${item?.weight}</div>`;
-                }
-                if (item?.description) {
-                  result += `<p>${item?.description}</p>`;
-                }
-              });
-              return result + '</section>';
-            }
-            return undefined;
-          },
-        },
-      ],
-      layout: {
-        type: 'combo-combined',
-        preventOverlap: true,
-        comboPadding: 1,
-        spacing: 100,
-      },
-      node: {
-        style: {
-          size: 150,
-          labelText: (d) => d.id,
-          // labelPadding: 30,
-          labelFontSize: 40,
-          //   labelOffsetX: 20,
-          labelOffsetY: 20,
-          labelPlacement: 'center',
-          labelWordWrap: true,
-        },
-        palette: {
-          type: 'group',
-          field: (d) => {
-            return d?.entity_type as string;
-          },
-        },
-      },
-      edge: {
-        style: (model) => {
-          const weight: number = Number(model?.weight) || 2;
-          const lineWeight = weight * 4;
-          return {
-            stroke: '#99ADD1',
-            lineWidth: lineWeight > 10 ? 10 : lineWeight,
-          };
-        },
-      },
-    });
-
-    if (graphRef.current) {
-      graphRef.current.destroy();
-    }
-
-    graphRef.current = graph;
-
-    graph.setData(nextData);
-
-    graph.render();
-  }, [nextData]);
-
-  useEffect(() => {
-    if (!isEmpty(data)) {
-      render();
-    }
-  }, [data, render]);
-
-  return (
-    <div
-      ref={containerRef}
-      className={styles.forceContainer}
-      style={{
-        width: '100%',
-        height: '100%',
-        display: show ? 'block' : 'none',
-      }}
-    />
-  );
-};
-
-export default ForceGraph;
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/index.less b/web/src/pages/add-knowledge/components/knowledge-graph/index.less
deleted file mode 100644
index 7c5d1f5a8..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.forceContainer {
-  :global(.tooltip) {
-    border-radius: 10px !important;
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/index.tsx b/web/src/pages/add-knowledge/components/knowledge-graph/index.tsx
deleted file mode 100644
index 1c33438e5..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/index.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
-import { Button } from '@/components/ui/button';
-import { useFetchKnowledgeGraph } from '@/hooks/knowledge-hooks';
-import { Trash2 } from 'lucide-react';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import ForceGraph from './force-graph';
-import { useDeleteKnowledgeGraph } from './use-delete-graph';
-
-const KnowledgeGraph: React.FC = () => {
-  const { data } = useFetchKnowledgeGraph();
-  const { t } = useTranslation();
-  const { handleDeleteKnowledgeGraph } = useDeleteKnowledgeGraph();
-
-  return (
-    <section className={'w-full h-full relative'}>
-      <ConfirmDeleteDialog onOk={handleDeleteKnowledgeGraph}>
-        <Button
-          variant="outline"
-          size={'sm'}
-          className="absolute right-0 top-0 z-50"
-        >
-          <Trash2 /> {t('common.delete')}
-        </Button>
-      </ConfirmDeleteDialog>
-      <ForceGraph data={data?.graph} show></ForceGraph>
-    </section>
-  );
-};
-
-export default KnowledgeGraph;
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/use-delete-graph.ts b/web/src/pages/add-knowledge/components/knowledge-graph/use-delete-graph.ts
deleted file mode 100644
index 49c42986f..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/use-delete-graph.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  useKnowledgeBaseId,
-  useRemoveKnowledgeGraph,
-} from '@/hooks/knowledge-hooks';
-import { useCallback } from 'react';
-import { useNavigate } from 'umi';
-
-export function useDeleteKnowledgeGraph() {
-  const { removeKnowledgeGraph, loading } = useRemoveKnowledgeGraph();
-  const navigate = useNavigate();
-  const knowledgeBaseId = useKnowledgeBaseId();
-
-  const handleDeleteKnowledgeGraph = useCallback(async () => {
-    const ret = await removeKnowledgeGraph();
-    if (ret === 0) {
-      navigate(`/knowledge/dataset?id=${knowledgeBaseId}`);
-    }
-  }, [knowledgeBaseId, navigate, removeKnowledgeGraph]);
-
-  return { handleDeleteKnowledgeGraph, loading };
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-graph/util.ts b/web/src/pages/add-knowledge/components/knowledge-graph/util.ts
deleted file mode 100644
index e0be797f2..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-graph/util.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { isEmpty } from 'lodash';
-import { v4 as uuid } from 'uuid';
-
-class KeyGenerator {
-  idx = 0;
-  chars: string[] = [];
-  constructor() {
-    const chars = Array(26)
-      .fill(1)
-      .map((x, idx) => String.fromCharCode(97 + idx)); // 26 char
-    this.chars = chars;
-  }
-  generateKey() {
-    const key = this.chars[this.idx];
-    this.idx++;
-    return key;
-  }
-}
-
-// Classify nodes based on edge relationships
-export class Converter {
-  keyGenerator;
-  dict: Record<string, string> = {}; // key is node id, value is combo
-  constructor() {
-    this.keyGenerator = new KeyGenerator();
-  }
-  buildDict(edges: { source: string; target: string }[]) {
-    edges.forEach((x) => {
-      if (this.dict[x.source] && !this.dict[x.target]) {
-        this.dict[x.target] = this.dict[x.source];
-      } else if (!this.dict[x.source] && this.dict[x.target]) {
-        this.dict[x.source] = this.dict[x.target];
-      } else if (!this.dict[x.source] && !this.dict[x.target]) {
-        this.dict[x.source] = this.dict[x.target] =
-          this.keyGenerator.generateKey();
-      }
-    });
-    return this.dict;
-  }
-  buildNodesAndCombos(nodes: any[], edges: any[]) {
-    this.buildDict(edges);
-    const nextNodes = nodes.map((x) => ({ ...x, combo: this.dict[x.id] }));
-
-    const combos = Object.values(this.dict).reduce<any[]>((pre, cur) => {
-      if (pre.every((x) => x.id !== cur)) {
-        pre.push({
-          id: cur,
-          data: {
-            label: `Combo ${cur}`,
-          },
-        });
-      }
-      return pre;
-    }, []);
-
-    return { nodes: nextNodes, combos };
-  }
-}
-
-export const isDataExist = (data: any) => {
-  return (
-    data?.data && typeof data?.data !== 'boolean' && !isEmpty(data?.data?.graph)
-  );
-};
-
-const findCombo = (communities: string[]) => {
-  const combo = Array.isArray(communities) ? communities[0] : undefined;
-  return combo;
-};
-
-export const buildNodesAndCombos = (nodes: any[]) => {
-  const combos: any[] = [];
-  nodes.forEach((x) => {
-    const combo = findCombo(x?.communities);
-    if (combo && combos.every((y) => y.data.label !== combo)) {
-      combos.push({
-        isCombo: true,
-        id: uuid(),
-        data: {
-          label: combo,
-        },
-      });
-    }
-  });
-
-  const nextNodes = nodes.map((x) => {
-    return {
-      ...x,
-      combo: combos.find((y) => y.data.label === findCombo(x?.communities))?.id,
-    };
-  });
-
-  return { nodes: nextNodes, combos };
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx
deleted file mode 100644
index 4e96fefcc..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import SvgIcon from '@/components/svg-icon';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useSelectParserList } from '@/hooks/user-setting-hooks';
-import { Col, Divider, Empty, Row, Typography } from 'antd';
-import DOMPurify from 'dompurify';
-import camelCase from 'lodash/camelCase';
-import { useMemo } from 'react';
-import styles from './index.less';
-import { TagTabs } from './tag-tabs';
-import { ImageMap } from './utils';
-
-const { Text } = Typography;
-
-const CategoryPanel = ({ chunkMethod }: { chunkMethod: string }) => {
-  const parserList = useSelectParserList();
-  const { t } = useTranslate('knowledgeConfiguration');
-
-  const item = useMemo(() => {
-    const item = parserList.find((x) => x.value === chunkMethod);
-    if (item) {
-      return {
-        title: item.label,
-        description: t(camelCase(item.value)),
-      };
-    }
-    return { title: '', description: '' };
-  }, [parserList, chunkMethod, t]);
-
-  const imageList = useMemo(() => {
-    if (chunkMethod in ImageMap) {
-      return ImageMap[chunkMethod as keyof typeof ImageMap];
-    }
-    return [];
-  }, [chunkMethod]);
-
-  return (
-    <section className={styles.categoryPanelWrapper}>
-      {imageList.length > 0 ? (
-        <>
-          <h5 className="font-semibold text-base mt-0 mb-1">
-            {`"${item.title}" ${t('methodTitle')}`}
-          </h5>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: DOMPurify.sanitize(item.description),
-            }}
-          ></p>
-          <h5 className="font-semibold text-base mt-4 mb-1">{`"${item.title}" ${t('methodExamples')}`}</h5>
-          <Text>{t('methodExamplesDescription')}</Text>
-          <Row gutter={[10, 10]} className={styles.imageRow}>
-            {imageList.map((x) => (
-              <Col span={12} key={x}>
-                <SvgIcon
-                  name={x}
-                  width={'100%'}
-                  className={styles.image}
-                ></SvgIcon>
-              </Col>
-            ))}
-          </Row>
-          <h5 className="font-semibold text-base mt-4 mb-1">
-            {item.title} {t('dialogueExamplesTitle')}
-          </h5>
-          <Divider></Divider>
-        </>
-      ) : (
-        <Empty description={''} image={null}>
-          <p>{t('methodEmpty')}</p>
-          <SvgIcon name={'chunk-method/chunk-empty'} width={'100%'}></SvgIcon>
-        </Empty>
-      )}
-      {chunkMethod === 'tag' && <TagTabs></TagTabs>}
-    </section>
-  );
-};
-
-export default CategoryPanel;
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/audio.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/audio.tsx
deleted file mode 100644
index ff1e33223..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/audio.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function AudioConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/book.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/book.tsx
deleted file mode 100644
index c1ff2b30b..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/book.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function BookConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/common-item.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/common-item.tsx
deleted file mode 100644
index 62670e8a9..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/common-item.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import { useHandleChunkMethodSelectChange } from '@/hooks/logic-hooks';
-import { Form, Select } from 'antd';
-import { memo } from 'react';
-import {
-  useHasParsedDocument,
-  useSelectChunkMethodList,
-  useSelectEmbeddingModelOptions,
-} from '../hooks';
-
-export const EmbeddingModelItem = memo(function EmbeddingModelItem() {
-  const { t } = useTranslate('knowledgeConfiguration');
-  const embeddingModelOptions = useSelectEmbeddingModelOptions();
-  const disabled = useHasParsedDocument();
-
-  return (
-    <Form.Item
-      name="embd_id"
-      label={t('embeddingModel')}
-      rules={[{ required: true }]}
-      tooltip={t('embeddingModelTip')}
-    >
-      <Select
-        placeholder={t('embeddingModelPlaceholder')}
-        options={embeddingModelOptions}
-        disabled={disabled}
-      ></Select>
-    </Form.Item>
-  );
-});
-
-export const ChunkMethodItem = memo(function ChunkMethodItem() {
-  const { t } = useTranslate('knowledgeConfiguration');
-  const form = Form.useFormInstance();
-  const handleChunkMethodSelectChange = useHandleChunkMethodSelectChange(form);
-  const parserList = useSelectChunkMethodList();
-
-  return (
-    <Form.Item
-      name="parser_id"
-      label={t('chunkMethod')}
-      tooltip={t('chunkMethodTip')}
-      rules={[{ required: true }]}
-    >
-      <Select
-        placeholder={t('chunkMethodPlaceholder')}
-        onChange={handleChunkMethodSelectChange}
-        options={parserList}
-      ></Select>
-    </Form.Item>
-  );
-});
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/email.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/email.tsx
deleted file mode 100644
index c39015464..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/email.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function EmailConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx
deleted file mode 100644
index 4d142cdb4..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { DocumentParserType } from '@/constants/knowledge';
-import { useTranslate } from '@/hooks/common-hooks';
-import { normFile } from '@/utils/file-util';
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Radio, Space, Upload } from 'antd';
-import { FormInstance } from 'antd/lib';
-import { useEffect, useMemo, useState } from 'react';
-import {
-  useFetchKnowledgeConfigurationOnMount,
-  useSubmitKnowledgeConfiguration,
-} from '../hooks';
-import { AudioConfiguration } from './audio';
-import { BookConfiguration } from './book';
-import { EmailConfiguration } from './email';
-import { KnowledgeGraphConfiguration } from './knowledge-graph';
-import { LawsConfiguration } from './laws';
-import { ManualConfiguration } from './manual';
-import { NaiveConfiguration } from './naive';
-import { OneConfiguration } from './one';
-import { PaperConfiguration } from './paper';
-import { PictureConfiguration } from './picture';
-import { PresentationConfiguration } from './presentation';
-import { QAConfiguration } from './qa';
-import { ResumeConfiguration } from './resume';
-import { TableConfiguration } from './table';
-import { TagConfiguration } from './tag';
-
-import styles from '../index.less';
-
-const ConfigurationComponentMap = {
-  [DocumentParserType.Naive]: NaiveConfiguration,
-  [DocumentParserType.Qa]: QAConfiguration,
-  [DocumentParserType.Resume]: ResumeConfiguration,
-  [DocumentParserType.Manual]: ManualConfiguration,
-  [DocumentParserType.Table]: TableConfiguration,
-  [DocumentParserType.Paper]: PaperConfiguration,
-  [DocumentParserType.Book]: BookConfiguration,
-  [DocumentParserType.Laws]: LawsConfiguration,
-  [DocumentParserType.Presentation]: PresentationConfiguration,
-  [DocumentParserType.Picture]: PictureConfiguration,
-  [DocumentParserType.One]: OneConfiguration,
-  [DocumentParserType.Audio]: AudioConfiguration,
-  [DocumentParserType.Email]: EmailConfiguration,
-  [DocumentParserType.Tag]: TagConfiguration,
-  [DocumentParserType.KnowledgeGraph]: KnowledgeGraphConfiguration,
-};
-
-function EmptyComponent() {
-  return <div></div>;
-}
-
-export const ConfigurationForm = ({ form }: { form: FormInstance }) => {
-  const { submitKnowledgeConfiguration, submitLoading, navigateToDataset } =
-    useSubmitKnowledgeConfiguration(form);
-  const { t } = useTranslate('knowledgeConfiguration');
-
-  const [finalParserId, setFinalParserId] = useState<DocumentParserType>();
-  const knowledgeDetails = useFetchKnowledgeConfigurationOnMount(form);
-  const parserId: DocumentParserType = Form.useWatch('parser_id', form);
-  const ConfigurationComponent = useMemo(() => {
-    return finalParserId
-      ? ConfigurationComponentMap[finalParserId]
-      : EmptyComponent;
-  }, [finalParserId]);
-
-  useEffect(() => {
-    setFinalParserId(parserId);
-  }, [parserId]);
-
-  useEffect(() => {
-    setFinalParserId(knowledgeDetails.parser_id as DocumentParserType);
-  }, [knowledgeDetails.parser_id]);
-
-  return (
-    <Form form={form} name="validateOnly" layout="vertical" autoComplete="off">
-      <Form.Item name="name" label={t('name')} rules={[{ required: true }]}>
-        <Input />
-      </Form.Item>
-      <Form.Item
-        name="avatar"
-        label={t('photo')}
-        valuePropName="fileList"
-        getValueFromEvent={normFile}
-      >
-        <Upload
-          listType="picture-card"
-          maxCount={1}
-          beforeUpload={() => false}
-          showUploadList={{ showPreviewIcon: false, showRemoveIcon: false }}
-        >
-          <button style={{ border: 0, background: 'none' }} type="button">
-            <PlusOutlined />
-            <div style={{ marginTop: 8 }}>{t('upload')}</div>
-          </button>
-        </Upload>
-      </Form.Item>
-      <Form.Item name="description" label={t('description')}>
-        <Input />
-      </Form.Item>
-      <Form.Item
-        name="permission"
-        label={t('permissions')}
-        tooltip={t('permissionsTip')}
-        rules={[{ required: true }]}
-      >
-        <Radio.Group>
-          <Radio value="me">{t('me')}</Radio>
-          <Radio value="team">{t('team')}</Radio>
-        </Radio.Group>
-      </Form.Item>
-
-      <ConfigurationComponent></ConfigurationComponent>
-
-      <Form.Item>
-        <div className={styles.buttonWrapper}>
-          <Space>
-            <Button size={'middle'} onClick={navigateToDataset}>
-              {t('cancel')}
-            </Button>
-            <Button
-              type="primary"
-              size={'middle'}
-              loading={submitLoading}
-              onClick={submitKnowledgeConfiguration}
-            >
-              {t('save')}
-            </Button>
-          </Space>
-        </div>
-      </Form.Item>
-    </Form>
-  );
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/knowledge-graph.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/knowledge-graph.tsx
deleted file mode 100644
index 8a7e3062f..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/knowledge-graph.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import Delimiter from '@/components/delimiter';
-import EntityTypesItem from '@/components/entity-types-item';
-import MaxTokenNumber from '@/components/max-token-number';
-import PageRank from '@/components/page-rank';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function KnowledgeGraphConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <EntityTypesItem></EntityTypesItem>
-        <MaxTokenNumber max={8192 * 2}></MaxTokenNumber>
-        <Delimiter></Delimiter>
-      </>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/laws.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/laws.tsx
deleted file mode 100644
index c103884ec..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/laws.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function LawsConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/manual.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/manual.tsx
deleted file mode 100644
index 71837a280..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/manual.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function ManualConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/naive.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/naive.tsx
deleted file mode 100644
index 956f83b0f..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/naive.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import { DatasetConfigurationContainer } from '@/components/dataset-configuration-container';
-import Delimiter from '@/components/delimiter';
-import ExcelToHtml from '@/components/excel-to-html';
-import LayoutRecognize from '@/components/layout-recognize';
-import MaxTokenNumber from '@/components/max-token-number';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { Divider } from 'antd';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function NaiveConfiguration() {
-  return (
-    <section className="space-y-4 mb-4">
-      <DatasetConfigurationContainer>
-        <LayoutRecognize></LayoutRecognize>
-        <EmbeddingModelItem></EmbeddingModelItem>
-        <ChunkMethodItem></ChunkMethodItem>
-        <MaxTokenNumber></MaxTokenNumber>
-        <Delimiter></Delimiter>
-      </DatasetConfigurationContainer>
-      <Divider></Divider>
-      <DatasetConfigurationContainer>
-        <PageRank></PageRank>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-        <ExcelToHtml></ExcelToHtml>
-        <TagItems></TagItems>
-      </DatasetConfigurationContainer>
-      <Divider></Divider>
-      <DatasetConfigurationContainer>
-        <ParseConfiguration></ParseConfiguration>
-      </DatasetConfigurationContainer>
-      <Divider></Divider>
-      <GraphRagItems></GraphRagItems>
-    </section>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/one.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/one.tsx
deleted file mode 100644
index b488ec0ff..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/one.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function OneConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/paper.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/paper.tsx
deleted file mode 100644
index db61b01a2..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/paper.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function PaperConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/picture.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/picture.tsx
deleted file mode 100644
index f10b0892b..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/picture.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import PageRank from '@/components/page-rank';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function PictureConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/presentation.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/presentation.tsx
deleted file mode 100644
index 84d17a5fb..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/presentation.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  AutoKeywordsItem,
-  AutoQuestionsItem,
-} from '@/components/auto-keywords-item';
-import LayoutRecognize from '@/components/layout-recognize';
-import PageRank from '@/components/page-rank';
-import ParseConfiguration from '@/components/parse-configuration';
-import GraphRagItems from '@/components/parse-configuration/graph-rag-items';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function PresentationConfiguration() {
-  return (
-    <>
-      <LayoutRecognize></LayoutRecognize>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <>
-        <AutoKeywordsItem></AutoKeywordsItem>
-        <AutoQuestionsItem></AutoQuestionsItem>
-      </>
-
-      <ParseConfiguration></ParseConfiguration>
-
-      <GraphRagItems marginBottom></GraphRagItems>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/qa.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/qa.tsx
deleted file mode 100644
index 1d25dff4e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/qa.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import PageRank from '@/components/page-rank';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function QAConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/resume.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/resume.tsx
deleted file mode 100644
index 89d535d9c..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/resume.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import PageRank from '@/components/page-rank';
-import { TagItems } from '../tag-item';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function ResumeConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-
-      <TagItems></TagItems>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/table.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/table.tsx
deleted file mode 100644
index 5611812fa..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/table.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import PageRank from '@/components/page-rank';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function TableConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/tag.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/tag.tsx
deleted file mode 100644
index d2a22b228..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/tag.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import PageRank from '@/components/page-rank';
-import { ChunkMethodItem, EmbeddingModelItem } from './common-item';
-
-export function TagConfiguration() {
-  return (
-    <>
-      <EmbeddingModelItem></EmbeddingModelItem>
-      <ChunkMethodItem></ChunkMethodItem>
-
-      <PageRank></PageRank>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-setting/hooks.ts
deleted file mode 100644
index a065515df..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/hooks.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { LlmModelType } from '@/constants/knowledge';
-import { useSetModalState } from '@/hooks/common-hooks';
-import {
-  useFetchKnowledgeBaseConfiguration,
-  useUpdateKnowledge,
-} from '@/hooks/knowledge-hooks';
-import { useSelectLlmOptionsByModelType } from '@/hooks/llm-hooks';
-import { useNavigateToDataset } from '@/hooks/route-hook';
-import { useSelectParserList } from '@/hooks/user-setting-hooks';
-import {
-  getBase64FromUploadFileList,
-  getUploadFileListFromBase64,
-} from '@/utils/file-util';
-import { useIsFetching } from '@tanstack/react-query';
-import { Form, UploadFile } from 'antd';
-import { FormInstance } from 'antd/lib';
-import pick from 'lodash/pick';
-import { useCallback, useEffect, useState } from 'react';
-
-export const useSubmitKnowledgeConfiguration = (form: FormInstance) => {
-  const { saveKnowledgeConfiguration, loading } = useUpdateKnowledge();
-  const navigateToDataset = useNavigateToDataset();
-
-  const submitKnowledgeConfiguration = useCallback(async () => {
-    const values = await form.validateFields();
-    const avatar = await getBase64FromUploadFileList(values.avatar);
-    saveKnowledgeConfiguration({
-      ...values,
-      avatar,
-    });
-    navigateToDataset();
-  }, [saveKnowledgeConfiguration, form, navigateToDataset]);
-
-  return {
-    submitKnowledgeConfiguration,
-    submitLoading: loading,
-    navigateToDataset,
-  };
-};
-
-// The value that does not need to be displayed in the analysis method Select
-const HiddenFields = ['email', 'picture', 'audio'];
-
-export function useSelectChunkMethodList() {
-  const parserList = useSelectParserList();
-
-  return parserList.filter((x) => !HiddenFields.some((y) => y === x.value));
-}
-
-export function useSelectEmbeddingModelOptions() {
-  const allOptions = useSelectLlmOptionsByModelType();
-  return allOptions[LlmModelType.Embedding];
-}
-
-export function useHasParsedDocument() {
-  const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration();
-  return knowledgeDetails.chunk_num > 0;
-}
-
-export const useFetchKnowledgeConfigurationOnMount = (form: FormInstance) => {
-  const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration();
-
-  useEffect(() => {
-    const fileList: UploadFile[] = getUploadFileListFromBase64(
-      knowledgeDetails.avatar,
-    );
-    form.setFieldsValue({
-      ...pick(knowledgeDetails, [
-        'description',
-        'name',
-        'permission',
-        'embd_id',
-        'parser_id',
-        'language',
-        'parser_config',
-        'pagerank',
-      ]),
-      avatar: fileList,
-    });
-  }, [form, knowledgeDetails]);
-
-  return knowledgeDetails;
-};
-
-export const useSelectKnowledgeDetailsLoading = () =>
-  useIsFetching({ queryKey: ['fetchKnowledgeDetail'] }) > 0;
-
-export const useHandleChunkMethodChange = () => {
-  const [form] = Form.useForm();
-  const chunkMethod = Form.useWatch('parser_id', form);
-
-  useEffect(() => {
-    console.log('🚀 ~ useHandleChunkMethodChange ~ chunkMethod:', chunkMethod);
-  }, [chunkMethod]);
-
-  return { form, chunkMethod };
-};
-
-export const useRenameKnowledgeTag = () => {
-  const [tag, setTag] = useState<string>('');
-  const {
-    visible: tagRenameVisible,
-    hideModal: hideTagRenameModal,
-    showModal: showFileRenameModal,
-  } = useSetModalState();
-
-  const handleShowTagRenameModal = useCallback(
-    (record: string) => {
-      setTag(record);
-      showFileRenameModal();
-    },
-    [showFileRenameModal],
-  );
-
-  return {
-    initialName: tag,
-    tagRenameVisible,
-    hideTagRenameModal,
-    showTagRenameModal: handleShowTagRenameModal,
-  };
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/index.less b/web/src/pages/add-knowledge/components/knowledge-setting/index.less
deleted file mode 100644
index 4889e3776..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/index.less
+++ /dev/null
@@ -1,45 +0,0 @@
-.tags {
-  margin-bottom: 24px;
-}
-
-.preset {
-  display: flex;
-  height: 80px;
-  background-color: rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-  padding: 5px;
-  margin-bottom: 24px;
-
-  .left {
-    flex: 1;
-  }
-
-  .right {
-    width: 100px;
-    border-left: 1px solid rgba(0, 0, 0, 0.4);
-    margin: 10px 0px;
-    padding: 5px;
-  }
-}
-
-.configurationWrapper {
-  padding: 0 52px;
-  .buttonWrapper {
-    text-align: right;
-  }
-  .variableSlider {
-    width: 100%;
-  }
-}
-
-.categoryPanelWrapper {
-  .topTitle {
-    margin-top: 0;
-  }
-  .imageRow {
-    margin-top: 16px;
-  }
-  .image {
-    width: 100%;
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/index.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/index.tsx
deleted file mode 100644
index 8acc45de5..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Col, Divider, Row, Spin, Typography } from 'antd';
-import CategoryPanel from './category-panel';
-import { ConfigurationForm } from './configuration';
-import {
-  useHandleChunkMethodChange,
-  useSelectKnowledgeDetailsLoading,
-} from './hooks';
-
-import { useTranslate } from '@/hooks/common-hooks';
-import styles from './index.less';
-
-const { Title } = Typography;
-
-const Configuration = () => {
-  const loading = useSelectKnowledgeDetailsLoading();
-  const { form, chunkMethod } = useHandleChunkMethodChange();
-  const { t } = useTranslate('knowledgeConfiguration');
-
-  return (
-    <div className={styles.configurationWrapper}>
-      <Title level={5}>
-        {t('configuration', { keyPrefix: 'knowledgeDetails' })}
-      </Title>
-      <p>{t('titleDescription')}</p>
-      <Divider></Divider>
-      <Spin spinning={loading}>
-        <Row gutter={32}>
-          <Col span={8}>
-            <ConfigurationForm form={form}></ConfigurationForm>
-          </Col>
-          <Col span={16}>
-            <CategoryPanel chunkMethod={chunkMethod}></CategoryPanel>
-          </Col>
-        </Row>
-      </Spin>
-    </div>
-  );
-};
-
-export default Configuration;
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-item.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-item.tsx
deleted file mode 100644
index 4d3e2a9e0..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-item.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useFetchKnowledgeList } from '@/hooks/knowledge-hooks';
-import { UserOutlined } from '@ant-design/icons';
-import { Avatar, Flex, Form, InputNumber, Select, Slider, Space } from 'antd';
-import DOMPurify from 'dompurify';
-import { useTranslation } from 'react-i18next';
-
-export const TagSetItem = () => {
-  const { t } = useTranslation();
-
-  const { list: knowledgeList } = useFetchKnowledgeList(true);
-
-  const knowledgeOptions = knowledgeList
-    .filter((x) => x.parser_id === 'tag')
-    .map((x) => ({
-      label: (
-        <Space>
-          <Avatar size={20} icon={<UserOutlined />} src={x.avatar} />
-          {x.name}
-        </Space>
-      ),
-      value: x.id,
-    }));
-
-  return (
-    <Form.Item
-      label={t('knowledgeConfiguration.tagSet')}
-      name={['parser_config', 'tag_kb_ids']}
-      tooltip={
-        <div
-          dangerouslySetInnerHTML={{
-            __html: DOMPurify.sanitize(t('knowledgeConfiguration.tagSetTip')),
-          }}
-        ></div>
-      }
-      rules={[
-        {
-          message: t('chat.knowledgeBasesMessage'),
-          type: 'array',
-        },
-      ]}
-    >
-      <Select
-        mode="multiple"
-        options={knowledgeOptions}
-        placeholder={t('chat.knowledgeBasesMessage')}
-      ></Select>
-    </Form.Item>
-  );
-};
-
-export const TopNTagsItem = () => {
-  const { t } = useTranslation();
-
-  return (
-    <Form.Item label={t('knowledgeConfiguration.topnTags')}>
-      <Flex gap={20} align="center">
-        <Flex flex={1}>
-          <Form.Item
-            name={['parser_config', 'topn_tags']}
-            noStyle
-            initialValue={3}
-          >
-            <Slider max={10} min={1} style={{ width: '100%' }} />
-          </Form.Item>
-        </Flex>
-        <Form.Item name={['parser_config', 'topn_tags']} noStyle>
-          <InputNumber max={10} min={1} />
-        </Form.Item>
-      </Flex>
-    </Form.Item>
-  );
-};
-
-export function TagItems() {
-  return (
-    <>
-      <TagSetItem></TagSetItem>
-      <Form.Item noStyle dependencies={[['parser_config', 'tag_kb_ids']]}>
-        {({ getFieldValue }) => {
-          const ids: string[] = getFieldValue(['parser_config', 'tag_kb_ids']);
-
-          return (
-            Array.isArray(ids) &&
-            ids.length > 0 && <TopNTagsItem></TopNTagsItem>
-          );
-        }}
-      </Form.Item>
-    </>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/index.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/index.tsx
deleted file mode 100644
index 0ab25a86e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/index.tsx
+++ /dev/null
@@ -1,307 +0,0 @@
-'use client';
-
-import {
-  ColumnDef,
-  ColumnFiltersState,
-  SortingState,
-  VisibilityState,
-  flexRender,
-  getCoreRowModel,
-  getFilteredRowModel,
-  getPaginationRowModel,
-  getSortedRowModel,
-  useReactTable,
-} from '@tanstack/react-table';
-import { ArrowUpDown, Pencil, Trash2 } from 'lucide-react';
-import * as React from 'react';
-
-import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
-import { Button } from '@/components/ui/button';
-import { Checkbox } from '@/components/ui/checkbox';
-import { Input } from '@/components/ui/input';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@/components/ui/tooltip';
-import { useDeleteTag, useFetchTagList } from '@/hooks/knowledge-hooks';
-import { useCallback, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useRenameKnowledgeTag } from '../hooks';
-import { RenameDialog } from './rename-dialog';
-
-export type ITag = {
-  tag: string;
-  frequency: number;
-};
-
-export function TagTable() {
-  const { t } = useTranslation();
-  const { list } = useFetchTagList();
-  const [tagList, setTagList] = useState<ITag[]>([]);
-
-  const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
-    [],
-  );
-  const [columnVisibility, setColumnVisibility] =
-    React.useState<VisibilityState>({});
-  const [rowSelection, setRowSelection] = useState({});
-
-  const { deleteTag } = useDeleteTag();
-
-  useEffect(() => {
-    setTagList(list.map((x) => ({ tag: x[0], frequency: x[1] })));
-  }, [list]);
-
-  const handleDeleteTag = useCallback(
-    (tags: string[]) => () => {
-      deleteTag(tags);
-    },
-    [deleteTag],
-  );
-
-  const {
-    showTagRenameModal,
-    hideTagRenameModal,
-    tagRenameVisible,
-    initialName,
-  } = useRenameKnowledgeTag();
-
-  const columns: ColumnDef<ITag>[] = [
-    {
-      id: 'select',
-      header: ({ table }) => (
-        <Checkbox
-          checked={
-            table.getIsAllPageRowsSelected() ||
-            (table.getIsSomePageRowsSelected() && 'indeterminate')
-          }
-          onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-          aria-label="Select all"
-        />
-      ),
-      cell: ({ row }) => (
-        <Checkbox
-          checked={row.getIsSelected()}
-          onCheckedChange={(value) => row.toggleSelected(!!value)}
-          aria-label="Select row"
-        />
-      ),
-      enableSorting: false,
-      enableHiding: false,
-    },
-    {
-      accessorKey: 'tag',
-      header: ({ column }) => {
-        return (
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
-          >
-            {t('knowledgeConfiguration.tagName')}
-            <ArrowUpDown />
-          </Button>
-        );
-      },
-      cell: ({ row }) => {
-        const value: string = row.getValue('tag');
-        return <div>{value}</div>;
-      },
-    },
-    {
-      accessorKey: 'frequency',
-      header: ({ column }) => {
-        return (
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
-          >
-            {t('knowledgeConfiguration.frequency')}
-            <ArrowUpDown />
-          </Button>
-        );
-      },
-      cell: ({ row }) => (
-        <div className="capitalize ">{row.getValue('frequency')}</div>
-      ),
-    },
-    {
-      id: 'actions',
-      enableHiding: false,
-      header: t('common.action'),
-      cell: ({ row }) => {
-        return (
-          <div className="flex gap-1">
-            <Tooltip>
-              <ConfirmDeleteDialog onOk={handleDeleteTag([row.original.tag])}>
-                <TooltipTrigger asChild>
-                  <Button variant="ghost" size="icon">
-                    <Trash2 />
-                  </Button>
-                </TooltipTrigger>
-              </ConfirmDeleteDialog>
-              <TooltipContent>
-                <p>{t('common.delete')}</p>
-              </TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  onClick={() => showTagRenameModal(row.original.tag)}
-                >
-                  <Pencil />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>
-                <p>{t('common.rename')}</p>
-              </TooltipContent>
-            </Tooltip>
-          </div>
-        );
-      },
-    },
-  ];
-
-  const table = useReactTable({
-    data: tagList,
-    columns,
-    onSortingChange: setSorting,
-    onColumnFiltersChange: setColumnFilters,
-    getCoreRowModel: getCoreRowModel(),
-    getPaginationRowModel: getPaginationRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    onColumnVisibilityChange: setColumnVisibility,
-    onRowSelectionChange: setRowSelection,
-    state: {
-      sorting,
-      columnFilters,
-      columnVisibility,
-      rowSelection,
-    },
-  });
-
-  const selectedRowLength = table.getFilteredSelectedRowModel().rows.length;
-
-  return (
-    <TooltipProvider>
-      <div className="w-full">
-        <div className="flex items-center justify-between py-4 ">
-          <Input
-            placeholder={t('knowledgeConfiguration.searchTags')}
-            value={(table.getColumn('tag')?.getFilterValue() as string) ?? ''}
-            onChange={(event) =>
-              table.getColumn('tag')?.setFilterValue(event.target.value)
-            }
-            className="w-1/2"
-          />
-          {selectedRowLength > 0 && (
-            <ConfirmDeleteDialog
-              onOk={handleDeleteTag(
-                table
-                  .getFilteredSelectedRowModel()
-                  .rows.map((x) => x.original.tag),
-              )}
-            >
-              <Button variant="outline" size="icon">
-                <Trash2 />
-              </Button>
-            </ConfirmDeleteDialog>
-          )}
-        </div>
-        <div className="rounded-md border">
-          <Table>
-            <TableHeader>
-              {table.getHeaderGroups().map((headerGroup) => (
-                <TableRow key={headerGroup.id}>
-                  {headerGroup.headers.map((header) => {
-                    return (
-                      <TableHead key={header.id}>
-                        {header.isPlaceholder
-                          ? null
-                          : flexRender(
-                              header.column.columnDef.header,
-                              header.getContext(),
-                            )}
-                      </TableHead>
-                    );
-                  })}
-                </TableRow>
-              ))}
-            </TableHeader>
-            <TableBody>
-              {table.getRowModel().rows?.length ? (
-                table.getRowModel().rows.map((row) => (
-                  <TableRow
-                    key={row.id}
-                    data-state={row.getIsSelected() && 'selected'}
-                  >
-                    {row.getVisibleCells().map((cell) => (
-                      <TableCell key={cell.id}>
-                        {flexRender(
-                          cell.column.columnDef.cell,
-                          cell.getContext(),
-                        )}
-                      </TableCell>
-                    ))}
-                  </TableRow>
-                ))
-              ) : (
-                <TableRow>
-                  <TableCell
-                    colSpan={columns.length}
-                    className="h-24 text-center"
-                  >
-                    No results.
-                  </TableCell>
-                </TableRow>
-              )}
-            </TableBody>
-          </Table>
-        </div>
-        <div className="flex items-center justify-end space-x-2 py-4">
-          <div className="flex-1 text-sm text-muted-foreground">
-            {selectedRowLength} of {table.getFilteredRowModel().rows.length}{' '}
-            row(s) selected.
-          </div>
-          <div className="space-x-2">
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => table.previousPage()}
-              disabled={!table.getCanPreviousPage()}
-            >
-              {t('common.previousPage')}
-            </Button>
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => table.nextPage()}
-              disabled={!table.getCanNextPage()}
-            >
-              {t('common.nextPage')}
-            </Button>
-          </div>
-        </div>
-      </div>
-      {tagRenameVisible && (
-        <RenameDialog
-          hideModal={hideTagRenameModal}
-          initialName={initialName}
-        ></RenameDialog>
-      )}
-    </TooltipProvider>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/index.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/index.tsx
deleted file mode 100644
index b95907f92..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { LoadingButton } from '@/components/ui/loading-button';
-import { useTagIsRenaming } from '@/hooks/knowledge-hooks';
-import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
-import { useTranslation } from 'react-i18next';
-import { RenameForm } from './rename-form';
-
-export function RenameDialog({
-  hideModal,
-  initialName,
-}: IModalProps<any> & { initialName: string }) {
-  const { t } = useTranslation();
-  const loading = useTagIsRenaming();
-
-  return (
-    <Dialog open onOpenChange={hideModal}>
-      <DialogContent className="sm:max-w-[425px]">
-        <DialogHeader>
-          <DialogTitle>{t('common.rename')}</DialogTitle>
-        </DialogHeader>
-        <RenameForm
-          initialName={initialName}
-          hideModal={hideModal}
-        ></RenameForm>
-        <DialogFooter>
-          <LoadingButton type="submit" form={TagRenameId} loading={loading}>
-            {t('common.save')}
-          </LoadingButton>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/rename-form.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/rename-form.tsx
deleted file mode 100644
index 9c8f1cf7e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-table/rename-dialog/rename-form.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-'use client';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { useRenameTag } from '@/hooks/knowledge-hooks';
-import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
-import { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export function RenameForm({
-  initialName,
-  hideModal,
-}: IModalProps<any> & { initialName: string }) {
-  const { t } = useTranslation();
-  const FormSchema = z.object({
-    name: z
-      .string()
-      .min(1, {
-        message: t('common.namePlaceholder'),
-      })
-      .trim(),
-  });
-
-  const form = useForm<z.infer<typeof FormSchema>>({
-    resolver: zodResolver(FormSchema),
-    defaultValues: {
-      name: '',
-    },
-  });
-
-  const { renameTag } = useRenameTag();
-
-  async function onSubmit(data: z.infer<typeof FormSchema>) {
-    const ret = await renameTag({ fromTag: initialName, toTag: data.name });
-    if (ret) {
-      hideModal?.();
-    }
-  }
-
-  useEffect(() => {
-    form.setValue('name', initialName);
-  }, [form, initialName]);
-
-  return (
-    <Form {...form}>
-      <form
-        onSubmit={form.handleSubmit(onSubmit)}
-        className="space-y-6"
-        id={TagRenameId}
-      >
-        <FormField
-          control={form.control}
-          name="name"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t('common.name')}</FormLabel>
-              <FormControl>
-                <Input
-                  placeholder={t('common.namePlaceholder')}
-                  {...field}
-                  autoComplete="off"
-                />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-      </form>
-    </Form>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-tabs.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-tabs.tsx
deleted file mode 100644
index abcd3f673..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-tabs.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Segmented } from 'antd';
-import { SegmentedLabeledOption } from 'antd/es/segmented';
-import { upperFirst } from 'lodash';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { TagTable } from './tag-table';
-import { TagWordCloud } from './tag-word-cloud';
-
-enum TagType {
-  Cloud = 'cloud',
-  Table = 'table',
-}
-
-const TagContentMap = {
-  [TagType.Cloud]: <TagWordCloud></TagWordCloud>,
-  [TagType.Table]: <TagTable></TagTable>,
-};
-
-export function TagTabs() {
-  const [value, setValue] = useState<TagType>(TagType.Cloud);
-  const { t } = useTranslation();
-
-  const options: SegmentedLabeledOption[] = [TagType.Cloud, TagType.Table].map(
-    (x) => ({
-      label: t(`knowledgeConfiguration.tag${upperFirst(x)}`),
-      value: x,
-    }),
-  );
-
-  return (
-    <section className="mt-4">
-      <Segmented
-        value={value}
-        options={options}
-        onChange={(val) => setValue(val as TagType)}
-      />
-      {TagContentMap[value]}
-    </section>
-  );
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/tag-word-cloud.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/tag-word-cloud.tsx
deleted file mode 100644
index b71ed69af..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/tag-word-cloud.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { useFetchTagList } from '@/hooks/knowledge-hooks';
-import { Chart } from '@antv/g2';
-import { sumBy } from 'lodash';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
-
-export function TagWordCloud() {
-  const domRef = useRef<HTMLDivElement>(null);
-  let chartRef = useRef<Chart>();
-  const { list } = useFetchTagList();
-
-  const { list: tagList } = useMemo(() => {
-    const nextList = list.sort((a, b) => b[1] - a[1]).slice(0, 256);
-
-    return {
-      list: nextList.map((x) => ({ text: x[0], value: x[1], name: x[0] })),
-      sumValue: sumBy(nextList, (x: [string, number]) => x[1]),
-      length: nextList.length,
-    };
-  }, [list]);
-
-  const renderWordCloud = useCallback(() => {
-    if (domRef.current) {
-      chartRef.current = new Chart({ container: domRef.current });
-
-      chartRef.current.options({
-        type: 'wordCloud',
-        autoFit: true,
-        layout: {
-          fontSize: [10, 50],
-          // fontSize: (d: any) => {
-          //   if (d.value) {
-          //     return (d.value / sumValue) * 100 * (length / 10);
-          //   }
-          //   return 0;
-          // },
-        },
-        data: {
-          type: 'inline',
-          value: tagList,
-        },
-        encode: { color: 'text' },
-        legend: false,
-        tooltip: {
-          title: 'name', // title
-          items: ['value'], // data item
-        },
-      });
-
-      chartRef.current.render();
-    }
-  }, [tagList]);
-
-  useEffect(() => {
-    renderWordCloud();
-
-    return () => {
-      chartRef.current?.destroy();
-    };
-  }, [renderWordCloud]);
-
-  return <div ref={domRef} className="w-full h-[38vh]"></div>;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts b/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
deleted file mode 100644
index 4c5666467..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-const getImageName = (prefix: string, length: number) =>
-  new Array(length)
-    .fill(0)
-    .map((x, idx) => `chunk-method/${prefix}-0${idx + 1}`);
-
-export const ImageMap = {
-  book: getImageName('book', 4),
-  laws: getImageName('law', 2),
-  manual: getImageName('manual', 4),
-  picture: getImageName('media', 2),
-  naive: getImageName('naive', 2),
-  paper: getImageName('paper', 2),
-  presentation: getImageName('presentation', 2),
-  qa: getImageName('qa', 2),
-  resume: getImageName('resume', 2),
-  table: getImageName('table', 2),
-  one: getImageName('one', 2),
-  knowledge_graph: getImageName('knowledge-graph', 2),
-  tag: getImageName('tag', 2),
-};
diff --git a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.less b/web/src/pages/add-knowledge/components/knowledge-sidebar/index.less
deleted file mode 100644
index 1080b0629..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.less
+++ /dev/null
@@ -1,63 +0,0 @@
-.sidebarWrapper {
-  max-width: 288px;
-  padding: 32px 24px 24px 24px;
-  flex-direction: column;
-
-  .sidebarTop {
-    text-align: center;
-    .knowledgeLogo {
-    }
-    .knowledgeTitle {
-      font-size: 16px;
-      line-height: 24px;
-      font-weight: @fontWeight700;
-      margin-bottom: 6px;
-    }
-    .knowledgeDescription {
-      font-size: 12px;
-      font-weight: @fontWeight600;
-      color: @gray8;
-      margin: 0;
-    }
-    padding-bottom: 20px;
-  }
-  .divider {
-    height: 2px;
-    background-image: linear-gradient(
-      to right,
-      @gray11 0%,
-      @gray11 50%,
-      transparent 50%
-    );
-    background-size: 10px 2px;
-    background-repeat: repeat-x;
-  }
-
-  .menuWrapper {
-    padding-top: 10px;
-
-    .menu {
-      border: none;
-      font-size: @fontSize16;
-      font-weight: @fontWeight600;
-      :global(.ant-menu-item) {
-        display: flex;
-        align-items: center;
-      }
-    }
-
-    .defaultWidth {
-      width: 240px;
-    }
-
-    .minWidth {
-      width: 50px;
-    }
-
-    .menuText {
-      color: @gray3;
-      font-size: @fontSize14;
-      font-weight: @fontWeight700;
-    }
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx b/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx
deleted file mode 100644
index 421a28653..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import { ReactComponent as ConfigurationIcon } from '@/assets/svg/knowledge-configration.svg';
-import { ReactComponent as DatasetIcon } from '@/assets/svg/knowledge-dataset.svg';
-import { ReactComponent as TestingIcon } from '@/assets/svg/knowledge-testing.svg';
-import {
-  useFetchKnowledgeBaseConfiguration,
-  useFetchKnowledgeGraph,
-} from '@/hooks/knowledge-hooks';
-import {
-  useGetKnowledgeSearchParams,
-  useSecondPathName,
-} from '@/hooks/route-hook';
-import { getWidth } from '@/utils';
-import { Avatar, Menu, MenuProps, Space } from 'antd';
-import classNames from 'classnames';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'umi';
-import { KnowledgeRouteKey } from '../../constant';
-
-import { isEmpty } from 'lodash';
-import { GitGraph } from 'lucide-react';
-import styles from './index.less';
-
-const KnowledgeSidebar = () => {
-  let navigate = useNavigate();
-  const activeKey = useSecondPathName();
-  const { knowledgeId } = useGetKnowledgeSearchParams();
-
-  const [windowWidth, setWindowWidth] = useState(getWidth());
-  const { t } = useTranslation();
-  const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration();
-
-  const handleSelect: MenuProps['onSelect'] = (e) => {
-    navigate(`/knowledge/${e.key}?id=${knowledgeId}`);
-  };
-
-  const { data } = useFetchKnowledgeGraph();
-
-  type MenuItem = Required<MenuProps>['items'][number];
-
-  const getItem = useCallback(
-    (
-      label: string,
-      key: React.Key,
-      icon?: React.ReactNode,
-      disabled?: boolean,
-      children?: MenuItem[],
-      type?: 'group',
-    ): MenuItem => {
-      return {
-        key,
-        icon,
-        children,
-        label: t(`knowledgeDetails.${label}`),
-        type,
-        disabled,
-      } as MenuItem;
-    },
-    [t],
-  );
-
-  const items: MenuItem[] = useMemo(() => {
-    const list = [
-      getItem(
-        KnowledgeRouteKey.Dataset, // TODO: Change icon color when selected
-        KnowledgeRouteKey.Dataset,
-        <DatasetIcon />,
-      ),
-      getItem(
-        KnowledgeRouteKey.Testing,
-        KnowledgeRouteKey.Testing,
-        <TestingIcon />,
-      ),
-      getItem(
-        KnowledgeRouteKey.Configuration,
-        KnowledgeRouteKey.Configuration,
-        <ConfigurationIcon />,
-      ),
-    ];
-
-    if (!isEmpty(data?.graph)) {
-      list.push(
-        getItem(
-          KnowledgeRouteKey.KnowledgeGraph,
-          KnowledgeRouteKey.KnowledgeGraph,
-          <GitGraph />,
-        ),
-      );
-    }
-
-    return list;
-  }, [data, getItem]);
-
-  useEffect(() => {
-    const widthSize = () => {
-      const width = getWidth();
-
-      setWindowWidth(width);
-    };
-    window.addEventListener('resize', widthSize);
-    return () => {
-      window.removeEventListener('resize', widthSize);
-    };
-  }, []);
-
-  return (
-    <div className={styles.sidebarWrapper}>
-      <div className={styles.sidebarTop}>
-        <Space size={8} direction="vertical">
-          <Avatar size={64} src={knowledgeDetails.avatar} />
-          <div className={styles.knowledgeTitle}>{knowledgeDetails.name}</div>
-        </Space>
-        <p className={styles.knowledgeDescription}>
-          {knowledgeDetails.description}
-        </p>
-      </div>
-      <div className={styles.divider}></div>
-      <div className={styles.menuWrapper}>
-        <Menu
-          selectedKeys={[activeKey]}
-          // mode="inline"
-          className={classNames(styles.menu, {
-            [styles.defaultWidth]: windowWidth.width > 957,
-            [styles.minWidth]: windowWidth.width <= 957,
-          })}
-          // inlineCollapsed={collapsed}
-          items={items}
-          onSelect={handleSelect}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default KnowledgeSidebar;
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/index.less b/web/src/pages/add-knowledge/components/knowledge-testing/index.less
deleted file mode 100644
index c7d005dc6..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/index.less
+++ /dev/null
@@ -1,4 +0,0 @@
-.testingWrapper {
-  flex: 1;
-  height: 100%;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/index.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/index.tsx
deleted file mode 100644
index 531941d30..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/index.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import {
-  useTestChunkAllRetrieval,
-  useTestChunkRetrieval,
-} from '@/hooks/knowledge-hooks';
-import { Flex, Form } from 'antd';
-import { useMemo, useState } from 'react';
-import TestingControl from './testing-control';
-import TestingResult from './testing-result';
-
-import styles from './index.less';
-
-const KnowledgeTesting = () => {
-  const [form] = Form.useForm();
-  const {
-    data: retrievalData,
-    testChunk,
-    loading: retrievalLoading,
-  } = useTestChunkRetrieval();
-  const {
-    data: allRetrievalData,
-    testChunkAll,
-    loading: allRetrievalLoading,
-  } = useTestChunkAllRetrieval();
-  const [selectedDocumentIds, setSelectedDocumentIds] = useState<string[]>([]);
-
-  const handleTesting = async (documentIds: string[] = []) => {
-    const values = await form.validateFields();
-    const params = {
-      ...values,
-      vector_similarity_weight: 1 - values.vector_similarity_weight,
-    };
-
-    if (Array.isArray(documentIds) && documentIds.length > 0) {
-      testChunk({
-        ...params,
-        doc_ids: documentIds,
-      });
-    } else {
-      testChunkAll({
-        ...params,
-        doc_ids: [],
-      });
-    }
-  };
-
-  const testingResult = useMemo(() => {
-    return selectedDocumentIds.length > 0 ? retrievalData : allRetrievalData;
-  }, [allRetrievalData, retrievalData, selectedDocumentIds.length]);
-
-  return (
-    <Flex className={styles.testingWrapper} gap={16}>
-      <TestingControl
-        form={form}
-        handleTesting={handleTesting}
-        selectedDocumentIds={selectedDocumentIds}
-      ></TestingControl>
-      <TestingResult
-        data={testingResult}
-        loading={retrievalLoading || allRetrievalLoading}
-        handleTesting={handleTesting}
-        selectedDocumentIds={selectedDocumentIds}
-        setSelectedDocumentIds={setSelectedDocumentIds}
-      ></TestingResult>
-    </Flex>
-  );
-};
-
-export default KnowledgeTesting;
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.less b/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.less
deleted file mode 100644
index 7b0db52db..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.testingControlWrapper {
-  width: 350px;
-  background-color: rgba(255, 255, 255, 0.1);
-  padding: 30px 20px;
-  overflow: auto;
-  height: calc(100vh - 160px);
-
-  .historyTitle {
-    padding: 30px 0 20px;
-  }
-  .historyIcon {
-    vertical-align: middle;
-  }
-  .historyCardWrapper {
-    width: 100%;
-  }
-  .historyCard {
-    width: 100%;
-    :global(.ant-card-body) {
-      padding: 10px;
-    }
-  }
-  .historyText {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1;
-  }
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx
deleted file mode 100644
index 8efb4c195..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import Rerank from '@/components/rerank';
-import SimilaritySlider from '@/components/similarity-slider';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useChunkIsTesting } from '@/hooks/knowledge-hooks';
-import { Button, Card, Divider, Flex, Form, Input } from 'antd';
-import { FormInstance } from 'antd/lib';
-import { LabelWordCloud } from './label-word-cloud';
-
-import { CrossLanguageItem } from '@/components/cross-language-item';
-import { UseKnowledgeGraphItem } from '@/components/use-knowledge-graph-item';
-import styles from './index.less';
-
-type FieldType = {
-  similarity_threshold?: number;
-  vector_similarity_weight?: number;
-  question: string;
-};
-
-interface IProps {
-  form: FormInstance;
-  handleTesting: (documentIds?: string[]) => Promise<any>;
-  selectedDocumentIds: string[];
-}
-
-const TestingControl = ({
-  form,
-  handleTesting,
-  selectedDocumentIds,
-}: IProps) => {
-  const question = Form.useWatch('question', { form, preserve: true });
-  const loading = useChunkIsTesting();
-  const { t } = useTranslate('knowledgeDetails');
-
-  const buttonDisabled =
-    !question || (typeof question === 'string' && question.trim() === '');
-
-  const onClick = () => {
-    handleTesting(selectedDocumentIds);
-  };
-
-  return (
-    <section className={styles.testingControlWrapper}>
-      <div>
-        <b>{t('testing')}</b>
-      </div>
-      <p>{t('testingDescription')}</p>
-      <Divider></Divider>
-      <section>
-        <Form name="testing" layout="vertical" form={form}>
-          <SimilaritySlider isTooltipShown></SimilaritySlider>
-          <Rerank></Rerank>
-          <UseKnowledgeGraphItem filedName={['use_kg']}></UseKnowledgeGraphItem>
-          <CrossLanguageItem name={'cross_languages'}></CrossLanguageItem>
-          <Card size="small" title={t('testText')}>
-            <Form.Item<FieldType>
-              name={'question'}
-              rules={[{ required: true, message: t('testTextPlaceholder') }]}
-            >
-              <Input.TextArea autoSize={{ minRows: 8 }}></Input.TextArea>
-            </Form.Item>
-            <Flex justify={'end'}>
-              <Button
-                type="primary"
-                size="small"
-                onClick={onClick}
-                disabled={buttonDisabled}
-                loading={loading}
-              >
-                {t('testingLabel')}
-              </Button>
-            </Flex>
-          </Card>
-        </Form>
-      </section>
-      <LabelWordCloud></LabelWordCloud>
-      {/* <section>
-        <div className={styles.historyTitle}>
-          <Space size={'middle'}>
-            <HistoryOutlined className={styles.historyIcon} />
-            <b>Test history</b>
-          </Space>
-        </div>
-        <Space
-          direction="vertical"
-          size={'middle'}
-          className={styles.historyCardWrapper}
-        >
-          {list.map((x) => (
-            <Card className={styles.historyCard} key={x}>
-              <Flex justify={'space-between'} gap={'small'}>
-                <span>{x}</span>
-                <div className={styles.historyText}>
-                  content dcjsjl snldsh svnodvn svnodrfn svjdoghdtbnhdo
-                  sdvhodhbuid sldghdrlh
-                </div>
-                <Flex gap={'small'}>
-                  <span>time</span>
-                  <DeleteOutlined></DeleteOutlined>
-                </Flex>
-              </Flex>
-            </Card>
-          ))}
-        </Space>
-      </section> */}
-    </section>
-  );
-};
-
-export default TestingControl;
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/label-word-cloud.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/label-word-cloud.tsx
deleted file mode 100644
index b1dbc05ba..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/label-word-cloud.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useSelectTestingResult } from '@/hooks/knowledge-hooks';
-import { Chart } from '@antv/g2';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
-
-export function LabelWordCloud() {
-  const domRef = useRef<HTMLDivElement>(null);
-  let chartRef = useRef<Chart>();
-  const { labels } = useSelectTestingResult();
-
-  const list = useMemo(() => {
-    if (!labels) {
-      return [];
-    }
-
-    return Object.keys(labels).reduce<
-      Array<{ text: string; name: string; value: number }>
-    >((pre, cur) => {
-      pre.push({ name: cur, text: cur, value: labels[cur] });
-
-      return pre;
-    }, []);
-  }, [labels]);
-
-  const renderWordCloud = useCallback(() => {
-    if (domRef.current && list.length) {
-      chartRef.current = new Chart({ container: domRef.current });
-
-      chartRef.current.options({
-        type: 'wordCloud',
-        autoFit: true,
-        layout: {
-          fontSize: [6, 15],
-        },
-        data: {
-          type: 'inline',
-          value: list,
-        },
-        encode: { color: 'text' },
-        legend: false,
-        tooltip: {
-          title: 'name', // title
-          items: ['value'], // data item
-        },
-      });
-
-      chartRef.current.render();
-    }
-  }, [list]);
-
-  useEffect(() => {
-    renderWordCloud();
-
-    return () => {
-      chartRef.current?.destroy();
-    };
-  }, [renderWordCloud]);
-
-  return <div ref={domRef} className="w-full h-[13vh]"></div>;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.less b/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.less
deleted file mode 100644
index 44a886798..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.testingResultWrapper {
-  flex: 1;
-  background-color: rgba(255, 255, 255, 0.1);
-  padding: 30px 20px;
-  overflow: auto;
-  height: calc(100vh - 160px);
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-
-  .selectFilesCollapse {
-    :global(.ant-collapse-header) {
-      padding-left: 22px;
-    }
-    margin-bottom: 32px;
-    overflow-y: auto;
-  }
-
-  .selectFilesTitle {
-    padding-right: 10px;
-  }
-
-  .similarityCircle {
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    background-color: rgba(255, 255, 255, 0.1);
-    font-size: 10px;
-    font-weight: normal;
-  }
-
-  .similarityText {
-    font-size: 12px;
-    font-weight: 500;
-  }
-  .image {
-    width: 100%;
-    max-height: 30vh;
-    object-fit: contain;
-  }
-}
-.imagePreview {
-  display: block;
-  max-width: 45vw;
-  max-height: 40vh;
-}
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.tsx
deleted file mode 100644
index 02481cc9e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/index.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { ReactComponent as SelectedFilesCollapseIcon } from '@/assets/svg/selected-files-collapse.svg';
-import { useTranslate } from '@/hooks/common-hooks';
-import { ITestingChunk, ITestingResult } from '@/interfaces/database/knowledge';
-import {
-  Card,
-  Collapse,
-  Empty,
-  Flex,
-  Image,
-  Pagination,
-  PaginationProps,
-  Space,
-} from 'antd';
-import camelCase from 'lodash/camelCase';
-import SelectFiles from './select-files';
-
-import { useGetPaginationWithRouter } from '@/hooks/logic-hooks';
-import { api_host } from '@/utils/api';
-import { showImage } from '@/utils/chat';
-import { useCallback } from 'react';
-import styles from './index.less';
-
-const similarityList: Array<{ field: keyof ITestingChunk; label: string }> = [
-  { field: 'similarity', label: 'Hybrid Similarity' },
-  { field: 'term_similarity', label: 'Term Similarity' },
-  { field: 'vector_similarity', label: 'Vector Similarity' },
-];
-
-const ChunkTitle = ({ item }: { item: ITestingChunk }) => {
-  const { t } = useTranslate('knowledgeDetails');
-  return (
-    <Flex gap={10}>
-      {similarityList.map((x) => (
-        <Space key={x.field}>
-          <span className={styles.similarityCircle}>
-            {((item[x.field] as number) * 100).toFixed(2)}
-          </span>
-          <span className={styles.similarityText}>{t(camelCase(x.field))}</span>
-        </Space>
-      ))}
-    </Flex>
-  );
-};
-
-interface IProps {
-  handleTesting: (documentIds?: string[]) => Promise<any>;
-  selectedDocumentIds: string[];
-  setSelectedDocumentIds: (ids: string[]) => void;
-  data?: ITestingResult;
-  loading?: boolean;
-}
-
-const TestingResult = ({
-  handleTesting,
-  selectedDocumentIds,
-  setSelectedDocumentIds,
-  data,
-  loading,
-}: IProps) => {
-  const { documents, chunks, total } = data || {};
-  const { t } = useTranslate('knowledgeDetails');
-  const { pagination, setPagination } = useGetPaginationWithRouter();
-
-  const onChange: PaginationProps['onChange'] = (pageNumber, pageSize) => {
-    pagination.onChange?.(pageNumber, pageSize);
-    handleTesting(selectedDocumentIds);
-  };
-
-  const onTesting = useCallback(
-    (ids: string[]) => {
-      setPagination({ page: 1 });
-      handleTesting(ids);
-    },
-    [setPagination, handleTesting],
-  );
-
-  return (
-    <section className={styles.testingResultWrapper}>
-      <Collapse
-        expandIcon={() => (
-          <SelectedFilesCollapseIcon></SelectedFilesCollapseIcon>
-        )}
-        className={styles.selectFilesCollapse}
-        items={[
-          {
-            key: '1',
-            label: (
-              <Flex
-                justify={'space-between'}
-                align="center"
-                className={styles.selectFilesTitle}
-              >
-                <Space>
-                  <span>
-                    {selectedDocumentIds?.length ?? 0}/{documents?.length ?? 0}
-                  </span>
-                  {t('filesSelected')}
-                </Space>
-              </Flex>
-            ),
-            children: (
-              <div>
-                <SelectFiles
-                  setSelectedDocumentIds={setSelectedDocumentIds}
-                  handleTesting={onTesting}
-                ></SelectFiles>
-              </div>
-            ),
-          },
-        ]}
-      />
-      <Flex
-        gap={'large'}
-        vertical
-        flex={1}
-        className={styles.selectFilesCollapse}
-      >
-        {loading === false && chunks && chunks.length > 0 ? (
-          chunks?.map((x) => (
-            <Card key={x.chunk_id} title={<ChunkTitle item={x}></ChunkTitle>}>
-              <div className="flex justify-center">
-                {showImage(x.doc_type_kwd) && (
-                  <Image
-                    id={x.image_id}
-                    className={'object-contain max-h-[30vh] w-full text-center'}
-                    src={`${api_host}/document/image/${x.image_id}`}
-                  ></Image>
-                )}
-              </div>
-              <div className="pt-4">{x.content_with_weight}</div>
-            </Card>
-          ))
-        ) : loading === false && chunks && chunks.length === 0 ? (
-          <Empty></Empty>
-        ) : null}
-      </Flex>
-      <Pagination
-        {...pagination}
-        size={'small'}
-        total={total}
-        onChange={onChange}
-      />
-    </section>
-  );
-};
-
-export default TestingResult;
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/select-files.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/select-files.tsx
deleted file mode 100644
index 93545e09e..000000000
--- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-result/select-files.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import NewDocumentLink from '@/components/new-document-link';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useAllTestingResult } from '@/hooks/knowledge-hooks';
-import { ITestingDocument } from '@/interfaces/database/knowledge';
-import { EyeOutlined } from '@ant-design/icons';
-import { Button, Table, TableProps, Tooltip } from 'antd';
-
-interface IProps {
-  handleTesting: (ids: string[]) => void;
-  setSelectedDocumentIds: (ids: string[]) => void;
-}
-
-const SelectFiles = ({ setSelectedDocumentIds, handleTesting }: IProps) => {
-  const { documents } = useAllTestingResult();
-  const { t } = useTranslate('fileManager');
-
-  const columns: TableProps<ITestingDocument>['columns'] = [
-    {
-      title: 'Name',
-      dataIndex: 'doc_name',
-      key: 'doc_name',
-      render: (text) => <p>{text}</p>,
-    },
-
-    {
-      title: 'Hits',
-      dataIndex: 'count',
-      key: 'count',
-      width: 80,
-    },
-    {
-      title: 'View',
-      key: 'view',
-      width: 50,
-      render: (_, { doc_id, doc_name }) => (
-        <NewDocumentLink
-          documentName={doc_name}
-          documentId={doc_id}
-          prefix="document"
-        >
-          <Tooltip title={t('preview')}>
-            <Button type="text">
-              <EyeOutlined size={20} />
-            </Button>
-          </Tooltip>
-        </NewDocumentLink>
-      ),
-    },
-  ];
-
-  const rowSelection = {
-    onChange: (selectedRowKeys: React.Key[]) => {
-      setSelectedDocumentIds(selectedRowKeys as string[]);
-      handleTesting(selectedRowKeys as string[]);
-    },
-    getCheckboxProps: (record: ITestingDocument) => ({
-      disabled: record.doc_name === 'Disabled User', // Column configuration not to be checked
-      name: record.doc_name,
-    }),
-  };
-
-  return (
-    <Table
-      columns={columns}
-      dataSource={documents}
-      showHeader={false}
-      rowSelection={rowSelection}
-      rowKey={'doc_id'}
-    />
-  );
-};
-
-export default SelectFiles;
diff --git a/web/src/pages/add-knowledge/constant.ts b/web/src/pages/add-knowledge/constant.ts
deleted file mode 100644
index 71df266c8..000000000
--- a/web/src/pages/add-knowledge/constant.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { KnowledgeRouteKey } from '@/constants/knowledge';
-
-export const routeMap = {
-  [KnowledgeRouteKey.Dataset]: 'Dataset',
-  [KnowledgeRouteKey.Testing]: 'Retrieval testing',
-  [KnowledgeRouteKey.Configuration]: 'Configuration',
-};
-
-export enum KnowledgeDatasetRouteKey {
-  Chunk = 'chunk',
-  File = 'file',
-}
-
-export const datasetRouteMap = {
-  [KnowledgeDatasetRouteKey.Chunk]: 'Chunk',
-  [KnowledgeDatasetRouteKey.File]: 'File Upload',
-};
-
-export * from '@/constants/knowledge';
-
-export const TagRenameId = 'tagRename';
diff --git a/web/src/pages/add-knowledge/index.less b/web/src/pages/add-knowledge/index.less
deleted file mode 100644
index dc934280c..000000000
--- a/web/src/pages/add-knowledge/index.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.container {
-  display: flex;
-  height: 100%;
-  width: 100%;
-  .contentWrapper {
-    flex: 1;
-    overflow-x: auto;
-    height: 100%;
-    background-color: rgba(255, 255, 255, 0.1);
-    padding: 16px 20px 28px 40px;
-    display: flex;
-    flex-direction: column;
-  }
-  .content {
-    background-color: rgba(255, 255, 255, 0.1);
-    margin-top: 16px;
-    flex: 1;
-  }
-}
diff --git a/web/src/pages/add-knowledge/index.tsx b/web/src/pages/add-knowledge/index.tsx
deleted file mode 100644
index 18187cf4e..000000000
--- a/web/src/pages/add-knowledge/index.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useKnowledgeBaseId } from '@/hooks/knowledge-hooks';
-import {
-  useNavigateWithFromState,
-  useSecondPathName,
-  useThirdPathName,
-} from '@/hooks/route-hook';
-import { Breadcrumb } from 'antd';
-import { ItemType } from 'antd/es/breadcrumb/Breadcrumb';
-import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Link, Outlet } from 'umi';
-import Siderbar from './components/knowledge-sidebar';
-import { KnowledgeDatasetRouteKey, KnowledgeRouteKey } from './constant';
-import styles from './index.less';
-
-const KnowledgeAdding = () => {
-  const knowledgeBaseId = useKnowledgeBaseId();
-
-  const { t } = useTranslation();
-  const activeKey: KnowledgeRouteKey =
-    (useSecondPathName() as KnowledgeRouteKey) || KnowledgeRouteKey.Dataset;
-
-  const datasetActiveKey: KnowledgeDatasetRouteKey =
-    useThirdPathName() as KnowledgeDatasetRouteKey;
-
-  const gotoList = useNavigateWithFromState();
-
-  const breadcrumbItems: ItemType[] = useMemo(() => {
-    const items: ItemType[] = [
-      {
-        title: (
-          <a onClick={() => gotoList('/knowledge')}>
-            {t('header.knowledgeBase')}
-          </a>
-        ),
-      },
-      {
-        title: datasetActiveKey ? (
-          <Link
-            to={`/knowledge/${KnowledgeRouteKey.Dataset}?id=${knowledgeBaseId}`}
-          >
-            {t(`knowledgeDetails.${activeKey}`)}
-          </Link>
-        ) : (
-          t(`knowledgeDetails.${activeKey}`)
-        ),
-      },
-    ];
-
-    if (datasetActiveKey) {
-      items.push({
-        title: t(`knowledgeDetails.${datasetActiveKey}`),
-      });
-    }
-
-    return items;
-  }, [activeKey, datasetActiveKey, gotoList, knowledgeBaseId, t]);
-
-  return (
-    <>
-      <div className={styles.container}>
-        <Siderbar></Siderbar>
-        <div className={styles.contentWrapper}>
-          <Breadcrumb items={breadcrumbItems} />
-          <div className={styles.content}>
-            <Outlet></Outlet>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default KnowledgeAdding;
diff --git a/web/src/pages/agent/chat/box.tsx b/web/src/pages/agent/chat/box.tsx
index f57ed4282..f44e219fc 100644
--- a/web/src/pages/agent/chat/box.tsx
+++ b/web/src/pages/agent/chat/box.tsx
@@ -1,5 +1,4 @@
 import { MessageType } from '@/constants/chat';
-import { useGetFileIcon } from '@/pages/chat/hooks';
 
 import { useSendAgentMessage } from './use-send-agent-message';
 
@@ -19,6 +18,7 @@ import { useParams } from 'umi';
 import DebugContent from '../debug-content';
 import { useAwaitCompentData } from '../hooks/use-chat-logic';
 import { useIsTaskMode } from '../hooks/use-get-begin-query';
+import { useGetFileIcon } from './use-get-file-icon';
 
 function AgentChatBox() {
   const { data: canvasInfo, refetch } = useFetchAgent();
diff --git a/web/src/pages/agent/chat/use-get-file-icon.tsx b/web/src/pages/agent/chat/use-get-file-icon.tsx
new file mode 100644
index 000000000..f86c5524e
--- /dev/null
+++ b/web/src/pages/agent/chat/use-get-file-icon.tsx
@@ -0,0 +1,12 @@
+import { fileIconMap } from '@/constants/common';
+import { getFileExtension } from '@/utils';
+
+export const useGetFileIcon = () => {
+  const getFileIcon = (filename: string) => {
+    const ext: string = getFileExtension(filename);
+    const iconPath = fileIconMap[ext as keyof typeof fileIconMap];
+    return `@/assets/svg/file-icon/${iconPath}`;
+  };
+
+  return getFileIcon;
+};
diff --git a/web/src/pages/agent/debug-content/index.tsx b/web/src/pages/agent/debug-content/index.tsx
index eadcefe58..22e20dc78 100644
--- a/web/src/pages/agent/debug-content/index.tsx
+++ b/web/src/pages/agent/debug-content/index.tsx
@@ -11,7 +11,7 @@ import { Input } from '@/components/ui/input';
 import { RAGFlowSelect } from '@/components/ui/select';
 import { Switch } from '@/components/ui/switch';
 import { Textarea } from '@/components/ui/textarea';
-import { IMessage } from '@/pages/chat/interface';
+import { IMessage } from '@/interfaces/database/chat';
 import { zodResolver } from '@hookform/resolvers/zod';
 import React, { ReactNode, useCallback, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
diff --git a/web/src/pages/agent/hooks/use-chat-logic.ts b/web/src/pages/agent/hooks/use-chat-logic.ts
index 42b0533cb..3c62ae4d1 100644
--- a/web/src/pages/agent/hooks/use-chat-logic.ts
+++ b/web/src/pages/agent/hooks/use-chat-logic.ts
@@ -1,6 +1,5 @@
 import { MessageType } from '@/constants/chat';
-import { Message } from '@/interfaces/database/chat';
-import { IMessage } from '@/pages/chat/interface';
+import { IMessage, Message } from '@/interfaces/database/chat';
 import { get } from 'lodash';
 import { useCallback, useMemo } from 'react';
 import { BeginQuery } from '../interface';
diff --git a/web/src/pages/agent/share/index.tsx b/web/src/pages/agent/share/index.tsx
index b33c1b3ce..24308ea66 100644
--- a/web/src/pages/agent/share/index.tsx
+++ b/web/src/pages/agent/share/index.tsx
@@ -11,12 +11,12 @@ import i18n from '@/locales/config';
 import DebugContent from '@/pages/agent/debug-content';
 import { useCacheChatLog } from '@/pages/agent/hooks/use-cache-chat-log';
 import { useAwaitCompentData } from '@/pages/agent/hooks/use-chat-logic';
-import { useSendButtonDisabled } from '@/pages/chat/hooks';
 import { buildMessageUuidWithRole } from '@/utils/chat';
 import { isEmpty } from 'lodash';
 import React, { forwardRef, useCallback } from 'react';
 import {
   useGetSharedChatSearchParams,
+  useSendButtonDisabled,
   useSendNextSharedMessage,
 } from '../hooks/use-send-shared-message';
 import { ParameterDialog } from './parameter-dialog';
diff --git a/web/src/pages/agent/utils/chat.ts b/web/src/pages/agent/utils/chat.ts
index 15c8ff850..a2859b6dc 100644
--- a/web/src/pages/agent/utils/chat.ts
+++ b/web/src/pages/agent/utils/chat.ts
@@ -1,6 +1,5 @@
 import { MessageType } from '@/constants/chat';
-import { IReference } from '@/interfaces/database/chat';
-import { IMessage } from '@/pages/chat/interface';
+import { IMessage, IReference } from '@/interfaces/database/chat';
 import { isEmpty } from 'lodash';
 
 export const buildAgentMessageItemReference = (
diff --git a/web/src/pages/agents/agent-log-detail-modal.tsx b/web/src/pages/agents/agent-log-detail-modal.tsx
index beabe8c5f..88c1327b8 100644
--- a/web/src/pages/agents/agent-log-detail-modal.tsx
+++ b/web/src/pages/agents/agent-log-detail-modal.tsx
@@ -3,10 +3,13 @@ import { Modal } from '@/components/ui/modal/modal';
 import { useFetchAgent } from '@/hooks/use-agent-request';
 import { useFetchUserInfo } from '@/hooks/user-setting-hooks';
 import { IAgentLogMessage } from '@/interfaces/database/agent';
-import { IReferenceObject, Message } from '@/interfaces/database/chat';
+import {
+  IMessage,
+  IReferenceObject,
+  Message,
+} from '@/interfaces/database/chat';
 import { buildMessageUuidWithRole } from '@/utils/chat';
 import React, { useMemo } from 'react';
-import { IMessage } from '../chat/interface';
 
 interface CustomModalProps {
   isOpen: boolean;
diff --git a/web/src/pages/agents/create-agent-dialog.tsx b/web/src/pages/agents/create-agent-dialog.tsx
index 5c8f99320..ae998e6c5 100644
--- a/web/src/pages/agents/create-agent-dialog.tsx
+++ b/web/src/pages/agents/create-agent-dialog.tsx
@@ -6,7 +6,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
+import { TagRenameId } from '@/constants/knowledge';
 import { useTranslation } from 'react-i18next';
 import { CreateAgentForm, CreateAgentFormProps } from './create-agent-form';
 
diff --git a/web/src/pages/agents/create-agent-form.tsx b/web/src/pages/agents/create-agent-form.tsx
index f89031d17..ec36086d8 100644
--- a/web/src/pages/agents/create-agent-form.tsx
+++ b/web/src/pages/agents/create-agent-form.tsx
@@ -7,9 +7,9 @@ import { z } from 'zod';
 import { RAGFlowFormItem } from '@/components/ragflow-form';
 import { Card, CardContent } from '@/components/ui/card';
 import { Form } from '@/components/ui/form';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
 import { cn } from '@/lib/utils';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { BrainCircuit, Check, Route } from 'lucide-react';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/web/src/pages/agents/upload-agent-dialog/index.tsx b/web/src/pages/agents/upload-agent-dialog/index.tsx
index b2084bc0f..83a51dbdf 100644
--- a/web/src/pages/agents/upload-agent-dialog/index.tsx
+++ b/web/src/pages/agents/upload-agent-dialog/index.tsx
@@ -6,8 +6,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 import { UploadAgentForm } from './upload-agent-form';
 
diff --git a/web/src/pages/agents/upload-agent-dialog/upload-agent-form.tsx b/web/src/pages/agents/upload-agent-dialog/upload-agent-form.tsx
index f7711b70d..1cabecd93 100644
--- a/web/src/pages/agents/upload-agent-dialog/upload-agent-form.tsx
+++ b/web/src/pages/agents/upload-agent-dialog/upload-agent-form.tsx
@@ -14,8 +14,8 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { FileMimeType } from '@/constants/common';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { NameFormField, NameFormSchema } from '../name-form-field';
 
 export const FormSchema = z.object({
diff --git a/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx b/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx
deleted file mode 100644
index 1e955c100..000000000
--- a/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import KnowledgeBaseItem from '@/components/knowledge-base-item';
-import { TavilyItem } from '@/components/tavily-item';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useFetchTenantInfo } from '@/hooks/user-setting-hooks';
-import { PlusOutlined } from '@ant-design/icons';
-import { Form, Input, message, Select, Switch, Upload } from 'antd';
-import classNames from 'classnames';
-import { useCallback } from 'react';
-import { ISegmentedContentProps } from '../interface';
-
-import { DatasetMetadata } from '@/constants/chat';
-import styles from './index.less';
-import { MetadataFilterConditions } from './metadata-filter-conditions';
-
-const emptyResponseField = ['prompt_config', 'empty_response'];
-
-const AssistantSetting = ({
-  show,
-  form,
-  setHasError,
-}: ISegmentedContentProps) => {
-  const { t } = useTranslate('chat');
-  const { data } = useFetchTenantInfo(true);
-
-  const MetadataOptions = Object.values(DatasetMetadata).map((x) => {
-    return {
-      value: x,
-      label: t(`meta.${x}`),
-    };
-  });
-
-  const metadata = Form.useWatch(['meta_data_filter', 'method'], form);
-  const kbIds = Form.useWatch(['kb_ids'], form);
-
-  const hasKnowledge = Array.isArray(kbIds) && kbIds.length > 0;
-
-  const handleChange = useCallback(() => {
-    const kbIds = form.getFieldValue('kb_ids');
-    const emptyResponse = form.getFieldValue(emptyResponseField);
-
-    const required =
-      emptyResponse && ((Array.isArray(kbIds) && kbIds.length === 0) || !kbIds);
-
-    setHasError(required);
-    form.setFields([
-      {
-        name: emptyResponseField,
-        errors: required ? [t('emptyResponseMessage')] : [],
-      },
-    ]);
-  }, [form, setHasError, t]);
-
-  const normFile = (e: any) => {
-    if (Array.isArray(e)) {
-      return e;
-    }
-    return e?.fileList;
-  };
-
-  const handleTtsChange = useCallback(
-    (checked: boolean) => {
-      if (checked && !data.tts_id) {
-        message.error(`Please set TTS model firstly. 
-        Setting >> Model providers >> System model settings`);
-        form.setFieldValue(['prompt_config', 'tts'], false);
-      }
-    },
-    [data, form],
-  );
-
-  const uploadButton = (
-    <button style={{ border: 0, background: 'none' }} type="button">
-      <PlusOutlined />
-      <div style={{ marginTop: 8 }}>{t('upload', { keyPrefix: 'common' })}</div>
-    </button>
-  );
-
-  return (
-    <section
-      className={classNames({
-        [styles.segmentedHidden]: !show,
-      })}
-    >
-      <Form.Item
-        name={'name'}
-        label={t('assistantName')}
-        rules={[{ required: true, message: t('assistantNameMessage') }]}
-      >
-        <Input placeholder={t('namePlaceholder')} />
-      </Form.Item>
-      <Form.Item name={'description'} label={t('description')}>
-        <Input placeholder={t('descriptionPlaceholder')} />
-      </Form.Item>
-      <Form.Item
-        name="icon"
-        label={t('assistantAvatar')}
-        valuePropName="fileList"
-        getValueFromEvent={normFile}
-      >
-        <Upload
-          listType="picture-card"
-          maxCount={1}
-          beforeUpload={() => false}
-          showUploadList={{ showPreviewIcon: false, showRemoveIcon: false }}
-        >
-          {show ? uploadButton : null}
-        </Upload>
-      </Form.Item>
-      <Form.Item
-        name={'language'}
-        label={t('language')}
-        initialValue={'English'}
-        tooltip="coming soon"
-        style={{ display: 'none' }}
-      >
-        <Select
-          options={[
-            { value: 'Chinese', label: t('chinese', { keyPrefix: 'common' }) },
-            { value: 'English', label: t('english', { keyPrefix: 'common' }) },
-          ]}
-        />
-      </Form.Item>
-      <Form.Item
-        name={emptyResponseField}
-        label={t('emptyResponse')}
-        tooltip={t('emptyResponseTip')}
-      >
-        <Input placeholder="" onChange={handleChange} />
-      </Form.Item>
-      <Form.Item
-        name={['prompt_config', 'prologue']}
-        label={t('setAnOpener')}
-        tooltip={t('setAnOpenerTip')}
-        initialValue={t('setAnOpenerInitial')}
-      >
-        <Input.TextArea autoSize={{ minRows: 5 }} />
-      </Form.Item>
-      <Form.Item
-        label={t('quote')}
-        valuePropName="checked"
-        name={['prompt_config', 'quote']}
-        tooltip={t('quoteTip')}
-        initialValue={true}
-      >
-        <Switch />
-      </Form.Item>
-      <Form.Item
-        label={t('keyword')}
-        valuePropName="checked"
-        name={['prompt_config', 'keyword']}
-        tooltip={t('keywordTip')}
-        initialValue={false}
-      >
-        <Switch />
-      </Form.Item>
-      <Form.Item
-        label={t('tts')}
-        valuePropName="checked"
-        name={['prompt_config', 'tts']}
-        tooltip={t('ttsTip')}
-        initialValue={false}
-      >
-        <Switch onChange={handleTtsChange} />
-      </Form.Item>
-      <TavilyItem></TavilyItem>
-      <KnowledgeBaseItem
-        required={false}
-        onChange={handleChange}
-      ></KnowledgeBaseItem>
-      {hasKnowledge && (
-        <Form.Item
-          label={t('metadata')}
-          name={['meta_data_filter', 'method']}
-          tooltip={t('metadataTip')}
-          initialValue={DatasetMetadata.Disabled}
-        >
-          <Select options={MetadataOptions} />
-        </Form.Item>
-      )}
-      {hasKnowledge && metadata === DatasetMetadata.Manual && (
-        <Form.Item
-          label={t('conditions')}
-          tooltip={t('ttsTip')}
-          initialValue={false}
-        >
-          <MetadataFilterConditions kbIds={kbIds}></MetadataFilterConditions>
-        </Form.Item>
-      )}
-    </section>
-  );
-};
-
-export default AssistantSetting;
diff --git a/web/src/pages/chat/chat-configuration-modal/editable-cell.tsx b/web/src/pages/chat/chat-configuration-modal/editable-cell.tsx
deleted file mode 100644
index 712473fbd..000000000
--- a/web/src/pages/chat/chat-configuration-modal/editable-cell.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Form, FormInstance, Input, InputRef } from 'antd';
-import { omit } from 'lodash';
-import React, { useContext, useEffect, useRef, useState } from 'react';
-
-const EditableContext = React.createContext<FormInstance<any> | null>(null);
-
-interface EditableRowProps {
-  index: number;
-}
-
-interface Item {
-  key: string;
-  name: string;
-  age: string;
-  address: string;
-}
-
-export const EditableRow: React.FC<EditableRowProps> = ({ ...props }) => {
-  const [form] = Form.useForm();
-  return (
-    <Form form={form} component={false}>
-      <EditableContext.Provider value={form}>
-        <tr {...omit(props, 'index')} />
-      </EditableContext.Provider>
-    </Form>
-  );
-};
-
-interface EditableCellProps {
-  title: React.ReactNode;
-  editable: boolean;
-  children: React.ReactNode;
-  dataIndex: keyof Item;
-  record: Item;
-  handleSave: (record: Item) => void;
-}
-
-export const EditableCell: React.FC<EditableCellProps> = ({
-  title,
-  editable,
-  children,
-  dataIndex,
-  record,
-  handleSave,
-  ...restProps
-}) => {
-  const [editing, setEditing] = useState(false);
-  const inputRef = useRef<InputRef>(null);
-  const form = useContext(EditableContext)!;
-
-  useEffect(() => {
-    if (editing) {
-      inputRef.current!.focus();
-    }
-  }, [editing]);
-
-  const toggleEdit = () => {
-    setEditing(!editing);
-    form.setFieldsValue({ [dataIndex]: record[dataIndex] });
-  };
-
-  const save = async () => {
-    try {
-      const values = await form.validateFields();
-
-      toggleEdit();
-      handleSave({ ...record, ...values });
-    } catch (errInfo) {
-      console.log('Save failed:', errInfo);
-    }
-  };
-
-  let childNode = children;
-
-  if (editable) {
-    childNode = editing ? (
-      <Form.Item
-        style={{ margin: 0 }}
-        name={dataIndex}
-        rules={[
-          {
-            required: true,
-            message: `${title} is required.`,
-          },
-        ]}
-      >
-        <Input ref={inputRef} onPressEnter={save} onBlur={save} />
-      </Form.Item>
-    ) : (
-      <div
-        className="editable-cell-value-wrap"
-        style={{ paddingRight: 24 }}
-        onClick={toggleEdit}
-      >
-        {children}
-      </div>
-    );
-  }
-
-  return <td {...restProps}>{childNode}</td>;
-};
diff --git a/web/src/pages/chat/chat-configuration-modal/index.less b/web/src/pages/chat/chat-configuration-modal/index.less
deleted file mode 100644
index 706725ccf..000000000
--- a/web/src/pages/chat/chat-configuration-modal/index.less
+++ /dev/null
@@ -1,57 +0,0 @@
-.chatConfigurationDescription {
-  font-size: 14px;
-}
-
-.variableContainer {
-  padding-bottom: 20px;
-  .variableAlign {
-    text-align: end;
-  }
-
-  .variableLabel {
-    margin-right: 14px;
-  }
-
-  .variableIcon {
-    margin-inline-start: 4px;
-    color: rgba(0, 0, 0, 0.45);
-    cursor: help;
-    writing-mode: horizontal-tb;
-  }
-
-  .variableTable {
-    margin-top: 14px;
-  }
-  .editableRow {
-    :global(.editable-cell) {
-      position: relative;
-    }
-
-    :global(.editable-cell-value-wrap) {
-      padding: 5px 12px;
-      cursor: pointer;
-      height: 22px !important;
-    }
-    &:hover {
-      :global(.editable-cell-value-wrap) {
-        padding: 4px 11px;
-        border: 1px solid #d9d9d9;
-        border-radius: 2px;
-      }
-    }
-  }
-}
-
-.segmentedHidden {
-  opacity: 0;
-  height: 0;
-  width: 0;
-  margin: 0;
-}
-
-.sliderInputNumber {
-  width: 80px;
-}
-.variableSlider {
-  width: 100%;
-}
diff --git a/web/src/pages/chat/chat-configuration-modal/index.tsx b/web/src/pages/chat/chat-configuration-modal/index.tsx
deleted file mode 100644
index be87cd13e..000000000
--- a/web/src/pages/chat/chat-configuration-modal/index.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-import { ReactComponent as ChatConfigurationAtom } from '@/assets/svg/chat-configuration-atom.svg';
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import {
-  ModelVariableType,
-  settledModelVariableMap,
-} from '@/constants/knowledge';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useFetchModelId } from '@/hooks/logic-hooks';
-import { IDialog } from '@/interfaces/database/chat';
-import { getBase64FromUploadFileList } from '@/utils/file-util';
-import { removeUselessFieldsFromValues } from '@/utils/form';
-import { Divider, Flex, Form, Modal, Segmented, UploadFile } from 'antd';
-import { SegmentedValue } from 'antd/es/segmented';
-import camelCase from 'lodash/camelCase';
-import { useEffect, useRef, useState } from 'react';
-import { IPromptConfigParameters } from '../interface';
-import AssistantSetting from './assistant-setting';
-import ModelSetting from './model-setting';
-import PromptEngine from './prompt-engine';
-
-import styles from './index.less';
-
-const layout = {
-  labelCol: { span: 9 },
-  wrapperCol: { span: 15 },
-};
-
-const validateMessages = {
-  required: '${label} is required!',
-  types: {
-    email: '${label} is not a valid email!',
-    number: '${label} is not a valid number!',
-  },
-  number: {
-    range: '${label} must be between ${min} and ${max}',
-  },
-};
-
-enum ConfigurationSegmented {
-  AssistantSetting = 'Assistant Setting',
-  PromptEngine = 'Prompt Engine',
-  ModelSetting = 'Model Setting',
-}
-
-const segmentedMap = {
-  [ConfigurationSegmented.AssistantSetting]: AssistantSetting,
-  [ConfigurationSegmented.ModelSetting]: ModelSetting,
-  [ConfigurationSegmented.PromptEngine]: PromptEngine,
-};
-
-interface IProps extends IModalManagerChildrenProps {
-  initialDialog: IDialog;
-  loading: boolean;
-  onOk: (dialog: IDialog) => void;
-  clearDialog: () => void;
-}
-
-const ChatConfigurationModal = ({
-  visible,
-  hideModal,
-  initialDialog,
-  loading,
-  onOk,
-  clearDialog,
-}: IProps) => {
-  const [form] = Form.useForm();
-  const [hasError, setHasError] = useState(false);
-
-  const [value, setValue] = useState<ConfigurationSegmented>(
-    ConfigurationSegmented.AssistantSetting,
-  );
-  const promptEngineRef = useRef<Array<IPromptConfigParameters>>([]);
-  const modelId = useFetchModelId();
-  const { t } = useTranslate('chat');
-
-  const handleOk = async () => {
-    const values = await form.validateFields();
-    if (hasError) {
-      return;
-    }
-    const nextValues: any = removeUselessFieldsFromValues(
-      values,
-      'llm_setting.',
-    );
-    const emptyResponse = nextValues.prompt_config?.empty_response ?? '';
-
-    const icon = await getBase64FromUploadFileList(values.icon);
-
-    const finalValues = {
-      dialog_id: initialDialog.id,
-      ...nextValues,
-      vector_similarity_weight: 1 - nextValues.vector_similarity_weight,
-      prompt_config: {
-        ...nextValues.prompt_config,
-        parameters: promptEngineRef.current,
-        empty_response: emptyResponse,
-      },
-      icon,
-    };
-    onOk(finalValues);
-  };
-
-  const handleSegmentedChange = (val: SegmentedValue) => {
-    setValue(val as ConfigurationSegmented);
-  };
-
-  const handleModalAfterClose = () => {
-    clearDialog();
-    form.resetFields();
-  };
-
-  const title = (
-    <Flex gap={16}>
-      <ChatConfigurationAtom></ChatConfigurationAtom>
-      <div>
-        <b>{t('chatConfiguration')}</b>
-        <div className={styles.chatConfigurationDescription}>
-          {t('chatConfigurationDescription')}
-        </div>
-      </div>
-    </Flex>
-  );
-
-  useEffect(() => {
-    if (visible) {
-      const icon = initialDialog.icon;
-      let fileList: UploadFile[] = [];
-
-      if (icon) {
-        fileList = [{ uid: '1', name: 'file', thumbUrl: icon, status: 'done' }];
-      }
-      form.setFieldsValue({
-        ...initialDialog,
-        llm_setting:
-          initialDialog.llm_setting ??
-          settledModelVariableMap[ModelVariableType.Precise],
-        icon: fileList,
-        llm_id: initialDialog.llm_id ?? modelId,
-        vector_similarity_weight:
-          1 - (initialDialog.vector_similarity_weight ?? 0.3),
-      });
-    }
-  }, [initialDialog, form, visible, modelId]);
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    // Allow Enter in textareas
-    if (e.target instanceof HTMLTextAreaElement) {
-      return;
-    }
-
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault();
-      handleOk();
-    }
-  };
-
-  return (
-    <Modal
-      title={title}
-      width={688}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      confirmLoading={loading}
-      destroyOnClose
-      afterClose={handleModalAfterClose}
-    >
-      <Segmented
-        size={'large'}
-        value={value}
-        onChange={handleSegmentedChange}
-        options={Object.values(ConfigurationSegmented).map((x) => ({
-          label: t(camelCase(x)),
-          value: x,
-        }))}
-        block
-      />
-      <Divider></Divider>
-      <Form
-        {...layout}
-        name="nest-messages"
-        form={form}
-        style={{ maxWidth: 600 }}
-        validateMessages={validateMessages}
-        colon={false}
-        onKeyDown={handleKeyDown}
-      >
-        {Object.entries(segmentedMap).map(([key, Element]) => (
-          <Element
-            key={key}
-            show={key === value}
-            form={form}
-            setHasError={setHasError}
-            {...(key === ConfigurationSegmented.ModelSetting
-              ? { initialLlmSetting: initialDialog.llm_setting, visible }
-              : {})}
-            {...(key === ConfigurationSegmented.PromptEngine
-              ? { ref: promptEngineRef }
-              : {})}
-          ></Element>
-        ))}
-      </Form>
-    </Modal>
-  );
-};
-
-export default ChatConfigurationModal;
diff --git a/web/src/pages/chat/chat-configuration-modal/metadata-filter-conditions.tsx b/web/src/pages/chat/chat-configuration-modal/metadata-filter-conditions.tsx
deleted file mode 100644
index ce2a0b59a..000000000
--- a/web/src/pages/chat/chat-configuration-modal/metadata-filter-conditions.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { SwitchOperatorOptions } from '@/constants/agent';
-import { useBuildSwitchOperatorOptions } from '@/hooks/logic-hooks/use-build-operator-options';
-import { useFetchKnowledgeMetadata } from '@/hooks/use-knowledge-request';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Dropdown,
-  Empty,
-  Form,
-  FormListOperation,
-  Input,
-  Select,
-  Space,
-} from 'antd';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export function MetadataFilterConditions({ kbIds }: { kbIds: string[] }) {
-  const metadata = useFetchKnowledgeMetadata(kbIds);
-  const { t } = useTranslation();
-  const switchOperatorOptions = useBuildSwitchOperatorOptions();
-
-  const renderItems = useCallback(
-    (add: FormListOperation['add']) => {
-      if (Object.keys(metadata.data).length === 0) {
-        return [{ key: 'noData', label: <Empty></Empty> }];
-      }
-      return Object.keys(metadata.data).map((key) => {
-        return {
-          key,
-          onClick: () => {
-            add({
-              key,
-              value: '',
-              op: SwitchOperatorOptions[0].value,
-            });
-          },
-          label: key,
-        };
-      });
-    },
-    [metadata],
-  );
-  return (
-    <Form.List name={['meta_data_filter', 'manual']}>
-      {(fields, { add, remove }) => (
-        <>
-          {fields.map(({ key, name, ...restField }) => (
-            <Space
-              key={key}
-              style={{ display: 'flex', marginBottom: 8 }}
-              align="baseline"
-            >
-              <Form.Item
-                {...restField}
-                name={[name, 'key']}
-                rules={[{ required: true, message: t('common.pleaseInput') }]}
-              >
-                <Input placeholder={t('common.pleaseInput')} />
-              </Form.Item>
-              <Form.Item {...restField} name={[name, 'op']} className="w-20">
-                <Select
-                  options={switchOperatorOptions}
-                  popupMatchSelectWidth={false}
-                />
-              </Form.Item>
-              <Form.Item
-                {...restField}
-                name={[name, 'value']}
-                rules={[{ required: true, message: t('common.pleaseInput') }]}
-              >
-                <Input placeholder={t('common.pleaseInput')} />
-              </Form.Item>
-              <MinusCircleOutlined onClick={() => remove(name)} />
-            </Space>
-          ))}
-          <Form.Item>
-            <Dropdown trigger={['click']} menu={{ items: renderItems(add) }}>
-              <Button type="dashed" block icon={<PlusOutlined />}>
-                {t('chat.addCondition')}
-              </Button>
-            </Dropdown>
-          </Form.Item>
-        </>
-      )}
-    </Form.List>
-  );
-}
diff --git a/web/src/pages/chat/chat-configuration-modal/model-setting.tsx b/web/src/pages/chat/chat-configuration-modal/model-setting.tsx
deleted file mode 100644
index a890bbbbe..000000000
--- a/web/src/pages/chat/chat-configuration-modal/model-setting.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import classNames from 'classnames';
-import { useEffect } from 'react';
-import { ISegmentedContentProps } from '../interface';
-
-import LlmSettingItems from '@/components/llm-setting-items';
-import {
-  ChatVariableEnabledField,
-  variableEnabledFieldMap,
-} from '@/constants/chat';
-import { Variable } from '@/interfaces/database/chat';
-import { setInitialChatVariableEnabledFieldValue } from '@/utils/chat';
-import styles from './index.less';
-
-const ModelSetting = ({
-  show,
-  form,
-  initialLlmSetting,
-  visible,
-}: ISegmentedContentProps & {
-  initialLlmSetting?: Variable;
-  visible?: boolean;
-}) => {
-  useEffect(() => {
-    if (visible) {
-      const values = Object.keys(variableEnabledFieldMap).reduce<
-        Record<string, boolean>
-      >((pre, field) => {
-        pre[field] =
-          initialLlmSetting === undefined
-            ? setInitialChatVariableEnabledFieldValue(
-                field as ChatVariableEnabledField,
-              )
-            : !!initialLlmSetting[
-                variableEnabledFieldMap[
-                  field as keyof typeof variableEnabledFieldMap
-                ] as keyof Variable
-              ];
-        return pre;
-      }, {});
-      form.setFieldsValue(values);
-    }
-  }, [form, initialLlmSetting, visible]);
-
-  return (
-    <section
-      className={classNames({
-        [styles.segmentedHidden]: !show,
-      })}
-    >
-      {visible && <LlmSettingItems prefix="llm_setting"></LlmSettingItems>}
-    </section>
-  );
-};
-
-export default ModelSetting;
diff --git a/web/src/pages/chat/chat-configuration-modal/prompt-engine.tsx b/web/src/pages/chat/chat-configuration-modal/prompt-engine.tsx
deleted file mode 100644
index 71bfb2cfe..000000000
--- a/web/src/pages/chat/chat-configuration-modal/prompt-engine.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import SimilaritySlider from '@/components/similarity-slider';
-import { DeleteOutlined, QuestionCircleOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Col,
-  Divider,
-  Form,
-  Input,
-  Row,
-  Switch,
-  Table,
-  TableProps,
-  Tooltip,
-} from 'antd';
-import classNames from 'classnames';
-import {
-  ForwardedRef,
-  forwardRef,
-  useEffect,
-  useImperativeHandle,
-  useState,
-} from 'react';
-import { v4 as uuid } from 'uuid';
-import {
-  VariableTableDataType as DataType,
-  IPromptConfigParameters,
-  ISegmentedContentProps,
-} from '../interface';
-import { EditableCell, EditableRow } from './editable-cell';
-
-import { CrossLanguageItem } from '@/components/cross-language-item';
-import Rerank from '@/components/rerank';
-import TopNItem from '@/components/top-n-item';
-import { UseKnowledgeGraphItem } from '@/components/use-knowledge-graph-item';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useSelectPromptConfigParameters } from '../hooks';
-import styles from './index.less';
-
-const PromptEngine = (
-  { show }: ISegmentedContentProps,
-  ref: ForwardedRef<Array<IPromptConfigParameters>>,
-) => {
-  const [dataSource, setDataSource] = useState<DataType[]>([]);
-  const parameters = useSelectPromptConfigParameters();
-  const { t } = useTranslate('chat');
-
-  const components = {
-    body: {
-      row: EditableRow,
-      cell: EditableCell,
-    },
-  };
-
-  const handleRemove = (key: string) => () => {
-    const newData = dataSource.filter((item) => item.key !== key);
-    setDataSource(newData);
-  };
-
-  const handleSave = (row: DataType) => {
-    const newData = [...dataSource];
-    const index = newData.findIndex((item) => row.key === item.key);
-    const item = newData[index];
-    newData.splice(index, 1, {
-      ...item,
-      ...row,
-    });
-    setDataSource(newData);
-  };
-
-  const handleAdd = () => {
-    setDataSource((state) => [
-      ...state,
-      {
-        key: uuid(),
-        variable: '',
-        optional: true,
-      },
-    ]);
-  };
-
-  const handleOptionalChange = (row: DataType) => (checked: boolean) => {
-    const newData = [...dataSource];
-    const index = newData.findIndex((item) => row.key === item.key);
-    const item = newData[index];
-    newData.splice(index, 1, {
-      ...item,
-      optional: checked,
-    });
-    setDataSource(newData);
-  };
-
-  useImperativeHandle(
-    ref,
-    () => {
-      return dataSource
-        .filter((x) => x.variable.trim() !== '')
-        .map((x) => ({ key: x.variable, optional: x.optional }));
-    },
-    [dataSource],
-  );
-
-  const columns: TableProps<DataType>['columns'] = [
-    {
-      title: t('key'),
-      dataIndex: 'variable',
-      key: 'variable',
-      onCell: (record: DataType) => ({
-        record,
-        editable: true,
-        dataIndex: 'variable',
-        title: 'key',
-        handleSave,
-      }),
-    },
-    {
-      title: t('optional'),
-      dataIndex: 'optional',
-      key: 'optional',
-      width: 40,
-      align: 'center',
-      render(text, record) {
-        return (
-          <Switch
-            size="small"
-            checked={text}
-            onChange={handleOptionalChange(record)}
-          />
-        );
-      },
-    },
-    {
-      title: t('operation'),
-      dataIndex: 'operation',
-      width: 30,
-      key: 'operation',
-      align: 'center',
-      render(_, record) {
-        return <DeleteOutlined onClick={handleRemove(record.key)} />;
-      },
-    },
-  ];
-
-  useEffect(() => {
-    setDataSource(parameters);
-  }, [parameters]);
-
-  return (
-    <section
-      className={classNames({
-        [styles.segmentedHidden]: !show,
-      })}
-    >
-      <Form.Item
-        label={t('system')}
-        rules={[{ required: true, message: t('systemMessage') }]}
-        tooltip={t('systemTip')}
-        name={['prompt_config', 'system']}
-        initialValue={t('systemInitialValue')}
-      >
-        <Input.TextArea autoSize={{ maxRows: 8, minRows: 5 }} />
-      </Form.Item>
-      <Divider></Divider>
-      <SimilaritySlider isTooltipShown></SimilaritySlider>
-      <TopNItem></TopNItem>
-      <Form.Item
-        label={t('multiTurn')}
-        tooltip={t('multiTurnTip')}
-        name={['prompt_config', 'refine_multiturn']}
-        initialValue={false}
-      >
-        <Switch></Switch>
-      </Form.Item>
-      <UseKnowledgeGraphItem
-        filedName={['prompt_config', 'use_kg']}
-      ></UseKnowledgeGraphItem>
-      <Form.Item
-        label={t('reasoning')}
-        tooltip={t('reasoningTip')}
-        name={['prompt_config', 'reasoning']}
-        initialValue={false}
-      >
-        <Switch></Switch>
-      </Form.Item>
-      <Rerank></Rerank>
-      <CrossLanguageItem></CrossLanguageItem>
-      <section className={classNames(styles.variableContainer)}>
-        <Row align={'middle'} justify="end">
-          <Col span={9} className={styles.variableAlign}>
-            <label className={styles.variableLabel}>
-              {t('variable')}
-              <Tooltip title={t('variableTip')}>
-                <QuestionCircleOutlined className={styles.variableIcon} />
-              </Tooltip>
-            </label>
-          </Col>
-          <Col span={15} className={styles.variableAlign}>
-            <Button size="small" onClick={handleAdd}>
-              {t('add')}
-            </Button>
-          </Col>
-        </Row>
-        {dataSource.length > 0 && (
-          <Row>
-            <Col span={7}> </Col>
-            <Col span={17}>
-              <Table
-                dataSource={dataSource}
-                columns={columns}
-                rowKey={'key'}
-                className={styles.variableTable}
-                components={components}
-                rowClassName={() => styles.editableRow}
-              />
-            </Col>
-          </Row>
-        )}
-      </section>
-    </section>
-  );
-};
-
-export default forwardRef(PromptEngine);
diff --git a/web/src/pages/chat/chat-container/index.less b/web/src/pages/chat/chat-container/index.less
deleted file mode 100644
index 8430b1ef6..000000000
--- a/web/src/pages/chat/chat-container/index.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.chatContainer {
-  padding: 0 0 24px 24px;
-  .messageContainer {
-    overflow-y: auto;
-    padding-right: 24px;
-  }
-}
diff --git a/web/src/pages/chat/chat-container/index.tsx b/web/src/pages/chat/chat-container/index.tsx
deleted file mode 100644
index de5b41faf..000000000
--- a/web/src/pages/chat/chat-container/index.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import MessageItem from '@/components/message-item';
-import { MessageType } from '@/constants/chat';
-import { Flex, Spin } from 'antd';
-import {
-  useCreateConversationBeforeUploadDocument,
-  useGetFileIcon,
-  useGetSendButtonDisabled,
-  useSendButtonDisabled,
-  useSendNextMessage,
-} from '../hooks';
-import { buildMessageItemReference } from '../utils';
-
-import MessageInput from '@/components/message-input';
-import PdfDrawer from '@/components/pdf-drawer';
-import { useClickDrawer } from '@/components/pdf-drawer/hooks';
-import {
-  useFetchNextConversation,
-  useFetchNextDialog,
-  useGetChatSearchParams,
-} from '@/hooks/chat-hooks';
-import { useFetchUserInfo } from '@/hooks/user-setting-hooks';
-import { buildMessageUuidWithRole } from '@/utils/chat';
-import { memo } from 'react';
-import styles from './index.less';
-
-interface IProps {
-  controller: AbortController;
-}
-
-const ChatContainer = ({ controller }: IProps) => {
-  const { conversationId } = useGetChatSearchParams();
-  const { data: conversation } = useFetchNextConversation();
-  const { data: currentDialog } = useFetchNextDialog();
-
-  const {
-    value,
-    scrollRef,
-    messageContainerRef,
-    loading,
-    sendLoading,
-    derivedMessages,
-    handleInputChange,
-    handlePressEnter,
-    regenerateMessage,
-    removeMessageById,
-    stopOutputMessage,
-  } = useSendNextMessage(controller);
-
-  const { visible, hideModal, documentId, selectedChunk, clickDocumentButton } =
-    useClickDrawer();
-  const disabled = useGetSendButtonDisabled();
-  const sendDisabled = useSendButtonDisabled(value);
-  useGetFileIcon();
-  const { data: userInfo } = useFetchUserInfo();
-  const { createConversationBeforeUploadDocument } =
-    useCreateConversationBeforeUploadDocument();
-
-  return (
-    <>
-      <Flex flex={1} className={styles.chatContainer} vertical>
-        <Flex
-          flex={1}
-          vertical
-          className={styles.messageContainer}
-          ref={messageContainerRef}
-        >
-          <div>
-            <Spin spinning={loading}>
-              {derivedMessages?.map((message, i) => {
-                return (
-                  <MessageItem
-                    loading={
-                      message.role === MessageType.Assistant &&
-                      sendLoading &&
-                      derivedMessages.length - 1 === i
-                    }
-                    key={buildMessageUuidWithRole(message)}
-                    item={message}
-                    nickname={userInfo.nickname}
-                    avatar={userInfo.avatar}
-                    avatarDialog={currentDialog.icon}
-                    reference={buildMessageItemReference(
-                      {
-                        message: derivedMessages,
-                        reference: conversation.reference,
-                      },
-                      message,
-                    )}
-                    clickDocumentButton={clickDocumentButton}
-                    index={i}
-                    removeMessageById={removeMessageById}
-                    regenerateMessage={regenerateMessage}
-                    sendLoading={sendLoading}
-                  ></MessageItem>
-                );
-              })}
-            </Spin>
-          </div>
-          <div ref={scrollRef} />
-        </Flex>
-        <MessageInput
-          disabled={disabled}
-          sendDisabled={sendDisabled}
-          sendLoading={sendLoading}
-          value={value}
-          onInputChange={handleInputChange}
-          onPressEnter={handlePressEnter}
-          conversationId={conversationId}
-          createConversationBeforeUploadDocument={
-            createConversationBeforeUploadDocument
-          }
-          stopOutputMessage={stopOutputMessage}
-        ></MessageInput>
-      </Flex>
-      <PdfDrawer
-        visible={visible}
-        hideModal={hideModal}
-        documentId={documentId}
-        chunk={selectedChunk}
-      ></PdfDrawer>
-    </>
-  );
-};
-
-export default memo(ChatContainer);
diff --git a/web/src/pages/chat/chat-id-modal/index.less b/web/src/pages/chat/chat-id-modal/index.less
deleted file mode 100644
index c95b34c95..000000000
--- a/web/src/pages/chat/chat-id-modal/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.id {
-  .linkText();
-}
diff --git a/web/src/pages/chat/chat-id-modal/index.tsx b/web/src/pages/chat/chat-id-modal/index.tsx
deleted file mode 100644
index d640be055..000000000
--- a/web/src/pages/chat/chat-id-modal/index.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import { IModalProps } from '@/interfaces/common';
-import { Modal, Typography } from 'antd';
-
-import styles from './index.less';
-
-const { Paragraph, Link } = Typography;
-
-const ChatIdModal = ({
-  visible,
-  hideModal,
-  id,
-}: IModalProps<any> & { id: string; name?: string; idKey: string }) => {
-  const { t } = useTranslate('chat');
-
-  return (
-    <Modal
-      title={t('overview')}
-      open={visible}
-      onCancel={hideModal}
-      cancelButtonProps={{ style: { display: 'none' } }}
-      onOk={hideModal}
-      okText={t('close', { keyPrefix: 'common' })}
-    >
-      <Paragraph copyable={{ text: id }} className={styles.id}>
-        {id}
-      </Paragraph>
-      <Link
-        href="https://ragflow.io/docs/dev/http_api_reference#create-session-with-chat-assistant"
-        target="_blank"
-      >
-        {t('howUseId')}
-      </Link>
-    </Modal>
-  );
-};
-
-export default ChatIdModal;
diff --git a/web/src/pages/chat/constants.ts b/web/src/pages/chat/constants.ts
deleted file mode 100644
index 8c9a965f4..000000000
--- a/web/src/pages/chat/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const EmptyConversationId = 'empty';
diff --git a/web/src/pages/chat/context.ts b/web/src/pages/chat/context.ts
deleted file mode 100644
index 117641da5..000000000
--- a/web/src/pages/chat/context.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createContext } from 'react';
-
-export const ConversationContext = createContext<
-  null | ((isPlaying: boolean) => void)
->(null);
diff --git a/web/src/pages/chat/hooks.ts b/web/src/pages/chat/hooks.ts
deleted file mode 100644
index ce0d657cd..000000000
--- a/web/src/pages/chat/hooks.ts
+++ /dev/null
@@ -1,620 +0,0 @@
-import { ChatSearchParams, MessageType } from '@/constants/chat';
-import { fileIconMap } from '@/constants/common';
-import {
-  useFetchManualConversation,
-  useFetchManualDialog,
-  useFetchNextConversation,
-  useFetchNextConversationList,
-  useFetchNextDialog,
-  useFetchNextDialogList,
-  useGetChatSearchParams,
-  useRemoveNextConversation,
-  useRemoveNextDialog,
-  useSetNextDialog,
-  useUpdateNextConversation,
-} from '@/hooks/chat-hooks';
-import {
-  useSetModalState,
-  useShowDeleteConfirm,
-  useTranslate,
-} from '@/hooks/common-hooks';
-import {
-  useRegenerateMessage,
-  useSelectDerivedMessages,
-  useSendMessageWithSse,
-} from '@/hooks/logic-hooks';
-import { IConversation, IDialog, Message } from '@/interfaces/database/chat';
-import { getFileExtension } from '@/utils';
-import api from '@/utils/api';
-import { getConversationId } from '@/utils/chat';
-import { useMutationState } from '@tanstack/react-query';
-import { get } from 'lodash';
-import trim from 'lodash/trim';
-import {
-  ChangeEventHandler,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react';
-import { useSearchParams } from 'umi';
-import { v4 as uuid } from 'uuid';
-import {
-  IClientConversation,
-  IMessage,
-  VariableTableDataType,
-} from './interface';
-
-export const useSetChatRouteParams = () => {
-  const [currentQueryParameters, setSearchParams] = useSearchParams();
-  const newQueryParameters: URLSearchParams = useMemo(
-    () => new URLSearchParams(currentQueryParameters.toString()),
-    [currentQueryParameters],
-  );
-
-  const setConversationIsNew = useCallback(
-    (value: string) => {
-      newQueryParameters.set(ChatSearchParams.isNew, value);
-      setSearchParams(newQueryParameters);
-    },
-    [newQueryParameters, setSearchParams],
-  );
-
-  const getConversationIsNew = useCallback(() => {
-    return newQueryParameters.get(ChatSearchParams.isNew);
-  }, [newQueryParameters]);
-
-  return { setConversationIsNew, getConversationIsNew };
-};
-
-export const useSetNewConversationRouteParams = () => {
-  const [currentQueryParameters, setSearchParams] = useSearchParams();
-  const newQueryParameters: URLSearchParams = useMemo(
-    () => new URLSearchParams(currentQueryParameters.toString()),
-    [currentQueryParameters],
-  );
-
-  const setNewConversationRouteParams = useCallback(
-    (conversationId: string, isNew: string) => {
-      newQueryParameters.set(ChatSearchParams.ConversationId, conversationId);
-      newQueryParameters.set(ChatSearchParams.isNew, isNew);
-      setSearchParams(newQueryParameters);
-    },
-    [newQueryParameters, setSearchParams],
-  );
-
-  return { setNewConversationRouteParams };
-};
-
-export const useSelectCurrentDialog = () => {
-  const data = useMutationState({
-    filters: { mutationKey: ['fetchDialog'] },
-    select: (mutation) => {
-      return get(mutation, 'state.data.data', {});
-    },
-  });
-
-  return (data.at(-1) ?? {}) as IDialog;
-};
-
-export const useSelectPromptConfigParameters = (): VariableTableDataType[] => {
-  const { data: currentDialog } = useFetchNextDialog();
-
-  const finalParameters: VariableTableDataType[] = useMemo(() => {
-    const parameters = currentDialog?.prompt_config?.parameters ?? [];
-    if (!currentDialog.id) {
-      // The newly created chat has a default parameter
-      return [{ key: uuid(), variable: 'knowledge', optional: false }];
-    }
-    return parameters.map((x) => ({
-      key: uuid(),
-      variable: x.key,
-      optional: x.optional,
-    }));
-  }, [currentDialog]);
-
-  return finalParameters;
-};
-
-export const useDeleteDialog = () => {
-  const showDeleteConfirm = useShowDeleteConfirm();
-
-  const { removeDialog } = useRemoveNextDialog();
-
-  const onRemoveDialog = (dialogIds: Array<string>) => {
-    showDeleteConfirm({ onOk: () => removeDialog(dialogIds) });
-  };
-
-  return { onRemoveDialog };
-};
-
-export const useHandleItemHover = () => {
-  const [activated, setActivated] = useState<string>('');
-
-  const handleItemEnter = (id: string) => {
-    setActivated(id);
-  };
-
-  const handleItemLeave = () => {
-    setActivated('');
-  };
-
-  return {
-    activated,
-    handleItemEnter,
-    handleItemLeave,
-  };
-};
-
-export const useEditDialog = () => {
-  const [dialog, setDialog] = useState<IDialog>({} as IDialog);
-  const { fetchDialog } = useFetchManualDialog();
-  const { setDialog: submitDialog, loading } = useSetNextDialog();
-
-  const {
-    visible: dialogEditVisible,
-    hideModal: hideDialogEditModal,
-    showModal: showDialogEditModal,
-  } = useSetModalState();
-
-  const hideModal = useCallback(() => {
-    setDialog({} as IDialog);
-    hideDialogEditModal();
-  }, [hideDialogEditModal]);
-
-  const onDialogEditOk = useCallback(
-    async (dialog: IDialog) => {
-      const ret = await submitDialog(dialog);
-
-      if (ret === 0) {
-        hideModal();
-      }
-    },
-    [submitDialog, hideModal],
-  );
-
-  const handleShowDialogEditModal = useCallback(
-    async (dialogId?: string) => {
-      if (dialogId) {
-        const ret = await fetchDialog(dialogId);
-        if (ret.code === 0) {
-          setDialog(ret.data);
-        }
-      }
-      showDialogEditModal();
-    },
-    [showDialogEditModal, fetchDialog],
-  );
-
-  const clearDialog = useCallback(() => {
-    setDialog({} as IDialog);
-  }, []);
-
-  return {
-    dialogSettingLoading: loading,
-    initialDialog: dialog,
-    onDialogEditOk,
-    dialogEditVisible,
-    hideDialogEditModal: hideModal,
-    showDialogEditModal: handleShowDialogEditModal,
-    clearDialog,
-  };
-};
-
-//#region conversation
-
-const useFindPrologueFromDialogList = () => {
-  const { dialogId } = useGetChatSearchParams();
-  const { data: dialogList } = useFetchNextDialogList(true);
-  const prologue = useMemo(() => {
-    return dialogList.find((x) => x.id === dialogId)?.prompt_config.prologue;
-  }, [dialogId, dialogList]);
-
-  return prologue;
-};
-
-export const useSelectDerivedConversationList = () => {
-  const { t } = useTranslate('chat');
-
-  const [list, setList] = useState<Array<IConversation>>([]);
-  const { data: conversationList, loading } = useFetchNextConversationList();
-  const { dialogId } = useGetChatSearchParams();
-  const { setNewConversationRouteParams } = useSetNewConversationRouteParams();
-  const prologue = useFindPrologueFromDialogList();
-
-  const addTemporaryConversation = useCallback(() => {
-    const conversationId = getConversationId();
-    setList((pre) => {
-      if (dialogId) {
-        setNewConversationRouteParams(conversationId, 'true');
-        const nextList = [
-          {
-            id: conversationId,
-            name: t('newConversation'),
-            dialog_id: dialogId,
-            is_new: true,
-            message: [
-              {
-                content: prologue,
-                role: MessageType.Assistant,
-              },
-            ],
-          } as any,
-          ...conversationList,
-        ];
-        return nextList;
-      }
-
-      return pre;
-    });
-  }, [conversationList, dialogId, prologue, t, setNewConversationRouteParams]);
-
-  // When you first enter the page, select the top conversation card
-
-  useEffect(() => {
-    setList([...conversationList]);
-  }, [conversationList]);
-
-  return { list, addTemporaryConversation, loading };
-};
-
-export const useSetConversation = () => {
-  const { dialogId } = useGetChatSearchParams();
-  const { updateConversation } = useUpdateNextConversation();
-
-  const setConversation = useCallback(
-    async (
-      message: string,
-      isNew: boolean = false,
-      conversationId?: string,
-    ) => {
-      const data = await updateConversation({
-        dialog_id: dialogId,
-        name: message,
-        is_new: isNew,
-        conversation_id: conversationId,
-        message: [
-          {
-            role: MessageType.Assistant,
-            content: message,
-          },
-        ],
-      });
-
-      return data;
-    },
-    [updateConversation, dialogId],
-  );
-
-  return { setConversation };
-};
-
-export const useSelectNextMessages = () => {
-  const {
-    scrollRef,
-    messageContainerRef,
-    setDerivedMessages,
-    derivedMessages,
-    addNewestAnswer,
-    addNewestQuestion,
-    removeLatestMessage,
-    removeMessageById,
-    removeMessagesAfterCurrentMessage,
-  } = useSelectDerivedMessages();
-  const { data: conversation, loading } = useFetchNextConversation();
-  const { conversationId, dialogId, isNew } = useGetChatSearchParams();
-  const prologue = useFindPrologueFromDialogList();
-
-  const addPrologue = useCallback(() => {
-    if (dialogId !== '' && isNew === 'true') {
-      const nextMessage = {
-        role: MessageType.Assistant,
-        content: prologue,
-        id: uuid(),
-      } as IMessage;
-
-      setDerivedMessages([nextMessage]);
-    }
-  }, [dialogId, isNew, prologue, setDerivedMessages]);
-
-  useEffect(() => {
-    addPrologue();
-  }, [addPrologue]);
-
-  useEffect(() => {
-    if (
-      conversationId &&
-      isNew !== 'true' &&
-      conversation.message?.length > 0
-    ) {
-      setDerivedMessages(conversation.message);
-    }
-
-    if (!conversationId) {
-      setDerivedMessages([]);
-    }
-  }, [conversation.message, conversationId, setDerivedMessages, isNew]);
-
-  return {
-    scrollRef,
-    messageContainerRef,
-    derivedMessages,
-    loading,
-    addNewestAnswer,
-    addNewestQuestion,
-    removeLatestMessage,
-    removeMessageById,
-    removeMessagesAfterCurrentMessage,
-  };
-};
-
-export const useHandleMessageInputChange = () => {
-  const [value, setValue] = useState('');
-
-  const handleInputChange: ChangeEventHandler<HTMLTextAreaElement> = (e) => {
-    const value = e.target.value;
-    // const nextValue = value.replaceAll('\\n', '\n').replaceAll('\\t', '\t');
-    setValue(value);
-  };
-
-  return {
-    handleInputChange,
-    value,
-    setValue,
-  };
-};
-
-export const useSendNextMessage = (controller: AbortController) => {
-  const { setConversation } = useSetConversation();
-  const { conversationId, isNew } = useGetChatSearchParams();
-  const { handleInputChange, value, setValue } = useHandleMessageInputChange();
-
-  const { send, answer, done } = useSendMessageWithSse(
-    api.completeConversation,
-  );
-  const {
-    scrollRef,
-    messageContainerRef,
-    derivedMessages,
-    loading,
-    addNewestAnswer,
-    addNewestQuestion,
-    removeLatestMessage,
-    removeMessageById,
-    removeMessagesAfterCurrentMessage,
-  } = useSelectNextMessages();
-  const { setConversationIsNew, getConversationIsNew } =
-    useSetChatRouteParams();
-
-  const stopOutputMessage = useCallback(() => {
-    controller.abort();
-  }, [controller]);
-
-  const sendMessage = useCallback(
-    async ({
-      message,
-      currentConversationId,
-      messages,
-    }: {
-      message: Message;
-      currentConversationId?: string;
-      messages?: Message[];
-    }) => {
-      const res = await send(
-        {
-          conversation_id: currentConversationId ?? conversationId,
-          messages: [...(messages ?? derivedMessages ?? []), message],
-        },
-        controller,
-      );
-
-      if (res && (res?.response.status !== 200 || res?.data?.code !== 0)) {
-        // cancel loading
-        setValue(message.content);
-        console.info('removeLatestMessage111');
-        removeLatestMessage();
-      }
-    },
-    [
-      derivedMessages,
-      conversationId,
-      removeLatestMessage,
-      setValue,
-      send,
-      controller,
-    ],
-  );
-
-  const handleSendMessage = useCallback(
-    async (message: Message) => {
-      const isNew = getConversationIsNew();
-      if (isNew !== 'true') {
-        sendMessage({ message });
-      } else {
-        const data = await setConversation(
-          message.content,
-          true,
-          conversationId,
-        );
-        if (data.code === 0) {
-          setConversationIsNew('');
-          const id = data.data.id;
-          // currentConversationIdRef.current = id;
-          sendMessage({
-            message,
-            currentConversationId: id,
-            messages: data.data.message,
-          });
-        }
-      }
-    },
-    [
-      setConversation,
-      sendMessage,
-      setConversationIsNew,
-      getConversationIsNew,
-      conversationId,
-    ],
-  );
-
-  const { regenerateMessage } = useRegenerateMessage({
-    removeMessagesAfterCurrentMessage,
-    sendMessage,
-    messages: derivedMessages,
-  });
-
-  useEffect(() => {
-    //  #1289
-    if (answer.answer && conversationId && isNew !== 'true') {
-      addNewestAnswer(answer);
-    }
-  }, [answer, addNewestAnswer, conversationId, isNew]);
-
-  const handlePressEnter = useCallback(
-    (documentIds: string[]) => {
-      if (trim(value) === '') return;
-      const id = uuid();
-
-      addNewestQuestion({
-        content: value,
-        doc_ids: documentIds,
-        id,
-        role: MessageType.User,
-      });
-      if (done) {
-        setValue('');
-        handleSendMessage({
-          id,
-          content: value.trim(),
-          role: MessageType.User,
-          doc_ids: documentIds,
-        });
-      }
-    },
-    [addNewestQuestion, handleSendMessage, done, setValue, value],
-  );
-
-  return {
-    handlePressEnter,
-    handleInputChange,
-    value,
-    setValue,
-    regenerateMessage,
-    sendLoading: !done,
-    loading,
-    scrollRef,
-    messageContainerRef,
-    derivedMessages,
-    removeMessageById,
-    stopOutputMessage,
-  };
-};
-
-export const useGetFileIcon = () => {
-  const getFileIcon = (filename: string) => {
-    const ext: string = getFileExtension(filename);
-    const iconPath = fileIconMap[ext as keyof typeof fileIconMap];
-    return `@/assets/svg/file-icon/${iconPath}`;
-  };
-
-  return getFileIcon;
-};
-
-export const useDeleteConversation = () => {
-  const showDeleteConfirm = useShowDeleteConfirm();
-  const { removeConversation } = useRemoveNextConversation();
-
-  const deleteConversation = (conversationIds: Array<string>) => async () => {
-    const ret = await removeConversation(conversationIds);
-
-    return ret;
-  };
-
-  const onRemoveConversation = (conversationIds: Array<string>) => {
-    showDeleteConfirm({ onOk: deleteConversation(conversationIds) });
-  };
-
-  return { onRemoveConversation };
-};
-
-export const useRenameConversation = () => {
-  const [conversation, setConversation] = useState<IClientConversation>(
-    {} as IClientConversation,
-  );
-  const { fetchConversation } = useFetchManualConversation();
-  const {
-    visible: conversationRenameVisible,
-    hideModal: hideConversationRenameModal,
-    showModal: showConversationRenameModal,
-  } = useSetModalState();
-  const { updateConversation, loading } = useUpdateNextConversation();
-
-  const onConversationRenameOk = useCallback(
-    async (name: string) => {
-      const ret = await updateConversation({
-        conversation_id: conversation.id,
-        name,
-        is_new: false,
-      });
-
-      if (ret.code === 0) {
-        hideConversationRenameModal();
-      }
-    },
-    [updateConversation, conversation, hideConversationRenameModal],
-  );
-
-  const handleShowConversationRenameModal = useCallback(
-    async (conversationId: string) => {
-      const ret = await fetchConversation(conversationId);
-      if (ret.code === 0) {
-        setConversation(ret.data);
-      }
-      showConversationRenameModal();
-    },
-    [showConversationRenameModal, fetchConversation],
-  );
-
-  return {
-    conversationRenameLoading: loading,
-    initialConversationName: conversation.name,
-    onConversationRenameOk,
-    conversationRenameVisible,
-    hideConversationRenameModal,
-    showConversationRenameModal: handleShowConversationRenameModal,
-  };
-};
-
-export const useGetSendButtonDisabled = () => {
-  const { dialogId, conversationId } = useGetChatSearchParams();
-
-  return dialogId === '' || conversationId === '';
-};
-
-export const useSendButtonDisabled = (value: string) => {
-  return trim(value) === '';
-};
-
-export const useCreateConversationBeforeUploadDocument = () => {
-  const { setConversation } = useSetConversation();
-  const { dialogId } = useGetChatSearchParams();
-  const { getConversationIsNew } = useSetChatRouteParams();
-
-  const createConversationBeforeUploadDocument = useCallback(
-    async (message: string) => {
-      const isNew = getConversationIsNew();
-      if (isNew === 'true') {
-        const data = await setConversation(message, true);
-
-        return data;
-      }
-    },
-    [setConversation, getConversationIsNew],
-  );
-
-  return {
-    createConversationBeforeUploadDocument,
-    dialogId,
-  };
-};
-//#endregion
diff --git a/web/src/pages/chat/index.less b/web/src/pages/chat/index.less
deleted file mode 100644
index 58bcb26dc..000000000
--- a/web/src/pages/chat/index.less
+++ /dev/null
@@ -1,82 +0,0 @@
-.chatWrapper {
-  height: 100%;
-  width: 100%;
-
-  .chatAppWrapper {
-    width: 288px;
-    padding: 26px;
-
-    .chatAppContent {
-      overflow-y: auto;
-      width: 100%;
-    }
-
-    .chatAppCard {
-      :global(.ant-card-body) {
-        padding: 10px;
-      }
-      .cubeIcon {
-        &:hover {
-          cursor: pointer;
-        }
-      }
-    }
-    .chatAppCardSelected {
-      :global(.ant-card-body) {
-        background-color: @gray11;
-        border-radius: 8px;
-      }
-    }
-    .chatAppCardSelectedDark {
-      :global(.ant-card-body) {
-        background-color: rgba(255, 255, 255, 0.1);
-        border-radius: 8px;
-      }
-    }
-  }
-  .chatTitleWrapper {
-    width: 220px;
-    padding: 26px 0;
-  }
-
-  .chatTitle {
-    padding: 5px 15px;
-  }
-
-  .chatTitleContent {
-    padding: 5px 10px;
-    overflow: auto;
-  }
-
-  .chatSpin {
-    :global(.ant-spin-container) {
-      display: flex;
-      flex-direction: column;
-      gap: 10px;
-    }
-  }
-
-  .chatTitleCard {
-    :global(.ant-card-body) {
-      padding: 8px;
-    }
-  }
-
-  .chatTitleCardSelected {
-    :global(.ant-card-body) {
-      background-color: @gray11;
-      border-radius: 8px;
-    }
-  }
-  .chatTitleCardSelectedDark {
-    :global(.ant-card-body) {
-      background-color: rgba(255, 255, 255, 0.1);
-      border-radius: 8px;
-    }
-  }
-
-  .divider {
-    margin: 0;
-    height: 100%;
-  }
-}
diff --git a/web/src/pages/chat/index.tsx b/web/src/pages/chat/index.tsx
deleted file mode 100644
index 9c7d67e92..000000000
--- a/web/src/pages/chat/index.tsx
+++ /dev/null
@@ -1,393 +0,0 @@
-import { ReactComponent as ChatAppCube } from '@/assets/svg/chat-app-cube.svg';
-import RenameModal from '@/components/rename-modal';
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
-import {
-  Avatar,
-  Button,
-  Card,
-  Divider,
-  Dropdown,
-  Flex,
-  MenuProps,
-  Space,
-  Spin,
-  Tag,
-  Tooltip,
-  Typography,
-} from 'antd';
-import { MenuItemProps } from 'antd/lib/menu/MenuItem';
-import classNames from 'classnames';
-import { useCallback, useState } from 'react';
-import ChatConfigurationModal from './chat-configuration-modal';
-import ChatContainer from './chat-container';
-import {
-  useDeleteConversation,
-  useDeleteDialog,
-  useEditDialog,
-  useHandleItemHover,
-  useRenameConversation,
-  useSelectDerivedConversationList,
-} from './hooks';
-
-import EmbedModal from '@/components/api-service/embed-modal';
-import { useShowEmbedModal } from '@/components/api-service/hooks';
-import SvgIcon from '@/components/svg-icon';
-import { useTheme } from '@/components/theme-provider';
-import { SharedFrom } from '@/constants/chat';
-import {
-  useClickConversationCard,
-  useClickDialogCard,
-  useFetchNextDialogList,
-  useGetChatSearchParams,
-} from '@/hooks/chat-hooks';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useSetSelectedRecord } from '@/hooks/logic-hooks';
-import { IDialog } from '@/interfaces/database/chat';
-import { PictureInPicture2 } from 'lucide-react';
-import styles from './index.less';
-
-const { Text } = Typography;
-
-const Chat = () => {
-  const { data: dialogList, loading: dialogLoading } = useFetchNextDialogList();
-  const { onRemoveDialog } = useDeleteDialog();
-  const { onRemoveConversation } = useDeleteConversation();
-  const { handleClickDialog } = useClickDialogCard();
-  const { handleClickConversation } = useClickConversationCard();
-  const { dialogId, conversationId } = useGetChatSearchParams();
-  const { theme } = useTheme();
-  const {
-    list: conversationList,
-    addTemporaryConversation,
-    loading: conversationLoading,
-  } = useSelectDerivedConversationList();
-  const { activated, handleItemEnter, handleItemLeave } = useHandleItemHover();
-  const {
-    activated: conversationActivated,
-    handleItemEnter: handleConversationItemEnter,
-    handleItemLeave: handleConversationItemLeave,
-  } = useHandleItemHover();
-  const {
-    conversationRenameLoading,
-    initialConversationName,
-    onConversationRenameOk,
-    conversationRenameVisible,
-    hideConversationRenameModal,
-    showConversationRenameModal,
-  } = useRenameConversation();
-  const {
-    dialogSettingLoading,
-    initialDialog,
-    onDialogEditOk,
-    dialogEditVisible,
-    clearDialog,
-    hideDialogEditModal,
-    showDialogEditModal,
-  } = useEditDialog();
-  const { t } = useTranslate('chat');
-  const { currentRecord, setRecord } = useSetSelectedRecord<IDialog>();
-  const [controller, setController] = useState(new AbortController());
-  const { showEmbedModal, hideEmbedModal, embedVisible, beta } =
-    useShowEmbedModal();
-
-  const handleAppCardEnter = (id: string) => () => {
-    handleItemEnter(id);
-  };
-
-  const handleConversationCardEnter = (id: string) => () => {
-    handleConversationItemEnter(id);
-  };
-
-  const handleShowChatConfigurationModal =
-    (dialogId?: string): any =>
-    (info: any) => {
-      info?.domEvent?.preventDefault();
-      info?.domEvent?.stopPropagation();
-      showDialogEditModal(dialogId);
-    };
-
-  const handleRemoveDialog =
-    (dialogId: string): MenuItemProps['onClick'] =>
-    ({ domEvent }) => {
-      domEvent.preventDefault();
-      domEvent.stopPropagation();
-      onRemoveDialog([dialogId]);
-    };
-
-  const handleShowOverviewModal =
-    (dialog: IDialog): any =>
-    (info: any) => {
-      info?.domEvent?.preventDefault();
-      info?.domEvent?.stopPropagation();
-      setRecord(dialog);
-      showEmbedModal();
-    };
-
-  const handleRemoveConversation =
-    (conversationId: string): MenuItemProps['onClick'] =>
-    ({ domEvent }) => {
-      domEvent.preventDefault();
-      domEvent.stopPropagation();
-      onRemoveConversation([conversationId]);
-    };
-
-  const handleShowConversationRenameModal =
-    (conversationId: string): MenuItemProps['onClick'] =>
-    ({ domEvent }) => {
-      domEvent.preventDefault();
-      domEvent.stopPropagation();
-      showConversationRenameModal(conversationId);
-    };
-
-  const handleDialogCardClick = useCallback(
-    (dialogId: string) => () => {
-      handleClickDialog(dialogId);
-    },
-    [handleClickDialog],
-  );
-
-  const handleConversationCardClick = useCallback(
-    (conversationId: string, isNew: boolean) => () => {
-      handleClickConversation(conversationId, isNew ? 'true' : '');
-      setController((pre) => {
-        pre.abort();
-        return new AbortController();
-      });
-    },
-    [handleClickConversation],
-  );
-
-  const handleCreateTemporaryConversation = useCallback(() => {
-    addTemporaryConversation();
-  }, [addTemporaryConversation]);
-
-  const buildAppItems = (dialog: IDialog) => {
-    const dialogId = dialog.id;
-
-    const appItems: MenuProps['items'] = [
-      {
-        key: '1',
-        onClick: handleShowChatConfigurationModal(dialogId),
-        label: (
-          <Space>
-            <EditOutlined />
-            {t('edit', { keyPrefix: 'common' })}
-          </Space>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '2',
-        onClick: handleRemoveDialog(dialogId),
-        label: (
-          <Space>
-            <DeleteOutlined />
-            {t('delete', { keyPrefix: 'common' })}
-          </Space>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '3',
-        onClick: handleShowOverviewModal(dialog),
-        label: (
-          <Space>
-            {/* <KeyOutlined /> */}
-            <PictureInPicture2 className="size-4" />
-            {t('embedIntoSite', { keyPrefix: 'common' })}
-          </Space>
-        ),
-      },
-    ];
-
-    return appItems;
-  };
-
-  const buildConversationItems = (conversationId: string) => {
-    const appItems: MenuProps['items'] = [
-      {
-        key: '1',
-        onClick: handleShowConversationRenameModal(conversationId),
-        label: (
-          <Space>
-            <EditOutlined />
-            {t('rename', { keyPrefix: 'common' })}
-          </Space>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '2',
-        onClick: handleRemoveConversation(conversationId),
-        label: (
-          <Space>
-            <DeleteOutlined />
-            {t('delete', { keyPrefix: 'common' })}
-          </Space>
-        ),
-      },
-    ];
-
-    return appItems;
-  };
-
-  return (
-    <Flex className={styles.chatWrapper}>
-      <Flex className={styles.chatAppWrapper}>
-        <Flex flex={1} vertical>
-          <Button type="primary" onClick={handleShowChatConfigurationModal()}>
-            {t('createAssistant')}
-          </Button>
-          <Divider></Divider>
-          <Flex className={styles.chatAppContent} vertical gap={10}>
-            <Spin spinning={dialogLoading} wrapperClassName={styles.chatSpin}>
-              {dialogList.map((x) => (
-                <Card
-                  key={x.id}
-                  hoverable
-                  className={classNames(styles.chatAppCard, {
-                    [theme === 'dark'
-                      ? styles.chatAppCardSelectedDark
-                      : styles.chatAppCardSelected]: dialogId === x.id,
-                  })}
-                  onMouseEnter={handleAppCardEnter(x.id)}
-                  onMouseLeave={handleItemLeave}
-                  onClick={handleDialogCardClick(x.id)}
-                >
-                  <Flex justify="space-between" align="center">
-                    <Space size={15}>
-                      <Avatar src={x.icon} shape={'square'} />
-                      <section>
-                        <b>
-                          <Text
-                            ellipsis={{ tooltip: x.name }}
-                            style={{ width: 130 }}
-                          >
-                            {x.name}
-                          </Text>
-                        </b>
-                        <div>{x.description}</div>
-                      </section>
-                    </Space>
-                    {activated === x.id && (
-                      <section>
-                        <Dropdown menu={{ items: buildAppItems(x) }}>
-                          <ChatAppCube
-                            className={styles.cubeIcon}
-                          ></ChatAppCube>
-                        </Dropdown>
-                      </section>
-                    )}
-                  </Flex>
-                </Card>
-              ))}
-            </Spin>
-          </Flex>
-        </Flex>
-      </Flex>
-      <Divider type={'vertical'} className={styles.divider}></Divider>
-      <Flex className={styles.chatTitleWrapper}>
-        <Flex flex={1} vertical>
-          <Flex
-            justify={'space-between'}
-            align="center"
-            className={styles.chatTitle}
-          >
-            <Space>
-              <b>{t('chat')}</b>
-              <Tag>{conversationList.length}</Tag>
-            </Space>
-            <Tooltip title={t('newChat')}>
-              <div>
-                <SvgIcon
-                  name="plus-circle-fill"
-                  width={20}
-                  onClick={handleCreateTemporaryConversation}
-                ></SvgIcon>
-              </div>
-            </Tooltip>
-          </Flex>
-          <Divider></Divider>
-          <Flex vertical gap={10} className={styles.chatTitleContent}>
-            <Spin
-              spinning={conversationLoading}
-              wrapperClassName={styles.chatSpin}
-            >
-              {conversationList.map((x) => (
-                <Card
-                  key={x.id}
-                  hoverable
-                  onClick={handleConversationCardClick(x.id, x.is_new)}
-                  onMouseEnter={handleConversationCardEnter(x.id)}
-                  onMouseLeave={handleConversationItemLeave}
-                  className={classNames(styles.chatTitleCard, {
-                    [theme === 'dark'
-                      ? styles.chatTitleCardSelectedDark
-                      : styles.chatTitleCardSelected]: x.id === conversationId,
-                  })}
-                >
-                  <Flex justify="space-between" align="center">
-                    <div>
-                      <Text
-                        ellipsis={{ tooltip: x.name }}
-                        style={{ width: 150 }}
-                      >
-                        {x.name}
-                      </Text>
-                    </div>
-                    {conversationActivated === x.id &&
-                      x.id !== '' &&
-                      !x.is_new && (
-                        <section>
-                          <Dropdown
-                            menu={{ items: buildConversationItems(x.id) }}
-                          >
-                            <ChatAppCube
-                              className={styles.cubeIcon}
-                            ></ChatAppCube>
-                          </Dropdown>
-                        </section>
-                      )}
-                  </Flex>
-                </Card>
-              ))}
-            </Spin>
-          </Flex>
-        </Flex>
-      </Flex>
-      <Divider type={'vertical'} className={styles.divider}></Divider>
-      <ChatContainer controller={controller}></ChatContainer>
-      {dialogEditVisible && (
-        <ChatConfigurationModal
-          visible={dialogEditVisible}
-          initialDialog={initialDialog}
-          showModal={showDialogEditModal}
-          hideModal={hideDialogEditModal}
-          loading={dialogSettingLoading}
-          onOk={onDialogEditOk}
-          clearDialog={clearDialog}
-        ></ChatConfigurationModal>
-      )}
-      <RenameModal
-        visible={conversationRenameVisible}
-        hideModal={hideConversationRenameModal}
-        onOk={onConversationRenameOk}
-        initialName={initialConversationName}
-        loading={conversationRenameLoading}
-      ></RenameModal>
-
-      {embedVisible && (
-        <EmbedModal
-          visible={embedVisible}
-          hideModal={hideEmbedModal}
-          token={currentRecord.id}
-          form={SharedFrom.Chat}
-          beta={beta}
-          isAgent={false}
-        ></EmbedModal>
-      )}
-    </Flex>
-  );
-};
-
-export default Chat;
diff --git a/web/src/pages/chat/interface.ts b/web/src/pages/chat/interface.ts
deleted file mode 100644
index 570c6da21..000000000
--- a/web/src/pages/chat/interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { IConversation, IReference, Message } from '@/interfaces/database/chat';
-import { FormInstance } from 'antd';
-
-export interface ISegmentedContentProps {
-  show: boolean;
-  form: FormInstance;
-  setHasError: (hasError: boolean) => void;
-}
-
-export interface IVariable {
-  temperature: number;
-  top_p: number;
-  frequency_penalty: number;
-  presence_penalty: number;
-  max_tokens: number;
-}
-
-export interface VariableTableDataType {
-  key: string;
-  variable: string;
-  optional: boolean;
-}
-
-export type IPromptConfigParameters = Omit<VariableTableDataType, 'variable'>;
-
-export interface IMessage extends Message {
-  id: string;
-  reference?: IReference; // the latest news has reference
-}
-
-export interface IClientConversation extends IConversation {
-  message: IMessage[];
-}
diff --git a/web/src/pages/chat/share/index.less b/web/src/pages/chat/share/index.less
deleted file mode 100644
index 01e090061..000000000
--- a/web/src/pages/chat/share/index.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.chatWrapper {
-  height: 100vh;
-}
-
-.chatContainer {
-  padding: 10px;
-  box-sizing: border-box;
-  height: 100%;
-  .messageContainer {
-    overflow-y: auto;
-    padding-right: 6px;
-  }
-}
diff --git a/web/src/pages/chat/share/index.tsx b/web/src/pages/chat/share/index.tsx
deleted file mode 100644
index acaadcbf9..000000000
--- a/web/src/pages/chat/share/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import ChatContainer from './large';
-
-import styles from './index.less';
-
-const SharedChat = () => {
-  return (
-    <div className={styles.chatWrapper}>
-      <ChatContainer></ChatContainer>
-    </div>
-  );
-};
-
-export default SharedChat;
diff --git a/web/src/pages/chat/share/large.tsx b/web/src/pages/chat/share/large.tsx
deleted file mode 100644
index dfdd8c5a7..000000000
--- a/web/src/pages/chat/share/large.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import MessageInput from '@/components/message-input';
-import MessageItem from '@/components/message-item';
-import { useClickDrawer } from '@/components/pdf-drawer/hooks';
-import { MessageType, SharedFrom } from '@/constants/chat';
-import { useSendButtonDisabled } from '@/pages/chat/hooks';
-import { Flex, Spin } from 'antd';
-import React, { forwardRef, useMemo } from 'react';
-import {
-  useGetSharedChatSearchParams,
-  useSendSharedMessage,
-} from '../shared-hooks';
-import { buildMessageItemReference } from '../utils';
-
-import PdfDrawer from '@/components/pdf-drawer';
-import { useFetchNextConversationSSE } from '@/hooks/chat-hooks';
-import { useFetchFlowSSE } from '@/hooks/flow-hooks';
-import i18n from '@/locales/config';
-import { buildMessageUuidWithRole } from '@/utils/chat';
-import styles from './index.less';
-
-const ChatContainer = () => {
-  const {
-    sharedId: conversationId,
-    from,
-    locale,
-    visibleAvatar,
-  } = useGetSharedChatSearchParams();
-  const { visible, hideModal, documentId, selectedChunk, clickDocumentButton } =
-    useClickDrawer();
-
-  const {
-    handlePressEnter,
-    handleInputChange,
-    value,
-    sendLoading,
-    loading,
-    ref,
-    derivedMessages,
-    hasError,
-    stopOutputMessage,
-  } = useSendSharedMessage();
-  const sendDisabled = useSendButtonDisabled(value);
-
-  const useFetchAvatar = useMemo(() => {
-    return from === SharedFrom.Agent
-      ? useFetchFlowSSE
-      : useFetchNextConversationSSE;
-  }, [from]);
-  React.useEffect(() => {
-    if (locale && i18n.language !== locale) {
-      i18n.changeLanguage(locale);
-    }
-  }, [locale, visibleAvatar]);
-  const { data: avatarData } = useFetchAvatar();
-
-  if (!conversationId) {
-    return <div>empty</div>;
-  }
-
-  return (
-    <>
-      <Flex flex={1} className={styles.chatContainer} vertical>
-        <Flex flex={1} vertical className={styles.messageContainer}>
-          <div>
-            <Spin spinning={loading}>
-              {derivedMessages?.map((message, i) => {
-                return (
-                  <MessageItem
-                    visibleAvatar={visibleAvatar}
-                    key={buildMessageUuidWithRole(message)}
-                    avatarDialog={avatarData?.avatar}
-                    item={message}
-                    nickname="You"
-                    reference={buildMessageItemReference(
-                      {
-                        message: derivedMessages,
-                        reference: [],
-                      },
-                      message,
-                    )}
-                    loading={
-                      message.role === MessageType.Assistant &&
-                      sendLoading &&
-                      derivedMessages?.length - 1 === i
-                    }
-                    index={i}
-                    clickDocumentButton={clickDocumentButton}
-                    showLikeButton={false}
-                    showLoudspeaker={false}
-                  ></MessageItem>
-                );
-              })}
-            </Spin>
-          </div>
-          <div ref={ref} />
-        </Flex>
-
-        <MessageInput
-          isShared
-          value={value}
-          disabled={hasError}
-          sendDisabled={sendDisabled}
-          conversationId={conversationId}
-          onInputChange={handleInputChange}
-          onPressEnter={handlePressEnter}
-          sendLoading={sendLoading}
-          uploadMethod="external_upload_and_parse"
-          showUploadIcon={false}
-          stopOutputMessage={stopOutputMessage}
-        ></MessageInput>
-      </Flex>
-      {visible && (
-        <PdfDrawer
-          visible={visible}
-          hideModal={hideModal}
-          documentId={documentId}
-          chunk={selectedChunk}
-        ></PdfDrawer>
-      )}
-    </>
-  );
-};
-
-export default forwardRef(ChatContainer);
diff --git a/web/src/pages/chat/shared-hooks.ts b/web/src/pages/chat/shared-hooks.ts
deleted file mode 100644
index be5d49ffe..000000000
--- a/web/src/pages/chat/shared-hooks.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { MessageType, SharedFrom } from '@/constants/chat';
-import { useCreateNextSharedConversation } from '@/hooks/chat-hooks';
-import {
-  useSelectDerivedMessages,
-  useSendMessageWithSse,
-} from '@/hooks/logic-hooks';
-import { Message } from '@/interfaces/database/chat';
-import { message } from 'antd';
-import { get } from 'lodash';
-import trim from 'lodash/trim';
-import { useCallback, useEffect, useState } from 'react';
-import { useSearchParams } from 'umi';
-import { v4 as uuid } from 'uuid';
-import { useHandleMessageInputChange } from './hooks';
-
-const isCompletionError = (res: any) =>
-  res && (res?.response.status !== 200 || res?.data?.code !== 0);
-
-export const useSendButtonDisabled = (value: string) => {
-  return trim(value) === '';
-};
-
-export const useGetSharedChatSearchParams = () => {
-  const [searchParams] = useSearchParams();
-  const data_prefix = 'data_';
-  const data = Object.fromEntries(
-    searchParams
-      .entries()
-      .filter(([key]) => key.startsWith(data_prefix))
-      .map(([key, value]) => [key.replace(data_prefix, ''), value]),
-  );
-  return {
-    from: searchParams.get('from') as SharedFrom,
-    sharedId: searchParams.get('shared_id'),
-    locale: searchParams.get('locale'),
-    data: data,
-    visibleAvatar: searchParams.get('visible_avatar')
-      ? searchParams.get('visible_avatar') !== '1'
-      : true,
-  };
-};
-
-export const useSendSharedMessage = () => {
-  const {
-    from,
-    sharedId: conversationId,
-    data: data,
-  } = useGetSharedChatSearchParams();
-  const { createSharedConversation: setConversation } =
-    useCreateNextSharedConversation();
-  const { handleInputChange, value, setValue } = useHandleMessageInputChange();
-  const { send, answer, done, stopOutputMessage } = useSendMessageWithSse(
-    `/api/v1/${from === SharedFrom.Agent ? 'agentbots' : 'chatbots'}/${conversationId}/completions`,
-  );
-  const {
-    derivedMessages,
-    ref,
-    removeLatestMessage,
-    addNewestAnswer,
-    addNewestQuestion,
-  } = useSelectDerivedMessages();
-  const [hasError, setHasError] = useState(false);
-
-  const sendMessage = useCallback(
-    async (message: Message, id?: string) => {
-      const res = await send({
-        conversation_id: id ?? conversationId,
-        quote: true,
-        question: message.content,
-        session_id: get(derivedMessages, '0.session_id'),
-      });
-
-      if (isCompletionError(res)) {
-        // cancel loading
-        setValue(message.content);
-        removeLatestMessage();
-      }
-    },
-    [send, conversationId, derivedMessages, setValue, removeLatestMessage],
-  );
-
-  const handleSendMessage = useCallback(
-    async (message: Message) => {
-      if (conversationId !== '') {
-        sendMessage(message);
-      } else {
-        const data = await setConversation('user id');
-        if (data.code === 0) {
-          const id = data.data.id;
-          sendMessage(message, id);
-        }
-      }
-    },
-    [conversationId, setConversation, sendMessage],
-  );
-
-  const fetchSessionId = useCallback(async () => {
-    const payload = { question: '' };
-    const ret = await send({ ...payload, ...data });
-    if (isCompletionError(ret)) {
-      message.error(ret?.data.message);
-      setHasError(true);
-    }
-  }, [send]);
-
-  useEffect(() => {
-    fetchSessionId();
-  }, [fetchSessionId, send]);
-
-  useEffect(() => {
-    if (answer.answer) {
-      addNewestAnswer(answer);
-    }
-  }, [answer, addNewestAnswer]);
-
-  const handlePressEnter = useCallback(
-    (documentIds: string[]) => {
-      if (trim(value) === '') return;
-      const id = uuid();
-      if (done) {
-        setValue('');
-        addNewestQuestion({
-          content: value,
-          doc_ids: documentIds,
-          id,
-          role: MessageType.User,
-        });
-        handleSendMessage({
-          content: value.trim(),
-          id,
-          role: MessageType.User,
-        });
-      }
-    },
-    [addNewestQuestion, done, handleSendMessage, setValue, value],
-  );
-
-  return {
-    handlePressEnter,
-    handleInputChange,
-    value,
-    sendLoading: !done,
-    ref,
-    loading: false,
-    derivedMessages,
-    hasError,
-    stopOutputMessage,
-  };
-};
diff --git a/web/src/pages/chat/utils.ts b/web/src/pages/chat/utils.ts
deleted file mode 100644
index e3e4f5ff2..000000000
--- a/web/src/pages/chat/utils.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { MessageType } from '@/constants/chat';
-import { IConversation, IReference } from '@/interfaces/database/chat';
-import { isEmpty } from 'lodash';
-import { EmptyConversationId } from './constants';
-import { IMessage } from './interface';
-
-export const isConversationIdExist = (conversationId: string) => {
-  return conversationId !== EmptyConversationId && conversationId !== '';
-};
-
-export const getDocumentIdsFromConversionReference = (data: IConversation) => {
-  const documentIds = data.reference.reduce(
-    (pre: Array<string>, cur: IReference) => {
-      cur.doc_aggs
-        ?.map((x) => x.doc_id)
-        .forEach((x) => {
-          if (pre.every((y) => y !== x)) {
-            pre.push(x);
-          }
-        });
-      return pre;
-    },
-    [],
-  );
-  return documentIds.join(',');
-};
-
-export const buildMessageItemReference = (
-  conversation: { message: IMessage[]; reference: IReference[] },
-  message: IMessage,
-) => {
-  const assistantMessages = conversation.message
-    ?.filter((x) => x.role === MessageType.Assistant)
-    .slice(1);
-  const referenceIndex = assistantMessages.findIndex(
-    (x) => x.id === message.id,
-  );
-  const reference = !isEmpty(message?.reference)
-    ? message?.reference
-    : (conversation?.reference ?? [])[referenceIndex];
-
-  return reference ?? { doc_aggs: [], chunks: [], total: 0 };
-};
-
-const oldReg = /(#{2}\d+\${2})/g;
-export const currentReg = /\[ID:(\d+)\]/g;
-
-// To be compatible with the old index matching mode
-export const replaceTextByOldReg = (text: string) => {
-  return text?.replace(oldReg, (substring: string) => {
-    return `[ID:${substring.slice(2, -2)}]`;
-  });
-};
diff --git a/web/src/pages/chunk/parsed-result/add-knowledge/constant.ts b/web/src/pages/chunk/parsed-result/add-knowledge/constant.ts
index 71df266c8..fb4eecc3f 100644
--- a/web/src/pages/chunk/parsed-result/add-knowledge/constant.ts
+++ b/web/src/pages/chunk/parsed-result/add-knowledge/constant.ts
@@ -1,21 +1,4 @@
-import { KnowledgeRouteKey } from '@/constants/knowledge';
-
-export const routeMap = {
-  [KnowledgeRouteKey.Dataset]: 'Dataset',
-  [KnowledgeRouteKey.Testing]: 'Retrieval testing',
-  [KnowledgeRouteKey.Configuration]: 'Configuration',
-};
-
 export enum KnowledgeDatasetRouteKey {
   Chunk = 'chunk',
   File = 'file',
 }
-
-export const datasetRouteMap = {
-  [KnowledgeDatasetRouteKey.Chunk]: 'Chunk',
-  [KnowledgeDatasetRouteKey.File]: 'File Upload',
-};
-
-export * from '@/constants/knowledge';
-
-export const TagRenameId = 'tagRename';
diff --git a/web/src/pages/data-flow/constant.tsx b/web/src/pages/data-flow/constant.tsx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/src/pages/data-flow/form/parser-form/index.tsx b/web/src/pages/data-flow/form/parser-form/index.tsx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/src/pages/data-flow/form/parser-form/pdf-form-fields.tsx b/web/src/pages/data-flow/form/parser-form/pdf-form-fields.tsx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/src/pages/data-flow/form/parser-form/ppt-form-fields.tsx b/web/src/pages/data-flow/form/parser-form/ppt-form-fields.tsx
deleted file mode 100644
index 59b179498..000000000
--- a/web/src/pages/data-flow/form/parser-form/ppt-form-fields.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ParseDocumentType } from '@/components/layout-recognize-form-field';
-import { isEmpty } from 'lodash';
-import { useEffect } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { ParserMethodFormField } from './common-form-fields';
-import { CommonProps } from './interface';
-import { buildFieldNameWithPrefix } from './utils';
-
-export function PptFormFields({ prefix }: CommonProps) {
-  const form = useFormContext();
-
-  const parseMethodName = buildFieldNameWithPrefix('parse_method', prefix);
-
-  // PPT only supports DeepDOC and TCADPParser
-  const optionsWithoutLLM = [
-    { label: ParseDocumentType.DeepDOC, value: ParseDocumentType.DeepDOC },
-    {
-      label: ParseDocumentType.TCADPParser,
-      value: ParseDocumentType.TCADPParser,
-    },
-  ];
-
-  useEffect(() => {
-    if (isEmpty(form.getValues(parseMethodName))) {
-      form.setValue(parseMethodName, ParseDocumentType.DeepDOC, {
-        shouldValidate: true,
-        shouldDirty: true,
-      });
-    }
-  }, [form, parseMethodName]);
-
-  return (
-    <>
-      <ParserMethodFormField
-        prefix={prefix}
-        optionsWithoutLLM={optionsWithoutLLM}
-      ></ParserMethodFormField>
-    </>
-  );
-}
diff --git a/web/src/pages/data-flow/form/parser-form/spreadsheet-form-fields.tsx b/web/src/pages/data-flow/form/parser-form/spreadsheet-form-fields.tsx
deleted file mode 100644
index 443ff6e18..000000000
--- a/web/src/pages/data-flow/form/parser-form/spreadsheet-form-fields.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ParseDocumentType } from '@/components/layout-recognize-form-field';
-import { isEmpty } from 'lodash';
-import { useEffect } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { ParserMethodFormField } from './common-form-fields';
-import { CommonProps } from './interface';
-import { buildFieldNameWithPrefix } from './utils';
-
-export function SpreadsheetFormFields({ prefix }: CommonProps) {
-  const form = useFormContext();
-
-  const parseMethodName = buildFieldNameWithPrefix('parse_method', prefix);
-
-  // Spreadsheet only supports DeepDOC and TCADPParser
-  const optionsWithoutLLM = [
-    { label: ParseDocumentType.DeepDOC, value: ParseDocumentType.DeepDOC },
-    {
-      label: ParseDocumentType.TCADPParser,
-      value: ParseDocumentType.TCADPParser,
-    },
-  ];
-
-  useEffect(() => {
-    if (isEmpty(form.getValues(parseMethodName))) {
-      form.setValue(parseMethodName, ParseDocumentType.DeepDOC, {
-        shouldValidate: true,
-        shouldDirty: true,
-      });
-    }
-  }, [form, parseMethodName]);
-
-  return (
-    <>
-      <ParserMethodFormField
-        prefix={prefix}
-        optionsWithoutLLM={optionsWithoutLLM}
-      ></ParserMethodFormField>
-    </>
-  );
-}
diff --git a/web/src/pages/data-flow/utils.ts b/web/src/pages/data-flow/utils.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/src/pages/data-flows/index.tsx b/web/src/pages/data-flows/index.tsx
deleted file mode 100644
index 13ee9742c..000000000
--- a/web/src/pages/data-flows/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function DataFlows() {
-  return <section>xx</section>;
-}
diff --git a/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/index.tsx b/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/index.tsx
index b95907f92..86b8780e8 100644
--- a/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/index.tsx
+++ b/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/index.tsx
@@ -6,9 +6,9 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { LoadingButton } from '@/components/ui/loading-button';
+import { TagRenameId } from '@/constants/knowledge';
 import { useTagIsRenaming } from '@/hooks/knowledge-hooks';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 import { RenameForm } from './rename-form';
 
diff --git a/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/rename-form.tsx b/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/rename-form.tsx
index 9c8f1cf7e..9ba2407ab 100644
--- a/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/rename-form.tsx
+++ b/web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/rename-form.tsx
@@ -13,9 +13,9 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
+import { TagRenameId } from '@/constants/knowledge';
 import { useRenameTag } from '@/hooks/knowledge-hooks';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/web/src/pages/dataset/dataset/set-meta-dialog.tsx b/web/src/pages/dataset/dataset/set-meta-dialog.tsx
index 8636ddda6..ff5aeabc2 100644
--- a/web/src/pages/dataset/dataset/set-meta-dialog.tsx
+++ b/web/src/pages/dataset/dataset/set-meta-dialog.tsx
@@ -5,8 +5,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 
 import { zodResolver } from '@hookform/resolvers/zod';
diff --git a/web/src/pages/file-manager/action-cell/index.tsx b/web/src/pages/file-manager/action-cell/index.tsx
deleted file mode 100644
index 7280b5918..000000000
--- a/web/src/pages/file-manager/action-cell/index.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import NewDocumentLink from '@/components/new-document-link';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useDownloadFile } from '@/hooks/file-manager-hooks';
-import { IFile } from '@/interfaces/database/file-manager';
-import {
-  getExtension,
-  isSupportedPreviewDocumentType,
-} from '@/utils/document-util';
-import {
-  DownloadOutlined,
-  EditOutlined,
-  EyeOutlined,
-  LinkOutlined,
-} from '@ant-design/icons';
-import { Button, Space, Tooltip } from 'antd';
-import { FolderInput, Trash2 } from 'lucide-react';
-import { useHandleDeleteFile } from '../hooks';
-
-interface IProps {
-  record: IFile;
-  setCurrentRecord: (record: any) => void;
-  showRenameModal: (record: IFile) => void;
-  showMoveFileModal: (ids: string[]) => void;
-  showConnectToKnowledgeModal: (record: IFile) => void;
-  setSelectedRowKeys(keys: string[]): void;
-}
-
-const ActionCell = ({
-  record,
-  setCurrentRecord,
-  showRenameModal,
-  showConnectToKnowledgeModal,
-  setSelectedRowKeys,
-  showMoveFileModal,
-}: IProps) => {
-  const documentId = record.id;
-  const beingUsed = false;
-  const { t } = useTranslate('fileManager');
-  const { handleRemoveFile } = useHandleDeleteFile(
-    [documentId],
-    setSelectedRowKeys,
-  );
-  const { downloadFile, loading } = useDownloadFile();
-  const extension = getExtension(record.name);
-  const isKnowledgeBase = record.source_type === 'knowledgebase';
-
-  const onDownloadDocument = () => {
-    downloadFile({
-      id: documentId,
-      filename: record.name,
-    });
-  };
-
-  const setRecord = () => {
-    setCurrentRecord(record);
-  };
-
-  const onShowRenameModal = () => {
-    setRecord();
-    showRenameModal(record);
-  };
-
-  const onShowConnectToKnowledgeModal = () => {
-    showConnectToKnowledgeModal(record);
-  };
-
-  const onShowMoveFileModal = () => {
-    showMoveFileModal([documentId]);
-  };
-
-  return (
-    <Space size={0}>
-      {isKnowledgeBase || (
-        <Tooltip title={t('addToKnowledge')}>
-          <Button type="text" onClick={onShowConnectToKnowledgeModal}>
-            <LinkOutlined size={20} />
-          </Button>
-        </Tooltip>
-      )}
-
-      {isKnowledgeBase || (
-        <Tooltip title={t('rename', { keyPrefix: 'common' })}>
-          <Button type="text" disabled={beingUsed} onClick={onShowRenameModal}>
-            <EditOutlined size={20} />
-          </Button>
-        </Tooltip>
-      )}
-      {isKnowledgeBase || (
-        <Tooltip title={t('move', { keyPrefix: 'common' })}>
-          <Button
-            type="text"
-            disabled={beingUsed}
-            onClick={onShowMoveFileModal}
-            className="flex items-end"
-          >
-            <FolderInput className="size-4" />
-          </Button>
-        </Tooltip>
-      )}
-      {isKnowledgeBase || (
-        <Tooltip title={t('delete', { keyPrefix: 'common' })}>
-          <Button
-            type="text"
-            disabled={beingUsed}
-            onClick={handleRemoveFile}
-            className="flex items-end"
-          >
-            <Trash2 className="size-4" />
-          </Button>
-        </Tooltip>
-      )}
-      {record.type !== 'folder' && (
-        <Tooltip title={t('download', { keyPrefix: 'common' })}>
-          <Button
-            type="text"
-            disabled={beingUsed}
-            loading={loading}
-            onClick={onDownloadDocument}
-          >
-            <DownloadOutlined size={20} />
-          </Button>
-        </Tooltip>
-      )}
-      {isSupportedPreviewDocumentType(extension) && (
-        <NewDocumentLink
-          documentId={documentId}
-          documentName={record.name}
-          color="black"
-        >
-          <Tooltip title={t('preview')}>
-            <Button type="text">
-              <EyeOutlined size={20} />
-            </Button>
-          </Tooltip>
-        </NewDocumentLink>
-      )}
-    </Space>
-  );
-};
-
-export default ActionCell;
diff --git a/web/src/pages/file-manager/connect-to-knowledge-modal/index.tsx b/web/src/pages/file-manager/connect-to-knowledge-modal/index.tsx
deleted file mode 100644
index d32df3596..000000000
--- a/web/src/pages/file-manager/connect-to-knowledge-modal/index.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import { useFetchKnowledgeList } from '@/hooks/knowledge-hooks';
-import { IModalProps } from '@/interfaces/common';
-import { filterOptionsByInput } from '@/utils/common-util';
-import { Form, Modal, Select } from 'antd';
-import { useEffect } from 'react';
-
-const ConnectToKnowledgeModal = ({
-  visible,
-  hideModal,
-  onOk,
-  initialValue,
-  loading,
-}: IModalProps<string[]> & { initialValue: string[] }) => {
-  const [form] = Form.useForm();
-  const { list } = useFetchKnowledgeList();
-  const { t } = useTranslate('fileManager');
-
-  const options = list?.map((item) => ({
-    label: item.name,
-    value: item.id,
-  }));
-
-  const handleOk = async () => {
-    const values = await form.getFieldsValue();
-    const knowledgeIds = values.knowledgeIds ?? [];
-    return onOk?.(knowledgeIds);
-  };
-
-  useEffect(() => {
-    if (visible) {
-      form.setFieldValue('knowledgeIds', initialValue);
-    }
-  }, [visible, initialValue, form]);
-
-  return (
-    <Modal
-      title={t('addToKnowledge')}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      confirmLoading={loading}
-    >
-      <Form form={form}>
-        <Form.Item name="knowledgeIds" noStyle>
-          <Select
-            mode="multiple"
-            allowClear
-            showSearch
-            style={{ width: '100%' }}
-            placeholder={t('pleaseSelect')}
-            options={options}
-            optionFilterProp="children"
-            filterOption={filterOptionsByInput}
-          />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default ConnectToKnowledgeModal;
diff --git a/web/src/pages/file-manager/file-toolbar.tsx b/web/src/pages/file-manager/file-toolbar.tsx
deleted file mode 100644
index 8d65ec670..000000000
--- a/web/src/pages/file-manager/file-toolbar.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { useTranslate } from '@/hooks/common-hooks';
-import {
-  IListResult,
-  useFetchParentFolderList,
-} from '@/hooks/file-manager-hooks';
-import {
-  DownOutlined,
-  FileTextOutlined,
-  FolderOpenOutlined,
-  PlusOutlined,
-  SearchOutlined,
-} from '@ant-design/icons';
-import {
-  Breadcrumb,
-  BreadcrumbProps,
-  Button,
-  Dropdown,
-  Flex,
-  Input,
-  MenuProps,
-  Space,
-} from 'antd';
-import { useCallback, useMemo } from 'react';
-import {
-  useHandleBreadcrumbClick,
-  useHandleDeleteFile,
-  useSelectBreadcrumbItems,
-} from './hooks';
-
-import { FolderInput, Trash2 } from 'lucide-react';
-import styles from './index.less';
-
-interface IProps
-  extends Pick<IListResult, 'searchString' | 'handleInputChange'> {
-  selectedRowKeys: string[];
-  showFolderCreateModal: () => void;
-  showFileUploadModal: () => void;
-  setSelectedRowKeys: (keys: string[]) => void;
-  showMoveFileModal: (ids: string[]) => void;
-}
-
-const FileToolbar = ({
-  selectedRowKeys,
-  showFolderCreateModal,
-  showFileUploadModal,
-  setSelectedRowKeys,
-  searchString,
-  handleInputChange,
-  showMoveFileModal,
-}: IProps) => {
-  const { t } = useTranslate('knowledgeDetails');
-  const breadcrumbItems = useSelectBreadcrumbItems();
-  const { handleBreadcrumbClick } = useHandleBreadcrumbClick();
-  const parentFolderList = useFetchParentFolderList();
-  const isKnowledgeBase =
-    parentFolderList.at(-1)?.source_type === 'knowledgebase';
-
-  const itemRender: BreadcrumbProps['itemRender'] = (
-    currentRoute,
-    params,
-    items,
-  ) => {
-    const isLast = currentRoute?.path === items[items.length - 1]?.path;
-
-    return isLast ? (
-      <span>{currentRoute.title}</span>
-    ) : (
-      <span
-        className={styles.breadcrumbItemButton}
-        onClick={() => handleBreadcrumbClick(currentRoute.path)}
-      >
-        {currentRoute.title}
-      </span>
-    );
-  };
-
-  const actionItems: MenuProps['items'] = useMemo(() => {
-    return [
-      {
-        key: '1',
-        onClick: showFileUploadModal,
-        label: (
-          <div>
-            <Button type="link">
-              <Space>
-                <FileTextOutlined />
-                {t('uploadFile', { keyPrefix: 'fileManager' })}
-              </Space>
-            </Button>
-          </div>
-        ),
-      },
-      { type: 'divider' },
-      {
-        key: '2',
-        onClick: showFolderCreateModal,
-        label: (
-          <div>
-            <Button type="link">
-              <Space>
-                <FolderOpenOutlined />
-                {t('newFolder', { keyPrefix: 'fileManager' })}
-              </Space>
-            </Button>
-          </div>
-        ),
-      },
-    ];
-  }, [t, showFolderCreateModal, showFileUploadModal]);
-
-  const { handleRemoveFile } = useHandleDeleteFile(
-    selectedRowKeys,
-    setSelectedRowKeys,
-  );
-
-  const handleShowMoveFileModal = useCallback(() => {
-    showMoveFileModal(selectedRowKeys);
-  }, [selectedRowKeys, showMoveFileModal]);
-
-  const disabled = selectedRowKeys.length === 0;
-
-  const items: MenuProps['items'] = useMemo(() => {
-    return [
-      {
-        key: '4',
-        onClick: handleRemoveFile,
-        label: (
-          <Flex gap={10}>
-            <span className="flex items-center justify-center">
-              <Trash2 className="size-4" />
-            </span>
-            <b>{t('delete', { keyPrefix: 'common' })}</b>
-          </Flex>
-        ),
-      },
-      {
-        key: '5',
-        onClick: handleShowMoveFileModal,
-        label: (
-          <Flex gap={10}>
-            <span className="flex items-center justify-center">
-              <FolderInput className="size-4"></FolderInput>
-            </span>
-            <b>{t('move', { keyPrefix: 'common' })}</b>
-          </Flex>
-        ),
-      },
-    ];
-  }, [handleShowMoveFileModal, t, handleRemoveFile]);
-
-  return (
-    <div className={styles.filter}>
-      <Breadcrumb items={breadcrumbItems} itemRender={itemRender} />
-      <Space>
-        {isKnowledgeBase || (
-          <Dropdown
-            menu={{ items }}
-            placement="bottom"
-            arrow={false}
-            disabled={disabled}
-          >
-            <Button>
-              <Space>
-                <b> {t('bulk')}</b>
-                <DownOutlined />
-              </Space>
-            </Button>
-          </Dropdown>
-        )}
-        <Input
-          placeholder={t('searchFiles')}
-          value={searchString}
-          style={{ width: 220 }}
-          allowClear
-          onChange={handleInputChange}
-          prefix={<SearchOutlined />}
-        />
-
-        {isKnowledgeBase || (
-          <Dropdown menu={{ items: actionItems }} trigger={['click']}>
-            <Button type="primary" icon={<PlusOutlined />}>
-              {t('addFile')}
-            </Button>
-          </Dropdown>
-        )}
-      </Space>
-    </div>
-  );
-};
-
-export default FileToolbar;
diff --git a/web/src/pages/file-manager/folder-create-modal/index.tsx b/web/src/pages/file-manager/folder-create-modal/index.tsx
deleted file mode 100644
index d336a01b4..000000000
--- a/web/src/pages/file-manager/folder-create-modal/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Input, Modal } from 'antd';
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  onOk: (name: string) => void;
-}
-
-const FolderCreateModal = ({ visible, hideModal, loading, onOk }: IProps) => {
-  const [form] = Form.useForm();
-  const { t } = useTranslate('common');
-
-  type FieldType = {
-    name?: string;
-  };
-
-  const handleOk = async () => {
-    const ret = await form.validateFields();
-
-    return onOk(ret.name);
-  };
-
-  return (
-    <Modal
-      title={t('newFolder', { keyPrefix: 'fileManager' })}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      okButtonProps={{ loading }}
-      confirmLoading={loading}
-    >
-      <Form
-        name="basic"
-        labelCol={{ span: 4 }}
-        wrapperCol={{ span: 20 }}
-        style={{ maxWidth: 600 }}
-        autoComplete="off"
-        form={form}
-      >
-        <Form.Item<FieldType>
-          label={t('name')}
-          name="name"
-          rules={[{ required: true, message: t('namePlaceholder') }]}
-        >
-          <Input />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default FolderCreateModal;
diff --git a/web/src/pages/file-manager/hooks.ts b/web/src/pages/file-manager/hooks.ts
deleted file mode 100644
index d1145e572..000000000
--- a/web/src/pages/file-manager/hooks.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-import { useSetModalState, useShowDeleteConfirm } from '@/hooks/common-hooks';
-import {
-  useConnectToKnowledge,
-  useCreateFolder,
-  useDeleteFile,
-  useFetchParentFolderList,
-  useMoveFile,
-  useRenameFile,
-  useUploadFile,
-} from '@/hooks/file-manager-hooks';
-import { IFile } from '@/interfaces/database/file-manager';
-import { TableRowSelection } from 'antd/es/table/interface';
-import { UploadFile } from 'antd/lib';
-import { useCallback, useMemo, useState } from 'react';
-import { useNavigate, useSearchParams } from 'umi';
-
-export const useGetFolderId = () => {
-  const [searchParams] = useSearchParams();
-  const id = searchParams.get('folderId') as string;
-
-  return id ?? '';
-};
-
-export const useGetRowSelection = () => {
-  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
-
-  const rowSelection: TableRowSelection<IFile> = {
-    selectedRowKeys,
-    getCheckboxProps: (record) => {
-      return { disabled: record.source_type === 'knowledgebase' };
-    },
-    onChange: (newSelectedRowKeys: React.Key[]) => {
-      setSelectedRowKeys(newSelectedRowKeys);
-    },
-  };
-
-  return { rowSelection, setSelectedRowKeys };
-};
-
-export const useNavigateToOtherFolder = () => {
-  const navigate = useNavigate();
-  const navigateToOtherFolder = useCallback(
-    (folderId: string) => {
-      navigate(`/file?folderId=${folderId}`);
-    },
-    [navigate],
-  );
-
-  return navigateToOtherFolder;
-};
-
-export const useRenameCurrentFile = () => {
-  const [file, setFile] = useState<IFile>({} as IFile);
-  const {
-    visible: fileRenameVisible,
-    hideModal: hideFileRenameModal,
-    showModal: showFileRenameModal,
-  } = useSetModalState();
-  const { renameFile, loading } = useRenameFile();
-
-  const onFileRenameOk = useCallback(
-    async (name: string) => {
-      const ret = await renameFile({
-        fileId: file.id,
-        name,
-      });
-
-      if (ret === 0) {
-        hideFileRenameModal();
-      }
-    },
-    [renameFile, file, hideFileRenameModal],
-  );
-
-  const handleShowFileRenameModal = useCallback(
-    async (record: IFile) => {
-      setFile(record);
-      showFileRenameModal();
-    },
-    [showFileRenameModal],
-  );
-
-  return {
-    fileRenameLoading: loading,
-    initialFileName: file.name,
-    onFileRenameOk,
-    fileRenameVisible,
-    hideFileRenameModal,
-    showFileRenameModal: handleShowFileRenameModal,
-  };
-};
-
-export const useSelectBreadcrumbItems = () => {
-  const parentFolderList = useFetchParentFolderList();
-
-  return parentFolderList.length === 1
-    ? []
-    : parentFolderList.map((x) => ({
-        title: x.name === '/' ? 'root' : x.name,
-        path: `/file?folderId=${x.id}`,
-      }));
-};
-
-export const useHandleCreateFolder = () => {
-  const {
-    visible: folderCreateModalVisible,
-    hideModal: hideFolderCreateModal,
-    showModal: showFolderCreateModal,
-  } = useSetModalState();
-  const { createFolder, loading } = useCreateFolder();
-  const id = useGetFolderId();
-
-  const onFolderCreateOk = useCallback(
-    async (name: string) => {
-      const ret = await createFolder({ parentId: id, name });
-
-      if (ret === 0) {
-        hideFolderCreateModal();
-      }
-    },
-    [createFolder, hideFolderCreateModal, id],
-  );
-
-  return {
-    folderCreateLoading: loading,
-    onFolderCreateOk,
-    folderCreateModalVisible,
-    hideFolderCreateModal,
-    showFolderCreateModal,
-  };
-};
-
-export const useHandleDeleteFile = (
-  fileIds: string[],
-  setSelectedRowKeys: (keys: string[]) => void,
-) => {
-  const { deleteFile: removeDocument } = useDeleteFile();
-  const showDeleteConfirm = useShowDeleteConfirm();
-  const parentId = useGetFolderId();
-
-  const handleRemoveFile = () => {
-    showDeleteConfirm({
-      onOk: async () => {
-        const code = await removeDocument({ fileIds, parentId });
-        if (code === 0) {
-          setSelectedRowKeys([]);
-        }
-        return;
-      },
-    });
-  };
-
-  return { handleRemoveFile };
-};
-
-export const useHandleUploadFile = () => {
-  const {
-    visible: fileUploadVisible,
-    hideModal: hideFileUploadModal,
-    showModal: showFileUploadModal,
-  } = useSetModalState();
-  const { uploadFile, loading } = useUploadFile();
-  const id = useGetFolderId();
-
-  const onFileUploadOk = useCallback(
-    async (fileList: UploadFile[]): Promise<number | undefined> => {
-      if (fileList.length > 0) {
-        const ret: number = await uploadFile({ fileList, parentId: id });
-        if (ret === 0) {
-          hideFileUploadModal();
-        }
-        return ret;
-      }
-    },
-    [uploadFile, hideFileUploadModal, id],
-  );
-
-  return {
-    fileUploadLoading: loading,
-    onFileUploadOk,
-    fileUploadVisible,
-    hideFileUploadModal,
-    showFileUploadModal,
-  };
-};
-
-export const useHandleConnectToKnowledge = () => {
-  const {
-    visible: connectToKnowledgeVisible,
-    hideModal: hideConnectToKnowledgeModal,
-    showModal: showConnectToKnowledgeModal,
-  } = useSetModalState();
-  const { connectFileToKnowledge: connectToKnowledge, loading } =
-    useConnectToKnowledge();
-  const [record, setRecord] = useState<IFile>({} as IFile);
-
-  const initialValue = useMemo(() => {
-    return Array.isArray(record?.kbs_info)
-      ? record?.kbs_info?.map((x) => x.kb_id)
-      : [];
-  }, [record?.kbs_info]);
-
-  const onConnectToKnowledgeOk = useCallback(
-    async (knowledgeIds: string[]) => {
-      const ret = await connectToKnowledge({
-        fileIds: [record.id],
-        kbIds: knowledgeIds,
-      });
-
-      if (ret === 0) {
-        hideConnectToKnowledgeModal();
-      }
-      return ret;
-    },
-    [connectToKnowledge, hideConnectToKnowledgeModal, record.id],
-  );
-
-  const handleShowConnectToKnowledgeModal = useCallback(
-    (record: IFile) => {
-      setRecord(record);
-      showConnectToKnowledgeModal();
-    },
-    [showConnectToKnowledgeModal],
-  );
-
-  return {
-    initialValue,
-    connectToKnowledgeLoading: loading,
-    onConnectToKnowledgeOk,
-    connectToKnowledgeVisible,
-    hideConnectToKnowledgeModal,
-    showConnectToKnowledgeModal: handleShowConnectToKnowledgeModal,
-  };
-};
-
-export const useHandleBreadcrumbClick = () => {
-  const navigate = useNavigate();
-
-  const handleBreadcrumbClick = useCallback(
-    (path?: string) => {
-      if (path) {
-        navigate(path);
-      }
-    },
-    [navigate],
-  );
-
-  return { handleBreadcrumbClick };
-};
-
-export const useHandleMoveFile = (
-  setSelectedRowKeys: (keys: string[]) => void,
-) => {
-  const {
-    visible: moveFileVisible,
-    hideModal: hideMoveFileModal,
-    showModal: showMoveFileModal,
-  } = useSetModalState();
-  const { moveFile, loading } = useMoveFile();
-  const [sourceFileIds, setSourceFileIds] = useState<string[]>([]);
-
-  const onMoveFileOk = useCallback(
-    async (targetFolderId: string) => {
-      const ret = await moveFile({
-        src_file_ids: sourceFileIds,
-        dest_file_id: targetFolderId,
-      });
-
-      if (ret === 0) {
-        setSelectedRowKeys([]);
-        hideMoveFileModal();
-      }
-      return ret;
-    },
-    [moveFile, hideMoveFileModal, sourceFileIds, setSelectedRowKeys],
-  );
-
-  const handleShowMoveFileModal = useCallback(
-    (ids: string[]) => {
-      setSourceFileIds(ids);
-      showMoveFileModal();
-    },
-    [showMoveFileModal],
-  );
-
-  return {
-    initialValue: '',
-    moveFileLoading: loading,
-    onMoveFileOk,
-    moveFileVisible,
-    hideMoveFileModal,
-    showMoveFileModal: handleShowMoveFileModal,
-  };
-};
diff --git a/web/src/pages/file-manager/index.less b/web/src/pages/file-manager/index.less
deleted file mode 100644
index 8f3d2f34d..000000000
--- a/web/src/pages/file-manager/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.fileManagerWrapper {
-  width: 100%;
-  padding: 32px;
-}
-
-.filter {
-  height: 32px;
-  display: flex;
-  margin: 10px 0;
-  justify-content: space-between;
-  padding: 24px 0;
-  align-items: center;
-}
-
-.deleteIconWrapper {
-  width: 22px;
-  text-align: center;
-}
-
-.linkButton {
-  padding: 0;
-}
-
-.breadcrumbItemButton {
-  cursor: pointer;
-  color: #1677ff;
-  padding: 0;
-  height: auto;
-}
diff --git a/web/src/pages/file-manager/index.tsx b/web/src/pages/file-manager/index.tsx
deleted file mode 100644
index 4683b9538..000000000
--- a/web/src/pages/file-manager/index.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import { useFetchFileList } from '@/hooks/file-manager-hooks';
-import { IFile } from '@/interfaces/database/file-manager';
-import { formatDate } from '@/utils/date';
-import { Button, Flex, Space, Table, Tag, Typography } from 'antd';
-import { ColumnsType } from 'antd/es/table';
-import ActionCell from './action-cell';
-import FileToolbar from './file-toolbar';
-import {
-  useGetRowSelection,
-  useHandleConnectToKnowledge,
-  useHandleCreateFolder,
-  useHandleMoveFile,
-  useHandleUploadFile,
-  useNavigateToOtherFolder,
-  useRenameCurrentFile,
-} from './hooks';
-
-import FileUploadModal from '@/components/file-upload-modal';
-import RenameModal from '@/components/rename-modal';
-import SvgIcon from '@/components/svg-icon';
-import { useTranslate } from '@/hooks/common-hooks';
-import { formatNumberWithThousandsSeparator } from '@/utils/common-util';
-import { getExtension } from '@/utils/document-util';
-import ConnectToKnowledgeModal from './connect-to-knowledge-modal';
-import FolderCreateModal from './folder-create-modal';
-import styles from './index.less';
-import FileMovingModal from './move-file-modal';
-
-const { Text } = Typography;
-
-const FileManager = () => {
-  const { t } = useTranslate('fileManager');
-  // const fileList = useSelectFileList();
-  const { rowSelection, setSelectedRowKeys } = useGetRowSelection();
-  const navigateToOtherFolder = useNavigateToOtherFolder();
-  const {
-    fileRenameVisible,
-    fileRenameLoading,
-    hideFileRenameModal,
-    showFileRenameModal,
-    initialFileName,
-    onFileRenameOk,
-  } = useRenameCurrentFile();
-  const {
-    folderCreateModalVisible,
-    showFolderCreateModal,
-    hideFolderCreateModal,
-    folderCreateLoading,
-    onFolderCreateOk,
-  } = useHandleCreateFolder();
-  const {
-    fileUploadVisible,
-    hideFileUploadModal,
-    showFileUploadModal,
-    fileUploadLoading,
-    onFileUploadOk,
-  } = useHandleUploadFile();
-  const {
-    connectToKnowledgeVisible,
-    hideConnectToKnowledgeModal,
-    showConnectToKnowledgeModal,
-    onConnectToKnowledgeOk,
-    initialValue,
-    connectToKnowledgeLoading,
-  } = useHandleConnectToKnowledge();
-  const {
-    showMoveFileModal,
-    moveFileVisible,
-    onMoveFileOk,
-    hideMoveFileModal,
-    moveFileLoading,
-  } = useHandleMoveFile(setSelectedRowKeys);
-  const { pagination, data, searchString, handleInputChange, loading } =
-    useFetchFileList();
-  const columns: ColumnsType<IFile> = [
-    {
-      title: t('name'),
-      dataIndex: 'name',
-      key: 'name',
-      fixed: 'left',
-      render(value, record) {
-        return (
-          <Flex gap={10} align="center">
-            <SvgIcon
-              name={`file-icon/${record.type === 'folder' ? 'folder' : getExtension(value)}`}
-              width={24}
-            ></SvgIcon>
-            {record.type === 'folder' ? (
-              <Button
-                type={'link'}
-                className={styles.linkButton}
-                onClick={() => navigateToOtherFolder(record.id)}
-              >
-                <Text ellipsis={{ tooltip: value }}>{value}</Text>
-              </Button>
-            ) : (
-              <Text ellipsis={{ tooltip: value }}>{value}</Text>
-            )}
-          </Flex>
-        );
-      },
-    },
-    {
-      title: t('uploadDate'),
-      dataIndex: 'create_time',
-      key: 'create_time',
-      render(text) {
-        return formatDate(text);
-      },
-    },
-    {
-      title: t('size'),
-      dataIndex: 'size',
-      key: 'size',
-      render(value) {
-        return (
-          formatNumberWithThousandsSeparator((value / 1024).toFixed(2)) + ' KB'
-        );
-      },
-    },
-    {
-      title: t('knowledgeBase'),
-      dataIndex: 'kbs_info',
-      key: 'kbs_info',
-      render(value) {
-        return Array.isArray(value) ? (
-          <Space wrap>
-            {value?.map((x) => (
-              <Tag color="blue" key={x.kb_id}>
-                {x.kb_name}
-              </Tag>
-            ))}
-          </Space>
-        ) : (
-          ''
-        );
-      },
-    },
-    {
-      title: t('action'),
-      dataIndex: 'action',
-      key: 'action',
-      render: (text, record) => (
-        <ActionCell
-          record={record}
-          setCurrentRecord={(record: any) => {
-            console.info(record);
-          }}
-          showRenameModal={showFileRenameModal}
-          showMoveFileModal={showMoveFileModal}
-          showConnectToKnowledgeModal={showConnectToKnowledgeModal}
-          setSelectedRowKeys={setSelectedRowKeys}
-        ></ActionCell>
-      ),
-    },
-  ];
-
-  return (
-    <section className={styles.fileManagerWrapper}>
-      <FileToolbar
-        searchString={searchString}
-        handleInputChange={handleInputChange}
-        selectedRowKeys={rowSelection.selectedRowKeys as string[]}
-        showFolderCreateModal={showFolderCreateModal}
-        showFileUploadModal={showFileUploadModal}
-        setSelectedRowKeys={setSelectedRowKeys}
-        showMoveFileModal={showMoveFileModal}
-      ></FileToolbar>
-      <Table
-        dataSource={data?.files}
-        columns={columns}
-        rowKey={'id'}
-        rowSelection={rowSelection}
-        loading={loading}
-        pagination={pagination}
-        scroll={{ scrollToFirstRowOnChange: true, x: '100%' }}
-      />
-      <RenameModal
-        visible={fileRenameVisible}
-        hideModal={hideFileRenameModal}
-        onOk={onFileRenameOk}
-        initialName={initialFileName}
-        loading={fileRenameLoading}
-      ></RenameModal>
-      <FolderCreateModal
-        loading={folderCreateLoading}
-        visible={folderCreateModalVisible}
-        hideModal={hideFolderCreateModal}
-        onOk={onFolderCreateOk}
-      ></FolderCreateModal>
-      <FileUploadModal
-        visible={fileUploadVisible}
-        hideModal={hideFileUploadModal}
-        loading={fileUploadLoading}
-        onOk={onFileUploadOk}
-      ></FileUploadModal>
-      <ConnectToKnowledgeModal
-        initialValue={initialValue}
-        visible={connectToKnowledgeVisible}
-        hideModal={hideConnectToKnowledgeModal}
-        onOk={onConnectToKnowledgeOk}
-        loading={connectToKnowledgeLoading}
-      ></ConnectToKnowledgeModal>
-      {moveFileVisible && (
-        <FileMovingModal
-          visible={moveFileVisible}
-          hideModal={hideMoveFileModal}
-          onOk={onMoveFileOk}
-          loading={moveFileLoading}
-        ></FileMovingModal>
-      )}
-    </section>
-  );
-};
-
-export default FileManager;
diff --git a/web/src/pages/file-manager/move-file-modal/async-tree-select.tsx b/web/src/pages/file-manager/move-file-modal/async-tree-select.tsx
deleted file mode 100644
index 2ed1c80d6..000000000
--- a/web/src/pages/file-manager/move-file-modal/async-tree-select.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useFetchPureFileList } from '@/hooks/file-manager-hooks';
-import { IFile } from '@/interfaces/database/file-manager';
-import type { GetProp, TreeSelectProps } from 'antd';
-import { TreeSelect } from 'antd';
-import { useCallback, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-
-type DefaultOptionType = GetProp<TreeSelectProps, 'treeData'>[number];
-
-interface IProps {
-  value?: string;
-  onChange?: (value: string) => void;
-}
-
-const AsyncTreeSelect = ({ value, onChange }: IProps) => {
-  const { t } = useTranslation();
-  const { fetchList } = useFetchPureFileList();
-  const [treeData, setTreeData] = useState<Omit<DefaultOptionType, 'label'>[]>(
-    [],
-  );
-
-  const onLoadData: TreeSelectProps['loadData'] = useCallback(
-    async ({ id }) => {
-      const ret = await fetchList(id);
-      if (ret.code === 0) {
-        setTreeData((tree) => {
-          return tree.concat(
-            ret.data.files
-              .filter((x: IFile) => x.type === 'folder')
-              .map((x: IFile) => ({
-                id: x.id,
-                pId: x.parent_id,
-                value: x.id,
-                title: x.name,
-                isLeaf:
-                  typeof x.has_child_folder === 'boolean'
-                    ? !x.has_child_folder
-                    : false,
-              })),
-          );
-        });
-      }
-    },
-    [fetchList],
-  );
-
-  const handleChange = (newValue: string) => {
-    onChange?.(newValue);
-  };
-
-  useEffect(() => {
-    onLoadData?.({ id: '', props: '' });
-  }, [onLoadData]);
-
-  return (
-    <TreeSelect
-      treeDataSimpleMode
-      style={{ width: '100%' }}
-      value={value}
-      dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-      placeholder={t('fileManager.pleaseSelect')}
-      onChange={handleChange}
-      loadData={onLoadData}
-      treeData={treeData}
-    />
-  );
-};
-
-export default AsyncTreeSelect;
diff --git a/web/src/pages/file-manager/move-file-modal/index.tsx b/web/src/pages/file-manager/move-file-modal/index.tsx
deleted file mode 100644
index c7b13c48b..000000000
--- a/web/src/pages/file-manager/move-file-modal/index.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Modal } from 'antd';
-import AsyncTreeSelect from './async-tree-select';
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  onOk: (id: string) => void;
-}
-
-const FileMovingModal = ({ visible, hideModal, loading, onOk }: IProps) => {
-  const [form] = Form.useForm();
-  const { t } = useTranslate('fileManager');
-
-  type FieldType = {
-    name?: string;
-  };
-
-  const handleOk = async () => {
-    const ret = await form.validateFields();
-
-    return onOk(ret.name);
-  };
-
-  return (
-    <Modal
-      title={t('move', { keyPrefix: 'common' })}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      okButtonProps={{ loading }}
-      confirmLoading={loading}
-      width={600}
-    >
-      <Form
-        name="basic"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 18 }}
-        autoComplete="off"
-        form={form}
-      >
-        <Form.Item<FieldType>
-          label={t('destinationFolder')}
-          name="name"
-          rules={[{ required: true, message: t('pleaseSelect') }]}
-        >
-          <AsyncTreeSelect></AsyncTreeSelect>
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default FileMovingModal;
diff --git a/web/src/pages/files/create-folder-dialog/create-folder-form.tsx b/web/src/pages/files/create-folder-dialog/create-folder-form.tsx
index 15ab47643..a575d42c5 100644
--- a/web/src/pages/files/create-folder-dialog/create-folder-form.tsx
+++ b/web/src/pages/files/create-folder-dialog/create-folder-form.tsx
@@ -13,8 +13,8 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 
 export function CreateFolderForm({ hideModal, onOk }: IModalProps<any>) {
diff --git a/web/src/pages/files/create-folder-dialog/index.tsx b/web/src/pages/files/create-folder-dialog/index.tsx
index 3ac2dc1ee..1fb98dbc2 100644
--- a/web/src/pages/files/create-folder-dialog/index.tsx
+++ b/web/src/pages/files/create-folder-dialog/index.tsx
@@ -6,8 +6,8 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { LoadingButton } from '@/components/ui/loading-button';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 import { CreateFolderForm } from './create-folder-form';
 
diff --git a/web/src/pages/knowledge/hooks.ts b/web/src/pages/knowledge/hooks.ts
deleted file mode 100644
index e978a6243..000000000
--- a/web/src/pages/knowledge/hooks.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { KnowledgeRouteKey } from '@/constants/knowledge';
-import { useSetModalState } from '@/hooks/common-hooks';
-import { useCreateKnowledge } from '@/hooks/knowledge-hooks';
-import { useCallback, useState } from 'react';
-import { useNavigate } from 'umi';
-
-export const useSearchKnowledge = () => {
-  const [searchString, setSearchString] = useState<string>('');
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchString(e.target.value);
-  };
-  return {
-    searchString,
-    handleInputChange,
-  };
-};
-
-export const useSaveKnowledge = () => {
-  const { visible: visible, hideModal, showModal } = useSetModalState();
-  const { loading, createKnowledge } = useCreateKnowledge();
-  const navigate = useNavigate();
-
-  const onCreateOk = useCallback(
-    async (name: string) => {
-      const ret = await createKnowledge({
-        name,
-      });
-
-      if (ret?.code === 0) {
-        hideModal();
-        navigate(
-          `/knowledge/${KnowledgeRouteKey.Configuration}?id=${ret.data.kb_id}`,
-        );
-      }
-    },
-    [createKnowledge, hideModal, navigate],
-  );
-
-  return {
-    loading,
-    onCreateOk,
-    visible,
-    hideModal,
-    showModal,
-  };
-};
diff --git a/web/src/pages/knowledge/index.less b/web/src/pages/knowledge/index.less
deleted file mode 100644
index e40efb0f6..000000000
--- a/web/src/pages/knowledge/index.less
+++ /dev/null
@@ -1,50 +0,0 @@
-// @import '~@/less/variable.less';
-
-.knowledge {
-  padding: 48px 0;
-  overflow: auto;
-}
-
-.topWrapper {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  padding: 0 60px 72px;
-
-  .title {
-    font-family: Inter;
-    font-size: 30px;
-    font-style: normal;
-    font-weight: @fontWeight600;
-    line-height: 38px;
-    color: var(--ant-color-info);
-  }
-  .description {
-    font-family: Inter;
-    font-size: 16px;
-    font-style: normal;
-    font-weight: 400;
-    line-height: 24px;
-  }
-
-  .topButton {
-    font-family: Inter;
-    font-size: 14px;
-    font-style: normal;
-    font-weight: @fontWeight600;
-    line-height: 20px;
-  }
-
-  .filterButton {
-    display: flex;
-    align-items: center;
-    .topButton();
-  }
-}
-.knowledgeCardContainer {
-  padding: 0 60px;
-  overflow: auto;
-  .knowledgeEmpty {
-    width: 100%;
-  }
-}
diff --git a/web/src/pages/knowledge/index.tsx b/web/src/pages/knowledge/index.tsx
deleted file mode 100644
index df9ddb23d..000000000
--- a/web/src/pages/knowledge/index.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { useInfiniteFetchKnowledgeList } from '@/hooks/knowledge-hooks';
-import { useFetchUserInfo } from '@/hooks/user-setting-hooks';
-import { PlusOutlined, SearchOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Divider,
-  Empty,
-  Flex,
-  Input,
-  Skeleton,
-  Space,
-  Spin,
-} from 'antd';
-import { useTranslation } from 'react-i18next';
-import InfiniteScroll from 'react-infinite-scroll-component';
-import { useSaveKnowledge } from './hooks';
-import KnowledgeCard from './knowledge-card';
-import KnowledgeCreatingModal from './knowledge-creating-modal';
-
-import { useMemo } from 'react';
-import styles from './index.less';
-
-const KnowledgeList = () => {
-  const { data: userInfo } = useFetchUserInfo();
-  const { t } = useTranslation('translation', { keyPrefix: 'knowledgeList' });
-  const {
-    visible,
-    hideModal,
-    showModal,
-    onCreateOk,
-    loading: creatingLoading,
-  } = useSaveKnowledge();
-  const {
-    fetchNextPage,
-    data,
-    hasNextPage,
-    searchString,
-    handleInputChange,
-    loading,
-  } = useInfiniteFetchKnowledgeList();
-
-  const nextList = useMemo(() => {
-    const list =
-      data?.pages?.flatMap((x) => (Array.isArray(x.kbs) ? x.kbs : [])) ?? [];
-    return list;
-  }, [data?.pages]);
-
-  const total = useMemo(() => {
-    return data?.pages.at(-1).total ?? 0;
-  }, [data?.pages]);
-
-  return (
-    <Flex className={styles.knowledge} vertical flex={1}>
-      <div className={styles.topWrapper}>
-        <div>
-          <span className={styles.title}>
-            {t('welcome')}, {userInfo.nickname}
-          </span>
-          <p className={styles.description}>{t('description')}</p>
-        </div>
-        <Space size={'large'}>
-          <Input
-            placeholder={t('searchKnowledgePlaceholder')}
-            value={searchString}
-            style={{ width: 220 }}
-            allowClear
-            onChange={handleInputChange}
-            prefix={<SearchOutlined />}
-          />
-
-          <Button
-            type="primary"
-            icon={<PlusOutlined />}
-            onClick={showModal}
-            className={styles.topButton}
-          >
-            {t('createKnowledgeBase')}
-          </Button>
-        </Space>
-      </div>
-      <Spin spinning={loading}>
-        <div
-          id="scrollableDiv"
-          style={{
-            height: 'calc(100vh - 250px)',
-            overflow: 'auto',
-            padding: '0 16px',
-          }}
-        >
-          <InfiniteScroll
-            dataLength={nextList?.length ?? 0}
-            next={fetchNextPage}
-            hasMore={hasNextPage}
-            loader={<Skeleton avatar paragraph={{ rows: 1 }} active />}
-            endMessage={
-              !!total && <Divider plain>{t('noMoreData')} 🤐</Divider>
-            }
-            scrollableTarget="scrollableDiv"
-            scrollThreshold="200px"
-          >
-            <Flex
-              gap={'large'}
-              wrap="wrap"
-              className={styles.knowledgeCardContainer}
-            >
-              {nextList?.length > 0 ? (
-                nextList.map((item: any, index: number) => {
-                  return (
-                    <KnowledgeCard
-                      item={item}
-                      key={`${item?.name}-${index}`}
-                    ></KnowledgeCard>
-                  );
-                })
-              ) : (
-                <Empty className={styles.knowledgeEmpty}></Empty>
-              )}
-            </Flex>
-          </InfiniteScroll>
-        </div>
-      </Spin>
-      <KnowledgeCreatingModal
-        loading={creatingLoading}
-        visible={visible}
-        hideModal={hideModal}
-        onOk={onCreateOk}
-      ></KnowledgeCreatingModal>
-    </Flex>
-  );
-};
-
-export default KnowledgeList;
diff --git a/web/src/pages/knowledge/knowledge-card/index.less b/web/src/pages/knowledge/knowledge-card/index.less
deleted file mode 100644
index 6791a5d38..000000000
--- a/web/src/pages/knowledge/knowledge-card/index.less
+++ /dev/null
@@ -1,133 +0,0 @@
-.container {
-  height: 251px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-
-  .delete {
-    height: 24px;
-  }
-
-  .content {
-    display: flex;
-    justify-content: space-between;
-
-    .context {
-      flex: 1;
-    }
-  }
-
-  .footer {
-    // text-align: left;
-  }
-  .footerTop {
-    padding-bottom: 2px;
-  }
-
-  .titleWrapper {
-    margin: 16px 0;
-    overflow: hidden;
-
-    .title {
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      font-size: 24px;
-      line-height: 32px;
-      font-weight: 600;
-      color: rgba(0, 0, 0, 0.88);
-      word-break: break-all;
-    }
-
-    .description {
-      margin-top: 4px;
-      display: -webkit-box;
-      -webkit-line-clamp: 3;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      font-size: 12px;
-      font-weight: 600;
-      line-height: 20px;
-      color: rgba(0, 0, 0, 0.45);
-    }
-    .titledark {
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      font-size: 24px;
-      line-height: 32px;
-      font-weight: 600;
-      word-break: break-all;
-    }
-
-    .descriptiondark {
-      margin-top: 4px;
-      display: -webkit-box;
-      -webkit-line-clamp: 3;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      font-size: 12px;
-      font-weight: 600;
-      line-height: 20px;
-    }
-  }
-}
-
-.card {
-  border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  background-color: rgba(255, 255, 255, 0.1);
-  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
-  padding: 24px;
-  width: 300px;
-  cursor: pointer;
-
-  .titleWrapper {
-    .title {
-      font-size: 24px;
-      line-height: 32px;
-      font-weight: 600;
-      word-break: break-all;
-    }
-    .description {
-      font-size: 12px;
-      font-weight: 600;
-      line-height: 20px;
-    }
-  }
-
-  :global {
-    .ant-card-body {
-      padding: 0;
-      margin: 0;
-    }
-  }
-  .bottom {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .bottomLeft {
-    vertical-align: middle;
-  }
-  .leftIcon {
-    margin-right: 10px;
-    font-size: 18px;
-    vertical-align: middle;
-  }
-  .rightText {
-    font-size: 12px;
-    font-weight: 600;
-    vertical-align: middle;
-  }
-}
-
-.hideRibbon {
-  display: none !important;
-}
-
-.ribbon {
-  top: 4px;
-}
diff --git a/web/src/pages/knowledge/knowledge-card/index.tsx b/web/src/pages/knowledge/knowledge-card/index.tsx
deleted file mode 100644
index 2265b19da..000000000
--- a/web/src/pages/knowledge/knowledge-card/index.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { KnowledgeRouteKey } from '@/constants/knowledge';
-import { IKnowledge } from '@/interfaces/database/knowledge';
-import { formatDate } from '@/utils/date';
-import {
-  CalendarOutlined,
-  FileTextOutlined,
-  UserOutlined,
-} from '@ant-design/icons';
-import { Avatar, Badge, Card, Space } from 'antd';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'umi';
-
-import OperateDropdown from '@/components/operate-dropdown';
-import { useTheme } from '@/components/theme-provider';
-import { useDeleteKnowledge } from '@/hooks/knowledge-hooks';
-import { useFetchUserInfo } from '@/hooks/user-setting-hooks';
-import styles from './index.less';
-
-interface IProps {
-  item: IKnowledge;
-}
-
-const KnowledgeCard = ({ item }: IProps) => {
-  const navigate = useNavigate();
-  const { t } = useTranslation();
-  const { data: userInfo } = useFetchUserInfo();
-  const { theme } = useTheme();
-  const { deleteKnowledge } = useDeleteKnowledge();
-
-  const removeKnowledge = async () => {
-    return deleteKnowledge(item.id);
-  };
-
-  const handleCardClick = () => {
-    navigate(`/knowledge/${KnowledgeRouteKey.Dataset}?id=${item.id}`, {
-      state: { from: 'list' },
-    });
-  };
-
-  return (
-    <Badge.Ribbon
-      text={item?.nickname}
-      color={userInfo?.nickname === item?.nickname ? '#1677ff' : 'pink'}
-      className={classNames(styles.ribbon, {
-        [styles.hideRibbon]: item.permission !== 'team',
-      })}
-    >
-      <Card className={styles.card} onClick={handleCardClick}>
-        <div className={styles.container}>
-          <div className={styles.content}>
-            <Avatar size={34} icon={<UserOutlined />} src={item.avatar} />
-            <OperateDropdown deleteItem={removeKnowledge}></OperateDropdown>
-          </div>
-          <div className={styles.titleWrapper}>
-            <span
-              className={theme === 'dark' ? styles.titledark : styles.title}
-            >
-              {item.name}
-            </span>
-            <p
-              className={
-                theme === 'dark' ? styles.descriptiondark : styles.description
-              }
-            >
-              {item.description}
-            </p>
-          </div>
-          <div className={styles.footer}>
-            <div className={styles.footerTop}>
-              <div className={styles.bottomLeft}>
-                <FileTextOutlined className={styles.leftIcon} />
-                <span className={styles.rightText}>
-                  <Space>
-                    {item.doc_num}
-                    {t('knowledgeList.doc')}
-                  </Space>
-                </span>
-              </div>
-            </div>
-            <div className={styles.bottom}>
-              <div className={styles.bottomLeft}>
-                <CalendarOutlined className={styles.leftIcon} />
-                <span className={styles.rightText}>
-                  {formatDate(item.update_time)}
-                </span>
-              </div>
-              {/* <Avatar.Group size={25}>
-                <Avatar src="https://api.dicebear.com/7.x/miniavs/svg?seed=1" />
-                <a href="https://ant.design">
-                  <Avatar style={{ backgroundColor: '#f56a00' }}>K</Avatar>
-                </a>
-                <Tooltip title="Ant User" placement="top">
-                  <Avatar
-                    style={{ backgroundColor: '#87d068' }}
-                    icon={<UserOutlined />}
-                  />
-                </Tooltip>
-                <Avatar
-                  style={{ backgroundColor: '#1677ff' }}
-                  icon={<AntDesignOutlined />}
-                />
-              </Avatar.Group> */}
-            </div>
-          </div>
-        </div>
-      </Card>
-    </Badge.Ribbon>
-  );
-};
-
-export default KnowledgeCard;
diff --git a/web/src/pages/knowledge/knowledge-creating-modal/index.tsx b/web/src/pages/knowledge/knowledge-creating-modal/index.tsx
deleted file mode 100644
index 1025cd21c..000000000
--- a/web/src/pages/knowledge/knowledge-creating-modal/index.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { IModalManagerChildrenProps } from '@/components/modal-manager';
-import { Form, Input, Modal } from 'antd';
-import { useTranslation } from 'react-i18next';
-
-type FieldType = {
-  name?: string;
-};
-
-interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
-  loading: boolean;
-  onOk: (name: string) => void;
-}
-
-const KnowledgeCreatingModal = ({
-  visible,
-  hideModal,
-  loading,
-  onOk,
-}: IProps) => {
-  const [form] = Form.useForm();
-
-  const { t } = useTranslation('translation', { keyPrefix: 'knowledgeList' });
-
-  const handleOk = async () => {
-    const ret = await form.validateFields();
-    onOk(ret.name);
-  };
-
-  const handleKeyDown = async (e) => {
-    if (e.key === 'Enter') {
-      await handleOk();
-    }
-  };
-
-  return (
-    <Modal
-      title={t('createKnowledgeBase')}
-      open={visible}
-      onOk={handleOk}
-      onCancel={hideModal}
-      okButtonProps={{ loading }}
-    >
-      <Form
-        name="Create"
-        labelCol={{ span: 4 }}
-        wrapperCol={{ span: 20 }}
-        style={{ maxWidth: 600 }}
-        autoComplete="off"
-        form={form}
-      >
-        <Form.Item<FieldType>
-          label={t('name')}
-          name="name"
-          rules={[{ required: true, message: t('namePlaceholder') }]}
-        >
-          <Input placeholder={t('namePlaceholder')} onKeyDown={handleKeyDown} />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default KnowledgeCreatingModal;
diff --git a/web/src/pages/next-chats/chat/interface.ts b/web/src/pages/next-chats/chat/interface.ts
index 570c6da21..cf5c25814 100644
--- a/web/src/pages/next-chats/chat/interface.ts
+++ b/web/src/pages/next-chats/chat/interface.ts
@@ -1,4 +1,3 @@
-import { IConversation, IReference, Message } from '@/interfaces/database/chat';
 import { FormInstance } from 'antd';
 
 export interface ISegmentedContentProps {
@@ -22,12 +21,3 @@ export interface VariableTableDataType {
 }
 
 export type IPromptConfigParameters = Omit<VariableTableDataType, 'variable'>;
-
-export interface IMessage extends Message {
-  id: string;
-  reference?: IReference; // the latest news has reference
-}
-
-export interface IClientConversation extends IConversation {
-  message: IMessage[];
-}
diff --git a/web/src/pages/next-chats/hooks/use-send-chat-message.ts b/web/src/pages/next-chats/hooks/use-send-chat-message.ts
index ad589a041..6263f6c23 100644
--- a/web/src/pages/next-chats/hooks/use-send-chat-message.ts
+++ b/web/src/pages/next-chats/hooks/use-send-chat-message.ts
@@ -10,13 +10,12 @@ import {
   useFetchConversation,
   useGetChatSearchParams,
 } from '@/hooks/use-chat-request';
-import { Message } from '@/interfaces/database/chat';
+import { IMessage, Message } from '@/interfaces/database/chat';
 import api from '@/utils/api';
 import { trim } from 'lodash';
 import { useCallback, useEffect } from 'react';
 import { useParams } from 'umi';
 import { v4 as uuid } from 'uuid';
-import { IMessage } from '../chat/interface';
 import { useFindPrologueFromDialogList } from './use-select-conversation-list';
 import { useSetChatRouteParams } from './use-set-chat-route';
 import { useSetConversation } from './use-set-conversation';
diff --git a/web/src/pages/next-chats/hooks/use-send-multiple-message.ts b/web/src/pages/next-chats/hooks/use-send-multiple-message.ts
index bd0bc8c38..34a2c099d 100644
--- a/web/src/pages/next-chats/hooks/use-send-multiple-message.ts
+++ b/web/src/pages/next-chats/hooks/use-send-multiple-message.ts
@@ -5,13 +5,12 @@ import {
   useSendMessageWithSse,
 } from '@/hooks/logic-hooks';
 import { useGetChatSearchParams } from '@/hooks/use-chat-request';
-import { IAnswer, Message } from '@/interfaces/database/chat';
+import { IAnswer, IMessage, Message } from '@/interfaces/database/chat';
 import api from '@/utils/api';
 import { buildMessageUuid } from '@/utils/chat';
 import { trim } from 'lodash';
 import { useCallback, useEffect, useState } from 'react';
 import { v4 as uuid } from 'uuid';
-import { IMessage } from '../chat/interface';
 import { useBuildFormRefs } from './use-build-form-refs';
 import { useUploadFile } from './use-upload-file';
 
diff --git a/web/src/pages/next-chats/share/index.tsx b/web/src/pages/next-chats/share/index.tsx
index 1b7e53dca..648b22f72 100644
--- a/web/src/pages/next-chats/share/index.tsx
+++ b/web/src/pages/next-chats/share/index.tsx
@@ -8,9 +8,9 @@ import { useFetchNextConversationSSE } from '@/hooks/chat-hooks';
 import { useFetchFlowSSE } from '@/hooks/flow-hooks';
 import { useFetchExternalChatInfo } from '@/hooks/use-chat-request';
 import i18n from '@/locales/config';
-import { useSendButtonDisabled } from '@/pages/chat/hooks';
 import { buildMessageUuidWithRole } from '@/utils/chat';
 import React, { forwardRef, useMemo } from 'react';
+import { useSendButtonDisabled } from '../hooks/use-button-disabled';
 import {
   useGetSharedChatSearchParams,
   useSendSharedMessage,
diff --git a/web/src/pages/next-chats/utils.ts b/web/src/pages/next-chats/utils.ts
index a31f40097..ab640b7ac 100644
--- a/web/src/pages/next-chats/utils.ts
+++ b/web/src/pages/next-chats/utils.ts
@@ -1,7 +1,10 @@
 import { EmptyConversationId, MessageType } from '@/constants/chat';
-import { IConversation, IReference } from '@/interfaces/database/chat';
+import {
+  IConversation,
+  IMessage,
+  IReference,
+} from '@/interfaces/database/chat';
 import { isEmpty } from 'lodash';
-import { IMessage } from '../chat/interface';
 
 export const isConversationIdExist = (conversationId: string) => {
   return conversationId !== EmptyConversationId && conversationId !== '';
@@ -40,13 +43,3 @@ export const buildMessageItemReference = (
 
   return reference ?? { doc_aggs: [], chunks: [], total: 0 };
 };
-
-const oldReg = /(#{2}\d+\${2})/g;
-export const currentReg = /\[ID:(\d+)\]/g;
-
-// To be compatible with the old index matching mode
-export const replaceTextByOldReg = (text: string) => {
-  return text?.replace(oldReg, (substring: string) => {
-    return `[ID:${substring.slice(2, -2)}]`;
-  });
-};
diff --git a/web/src/pages/next-search/hooks.ts b/web/src/pages/next-search/hooks.ts
index 568705582..34a810ad1 100644
--- a/web/src/pages/next-search/hooks.ts
+++ b/web/src/pages/next-search/hooks.ts
@@ -1,5 +1,6 @@
 import message from '@/components/ui/message';
 import { SharedFrom } from '@/constants/chat';
+import { useSetModalState } from '@/hooks/common-hooks';
 import { useSelectTestingResult } from '@/hooks/knowledge-hooks';
 import {
   useGetPaginationWithRouter,
@@ -16,18 +17,18 @@ import kbService from '@/services/knowledge-service';
 import searchService from '@/services/search-service';
 import api from '@/utils/api';
 import { useMutation } from '@tanstack/react-query';
-import { has, isEmpty, trim } from 'lodash';
+import { has, isEmpty, isEqual, trim } from 'lodash';
 import {
   ChangeEventHandler,
   Dispatch,
   SetStateAction,
   useCallback,
   useEffect,
+  useRef,
   useState,
 } from 'react';
 import { useSearchParams } from 'umi';
 import { ISearchAppDetailProps } from '../next-searches/hooks';
-import { useShowMindMapDrawer } from '../search/hooks';
 import { useClickDrawer } from './document-preview-modal/hooks';
 
 export interface ISearchingProps {
@@ -90,6 +91,41 @@ export const useSearchFetchMindMap = () => {
   return { data, loading, fetchMindMap: mutateAsync };
 };
 
+export const useShowMindMapDrawer = (
+  kbIds: string[],
+  question: string,
+  searchId = '',
+) => {
+  const { visible, showModal, hideModal } = useSetModalState();
+  const ref = useRef<any>();
+
+  const {
+    fetchMindMap,
+    data: mindMap,
+    loading: mindMapLoading,
+  } = useSearchFetchMindMap();
+
+  const handleShowModal = useCallback(() => {
+    const searchParams = { question: trim(question), kb_ids: kbIds, searchId };
+    if (
+      !isEmpty(searchParams.question) &&
+      !isEqual(searchParams, ref.current)
+    ) {
+      ref.current = searchParams;
+      fetchMindMap(searchParams);
+    }
+    showModal();
+  }, [fetchMindMap, showModal, question, kbIds, searchId]);
+
+  return {
+    mindMap,
+    mindMapVisible: visible,
+    mindMapLoading,
+    showMindMapModal: handleShowModal,
+    hideMindMapModal: hideModal,
+  };
+};
+
 export const useTestChunkRetrieval = (
   tenantId?: string,
 ): ResponsePostType<ITestingResult> & {
@@ -539,3 +575,28 @@ export const useCheckSettings = (data: ISearchAppDetailProps) => {
     openSetting: kb_ids && kb_ids.length > 0 && name ? false : true,
   };
 };
+
+export const usePendingMindMap = () => {
+  const [count, setCount] = useState<number>(0);
+  const ref = useRef<NodeJS.Timeout>();
+
+  const setCountInterval = useCallback(() => {
+    ref.current = setInterval(() => {
+      setCount((pre) => {
+        if (pre > 40) {
+          clearInterval(ref?.current);
+        }
+        return pre + 1;
+      });
+    }, 1000);
+  }, []);
+
+  useEffect(() => {
+    setCountInterval();
+    return () => {
+      clearInterval(ref?.current);
+    };
+  }, [setCountInterval]);
+
+  return Number(((count / 43) * 100).toFixed(0));
+};
diff --git a/web/src/pages/next-search/markdown-content/index.tsx b/web/src/pages/next-search/markdown-content/index.tsx
index fe23900b6..88107536c 100644
--- a/web/src/pages/next-search/markdown-content/index.tsx
+++ b/web/src/pages/next-search/markdown-content/index.tsx
@@ -20,7 +20,9 @@ import { useTranslation } from 'react-i18next';
 import 'katex/dist/katex.min.css'; // `rehype-katex` does not import the CSS for you
 
 import {
+  currentReg,
   preprocessLaTeX,
+  replaceTextByOldReg,
   replaceThinkToSection,
   showImage,
 } from '@/utils/chat';
@@ -31,7 +33,6 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from '@/components/ui/popover';
-import { currentReg, replaceTextByOldReg } from '@/pages/next-chats/utils';
 import classNames from 'classnames';
 import { omit } from 'lodash';
 import { pipe } from 'lodash/fp';
diff --git a/web/src/pages/next-search/mindmap-drawer.tsx b/web/src/pages/next-search/mindmap-drawer.tsx
index 1d3084de5..cf5853d5e 100644
--- a/web/src/pages/next-search/mindmap-drawer.tsx
+++ b/web/src/pages/next-search/mindmap-drawer.tsx
@@ -3,7 +3,7 @@ import { Progress } from '@/components/ui/progress';
 import { IModalProps } from '@/interfaces/common';
 import { X } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
-import { usePendingMindMap } from '../search/hooks';
+import { usePendingMindMap } from './hooks';
 
 interface IProps extends IModalProps<any> {
   data: any;
diff --git a/web/src/pages/profile-setting/mcp/import-mcp-dialog/import-mcp-form.tsx b/web/src/pages/profile-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
index d34507308..6408b9e18 100644
--- a/web/src/pages/profile-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
+++ b/web/src/pages/profile-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
@@ -14,8 +14,8 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { FileMimeType, Platform } from '@/constants/common';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 
 export function ImportMcpForm({ hideModal, onOk }: IModalProps<any>) {
diff --git a/web/src/pages/profile-setting/mcp/import-mcp-dialog/index.tsx b/web/src/pages/profile-setting/mcp/import-mcp-dialog/index.tsx
index 76b35387b..1946523eb 100644
--- a/web/src/pages/profile-setting/mcp/import-mcp-dialog/index.tsx
+++ b/web/src/pages/profile-setting/mcp/import-mcp-dialog/index.tsx
@@ -6,8 +6,8 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { LoadingButton } from '@/components/ui/loading-button';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 import { ImportMcpForm } from './import-mcp-form';
 
diff --git a/web/src/pages/search/hooks.ts b/web/src/pages/search/hooks.ts
deleted file mode 100644
index abfecd698..000000000
--- a/web/src/pages/search/hooks.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import { useFetchRelatedQuestions } from '@/hooks/chat-hooks';
-import { useSetModalState } from '@/hooks/common-hooks';
-import {
-  useTestChunkAllRetrieval,
-  useTestChunkRetrieval,
-} from '@/hooks/knowledge-hooks';
-import {
-  useGetPaginationWithRouter,
-  useSendMessageWithSse,
-} from '@/hooks/logic-hooks';
-import { IAnswer } from '@/interfaces/database/chat';
-import api from '@/utils/api';
-import { get, isEmpty, isEqual, trim } from 'lodash';
-import {
-  ChangeEventHandler,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
-import {
-  useGetSharedSearchParams,
-  useSearchFetchMindMap,
-} from '../next-search/hooks';
-
-export const useSendQuestion = (kbIds: string[], tenantId?: string) => {
-  const { sharedId } = useGetSharedSearchParams();
-  const { send, answer, done, stopOutputMessage } = useSendMessageWithSse(
-    sharedId ? api.askShare : api.ask,
-  );
-
-  const { testChunk, loading } = useTestChunkRetrieval(tenantId);
-  const { testChunkAll } = useTestChunkAllRetrieval(tenantId);
-  const [sendingLoading, setSendingLoading] = useState(false);
-  const [currentAnswer, setCurrentAnswer] = useState({} as IAnswer);
-  const { fetchRelatedQuestions, data: relatedQuestions } =
-    useFetchRelatedQuestions(tenantId);
-  const [searchStr, setSearchStr] = useState<string>('');
-  const [isFirstRender, setIsFirstRender] = useState(true);
-  const [selectedDocumentIds, setSelectedDocumentIds] = useState<string[]>([]);
-
-  const { pagination, setPagination } = useGetPaginationWithRouter();
-
-  const sendQuestion = useCallback(
-    (question: string) => {
-      const q = trim(question);
-      if (isEmpty(q)) return;
-      setPagination({ page: 1 });
-      setIsFirstRender(false);
-      setCurrentAnswer({} as IAnswer);
-      setSendingLoading(true);
-      send({ kb_ids: kbIds, question: q, tenantId });
-      testChunk({
-        kb_id: kbIds,
-        highlight: true,
-        question: q,
-        page: 1,
-        size: pagination.pageSize,
-      });
-
-      fetchRelatedQuestions(q);
-    },
-    [
-      send,
-      testChunk,
-      kbIds,
-      fetchRelatedQuestions,
-      setPagination,
-      pagination.pageSize,
-      tenantId,
-    ],
-  );
-
-  const handleSearchStrChange: ChangeEventHandler<HTMLInputElement> =
-    useCallback((e) => {
-      setSearchStr(e.target.value);
-    }, []);
-
-  const handleClickRelatedQuestion = useCallback(
-    (question: string) => () => {
-      if (sendingLoading) return;
-
-      setSearchStr(question);
-      sendQuestion(question);
-    },
-    [sendQuestion, sendingLoading],
-  );
-
-  const handleTestChunk = useCallback(
-    (documentIds: string[], page: number = 1, size: number = 10) => {
-      const q = trim(searchStr);
-      if (sendingLoading || isEmpty(q)) return;
-
-      testChunk({
-        kb_id: kbIds,
-        highlight: true,
-        question: q,
-        doc_ids: documentIds ?? selectedDocumentIds,
-        page,
-        size,
-      });
-
-      testChunkAll({
-        kb_id: kbIds,
-        highlight: true,
-        question: q,
-        doc_ids: [],
-        page,
-        size,
-      });
-    },
-    [
-      searchStr,
-      sendingLoading,
-      testChunk,
-      kbIds,
-      selectedDocumentIds,
-      testChunkAll,
-    ],
-  );
-
-  useEffect(() => {
-    if (!isEmpty(answer)) {
-      setCurrentAnswer(answer);
-    }
-  }, [answer]);
-
-  useEffect(() => {
-    if (done) {
-      setSendingLoading(false);
-    }
-  }, [done]);
-
-  return {
-    sendQuestion,
-    handleSearchStrChange,
-    handleClickRelatedQuestion,
-    handleTestChunk,
-    setSelectedDocumentIds,
-    loading,
-    sendingLoading,
-    answer: currentAnswer,
-    relatedQuestions: relatedQuestions?.slice(0, 5) ?? [],
-    searchStr,
-    setSearchStr,
-    isFirstRender,
-    selectedDocumentIds,
-    isSearchStrEmpty: isEmpty(trim(searchStr)),
-    stopOutputMessage,
-  };
-};
-
-export const useFetchBackgroundImage = () => {
-  const [imgUrl, setImgUrl] = useState<string>('');
-
-  const fetchImage = useCallback(async () => {
-    try {
-      const res = await fetch(
-        '/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN',
-      );
-      const ret = await res.json();
-      const url = get(ret, 'images.0.url');
-      if (url) {
-        setImgUrl(url);
-      }
-    } catch (error) {
-      console.log('🚀 ~ fetchImage ~ error:', error);
-    }
-  }, []);
-
-  useEffect(() => {
-    fetchImage();
-  }, [fetchImage]);
-
-  return `https://cn.bing.com${imgUrl}`;
-};
-
-export const useTestRetrieval = (
-  kbIds: string[],
-  searchStr: string,
-  sendingLoading: boolean,
-) => {
-  const { testChunk, loading } = useTestChunkRetrieval();
-  const { pagination } = useGetPaginationWithRouter();
-
-  const [selectedDocumentIds, setSelectedDocumentIds] = useState<string[]>([]);
-
-  const handleTestChunk = useCallback(() => {
-    const q = trim(searchStr);
-    if (sendingLoading || isEmpty(q)) return;
-
-    testChunk({
-      kb_id: kbIds,
-      highlight: true,
-      question: q,
-      doc_ids: Array.isArray(selectedDocumentIds) ? selectedDocumentIds : [],
-      page: pagination.current,
-      size: pagination.pageSize,
-    });
-  }, [
-    sendingLoading,
-    searchStr,
-    kbIds,
-    testChunk,
-    selectedDocumentIds,
-    pagination,
-  ]);
-
-  useEffect(() => {
-    handleTestChunk();
-  }, [handleTestChunk]);
-
-  return {
-    loading,
-    selectedDocumentIds,
-    setSelectedDocumentIds,
-  };
-};
-
-export const useShowMindMapDrawer = (
-  kbIds: string[],
-  question: string,
-  searchId = '',
-) => {
-  const { visible, showModal, hideModal } = useSetModalState();
-  const ref = useRef<any>();
-
-  const {
-    fetchMindMap,
-    data: mindMap,
-    loading: mindMapLoading,
-  } = useSearchFetchMindMap();
-
-  const handleShowModal = useCallback(() => {
-    const searchParams = { question: trim(question), kb_ids: kbIds, searchId };
-    if (
-      !isEmpty(searchParams.question) &&
-      !isEqual(searchParams, ref.current)
-    ) {
-      ref.current = searchParams;
-      fetchMindMap(searchParams);
-    }
-    showModal();
-  }, [fetchMindMap, showModal, question, kbIds, searchId]);
-
-  return {
-    mindMap,
-    mindMapVisible: visible,
-    mindMapLoading,
-    showMindMapModal: handleShowModal,
-    hideMindMapModal: hideModal,
-  };
-};
-
-export const usePendingMindMap = () => {
-  const [count, setCount] = useState<number>(0);
-  const ref = useRef<NodeJS.Timeout>();
-
-  const setCountInterval = useCallback(() => {
-    ref.current = setInterval(() => {
-      setCount((pre) => {
-        if (pre > 40) {
-          clearInterval(ref?.current);
-        }
-        return pre + 1;
-      });
-    }, 1000);
-  }, []);
-
-  useEffect(() => {
-    setCountInterval();
-    return () => {
-      clearInterval(ref?.current);
-    };
-  }, [setCountInterval]);
-
-  return Number(((count / 43) * 100).toFixed(0));
-};
diff --git a/web/src/pages/search/index.less b/web/src/pages/search/index.less
deleted file mode 100644
index 1958fd116..000000000
--- a/web/src/pages/search/index.less
+++ /dev/null
@@ -1,191 +0,0 @@
-.searchPage {
-  background-position: center;
-  background-size: cover;
-  .card {
-    width: 100%;
-    :global(.ant-card-body) {
-      padding: 14px;
-    }
-    p {
-      margin: 0;
-    }
-  }
-  .tag {
-    padding: 4px 8px;
-    font-size: 14px;
-    cursor: pointer;
-  }
-}
-
-.searchSide {
-  position: relative;
-  max-width: 400px !important;
-  min-width: auto !important;
-
-  :global(.ant-layout-sider-children) {
-    height: auto;
-  }
-  inset-inline-start: 0;
-
-  .modelForm {
-    display: flex;
-    padding: 24px;
-  }
-
-  .checkGroup {
-    width: 100%;
-    height: 100%;
-  }
-  .list {
-    padding-top: 10px;
-    width: 100%;
-    height: calc(100vh - 76px);
-    overflow: auto;
-    // background-color: transparent;
-    // &::-webkit-scrollbar-track {
-    //   background: transparent;
-    // }
-  }
-  .checkbox {
-    width: 100%;
-  }
-  .knowledgeName {
-    width: 116px;
-    max-width: 270px;
-  }
-  .embeddingId {
-    width: 170px;
-  }
-}
-
-.firstRenderContent {
-  height: 100%;
-}
-
-.content {
-  height: 100%;
-  overflow: auto;
-  width: 100%;
-  padding: 20px 16% 10px;
-  .hide {
-    display: none;
-  }
-
-  .main {
-    margin: 0 auto;
-    width: 100%;
-    max-width: 1200px;
-  }
-
-  .highlightContent {
-    .multipleLineEllipsis(2);
-    em {
-      color: red;
-      font-style: normal;
-    }
-  }
-  .documentReference {
-    cursor: pointer;
-  }
-  .pagination {
-    padding-bottom: 16px;
-  }
-}
-.answerWrapper {
-  margin-top: 16px;
-  background: rgba(232 242 251, 1);
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.08);
-  :global(.ant-card-head) {
-    background-color: #e6f4ff23;
-  }
-  & p {
-    margin: 0;
-  }
-}
-
-.input() {
-  :global(.ant-input-affix-wrapper) {
-    padding: 4px 12px;
-    border-start-start-radius: 30px !important;
-    border-end-start-radius: 30px !important;
-  }
-  // :global(.ant-input-group-addon) {
-  //   background-color: transparent;
-  // }
-  input {
-    height: 40px;
-  }
-  button {
-    height: 50px !important;
-    border-start-end-radius: 30px !important;
-    border-end-end-radius: 30px !important;
-  }
-}
-
-.globalInput {
-  width: 600px;
-  position: sticky;
-  top: 30%;
-  z-index: 1;
-  .input();
-}
-.partialInput {
-  width: 100%;
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  .input();
-}
-
-.searchInput {
-  :global(.ant-input-search-button) {
-    display: none;
-  }
-}
-
-.appIcon {
-  display: inline-block;
-  vertical-align: middle;
-  width: 60px;
-}
-
-.appName {
-  vertical-align: middle;
-  font-family: Inter;
-  font-size: 40px;
-  font-style: normal;
-  font-weight: 600;
-  line-height: 20px;
-
-  background: linear-gradient(to right, #095fab 10%, #25abe8 50%, #55c8dd 60%);
-  background-size: auto auto;
-  background-clip: border-box;
-  background-size: 200% auto;
-  color: #fff;
-  background-clip: text;
-  text-fill-color: transparent;
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  animation: textclip 1.5s linear infinite;
-}
-
-@keyframes textclip {
-  to {
-    background-position: 200% center;
-  }
-}
-
-.popupMarkdown {
-  width: 60vw;
-  max-height: 40vh;
-  overflow: auto;
-}
-
-.mindMapFloatButton {
-  top: 20%;
-  width: 60px;
-  height: 60px;
-  :global(.ant-float-btn-content, .ant-float-btn-icon) {
-    width: auto !important;
-  }
-}
diff --git a/web/src/pages/search/index.tsx b/web/src/pages/search/index.tsx
deleted file mode 100644
index db19e82aa..000000000
--- a/web/src/pages/search/index.tsx
+++ /dev/null
@@ -1,284 +0,0 @@
-import FileIcon from '@/components/file-icon';
-import HightLightMarkdown from '@/components/highlight-markdown';
-import { ImageWithPopover } from '@/components/image';
-import PdfDrawer from '@/components/pdf-drawer';
-import { useClickDrawer } from '@/components/pdf-drawer/hooks';
-import RetrievalDocuments from '@/components/retrieval-documents';
-import SvgIcon from '@/components/svg-icon';
-import {
-  useFetchKnowledgeList,
-  useSelectTestingResult,
-} from '@/hooks/knowledge-hooks';
-import { useGetPaginationWithRouter } from '@/hooks/logic-hooks';
-import { IReference } from '@/interfaces/database/chat';
-import {
-  Button,
-  Card,
-  Divider,
-  Flex,
-  FloatButton,
-  Input,
-  Layout,
-  List,
-  Pagination,
-  PaginationProps,
-  Popover,
-  Skeleton,
-  Space,
-  Spin,
-  Tag,
-  Tooltip,
-} from 'antd';
-import classNames from 'classnames';
-import DOMPurify from 'dompurify';
-import { isEmpty } from 'lodash';
-import { CircleStop, SendHorizontal } from 'lucide-react';
-import { useCallback, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import MarkdownContent from '../chat/markdown-content';
-import { useSendQuestion, useShowMindMapDrawer } from './hooks';
-import styles from './index.less';
-import MindMapDrawer from './mindmap-drawer';
-import SearchSidebar from './sidebar';
-
-const { Content } = Layout;
-const { Search } = Input;
-
-const SearchPage = () => {
-  const { t } = useTranslation();
-  const [checkedList, setCheckedList] = useState<string[]>([]);
-  const { chunks, total } = useSelectTestingResult();
-  const { list: knowledgeList } = useFetchKnowledgeList();
-  const checkedWithoutEmbeddingIdList = useMemo(() => {
-    return checkedList.filter((x) => knowledgeList.some((y) => y.id === x));
-  }, [checkedList, knowledgeList]);
-
-  const {
-    sendQuestion,
-    handleClickRelatedQuestion,
-    handleSearchStrChange,
-    handleTestChunk,
-    setSelectedDocumentIds,
-    answer,
-    sendingLoading,
-    relatedQuestions,
-    searchStr,
-    loading,
-    isFirstRender,
-    selectedDocumentIds,
-    isSearchStrEmpty,
-    stopOutputMessage,
-  } = useSendQuestion(checkedWithoutEmbeddingIdList);
-  const { visible, hideModal, documentId, selectedChunk, clickDocumentButton } =
-    useClickDrawer();
-  const { pagination } = useGetPaginationWithRouter();
-  const {
-    mindMapVisible,
-    hideMindMapModal,
-    showMindMapModal,
-    mindMapLoading,
-    mindMap,
-  } = useShowMindMapDrawer(checkedWithoutEmbeddingIdList, searchStr);
-
-  const onChange: PaginationProps['onChange'] = (pageNumber, pageSize) => {
-    pagination.onChange?.(pageNumber, pageSize);
-    handleTestChunk(selectedDocumentIds, pageNumber, pageSize);
-  };
-
-  const handleSearch = useCallback(() => {
-    sendQuestion(searchStr);
-  }, [searchStr, sendQuestion]);
-
-  const InputSearch = (
-    <Search
-      value={searchStr}
-      onChange={handleSearchStrChange}
-      placeholder={t('header.search')}
-      allowClear
-      addonAfter={
-        sendingLoading ? (
-          <Button onClick={stopOutputMessage}>
-            <CircleStop />
-          </Button>
-        ) : (
-          <Button onClick={handleSearch}>
-            <SendHorizontal className="size-5 text-blue-500" />
-          </Button>
-        )
-      }
-      onSearch={sendQuestion}
-      size="large"
-      loading={sendingLoading}
-      disabled={checkedWithoutEmbeddingIdList.length === 0}
-      className={classNames(
-        styles.searchInput,
-        isFirstRender ? styles.globalInput : styles.partialInput,
-      )}
-    />
-  );
-
-  return (
-    <>
-      <Layout className={styles.searchPage}>
-        <SearchSidebar
-          isFirstRender={isFirstRender}
-          checkedList={checkedWithoutEmbeddingIdList}
-          setCheckedList={setCheckedList}
-        ></SearchSidebar>
-        <Layout className={isFirstRender ? styles.mainLayout : ''}>
-          <Content>
-            {isFirstRender ? (
-              <Flex justify="center" className={styles.firstRenderContent}>
-                <Flex vertical align="center" gap={'large'}>
-                  {InputSearch}
-                </Flex>
-              </Flex>
-            ) : (
-              <Flex className={styles.content}>
-                <section className={styles.main}>
-                  {InputSearch}
-                  <Card
-                    title={
-                      <Flex gap={10}>
-                        <img src="/logo.svg" alt="" width={20} />
-                        {t('chat.answerTitle')}
-                      </Flex>
-                    }
-                    className={styles.answerWrapper}
-                  >
-                    {isEmpty(answer) && sendingLoading ? (
-                      <Skeleton active />
-                    ) : (
-                      answer.answer && (
-                        <MarkdownContent
-                          loading={sendingLoading}
-                          content={answer.answer}
-                          reference={answer.reference ?? ({} as IReference)}
-                          clickDocumentButton={clickDocumentButton}
-                        ></MarkdownContent>
-                      )
-                    )}
-                  </Card>
-                  <Divider></Divider>
-                  <RetrievalDocuments
-                    selectedDocumentIds={selectedDocumentIds}
-                    setSelectedDocumentIds={setSelectedDocumentIds}
-                    onTesting={handleTestChunk}
-                  ></RetrievalDocuments>
-                  <Divider></Divider>
-                  <Spin spinning={loading}>
-                    {chunks?.length > 0 && (
-                      <List
-                        dataSource={chunks || []}
-                        className={styles.chunks}
-                        renderItem={(item) => (
-                          <List.Item>
-                            <Card className={styles.card}>
-                              <Space>
-                                <ImageWithPopover
-                                  id={item.img_id}
-                                ></ImageWithPopover>
-                                <Flex vertical gap={10}>
-                                  <Popover
-                                    content={
-                                      <div className={styles.popupMarkdown}>
-                                        <HightLightMarkdown>
-                                          {item.content_with_weight}
-                                        </HightLightMarkdown>
-                                      </div>
-                                    }
-                                  >
-                                    <div
-                                      dangerouslySetInnerHTML={{
-                                        __html: DOMPurify.sanitize(
-                                          `${item.highlight}...`,
-                                        ),
-                                      }}
-                                      className={styles.highlightContent}
-                                    ></div>
-                                  </Popover>
-                                  <Space
-                                    className={styles.documentReference}
-                                    onClick={() =>
-                                      clickDocumentButton(
-                                        item.doc_id,
-                                        item as any,
-                                      )
-                                    }
-                                  >
-                                    <FileIcon
-                                      id={item.image_id}
-                                      name={item.docnm_kwd}
-                                    ></FileIcon>
-                                    {item.docnm_kwd}
-                                  </Space>
-                                </Flex>
-                              </Space>
-                            </Card>
-                          </List.Item>
-                        )}
-                      />
-                    )}
-                  </Spin>
-                  {relatedQuestions?.length > 0 && (
-                    <Card title={t('chat.relatedQuestion')}>
-                      <Flex wrap="wrap" gap={'10px 0'}>
-                        {relatedQuestions?.map((x, idx) => (
-                          <Tag
-                            key={idx}
-                            className={styles.tag}
-                            onClick={handleClickRelatedQuestion(x)}
-                          >
-                            {x}
-                          </Tag>
-                        ))}
-                      </Flex>
-                    </Card>
-                  )}
-                  <Divider></Divider>
-                  <Pagination
-                    {...pagination}
-                    total={total}
-                    onChange={onChange}
-                    className={styles.pagination}
-                  />
-                </section>
-              </Flex>
-            )}
-          </Content>
-        </Layout>
-      </Layout>
-      {!isFirstRender &&
-        !isSearchStrEmpty &&
-        !isEmpty(checkedWithoutEmbeddingIdList) && (
-          <Tooltip title={t('chunk.mind')} zIndex={1}>
-            <FloatButton
-              className={styles.mindMapFloatButton}
-              onClick={showMindMapModal}
-              icon={
-                <SvgIcon name="paper-clip" width={24} height={30}></SvgIcon>
-              }
-            />
-          </Tooltip>
-        )}
-      {visible && (
-        <PdfDrawer
-          visible={visible}
-          hideModal={hideModal}
-          documentId={documentId}
-          chunk={selectedChunk}
-        ></PdfDrawer>
-      )}
-      {mindMapVisible && (
-        <MindMapDrawer
-          visible={mindMapVisible}
-          hideModal={hideMindMapModal}
-          data={mindMap}
-          loading={mindMapLoading}
-        ></MindMapDrawer>
-      )}
-    </>
-  );
-};
-
-export default SearchPage;
diff --git a/web/src/pages/search/mindmap-drawer.tsx b/web/src/pages/search/mindmap-drawer.tsx
deleted file mode 100644
index 43ac8eb1d..000000000
--- a/web/src/pages/search/mindmap-drawer.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import IndentedTree from '@/components/indented-tree/indented-tree';
-import { IModalProps } from '@/interfaces/common';
-import { Drawer, Flex, Progress } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { usePendingMindMap } from './hooks';
-
-interface IProps extends IModalProps<any> {
-  data: any;
-}
-
-const MindMapDrawer = ({ data, hideModal, visible, loading }: IProps) => {
-  const { t } = useTranslation();
-  const percent = usePendingMindMap();
-  return (
-    <Drawer
-      title={t('chunk.mind')}
-      onClose={hideModal}
-      open={visible}
-      width={'40vw'}
-    >
-      {loading ? (
-        <Flex justify="center">
-          <Progress type="circle" percent={percent} size={200} />
-        </Flex>
-      ) : (
-        <IndentedTree
-          data={data}
-          show
-          style={{ width: '100%', height: '100%' }}
-        ></IndentedTree>
-      )}
-    </Drawer>
-  );
-};
-
-export default MindMapDrawer;
diff --git a/web/src/pages/search/sidebar.tsx b/web/src/pages/search/sidebar.tsx
deleted file mode 100644
index 052f48443..000000000
--- a/web/src/pages/search/sidebar.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useFetchKnowledgeList } from '@/hooks/knowledge-hooks';
-import { UserOutlined } from '@ant-design/icons';
-import type { TreeDataNode, TreeProps } from 'antd';
-import { Avatar, Layout, Space, Spin, Tree, Typography } from 'antd';
-import classNames from 'classnames';
-import {
-  Dispatch,
-  SetStateAction,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react';
-
-import styles from './index.less';
-
-const { Sider } = Layout;
-
-interface IProps {
-  isFirstRender: boolean;
-  checkedList: string[];
-  setCheckedList: Dispatch<SetStateAction<string[]>>;
-}
-
-const SearchSidebar = ({
-  isFirstRender,
-  checkedList,
-  setCheckedList,
-}: IProps) => {
-  const { list, loading } = useFetchKnowledgeList();
-
-  const groupedList = useMemo(() => {
-    return list.reduce((pre: TreeDataNode[], cur) => {
-      const parentItem = pre.find((x) => x.key === cur.embd_id);
-      const childItem: TreeDataNode = {
-        title: cur.name,
-        key: cur.id,
-        isLeaf: true,
-      };
-      if (parentItem) {
-        parentItem.children?.push(childItem);
-      } else {
-        pre.push({
-          title: cur.embd_id,
-          key: cur.embd_id,
-          isLeaf: false,
-          children: [childItem],
-        });
-      }
-
-      return pre;
-    }, []);
-  }, [list]);
-
-  const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
-  const [autoExpandParent, setAutoExpandParent] = useState<boolean>(true);
-
-  const onExpand: TreeProps['onExpand'] = (expandedKeysValue) => {
-    // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-    // or, you can remove all expanded children keys.
-    setExpandedKeys(expandedKeysValue);
-    setAutoExpandParent(false);
-  };
-
-  const onCheck: TreeProps['onCheck'] = (checkedKeysValue, info) => {
-    console.log('onCheck', checkedKeysValue, info);
-    const currentCheckedKeysValue = checkedKeysValue as string[];
-
-    let nextSelectedKeysValue: string[] = [];
-    const { isLeaf, checked, key, children } = info.node;
-    if (isLeaf) {
-      const item = list.find((x) => x.id === key);
-      if (!checked) {
-        const embeddingIds = currentCheckedKeysValue
-          .filter((x) => list.some((y) => y.id === x))
-          .map((x) => list.find((y) => y.id === x)?.embd_id);
-
-        if (embeddingIds.some((x) => x !== item?.embd_id)) {
-          nextSelectedKeysValue = [key as string];
-        } else {
-          nextSelectedKeysValue = currentCheckedKeysValue;
-        }
-      } else {
-        nextSelectedKeysValue = currentCheckedKeysValue;
-      }
-    } else {
-      if (!checked) {
-        nextSelectedKeysValue = [
-          key as string,
-          ...(children?.map((x) => x.key as string) ?? []),
-        ];
-      } else {
-        nextSelectedKeysValue = [];
-      }
-    }
-
-    setCheckedList(nextSelectedKeysValue);
-  };
-
-  const onSelect: TreeProps['onSelect'] = (selectedKeysValue, info) => {
-    console.log('onSelect', info);
-
-    setSelectedKeys(selectedKeysValue);
-  };
-
-  const renderTitle = useCallback(
-    (node: TreeDataNode) => {
-      const item = list.find((x) => x.id === node.key);
-      return (
-        <Space>
-          {node.isLeaf && (
-            <Avatar size={24} icon={<UserOutlined />} src={item?.avatar} />
-          )}
-          <Typography.Text
-            ellipsis={{ tooltip: node.title as string }}
-            className={node.isLeaf ? styles.knowledgeName : styles.embeddingId}
-          >
-            {node.title as string}
-          </Typography.Text>
-        </Space>
-      );
-    },
-    [list],
-  );
-
-  useEffect(() => {
-    const firstGroup = groupedList[0]?.children?.map((x) => x.key as string);
-    if (firstGroup) {
-      setCheckedList(firstGroup);
-    }
-    setExpandedKeys(groupedList.map((x) => x.key));
-  }, [groupedList, setExpandedKeys, setCheckedList]);
-
-  return (
-    <Sider
-      className={classNames(styles.searchSide, {
-        [styles.transparentSearchSide]: isFirstRender,
-      })}
-      theme={'light'}
-      width={'20%'}
-    >
-      <Spin spinning={loading}>
-        <Tree
-          className={styles.list}
-          checkable
-          onExpand={onExpand}
-          expandedKeys={expandedKeys}
-          autoExpandParent={autoExpandParent}
-          onCheck={onCheck}
-          checkedKeys={checkedList}
-          onSelect={onSelect}
-          selectedKeys={selectedKeys}
-          treeData={groupedList}
-          titleRender={renderTitle}
-        />
-      </Spin>
-    </Sider>
-  );
-};
-
-export default SearchSidebar;
diff --git a/web/src/pages/user-setting/mcp/import-mcp-dialog/import-mcp-form.tsx b/web/src/pages/user-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
index d34507308..6408b9e18 100644
--- a/web/src/pages/user-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
+++ b/web/src/pages/user-setting/mcp/import-mcp-dialog/import-mcp-form.tsx
@@ -14,8 +14,8 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { FileMimeType, Platform } from '@/constants/common';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 
 export function ImportMcpForm({ hideModal, onOk }: IModalProps<any>) {
diff --git a/web/src/pages/user-setting/mcp/import-mcp-dialog/index.tsx b/web/src/pages/user-setting/mcp/import-mcp-dialog/index.tsx
index 76b35387b..1946523eb 100644
--- a/web/src/pages/user-setting/mcp/import-mcp-dialog/index.tsx
+++ b/web/src/pages/user-setting/mcp/import-mcp-dialog/index.tsx
@@ -6,8 +6,8 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { LoadingButton } from '@/components/ui/loading-button';
+import { TagRenameId } from '@/constants/knowledge';
 import { IModalProps } from '@/interfaces/common';
-import { TagRenameId } from '@/pages/add-knowledge/constant';
 import { useTranslation } from 'react-i18next';
 import { ImportMcpForm } from './import-mcp-form';
 
diff --git a/web/src/routes.ts b/web/src/routes.ts
index 56dd84077..306a5225f 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -69,11 +69,6 @@ const routes = [
     component: '@/pages/login-next',
     layout: false,
   },
-  {
-    path: '/chat/share',
-    component: '@/pages/chat/share',
-    layout: false,
-  },
   {
     path: Routes.ChatShare,
     component: `@/pages${Routes.ChatShare}`,
@@ -89,65 +84,11 @@ const routes = [
     component: `@/pages${Routes.ChatWidget}`,
     layout: false,
   },
-  {
-    path: Routes.Home,
-    component: '@/layouts',
-    layout: false,
-    redirect: '/knowledge',
-  },
-  {
-    path: '/knowledge',
-    component: '@/pages/knowledge',
-  },
-  {
-    path: '/knowledge',
-    component: '@/pages/add-knowledge',
-    routes: [
-      {
-        path: 'dataset',
-        component: '@/pages/add-knowledge/components/knowledge-dataset',
-        routes: [
-          {
-            path: '',
-            component: '@/pages/add-knowledge/components/knowledge-file',
-          },
-          {
-            path: 'chunk',
-            component: '@/pages/add-knowledge/components/knowledge-chunk',
-          },
-        ],
-      },
-      {
-        path: 'configuration',
-        component: '@/pages/add-knowledge/components/knowledge-setting',
-      },
-      {
-        path: 'testing',
-        component: '@/pages/add-knowledge/components/knowledge-testing',
-      },
-      {
-        path: 'knowledgeGraph',
-        component: '@/pages/add-knowledge/components/knowledge-graph',
-      },
-    ],
-  },
 
-  {
-    path: '/chat',
-    component: '@/pages/chat',
-  },
-  {
-    path: '/file',
-    component: '@/pages/file-manager',
-  },
   {
     path: Routes.AgentList,
     component: `@/pages/${Routes.Agents}`,
   },
-  {
-    path: '/search',
-    component: '@/pages/search',
-  },
   {
     path: '/document/:id',
     component: '@/pages/document-viewer',
diff --git a/web/src/utils/chat.ts b/web/src/utils/chat.ts
index b66559372..08ef3c820 100644
--- a/web/src/utils/chat.ts
+++ b/web/src/utils/chat.ts
@@ -2,8 +2,7 @@ import {
   ChatVariableEnabledField,
   EmptyConversationId,
 } from '@/constants/chat';
-import { Message } from '@/interfaces/database/chat';
-import { IMessage } from '@/pages/chat/interface';
+import { IMessage, Message } from '@/interfaces/database/chat';
 import { omit } from 'lodash';
 import { v4 as uuid } from 'uuid';
 
@@ -84,3 +83,13 @@ export function setChatVariableEnabledFieldValuePage() {
 
   return variableCheckBoxFieldMap;
 }
+
+const oldReg = /(#{2}\d+\${2})/g;
+export const currentReg = /\[ID:(\d+)\]/g;
+
+// To be compatible with the old index matching mode
+export const replaceTextByOldReg = (text: string) => {
+  return text?.replace(oldReg, (substring: string) => {
+    return `[ID:${substring.slice(2, -2)}]`;
+  });
+};

From a674338c219f2e266e8e6f300dbd257a0f960c7a Mon Sep 17 00:00:00 2001
From: buua436 <66937541+buua436@users.noreply.github.com>
Date: Thu, 27 Nov 2025 17:54:49 +0800
Subject: [PATCH 13/17] Fix: remove garbage filtering rules (#11567)

### What problem does this PR solve?
change:

remove garbage filtering rules

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 deepdoc/vision/layout_recognizer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deepdoc/vision/layout_recognizer.py b/deepdoc/vision/layout_recognizer.py
index 8068cbc07..5b79e2bf5 100644
--- a/deepdoc/vision/layout_recognizer.py
+++ b/deepdoc/vision/layout_recognizer.py
@@ -17,7 +17,7 @@
 import logging
 import math
 import os
-import re
+# import re
 from collections import Counter
 from copy import deepcopy
 
@@ -62,8 +62,9 @@ class LayoutRecognizer(Recognizer):
 
     def __call__(self, image_list, ocr_res, scale_factor=3, thr=0.2, batch_size=16, drop=True):
         def __is_garbage(b):
-            patt = [r"^•+$", "^[0-9]{1,2} / ?[0-9]{1,2}$", r"^[0-9]{1,2} of [0-9]{1,2}$", "^http://[^ ]{12,}", "\\(cid *: *[0-9]+ *\\)"]
-            return any([re.search(p, b["text"]) for p in patt])
+            return False
+            # patt = [r"^•+$", "^[0-9]{1,2} / ?[0-9]{1,2}$", r"^[0-9]{1,2} of [0-9]{1,2}$", "^http://[^ ]{12,}", "\\(cid *: *[0-9]+ *\\)"]
+            # return any([re.search(p, b["text"]) for p in patt])
 
         if self.client:
             layouts = self.client.predict(image_list)

From 8604c4f57c1f5b1432cdf35044c0f7bddf71a82a Mon Sep 17 00:00:00 2001
From: Yongteng Lei <yongtengrey@outlook.com>
Date: Thu, 27 Nov 2025 17:59:17 +0800
Subject: [PATCH 14/17] =?UTF-8?q?Feat:=20add=20GPT-5.1,=20GPT=E2=80=915.1?=
 =?UTF-8?q?=20Instant=20and=20Claude-Opus-4.5=20(#11559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### What problem does this PR solve?

Add GPT-5.1, GPT‑5.1 Instant and Claude-Opus-4.5. #11548

### Type of change

- [x] New Feature (non-breaking change which adds functionality)
---
 conf/llm_factories.json | 21 +++++++++++++++++++++
 rag/llm/chat_model.py   |  5 +++++
 2 files changed, 26 insertions(+)

diff --git a/conf/llm_factories.json b/conf/llm_factories.json
index 71f47be2e..90602c65f 100644
--- a/conf/llm_factories.json
+++ b/conf/llm_factories.json
@@ -7,6 +7,20 @@
             "status": "1",
             "rank": "999",
             "llm": [
+                {
+                    "llm_name": "gpt-5.1",
+                    "tags": "LLM,CHAT,400k,IMAGE2TEXT",
+                    "max_tokens": 400000,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
+                {
+                    "llm_name": "gpt-5.1-chat-latest",
+                    "tags": "LLM,CHAT,400k,IMAGE2TEXT",
+                    "max_tokens": 400000,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
                 {
                     "llm_name": "gpt-5",
                     "tags": "LLM,CHAT,400k,IMAGE2TEXT",
@@ -3218,6 +3232,13 @@
             "status": "1",
             "rank": "990",
             "llm": [
+                {
+                    "llm_name": "claude-opus-4-5-20251101",
+                    "tags": "LLM,CHAT,IMAGE2TEXT,200k",
+                    "max_tokens": 204800,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
                 {
                     "llm_name": "claude-opus-4-1-20250805",
                     "tags": "LLM,CHAT,IMAGE2TEXT,200k",
diff --git a/rag/llm/chat_model.py b/rag/llm/chat_model.py
index cce5b2454..9fbc88348 100644
--- a/rag/llm/chat_model.py
+++ b/rag/llm/chat_model.py
@@ -132,6 +132,11 @@ class Base(ABC):
 
         gen_conf = {k: v for k, v in gen_conf.items() if k in allowed_conf}
 
+        model_name_lower = (self.model_name or "").lower()
+        # gpt-5 and gpt-5.1 endpoints have inconsistent parameter support, clear custom generation params to prevent unexpected issues
+        if "gpt-5" in model_name_lower:
+            gen_conf = {}
+
         return gen_conf
 
     def _chat(self, history, gen_conf, **kwargs):

From 1f96c95b427339f01dd7c48e264540ec1e37fb6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BA=B7=E7=B9=81=E4=B8=8B=E7=9A=84=E6=97=A0=E5=A5=88?=
 <zhileihuang@126.com>
Date: Fri, 28 Nov 2025 12:10:04 +0800
Subject: [PATCH 15/17] update new models for tokenpony (#11571)

update new models for TokenPony

Co-authored-by: huangzl <huangzl@shinemo.com>
---
 conf/llm_factories.json | 42 +++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/conf/llm_factories.json b/conf/llm_factories.json
index 90602c65f..d3b2dcc1c 100644
--- a/conf/llm_factories.json
+++ b/conf/llm_factories.json
@@ -283,20 +283,6 @@
                     "model_type": "chat",
                     "is_tools": true
                 },
-                {
-                    "llm_name": "glm-4.5",
-                    "tags": "LLM,CHAT,131K",
-                    "max_tokens": 131000,
-                    "model_type": "chat",
-                    "is_tools": true
-                },
-                {
-                    "llm_name": "deepseek-v3.1",
-                    "tags": "LLM,CHAT,128k",
-                    "max_tokens": 128000,
-                    "model_type": "chat",
-                    "is_tools": true
-                },
                 {
                     "llm_name": "hunyuan-a13b-instruct",
                     "tags": "LLM,CHAT,256k",
@@ -338,6 +324,34 @@
                     "max_tokens": 262000,
                     "model_type": "chat",
                     "is_tools": true
+                },
+                {
+                    "llm_name": "deepseek-ocr",
+                    "tags": "LLM,8k",
+                    "max_tokens": 8000,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
+                {
+                    "llm_name": "qwen3-235b-a22b-instruct-2507",
+                    "tags": "LLM,CHAT,256k",
+                    "max_tokens": 256000,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
+                {
+                    "llm_name": "glm-4.6",
+                    "tags": "LLM,CHAT,200k",
+                    "max_tokens": 200000,
+                    "model_type": "chat",
+                    "is_tools": true
+                },
+                {
+                    "llm_name": "minimax-m2",
+                    "tags": "LLM,CHAT,200k",
+                    "max_tokens": 200000,
+                    "model_type": "chat",
+                    "is_tools": true
                 }
             ]
         },

From 982ed233a2278ab1daf21953f04cd07246dcf36d Mon Sep 17 00:00:00 2001
From: Billy Bao <newyorkupperbay@gmail.com>
Date: Fri, 28 Nov 2025 13:09:05 +0800
Subject: [PATCH 16/17] Fix: doc_aggs not correctly returned when no chunks
 retrieved. (#11578)

### What problem does this PR solve?

Fix: doc_aggs not correctly returned when no chunks retrieved.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 rag/nlp/search.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rag/nlp/search.py b/rag/nlp/search.py
index e282cbd72..084f7b48f 100644
--- a/rag/nlp/search.py
+++ b/rag/nlp/search.py
@@ -424,6 +424,7 @@ class Dealer:
 
         sim_np = np.array(sim, dtype=np.float64)
         if sim_np.size == 0:
+            ranks["doc_aggs"] = []
             return ranks
 
         sorted_idx = np.argsort(sim_np * -1)
@@ -433,6 +434,7 @@ class Dealer:
         ranks["total"] = int(filtered_count)
 
         if filtered_count == 0:
+            ranks["doc_aggs"] = []
             return ranks
 
         max_pages = max(RERANK_LIMIT // max(page_size, 1), 1)

From cf7fdd274bc21c16f90d6a2b6c74121808ddf8c0 Mon Sep 17 00:00:00 2001
From: Billy Bao <newyorkupperbay@gmail.com>
Date: Fri, 28 Nov 2025 13:09:40 +0800
Subject: [PATCH 17/17] Feat: add gmail connector (#11549)

### What problem does this PR solve?

_Briefly describe what this PR aims to solve. Include background context
that will help reviewers understand the purpose of the PR._

### Type of change

- [x] New Feature (non-breaking change which adds functionality)
---
 api/apps/connector_app.py                     | 170 ++++++--
 api/apps/user_app.py                          |   8 +-
 common/data_source/config.py                  |   1 +
 common/data_source/gmail_connector.py         |  58 ++-
 common/data_source/google_drive/connector.py  |  39 +-
 common/data_source/google_util/constant.py    |   4 +-
 common/data_source/google_util/util.py        | 115 +++++-
 common/data_source/interfaces.py              |   1 -
 common/data_source/utils.py                   |  11 +-
 rag/svr/sync_data_source.py                   |  60 ++-
 web/src/assets/svg/data-source/gmail.svg      |   7 +
 web/src/locales/en.ts                         |   5 +
 web/src/locales/ru.ts                         |   6 +
 web/src/locales/zh.ts                         |   5 +
 .../data-source/add-datasource-modal.tsx      |   1 +
 .../component/gmail-token-field.tsx           | 391 ++++++++++++++++++
 .../component/google-drive-token-field.tsx    |  13 +-
 .../user-setting/data-source/contant.tsx      |  51 ++-
 web/src/services/data-source-service.ts       |  12 +-
 web/src/utils/api.ts                          |   6 +-
 20 files changed, 856 insertions(+), 108 deletions(-)
 create mode 100644 web/src/assets/svg/data-source/gmail.svg
 create mode 100644 web/src/pages/user-setting/data-source/component/gmail-token-field.tsx

diff --git a/api/apps/connector_app.py b/api/apps/connector_app.py
index 4932c3fcc..34da2293b 100644
--- a/api/apps/connector_app.py
+++ b/api/apps/connector_app.py
@@ -28,8 +28,8 @@ from api.db import InputType
 from api.db.services.connector_service import ConnectorService, SyncLogsService
 from api.utils.api_utils import get_data_error_result, get_json_result, validate_request
 from common.constants import RetCode, TaskStatus
-from common.data_source.config import GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI, DocumentSource
-from common.data_source.google_util.constant import GOOGLE_DRIVE_WEB_OAUTH_POPUP_TEMPLATE, GOOGLE_SCOPES
+from common.data_source.config import GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI, GMAIL_WEB_OAUTH_REDIRECT_URI, DocumentSource
+from common.data_source.google_util.constant import GOOGLE_WEB_OAUTH_POPUP_TEMPLATE, GOOGLE_SCOPES
 from common.misc_utils import get_uuid
 from rag.utils.redis_conn import REDIS_CONN
 from api.apps import login_required, current_user
@@ -122,12 +122,30 @@ GOOGLE_WEB_FLOW_RESULT_PREFIX = "google_drive_web_flow_result"
 WEB_FLOW_TTL_SECS = 15 * 60
 
 
-def _web_state_cache_key(flow_id: str) -> str:
-    return f"{GOOGLE_WEB_FLOW_STATE_PREFIX}:{flow_id}"
+def _web_state_cache_key(flow_id: str, source_type: str | None = None) -> str:
+    """Return Redis key for web OAuth state.
+
+    The default prefix keeps backward compatibility for Google Drive.
+    When source_type == "gmail", a different prefix is used so that
+    Drive/Gmail flows don't clash in Redis.
+    """
+    if source_type == "gmail":
+        prefix = "gmail_web_flow_state"
+    else:
+        prefix = GOOGLE_WEB_FLOW_STATE_PREFIX
+    return f"{prefix}:{flow_id}"
 
 
-def _web_result_cache_key(flow_id: str) -> str:
-    return f"{GOOGLE_WEB_FLOW_RESULT_PREFIX}:{flow_id}"
+def _web_result_cache_key(flow_id: str, source_type: str | None = None) -> str:
+    """Return Redis key for web OAuth result.
+
+    Mirrors _web_state_cache_key logic for result storage.
+    """
+    if source_type == "gmail":
+        prefix = "gmail_web_flow_result"
+    else:
+        prefix = GOOGLE_WEB_FLOW_RESULT_PREFIX
+    return f"{prefix}:{flow_id}"
 
 
 def _load_credentials(payload: str | dict[str, Any]) -> dict[str, Any]:
@@ -146,19 +164,22 @@ def _get_web_client_config(credentials: dict[str, Any]) -> dict[str, Any]:
     return {"web": web_section}
 
 
-async def _render_web_oauth_popup(flow_id: str, success: bool, message: str):
+async def _render_web_oauth_popup(flow_id: str, success: bool, message: str, source="drive"):
     status = "success" if success else "error"
     auto_close = "window.close();" if success else ""
     escaped_message = escape(message)
     payload_json = json.dumps(
         {
-            "type": "ragflow-google-drive-oauth",
+            # TODO(google-oauth): include connector type (drive/gmail) in payload type if needed
+            "type": f"ragflow-google-{source}-oauth",
             "status": status,
             "flowId": flow_id or "",
             "message": message,
         }
     )
-    html = GOOGLE_DRIVE_WEB_OAUTH_POPUP_TEMPLATE.format(
+    # TODO(google-oauth): title/heading/message may need to reflect drive/gmail based on cached type
+    html = GOOGLE_WEB_OAUTH_POPUP_TEMPLATE.format(
+        title=f"Google {source.capitalize()} Authorization",
         heading="Authorization complete" if success else "Authorization failed",
         message=escaped_message,
         payload_json=payload_json,
@@ -169,20 +190,33 @@ async def _render_web_oauth_popup(flow_id: str, success: bool, message: str):
     return response
 
 
-@manager.route("/google-drive/oauth/web/start", methods=["POST"])  # noqa: F821
+@manager.route("/google/oauth/web/start", methods=["POST"])  # noqa: F821
 @login_required
 @validate_request("credentials")
-async def start_google_drive_web_oauth():
-    if not GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI:
+async def start_google_web_oauth():
+    source = request.args.get("type", "google-drive")
+    if source not in ("google-drive", "gmail"):
+        return get_json_result(code=RetCode.ARGUMENT_ERROR, message="Invalid Google OAuth type.")
+
+    if source == "gmail":
+        redirect_uri = GMAIL_WEB_OAUTH_REDIRECT_URI
+        scopes = GOOGLE_SCOPES[DocumentSource.GMAIL]
+    else:
+        redirect_uri = GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI if source == "google-drive" else GMAIL_WEB_OAUTH_REDIRECT_URI
+        scopes = GOOGLE_SCOPES[DocumentSource.GOOGLE_DRIVE if source == "google-drive" else DocumentSource.GMAIL]
+
+    if not redirect_uri:
         return get_json_result(
             code=RetCode.SERVER_ERROR,
-            message="Google Drive OAuth redirect URI is not configured on the server.",
+            message="Google OAuth redirect URI is not configured on the server.",
         )
 
     req = await request.json or {}
     raw_credentials = req.get("credentials", "")
+
     try:
         credentials = _load_credentials(raw_credentials)
+        print(credentials)
     except ValueError as exc:
         return get_json_result(code=RetCode.ARGUMENT_ERROR, message=str(exc))
 
@@ -199,8 +233,8 @@ async def start_google_drive_web_oauth():
 
     flow_id = str(uuid.uuid4())
     try:
-        flow = Flow.from_client_config(client_config, scopes=GOOGLE_SCOPES[DocumentSource.GOOGLE_DRIVE])
-        flow.redirect_uri = GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI
+        flow = Flow.from_client_config(client_config, scopes=scopes)
+        flow.redirect_uri = redirect_uri
         authorization_url, _ = flow.authorization_url(
             access_type="offline",
             include_granted_scopes="true",
@@ -219,7 +253,7 @@ async def start_google_drive_web_oauth():
         "client_config": client_config,
         "created_at": int(time.time()),
     }
-    REDIS_CONN.set_obj(_web_state_cache_key(flow_id), cache_payload, WEB_FLOW_TTL_SECS)
+    REDIS_CONN.set_obj(_web_state_cache_key(flow_id, source), cache_payload, WEB_FLOW_TTL_SECS)
 
     return get_json_result(
         data={
@@ -230,60 +264,122 @@ async def start_google_drive_web_oauth():
     )
 
 
-@manager.route("/google-drive/oauth/web/callback", methods=["GET"])  # noqa: F821
-async def google_drive_web_oauth_callback():
+@manager.route("/gmail/oauth/web/callback", methods=["GET"])  # noqa: F821
+async def google_gmail_web_oauth_callback():
     state_id = request.args.get("state")
     error = request.args.get("error")
+    source = "gmail"
+    if source != 'gmail':
+        return await _render_web_oauth_popup("", False, "Invalid Google OAuth type.", source)
+
     error_description = request.args.get("error_description") or error
 
     if not state_id:
-        return await _render_web_oauth_popup("", False, "Missing OAuth state parameter.")
+        return await _render_web_oauth_popup("", False, "Missing OAuth state parameter.", source)
 
-    state_cache = REDIS_CONN.get(_web_state_cache_key(state_id))
+    state_cache = REDIS_CONN.get(_web_state_cache_key(state_id, source))
     if not state_cache:
-        return await _render_web_oauth_popup(state_id, False, "Authorization session expired. Please restart from the main window.")
+        return await _render_web_oauth_popup(state_id, False, "Authorization session expired. Please restart from the main window.", source)
 
     state_obj = json.loads(state_cache)
     client_config = state_obj.get("client_config")
     if not client_config:
-        REDIS_CONN.delete(_web_state_cache_key(state_id))
-        return await _render_web_oauth_popup(state_id, False, "Authorization session was invalid. Please retry.")
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, "Authorization session was invalid. Please retry.", source)
 
     if error:
-        REDIS_CONN.delete(_web_state_cache_key(state_id))
-        return await _render_web_oauth_popup(state_id, False, error_description or "Authorization was cancelled.")
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, error_description or "Authorization was cancelled.", source)
 
     code = request.args.get("code")
     if not code:
-        return await _render_web_oauth_popup(state_id, False, "Missing authorization code from Google.")
+        return await _render_web_oauth_popup(state_id, False, "Missing authorization code from Google.", source)
 
     try:
-        flow = Flow.from_client_config(client_config, scopes=GOOGLE_SCOPES[DocumentSource.GOOGLE_DRIVE])
-        flow.redirect_uri = GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI
+        # TODO(google-oauth): branch scopes/redirect_uri based on source_type (drive vs gmail)
+        flow = Flow.from_client_config(client_config, scopes=GOOGLE_SCOPES[DocumentSource.GMAIL])
+        flow.redirect_uri = GMAIL_WEB_OAUTH_REDIRECT_URI
         flow.fetch_token(code=code)
     except Exception as exc:  # pragma: no cover - defensive
         logging.exception("Failed to exchange Google OAuth code: %s", exc)
-        REDIS_CONN.delete(_web_state_cache_key(state_id))
-        return await _render_web_oauth_popup(state_id, False, "Failed to exchange tokens with Google. Please retry.")
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, "Failed to exchange tokens with Google. Please retry.", source)
 
     creds_json = flow.credentials.to_json()
     result_payload = {
         "user_id": state_obj.get("user_id"),
         "credentials": creds_json,
     }
-    REDIS_CONN.set_obj(_web_result_cache_key(state_id), result_payload, WEB_FLOW_TTL_SECS)
-    REDIS_CONN.delete(_web_state_cache_key(state_id))
+    REDIS_CONN.set_obj(_web_result_cache_key(state_id, source), result_payload, WEB_FLOW_TTL_SECS)
 
-    return await _render_web_oauth_popup(state_id, True, "Authorization completed successfully.")
+    print("\n\n", _web_result_cache_key(state_id, source), "\n\n")
+
+    REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+
+    return await _render_web_oauth_popup(state_id, True, "Authorization completed successfully.", source)
 
 
-@manager.route("/google-drive/oauth/web/result", methods=["POST"])  # noqa: F821
+@manager.route("/google-drive/oauth/web/callback", methods=["GET"])  # noqa: F821
+async def google_drive_web_oauth_callback():
+    state_id = request.args.get("state")
+    error = request.args.get("error")
+    source = "google-drive"
+    if source not in ("google-drive", "gmail"):
+        return await _render_web_oauth_popup("", False, "Invalid Google OAuth type.", source)
+
+    error_description = request.args.get("error_description") or error
+
+    if not state_id:
+        return await _render_web_oauth_popup("", False, "Missing OAuth state parameter.", source)
+
+    state_cache = REDIS_CONN.get(_web_state_cache_key(state_id, source))
+    if not state_cache:
+        return await _render_web_oauth_popup(state_id, False, "Authorization session expired. Please restart from the main window.", source)
+
+    state_obj = json.loads(state_cache)
+    client_config = state_obj.get("client_config")
+    if not client_config:
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, "Authorization session was invalid. Please retry.", source)
+
+    if error:
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, error_description or "Authorization was cancelled.", source)
+
+    code = request.args.get("code")
+    if not code:
+        return await _render_web_oauth_popup(state_id, False, "Missing authorization code from Google.", source)
+
+    try:
+        # TODO(google-oauth): branch scopes/redirect_uri based on source_type (drive vs gmail)
+        flow = Flow.from_client_config(client_config, scopes=GOOGLE_SCOPES[DocumentSource.GOOGLE_DRIVE])
+        flow.redirect_uri = GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI
+        flow.fetch_token(code=code)
+    except Exception as exc:  # pragma: no cover - defensive
+        logging.exception("Failed to exchange Google OAuth code: %s", exc)
+        REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+        return await _render_web_oauth_popup(state_id, False, "Failed to exchange tokens with Google. Please retry.", source)
+
+    creds_json = flow.credentials.to_json()
+    result_payload = {
+        "user_id": state_obj.get("user_id"),
+        "credentials": creds_json,
+    }
+    REDIS_CONN.set_obj(_web_result_cache_key(state_id, source), result_payload, WEB_FLOW_TTL_SECS)
+    REDIS_CONN.delete(_web_state_cache_key(state_id, source))
+
+    return await _render_web_oauth_popup(state_id, True, "Authorization completed successfully.", source)
+
+@manager.route("/google/oauth/web/result", methods=["POST"])  # noqa: F821
 @login_required
 @validate_request("flow_id")
-async def poll_google_drive_web_result():
+async def poll_google_web_result():
     req = await request.json or {}
+    source = request.args.get("type")
+    if source not in ("google-drive", "gmail"):
+        return get_json_result(code=RetCode.ARGUMENT_ERROR, message="Invalid Google OAuth type.")
     flow_id = req.get("flow_id")
-    cache_raw = REDIS_CONN.get(_web_result_cache_key(flow_id))
+    cache_raw = REDIS_CONN.get(_web_result_cache_key(flow_id, source))
     if not cache_raw:
         return get_json_result(code=RetCode.RUNNING, message="Authorization is still pending.")
 
@@ -291,5 +387,5 @@ async def poll_google_drive_web_result():
     if result.get("user_id") != current_user.id:
         return get_json_result(code=RetCode.PERMISSION_ERROR, message="You are not allowed to access this authorization result.")
 
-    REDIS_CONN.delete(_web_result_cache_key(flow_id))
+    REDIS_CONN.delete(_web_result_cache_key(flow_id, source))
     return get_json_result(data={"credentials": result.get("credentials")})
diff --git a/api/apps/user_app.py b/api/apps/user_app.py
index 46e114fdf..ae1355da8 100644
--- a/api/apps/user_app.py
+++ b/api/apps/user_app.py
@@ -121,8 +121,8 @@ async def login():
         response_data = user.to_json()
         user.access_token = get_uuid()
         login_user(user)
-        user.update_time = (current_timestamp(),)
-        user.update_date = (datetime_format(datetime.now()),)
+        user.update_time = current_timestamp()
+        user.update_date = datetime_format(datetime.now())
         user.save()
         msg = "Welcome back!"
 
@@ -1002,8 +1002,8 @@ async def forget():
     # Auto login (reuse login flow)
     user.access_token = get_uuid()
     login_user(user)
-    user.update_time = (current_timestamp(),)
-    user.update_date = (datetime_format(datetime.now()),)
+    user.update_time = current_timestamp()
+    user.update_date = datetime_format(datetime.now())
     user.save()
     msg = "Password reset successful. Logged in."
     return construct_response(data=user.to_json(), auth=user.get_id(), message=msg)
diff --git a/common/data_source/config.py b/common/data_source/config.py
index a643e3d41..a3d86720c 100644
--- a/common/data_source/config.py
+++ b/common/data_source/config.py
@@ -217,6 +217,7 @@ OAUTH_GOOGLE_DRIVE_CLIENT_SECRET = os.environ.get(
     "OAUTH_GOOGLE_DRIVE_CLIENT_SECRET", ""
 )
 GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI = os.environ.get("GOOGLE_DRIVE_WEB_OAUTH_REDIRECT_URI", "http://localhost:9380/v1/connector/google-drive/oauth/web/callback")
+GMAIL_WEB_OAUTH_REDIRECT_URI = os.environ.get("GMAIL_WEB_OAUTH_REDIRECT_URI", "http://localhost:9380/v1/connector/gmail/oauth/web/callback")
 
 CONFLUENCE_OAUTH_TOKEN_URL = "https://auth.atlassian.com/oauth/token"
 RATE_LIMIT_MESSAGE_LOWERCASE = "Rate limit exceeded".lower()
diff --git a/common/data_source/gmail_connector.py b/common/data_source/gmail_connector.py
index 67ebfae98..1757f4ffe 100644
--- a/common/data_source/gmail_connector.py
+++ b/common/data_source/gmail_connector.py
@@ -1,6 +1,6 @@
 import logging
+import os
 from typing import Any
-
 from google.oauth2.credentials import Credentials as OAuthCredentials
 from google.oauth2.service_account import Credentials as ServiceAccountCredentials
 from googleapiclient.errors import HttpError
@@ -9,10 +9,10 @@ from common.data_source.config import INDEX_BATCH_SIZE, SLIM_BATCH_SIZE, Documen
 from common.data_source.google_util.auth import get_google_creds
 from common.data_source.google_util.constant import DB_CREDENTIALS_PRIMARY_ADMIN_KEY, MISSING_SCOPES_ERROR_STR, SCOPE_INSTRUCTIONS, USER_FIELDS
 from common.data_source.google_util.resource import get_admin_service, get_gmail_service
-from common.data_source.google_util.util import _execute_single_retrieval, execute_paginated_retrieval
+from common.data_source.google_util.util import _execute_single_retrieval, execute_paginated_retrieval, sanitize_filename, clean_string
 from common.data_source.interfaces import LoadConnector, PollConnector, SecondsSinceUnixEpoch, SlimConnectorWithPermSync
 from common.data_source.models import BasicExpertInfo, Document, ExternalAccess, GenerateDocumentsOutput, GenerateSlimDocumentOutput, SlimDocument, TextSection
-from common.data_source.utils import build_time_range_query, clean_email_and_extract_name, get_message_body, is_mail_service_disabled_error, time_str_to_utc
+from common.data_source.utils import build_time_range_query, clean_email_and_extract_name, get_message_body, is_mail_service_disabled_error, gmail_time_str_to_utc
 
 # Constants for Gmail API fields
 THREAD_LIST_FIELDS = "nextPageToken, threads(id)"
@@ -67,7 +67,6 @@ def message_to_section(message: dict[str, Any]) -> tuple[TextSection, dict[str,
             message_data += f"{name}: {value}\n"
 
     message_body_text: str = get_message_body(payload)
-
     return TextSection(link=link, text=message_body_text + message_data), metadata
 
 
@@ -97,13 +96,15 @@ def thread_to_document(full_thread: dict[str, Any], email_used_to_fetch_thread:
 
         if not semantic_identifier:
             semantic_identifier = message_metadata.get("subject", "")
+            semantic_identifier = clean_string(semantic_identifier)
+            semantic_identifier = sanitize_filename(semantic_identifier)
 
         if message_metadata.get("updated_at"):
             updated_at = message_metadata.get("updated_at")
-
+            
     updated_at_datetime = None
     if updated_at:
-        updated_at_datetime = time_str_to_utc(updated_at)
+        updated_at_datetime = gmail_time_str_to_utc(updated_at)
 
     thread_id = full_thread.get("id")
     if not thread_id:
@@ -115,15 +116,24 @@ def thread_to_document(full_thread: dict[str, Any], email_used_to_fetch_thread:
     if not semantic_identifier:
         semantic_identifier = "(no subject)"
 
+    combined_sections = "\n\n".join(
+        sec.text for sec in sections if hasattr(sec, "text")
+    )
+    blob = combined_sections
+    size_bytes = len(blob)
+    extension = '.txt'
+
     return Document(
         id=thread_id,
         semantic_identifier=semantic_identifier,
-        sections=sections,
+        blob=blob,
+        size_bytes=size_bytes,
+        extension=extension,
         source=DocumentSource.GMAIL,
         primary_owners=primary_owners,
         secondary_owners=secondary_owners,
         doc_updated_at=updated_at_datetime,
-        metadata={},
+        metadata=message_metadata,
         external_access=ExternalAccess(
             external_user_emails={email_used_to_fetch_thread},
             external_user_group_ids=set(),
@@ -214,15 +224,13 @@ class GmailConnector(LoadConnector, PollConnector, SlimConnectorWithPermSync):
                     q=query,
                     continue_on_404_or_403=True,
                 ):
-                    full_threads = _execute_single_retrieval(
+                    full_thread = _execute_single_retrieval(
                         retrieval_function=gmail_service.users().threads().get,
-                        list_key=None,
                         userId=user_email,
                         fields=THREAD_FIELDS,
                         id=thread["id"],
                         continue_on_404_or_403=True,
                     )
-                    full_thread = list(full_threads)[0]
                     doc = thread_to_document(full_thread, user_email)
                     if doc is None:
                         continue
@@ -310,4 +318,30 @@ class GmailConnector(LoadConnector, PollConnector, SlimConnectorWithPermSync):
 
 
 if __name__ == "__main__":
-    pass
+    import time
+    import os
+    from common.data_source.google_util.util import get_credentials_from_env
+    logging.basicConfig(level=logging.INFO)
+    try:
+        email = os.environ.get("GMAIL_TEST_EMAIL", "newyorkupperbay@gmail.com")
+        creds = get_credentials_from_env(email, oauth=True, source="gmail")
+        print("Credentials loaded successfully")
+        print(f"{creds=}")
+
+        connector = GmailConnector(batch_size=2)
+        print("GmailConnector initialized")
+        connector.load_credentials(creds)
+        print("Credentials loaded into connector")
+
+        print("Gmail is ready to use")
+
+        for file in connector._fetch_threads(
+            int(time.time()) - 1 * 24 * 60 * 60,
+            int(time.time()),
+        ):
+            print("new batch","-"*80)
+            for f in file:
+                print(f)
+                print("\n\n")
+    except Exception as e:
+        logging.exception(f"Error loading credentials: {e}")
\ No newline at end of file
diff --git a/common/data_source/google_drive/connector.py b/common/data_source/google_drive/connector.py
index fb88d0ed0..48628f490 100644
--- a/common/data_source/google_drive/connector.py
+++ b/common/data_source/google_drive/connector.py
@@ -1,7 +1,6 @@
 """Google Drive connector"""
 
 import copy
-import json
 import logging
 import os
 import sys
@@ -32,7 +31,6 @@ from common.data_source.google_drive.file_retrieval import (
 from common.data_source.google_drive.model import DriveRetrievalStage, GoogleDriveCheckpoint, GoogleDriveFileType, RetrievedDriveFile, StageCompletion
 from common.data_source.google_util.auth import get_google_creds
 from common.data_source.google_util.constant import DB_CREDENTIALS_PRIMARY_ADMIN_KEY, MISSING_SCOPES_ERROR_STR, USER_FIELDS
-from common.data_source.google_util.oauth_flow import ensure_oauth_token_dict
 from common.data_source.google_util.resource import GoogleDriveService, get_admin_service, get_drive_service
 from common.data_source.google_util.util import GoogleFields, execute_paginated_retrieval, get_file_owners
 from common.data_source.google_util.util_threadpool_concurrency import ThreadSafeDict
@@ -1138,39 +1136,6 @@ class GoogleDriveConnector(SlimConnectorWithPermSync, CheckpointedConnectorWithP
         return GoogleDriveCheckpoint.model_validate_json(checkpoint_json)
 
 
-def get_credentials_from_env(email: str, oauth: bool = False) -> dict:
-    try:
-        if oauth:
-            raw_credential_string = os.environ["GOOGLE_DRIVE_OAUTH_CREDENTIALS_JSON_STR"]
-        else:
-            raw_credential_string = os.environ["GOOGLE_DRIVE_SERVICE_ACCOUNT_JSON_STR"]
-    except KeyError:
-        raise ValueError("Missing Google Drive credentials in environment variables")
-
-    try:
-        credential_dict = json.loads(raw_credential_string)
-    except json.JSONDecodeError:
-        raise ValueError("Invalid JSON in Google Drive credentials")
-
-    if oauth:
-        credential_dict = ensure_oauth_token_dict(credential_dict, DocumentSource.GOOGLE_DRIVE)
-
-    refried_credential_string = json.dumps(credential_dict)
-
-    DB_CREDENTIALS_DICT_TOKEN_KEY = "google_tokens"
-    DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY = "google_service_account_key"
-    DB_CREDENTIALS_PRIMARY_ADMIN_KEY = "google_primary_admin"
-    DB_CREDENTIALS_AUTHENTICATION_METHOD = "authentication_method"
-
-    cred_key = DB_CREDENTIALS_DICT_TOKEN_KEY if oauth else DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY
-
-    return {
-        cred_key: refried_credential_string,
-        DB_CREDENTIALS_PRIMARY_ADMIN_KEY: email,
-        DB_CREDENTIALS_AUTHENTICATION_METHOD: "uploaded",
-    }
-
-
 class CheckpointOutputWrapper:
     """
     Wraps a CheckpointOutput generator to give things back in a more digestible format.
@@ -1236,7 +1201,7 @@ def yield_all_docs_from_checkpoint_connector(
 
 if __name__ == "__main__":
     import time
-
+    from common.data_source.google_util.util import get_credentials_from_env
     logging.basicConfig(level=logging.DEBUG)
 
     try:
@@ -1245,7 +1210,7 @@ if __name__ == "__main__":
         creds = get_credentials_from_env(email, oauth=True)
         print("Credentials loaded successfully")
         print(f"{creds=}")
-
+        sys.exit(0)
         connector = GoogleDriveConnector(
             include_shared_drives=False,
             shared_drive_urls=None,
diff --git a/common/data_source/google_util/constant.py b/common/data_source/google_util/constant.py
index 8ab75fa14..858ee31c8 100644
--- a/common/data_source/google_util/constant.py
+++ b/common/data_source/google_util/constant.py
@@ -49,11 +49,11 @@ MISSING_SCOPES_ERROR_STR = "client not authorized for any of the scopes requeste
 SCOPE_INSTRUCTIONS = ""
 
 
-GOOGLE_DRIVE_WEB_OAUTH_POPUP_TEMPLATE = """<!DOCTYPE html>
+GOOGLE_WEB_OAUTH_POPUP_TEMPLATE = """<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="utf-8" />
-  <title>Google Drive Authorization</title>
+  <title>{title}</title>
   <style>
     body {{
       font-family: Arial, sans-serif;
diff --git a/common/data_source/google_util/util.py b/common/data_source/google_util/util.py
index bc1a581ed..164445e7e 100644
--- a/common/data_source/google_util/util.py
+++ b/common/data_source/google_util/util.py
@@ -1,12 +1,17 @@
+import json
 import logging
+import os
+import re
 import socket
 from collections.abc import Callable, Iterator
 from enum import Enum
 from typing import Any
-
+import unicodedata
 from googleapiclient.errors import HttpError  # type: ignore  # type: ignore
 
+from common.data_source.config import DocumentSource
 from common.data_source.google_drive.model import GoogleDriveFileType
+from common.data_source.google_util.oauth_flow import ensure_oauth_token_dict
 
 
 # See https://developers.google.com/drive/api/reference/rest/v3/files/list for more
@@ -117,6 +122,7 @@ def _execute_single_retrieval(
     """Execute a single retrieval from Google Drive API"""
     try:
         results = retrieval_function(**request_kwargs).execute()
+
     except HttpError as e:
         if e.resp.status >= 500:
             results = retrieval_function()
@@ -148,5 +154,110 @@ def _execute_single_retrieval(
             error,
         )
         results = retrieval_function()
-
     return results
+
+
+def get_credentials_from_env(email: str, oauth: bool = False, source="drive") -> dict:
+    try:
+        if oauth:
+            raw_credential_string = os.environ["GOOGLE_OAUTH_CREDENTIALS_JSON_STR"]
+        else:
+            raw_credential_string = os.environ["GOOGLE_SERVICE_ACCOUNT_JSON_STR"]
+    except KeyError:
+        raise ValueError("Missing Google Drive credentials in environment variables")
+
+    try:
+        credential_dict = json.loads(raw_credential_string)
+    except json.JSONDecodeError:
+        raise ValueError("Invalid JSON in Google Drive credentials")
+
+    if oauth and source == "drive":
+        credential_dict = ensure_oauth_token_dict(credential_dict, DocumentSource.GOOGLE_DRIVE)
+    else:
+        credential_dict = ensure_oauth_token_dict(credential_dict, DocumentSource.GMAIL)
+
+    refried_credential_string = json.dumps(credential_dict)
+
+    DB_CREDENTIALS_DICT_TOKEN_KEY = "google_tokens"
+    DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY = "google_service_account_key"
+    DB_CREDENTIALS_PRIMARY_ADMIN_KEY = "google_primary_admin"
+    DB_CREDENTIALS_AUTHENTICATION_METHOD = "authentication_method"
+
+    cred_key = DB_CREDENTIALS_DICT_TOKEN_KEY if oauth else DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY
+
+    return {
+        cred_key: refried_credential_string,
+        DB_CREDENTIALS_PRIMARY_ADMIN_KEY: email,
+        DB_CREDENTIALS_AUTHENTICATION_METHOD: "uploaded",
+    }
+
+def sanitize_filename(name: str) -> str:
+    """
+    Soft sanitize for MinIO/S3:
+    - Replace only prohibited characters with a space.
+    - Preserve readability (no ugly underscores).
+    - Collapse multiple spaces.
+    """
+    if name is None:
+        return "file.txt"
+
+    name = str(name).strip()
+
+    # Characters that MUST NOT appear in S3/MinIO object keys
+    # Replace them with a space (not underscore)
+    forbidden = r'[\\\?\#\%\*\:\|\<\>"]'
+    name = re.sub(forbidden, " ", name)
+
+    # Replace slashes "/" (S3 interprets as folder) with space
+    name = name.replace("/", " ")
+
+    # Collapse multiple spaces into one
+    name = re.sub(r"\s+", " ", name)
+
+    # Trim both ends
+    name = name.strip()
+
+    # Enforce reasonable max length
+    if len(name) > 200:
+        base, ext = os.path.splitext(name)
+        name = base[:180].rstrip() + ext
+
+    # Ensure there is an extension (your original logic)
+    if not os.path.splitext(name)[1]:
+        name += ".txt"
+
+    return name
+
+
+def clean_string(text: str | None) -> str | None:
+    """
+    Clean a string to make it safe for insertion into MySQL (utf8mb4).
+    - Normalize Unicode
+    - Remove control characters / zero-width characters
+    - Optionally remove high-plane emoji and symbols
+    """
+    if text is None:
+        return None
+
+    # 0. Ensure the value is a string
+    text = str(text)
+
+    # 1. Normalize Unicode (NFC)
+    text = unicodedata.normalize("NFC", text)
+
+    # 2. Remove ASCII control characters (except tab, newline, carriage return)
+    text = re.sub(r"[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]", "", text)
+
+    # 3. Remove zero-width characters / BOM
+    text = re.sub(r"[\u200b-\u200d\uFEFF]", "", text)
+
+    # 4. Remove high Unicode characters (emoji, special symbols)
+    text = re.sub(r"[\U00010000-\U0010FFFF]", "", text)
+
+    # 5. Final fallback: strip any invalid UTF-8 sequences
+    try:
+        text.encode("utf-8")
+    except UnicodeEncodeError:
+        text = text.encode("utf-8", errors="ignore").decode("utf-8")
+
+    return text
\ No newline at end of file
diff --git a/common/data_source/interfaces.py b/common/data_source/interfaces.py
index 5e5d3aa2e..47ad94c9b 100644
--- a/common/data_source/interfaces.py
+++ b/common/data_source/interfaces.py
@@ -30,7 +30,6 @@ class LoadConnector(ABC):
         """Load documents from state"""
         pass
 
-    @abstractmethod
     def validate_connector_settings(self) -> None:
         """Validate connector settings"""
         pass
diff --git a/common/data_source/utils.py b/common/data_source/utils.py
index cba05b062..a18b9321f 100644
--- a/common/data_source/utils.py
+++ b/common/data_source/utils.py
@@ -733,7 +733,7 @@ def build_time_range_query(
     """Build time range query for Gmail API"""
     query = ""
     if time_range_start is not None and time_range_start != 0:
-        query += f"after:{int(time_range_start)}"
+        query += f"after:{int(time_range_start) + 1}"
     if time_range_end is not None and time_range_end != 0:
         query += f" before:{int(time_range_end)}"
     query = query.strip()
@@ -778,6 +778,15 @@ def time_str_to_utc(time_str: str):
     return datetime.fromisoformat(time_str.replace("Z", "+00:00"))
 
 
+def gmail_time_str_to_utc(time_str: str):
+    """Convert Gmail RFC 2822 time string to UTC."""
+    from email.utils import parsedate_to_datetime
+    from datetime import timezone
+
+    dt = parsedate_to_datetime(time_str)
+    return dt.astimezone(timezone.utc)
+
+
 # Notion Utilities
 T = TypeVar("T")
 
diff --git a/rag/svr/sync_data_source.py b/rag/svr/sync_data_source.py
index 5fb1f198b..a5c4c4cfb 100644
--- a/rag/svr/sync_data_source.py
+++ b/rag/svr/sync_data_source.py
@@ -41,6 +41,7 @@ from common.data_source import BlobStorageConnector, NotionConnector, DiscordCon
 from common.constants import FileSource, TaskStatus
 from common.data_source.config import INDEX_BATCH_SIZE
 from common.data_source.confluence_connector import ConfluenceConnector
+from common.data_source.gmail_connector import GmailConnector
 from common.data_source.interfaces import CheckpointOutputWrapper
 from common.data_source.utils import load_all_docs_from_checkpoint_connector
 from common.log_utils import init_root_logger
@@ -230,7 +231,64 @@ class Gmail(SyncBase):
     SOURCE_NAME: str = FileSource.GMAIL
 
     async def _generate(self, task: dict):
-        pass
+        # Gmail sync reuses the generic LoadConnector/PollConnector interface
+        # implemented by common.data_source.gmail_connector.GmailConnector.
+        #
+        # Config expectations (self.conf):
+        #   credentials: Gmail / Workspace OAuth JSON (with primary admin email)
+        #   batch_size:  optional, defaults to INDEX_BATCH_SIZE
+        batch_size = self.conf.get("batch_size", INDEX_BATCH_SIZE)
+
+        self.connector = GmailConnector(batch_size=batch_size)
+
+        credentials = self.conf.get("credentials")
+        if not credentials:
+            raise ValueError("Gmail connector is missing credentials.")
+
+        new_credentials = self.connector.load_credentials(credentials)
+        if new_credentials:
+            # Persist rotated / refreshed credentials back to connector config
+            try:
+                updated_conf = copy.deepcopy(self.conf)
+                updated_conf["credentials"] = new_credentials
+                ConnectorService.update_by_id(task["connector_id"], {"config": updated_conf})
+                self.conf = updated_conf
+                logging.info(
+                    "Persisted refreshed Gmail credentials for connector %s",
+                    task["connector_id"],
+                )
+            except Exception:
+                logging.exception(
+                    "Failed to persist refreshed Gmail credentials for connector %s",
+                    task["connector_id"],
+                )
+
+        # Decide between full reindex and incremental polling by time range.
+        if task["reindex"] == "1" or not task.get("poll_range_start"):
+            start_time = None
+            end_time = None
+            begin_info = "totally"
+            document_generator = self.connector.load_from_state()
+        else:
+            poll_start = task["poll_range_start"]
+            # Defensive: if poll_start is somehow None, fall back to full load
+            if poll_start is None:
+                start_time = None
+                end_time = None
+                begin_info = "totally"
+                document_generator = self.connector.load_from_state()
+            else:
+                start_time = poll_start.timestamp()
+                end_time = datetime.now(timezone.utc).timestamp()
+                begin_info = f"from {poll_start}"
+                document_generator = self.connector.poll_source(start_time, end_time)
+
+        try:
+            admin_email = self.connector.primary_admin_email
+        except RuntimeError:
+            admin_email = "unknown"
+        logging.info(f"Connect to Gmail as {admin_email} {begin_info}")
+        return document_generator
 
 
 class Dropbox(SyncBase):
diff --git a/web/src/assets/svg/data-source/gmail.svg b/web/src/assets/svg/data-source/gmail.svg
new file mode 100644
index 000000000..40b7175c1
--- /dev/null
+++ b/web/src/assets/svg/data-source/gmail.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="52 42 88 66">
+<path fill="#4285f4" d="M58 108h14V74L52 59v43c0 3.32 2.69 6 6 6"/>
+<path fill="#34a853" d="M120 108h14c3.32 0 6-2.69 6-6V59l-20 15"/>
+<path fill="#fbbc04" d="M120 48v26l20-15v-8c0-7.42-8.47-11.65-14.4-7.2"/>
+<path fill="#ea4335" d="M72 74V48l24 18 24-18v26L96 92"/>
+<path fill="#c5221f" d="M52 51v8l20 15V48l-5.6-4.2c-5.94-4.45-14.4-.22-14.4 7.2"/>
+</svg>
\ No newline at end of file
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 59f2bf73c..9a952a54c 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -739,6 +739,7 @@ Example: Virtual Hosted Style`,
         'Sync pages and databases from Notion for knowledge retrieval.',
       google_driveDescription:
         'Connect your Google Drive via OAuth and sync specific folders or drives.',
+      gmailDescription: 'Connect your Gmail via OAuth to sync emails.',
       webdavDescription: 'Connect to WebDAV servers to sync files.',
       webdavRemotePathTip:
         'Optional: Specify a folder path on the WebDAV server (e.g., /Documents). Leave empty to sync from root.',
@@ -750,6 +751,10 @@ Example: Virtual Hosted Style`,
         'Comma-separated emails whose "My Drive" contents should be indexed (include the primary admin).',
       google_driveSharedFoldersTip:
         'Comma-separated Google Drive folder links to crawl.',
+      gmailPrimaryAdminTip:
+        'Primary admin email with Gmail / Workspace access, used to enumerate domain users and as the default sync account.',
+      gmailTokenTip:
+        'Upload the OAuth JSON generated from Google Console. If it only contains client credentials, run the browser-based verification once to mint long-lived refresh tokens.',
       dropboxDescription:
         'Connect your Dropbox to sync files and folders from a chosen account.',
       dropboxAccessTokenTip:
diff --git a/web/src/locales/ru.ts b/web/src/locales/ru.ts
index c29d2301a..36161c957 100644
--- a/web/src/locales/ru.ts
+++ b/web/src/locales/ru.ts
@@ -736,6 +736,8 @@ export default {
         'Синхронизируйте страницы и базы данных из Notion для извлечения знаний.',
       google_driveDescription:
         'Подключите ваш Google Drive через OAuth и синхронизируйте определенные папки или диски.',
+      gmailDescription:
+        'Подключите ваш Gmail / Google Workspace аккаунт для синхронизации писем и их метаданных, чтобы построить корпоративную почтовую базу знаний и поиск с учетом прав доступа.',
       google_driveTokenTip:
         'Загрузите JSON токена OAuth, сгенерированный из помощника OAuth или Google Cloud Console. Вы также можете загрузить client_secret JSON из "установленного" или "веб" приложения. Если это ваша первая синхронизация, откроется окно браузера для завершения согласия OAuth. Если JSON уже содержит токен обновления, он будет автоматически повторно использован.',
       google_drivePrimaryAdminTip:
@@ -744,6 +746,10 @@ export default {
         'Электронные почты через запятую, чье содержимое "Мой диск" должно индексироваться (включите основного администратора).',
       google_driveSharedFoldersTip:
         'Ссылки на папки Google Drive через запятую для обхода.',
+      gmailPrimaryAdminTip:
+        'Основной административный email с доступом к Gmail / Workspace, используется для перечисления пользователей домена и как аккаунт синхронизации по умолчанию.',
+      gmailTokenTip:
+        'Загрузите OAuth JSON, сгенерированный в Google Console. Если он содержит только учетные данные клиента, выполните одноразовое подтверждение в браузере, чтобы получить долгоживущие токены обновления.',
       jiraDescription:
         'Подключите ваше рабочее пространство Jira для синхронизации задач, комментариев и вложений.',
       jiraBaseUrlTip:
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index 4156e5b34..da264db7a 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -718,6 +718,7 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       notionDescription: ' 同步 Notion 页面与数据库，用于知识检索。',
       google_driveDescription:
         '通过 OAuth 连接 Google Drive，并同步指定的文件夹或云端硬盘。',
+      gmailDescription: '通过 OAuth 连接 Gmail，用于同步邮件。',
       google_driveTokenTip:
         '请上传由 OAuth helper 或 Google Cloud Console 导出的 OAuth token JSON。也支持上传 “installed” 或 “web” 类型的 client_secret JSON。若为首次同步，将自动弹出浏览器完成 OAuth 授权流程；如果该 JSON 已包含 refresh token，将会被自动复用。',
       google_drivePrimaryAdminTip: '拥有相应 Drive 访问权限的管理员邮箱。',
@@ -725,6 +726,10 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
         '需要索引其 “我的云端硬盘” 的邮箱，多个邮箱用逗号分隔（建议包含管理员）。',
       google_driveSharedFoldersTip:
         '需要同步的 Google Drive 文件夹链接，多个链接用逗号分隔。',
+      gmailPrimaryAdminTip:
+        '拥有 Gmail / Workspace 访问权限的主要管理员邮箱，用于列出域内用户并作为默认同步账号。',
+      gmailTokenTip:
+        '请上传由 Google Console 生成的 OAuth JSON。如果仅包含 client credentials，请通过浏览器授权一次以获取长期有效的刷新 Token。',
       dropboxDescription: '连接 Dropbox，同步指定账号下的文件与文件夹。',
       dropboxAccessTokenTip:
         '请在 Dropbox App Console 生成 Access Token，并勾选 files.metadata.read、files.content.read、sharing.read 等必要权限。',
diff --git a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
index cf0a7ae44..2ace89a8d 100644
--- a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
+++ b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
@@ -47,6 +47,7 @@ const AddDataSourceModal = ({
       }
       open={visible || false}
       onOpenChange={(open) => !open && hideModal?.()}
+      maskClosable={false}
       // onOk={() => handleOk()}
       okText={t('common.confirm')}
       cancelText={t('common.cancel')}
diff --git a/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx b/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx
new file mode 100644
index 000000000..3777ebb31
--- /dev/null
+++ b/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx
@@ -0,0 +1,391 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { FileUploader } from '@/components/file-uploader';
+import { Button } from '@/components/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
+import message from '@/components/ui/message';
+import { FileMimeType } from '@/constants/common';
+import {
+  pollGmailWebAuthResult,
+  startGmailWebAuth,
+} from '@/services/data-source-service';
+import { Loader2 } from 'lucide-react';
+
+export type GmailTokenFieldProps = {
+  value?: string;
+  onChange: (value: any) => void;
+  placeholder?: string;
+};
+
+const credentialHasRefreshToken = (content: string) => {
+  try {
+    const parsed = JSON.parse(content);
+    return Boolean(parsed?.refresh_token);
+  } catch {
+    return false;
+  }
+};
+
+const describeCredentials = (content?: string) => {
+  if (!content) return '';
+  try {
+    const parsed = JSON.parse(content);
+    if (parsed?.refresh_token) {
+      return 'Uploaded OAuth tokens with a refresh token.';
+    }
+    if (parsed?.installed || parsed?.web) {
+      return 'Client credentials detected. Complete verification to mint long-lived tokens.';
+    }
+    return 'Stored Google credential JSON.';
+  } catch {
+    return '';
+  }
+};
+
+const GmailTokenField = ({
+  value,
+  onChange,
+  placeholder,
+}: GmailTokenFieldProps) => {
+  const [files, setFiles] = useState<File[]>([]);
+  const [pendingCredentials, setPendingCredentials] = useState<string>('');
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const [webAuthLoading, setWebAuthLoading] = useState(false);
+  const [webFlowId, setWebFlowId] = useState<string | null>(null);
+  const [webStatus, setWebStatus] = useState<
+    'idle' | 'waiting' | 'success' | 'error'
+  >('idle');
+  const [webStatusMessage, setWebStatusMessage] = useState('');
+  const webFlowIdRef = useRef<string | null>(null);
+  const webPollTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const clearWebState = useCallback(() => {
+    if (webPollTimerRef.current) {
+      clearTimeout(webPollTimerRef.current);
+      webPollTimerRef.current = null;
+    }
+    webFlowIdRef.current = null;
+    setWebFlowId(null);
+    setWebStatus('idle');
+    setWebStatusMessage('');
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      if (webPollTimerRef.current) {
+        clearTimeout(webPollTimerRef.current);
+      }
+    };
+  }, []);
+
+  useEffect(() => {
+    webFlowIdRef.current = webFlowId;
+  }, [webFlowId]);
+
+  const credentialSummary = useMemo(() => describeCredentials(value), [value]);
+  const hasVerifiedTokens = useMemo(
+    () => Boolean(value && credentialHasRefreshToken(value)),
+    [value],
+  );
+  const hasUploadedButUnverified = useMemo(
+    () => Boolean(value && !hasVerifiedTokens),
+    [hasVerifiedTokens, value],
+  );
+
+  const resetDialog = useCallback(
+    (shouldResetState: boolean) => {
+      setDialogOpen(false);
+      clearWebState();
+      if (shouldResetState) {
+        setPendingCredentials('');
+        setFiles([]);
+      }
+    },
+    [clearWebState],
+  );
+
+  const fetchWebResult = useCallback(
+    async (flowId: string) => {
+      try {
+        const { data } = await pollGmailWebAuthResult({
+          flow_id: flowId,
+        });
+        if (data.code === 0 && data.data?.credentials) {
+          onChange(data.data.credentials);
+          setPendingCredentials('');
+          message.success('Gmail credentials verified.');
+          resetDialog(false);
+          return;
+        }
+        if (data.code === 106) {
+          setWebStatus('waiting');
+          setWebStatusMessage('Authorization confirmed. Finalizing tokens...');
+          if (webPollTimerRef.current) {
+            clearTimeout(webPollTimerRef.current);
+          }
+          webPollTimerRef.current = setTimeout(
+            () => fetchWebResult(flowId),
+            1500,
+          );
+          return;
+        }
+        message.error(data.message || 'Authorization failed.');
+        clearWebState();
+      } catch (err) {
+        message.error('Unable to retrieve authorization result.');
+        clearWebState();
+      }
+    },
+    [clearWebState, onChange, resetDialog],
+  );
+
+  useEffect(() => {
+    const handler = (event: MessageEvent) => {
+      const payload = event.data;
+      if (!payload || payload.type !== 'ragflow-gmail-oauth') {
+        return;
+      }
+      if (!payload.flowId) {
+        return;
+      }
+      if (webFlowIdRef.current && webFlowIdRef.current !== payload.flowId) {
+        return;
+      }
+
+      if (payload.status === 'success') {
+        setWebStatus('waiting');
+        setWebStatusMessage('Authorization confirmed. Finalizing tokens...');
+        fetchWebResult(payload.flowId);
+      } else {
+        message.error(
+          payload.message || 'Authorization window reported an error.',
+        );
+        clearWebState();
+      }
+    };
+
+    window.addEventListener('message', handler);
+    return () => window.removeEventListener('message', handler);
+  }, [clearWebState, fetchWebResult]);
+
+  const handleValueChange = useCallback(
+    (nextFiles: File[]) => {
+      if (!nextFiles.length) {
+        setFiles([]);
+        onChange('');
+        setPendingCredentials('');
+        clearWebState();
+        return;
+      }
+      const file = nextFiles[nextFiles.length - 1];
+      file
+        .text()
+        .then((text) => {
+          try {
+            JSON.parse(text);
+          } catch {
+            message.error('Invalid JSON file.');
+            setFiles([]);
+            clearWebState();
+            return;
+          }
+          setFiles([file]);
+          clearWebState();
+          if (credentialHasRefreshToken(text)) {
+            onChange(text);
+            setPendingCredentials('');
+            message.success('Gmail OAuth credentials uploaded.');
+            return;
+          }
+          setPendingCredentials(text);
+          setDialogOpen(true);
+          message.info(
+            'Client configuration uploaded. Verification is required to finish setup.',
+          );
+        })
+        .catch(() => {
+          message.error('Unable to read the uploaded file.');
+          setFiles([]);
+        });
+    },
+    [clearWebState, onChange],
+  );
+
+  const handleStartWebAuthorization = useCallback(async () => {
+    if (!pendingCredentials) {
+      message.error('No Google credential file detected.');
+      return;
+    }
+    setWebAuthLoading(true);
+    clearWebState();
+    try {
+      const { data } = await startGmailWebAuth({
+        credentials: pendingCredentials,
+      });
+      if (data.code === 0 && data.data?.authorization_url) {
+        const flowId = data.data.flow_id;
+        const popup = window.open(
+          data.data.authorization_url,
+          'ragflow-gmail-oauth',
+          'width=600,height=720',
+        );
+        if (!popup) {
+          message.error(
+            'Popup was blocked. Please allow popups for this site.',
+          );
+          return;
+        }
+        popup.focus();
+        webFlowIdRef.current = flowId;
+        setWebFlowId(flowId);
+        setWebStatus('waiting');
+        setWebStatusMessage('Complete the Google consent in the popup window.');
+      } else {
+        message.error(data.message || 'Failed to start browser authorization.');
+      }
+    } catch (err) {
+      message.error('Failed to start browser authorization.');
+    } finally {
+      setWebAuthLoading(false);
+    }
+  }, [clearWebState, pendingCredentials]);
+
+  const handleManualWebCheck = useCallback(() => {
+    if (!webFlowId) {
+      message.info('Start browser authorization first.');
+      return;
+    }
+    setWebStatus('waiting');
+    setWebStatusMessage('Checking authorization status...');
+    fetchWebResult(webFlowId);
+  }, [fetchWebResult, webFlowId]);
+
+  const handleCancel = useCallback(() => {
+    message.warning(
+      'Verification canceled. Upload the credential again to restart.',
+    );
+    resetDialog(true);
+  }, [resetDialog]);
+
+  return (
+    <div className="flex flex-col gap-3">
+      {(credentialSummary ||
+        hasVerifiedTokens ||
+        hasUploadedButUnverified ||
+        pendingCredentials) && (
+        <div className="flex flex-wrap items-center gap-3 rounded-md border border-dashed border-muted-foreground/40 bg-muted/20 px-3 py-2 text-xs text-muted-foreground">
+          <div className="flex flex-wrap items-center gap-2">
+            {hasVerifiedTokens ? (
+              <span className="rounded-full bg-emerald-100 px-2 py-0.5 text-[11px] font-semibold uppercase tracking-wide text-emerald-700">
+                Verified
+              </span>
+            ) : null}
+            {hasUploadedButUnverified ? (
+              <span className="rounded-full bg-amber-100 px-2 py-0.5 text-[11px] font-semibold uppercase tracking-wide text-amber-700">
+                Needs authorization
+              </span>
+            ) : null}
+            {pendingCredentials && !hasVerifiedTokens ? (
+              <span className="rounded-full bg-blue-100 px-2 py-0.5 text-[11px] font-semibold uppercase tracking-wide text-blue-700">
+                Uploaded (pending)
+              </span>
+            ) : null}
+          </div>
+          {credentialSummary ? (
+            <p className="m-0">{credentialSummary}</p>
+          ) : null}
+        </div>
+      )}
+      <FileUploader
+        className="py-4 border-[0.5px] bg-bg-card text-text-secondary"
+        value={files}
+        onValueChange={handleValueChange}
+        accept={{ '*.json': [FileMimeType.Json] }}
+        maxFileCount={1}
+        description={'Upload your Gmail OAuth JSON file.'}
+      />
+
+      <Dialog
+        open={dialogOpen}
+        onOpenChange={(open) => {
+          if (!open && dialogOpen) {
+            handleCancel();
+          }
+        }}
+      >
+        <DialogContent
+          onPointerDownOutside={(e) => e.preventDefault()}
+          onInteractOutside={(e) => e.preventDefault()}
+          onEscapeKeyDown={(e) => e.preventDefault()}
+        >
+          <DialogHeader>
+            <DialogTitle>Complete Gmail verification</DialogTitle>
+            <DialogDescription>
+              The uploaded client credentials do not contain a refresh token.
+              Run the verification flow once to mint reusable tokens.
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className="space-y-4">
+            <div className="rounded-md border border-dashed border-muted-foreground/40 bg-muted/10 px-4 py-4 text-sm text-muted-foreground">
+              <div className="text-sm font-semibold text-foreground">
+                Authorize in browser
+              </div>
+              <p className="mt-2">
+                We will open Google&apos;s consent page in a new window. Sign in
+                with the admin account, grant access, and return here. Your
+                credentials will update automatically.
+              </p>
+              {webStatus !== 'idle' && (
+                <p
+                  className={`mt-2 text-xs ${
+                    webStatus === 'error'
+                      ? 'text-destructive'
+                      : 'text-muted-foreground'
+                  }`}
+                >
+                  {webStatusMessage}
+                </p>
+              )}
+              <div className="mt-3 flex flex-wrap gap-2">
+                <Button
+                  onClick={handleStartWebAuthorization}
+                  disabled={webAuthLoading}
+                >
+                  {webAuthLoading && (
+                    <Loader2 className="mr-2 size-4 animate-spin" />
+                  )}
+                  Authorize with Google
+                </Button>
+                {webFlowId ? (
+                  <Button
+                    variant="outline"
+                    onClick={handleManualWebCheck}
+                    disabled={webStatus === 'success'}
+                  >
+                    Refresh status
+                  </Button>
+                ) : null}
+              </div>
+            </div>
+          </div>
+
+          <DialogFooter className="pt-2">
+            <Button variant="ghost" onClick={handleCancel}>
+              Cancel
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+};
+
+export default GmailTokenField;
diff --git a/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx b/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx
index 50a055f52..bb0565bae 100644
--- a/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx
+++ b/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx
@@ -1,5 +1,3 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-
 import { FileUploader } from '@/components/file-uploader';
 import { Button } from '@/components/ui/button';
 import {
@@ -17,6 +15,7 @@ import {
   startGoogleDriveWebAuth,
 } from '@/services/data-source-service';
 import { Loader2 } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 type GoogleDriveTokenFieldProps = {
   value?: string;
@@ -313,12 +312,16 @@ const GoogleDriveTokenField = ({
       <Dialog
         open={dialogOpen}
         onOpenChange={(open) => {
-          if (!open) {
+          if (!open && dialogOpen) {
             handleCancel();
           }
         }}
       >
-        <DialogContent>
+        <DialogContent
+          onPointerDownOutside={(e) => e.preventDefault()}
+          onInteractOutside={(e) => e.preventDefault()}
+          onEscapeKeyDown={(e) => e.preventDefault()}
+        >
           <DialogHeader>
             <DialogTitle>Complete Google verification</DialogTitle>
             <DialogDescription>
@@ -326,7 +329,6 @@ const GoogleDriveTokenField = ({
               Run the verification flow once to mint reusable tokens.
             </DialogDescription>
           </DialogHeader>
-
           <div className="space-y-4">
             <div className="rounded-md border border-dashed border-muted-foreground/40 bg-muted/10 px-4 py-4 text-sm text-muted-foreground">
               <div className="text-sm font-semibold text-foreground">
@@ -370,7 +372,6 @@ const GoogleDriveTokenField = ({
               </div>
             </div>
           </div>
-
           <DialogFooter className="pt-2">
             <Button variant="ghost" onClick={handleCancel}>
               Cancel
diff --git a/web/src/pages/user-setting/data-source/contant.tsx b/web/src/pages/user-setting/data-source/contant.tsx
index 2ce1c7553..f1359860a 100644
--- a/web/src/pages/user-setting/data-source/contant.tsx
+++ b/web/src/pages/user-setting/data-source/contant.tsx
@@ -1,6 +1,7 @@
 import { FormFieldType } from '@/components/dynamic-form';
 import SvgIcon from '@/components/svg-icon';
 import { t } from 'i18next';
+import GmailTokenField from './component/gmail-token-field';
 import GoogleDriveTokenField from './component/google-drive-token-field';
 
 export enum DataSourceKey {
@@ -10,7 +11,7 @@ export enum DataSourceKey {
   DISCORD = 'discord',
   GOOGLE_DRIVE = 'google_drive',
   MOODLE = 'moodle',
-  //   GMAIL = 'gmail',
+  GMAIL = 'gmail',
   JIRA = 'jira',
   WEBDAV = 'webdav',
   DROPBOX = 'dropbox',
@@ -45,6 +46,11 @@ export const DataSourceInfo = {
     description: t(`setting.${DataSourceKey.GOOGLE_DRIVE}Description`),
     icon: <SvgIcon name={'data-source/google-drive'} width={38} />,
   },
+  [DataSourceKey.GMAIL]: {
+    name: 'Gmail',
+    description: t(`setting.${DataSourceKey.GMAIL}Description`),
+    icon: <SvgIcon name={'data-source/gmail'} width={38} />,
+  },
   [DataSourceKey.MOODLE]: {
     name: 'Moodle',
     description: t(`setting.${DataSourceKey.MOODLE}Description`),
@@ -320,6 +326,38 @@ export const DataSourceFormFields = {
       defaultValue: 'uploaded',
     },
   ],
+  [DataSourceKey.GMAIL]: [
+    {
+      label: 'Primary Admin Email',
+      name: 'config.credentials.google_primary_admin',
+      type: FormFieldType.Text,
+      required: true,
+      placeholder: 'admin@example.com',
+      tooltip: t('setting.gmailPrimaryAdminTip'),
+    },
+    {
+      label: 'OAuth Token JSON',
+      name: 'config.credentials.google_tokens',
+      type: FormFieldType.Textarea,
+      required: true,
+      render: (fieldProps: any) => (
+        <GmailTokenField
+          value={fieldProps.value}
+          onChange={fieldProps.onChange}
+          placeholder='{ "token": "...", "refresh_token": "...", ... }'
+        />
+      ),
+      tooltip: t('setting.gmailTokenTip'),
+    },
+    {
+      label: '',
+      name: 'config.credentials.authentication_method',
+      type: FormFieldType.Text,
+      required: false,
+      hidden: true,
+      defaultValue: 'uploaded',
+    },
+  ],
   [DataSourceKey.MOODLE]: [
     {
       label: 'Moodle URL',
@@ -550,6 +588,17 @@ export const DataSourceFormDefaultValues = {
       },
     },
   },
+  [DataSourceKey.GMAIL]: {
+    name: '',
+    source: DataSourceKey.GMAIL,
+    config: {
+      credentials: {
+        google_primary_admin: '',
+        google_tokens: '',
+        authentication_method: 'uploaded',
+      },
+    },
+  },
   [DataSourceKey.MOODLE]: {
     name: '',
     source: DataSourceKey.MOODLE,
diff --git a/web/src/services/data-source-service.ts b/web/src/services/data-source-service.ts
index 05830ff3a..036c156ad 100644
--- a/web/src/services/data-source-service.ts
+++ b/web/src/services/data-source-service.ts
@@ -34,9 +34,17 @@ export const featchDataSourceDetail = (id: string) =>
   request.get(api.dataSourceDetail(id));
 
 export const startGoogleDriveWebAuth = (payload: { credentials: string }) =>
-  request.post(api.googleDriveWebAuthStart, { data: payload });
+  request.post(api.googleWebAuthStart('google-drive'), { data: payload });
 
 export const pollGoogleDriveWebAuthResult = (payload: { flow_id: string }) =>
-  request.post(api.googleDriveWebAuthResult, { data: payload });
+  request.post(api.googleWebAuthResult('google-drive'), { data: payload });
+
+// Gmail web auth follows the same pattern as Google Drive, but uses
+// Gmail-specific endpoints and is consumed by the GmailTokenField UI.
+export const startGmailWebAuth = (payload: { credentials: string }) =>
+  request.post(api.googleWebAuthStart('gmail'), { data: payload });
+
+export const pollGmailWebAuthResult = (payload: { flow_id: string }) =>
+  request.post(api.googleWebAuthResult('gmail'), { data: payload });
 
 export default dataSourceService;
diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts
index c4ce8205f..5db7ba825 100644
--- a/web/src/utils/api.ts
+++ b/web/src/utils/api.ts
@@ -42,8 +42,10 @@ export default {
   dataSourceRebuild: (id: string) => `${api_host}/connector/${id}/rebuild`,
   dataSourceLogs: (id: string) => `${api_host}/connector/${id}/logs`,
   dataSourceDetail: (id: string) => `${api_host}/connector/${id}`,
-  googleDriveWebAuthStart: `${api_host}/connector/google-drive/oauth/web/start`,
-  googleDriveWebAuthResult: `${api_host}/connector/google-drive/oauth/web/result`,
+  googleWebAuthStart: (type: 'google-drive' | 'gmail') =>
+    `${api_host}/connector/google/oauth/web/start?type=${type}`,
+  googleWebAuthResult: (type: 'google-drive' | 'gmail') =>
+    `${api_host}/connector/google/oauth/web/result?type=${type}`,
 
   // plugin
   llm_tools: `${api_host}/plugin/llm_tools`,