fix: 修复选中问题

- Added a Discord link to the English, Japanese, and Chinese README files, encouraging users to join discussions and seek help alongside the existing Telegram group invitation.
- This change enhances community engagement options for Cherry Studio users.

.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch

@@ -15,3 +15,203 @@ index 50c3c4064af17bc4c7c46554d8f2419b3afceb0e..632c9b2e04d2e0e3bb09ef1cd8f29d25
      }
      static getInstance() {
          return RAGEmbedding.singleton;
+diff --git a/src/loaders/local-path-loader.d.ts b/src/loaders/local-path-loader.d.ts
+index 48c20e68c469cd309be2dc8f28e44c1bd04a26e9..87002be39e7305a02e2a607b0c0d95cbbc359f9d 100644
+--- a/src/loaders/local-path-loader.d.ts
++++ b/src/loaders/local-path-loader.d.ts
+@@ -1,19 +1,29 @@
+-import { BaseLoader } from '@llm-tools/embedjs-interfaces';
++import { BaseLoader } from "@llm-tools/embedjs-interfaces";
+ export declare class LocalPathLoader extends BaseLoader<{
+-    type: 'LocalPathLoader';
++  type: "LocalPathLoader";
+ }> {
+-    private readonly debug;
+-    private readonly path;
+-    constructor({ path }: {
+-        path: string;
+-    });
+-    getUnfilteredChunks(): AsyncGenerator<{
+-        metadata: {
+-            type: "LocalPathLoader";
+-            originalPath: string;
+-            source: string;
+-        };
+-        pageContent: string;
+-    }, void, unknown>;
+-    private recursivelyAddPath;
++  private readonly debug;
++  private readonly path;
++  constructor({
++    path,
++    chunkSize,
++    chunkOverlap,
++  }: {
++    path: string;
++    chunkSize?: number;
++    chunkOverlap?: number;
++  });
++  getUnfilteredChunks(): AsyncGenerator<
++    {
++      metadata: {
++        type: "LocalPathLoader";
++        originalPath: string;
++        source: string;
++      };
++      pageContent: string;
++    },
++    void,
++    unknown
++  >;
++  private recursivelyAddPath;
+ }
+diff --git a/src/loaders/local-path-loader.js b/src/loaders/local-path-loader.js
+index 4cf8a6bd1d890244c8ec49d4a05ee3bd58861c79..fd0fe1951c73da315b0c9bf4a8f33effbadb9f8f 100644
+--- a/src/loaders/local-path-loader.js
++++ b/src/loaders/local-path-loader.js
+@@ -8,8 +8,8 @@ import { BaseLoader } from '@llm-tools/embedjs-interfaces';
+ export class LocalPathLoader extends BaseLoader {
+     debug = createDebugMessages('embedjs:loader:LocalPathLoader');
+     path;
+-    constructor({ path }) {
+-        super(`LocalPathLoader_${md5(path)}`, { path });
++    constructor({ path, chunkSize, chunkOverlap}) {
++        super(`LocalPathLoader_${md5(path)}`, { path }, chunkSize ?? 1000, chunkOverlap ?? 0);
+         this.path = path;
+     }
+     async *getUnfilteredChunks() {
+@@ -36,10 +36,12 @@ export class LocalPathLoader extends BaseLoader {
+                 const extension = currentPath.split('.').pop().toLowerCase();
+                 if (extension === 'md' || extension === 'mdx')
+                     mime = 'text/markdown';
++                if (extension === 'txt')
++                    mime = 'text/plain';
+                 this.debug(`File '${this.path}' mime type updated to 'text/markdown'`);
+             }
+             try {
+-                const loader = await createLoaderFromMimeType(currentPath, mime);
++                const loader = await createLoaderFromMimeType(currentPath, mime, this.chunkSize, this.chunkOverlap);
+                 for await (const result of await loader.getUnfilteredChunks()) {
+                     yield {
+                         pageContent: result.pageContent,
+diff --git a/src/util/mime.d.ts b/src/util/mime.d.ts
+index 57f56a1b8edc98366af9f84d671676c41c2f01ca..f53856fa9c78afbeee9e085c7ed0b3a131f8ee5a 100644
+--- a/src/util/mime.d.ts
++++ b/src/util/mime.d.ts
+@@ -1,2 +1,7 @@
+-import { BaseLoader } from '@llm-tools/embedjs-interfaces';
+-export declare function createLoaderFromMimeType(loaderData: string, mimeType: string): Promise<BaseLoader>;
++import { BaseLoader } from "@llm-tools/embedjs-interfaces";
++export declare function createLoaderFromMimeType(
++  loaderData: string,
++  mimeType: string,
++  chunkSize?: number,
++  chunkOverlap?: number
++): Promise<BaseLoader>;
+diff --git a/src/util/mime.js b/src/util/mime.js
+index 9af30bd5b8cf42985f547073a4c19756292c33a3..54ae20343131a533ab70236d3060b6accc8f6126 100644
+--- a/src/util/mime.js
++++ b/src/util/mime.js
+@@ -1,7 +1,9 @@
+ import mime from 'mime';
+ import createDebugMessages from 'debug';
+ import { TextLoader } from '../loaders/text-loader.js';
+-export async function createLoaderFromMimeType(loaderData, mimeType) {
++import fs from 'node:fs';
++
++export async function createLoaderFromMimeType(loaderData, mimeType, chunkSize, chunkOverlap) {
+     createDebugMessages('embedjs:util:createLoaderFromMimeType')(`Incoming mime type '${mimeType}'`);
+     switch (mimeType) {
+         case 'application/msword':
+@@ -10,7 +12,7 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load docx files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported DocxLoader');
+-            return new DocxLoader({ filePathOrUrl: loaderData });
++            return new DocxLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'application/vnd.ms-excel':
+         case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': {
+@@ -18,21 +20,21 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load excel files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported ExcelLoader');
+-            return new ExcelLoader({ filePathOrUrl: loaderData });
++            return new ExcelLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'application/pdf': {
+             const { PdfLoader } = await import('@llm-tools/embedjs-loader-pdf').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-pdf` needs to be installed to load PDF files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported PdfLoader');
+-            return new PdfLoader({ filePathOrUrl: loaderData });
++            return new PdfLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'application/vnd.openxmlformats-officedocument.presentationml.presentation': {
+             const { PptLoader } = await import('@llm-tools/embedjs-loader-msoffice').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load pptx files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported PptLoader');
+-            return new PptLoader({ filePathOrUrl: loaderData });
++            return new PptLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/plain': {
+             const fineType = mime.getType(loaderData);
+@@ -42,24 +44,26 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                     throw new Error('Package `@llm-tools/embedjs-loader-csv` needs to be installed to load CSV files');
+                 });
+                 createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported CsvLoader');
+-                return new CsvLoader({ filePathOrUrl: loaderData });
++                return new CsvLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
++            }
++            else{
++                const content = fs.readFileSync(loaderData, 'utf-8');
++                return new TextLoader({ text: content, chunkSize, chunkOverlap });
+             }
+-            else
+-                return new TextLoader({ text: loaderData });
+         }
+         case 'application/csv': {
+             const { CsvLoader } = await import('@llm-tools/embedjs-loader-csv').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-csv` needs to be installed to load CSV files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported CsvLoader');
+-            return new CsvLoader({ filePathOrUrl: loaderData });
++            return new CsvLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/html': {
+             const { WebLoader } = await import('@llm-tools/embedjs-loader-web').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-web` needs to be installed to load web documents');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported WebLoader');
+-            return new WebLoader({ urlOrContent: loaderData });
++            return new WebLoader({ urlOrContent: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/xml': {
+             const { SitemapLoader } = await import('@llm-tools/embedjs-loader-sitemap').catch(() => {
+@@ -67,14 +71,14 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported SitemapLoader');
+             if (await SitemapLoader.test(loaderData)) {
+-                return new SitemapLoader({ url: loaderData });
++                return new SitemapLoader({ url: loaderData, chunkSize, chunkOverlap });
+             }
+             //This is not a Sitemap but is still XML
+             const { XmlLoader } = await import('@llm-tools/embedjs-loader-xml').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-xml` needs to be installed to load XML documents');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported XmlLoader');
+-            return new XmlLoader({ filePathOrUrl: loaderData });
++            return new XmlLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/x-markdown':
+         case 'text/markdown': {
+@@ -82,7 +86,7 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-markdown` needs to be installed to load markdown files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported MarkdownLoader');
+-            return new MarkdownLoader({ filePathOrUrl: loaderData });
++            return new MarkdownLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case undefined:
+             throw new Error(`MIME type could not be detected. Please file an issue if you think this is a bug.`);

README.md

@@ -11,7 +11,9 @@
 
 Cherry Studio is a desktop client that supports for multiple LLM providers, available on Windows, Mac and Linux.
 
-👏 Join [Telegram Group](https://t.me/CherryStudioAI)
+👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/C3xrXWjY) | [QQ Group](https://qm.qq.com/q/pQPuHMjUeQ)
+
+❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
 
 # 🌠 Screenshot
 

docs/README.ja.md

@@ -11,7 +11,9 @@
 
 Cherry Studioは、複数のLLMプロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linuxで利用可能です。
 
-👏 [Telegramグループ](https://t.me/CherryStudioAI)に参加しましょう
+👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/C3xrXWjY) | [QQグループ](https://qm.qq.com/q/pQPuHMjUeQ)
+
+❤️ Cherry Studioをお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
 
 # 🌠 スクリーンショット
 

docs/README.zh.md

@@ -11,7 +11,9 @@
 
 Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
 
-👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)
+👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/C3xrXWjY) | [QQ 群](https://qm.qq.com/q/pQPuHMjUeQ)
+
+❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
 
 # 🌠 界面
 

electron-builder.yml

@@ -80,7 +80,4 @@ afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    消息分组显示 @teojs
-    支持 DeepSeek R1 模型
-    助手的预设消息保存逻辑的修改 @duanyongcheng
-    错误修复和性能优化
+    错误修复

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "0.9.16",
+  "version": "0.9.17",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",

packages/shared/config/constant.ts

@@ -87,7 +87,8 @@ export const textExts = [
   '.gradle', // Gradle 构建文件
   '.groovy', // Gradle 构建文件
   '.kts', // Kotlin Script 文件
-  '.java' // Java 代码文件
+  '.java', // Java 代码文件
+  '.cs' // C# 代码文件
 ]
 
 export const ZOOM_SHORTCUTS = [

src/main/services/FileStorage.ts

@@ -388,7 +388,7 @@ class FileStorage {
       }
 
       // 如果URL中有文件名，使用URL中的文件名
-      const urlFilename = url.split('/').pop()
+      const urlFilename = url.split('/').pop()?.split('?')[0]
       if (urlFilename && urlFilename.includes('.')) {
         filename = urlFilename
       }

src/main/services/KnowledgeService.ts

@@ -83,54 +83,103 @@ class KnowledgeService {
 
     if (item.type === 'directory') {
       const directory = item.content as string
-      return await ragApplication.addLoader(new LocalPathLoader({ path: directory }), forceReload)
+      return await ragApplication.addLoader(
+        new LocalPathLoader({ path: directory, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+        forceReload
+      )
     }
 
     if (item.type === 'url') {
       const content = item.content as string
       if (content.startsWith('http')) {
-        // @ts-ignore loader type
-        return await ragApplication.addLoader(new WebLoader({ urlOrContent: content }), forceReload)
+        return await ragApplication.addLoader(
+          new WebLoader({ urlOrContent: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+          forceReload
+        )
       }
     }
 
     if (item.type === 'sitemap') {
       const content = item.content as string
       // @ts-ignore loader type
-      return await ragApplication.addLoader(new SitemapLoader({ url: content }), forceReload)
+      return await ragApplication.addLoader(
+        new SitemapLoader({ url: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+        forceReload
+      )
     }
 
     if (item.type === 'note') {
       const content = item.content as string
-      return await ragApplication.addLoader(new TextLoader({ text: content }), forceReload)
+      return await ragApplication.addLoader(
+        new TextLoader({ text: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }),
+        forceReload
+      )
     }
 
     if (item.type === 'file') {
       const file = item.content as FileType
 
       if (file.ext === '.pdf') {
-        return await ragApplication.addLoader(new PdfLoader({ filePathOrUrl: file.path }) as any, forceReload)
+        return await ragApplication.addLoader(
+          new PdfLoader({
+            filePathOrUrl: file.path,
+            chunkSize: base.chunkSize,
+            chunkOverlap: base.chunkOverlap
+          }) as any,
+          forceReload
+        )
       }
 
       if (file.ext === '.docx') {
-        return await ragApplication.addLoader(new DocxLoader({ filePathOrUrl: file.path }) as any, forceReload)
+        return await ragApplication.addLoader(
+          new DocxLoader({
+            filePathOrUrl: file.path,
+            chunkSize: base.chunkSize,
+            chunkOverlap: base.chunkOverlap
+          }) as any,
+          forceReload
+        )
       }
 
       if (file.ext === '.pptx') {
-        return await ragApplication.addLoader(new PptLoader({ filePathOrUrl: file.path }) as any, forceReload)
+        return await ragApplication.addLoader(
+          new PptLoader({
+            filePathOrUrl: file.path,
+            chunkSize: base.chunkSize,
+            chunkOverlap: base.chunkOverlap
+          }) as any,
+          forceReload
+        )
       }
 
       if (file.ext === '.xlsx') {
-        return await ragApplication.addLoader(new ExcelLoader({ filePathOrUrl: file.path }) as any, forceReload)
+        return await ragApplication.addLoader(
+          new ExcelLoader({
+            filePathOrUrl: file.path,
+            chunkSize: base.chunkSize,
+            chunkOverlap: base.chunkOverlap
+          }) as any,
+          forceReload
+        )
       }
 
       if (['.md'].includes(file.ext)) {
-        return await ragApplication.addLoader(new MarkdownLoader({ filePathOrUrl: file.path }) as any, forceReload)
+        return await ragApplication.addLoader(
+          new MarkdownLoader({
+            filePathOrUrl: file.path,
+            chunkSize: base.chunkSize,
+            chunkOverlap: base.chunkOverlap
+          }) as any,
+          forceReload
+        )
       }
 
       const fileContent = fs.readFileSync(file.path, 'utf-8')
 
-      return await ragApplication.addLoader(new TextLoader({ text: fileContent }), forceReload)
+      return await ragApplication.addLoader(
+        new TextLoader({ text: fileContent, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }),
+        forceReload
+      )
     }
 
     return { entriesAdded: 0, uniqueId: '', loaderType: '' }

src/renderer/src/App.tsx

@@ -16,7 +16,6 @@ import FilesPage from './pages/files/FilesPage'
 import HomePage from './pages/home/HomePage'
 import KnowledgePage from './pages/knowledge/KnowledgePage'
 import PaintingsPage from './pages/paintings/PaintingsPage'
-import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
 
 function App(): JSX.Element {
@@ -37,7 +36,6 @@ function App(): JSX.Element {
                     <Route path="/files" element={<FilesPage />} />
                     <Route path="/knowledge" element={<KnowledgePage />} />
                     <Route path="/apps" element={<AppsPage />} />
-                    <Route path="/settings/*" element={<SettingsPage />} />
                   </Routes>
                 </HashRouter>
               </TopViewContainer>

src/renderer/src/components/Popups/SettingsPopup.tsx

@@ -0,0 +1,66 @@
+import SettingsPage, { SettingsTab } from '@renderer/pages/settings/SettingsPage'
+import { Modal } from 'antd'
+import { FC, useState } from 'react'
+import styled, { createGlobalStyle } from 'styled-components'
+
+interface Props {
+  actionButton?: React.ReactNode
+  activeTab?: SettingsTab
+}
+
+const SettingsPopup: FC<Props> = (props) => {
+  const [open, setOpen] = useState(false)
+  const [activeTab, setActiveTab] = useState<SettingsTab | undefined>(props.activeTab)
+
+  const onOpen = () => {
+    if (props.activeTab) {
+      setActiveTab(props.activeTab)
+    }
+    setOpen(true)
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  return (
+    <>
+      <div onClick={onOpen}>{props.actionButton}</div>
+      <GlobalStyle />
+      <StyledModal
+        transitionName="ant-move-down"
+        width="80vw"
+        title={null}
+        open={open}
+        onCancel={onCancel}
+        footer={null}>
+        <SettingsPage activeTab={activeTab} onTabChange={setActiveTab} />
+      </StyledModal>
+    </>
+  )
+}
+
+const GlobalStyle = createGlobalStyle`
+  .ant-modal-mask {
+    backdrop-filter: blur(10px);
+    background-color: transparent !important;
+  }
+`
+
+const StyledModal = styled(Modal)`
+  min-width: 900px;
+  max-width: 1300px;
+  padding-bottom: 0;
+
+  .ant-modal-content {
+    padding: 0;
+    overflow: hidden;
+    border-radius: 12px;
+  }
+  .ant-modal-close {
+    top: 4px;
+    right: 4px;
+  }
+`
+
+export default SettingsPopup

src/renderer/src/components/app/Sidebar.tsx

@@ -1,10 +1,10 @@
 import { FileSearchOutlined, FolderOutlined, PictureOutlined, TranslationOutlined } from '@ant-design/icons'
 import { isMac } from '@renderer/config/constant'
-import { isLocalAi, UserAvatar } from '@renderer/config/env'
+import { UserAvatar } from '@renderer/config/env'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import useAvatar from '@renderer/hooks/useAvatar'
 import { useMinapps } from '@renderer/hooks/useMinapps'
-import { modelGenerating, useRuntime } from '@renderer/hooks/useRuntime'
+import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
 import type { MenuProps } from 'antd'
 import { Tooltip } from 'antd'
@@ -18,14 +18,13 @@ import styled from 'styled-components'
 import DragableList from '../DragableList'
 import MinAppIcon from '../Icons/MinAppIcon'
 import MinApp from '../MinApp'
+import SettingsPopup from '../Popups/SettingsPopup'
 import UserPopup from '../Popups/UserPopup'
 
 const Sidebar: FC = () => {
-  const { pathname } = useLocation()
   const avatar = useAvatar()
   const { minappShow } = useRuntime()
   const { t } = useTranslation()
-  const navigate = useNavigate()
   const { windowStyle, sidebarIcons } = useSettings()
   const { theme, toggleTheme } = useTheme()
   const { pinned } = useMinapps()
@@ -37,11 +36,6 @@ const Sidebar: FC = () => {
 
   const showPinnedApps = pinned.length > 0 && sidebarIcons.visible.includes('minapp')
 
-  const to = async (path: string) => {
-    await modelGenerating()
-    navigate(path)
-  }
-
   return (
     <Container
       id="app-sidebar"
@@ -73,13 +67,15 @@ const Sidebar: FC = () => {
             )}
           </Icon>
         </Tooltip>
-        <Tooltip title={t('settings.title')} mouseEnterDelay={0.8} placement="right">
-          <StyledLink onClick={() => to(isLocalAi ? '/settings/assistant' : '/settings/provider')}>
-            <Icon className={pathname.startsWith('/settings') ? 'active' : ''}>
-              <i className="iconfont icon-setting" />
-            </Icon>
-          </StyledLink>
-        </Tooltip>
+        <SettingsPopup
+          actionButton={
+            <Tooltip title={t('settings.title')} mouseEnterDelay={0.8} placement="right">
+              <Icon>
+                <i className="iconfont icon-setting" />
+              </Icon>
+            </Tooltip>
+          }
+        />
       </Menus>
     </Container>
   )

src/renderer/src/config/models.ts

@@ -760,6 +760,12 @@ export const SYSTEM_MODELS: Record<string, Model[]> = {
       provider: 'minimax',
       name: 'abab5.5s',
       group: 'abab5'
+    },
+    {
+      id: 'minimax-text-01',
+      provider: 'minimax',
+      name: 'minimax-01',
+      group: 'minimax-01'
     }
   ],
   hyperbolic: [

src/renderer/src/i18n/locales/en-us.json

@@ -245,6 +245,7 @@
       "error.enter.api.key": "Please enter your API key first",
       "error.enter.model": "Please select a model first",
       "error.enter.name": "Please enter the name of the knowledge base",
+      "error.chunk_overlap_too_large": "Chunk overlap cannot be greater than chunk size",
       "error.invalid.proxy.url": "Invalid proxy URL",
       "error.invalid.webdav": "Invalid WebDAV settings",
       "message.code_style": "Code style",
@@ -269,7 +270,9 @@
       "upgrade.success.title": "Upgrade successfully",
       "regenerate.confirm": "Regenerating will replace current message",
       "copy.success": "Copied!",
-      "error.get_embedding_dimensions": "Failed to get embedding dimensions"
+      "error.get_embedding_dimensions": "Failed to get embedding dimensions",
+      "group.delete.title": "Delete Group Message",
+      "group.delete.content": "Deleting a group message will delete the user's question and all assistant's answers"
     },
     "minapp": {
       "title": "MinApp",
@@ -623,7 +626,10 @@
       "model_info": "Model Info",
       "not_support": "Knowledge base database engine updated, the knowledge base will no longer be supported, please create a new knowledge base",
       "no_provider": "Knowledge base model provider is not set, the knowledge base will no longer be supported, please create a new knowledge base",
-      "source": "Source"
+      "source": "Source",
+      "chunk_size": "Chunk Size",
+      "chunk_overlap": "Chunk Overlap",
+      "not_set": "Not Set"
     },
     "models": {
       "pinned": "Pinned",

src/renderer/src/i18n/locales/ja-jp.json

@@ -244,6 +244,7 @@
       "error.enter.api.host": "APIホストを入力してください",
       "error.enter.api.key": "APIキーを入力してください",
       "error.enter.model": "モデルを選択してください",
+      "error.chunk_overlap_too_large": "チャンクの重なりは、チャンクサイズを超えることはできません",
       "error.invalid.proxy.url": "無効なプロキシURL",
       "error.invalid.webdav": "無効なWebDAV設定",
       "message.code_style": "コードスタイル",
@@ -268,7 +269,9 @@
       "upgrade.success.title": "アップグレードに成功しました",
       "regenerate.confirm": "再生成すると現在のメッセージが置き換えられます",
       "copy.success": "コピーしました！",
-      "error.get_embedding_dimensions": "埋込み次元を取得できませんでした"
+      "error.get_embedding_dimensions": "埋込み次元を取得できませんでした",
+      "group.delete.title": "分組メッセージを削除",
+      "group.delete.content": "分組メッセージを削除するとユーザーの質問と助け手の回答がすべて削除されます"
     },
     "minapp": {
       "title": "ミニアプリ",
@@ -607,7 +610,10 @@
       "model_info": "モデル情報",
       "not_support": "ナレッジベースデータベースエンジンが更新されました。このナレッジベースはもうサポートされていません。新しいナレッジベースを作成してください",
       "no_provider": "ナレッジベースモデルプロバイダーが設定されていません。ナレッジベースはもうサポートされていません。新しいナレッジベースを作成してください",
-      "source": "ソース"
+      "source": "ソース",
+      "chunk_size": "チャンクサイズ",
+      "chunk_overlap": "チャンクの重なり",
+      "not_set": "未設定"
     },
     "models": {
       "pinned": "固定済み",

src/renderer/src/i18n/locales/ru-ru.json

@@ -245,6 +245,7 @@
       "error.enter.api.key": "Пожалуйста, введите ваш API ключ",
       "error.enter.model": "Пожалуйста, выберите модель",
       "error.enter.name": "Пожалуйста, введите название базы знаний",
+      "error.chunk_overlap_too_large": "Перекрытие фрагментов не может быть больше размера фрагмента.",
       "error.invalid.proxy.url": "Неверный URL прокси",
       "error.invalid.webdav": "Неверные настройки WebDAV",
       "message.code_style": "Стиль кода",
@@ -269,7 +270,9 @@
       "upgrade.success.title": "Обновление успешно",
       "regenerate.confirm": "Перегенерация заменит текущее сообщение",
       "copy.success": "Скопировано!",
-      "error.get_embedding_dimensions": "Не удалось получить размерность встраивания"
+      "error.get_embedding_dimensions": "Не удалось получить размерность встраивания",
+      "group.delete.title": "Удалить группу сообщений",
+      "group.delete.content": "Удаление группы сообщений удалит пользовательский вопрос и все ответы помощника"
     },
     "minapp": {
       "title": "Встроенные приложения",
@@ -620,7 +623,10 @@
       "model_info": "Модель информации",
       "not_support": "База знаний базы данных движок обновлен, база знаний больше не поддерживается, пожалуйста, создайте новую базу знаний",
       "no_provider": "База знаний модель поставщика не настроена, база знаний больше не поддерживается, пожалуйста, создайте новую базу знаний",
-      "source": "Источник"
+      "source": "Источник",
+      "chunk_size": "Размер фрагмента",
+      "chunk_overlap": "Перекрытие фрагмента",
+      "not_set": "Не установлено"
     },
     "models": {
       "pinned": "Закреплено",

src/renderer/src/i18n/locales/zh-cn.json

@@ -246,6 +246,7 @@
       "error.enter.api.key": "请输入您的 API 密钥",
       "error.enter.model": "请选择一个模型",
       "error.enter.name": "请输入知识库名称",
+      "error.chunk_overlap_too_large": "分段重叠不能大于分段大小",
       "error.invalid.proxy.url": "无效的代理地址",
       "error.invalid.webdav": "无效的 WebDAV 设置",
       "message.code_style": "代码风格",
@@ -270,7 +271,9 @@
       "upgrade.success.title": "升级成功",
       "regenerate.confirm": "重新生成会覆盖当前消息",
       "copy.success": "复制成功",
-      "error.get_embedding_dimensions": "获取嵌入维度失败"
+      "error.get_embedding_dimensions": "获取嵌入维度失败",
+      "group.delete.title": "删除分组消息",
+      "group.delete.content": "删除分组消息会删除用户提问和所有助手的回答"
     },
     "minapp": {
       "title": "小程序",
@@ -609,7 +612,10 @@
       "model_info": "模型信息",
       "not_support": "知识库数据库引擎已更新，该知识库将不再支持，请重新创建知识库",
       "no_provider": "知识库模型服务商丢失，该知识库将不再支持，请重新创建知识库",
-      "source": "来源"
+      "source": "来源",
+      "chunk_size": "分段大小",
+      "chunk_overlap": "重叠大小",
+      "not_set": "未设置"
     },
     "models": {
       "pinned": "已固定",

src/renderer/src/i18n/locales/zh-tw.json

@@ -245,6 +245,7 @@
       "error.enter.api.key": "請先輸入您的 API 密鑰",
       "error.enter.model": "請先選擇一個模型",
       "error.enter.name": "請先輸入知識庫名稱",
+      "error.chunk_overlap_too_large": "分段重疊不能大於分段大小",
       "error.invalid.proxy.url": "無效的代理 URL",
       "error.invalid.webdav": "無效的 WebDAV 設定",
       "message.code_style": "程式碼風格",
@@ -269,7 +270,9 @@
       "upgrade.success.title": "升級成功",
       "regenerate.confirm": "重新生成會覆蓋當前訊息",
       "copy.success": "複製成功",
-      "error.get_embedding_dimensions": "獲取嵌入維度失敗"
+      "error.get_embedding_dimensions": "獲取嵌入維度失敗",
+      "group.delete.title": "刪除分組消息",
+      "group.delete.content": "刪除分組消息會刪除用戶提問和所有助手的回答"
     },
     "minapp": {
       "title": "小程序",
@@ -608,7 +611,10 @@
       "model_info": "模型信息",
       "not_support": "知識庫數據庫引擎已更新，該知識庫將不再支持，請重新創建知識庫",
       "no_provider": "知識庫模型提供商遺失，該知識庫將不再支持，請重新創建知識庫",
-      "source": "來源"
+      "source": "來源",
+      "chunk_size": "分段大小",
+      "chunk_overlap": "重疊大小",
+      "not_set": "未設置"
     },
     "models": {
       "pinned": "已固定",

src/renderer/src/pages/home/Messages/MessageGroup.tsx

@@ -8,6 +8,7 @@ import { MultiModelMessageStyle } from '@renderer/store/settings'
 import { Message, Model, Topic } from '@renderer/types'
 import { Button, Segmented as AntdSegmented } from 'antd'
 import { Dispatch, FC, SetStateAction, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styled, { css } from 'styled-components'
 
 import MessageItem from './Message'
@@ -32,6 +33,7 @@ const MessageGroup: FC<Props> = ({
   onDeleteGroupMessages
 }) => {
   const { multiModelMessageStyle: multiModelMessageStyleSetting } = useSettings()
+  const { t } = useTranslation()
 
   const [multiModelMessageStyle, setMultiModelMessageStyle] =
     useState<MultiModelMessageStyle>(multiModelMessageStyleSetting)
@@ -42,8 +44,19 @@ const MessageGroup: FC<Props> = ({
   const isGrouped = messageLength > 1
 
   const onDelete = async () => {
-    const askId = messages[0].askId
-    askId && onDeleteGroupMessages?.(askId)
+    window.modal.confirm({
+      title: t('message.group.delete.title'),
+      content: t('message.group.delete.content'),
+      centered: true,
+      okButtonProps: {
+        danger: true
+      },
+      okText: t('common.delete'),
+      onOk: () => {
+        const askId = messages[0].askId
+        askId && onDeleteGroupMessages?.(askId)
+      }
+    })
   }
 
   useEffect(() => {

src/renderer/src/pages/home/Messages/MessageMenubar.tsx

@@ -16,11 +16,13 @@ import TextEditPopup from '@renderer/components/Popups/TextEditPopup'
 import { TranslateLanguageOptions } from '@renderer/config/translate'
 import { modelGenerating } from '@renderer/hooks/useRuntime'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
+import { resetAssistantMessage } from '@renderer/services/MessagesService'
 import { translateText } from '@renderer/services/TranslateService'
 import { Message, Model } from '@renderer/types'
 import { removeTrailingDoubleSpaces, uuid } from '@renderer/utils'
 import { Button, Dropdown, Popconfirm, Tooltip } from 'antd'
 import dayjs from 'dayjs'
+import { isEmpty } from 'lodash'
 import { FC, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -77,6 +79,21 @@ const MessageMenubar: FC<Props> = (props) => {
   const onResend = useCallback(async () => {
     await modelGenerating()
     const _messages = onGetMessages?.() || []
+    const groupdMessages = _messages.filter((m) => m.askId === message.id)
+
+    // Resend all groupd messages
+    if (!isEmpty(groupdMessages)) {
+      for (const assistantMessage of groupdMessages) {
+        const _model = assistantMessage.model || assistantModel
+        EventEmitter.emit(
+          EVENT_NAMES.RESEND_MESSAGE + ':' + assistantMessage.id,
+          resetAssistantMessage(assistantMessage, _model)
+        )
+      }
+      return
+    }
+
+    // If there is no groupd message, resend next message
     const index = _messages.findIndex((m) => m.id === message.id)
     const nextIndex = index + 1
     const nextMessage = _messages[nextIndex]
@@ -91,6 +108,7 @@ const MessageMenubar: FC<Props> = (props) => {
       })
     }
 
+    // If next message is not exist or next message role is user, delete current message and resend
     if (!nextMessage || nextMessage.role === 'user') {
       EventEmitter.emit(EVENT_NAMES.SEND_MESSAGE, { ...message, id: uuid() })
       onDeleteMessage?.(message)
@@ -102,20 +120,25 @@ const MessageMenubar: FC<Props> = (props) => {
 
     const editedText = await TextEditPopup.show({
       text: message.content,
-      children: (props) =>
-        message.role === 'user' ? (
+      children: (props) => {
+        const onPress = () => {
+          props.onOk?.()
+          resendMessage = true
+        }
+        return message.role === 'user' ? (
           <ReSendButton
             icon={<i className="iconfont icon-ic_send" style={{ color: 'var(--color-primary)' }} />}
-            onClick={() => {
-              props.onOk?.()
-              resendMessage = true
-            }}>
+            onClick={onPress}>
             {t('chat.resend')}
           </ReSendButton>
         ) : null
+      }
     })
 
-    editedText && onEditMessage?.({ ...message, content: editedText })
+    if (editedText) {
+      await onEditMessage?.({ ...message, content: editedText })
+    }
+
     resendMessage && onResend()
   }, [message, onEditMessage, onResend, t])
 
@@ -177,16 +200,7 @@ const MessageMenubar: FC<Props> = (props) => {
     const selectedModel = await SelectModelPopup.show({ model })
     if (!selectedModel) return
 
-    const _message: Message = {
-      ...message,
-      content: '',
-      reasoning_content: undefined,
-      metrics: undefined,
-      status: 'sending',
-      model: selectedModel,
-      translatedContent: undefined,
-      metadata: undefined
-    }
+    const _message: Message = resetAssistantMessage(message, selectedModel)
 
     if (message.askId && message.model) {
       return EventEmitter.emit(EVENT_NAMES.APPEND_MESSAGE, { ..._message, id: uuid() })

src/renderer/src/pages/knowledge/KnowledgeContent.tsx

@@ -361,6 +361,13 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
         {providerName && <Tag color="purple">{providerName}</Tag>}
       </ModelInfo>
 
+      <ModelInfo>
+        <label htmlFor="model-info">{t('knowledge.chunk_size')}</label>
+        <Tag color="green">{base.chunkSize || t('knowledge.not_set')}</Tag>
+        <label htmlFor="model-info">{t('knowledge.chunk_overlap')}</label>
+        <Tag color="orange">{base.chunkOverlap || t('knowledge.not_set')}</Tag>
+      </ModelInfo>
+
       <IndexSection>
         <Button
           type="primary"

src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx

@@ -6,7 +6,7 @@ import AiProvider from '@renderer/providers/AiProvider'
 import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService'
 import { getModelUniqId } from '@renderer/services/ModelService'
 import { Model } from '@renderer/types'
-import { Form, Input, Modal, Select } from 'antd'
+import { Form, Input, InputNumber, Modal, Select } from 'antd'
 import { find, sortBy } from 'lodash'
 import { nanoid } from 'nanoid'
 import { useState } from 'react'
@@ -19,6 +19,8 @@ interface ShowParams {
 interface FormData {
   name: string
   model: string
+  chunkSize?: number
+  chunkOverlap?: number
 }
 
 interface Props extends ShowParams {
@@ -81,6 +83,8 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           name: values.name,
           model: selectedModel,
           dimensions,
+          chunkSize: values.chunkSize,
+          chunkOverlap: values.chunkOverlap,
           items: [],
           created_at: Date.now(),
           updated_at: Date.now(),
@@ -131,6 +135,27 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           rules={[{ required: true, message: t('message.error.enter.model') }]}>
           <Select style={{ width: '100%' }} options={selectOptions} placeholder={t('settings.models.empty')} />
         </Form.Item>
+
+        <Form.Item name="chunkSize" label={t('knowledge.chunk_size')}>
+          <InputNumber style={{ width: '100%' }} min={1} />
+        </Form.Item>
+
+        <Form.Item
+          name="chunkOverlap"
+          label={t('knowledge.chunk_overlap')}
+          rules={[
+            ({ getFieldValue }) => ({
+              validator(_, value) {
+                if (!value || getFieldValue('chunkSize') > value) {
+                  return Promise.resolve()
+                }
+                return Promise.reject(new Error(t('message.error.chunk_overlap_too_large')))
+              }
+            })
+          ]}
+          dependencies={['chunkSize']}>
+          <InputNumber style={{ width: '100%' }} min={0} />
+        </Form.Item>
       </Form>
     </Modal>
   )

src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx

@@ -67,8 +67,22 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     setApiHost(provider.apiHost)
   }, [provider])
 
-  const onUpdateApiKey = () => updateProvider({ ...provider, apiKey })
-  const onUpdateApiHost = () => updateProvider({ ...provider, apiHost })
+  const onUpdateApiKey = () => {
+    if (apiKey.trim()) {
+      updateProvider({ ...provider, apiKey })
+    } else {
+      setApiKey(provider.apiKey)
+    }
+  }
+
+  const onUpdateApiHost = () => {
+    if (apiHost.trim()) {
+      updateProvider({ ...provider, apiHost })
+    } else {
+      setApiHost(provider.apiHost)
+    }
+  }
+
   const onUpdateApiVersion = () => updateProvider({ ...provider, apiVersion })
   const onManageModel = () => EditModelsPopup.show({ provider })
   const onAddModel = () => AddModelPopup.show({ title: t('settings.models.add.add_model'), provider })

src/renderer/src/pages/settings/ProviderSettings/index.tsx

@@ -164,7 +164,7 @@ const ProviderListContainer = styled.div`
   display: flex;
   flex-direction: column;
   min-width: calc(var(--settings-width) + 10px);
-  height: calc(100vh - var(--navbar-height));
+  height: calc(75vh - var(--navbar-height));
   border-right: 0.5px solid var(--color-border);
 `
 
@@ -180,19 +180,18 @@ const ProviderListItem = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;
-  padding: 5px 10px;
+  padding: 8px 8px;
   width: 100%;
   cursor: grab;
-  border-radius: var(--list-item-border-radius);
+  border-radius: 8px;
   font-size: 14px;
   transition: all 0.2s ease-in-out;
-  border: 0.5px solid transparent;
   &:hover {
-    background: var(--color-background-soft);
+    background: var(--color-primary-mute);
   }
   &.active {
-    background: var(--color-background-soft);
-    border: 0.5px solid var(--color-border);
+    background: var(--color-primary-mute);
+    color: var(--color-primary);
     font-weight: bold !important;
   }
 `

src/renderer/src/pages/settings/SettingsPage.tsx

@@ -7,11 +7,10 @@ import {
   SaveOutlined,
   SettingOutlined
 } from '@ant-design/icons'
-import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
 import { isLocalAi } from '@renderer/config/env'
-import { FC } from 'react'
+import { Breadcrumb, Button, Menu } from 'antd'
+import { FC, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Link, Route, Routes, useLocation } from 'react-router-dom'
 import styled from 'styled-components'
 
 import AboutSettings from './AboutSettings'
@@ -23,94 +22,145 @@ import ProvidersList from './ProviderSettings'
 import QuickAssistantSettings from './QuickAssistantSettings'
 import ShortcutSettings from './ShortcutSettings'
 
-const SettingsPage: FC = () => {
-  const { pathname } = useLocation()
-  const { t } = useTranslation()
+export type SettingsTab =
+  | 'provider'
+  | 'model'
+  | 'general'
+  | 'display'
+  | 'data'
+  | 'quickAssistant'
+  | 'shortcut'
+  | 'about'
 
-  const isRoute = (path: string): string => (pathname.startsWith(path) ? 'active' : '')
-
-  return (
-    <Container>
-      <Navbar>
-        <NavbarCenter style={{ borderRight: 'none' }}>{t('settings.title')}</NavbarCenter>
-      </Navbar>
-      <ContentContainer id="content-container">
-        <SettingMenus>
-          {!isLocalAi && (
-            <>
-              <MenuItemLink to="/settings/provider">
-                <MenuItem className={isRoute('/settings/provider')}>
-                  <CloudOutlined />
-                  {t('settings.provider.title')}
-                </MenuItem>
-              </MenuItemLink>
-              <MenuItemLink to="/settings/model">
-                <MenuItem className={isRoute('/settings/model')}>
-                  <i className="iconfont icon-ai-model" />
-                  {t('settings.model')}
-                </MenuItem>
-              </MenuItemLink>
-            </>
-          )}
-          <MenuItemLink to="/settings/general">
-            <MenuItem className={isRoute('/settings/general')}>
-              <SettingOutlined />
-              {t('settings.general')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/display">
-            <MenuItem className={isRoute('/settings/display')}>
-              <LayoutOutlined />
-              {t('settings.display.title')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/shortcut">
-            <MenuItem className={isRoute('/settings/shortcut')}>
-              <MacCommandOutlined />
-              {t('settings.shortcuts.title')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/quickAssistant">
-            <MenuItem className={isRoute('/settings/quickAssistant')}>
-              <RocketOutlined />
-              {t('settings.quickAssistant.title')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/data">
-            <MenuItem className={isRoute('/settings/data')}>
-              <SaveOutlined />
-              {t('settings.data.title')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/about">
-            <MenuItem className={isRoute('/settings/about')}>
-              <InfoCircleOutlined />
-              {t('settings.about')}
-            </MenuItem>
-          </MenuItemLink>
-        </SettingMenus>
-        <SettingContent>
-          <Routes>
-            <Route path="provider" element={<ProvidersList />} />
-            <Route path="model" element={<ModelSettings />} />
-            <Route path="general/*" element={<GeneralSettings />} />
-            <Route path="display" element={<DisplaySettings />} />
-            <Route path="data/*" element={<DataSettings />} />
-            <Route path="quickAssistant" element={<QuickAssistantSettings />} />
-            <Route path="shortcut" element={<ShortcutSettings />} />
-            <Route path="about" element={<AboutSettings />} />
-          </Routes>
-        </SettingContent>
-      </ContentContainer>
-    </Container>
-  )
+interface Props {
+  activeTab?: SettingsTab
+  onTabChange?: (tab: SettingsTab) => void
+}
+interface MenuItem {
+  label: string
+  icon: React.ReactNode
+  key: string
+  enabled: boolean
 }
 
-const Container = styled.div`
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-`
+const SettingsPage: FC<Props> = (props) => {
+  const { t } = useTranslation()
+  const [collapsed, setCollapsed] = useState(false)
+
+  const activeTab = props.activeTab || 'provider'
+
+  const settingMenus = useMemo<MenuItem[]>(
+    () => [
+      {
+        label: t('settings.provider.title'),
+        icon: <CloudOutlined />,
+        key: 'provider',
+        enabled: !isLocalAi
+      },
+      {
+        label: t('settings.model'),
+        icon: <i className="iconfont icon-ai-model" />,
+        key: 'model',
+        enabled: !isLocalAi
+      },
+      {
+        label: t('settings.general'),
+        icon: <SettingOutlined />,
+        key: 'general',
+        enabled: true
+      },
+      {
+        label: t('settings.display.title'),
+        icon: <LayoutOutlined />,
+        key: 'display',
+        enabled: true
+      },
+      {
+        label: t('settings.shortcuts.title'),
+        icon: <MacCommandOutlined />,
+        key: 'shortcut',
+        enabled: true
+      },
+      {
+        label: t('settings.quickAssistant.title'),
+        icon: <RocketOutlined />,
+        key: 'quickAssistant',
+        enabled: true
+      },
+      {
+        label: t('settings.data.title'),
+        icon: <SaveOutlined />,
+        key: 'data',
+        enabled: true
+      },
+      {
+        label: t('settings.about'),
+        icon: <InfoCircleOutlined />,
+        key: 'about',
+        enabled: true
+      }
+    ],
+    [t]
+  )
+
+  const breadcrumbItems = useMemo(() => {
+    return [
+      {
+        title: t('settings.title')
+      },
+      {
+        title: settingMenus.find((item) => item.key === activeTab)?.label
+      }
+    ]
+  }, [t, activeTab, settingMenus])
+
+  const renderContent = () => {
+    switch (activeTab) {
+      case 'provider':
+        return <ProvidersList />
+      case 'model':
+        return <ModelSettings />
+      case 'general':
+        return <GeneralSettings />
+      case 'display':
+        return <DisplaySettings />
+      case 'data':
+        return <DataSettings />
+      case 'quickAssistant':
+        return <QuickAssistantSettings />
+      case 'shortcut':
+        return <ShortcutSettings />
+      case 'about':
+        return <AboutSettings />
+      default:
+        return <GeneralSettings />
+    }
+  }
+
+  return (
+    <ContentContainer>
+      <MenuContainer $isCollapsed={collapsed}>
+        <Title>{t('settings.title')}</Title>
+        <Menu
+          mode="inline"
+          onClick={(e) => props.onTabChange?.(e.key as SettingsTab)}
+          selectedKeys={[activeTab]}
+          items={settingMenus.filter((item) => item.enabled)}
+          inlineCollapsed={collapsed}
+        />
+      </MenuContainer>
+      <SettingContent>
+        <SettingHeader>
+          <CollapseButton shape="circle" type="text" onClick={() => setCollapsed(!collapsed)} $isCollapsed={collapsed}>
+            <i className="iconfont icon-hide-sidebar" />
+          </CollapseButton>
+          <Breadcrumb items={breadcrumbItems} />
+        </SettingHeader>
+        {renderContent()}
+      </SettingContent>
+    </ContentContainer>
+  )
+}
 
 const ContentContainer = styled.div`
   display: flex;
@@ -118,57 +168,40 @@ const ContentContainer = styled.div`
   flex-direction: row;
 `
 
-const SettingMenus = styled.ul`
-  display: flex;
-  flex-direction: column;
-  min-width: var(--settings-width);
-  border-right: 0.5px solid var(--color-border);
-  padding: 10px;
-  user-select: none;
-`
-
-const MenuItemLink = styled(Link)`
-  text-decoration: none;
-  color: var(--color-text-1);
-  margin-bottom: 5px;
-`
-
-const MenuItem = styled.li`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 10px;
-  width: 100%;
-  cursor: pointer;
-  border-radius: var(--list-item-border-radius);
-  font-weight: 500;
-  transition: all 0.2s ease-in-out;
-  border: 0.5px solid transparent;
-  .anticon {
-    font-size: 16px;
-    opacity: 0.8;
+const MenuContainer = styled.div<{ $isCollapsed: boolean }>`
+  width: ${({ $isCollapsed }) => ($isCollapsed ? '80px' : '160px')};
+  background-color: var(--color-background-mute);
+  transition: width 0.3s ease-in-out;
+  position: relative;
+  .ant-menu-light {
+    background-color: var(--color-background-mute);
   }
+`
+
+const CollapseButton = styled(Button)<{ $isCollapsed: boolean }>`
+  color: var(--color-icon);
   .iconfont {
-    font-size: 18px;
-    line-height: 18px;
-    opacity: 0.7;
-    margin-left: -1px;
-  }
-  &:hover {
-    background: var(--color-background-soft);
-  }
-  &.active {
-    background: var(--color-background-soft);
-    border: 0.5px solid var(--color-border);
+    transform: rotate(${({ $isCollapsed }) => ($isCollapsed ? '180deg' : '0deg')});
   }
 `
 
+const Title = styled.div`
+  font-size: 16px;
+  font-weight: 600;
+  padding: 16px 24px;
+`
+
 const SettingContent = styled.div`
-  display: flex;
   height: 100%;
   flex: 1;
-  border-right: 0.5px solid var(--color-border);
+`
+
+const SettingHeader = styled.div`
+  padding: 4px 8px;
+  border-bottom: 0.5px solid var(--color-border);
+  display: flex;
+  align-items: center;
+  gap: 8px;
 `
 
 export default SettingsPage

src/renderer/src/pages/settings/index.tsx

@@ -7,12 +7,11 @@ export const SettingContainer = styled.div<{ theme?: ThemeMode }>`
   display: flex;
   flex-direction: column;
   flex: 1;
-  height: calc(100vh - var(--navbar-height));
-  padding: 20px;
+  height: calc(75vh - var(--navbar-height));
+  padding: 16px;
   padding-top: 15px;
   overflow-y: scroll;
   font-family: Ubuntu;
-  background: ${(props) => (props.theme === 'dark' ? 'transparent' : 'var(--color-background-soft)')};
 
   &::-webkit-scrollbar {
     display: none;

src/renderer/src/pages/translate/TranslatePage.tsx

@@ -1,6 +1,7 @@
 import { CheckOutlined, SendOutlined, SettingOutlined, SwapOutlined, WarningOutlined } from '@ant-design/icons'
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
 import CopyIcon from '@renderer/components/Icons/CopyIcon'
+import SettingsPopup from '@renderer/components/Popups/SettingsPopup'
 import { isLocalAi } from '@renderer/config/env'
 import { TranslateLanguageOptions } from '@renderer/config/translate'
 import db from '@renderer/databases'
@@ -90,9 +91,10 @@ const TranslatePage: FC = () => {
 
     if (translateModel) {
       return (
-        <Link to="/settings/model" style={{ color: 'var(--color-text-2)' }}>
-          <SettingOutlined />
-        </Link>
+        <SettingsPopup
+          activeTab="model"
+          actionButton={<Button type="text" shape="circle" icon={<SettingOutlined />} />}
+        />
       )
     }
 

src/renderer/src/services/KnowledgeService.ts

@@ -22,7 +22,9 @@ export const getKnowledgeBaseParams = (base: KnowledgeBase): KnowledgeBaseParams
     dimensions: base.dimensions,
     apiKey: aiProvider.getApiKey() || 'secret',
     apiVersion: provider.apiVersion,
-    baseURL: host
+    baseURL: host,
+    chunkSize: base.chunkSize,
+    chunkOverlap: base.chunkOverlap
   }
 }
 

src/renderer/src/services/MessagesService.ts

@@ -3,7 +3,7 @@ import { DEFAULT_CONTEXTCOUNT } from '@renderer/config/constant'
 import { getTopicById } from '@renderer/hooks/useTopic'
 import i18n from '@renderer/i18n'
 import store from '@renderer/store'
-import { Assistant, Message, Topic } from '@renderer/types'
+import { Assistant, Message, Model, Topic } from '@renderer/types'
 import { uuid } from '@renderer/utils'
 import { isEmpty, remove, takeRight } from 'lodash'
 import { NavigateFunction } from 'react-router'
@@ -153,3 +153,18 @@ export function getGroupedMessages(messages: Message[]): { [key: string]: (Messa
 export function getMessageModelId(message: Message) {
   return message?.model?.id || message.modelId
 }
+
+export function resetAssistantMessage(message: Message, model?: Model): Message {
+  return {
+    ...message,
+    model: model || message.model,
+    content: '',
+    status: 'sending',
+    translatedContent: undefined,
+    reasoning_content: undefined,
+    usage: undefined,
+    metrics: undefined,
+    metadata: undefined,
+    useful: undefined
+  }
+}

src/renderer/src/store/index.ts

@@ -30,7 +30,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 60,
+    version: 61,
     blacklist: ['runtime'],
     migrate
   },

src/renderer/src/store/migrate.ts

@@ -814,7 +814,7 @@ const migrateConfig = {
     state.llm.providers.push({
       id: 'qwenlm',
       name: 'QwenLM',
-      type: 'openai',
+      type: 'qwenlm',
       apiKey: '',
       apiHost: 'https://chat.qwenlm.ai/api/',
       models: SYSTEM_MODELS.qwenlm,
@@ -881,6 +881,14 @@ const migrateConfig = {
   '60': (state: RootState) => {
     state.settings.multiModelMessageStyle = 'fold'
     return state
+  },
+  '61': (state: RootState) => {
+    state.llm.providers.forEach((provider) => {
+      if (provider.id === 'qwenlm') {
+        provider.type = 'qwenlm'
+      }
+    })
+    return state
   }
 }
 

src/renderer/src/types/index.ts

@@ -53,6 +53,7 @@ export type Message = {
   createdAt: string
   status: 'sending' | 'pending' | 'success' | 'paused' | 'error'
   modelId?: string
+  model?: Model
   files?: FileType[]
   images?: string[]
   usage?: OpenAI.Completions.CompletionUsage
@@ -61,7 +62,6 @@ export type Message = {
   type: 'text' | '@' | 'clear'
   isPreset?: boolean
   mentions?: Model[]
-  model?: Model
   metadata?: {
     // Gemini
     groundingMetadata?: any
@@ -232,6 +232,8 @@ export interface KnowledgeBase {
   created_at: number
   updated_at: number
   version: number
+  chunkSize?: number
+  chunkOverlap?: number
 }
 
 export type KnowledgeBaseParams = {
@@ -241,6 +243,8 @@ export type KnowledgeBaseParams = {
   apiKey: string
   apiVersion?: string
   baseURL: string
+  chunkSize?: number
+  chunkOverlap?: number
 }
 
 export type GenerateImageParams = {

yarn.lock

@@ -1693,7 +1693,7 @@ __metadata:
 
 "@llm-tools/embedjs@patch:@llm-tools/embedjs@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch":
   version: 0.1.25
-  resolution: "@llm-tools/embedjs@patch:@llm-tools/embedjs@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch::version=0.1.25&hash=7b05b5"
+  resolution: "@llm-tools/embedjs@patch:@llm-tools/embedjs@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch::version=0.1.25&hash=3b8a9c"
   dependencies:
     "@langchain/textsplitters": "npm:^0.1.0"
     "@llm-tools/embedjs-interfaces": "npm:0.1.25"
@@ -1703,7 +1703,7 @@ __metadata:
     md5: "npm:^2.3.0"
     mime: "npm:^4.0.6"
     stream-mime-type: "npm:^2.0.0"
-  checksum: 10c0/d0a37a5c7232571a71eff7e90ff4ba612bf33022a6eccd933c3a778844320f427a936d0851aae00092e34407c8c2f3555fe4444c6f2139f978ecfdd42fd89375
+  checksum: 10c0/3ef5fb0068e662d9fc3ff794c0c200fca91fba548d1989a628ad2c3576e3f97838f3abca683adc77b1774d57e09c6d155c1c4b9d69eb20aac26bd274148f72a1
   languageName: node
   linkType: hard