chore(version): 0.6.4

.editorconfig

@@ -6,4 +6,4 @@ indent_style = space
 indent_size = 2
 end_of_line = lf
 insert_final_newline = true
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true

.gitignore

@@ -45,3 +45,6 @@ out
 # ENV
 .env
 .env.*
+
+# Local
+local

.yarn/patches/@electron-notarize-npm-2.3.2-535908a4bd.patch

@@ -0,0 +1,53 @@
+diff --git a/lib/check-signature.js b/lib/check-signature.js
+index 324568af71bcc4372c9f959131ecd24122848c86..677348e0a138ff608b2ac41f592d813b15ee4956 100644
+--- a/lib/check-signature.js
++++ b/lib/check-signature.js
+@@ -41,16 +41,12 @@ const spawn_1 = require("./spawn");
+ const debug_1 = __importDefault(require("debug"));
+ const d = (0, debug_1.default)('electron-notarize');
+ const codesignDisplay = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+-    const result = yield (0, spawn_1.spawn)('codesign', ['-dv', '-vvvv', '--deep', path.basename(opts.appPath)], {
+-        cwd: path.dirname(opts.appPath),
+-    });
++    const result = yield (0, spawn_1.spawn)('codesign', ['-dv', '-vvvv', '--deep', opts.appPath]);
+     return result;
+ });
+ const codesign = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+     d('attempting to check codesign of app:', opts.appPath);
+-    const result = yield (0, spawn_1.spawn)('codesign', ['-vvv', '--deep', '--strict', path.basename(opts.appPath)], {
+-        cwd: path.dirname(opts.appPath),
+-    });
++    const result = yield (0, spawn_1.spawn)('codesign', ['-vvv', '--deep', '--strict', opts.appPath]);
+     return result;
+ });
+ function checkSignatures(opts) {
+diff --git a/lib/notarytool.js b/lib/notarytool.js
+index 1ab090efb2101fc8bee5553445e0349c54474421..a5ddfd922197449fc56078e4a7e9a2ee5d8d207d 100644
+--- a/lib/notarytool.js
++++ b/lib/notarytool.js
+@@ -92,9 +92,7 @@ function notarizeAndWaitForNotaryTool(opts) {
+             else {
+                 filePath = path.resolve(dir, `${path.parse(opts.appPath).name}.zip`);
+                 d('zipping application to:', filePath);
+-                const zipResult = yield (0, spawn_1.spawn)('ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', path.basename(opts.appPath), filePath], {
+-                    cwd: path.dirname(opts.appPath),
+-                });
++                const zipResult = yield (0, spawn_1.spawn)('ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', opts.appPath, filePath]);
+                 if (zipResult.code !== 0) {
+                     throw new Error(`Failed to zip application, exited with code: ${zipResult.code}\n\n${zipResult.output}`);
+                 }
+diff --git a/lib/staple.js b/lib/staple.js
+index 47dbd85b2fc279d999b57f47fb8171e1cc674436..f8829e6ac54fcd630a730d12d75acc1591b953b6 100644
+--- a/lib/staple.js
++++ b/lib/staple.js
+@@ -43,9 +43,7 @@ const d = (0, debug_1.default)('electron-notarize:staple');
+ function stapleApp(opts) {
+     return __awaiter(this, void 0, void 0, function* () {
+         d('attempting to staple app:', opts.appPath);
+-        const result = yield (0, spawn_1.spawn)('xcrun', ['stapler', 'staple', '-v', path.basename(opts.appPath)], {
+-            cwd: path.dirname(opts.appPath),
+-        });
++        const result = yield (0, spawn_1.spawn)('xcrun', ['stapler', 'staple', '-v', opts.appPath]);
+         if (result.code !== 0) {
+             throw new Error(`Failed to staple your application with code: ${result.code}\n\n${result.output}`);
+         }

.yarnrc.yml

@@ -1,2 +1,5 @@
-nodeLinker: node-modules
+enableImmutableInstalls: false
+
 httpTimeout: 300000
+
+nodeLinker: node-modules

electron-builder.yml

@@ -3,12 +3,13 @@ productName: Cherry Studio
 directories:
   buildResources: build
 files:
-  - '!**/.vscode/*'
-  - '!src/*'
+  - '!{.vscode,.yarn,.github}'
   - '!electron.vite.config.{js,ts,mjs,cjs}'
   - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
   - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
+  - '!src/*'
+  - '!local'
 asarUnpack:
   - resources/**
 win:
@@ -56,5 +57,6 @@ electronDownload:
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    增加应用备份和恢复功能
-    增加更多AI小程序
+    智能助理和消息列表合并
+    优化输入框样式
+    提升小程序稳定性

electron.vite.config.ts

@@ -4,7 +4,12 @@ import { resolve } from 'path'
 
 export default defineConfig({
   main: {
-    plugins: [externalizeDepsPlugin()]
+    plugins: [externalizeDepsPlugin()],
+    resolve: {
+      alias: {
+        ollama: resolve('ollama/src')
+      }
+    }
   },
   preload: {
     plugins: [externalizeDepsPlugin()]

package.json

@@ -1,10 +1,16 @@
 {
-  "name": "cherry-studio",
-  "version": "0.6.1",
+  "name": "CherryStudio",
+  "version": "0.6.4",
+  "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
   "author": "kangfenmao@qq.com",
   "homepage": "https://github.com/kangfenmao/cherry-studio",
+  "workspaces": {
+    "packages": [
+      "local"
+    ]
+  },
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
@@ -25,12 +31,10 @@
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "@sentry/electron": "^5.2.0",
     "electron-log": "^5.1.5",
     "electron-store": "^8.2.0",
     "electron-updater": "^6.1.7",
-    "electron-window-state": "^5.0.3",
-    "eslint-plugin-simple-import-sort": "^12.1.1"
+    "electron-window-state": "^5.0.3"
   },
   "devDependencies": {
     "@anthropic-ai/sdk": "^0.24.3",
@@ -51,15 +55,15 @@
     "browser-image-compression": "^2.0.2",
     "dayjs": "^1.11.11",
     "dotenv-cli": "^7.4.2",
-    "electron": "^28.2.0",
+    "electron": "^28.3.3",
     "electron-builder": "^24.9.1",
-    "electron-devtools-installer": "^3.2.0",
     "electron-vite": "^2.0.0",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
     "eslint": "^8.56.0",
     "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.0.0",
     "gpt-tokens": "^1.3.6",
     "i18next": "^23.11.5",
@@ -76,6 +80,7 @@
     "react-router-dom": "6",
     "react-spinners": "^0.14.1",
     "react-syntax-highlighter": "^15.5.0",
+    "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "rehype-katex": "^7.0.0",
     "remark-gfm": "^4.0.0",
@@ -91,7 +96,8 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "resolutions": {
-    "@electron/notarize": "2.3.2"
+    "@electron/notarize": "2.3.2",
+    "@electron/notarize@npm:2.2.1": "patch:@electron/notarize@npm%3A2.3.2#~/.yarn/patches/@electron-notarize-npm-2.3.2-535908a4bd.patch"
   },
   "packageManager": "yarn@4.3.1"
 }

src/main/index.ts

@@ -1,15 +1,16 @@
 import { electronApp, optimizer } from '@electron-toolkit/utils'
-import * as Sentry from '@sentry/electron/main'
 import { app, BrowserWindow } from 'electron'
-import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
+import { updateUserDataPath } from './utils/upgrade'
 import { createMainWindow } from './window'
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
+app.whenReady().then(async () => {
+  await updateUserDataPath()
+
   // Set app user model id for windows
   electronApp.setAppUserModelId('com.kangfenmao.CherryStudio')
 
@@ -29,8 +30,6 @@ app.whenReady().then(() => {
   const mainWindow = createMainWindow()
 
   registerIpc(mainWindow, app)
-
-  installExtension(REDUX_DEVTOOLS)
 })
 
 // Quit when all windows are closed, except on macOS. There, it's common
@@ -44,6 +43,3 @@ app.on('window-all-closed', () => {
 
 // In this file you can include the rest of your app"s specific main process
 // code. You can also put them in separate files and require them here.
-Sentry.init({
-  dsn: 'https://f0e972deff79c2df3e887e232d8a46a3@o4507610668007424.ingest.us.sentry.io/4507610670563328'
-})

src/main/ipc.ts

@@ -50,7 +50,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // 触发检查更新(此方法用于被渲染线程调用，例如页面点击检查更新按钮来调用此方法)
   ipcMain.handle('check-for-update', async () => {
-    autoUpdater.logger?.info('触发检查更新')
     return {
       currentVersion: autoUpdater.currentVersion,
       update: await autoUpdater.checkForUpdates()

src/main/updater.ts

@@ -17,11 +17,6 @@ export default class AppUpdater {
       mainWindow.webContents.send('update-error', error)
     })
 
-    // 检测是否需要更新
-    autoUpdater.on('checking-for-update', () => {
-      logger.info('正在检查更新……')
-    })
-
     autoUpdater.on('update-available', (releaseInfo: UpdateInfo) => {
       autoUpdater.logger?.info('检测到新版本，确认是否下载')
       mainWindow.webContents.send('update-available', releaseInfo)
@@ -59,7 +54,6 @@ export default class AppUpdater {
 
     // 检测到不需要更新时
     autoUpdater.on('update-not-available', () => {
-      logger.info('现在使用的就是最新版本，不用更新')
       mainWindow.webContents.send('update-not-available')
     })
 

src/main/utils/upgrade.ts

@@ -0,0 +1,77 @@
+import { spawn } from 'child_process'
+import { app, dialog } from 'electron'
+import Logger from 'electron-log'
+import fs from 'fs'
+import path from 'path'
+
+export async function updateUserDataPath() {
+  const currentPath = app.getPath('userData')
+  const oldPath = currentPath.replace('CherryStudio', 'cherry-studio')
+
+  if (currentPath !== oldPath && fs.existsSync(oldPath)) {
+    Logger.log('Update userData path')
+
+    try {
+      if (process.platform === 'win32') {
+        // Windows 系统：创建 bat 文件
+        const batPath = await createWindowsBatFile(oldPath, currentPath)
+        await promptRestartAndExecute(batPath)
+      } else {
+        // 其他系统：直接更新
+        fs.rmSync(currentPath, { recursive: true, force: true })
+        fs.renameSync(oldPath, currentPath)
+        Logger.log(`Directory renamed: ${currentPath}`)
+        await promptRestart()
+      }
+    } catch (error: any) {
+      Logger.error('Error updating userData path:', error)
+      dialog.showErrorBox('错误', `更新用户数据目录时发生错误: ${error.message}`)
+    }
+  } else {
+    Logger.log('userData path does not need to be updated')
+  }
+}
+
+async function createWindowsBatFile(oldPath: string, currentPath: string): Promise<string> {
+  const batPath = path.join(app.getPath('temp'), 'rename_userdata.bat')
+  const appPath = app.getPath('exe')
+  const batContent = `
+@echo off
+timeout /t 2 /nobreak
+rmdir /s /q "${currentPath}"
+rename "${oldPath}" "${path.basename(currentPath)}"
+start "" "${appPath}"
+del "%~f0"
+  `
+  fs.writeFileSync(batPath, batContent)
+  return batPath
+}
+
+async function promptRestartAndExecute(batPath: string) {
+  await dialog.showMessageBox({
+    type: 'info',
+    title: '应用需要重启',
+    message: '用户数据目录将在重启后更新。请重启应用以应用更改。',
+    buttons: ['手动重启']
+  })
+
+  // 执行 bat 文件
+  spawn('cmd.exe', ['/c', batPath], {
+    detached: true,
+    stdio: 'ignore'
+  })
+
+  app.exit(0)
+}
+
+async function promptRestart() {
+  await dialog.showMessageBox({
+    type: 'info',
+    title: '应用需要重启',
+    message: '用户数据目录已更新。请重启应用以应用更改。',
+    buttons: ['重启']
+  })
+
+  app.relaunch()
+  app.exit(0)
+}

src/main/utils/zip.ts

@@ -1,6 +1,8 @@
 import util from 'node:util'
 import zlib from 'node:zlib'
 
+import logger from 'electron-log'
+
 // 将 zlib 的 gzip 和 gunzip 方法转换为 Promise 版本
 const gzipPromise = util.promisify(zlib.gzip)
 const gunzipPromise = util.promisify(zlib.gunzip)
@@ -16,7 +18,7 @@ export async function compress(str) {
     const compressedBuffer = await gzipPromise(buffer)
     return compressedBuffer
   } catch (error) {
-    console.error('Compression failed:', error)
+    logger.error('Compression failed:', error)
     throw error
   }
 }
@@ -31,7 +33,7 @@ export async function decompress(compressedBuffer) {
     const buffer = await gunzipPromise(compressedBuffer)
     return buffer.toString('utf-8')
   } catch (error) {
-    console.error('Decompression failed:', error)
+    logger.error('Decompression failed:', error)
     throw error
   }
 }

src/main/window.ts

@@ -34,7 +34,8 @@ export function createMainWindow() {
     webPreferences: {
       preload: join(__dirname, '../preload/index.js'),
       sandbox: false,
-      webSecurity: false
+      webSecurity: false,
+      webviewTag: true
       // devTools: !app.isPackaged,
     }
   })

src/renderer/index.html

@@ -2,7 +2,6 @@
 <html lang="zh-CN">
   <head>
     <meta charset="UTF-8" />
-    <title>Cherry Studio</title>
     <meta name="viewport" content="initial-scale=1, width=device-width" />
     <meta
       http-equiv="Content-Security-Policy"

src/renderer/src/App.tsx

@@ -5,13 +5,13 @@ import { PersistGate } from 'redux-persist/integration/react'
 
 import Sidebar from './components/app/Sidebar'
 import TopViewContainer from './components/TopView'
+import AntdProvider from './context/AntdProvider'
+import { ThemeProvider } from './context/ThemeProvider'
 import AgentsPage from './pages/agents/AgentsPage'
 import AppsPage from './pages/apps/AppsPage'
 import HomePage from './pages/home/HomePage'
 import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
-import AntdProvider from './providers/AntdProvider'
-import { ThemeProvider } from './providers/ThemeProvider'
 
 function App(): JSX.Element {
   return (

src/renderer/src/assets/styles/scrollbar.scss

@@ -10,6 +10,7 @@
 
 ::-webkit-scrollbar-thumb {
   background: var(--color-scrollbar-thumb);
+  border-radius: 5px;
   &:hover {
     background: var(--color-scrollbar-thumb-hover);
   }

src/renderer/src/components/EmojiPicker/index.tsx

@@ -1,4 +1,4 @@
-import { useTheme } from '@renderer/providers/ThemeProvider'
+import { useTheme } from '@renderer/context/ThemeProvider'
 import { FC, useEffect, useRef } from 'react'
 
 interface Props {

src/renderer/src/components/MinApp/index.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-unknown-property */
 import { CloseOutlined, ExportOutlined, ReloadOutlined } from '@ant-design/icons'
 import { isMac, isWindows } from '@renderer/config/constant'
 import { useBridge } from '@renderer/hooks/useBridge'
@@ -5,7 +6,8 @@ import store from '@renderer/store'
 import { setMinappShow } from '@renderer/store/runtime'
 import { MinAppType } from '@renderer/types'
 import { Drawer } from 'antd'
-import { useRef, useState } from 'react'
+import { WebviewTag } from 'electron'
+import { useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 
 import { TopView } from '../TopView'
@@ -17,7 +19,7 @@ interface Props {
 
 const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
   const [open, setOpen] = useState(true)
-  const iframeRef = useRef<HTMLIFrameElement>(null)
+  const webviewRef = useRef<WebviewTag | null>(null)
 
   useBridge()
 
@@ -29,8 +31,8 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
   }
 
   const onReload = () => {
-    if (iframeRef.current) {
-      iframeRef.current.src = app.url
+    if (webviewRef.current) {
+      webviewRef.current.src = app.url
     }
   }
 
@@ -59,6 +61,27 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
     )
   }
 
+  useEffect(() => {
+    const webview = webviewRef.current
+
+    if (webview) {
+      const handleNewWindow = (event: any) => {
+        event.preventDefault()
+        if (webview.loadURL) {
+          webview.loadURL(event.url)
+        }
+      }
+
+      webview.addEventListener('new-window', handleNewWindow)
+
+      return () => {
+        webview.removeEventListener('new-window', handleNewWindow)
+      }
+    }
+
+    return () => {}
+  }, [])
+
   return (
     <Drawer
       title={<Title />}
@@ -72,17 +95,17 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
       maskClosable={false}
       closeIcon={null}
       style={{ marginLeft: 'var(--sidebar-width)' }}>
-      <Frame src={app.url} ref={iframeRef} />
+      <webview src={app.url} ref={webviewRef} style={WebviewStyle} allowpopups={'true' as any} />
     </Drawer>
   )
 }
 
-const Frame = styled.iframe`
-  width: calc(100vw - var(--sidebar-width));
-  height: calc(100vh - var(--navbar-height));
-  border: none;
-  background-color: white;
-`
+const WebviewStyle: React.CSSProperties = {
+  width: 'calc(100vw - var(--sidebar-width))',
+  height: 'calc(100vh - var(--navbar-height))',
+  backgroundColor: 'white',
+  display: 'inline-flex'
+}
 
 const TitleContainer = styled.div`
   display: flex;

src/renderer/src/components/Popups/AddAssistantPopup.tsx

@@ -25,24 +25,30 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
     () => ({
       id: defaultAssistant.id,
       name: defaultAssistant.name,
-      emoji: '',
+      emoji: defaultAssistant.emoji || '',
       prompt: defaultAssistant.prompt,
       group: 'system'
     }),
-    [defaultAssistant.id, defaultAssistant.name, defaultAssistant.prompt]
+    [defaultAssistant.emoji, defaultAssistant.id, defaultAssistant.name, defaultAssistant.prompt]
   )
 
   const agents = useMemo(() => {
-    const allAgents = [defaultAgent, ...userAgents, ...systemAgents] as Agent[]
-    const list = allAgents.filter((agent) => !assistants.map((a) => a.id).includes(agent.id))
+    const allAgents = [...userAgents, ...systemAgents] as Agent[]
+    const list = [defaultAgent, ...allAgents.filter((agent) => !assistants.map((a) => a.id).includes(agent.id))]
     return searchText
       ? list.filter((agent) => agent.name.toLowerCase().includes(searchText.trim().toLocaleLowerCase()))
       : list
   }, [assistants, defaultAgent, searchText, userAgents])
 
   const onCreateAssistant = (agent: Agent) => {
-    if (assistants.map((a) => a.id).includes(String(agent.id))) return
+    if (agent.id !== 'default') {
+      if (assistants.map((a) => a.id).includes(String(agent.id))) {
+        return
+      }
+    }
+
     const assistant = covertAgentToAssistant(agent)
+
     addAssistant(assistant)
     resolve(assistant)
     setOpen(false)

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

@@ -1,11 +1,12 @@
 import { TranslationOutlined } from '@ant-design/icons'
-import Logo from '@renderer/assets/images/logo.png'
 import { isMac } from '@renderer/config/constant'
+import { isLocalAi, UserAvatar } from '@renderer/config/env'
 import useAvatar from '@renderer/hooks/useAvatar'
-import { useRuntime } from '@renderer/hooks/useStore'
+import { useRuntime, useShowAssistants } from '@renderer/hooks/useStore'
 import { Avatar } from 'antd'
 import { FC } from 'react'
-import { Link, useLocation } from 'react-router-dom'
+import { useTranslation } from 'react-i18next'
+import { useLocation, useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
 import UserPopup from '../Popups/UserPopup'
@@ -16,34 +17,48 @@ const Sidebar: FC = () => {
   const { pathname } = useLocation()
   const avatar = useAvatar()
   const { minappShow } = useRuntime()
+  const { toggleShowAssistants } = useShowAssistants()
+  const { generating } = useRuntime()
+  const { t } = useTranslation()
+  const navigate = useNavigate()
 
   const isRoute = (path: string): string => (pathname === path ? 'active' : '')
 
-  const onEditUser = () => {
-    UserPopup.show()
+  const onEditUser = () => UserPopup.show()
+
+  const to = (path: string) => {
+    if (generating) {
+      window.message.warning({ content: t('message.switch.disabled'), key: 'switch-assistant' })
+      return
+    }
+    navigate(path)
+  }
+
+  const onToggleShowAssistants = () => {
+    pathname === '/' ? toggleShowAssistants() : navigate('/')
   }
 
   return (
     <Container style={{ backgroundColor: minappShow ? 'var(--navbar-background)' : sidebarBackgroundColor }}>
-      <AvatarImg src={avatar || Logo} draggable={false} className="nodrag" onClick={onEditUser} />
+      <AvatarImg src={avatar || UserAvatar} draggable={false} className="nodrag" onClick={onEditUser} />
       <MainMenus>
         <Menus>
-          <StyledLink to="/">
+          <StyledLink onClick={onToggleShowAssistants}>
             <Icon className={isRoute('/')}>
               <i className="iconfont icon-chat"></i>
             </Icon>
           </StyledLink>
-          <StyledLink to="/agents">
+          <StyledLink onClick={() => to('/agents')}>
             <Icon className={isRoute('/agents')}>
               <i className="iconfont icon-business-smart-assistant"></i>
             </Icon>
           </StyledLink>
-          <StyledLink to="/translate">
+          <StyledLink onClick={() => to('/translate')}>
             <Icon className={isRoute('/translate')}>
               <TranslationOutlined />
             </Icon>
           </StyledLink>
-          <StyledLink to="/apps">
+          <StyledLink onClick={() => to('/apps')}>
             <Icon className={isRoute('/apps')}>
               <i className="iconfont icon-appstore"></i>
             </Icon>
@@ -51,7 +66,7 @@ const Sidebar: FC = () => {
         </Menus>
       </MainMenus>
       <Menus>
-        <StyledLink to="/settings/provider">
+        <StyledLink onClick={() => to(isLocalAi ? '/settings/assistant' : '/settings/provider')}>
           <Icon className={pathname.startsWith('/settings') ? 'active' : ''}>
             <i className="iconfont icon-setting"></i>
           </Icon>
@@ -133,7 +148,7 @@ const Icon = styled.div`
   }
 `
 
-const StyledLink = styled(Link)`
+const StyledLink = styled.div`
   text-decoration: none;
   -webkit-app-region: none;
   &* {

src/renderer/src/config/env.ts

@@ -0,0 +1,6 @@
+export { default as UserAvatar } from '@renderer/assets/images/avatar.png'
+export { default as AppLogo } from '@renderer/assets/images/logo.png'
+
+export const APP_NAME = 'Cherry Studio'
+
+export const isLocalAi = false

src/renderer/src/config/models.ts

@@ -1,36 +1,66 @@
 import { Model } from '@renderer/types'
 
-type SystemModel = Model & { enabled: boolean }
+const TEXT_TO_IMAGE_REGEX = /flux|diffusion|stabilityai|sd-turbo|dall|cogview/i
+const EMBEDDING_REGEX = /embedding/i
 
-export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
+export const SYSTEM_MODELS: Record<string, Model[]> = {
+  ollama: [],
+  silicon: [
+    {
+      id: 'Qwen/Qwen2-7B-Instruct',
+      provider: 'silicon',
+      name: 'Qwen2-7B-Instruct',
+      group: 'Qwen2'
+    },
+    {
+      id: 'Qwen/Qwen2-72B-Instruct',
+      provider: 'silicon',
+      name: 'Qwen2-72B-Instruct',
+      group: 'Qwen2'
+    },
+    {
+      id: 'THUDM/glm-4-9b-chat',
+      provider: 'silicon',
+      name: 'GLM-4-9B-Chat',
+      group: 'GLM'
+    },
+    {
+      id: 'deepseek-ai/DeepSeek-V2-Chat',
+      provider: 'silicon',
+      name: 'DeepSeek-V2-Chat',
+      group: 'DeepSeek'
+    },
+    {
+      id: 'deepseek-ai/DeepSeek-Coder-V2-Instruct',
+      provider: 'silicon',
+      name: 'DeepSeek-Coder-V2-Instruct',
+      group: 'DeepSeek'
+    }
+  ],
   openai: [
     {
       id: 'gpt-4o',
       provider: 'openai',
       name: ' GPT-4o',
-      group: 'GPT 4o',
-      enabled: true
+      group: 'GPT 4o'
     },
     {
       id: 'gpt-4o-mini',
       provider: 'openai',
       name: ' GPT-4o-mini',
-      group: 'GPT 4o',
-      enabled: true
+      group: 'GPT 4o'
     },
     {
       id: 'gpt-4-turbo',
       provider: 'openai',
       name: ' GPT-4 Turbo',
-      group: 'GPT 4',
-      enabled: true
+      group: 'GPT 4'
     },
     {
       id: 'gpt-4',
       provider: 'openai',
       name: ' GPT-4',
-      group: 'GPT 4',
-      enabled: true
+      group: 'GPT 4'
     }
   ],
   gemini: [
@@ -38,129 +68,39 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'gemini-1.5-flash',
       provider: 'gemini',
       name: 'Gemini 1.5 Flash',
-      group: 'Gemini 1.5',
-      enabled: true
+      group: 'Gemini 1.5'
     },
     {
       id: 'gemini-1.5-pro-exp-0801',
       provider: 'gemini',
       name: 'Gemini 1.5 Pro Experimental 0801',
-      group: 'Gemini 1.5',
-      enabled: true
+      group: 'Gemini 1.5'
     }
   ],
-  silicon: [
+  anthropic: [
     {
-      id: 'Qwen/Qwen2-7B-Instruct',
-      provider: 'silicon',
-      name: 'Qwen2-7B-Instruct',
-      group: 'Qwen2',
-      enabled: true
+      id: 'claude-3-5-sonnet-20240620',
+      provider: 'anthropic',
+      name: 'Claude 3.5 Sonnet',
+      group: 'Claude 3.5'
     },
     {
-      id: 'Qwen/Qwen2-1.5B-Instruct',
-      provider: 'silicon',
-      name: 'Qwen2-1.5B-Instruct',
-      group: 'Qwen2',
-      enabled: false
+      id: 'claude-3-opus-20240229',
+      provider: 'anthropic',
+      name: 'Claude 3 Opus',
+      group: 'Claude 3'
     },
     {
-      id: 'Qwen/Qwen1.5-7B-Chat',
-      provider: 'silicon',
-      name: 'Qwen1.5-7B-Chat',
-      group: 'Qwen1.5',
-      enabled: false
+      id: 'claude-3-sonnet-20240229',
+      provider: 'anthropic',
+      name: 'Claude 3 Sonnet',
+      group: 'Claude 3'
     },
     {
-      id: 'Qwen/Qwen2-72B-Instruct',
-      provider: 'silicon',
-      name: 'Qwen2-72B-Instruct',
-      group: 'Qwen2',
-      enabled: true
-    },
-    {
-      id: 'Qwen/Qwen2-57B-A14B-Instruct',
-      provider: 'silicon',
-      name: 'Qwen2-57B-A14B-Instruct',
-      group: 'Qwen2',
-      enabled: false
-    },
-    {
-      id: 'Qwen/Qwen1.5-110B-Chat',
-      provider: 'silicon',
-      name: 'Qwen1.5-110B-Chat',
-      group: 'Qwen1.5',
-      enabled: false
-    },
-    {
-      id: 'Qwen/Qwen1.5-32B-Chat',
-      provider: 'silicon',
-      name: 'Qwen1.5-32B-Chat',
-      group: 'Qwen1.5',
-      enabled: false
-    },
-    {
-      id: 'Qwen/Qwen1.5-14B-Chat',
-      provider: 'silicon',
-      name: 'Qwen1.5-14B-Chat',
-      group: 'Qwen1.5',
-      enabled: false
-    },
-    {
-      id: 'deepseek-ai/DeepSeek-V2-Chat',
-      provider: 'silicon',
-      name: 'DeepSeek-V2-Chat',
-      group: 'DeepSeek',
-      enabled: false
-    },
-    {
-      id: 'deepseek-ai/DeepSeek-Coder-V2-Instruct',
-      provider: 'silicon',
-      name: 'DeepSeek-Coder-V2-Instruct',
-      group: 'DeepSeek',
-      enabled: false
-    },
-    {
-      id: 'deepseek-ai/deepseek-llm-67b-chat',
-      provider: 'silicon',
-      name: 'Deepseek-LLM-67B-Chat',
-      group: 'DeepSeek',
-      enabled: false
-    },
-    {
-      id: 'THUDM/glm-4-9b-chat',
-      provider: 'silicon',
-      name: 'GLM-4-9B-Chat',
-      group: 'GLM',
-      enabled: true
-    },
-    {
-      id: 'THUDM/chatglm3-6b',
-      provider: 'silicon',
-      name: 'GhatGLM3-6B',
-      group: 'GLM',
-      enabled: false
-    },
-    {
-      id: '01-ai/Yi-1.5-9B-Chat-16K',
-      provider: 'silicon',
-      name: 'Yi-1.5-9B-Chat-16K',
-      group: 'Yi',
-      enabled: false
-    },
-    {
-      id: '01-ai/Yi-1.5-6B-Chat',
-      provider: 'silicon',
-      name: 'Yi-1.5-6B-Chat',
-      group: 'Yi',
-      enabled: false
-    },
-    {
-      id: '01-ai/Yi-1.5-34B-Chat-16K',
-      provider: 'silicon',
-      name: 'Yi-1.5-34B-Chat-16K',
-      group: 'Yi',
-      enabled: false
+      id: 'claude-3-haiku-20240307',
+      provider: 'anthropic',
+      name: 'Claude 3 Haiku',
+      group: 'Claude 3'
     }
   ],
   deepseek: [
@@ -168,15 +108,13 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'deepseek-chat',
       provider: 'deepseek',
       name: 'DeepSeek Chat',
-      group: 'DeepSeek Chat',
-      enabled: true
+      group: 'DeepSeek Chat'
     },
     {
       id: 'deepseek-coder',
       provider: 'deepseek',
       name: 'DeepSeek Coder',
-      group: 'DeepSeek Coder',
-      enabled: true
+      group: 'DeepSeek Coder'
     }
   ],
   yi: [
@@ -184,87 +122,87 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'yi-large',
       provider: 'yi',
       name: 'Yi-Large',
-      group: 'Yi',
-      enabled: false
+      group: 'Yi'
     },
     {
       id: 'yi-large-turbo',
       provider: 'yi',
       name: 'Yi-Large-Turbo',
-      group: 'Yi',
-      enabled: true
+      group: 'Yi'
     },
     {
       id: 'yi-large-rag',
       provider: 'yi',
       name: 'Yi-Large-Rag',
-      group: 'Yi',
-      enabled: false
+      group: 'Yi'
     },
     {
       id: 'yi-medium',
       provider: 'yi',
       name: 'Yi-Medium',
-      group: 'Yi',
-      enabled: true
+      group: 'Yi'
     },
     {
       id: 'yi-medium-200k',
       provider: 'yi',
       name: 'Yi-Medium-200k',
-      group: 'Yi',
-      enabled: false
+      group: 'Yi'
     },
     {
       id: 'yi-spark',
       provider: 'yi',
       name: 'Yi-Spark',
-      group: 'Yi',
-      enabled: false
+      group: 'Yi'
     }
   ],
   zhipu: [
-    {
-      id: 'glm-4-0520',
-      provider: 'zhipu',
-      name: 'GLM-4-0520',
-      group: 'GLM',
-      enabled: true
-    },
     {
       id: 'glm-4',
       provider: 'zhipu',
       name: 'GLM-4',
-      group: 'GLM',
-      enabled: false
+      group: 'GLM-4'
     },
     {
-      id: 'glm-4-airx',
+      id: 'glm-4-plus',
       provider: 'zhipu',
-      name: 'GLM-4-AirX',
-      group: 'GLM',
-      enabled: false
+      name: 'GLM-4-Plus',
+      group: 'GLM-4'
     },
     {
       id: 'glm-4-air',
       provider: 'zhipu',
       name: 'GLM-4-Air',
-      group: 'GLM',
-      enabled: true
+      group: 'GLM-4'
+    },
+    {
+      id: 'glm-4-airx',
+      provider: 'zhipu',
+      name: 'GLM-4-AirX',
+      group: 'GLM-4'
+    },
+    {
+      id: 'glm-4-flash',
+      provider: 'zhipu',
+      name: 'GLM-4-Flash',
+      group: 'GLM-4'
     },
     {
       id: 'glm-4v',
       provider: 'zhipu',
-      name: 'GLM-4V',
-      group: 'GLM',
-      enabled: false
+      name: 'GLM 4V',
+      group: 'GLM-4v'
+    },
+    {
+      id: 'glm-4v-plus',
+      provider: 'zhipu',
+      name: 'GLM-4V-Plus',
+      group: 'GLM-4v'
     },
     {
       id: 'glm-4-alltools',
       provider: 'zhipu',
       name: 'GLM-4-AllTools',
-      group: 'GLM',
-      enabled: false
+      group: 'GLM-4-AllTools'
     }
   ],
   moonshot: [
@@ -272,22 +210,19 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'moonshot-v1-8k',
       provider: 'moonshot',
       name: 'Moonshot V1 8k',
-      group: 'Moonshot V1',
-      enabled: true
+      group: 'Moonshot V1'
     },
     {
       id: 'moonshot-v1-32k',
       provider: 'moonshot',
       name: 'Moonshot V1 32k',
-      group: 'Moonshot V1',
-      enabled: true
+      group: 'Moonshot V1'
     },
     {
       id: 'moonshot-v1-128k',
       provider: 'moonshot',
       name: 'Moonshot V1 128k',
-      group: 'Moonshot V1',
-      enabled: true
+      group: 'Moonshot V1'
     }
   ],
   baichuan: [
@@ -295,22 +230,19 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'Baichuan4',
       provider: 'baichuan',
       name: 'Baichuan4',
-      group: 'Baichuan4',
-      enabled: true
+      group: 'Baichuan4'
     },
     {
       id: 'Baichuan3-Turbo',
       provider: 'baichuan',
       name: 'Baichuan3 Turbo',
-      group: 'Baichuan3',
-      enabled: true
+      group: 'Baichuan3'
     },
     {
       id: 'Baichuan3-Turbo-128k',
       provider: 'baichuan',
       name: 'Baichuan3 Turbo 128k',
-      group: 'Baichuan3',
-      enabled: true
+      group: 'Baichuan3'
     }
   ],
   dashscope: [
@@ -318,22 +250,19 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'qwen-turbo',
       provider: 'dashscope',
       name: 'Qwen Turbo',
-      group: 'Qwen',
-      enabled: true
+      group: 'Qwen'
     },
     {
       id: 'qwen-plus',
       provider: 'dashscope',
       name: 'Qwen Plus',
-      group: 'Qwen',
-      enabled: true
+      group: 'Qwen'
     },
     {
       id: 'qwen-max',
       provider: 'dashscope',
       name: 'Qwen Max',
-      group: 'Qwen',
-      enabled: true
+      group: 'Qwen'
     }
   ],
   stepfun: [
@@ -341,15 +270,13 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'step-1-8k',
       provider: 'stepfun',
       name: 'Step 1 8K',
-      group: 'Step 1',
-      enabled: true
+      group: 'Step 1'
     },
     {
       id: 'step-1-flash',
       provider: 'stepfun',
       name: 'Step 1 Flash',
-      group: 'Step 1',
-      enabled: true
+      group: 'Step 1'
     }
   ],
   doubao: [],
@@ -358,29 +285,25 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'abab6.5s-chat',
       provider: 'minimax',
       name: 'abab6.5s',
-      group: 'abab6',
-      enabled: true
+      group: 'abab6'
     },
     {
       id: 'abab6.5g-chat',
       provider: 'minimax',
       name: 'abab6.5g',
-      group: 'abab6',
-      enabled: true
+      group: 'abab6'
     },
     {
       id: 'abab6.5t-chat',
       provider: 'minimax',
       name: 'abab6.5t',
-      group: 'abab6',
-      enabled: true
+      group: 'abab6'
     },
     {
       id: 'abab5.5s-chat',
       provider: 'minimax',
       name: 'abab5.5s',
-      group: 'abab5',
-      enabled: true
+      group: 'abab5'
     }
   ],
   aihubmix: [
@@ -388,15 +311,13 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'gpt-4o-mini',
       provider: 'aihubmix',
       name: 'GPT-4o Mini',
-      group: 'GPT-4o',
-      enabled: true
+      group: 'GPT-4o'
     },
     {
       id: 'aihubmix-Llama-3-70B-Instruct',
       provider: 'aihubmix',
       name: 'Llama 3 70B Instruct',
-      group: 'Llama3',
-      enabled: true
+      group: 'Llama3'
     }
   ],
   openrouter: [
@@ -404,36 +325,31 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'google/gemma-2-9b-it:free',
       provider: 'openrouter',
       name: 'Google: Gemma 2 9B',
-      group: 'Gemma',
-      enabled: true
+      group: 'Gemma'
     },
     {
       id: 'microsoft/phi-3-mini-128k-instruct:free',
       provider: 'openrouter',
       name: 'Phi-3 Mini 128K Instruct',
-      group: 'Phi',
-      enabled: true
+      group: 'Phi'
     },
     {
       id: 'microsoft/phi-3-medium-128k-instruct:free',
       provider: 'openrouter',
       name: 'Phi-3 Medium 128K Instruct',
-      group: 'Phi',
-      enabled: true
+      group: 'Phi'
     },
     {
       id: 'meta-llama/llama-3-8b-instruct:free',
       provider: 'openrouter',
       name: 'Meta: Llama 3 8B Instruct',
-      group: 'Llama3',
-      enabled: true
+      group: 'Llama3'
     },
     {
       id: 'mistralai/mistral-7b-instruct:free',
       provider: 'openrouter',
       name: 'Mistral: Mistral 7B Instruct',
-      group: 'Mistral',
-      enabled: true
+      group: 'Mistral'
     }
   ],
   groq: [
@@ -441,59 +357,33 @@ export const SYSTEM_MODELS: Record<string, SystemModel[]> = {
       id: 'llama3-8b-8192',
       provider: 'groq',
       name: 'LLaMA3 8B',
-      group: 'Llama3',
-      enabled: false
+      group: 'Llama3'
     },
     {
       id: 'llama3-70b-8192',
       provider: 'groq',
       name: 'LLaMA3 70B',
-      group: 'Llama3',
-      enabled: true
+      group: 'Llama3'
     },
     {
       id: 'mixtral-8x7b-32768',
       provider: 'groq',
       name: 'Mixtral 8x7B',
-      group: 'Mixtral',
-      enabled: false
+      group: 'Mixtral'
     },
     {
       id: 'gemma-7b-it',
       provider: 'groq',
       name: 'Gemma 7B',
-      group: 'Gemma',
-      enabled: false
-    }
-  ],
-  anthropic: [
-    {
-      id: 'claude-3-5-sonnet-20240620',
-      provider: 'anthropic',
-      name: 'Claude 3.5 Sonnet',
-      group: 'Claude 3.5',
-      enabled: true
-    },
-    {
-      id: 'claude-3-opus-20240229',
-      provider: 'anthropic',
-      name: 'Claude 3 Opus',
-      group: 'Claude 3',
-      enabled: true
-    },
-    {
-      id: 'claude-3-sonnet-20240229',
-      provider: 'anthropic',
-      name: 'Claude 3 Sonnet',
-      group: 'Claude 3',
-      enabled: true
-    },
-    {
-      id: 'claude-3-haiku-20240307',
-      provider: 'anthropic',
-      name: 'Claude 3 Haiku',
-      group: 'Claude 3',
-      enabled: true
+      group: 'Gemma'
     }
   ]
 }
+
+export function isTextToImageModel(model: Model): boolean {
+  return TEXT_TO_IMAGE_REGEX.test(model.id)
+}
+
+export function isEmbeddingModel(model: Model): boolean {
+  return EMBEDDING_REGEX.test(model.id)
+}

src/renderer/src/config/provider.ts

@@ -2,7 +2,7 @@ import BaicuanAppLogo from '@renderer/assets/images/apps/baixiaoying.webp'
 import KimiAppLogo from '@renderer/assets/images/apps/kimi.jpg'
 import YuewenAppLogo from '@renderer/assets/images/apps/yuewen.png'
 import BaichuanModelLogo from '@renderer/assets/images/models/baichuan.png'
-import ChatGLMModelLogo from '@renderer/assets/images/models/chatglm.jpeg'
+import ChatGLMModelLogo from '@renderer/assets/images/models/chatglm.png'
 import ChatGPTModelLogo from '@renderer/assets/images/models/chatgpt.jpeg'
 import ClaudeModelLogo from '@renderer/assets/images/models/claude.png'
 import DeepSeekModelLogo from '@renderer/assets/images/models/deepseek.png'

src/renderer/src/env.d.ts

@@ -4,6 +4,14 @@ import type KeyvStorage from '@kangfenmao/keyv-storage'
 import { MessageInstance } from 'antd/es/message/interface'
 import { HookAPI } from 'antd/es/modal/useModal'
 
+interface ImportMetaEnv {
+  VITE_RENDERER_INTEGRATED_MODEL: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}
+
 declare global {
   interface Window {
     message: MessageInstance

src/renderer/src/hooks/useAppInit.ts

@@ -1,3 +1,4 @@
+import { isLocalAi } from '@renderer/config/env'
 import i18n from '@renderer/i18n'
 import LocalStorage from '@renderer/services/storage'
 import { useAppDispatch } from '@renderer/store'
@@ -5,12 +6,14 @@ import { setAvatar } from '@renderer/store/runtime'
 import { runAsyncFunction } from '@renderer/utils'
 import { useEffect } from 'react'
 
+import { useDefaultModel } from './useAssistant'
 import { useSettings } from './useSettings'
 
 export function useAppInit() {
   const dispatch = useAppDispatch()
   const { proxyUrl } = useSettings()
   const { language } = useSettings()
+  const { setDefaultModel, setTopicNamingModel, setTranslateModel } = useDefaultModel()
 
   useEffect(() => {
     runAsyncFunction(async () => {
@@ -33,4 +36,14 @@ export function useAppInit() {
   useEffect(() => {
     i18n.changeLanguage(language || navigator.language || 'en-US')
   }, [language])
+
+  useEffect(() => {
+    if (isLocalAi) {
+      const model = JSON.parse(import.meta.env.VITE_RENDERER_INTEGRATED_MODEL)
+      setDefaultModel(model)
+      setTopicNamingModel(model)
+      setTranslateModel(model)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 }

src/renderer/src/hooks/useModel.ts

@@ -0,0 +1,7 @@
+import { useProviders } from './useProvider'
+
+export function useModel(id?: string) {
+  const { providers } = useProviders()
+  const allModels = providers.map((p) => p.models).flat()
+  return allModels.find((m) => m.id === id)
+}

src/renderer/src/hooks/useStore.ts

@@ -1,17 +1,5 @@
 import { useAppDispatch, useAppSelector } from '@renderer/store'
-import { setShowRightSidebar, toggleRightSidebar, toggleShowAssistants } from '@renderer/store/settings'
-
-export function useShowRightSidebar() {
-  const showRightSidebar = useAppSelector((state) => state.settings.showRightSidebar)
-  const dispatch = useAppDispatch()
-
-  return {
-    rightSidebarShown: showRightSidebar,
-    toggleRightSidebar: () => dispatch(toggleRightSidebar()),
-    showRightSidebar: () => dispatch(setShowRightSidebar(true)),
-    hideRightSidebar: () => dispatch(setShowRightSidebar(false))
-  }
-}
+import { toggleShowAssistants } from '@renderer/store/settings'
 
 export function useShowAssistants() {
   const showAssistants = useAppSelector((state) => state.settings.showAssistants)

src/renderer/src/hooks/useTopic.ts

@@ -2,9 +2,12 @@ import { Assistant, Topic } from '@renderer/types'
 import { find } from 'lodash'
 import { useEffect, useState } from 'react'
 
+import { useAssistant } from './useAssistant'
+
 let _activeTopic: Topic
 
-export function useActiveTopic(assistant: Assistant) {
+export function useActiveTopic(_assistant: Assistant) {
+  const { assistant } = useAssistant(_assistant.id)
   const [activeTopic, setActiveTopic] = useState(_activeTopic || assistant?.topics[0])
 
   useEffect(() => {

src/renderer/src/i18n/index.ts

@@ -29,7 +29,8 @@ const resources = {
         select: 'Select',
         search: 'Search',
         default: 'Default',
-        warning: 'Warning'
+        warning: 'Warning',
+        back: 'Back'
       },
       button: {
         add: 'Add',
@@ -57,7 +58,7 @@ const resources = {
       },
       chat: {
         save: 'Save',
-        'default.name': '🔆 Default Assistant',
+        'default.name': 'Default Assistant',
         'default.description': "Hello, I'm Default Assistant. You can start chatting with me right away",
         'default.topic.name': 'Default Topic',
         'topics.title': 'Topics',
@@ -67,7 +68,6 @@ const resources = {
         'topics.delete.all.title': 'Delete all topics',
         'topics.delete.all.content': 'Are you sure you want to delete all topics?',
         'input.new_topic': 'New Topic',
-        'input.topics': ' Topics ',
         'input.clear': 'Clear',
         'input.expand': 'Expand',
         'input.collapse': 'Collapse',
@@ -77,6 +77,7 @@ const resources = {
         'input.send': 'Send',
         'input.pause': 'Pause',
         'input.settings': 'Settings',
+        'input.upload': 'Upload image png、jpg、jpeg',
         'input.context_count.tip': 'Context Count',
         'input.estimated_tokens.tip': 'Estimated tokens',
         'settings.temperature': 'Temperature',
@@ -147,6 +148,8 @@ const resources = {
         'general.user_name': 'User Name',
         'general.user_name.placeholder': 'Enter your name',
         'general.backup.title': 'Data Backup and Recovery',
+        'general.backup.button': 'Backup',
+        'general.restore.button': 'Restore',
         'general.reset.title': 'Data Reset',
         'general.reset.button': 'Reset',
         'provider.api_key': 'API Key',
@@ -250,7 +253,7 @@ const resources = {
         topics: '话题',
         docs: '文档',
         and: '和',
-        assistant: '智能体',
+        assistant: '助手',
         name: '名称',
         description: '描述',
         prompt: '提示词',
@@ -266,7 +269,8 @@ const resources = {
         select: '选择',
         search: '搜索',
         default: '默认',
-        warning: '警告'
+        warning: '警告',
+        back: '返回'
       },
       button: {
         add: '添加',
@@ -294,7 +298,7 @@ const resources = {
       },
       chat: {
         save: '保存',
-        'default.name': '🔆 默认助手 - Assistant',
+        'default.name': '默认助手',
         'default.description': '你好，我是默认助手。你可以立刻开始跟我聊天。',
         'default.topic.name': '默认话题',
         'topics.title': '话题',
@@ -304,7 +308,6 @@ const resources = {
         'topics.delete.all.title': '删除所有话题',
         'topics.delete.all.content': '确定要删除所有话题吗?',
         'input.new_topic': '新话题',
-        'input.topics': ' 话题 ',
         'input.clear': '清除',
         'input.expand': '展开',
         'input.collapse': '收起',
@@ -314,6 +317,7 @@ const resources = {
         'input.send': '发送',
         'input.pause': '暂停',
         'input.settings': '设置',
+        'input.upload': '上传图片 png、jpg、jpeg',
         'input.context_count.tip': '上下文数',
         'input.estimated_tokens.tip': '预估 token 数',
         'settings.temperature': '模型温度',
@@ -385,6 +389,8 @@ const resources = {
         'general.user_name': '用户名',
         'general.user_name.placeholder': '请输入用户名',
         'general.backup.title': '数据备份与恢复',
+        'general.backup.button': '备份',
+        'general.restore.button': '恢复',
         'general.reset.title': '重置数据',
         'general.reset.button': '重置',
         'provider.api_key': 'API 密钥',

src/renderer/src/init.ts

@@ -1,27 +1,9 @@
 import KeyvStorage from '@kangfenmao/keyv-storage'
-import * as Sentry from '@sentry/electron/renderer'
 import localforage from 'localforage'
 
+import { APP_NAME } from './config/env'
 import { ThemeMode } from './store/settings'
-import { isProduction, loadScript } from './utils'
-
-async function initSentry() {
-  if (await isProduction()) {
-    Sentry.init({
-      integrations: [Sentry.browserTracingIntegration(), Sentry.replayIntegration()],
-
-      // Set tracesSampleRate to 1.0 to capture 100%
-      // of transactions for performance monitoring.
-      // We recommend adjusting this value in production
-      tracesSampleRate: 1.0,
-
-      // Capture Replay for 10% of all sessions,
-      // plus for 100% of sessions with an error
-      replaysSessionSampleRate: 0.1,
-      replaysOnErrorSampleRate: 1.0
-    })
-  }
-}
+import { loadScript } from './utils'
 
 export async function initMermaid(theme: ThemeMode) {
   if (!window.mermaid) {
@@ -41,13 +23,11 @@ function init() {
     name: 'CherryAI',
     version: 1.0,
     storeName: 'cherryai',
-    description: 'Cherry Studio Storage'
+    description: `${APP_NAME} Storage`
   })
 
   window.keyv = new KeyvStorage()
   window.keyv.init()
-
-  initSentry()
 }
 
 init()

src/renderer/src/pages/apps/App.tsx

@@ -1,5 +1,5 @@
 import MinApp from '@renderer/components/MinApp'
-import { useTheme } from '@renderer/providers/ThemeProvider'
+import { useTheme } from '@renderer/context/ThemeProvider'
 import { MinAppType } from '@renderer/types'
 import { FC } from 'react'
 import styled from 'styled-components'
@@ -12,13 +12,6 @@ const App: FC<Props> = ({ app }) => {
   const { theme } = useTheme()
 
   const onClick = () => {
-    const websiteReg = /claude|chatgpt|groq/i
-
-    if (websiteReg.test(app.url)) {
-      window.api.minApp({ url: app.url, windowOptions: { title: app.name } })
-      return
-    }
-
     MinApp.start(app)
   }
 

src/renderer/src/pages/apps/AppsPage.tsx

@@ -4,6 +4,7 @@ import AiSearchAppLogo from '@renderer/assets/images/apps/ai-search.png'
 import BaiduAiAppLogo from '@renderer/assets/images/apps/baidu-ai.png'
 import DevvAppLogo from '@renderer/assets/images/apps/devv.png'
 import MetasoAppLogo from '@renderer/assets/images/apps/metaso.webp'
+import PerplexityAppLogo from '@renderer/assets/images/apps/perplexity.webp'
 import SensetimeAppLogo from '@renderer/assets/images/apps/sensetime.png'
 import SparkDeskAppLogo from '@renderer/assets/images/apps/sparkdesk.png'
 import TiangongAiLogo from '@renderer/assets/images/apps/tiangong.png'
@@ -65,6 +66,11 @@ const _apps: MinAppType[] = [
     name: 'DEVV_',
     logo: DevvAppLogo,
     url: 'https://devv.ai/'
+  },
+  {
+    name: 'perplexity',
+    logo: PerplexityAppLogo,
+    url: 'https://www.perplexity.ai/'
   }
 ]
 

src/renderer/src/pages/home/Assistants.tsx

@@ -1,26 +1,40 @@
-import { CopyOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons'
-import { DragDropContext, Draggable, Droppable, DropResult } from '@hello-pangea/dnd'
+import { ArrowRightOutlined, CopyOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons'
+import DragableList from '@renderer/components/DragableList'
 import AssistantSettingPopup from '@renderer/components/Popups/AssistantSettingPopup'
 import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant'
 import { getDefaultTopic, syncAsistantToAgent } from '@renderer/services/assistant'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
 import { useAppSelector } from '@renderer/store'
-import { Assistant } from '@renderer/types'
-import { droppableReorder, uuid } from '@renderer/utils'
-import { Dropdown } from 'antd'
+import { Assistant, Topic } from '@renderer/types'
+import { uuid } from '@renderer/utils'
+import { Dropdown, Tooltip } from 'antd'
 import { ItemType } from 'antd/es/menu/interface'
 import { last } from 'lodash'
 import { FC, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+import Topics from './Topics'
+
 interface Props {
   activeAssistant: Assistant
   setActiveAssistant: (assistant: Assistant) => void
+  activeTopic: Topic
+  setActiveTopic: (topic: Topic) => void
+  showTopics: boolean
+  setShowTopics: (showTopics: boolean) => void
   onCreateAssistant: () => void
 }
 
-const Assistants: FC<Props> = ({ activeAssistant, setActiveAssistant, onCreateAssistant }) => {
+const Assistants: FC<Props> = ({
+  activeAssistant,
+  setActiveAssistant,
+  activeTopic,
+  setActiveTopic,
+  showTopics,
+  setShowTopics,
+  onCreateAssistant
+}) => {
   const { assistants, removeAssistant, addAssistant, updateAssistants } = useAssistants()
   const generating = useAppSelector((state) => state.runtime.generating)
   const { updateAssistant } = useAssistant(activeAssistant.id)
@@ -70,18 +84,6 @@ const Assistants: FC<Props> = ({ activeAssistant, setActiveAssistant, onCreateAs
     [addAssistant, onDelete, setActiveAssistant, t, updateAssistant]
   )
 
-  const onDragEnd = useCallback(
-    (result: DropResult) => {
-      if (result.destination) {
-        const sourceIndex = result.source.index
-        const destIndex = result.destination.index
-        const reorderAssistants = droppableReorder<Assistant>(assistants, sourceIndex, destIndex)
-        updateAssistants(reorderAssistants)
-      }
-    },
-    [assistants, updateAssistants]
-  )
-
   const onSwitchAssistant = useCallback(
     (assistant: Assistant): any => {
       if (generating) {
@@ -90,41 +92,45 @@ const Assistants: FC<Props> = ({ activeAssistant, setActiveAssistant, onCreateAs
           key: 'switch-assistant'
         })
       }
+
+      if (assistant.id === activeAssistant?.id) {
+        setShowTopics(true)
+        return
+      }
+
       EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR)
       setActiveAssistant(assistant)
     },
-    [generating, setActiveAssistant, t]
+    [activeAssistant?.id, generating, setActiveAssistant, setShowTopics, t]
   )
 
+  if (showTopics) {
+    return (
+      <Container>
+        <Topics assistant={activeAssistant} activeTopic={activeTopic} setActiveTopic={setActiveTopic} />
+      </Container>
+    )
+  }
+
   return (
     <Container>
-      <DragDropContext onDragEnd={onDragEnd}>
-        <Droppable droppableId="droppable">
-          {(provided) => (
-            <div {...provided.droppableProps} ref={provided.innerRef}>
-              {assistants.map((assistant, index) => (
-                <Draggable key={`draggable_${assistant.id}_${index}`} draggableId={assistant.id} index={index}>
-                  {(provided) => (
-                    <div
-                      ref={provided.innerRef}
-                      {...provided.draggableProps}
-                      {...provided.dragHandleProps}
-                      style={{ ...provided.draggableProps.style, marginBottom: 5 }}>
-                      <Dropdown key={assistant.id} menu={{ items: getMenuItems(assistant) }} trigger={['contextMenu']}>
-                        <AssistantItem
-                          onClick={() => onSwitchAssistant(assistant)}
-                          className={assistant.id === activeAssistant?.id ? 'active' : ''}>
-                          <AssistantName className="name">{assistant.name || t('chat.default.name')}</AssistantName>
-                        </AssistantItem>
-                      </Dropdown>
-                    </div>
-                  )}
-                </Draggable>
-              ))}
-            </div>
-          )}
-        </Droppable>
-      </DragDropContext>
+      <DragableList list={assistants} onUpdate={updateAssistants}>
+        {(assistant) => (
+          <Dropdown key={assistant.id} menu={{ items: getMenuItems(assistant) }} trigger={['contextMenu']}>
+            <AssistantItem
+              onClick={() => onSwitchAssistant(assistant)}
+              className={assistant.id === activeAssistant?.id ? 'active' : ''}>
+              <AssistantName className="name">{assistant.name || t('chat.default.name')}</AssistantName>
+              <Tooltip arrow title="话题列表" placement="bottom" mouseEnterDelay={0.5}>
+                <ArrowRightButton className="arrow-button" onClick={() => setShowTopics(true)}>
+                  <ArrowRightOutlined />
+                </ArrowRightButton>
+              </Tooltip>
+              {false && <TopicCount className="topics-count">{assistant.topics.length}</TopicCount>}
+            </AssistantItem>
+          </Dropdown>
+        )}
+      </DragableList>
     </Container>
   )
 }
@@ -136,31 +142,43 @@ const Container = styled.div`
   max-width: var(--assistants-width);
   border-right: 0.5px solid var(--color-border);
   height: calc(100vh - var(--navbar-height));
-  padding: 10px;
   overflow-y: auto;
+  padding-top: 10px;
+  padding-bottom: 0;
 `
 
 const AssistantItem = styled.div`
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
+  justify-content: space-between;
   padding: 7px 10px;
   position: relative;
   border-radius: 4px;
+  margin: 0 10px;
   cursor: pointer;
   font-family: Ubuntu;
   .anticon {
-    display: none;
+    opacity: 0;
+    color: var(--color-text-3);
   }
   &:hover {
     background-color: var(--color-background-soft);
+    .topics-count {
+      display: none;
+    }
     .anticon {
-      display: block;
-      color: var(--color-text-1);
+      opacity: 1;
     }
   }
   &.active {
     background-color: var(--color-background-mute);
-    cursor: pointer;
+    .topics-count {
+      display: none;
+    }
+    .anticon {
+      opacity: 1;
+      color: var(--color-text-2);
+    }
     .name {
       font-weight: 500;
     }
@@ -175,4 +193,37 @@ const AssistantName = styled.div`
   overflow: hidden;
 `
 
+const ArrowRightButton = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  transition: all 0.2s ease;
+  width: 24px;
+  height: 24px;
+  min-width: 24px;
+  min-height: 24px;
+  border-radius: 4px;
+  position: absolute;
+  right: 10px;
+  &:hover {
+    background-color: var(--color-background);
+  }
+`
+
+const TopicCount = styled.div`
+  color: var(--color-text-3);
+  font-size: 12px;
+  margin-right: 3px;
+  background-color: var(--color-background-mute);
+  opacity: 0.8;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+`
+
 export default Assistants

src/renderer/src/pages/home/Chat.tsx

@@ -1,29 +1,35 @@
 import { useAssistant } from '@renderer/hooks/useAssistant'
-import { useActiveTopic } from '@renderer/hooks/useTopic'
-import { Assistant } from '@renderer/types'
+import { Assistant, Topic } from '@renderer/types'
 import { Flex } from 'antd'
-import { FC } from 'react'
+import { FC, useState } from 'react'
 import styled from 'styled-components'
 
 import Inputbar from './Inputbar/Inputbar'
 import Messages from './Messages/Messages'
-import RightSidebar from './RightSidebar'
+import Settings from './Settings'
 
 interface Props {
   assistant: Assistant
+  activeTopic: Topic
+  setActiveTopic: (topic: Topic) => void
 }
 
 const Chat: FC<Props> = (props) => {
   const { assistant } = useAssistant(props.assistant.id)
-  const { activeTopic, setActiveTopic } = useActiveTopic(assistant)
+  const [showSetting, setShowSetting] = useState(false)
 
   return (
     <Container id="chat">
       <Main vertical flex={1} justify="space-between">
-        <Messages assistant={assistant} topic={activeTopic} />
-        <Inputbar assistant={assistant} setActiveTopic={setActiveTopic} />
+        <Messages assistant={assistant} topic={props.activeTopic} />
+        <Inputbar
+          assistant={assistant}
+          setActiveTopic={props.setActiveTopic}
+          showSetting={showSetting}
+          setShowSetting={setShowSetting}
+        />
       </Main>
-      <RightSidebar assistant={assistant} activeTopic={activeTopic} setActiveTopic={setActiveTopic} />
+      {showSetting && <Settings assistant={assistant} onClose={() => setShowSetting(false)} />}
     </Container>
   )
 }

src/renderer/src/pages/home/Header.tsx

@@ -1,42 +0,0 @@
-import { NavbarCenter } from '@renderer/components/app/Navbar'
-import { isMac } from '@renderer/config/constant'
-import { useAssistant } from '@renderer/hooks/useAssistant'
-import { useShowAssistants } from '@renderer/hooks/useStore'
-import { Assistant } from '@renderer/types'
-import { removeLeadingEmoji } from '@renderer/utils'
-import { FC } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-import SelectModelButton from './components/SelectModelButton'
-import { NewButton } from './HomePage'
-
-interface Props {
-  activeAssistant: Assistant
-}
-
-const HomeHeader: FC<Props> = ({ activeAssistant }) => {
-  const { assistant } = useAssistant(activeAssistant.id)
-  const { t } = useTranslation()
-  const { showAssistants, toggleShowAssistants } = useShowAssistants()
-
-  return (
-    <NavbarCenter style={{ paddingLeft: isMac ? 16 : 8 }}>
-      {!showAssistants && (
-        <NewButton onClick={toggleShowAssistants} style={{ marginRight: isMac ? 8 : 25 }}>
-          <i className="iconfont icon-showsidebarhoriz" />
-        </NewButton>
-      )}
-      <AssistantName>{removeLeadingEmoji(assistant?.name) || t('chat.default.name')}</AssistantName>
-      <SelectModelButton assistant={assistant} />
-    </NavbarCenter>
-  )
-}
-
-const AssistantName = styled.span`
-  margin-left: 5px;
-  margin-right: 10px;
-  font-family: Ubuntu;
-`
-
-export default HomeHeader

src/renderer/src/pages/home/HomePage.tsx

@@ -1,30 +1,40 @@
-import { Navbar, NavbarLeft, NavbarRight } from '@renderer/components/app/Navbar'
+import { ArrowLeftOutlined } from '@ant-design/icons'
+import { Navbar, NavbarCenter, NavbarLeft, NavbarRight } from '@renderer/components/app/Navbar'
 import { isMac, isWindows } from '@renderer/config/constant'
-import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
-import { useShowAssistants, useShowRightSidebar } from '@renderer/hooks/useStore'
-import { useTheme } from '@renderer/providers/ThemeProvider'
-import { Assistant } from '@renderer/types'
+import { useTheme } from '@renderer/context/ThemeProvider'
+import { useAssistant, useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
+import { useShowAssistants } from '@renderer/hooks/useStore'
+import { useActiveTopic } from '@renderer/hooks/useTopic'
+import { getDefaultTopic } from '@renderer/services/assistant'
+import { Assistant, Topic } from '@renderer/types'
 import { uuid } from '@renderer/utils'
 import { Switch } from 'antd'
 import { FC, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import AddAssistantPopup from '../../components/Popups/AddAssistantPopup'
 import Assistants from './Assistants'
 import Chat from './Chat'
-import Navigation from './Header'
+import SelectModelButton from './components/SelectModelButton'
 
 let _activeAssistant: Assistant
+let _showTopics = false
 
 const HomePage: FC = () => {
   const { assistants, addAssistant } = useAssistants()
   const [activeAssistant, setActiveAssistant] = useState(_activeAssistant || assistants[0])
-  const { rightSidebarShown, toggleRightSidebar } = useShowRightSidebar()
-  const { showAssistants, toggleShowAssistants } = useShowAssistants()
+  const { showAssistants } = useShowAssistants()
   const { defaultAssistant } = useDefaultAssistant()
   const { theme, toggleTheme } = useTheme()
+  const [showTopics, setShowTopics] = useState(_showTopics)
+  const { t } = useTranslation()
+
+  const { activeTopic, setActiveTopic } = useActiveTopic(activeAssistant)
+  const { addTopic } = useAssistant(activeAssistant.id)
 
   _activeAssistant = activeAssistant
+  _showTopics = showTopics
 
   const onCreateDefaultAssistant = () => {
     const assistant = { ...defaultAssistant, id: uuid() }
@@ -32,25 +42,40 @@ const HomePage: FC = () => {
     setActiveAssistant(assistant)
   }
 
-  const onCreateAssistant = async () => {
-    const assistant = await AddAssistantPopup.show()
-    assistant && setActiveAssistant(assistant)
+  const onCreate = async () => {
+    if (showTopics) {
+      const topic = getDefaultTopic()
+      addTopic(topic)
+      setActiveTopic(topic)
+    } else {
+      const assistant = await AddAssistantPopup.show()
+      assistant && setActiveAssistant(assistant)
+    }
+  }
+
+  const onSetActiveTopic = (topic: Topic) => {
+    setActiveTopic(topic)
   }
 
   return (
     <Container>
       <Navbar>
         {showAssistants && (
-          <NavbarLeft style={{ justifyContent: 'space-between', borderRight: 'none', padding: '0 8px' }}>
-            <NewButton onClick={toggleShowAssistants} style={{ marginLeft: isMac ? 8 : 0 }}>
-              <i className="iconfont icon-hidesidebarhoriz" />
-            </NewButton>
-            <NewButton onClick={onCreateAssistant}>
+          <NavbarLeft
+            style={{ justifyContent: 'space-between', alignItems: 'center', borderRight: 'none', padding: '0 8px' }}>
+            <NavigtaionBack onClick={() => setShowTopics(false)} style={{ opacity: showTopics ? 1 : 0 }}>
+              <ArrowLeftOutlined />
+              <NavigationBackTitle>{t('common.back')}</NavigationBackTitle>
+            </NavigtaionBack>
+            <NewButton onClick={onCreate}>
               <i className="iconfont icon-a-addchat"></i>
             </NewButton>
           </NavbarLeft>
         )}
-        <Navigation activeAssistant={activeAssistant} />
+        <NavbarCenter style={{ paddingLeft: isMac ? 16 : 8 }}>
+          <AssistantName>{activeAssistant?.name || t('chat.default.name')}</AssistantName>
+          <SelectModelButton assistant={activeAssistant} />
+        </NavbarCenter>
         <NavbarRight style={{ justifyContent: 'flex-end', paddingRight: isWindows ? 140 : 12 }}>
           <ThemeSwitch
             checkedChildren={<i className="iconfont icon-theme icon-dark1" />}
@@ -58,9 +83,6 @@ const HomePage: FC = () => {
             checked={theme === 'dark'}
             onChange={toggleTheme}
           />
-          <NewButton onClick={toggleRightSidebar}>
-            <i className={`iconfont ${rightSidebarShown ? 'icon-showsidebarhoriz' : 'icon-hidesidebarhoriz'}`} />
-          </NewButton>
         </NavbarRight>
       </Navbar>
       <ContentContainer>
@@ -68,10 +90,14 @@ const HomePage: FC = () => {
           <Assistants
             activeAssistant={activeAssistant}
             setActiveAssistant={setActiveAssistant}
+            activeTopic={activeTopic}
+            setActiveTopic={setActiveTopic}
+            showTopics={showTopics}
+            setShowTopics={setShowTopics}
             onCreateAssistant={onCreateDefaultAssistant}
           />
         )}
-        <Chat assistant={activeAssistant} />
+        <Chat assistant={activeAssistant} activeTopic={activeTopic} setActiveTopic={onSetActiveTopic} />
       </ContentContainer>
     </Container>
   )
@@ -90,6 +116,34 @@ const ContentContainer = styled.div`
   background-color: var(--color-background);
 `
 
+const NavigtaionBack = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 10px;
+  cursor: pointer;
+  margin-left: ${isMac ? '16px' : '4px'};
+  -webkit-app-region: none;
+  transition: all 0.2s ease-in-out;
+  color: var(--color-icon);
+  transition: opacity 0.2s ease-in-out;
+  &:hover {
+    color: var(--color-text-2);
+  }
+`
+
+const NavigationBackTitle = styled.div`
+  font-size: 13px;
+  font-weight: 500;
+`
+
+const AssistantName = styled.span`
+  margin-left: 5px;
+  margin-right: 10px;
+  font-family: Ubuntu;
+`
+
 export const NewButton = styled.div`
   -webkit-app-region: none;
   border-radius: 4px;

src/renderer/src/pages/home/Inputbar/AttachmentButton.tsx

@@ -0,0 +1,31 @@
+import { PaperClipOutlined } from '@ant-design/icons'
+import { Tooltip, Upload } from 'antd'
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props {
+  files: File[]
+  setFiles: (files: File[]) => void
+  ToolbarButton: any
+}
+
+const AttachmentButton: FC<Props> = ({ files, setFiles, ToolbarButton }) => {
+  const { t } = useTranslation()
+
+  return (
+    <Tooltip placement="top" title={t('chat.input.upload')} arrow>
+      <Upload
+        customRequest={() => {}}
+        accept="image/*"
+        itemRender={() => null}
+        maxCount={1}
+        onChange={async ({ file }) => file?.originFileObj && setFiles([file.originFileObj as File])}>
+        <ToolbarButton type="text" className={files.length ? 'active' : ''}>
+          <PaperClipOutlined style={{ rotate: '135deg' }} />
+        </ToolbarButton>
+      </Upload>
+    </Tooltip>
+  )
+}
+
+export default AttachmentButton

src/renderer/src/pages/home/Inputbar/Inputbar.tsx

@@ -3,7 +3,6 @@ import {
   ControlOutlined,
   FullscreenExitOutlined,
   FullscreenOutlined,
-  HistoryOutlined,
   PauseCircleOutlined,
   PlusCircleOutlined,
   QuestionCircleOutlined
@@ -22,7 +21,7 @@ import { Button, Divider, Popconfirm, Tag, Tooltip } from 'antd'
 import TextArea, { TextAreaRef } from 'antd/es/input/TextArea'
 import dayjs from 'dayjs'
 import { debounce, isEmpty } from 'lodash'
-import { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { CSSProperties, FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -31,11 +30,13 @@ import SendMessageButton from './SendMessageButton'
 interface Props {
   assistant: Assistant
   setActiveTopic: (topic: Topic) => void
+  showSetting: boolean
+  setShowSetting: (show: boolean) => void
 }
 
 let _text = ''
 
-const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
+const Inputbar: FC<Props> = ({ assistant, setActiveTopic, showSetting, setShowSetting }) => {
   const [text, setText] = useState(_text)
   const [inputFocus, setInputFocus] = useState(false)
   const { addTopic } = useAssistant(assistant.id)
@@ -43,8 +44,10 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
   const [expended, setExpend] = useState(false)
   const [estimateTokenCount, setEstimateTokenCount] = useState(0)
   const generating = useAppSelector((state) => state.runtime.generating)
-  const inputRef = useRef<TextAreaRef>(null)
+  const textareaRef = useRef<TextAreaRef>(null)
+  const [files, setFiles] = useState<File[]>([])
   const { t } = useTranslation()
+  const containerRef = useRef(null)
 
   _text = text
 
@@ -67,13 +70,19 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
       status: 'success'
     }
 
+    if (files.length > 0) {
+      message.files = files
+    }
+
     EventEmitter.emit(EVENT_NAMES.SEND_MESSAGE, message)
 
     setText('')
+    setFiles([])
     setTimeout(() => setText(''), 500)
+    setTimeout(() => resizeTextArea(), 0)
 
     setExpend(false)
-  }, [assistant.id, assistant.topics, generating, text])
+  }, [assistant.id, assistant.topics, generating, files, text])
 
   const inputTokenCount = useMemo(() => estimateInputTokenCount(text), [text])
 
@@ -117,6 +126,32 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     store.dispatch(setGenerating(false))
   }
 
+  const resizeTextArea = () => {
+    const textArea = textareaRef.current?.resizableTextArea?.textArea
+    if (textArea) {
+      textArea.style.height = 'auto'
+      textArea.style.height = textArea?.scrollHeight > 400 ? '400px' : `${textArea?.scrollHeight}px`
+    }
+  }
+
+  const onToggleExpended = () => {
+    const isExpended = !expended
+    setExpend(isExpended)
+    const textArea = textareaRef.current?.resizableTextArea?.textArea
+
+    if (textArea) {
+      if (isExpended) {
+        textArea.style.height = '70vh'
+      } else {
+        resizeTextArea()
+      }
+    }
+
+    textareaRef.current?.focus()
+  }
+
+  const onInput = () => !expended && resizeTextArea()
+
   // Command or Ctrl + N create new topic
   useEffect(() => {
     const onKeydown = (e) => {
@@ -124,7 +159,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
         if ((e.ctrlKey || e.metaKey) && e.key === 'n') {
           addNewTopic()
           EventEmitter.emit(EVENT_NAMES.SHOW_TOPIC_SIDEBAR)
-          inputRef.current?.focus()
+          textareaRef.current?.focus()
         }
       }
     }
@@ -137,7 +172,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     const unsubscribes = [
       EventEmitter.on(EVENT_NAMES.EDIT_MESSAGE, (message: Message) => {
         setText(message.content)
-        inputRef.current?.focus()
+        textareaRef.current?.focus()
       }),
       EventEmitter.on(EVENT_NAMES.ESTIMATED_TOKEN_COUNT, _setEstimateTokenCount)
     ]
@@ -145,14 +180,27 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
   }, [])
 
   useEffect(() => {
-    inputRef.current?.focus()
+    textareaRef.current?.focus()
   }, [assistant])
 
   return (
-    <Container
-      id="inputbar"
-      style={{ minHeight: expended ? '60%' : 'var(--input-bar-height)' }}
-      className={inputFocus ? 'focus' : ''}>
+    <Container id="inputbar" className={inputFocus ? 'focus' : ''} ref={containerRef}>
+      <Textarea
+        value={text}
+        onChange={(e) => setText(e.target.value)}
+        onKeyDown={handleKeyDown}
+        placeholder={t('chat.input.placeholder')}
+        autoFocus
+        contextMenu="true"
+        variant="borderless"
+        rows={1}
+        ref={textareaRef}
+        style={{ fontSize }}
+        styles={{ textarea: TextareaStyle }}
+        onFocus={() => setInputFocus(true)}
+        onBlur={() => setInputFocus(false)}
+        onInput={onInput}
+      />
       <Toolbar>
         <ToolbarMenu>
           <Tooltip placement="top" title={t('chat.input.new_topic')} arrow>
@@ -173,39 +221,27 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
               </ToolbarButton>
             </Popconfirm>
           </Tooltip>
-          <Tooltip placement="top" title={t('chat.input.topics')} arrow>
-            <ToolbarButton type="text" onClick={() => EventEmitter.emit(EVENT_NAMES.SHOW_TOPIC_SIDEBAR)}>
-              <HistoryOutlined />
-            </ToolbarButton>
-          </Tooltip>
-          <Tooltip placement="top" title={t('chat.input.settings')} arrow>
-            <ToolbarButton type="text" onClick={() => EventEmitter.emit(EVENT_NAMES.SHOW_CHAT_SETTINGS)}>
+          <Tooltip placement="top" title={t('chat.input.settings')} arrow className={showSetting ? 'active' : ''}>
+            <ToolbarButton type="text" onClick={() => setShowSetting(!showSetting)}>
               <ControlOutlined />
             </ToolbarButton>
           </Tooltip>
+          {/* <AttachmentButton files={files} setFiles={setFiles} ToolbarButton={ToolbarButton} /> */}
           <Tooltip placement="top" title={expended ? t('chat.input.collapse') : t('chat.input.expand')} arrow>
-            <ToolbarButton type="text" onClick={() => setExpend(!expended)}>
+            <ToolbarButton type="text" onClick={onToggleExpended}>
               {expended ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
             </ToolbarButton>
           </Tooltip>
           {showInputEstimatedTokens && (
             <TextCount>
               <Tooltip title={t('chat.input.context_count.tip') + ' | ' + t('chat.input.estimated_tokens.tip')}>
-                <Tag
-                  style={{
-                    cursor: 'pointer',
-                    borderRadius: '6px',
-                    display: 'flex',
-                    alignItems: 'center',
-                    padding: '2px 8px',
-                    borderWidth: 0.5
-                  }}>
+                <StyledTag>
                   <i className="iconfont icon-history" style={{ marginRight: '3px' }} />
                   {assistant?.settings?.contextCount ?? DEFAULT_CONEXTCOUNT}
                   <Divider type="vertical" style={{ marginTop: 2, marginLeft: 5, marginRight: 5 }} />↑{inputTokenCount}
                   <span style={{ margin: '0 2px' }}>/</span>
                   {estimateTokenCount}
-                </Tag>
+                </StyledTag>
               </Tooltip>
             </TextCount>
           )}
@@ -221,28 +257,17 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
           {!generating && <SendMessageButton sendMessage={sendMessage} disabled={generating || !text} />}
         </ToolbarMenu>
       </Toolbar>
-      <Textarea
-        value={text}
-        onChange={(e) => setText(e.target.value)}
-        onKeyDown={handleKeyDown}
-        placeholder={t('chat.input.placeholder')}
-        autoFocus
-        contextMenu="true"
-        variant="borderless"
-        ref={inputRef}
-        styles={{ textarea: { paddingLeft: 0 } }}
-        onFocus={() => setInputFocus(true)}
-        onBlur={() => setInputFocus(false)}
-        style={{ fontSize }}
-      />
     </Container>
   )
 }
 
+const TextareaStyle: CSSProperties = {
+  paddingLeft: 0,
+  padding: '10px 15px 8px',
+  transition: 'all 0.3s ease'
+}
+
 const Container = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: var(--input-bar-height);
   border: 1px solid var(--color-border-soft);
   transition: all 0.3s ease;
   position: relative;
@@ -257,11 +282,11 @@ const Textarea = styled(TextArea)`
   border-radius: 0;
   display: flex;
   flex: 1;
-  margin: 0 15px 5px 15px;
   font-family: Ubuntu;
   resize: vertical;
   overflow: auto;
-  width: auto;
+  width: 100%;
+  box-sizing: border-box;
 `
 
 const Toolbar = styled.div`
@@ -269,8 +294,9 @@ const Toolbar = styled.div`
   flex-direction: row;
   justify-content: space-between;
   padding: 0 8px;
-  padding-top: 3px;
   padding-bottom: 0;
+  margin-bottom: 4px;
+  height: 36px;
 `
 
 const ToolbarMenu = styled.div`
@@ -281,17 +307,23 @@ const ToolbarMenu = styled.div`
 `
 
 const ToolbarButton = styled(Button)`
-  width: 32px;
-  height: 32px;
-  font-size: 18px;
+  width: 30px;
+  height: 30px;
+  font-size: 17px;
   border-radius: 50%;
   transition: all 0.3s ease;
   color: var(--color-icon);
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 0;
   &.anticon {
     transition: all 0.3s ease;
     color: var(--color-icon);
   }
-  &:hover {
+  &:hover,
+  &.active {
     background-color: var(--color-background-soft);
     .anticon {
       color: var(--color-text-1);
@@ -308,4 +340,13 @@ const TextCount = styled.div`
   user-select: none;
 `
 
+const StyledTag = styled(Tag)`
+  cursor: pointer;
+  border-radius: 6px;
+  display: flex;
+  align-items: center;
+  padding: 2px 8px;
+  border-width: 0.5;
+`
+
 export default Inputbar

src/renderer/src/pages/home/Markdown/CodeBlock.tsx

@@ -1,7 +1,7 @@
 import { CheckOutlined } from '@ant-design/icons'
 import CopyIcon from '@renderer/components/Icons/CopyIcon'
+import { useTheme } from '@renderer/context/ThemeProvider'
 import { initMermaid } from '@renderer/init'
-import { useTheme } from '@renderer/providers/ThemeProvider'
 import { ThemeMode } from '@renderer/store/settings'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'

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

@@ -7,10 +7,12 @@ import {
   SaveOutlined,
   SyncOutlined
 } from '@ant-design/icons'
+import UserPopup from '@renderer/components/Popups/UserPopup'
 import { FONT_FAMILY } from '@renderer/config/constant'
 import { getModelLogo } from '@renderer/config/provider'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import useAvatar from '@renderer/hooks/useAvatar'
+import { useModel } from '@renderer/hooks/useModel'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useRuntime } from '@renderer/hooks/useStore'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
@@ -25,6 +27,7 @@ import styled from 'styled-components'
 
 import SelectModelDropdown from '../components/SelectModelDropdown'
 import Markdown from '../Markdown/Markdown'
+import MessageAttachments from './MessageAttachments'
 
 interface Props {
   message: Message
@@ -37,7 +40,8 @@ interface Props {
 const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) => {
   const avatar = useAvatar()
   const { t } = useTranslation()
-  const { assistant, model, setModel } = useAssistant(message.assistantId)
+  const { assistant, setModel } = useAssistant(message.assistantId)
+  const model = useModel(message.modelId)
   const { userName, showMessageDivider, messageFont, fontSize } = useSettings()
   const { generating } = useRuntime()
   const [copied, setCopied] = useState(false)
@@ -67,9 +71,9 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
 
   const getUserName = useCallback(() => {
     if (message.id === 'assistant') return assistant?.name
-    if (message.role === 'assistant') return upperFirst(model.name || model.id)
+    if (message.role === 'assistant') return upperFirst(model?.name || model?.id)
     return userName || t('common.you')
-  }, [assistant?.name, message.id, message.role, model.id, model.name, t, userName])
+  }, [assistant?.name, message.id, message.role, model?.id, model?.name, t, userName])
 
   const fontFamily = useMemo(() => {
     return messageFont === 'serif' ? FONT_FAMILY.replace('sans-serif', 'serif').replace('Ubuntu, ', '') : FONT_FAMILY
@@ -107,16 +111,21 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
     if (message.status === 'error') {
       return (
         <Alert
-          message={t('error.chat.response')}
+          message={<div style={{ fontSize: 14 }}>{t('error.chat.response')}</div>}
           description={<Markdown message={message} />}
           type="error"
-          style={{ marginBottom: 15 }}
+          style={{ marginBottom: 15, padding: 10, fontSize: 12 }}
         />
       )
     }
 
-    return <Markdown message={message} />
-  }, [message])
+    return (
+      <>
+        <Markdown message={message} />
+        <MessageAttachments message={message} />
+      </>
+    )
+  }, [message, t])
 
   return (
     <MessageContainer key={message.id} className="message">
@@ -127,7 +136,12 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
               {avatarName}
             </Avatar>
           ) : (
-            <Avatar src={avatar} size={35} style={{ borderRadius: '20%' }} />
+            <Avatar
+              src={avatar}
+              size={35}
+              style={{ borderRadius: '20%', cursor: 'pointer' }}
+              onClick={() => UserPopup.show()}
+            />
           )}
           <UserWrap>
             <UserName>{username}</UserName>
@@ -154,7 +168,7 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
                 </ActionButton>
               </Tooltip>
               {canRegenerate && (
-                <SelectModelDropdown model={model} onSelect={onRegenerate} placement="topRight">
+                <SelectModelDropdown model={model} onSelect={onRegenerate} placement="topLeft">
                   <Tooltip title={t('common.regenerate')} mouseEnterDelay={0.8}>
                     <ActionButton>
                       <SyncOutlined />

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

@@ -0,0 +1,25 @@
+import { Message } from '@renderer/types'
+import { Image as AntdImage } from 'antd'
+import { FC } from 'react'
+import styled from 'styled-components'
+
+interface Props {
+  message: Message
+}
+
+const MessageAttachments: FC<Props> = ({ message }) => {
+  return <Container>{message.images?.map((image) => <Image src={image} key={image} width="33%" />)}</Container>
+}
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  margin-top: 8px;
+`
+
+const Image = styled(AntdImage)`
+  border-radius: 10px;
+`
+
+export default MessageAttachments

src/renderer/src/pages/home/RightSidebar/index.tsx

@@ -1,96 +0,0 @@
-import { BarsOutlined, SettingOutlined } from '@ant-design/icons'
-import { useShowRightSidebar } from '@renderer/hooks/useStore'
-import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
-import { Assistant, Topic } from '@renderer/types'
-import { Segmented } from 'antd'
-import { FC, useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-import SettingsTab from './SettingsTab'
-import TopicsTab from './TopicsTab'
-
-interface Props {
-  assistant: Assistant
-  activeTopic: Topic
-  setActiveTopic: (topic: Topic) => void
-}
-
-const RightSidebar: FC<Props> = (props) => {
-  const [tab, setTab] = useState<'topic' | 'settings'>('topic')
-  const { rightSidebarShown, showRightSidebar, hideRightSidebar } = useShowRightSidebar()
-  const { t } = useTranslation()
-  const isTopicTab = tab === 'topic'
-  const isSettingsTab = tab === 'settings'
-
-  useEffect(() => {
-    const unsubscribes = [
-      EventEmitter.on(EVENT_NAMES.SHOW_TOPIC_SIDEBAR, (): any => {
-        if (rightSidebarShown && isTopicTab) {
-          return hideRightSidebar()
-        }
-        if (rightSidebarShown) {
-          return setTab('topic')
-        }
-        showRightSidebar()
-        setTab('topic')
-      }),
-      EventEmitter.on(EVENT_NAMES.SHOW_CHAT_SETTINGS, (): any => {
-        if (rightSidebarShown && isSettingsTab) {
-          return hideRightSidebar()
-        }
-        if (rightSidebarShown) {
-          return setTab('settings')
-        }
-        showRightSidebar()
-        setTab('settings')
-      }),
-      EventEmitter.on(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR, () => setTab('topic'))
-    ]
-    return () => unsubscribes.forEach((unsub) => unsub())
-  }, [hideRightSidebar, isSettingsTab, isTopicTab, rightSidebarShown, showRightSidebar])
-
-  if (!rightSidebarShown) {
-    return null
-  }
-
-  return (
-    <Container>
-      <Segmented
-        value={tab}
-        style={{ borderRadius: 0, padding: '10px', gap: 5, borderBottom: '0.5px solid var(--color-border)' }}
-        options={[
-          { label: t('common.topics'), value: 'topic', icon: <BarsOutlined /> },
-          { label: t('settings.title'), value: 'settings', icon: <SettingOutlined /> }
-        ]}
-        block
-        onChange={(value) => setTab(value as 'topic' | 'settings')}
-      />
-      <TabContent>
-        {tab === 'topic' && <TopicsTab {...props} />}
-        {tab === 'settings' && <SettingsTab assistant={props.assistant} />}
-      </TabContent>
-    </Container>
-  )
-}
-
-const Container = styled.div`
-  display: flex;
-  flex-direction: column;
-  width: var(--topic-list-width);
-  height: calc(100vh - var(--navbar-height));
-  border-left: 0.5px solid var(--color-border);
-  .collapsed {
-    width: 0;
-    border-left: none;
-  }
-`
-
-const TabContent = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  overflow-y: auto;
-`
-
-export default RightSidebar

src/renderer/src/pages/home/Settings.tsx

@@ -1,4 +1,4 @@
-import { CheckOutlined, QuestionCircleOutlined, ReloadOutlined } from '@ant-design/icons'
+import { CheckOutlined, CloseOutlined, QuestionCircleOutlined, ReloadOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
 import { DEFAULT_CONEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
 import { useAssistant } from '@renderer/hooks/useAssistant'
@@ -19,6 +19,7 @@ import styled from 'styled-components'
 
 interface Props {
   assistant: Assistant
+  onClose: () => void
 }
 
 const SettingsTab: FC<Props> = (props) => {
@@ -87,6 +88,10 @@ const SettingsTab: FC<Props> = (props) => {
 
   return (
     <Container>
+      <SettingsHeader>
+        {t('settings.title')}
+        <CloseIcon onClick={props.onClose} />
+      </SettingsHeader>
       <SettingSubtitle>
         {t('settings.messages.model.title')}{' '}
         <Tooltip title={t('chat.settings.reset')}>
@@ -234,7 +239,13 @@ const Container = styled.div`
   display: flex;
   flex: 1;
   flex-direction: column;
+  width: var(--topic-list-width);
+  max-width: var(--topic-list-width);
+  height: calc(100vh - var(--navbar-height));
+  border-left: 0.5px solid var(--color-border);
   padding: 0 15px;
+  padding-bottom: 20px;
+  overflow-y: auto;
 `
 
 const Label = styled.p`
@@ -253,4 +264,21 @@ const SettingRowTitleSmall = styled(SettingRowTitle)`
   font-size: 13px;
 `
 
+const SettingsHeader = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 15px;
+  border-bottom: 0.5px solid var(--color-border);
+  margin-left: -15px;
+  margin-right: -15px;
+`
+
+const CloseIcon = styled(CloseOutlined)`
+  font-size: 14px;
+  cursor: pointer;
+  color: var(--color-text-3);
+`
+
 export default SettingsTab

src/renderer/src/pages/home/Topics.tsx

@@ -18,7 +18,7 @@ interface Props {
   setActiveTopic: (topic: Topic) => void
 }
 
-const TopicsTab: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic }) => {
+const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic }) => {
   const { assistant, removeTopic, updateTopic, updateTopics } = useAssistant(_assistant.id)
   const { t } = useTranslation()
   const generating = useAppSelector((state) => state.runtime.generating)
@@ -136,11 +136,15 @@ const Container = styled.div`
   display: flex;
   flex: 1;
   flex-direction: column;
-  padding: 10px 10px;
+  overflow-y: scroll;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  margin-top: -10px;
 `
 
 const TopicListItem = styled.div`
   padding: 7px 10px;
+  margin: 0 10px;
   cursor: pointer;
   border-radius: 4px;
   white-space: nowrap;
@@ -152,7 +156,8 @@ const TopicListItem = styled.div`
   }
   &.active {
     background-color: var(--color-background-mute);
+    font-weight: 500;
   }
 `
 
-export default TopicsTab
+export default Topics

src/renderer/src/pages/home/components/SelectModelButton.tsx

@@ -1,4 +1,5 @@
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
+import { isLocalAi } from '@renderer/config/env'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { Assistant } from '@renderer/types'
 import { Button } from 'antd'
@@ -17,6 +18,10 @@ const SelectModelButton: FC<Props> = ({ assistant }) => {
   const { model, setModel } = useAssistant(assistant.id)
   const { t } = useTranslation()
 
+  if (isLocalAi) {
+    return null
+  }
+
   return (
     <SelectModelDropdown model={model} onSelect={setModel}>
       <DropdownButton size="small" type="default">

src/renderer/src/pages/home/components/SelectModelDropdown.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 interface Props extends DropdownProps {
-  model: Model
+  model?: Model
   onSelect: (model: Model) => void
 }
 
@@ -37,7 +37,7 @@ const SelectModelDropdown: FC<Props & PropsWithChildren> = ({ children, model, o
 
   return (
     <DropdownMenu
-      menu={{ items, style: { maxHeight: '80vh', overflow: 'auto' }, selectedKeys: [model?.id] }}
+      menu={{ items, style: { maxHeight: '80vh', overflow: 'auto' }, selectedKeys: model ? [model.id] : [] }}
       trigger={['click']}
       arrow
       placement="bottom"

src/renderer/src/pages/settings/AboutSettings.tsx

@@ -1,8 +1,8 @@
 import { GithubOutlined } from '@ant-design/icons'
 import { FileProtectOutlined, GlobalOutlined, MailOutlined, SoundOutlined } from '@ant-design/icons'
-import Logo from '@renderer/assets/images/logo.png'
 import { HStack } from '@renderer/components/Layout'
 import MinApp from '@renderer/components/MinApp'
+import { APP_NAME, AppLogo } from '@renderer/config/env'
 import { runAsyncFunction } from '@renderer/utils'
 import { Avatar, Button, Progress, Row, Tag } from 'antd'
 import { ProgressInfo } from 'electron-updater'
@@ -44,7 +44,7 @@ const AboutSettings: FC = () => {
 
   const mailto = async () => {
     const email = 'kangfenmao@qq.com'
-    const subject = 'Cherry Studio Feedback'
+    const subject = `${APP_NAME} Feedback`
     const version = (await window.api.getAppInfo()).version
     const platform = window.electron.process.platform
     const url = `mailto:${email}?subject=${subject}&body=%0A%0AVersion: ${version} | Platform: ${platform}`
@@ -117,10 +117,10 @@ const AboutSettings: FC = () => {
                 strokeColor="#67ad5b"
               />
             )}
-            <Avatar src={Logo} size={80} style={{ minHeight: 80 }} />
+            <Avatar src={AppLogo} size={80} style={{ minHeight: 80 }} />
           </AvatarWrapper>
           <VersionWrapper>
-            <Title>Cherry Studio</Title>
+            <Title>{APP_NAME}</Title>
             <Description>{t('settings.about.description')}</Description>
             <Tag
               onClick={() => onOpenWebsite('https://github.com/kangfenmao/cherry-studio/releases')}

src/renderer/src/pages/settings/GeneralSettings.tsx

@@ -119,10 +119,10 @@ const GeneralSettings: FC = () => {
         <SettingRowTitle>{t('settings.general.backup.title')}</SettingRowTitle>
         <HStack gap="5px">
           <Button onClick={backup} icon={<SaveOutlined />}>
-            备份
+            {t('settings.general.backup.button')}
           </Button>
           <Button onClick={restore} icon={<FolderOpenOutlined />}>
-            恢复
+            {t('settings.general.restore.button')}
           </Button>
         </HStack>
       </SettingRow>

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

@@ -8,8 +8,8 @@ import {
 } from '@ant-design/icons'
 import { getModelLogo } from '@renderer/config/provider'
 import { PROVIDER_CONFIG } from '@renderer/config/provider'
+import { useTheme } from '@renderer/context/ThemeProvider'
 import { useProvider } from '@renderer/hooks/useProvider'
-import { useTheme } from '@renderer/providers/ThemeProvider'
 import { checkApi } from '@renderer/services/api'
 import { Provider } from '@renderer/types'
 import { Avatar, Button, Card, Divider, Flex, Input, Space, Switch } from 'antd'

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

@@ -1,5 +1,4 @@
-import { PlusOutlined } from '@ant-design/icons'
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons'
+import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
 import { DragDropContext, Draggable, Droppable, DropResult } from '@hello-pangea/dnd'
 import { getProviderLogo } from '@renderer/config/provider'
 import { useAllProviders, useProviders } from '@renderer/hooks/useProvider'

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

@@ -6,6 +6,7 @@ import {
   SettingOutlined
 } from '@ant-design/icons'
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
+import { isLocalAi } from '@renderer/config/env'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Link, Route, Routes, useLocation } from 'react-router-dom'
@@ -30,18 +31,22 @@ const SettingsPage: FC = () => {
       </Navbar>
       <ContentContainer>
         <SettingMenus>
-          <MenuItemLink to="/settings/provider">
-            <MenuItem className={isRoute('/settings/provider')}>
-              <CloudOutlined />
-              {t('settings.provider')}
-            </MenuItem>
-          </MenuItemLink>
-          <MenuItemLink to="/settings/model">
-            <MenuItem className={isRoute('/settings/model')}>
-              <CodeSandboxOutlined />
-              {t('settings.model')}
-            </MenuItem>
-          </MenuItemLink>
+          {!isLocalAi && (
+            <>
+              <MenuItemLink to="/settings/provider">
+                <MenuItem className={isRoute('/settings/provider')}>
+                  <CloudOutlined />
+                  {t('settings.provider')}
+                </MenuItem>
+              </MenuItemLink>
+              <MenuItemLink to="/settings/model">
+                <MenuItem className={isRoute('/settings/model')}>
+                  <CodeSandboxOutlined />
+                  {t('settings.model')}
+                </MenuItem>
+              </MenuItemLink>
+            </>
+          )}
           <MenuItemLink to="/settings/assistant">
             <MenuItem className={isRoute('/settings/assistant')}>
               <MessageOutlined />

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

@@ -2,8 +2,6 @@ import { Divider } from 'antd'
 import Link from 'antd/es/typography/Link'
 import styled from 'styled-components'
 
-import SettingsPage from './SettingsPage'
-
 export const SettingContainer = styled.div`
   display: flex;
   flex-direction: column;
@@ -69,5 +67,3 @@ export const SettingHelpLink = styled(Link)`
   font-size: 11px;
   padding: 0 5px;
 `
-
-export default SettingsPage

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 { isLocalAi } from '@renderer/config/env'
 import { useDefaultModel } from '@renderer/hooks/useAssistant'
 import { fetchTranslate } from '@renderer/services/api'
 import { getDefaultAssistant } from '@renderer/services/assistant'
@@ -133,6 +134,31 @@ const TranslatePage: FC = () => {
     isEmpty(text) && setResult('')
   }, [text])
 
+  const SettingButton = () => {
+    if (isLocalAi) {
+      return null
+    }
+
+    if (translateModel) {
+      return (
+        <Link to="/settings/model" style={{ color: 'var(--color-text-2)' }}>
+          <SettingOutlined />
+        </Link>
+      )
+    }
+
+    return (
+      <Link to="/settings/model" style={{ marginLeft: -10 }}>
+        <Button
+          type="link"
+          style={{ color: 'var(--color-error)', textDecoration: 'underline' }}
+          icon={<WarningOutlined />}>
+          {t('translate.error.not_configured')}
+        </Button>
+      </Link>
+    )
+  }
+
   return (
     <Container>
       <Navbar>
@@ -165,21 +191,7 @@ const TranslatePage: FC = () => {
               </Space>
             )}
           />
-          {translateModel && (
-            <Link to="/settings/model" style={{ color: 'var(--color-text-2)' }}>
-              <SettingOutlined />
-            </Link>
-          )}
-          {!translateModel && (
-            <Link to="/settings/model" style={{ marginLeft: -10 }}>
-              <Button
-                type="link"
-                style={{ color: 'var(--color-error)', textDecoration: 'underline' }}
-                icon={<WarningOutlined />}>
-                {t('translate.error.not_configured')}
-              </Button>
-            </Link>
-          )}
+          <SettingButton />
         </MenuContainer>
         <TranslateInputWrapper>
           <InputContainer>

src/renderer/src/providers/AiProvider.ts

@@ -0,0 +1,40 @@
+import BaseProvider from '@renderer/providers/BaseProvider'
+import ProviderFactory from '@renderer/providers/ProviderFactory'
+import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import OpenAI from 'openai'
+
+export default class AiProvider {
+  private sdk: BaseProvider
+
+  constructor(provider: Provider) {
+    this.sdk = ProviderFactory.create(provider)
+  }
+
+  public async completions(
+    messages: Message[],
+    assistant: Assistant,
+    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
+  ): Promise<void> {
+    return this.sdk.completions(messages, assistant, onChunk)
+  }
+
+  public async translate(message: Message, assistant: Assistant): Promise<string> {
+    return this.sdk.translate(message, assistant)
+  }
+
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+    return this.sdk.summaries(messages, assistant)
+  }
+
+  public async suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]> {
+    return this.sdk.suggestions(messages, assistant)
+  }
+
+  public async check(): Promise<{ valid: boolean; error: Error | null }> {
+    return this.sdk.check()
+  }
+
+  public async models(): Promise<OpenAI.Models.Model[]> {
+    return this.sdk.models()
+  }
+}

src/renderer/src/providers/AnthropicProvider.ts

@@ -0,0 +1,143 @@
+import Anthropic from '@anthropic-ai/sdk'
+import { MessageCreateParamsNonStreaming, MessageParam } from '@anthropic-ai/sdk/resources'
+import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
+import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
+import { EVENT_NAMES } from '@renderer/services/event'
+import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import { sum, takeRight } from 'lodash'
+import OpenAI from 'openai'
+
+import BaseProvider from './BaseProvider'
+
+export default class AnthropicProvider extends BaseProvider {
+  private sdk: Anthropic
+
+  constructor(provider: Provider) {
+    super(provider)
+    this.sdk = new Anthropic({ apiKey: provider.apiKey, baseURL: this.getBaseURL() })
+  }
+
+  public async completions(
+    messages: Message[],
+    assistant: Assistant,
+    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
+  ) {
+    const defaultModel = getDefaultModel()
+    const model = assistant.model || defaultModel
+    const { contextCount, maxTokens } = getAssistantSettings(assistant)
+
+    const userMessages = takeRight(messages, contextCount + 1).map((message) => {
+      return {
+        role: message.role,
+        content: message.content
+      }
+    })
+
+    return new Promise<void>((resolve, reject) => {
+      const stream = this.sdk.messages
+        .stream({
+          model: model.id,
+          messages: userMessages.filter(Boolean) as MessageParam[],
+          max_tokens: maxTokens || DEFAULT_MAX_TOKENS,
+          temperature: assistant?.settings?.temperature,
+          system: assistant.prompt,
+          stream: true
+        })
+        .on('text', (text) => {
+          if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) {
+            resolve()
+            return stream.controller.abort()
+          }
+          onChunk({ text })
+        })
+        .on('finalMessage', (message) => {
+          onChunk({
+            text: '',
+            usage: {
+              prompt_tokens: message.usage.input_tokens,
+              completion_tokens: message.usage.output_tokens,
+              total_tokens: sum(Object.values(message.usage))
+            }
+          })
+          resolve()
+        })
+        .on('error', (error) => reject(error))
+    })
+  }
+
+  public async translate(message: Message, assistant: Assistant) {
+    const defaultModel = getDefaultModel()
+    const model = assistant.model || defaultModel
+    const messages = [
+      { role: 'system', content: assistant.prompt },
+      { role: 'user', content: message.content }
+    ]
+
+    const response = await this.sdk.messages.create({
+      model: model.id,
+      messages: messages.filter((m) => m.role === 'user') as MessageParam[],
+      max_tokens: 4096,
+      temperature: assistant?.settings?.temperature,
+      system: assistant.prompt,
+      stream: false
+    })
+
+    return response.content[0].type === 'text' ? response.content[0].text : ''
+  }
+
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+    const model = getTopNamingModel() || assistant.model || getDefaultModel()
+
+    const userMessages = takeRight(messages, 5).map((message) => ({
+      role: message.role,
+      content: message.content
+    }))
+
+    const systemMessage = {
+      role: 'system',
+      content: '你是一名擅长会话的助理，你需要将用户的会话总结为 10 个字以内的标题，不要使用标点符号和其他特殊符号。'
+    }
+
+    const message = await this.sdk.messages.create({
+      messages: userMessages as Anthropic.Messages.MessageParam[],
+      model: model.id,
+      system: systemMessage.content,
+      stream: false,
+      max_tokens: 4096
+    })
+
+    return message.content[0].type === 'text' ? message.content[0].text : null
+  }
+
+  public async suggestions(): Promise<Suggestion[]> {
+    return []
+  }
+
+  public async check(): Promise<{ valid: boolean; error: Error | null }> {
+    const model = this.provider.models[0]
+
+    const body = {
+      model: model.id,
+      messages: [{ role: 'user', content: 'hi' }],
+      max_tokens: 100,
+      stream: false
+    }
+
+    try {
+      const message = await this.sdk.messages.create(body as MessageCreateParamsNonStreaming)
+      return {
+        valid: message.content.length > 0,
+        error: null
+      }
+    } catch (error: any) {
+      return {
+        valid: false,
+        error
+      }
+    }
+  }
+
+  public async models(): Promise<OpenAI.Models.Model[]> {
+    return []
+  }
+}

src/renderer/src/providers/BaseProvider.ts

@@ -0,0 +1,33 @@
+import { getOllamaKeepAliveTime } from '@renderer/hooks/useOllama'
+import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import OpenAI from 'openai'
+
+export default abstract class BaseProvider {
+  protected provider: Provider
+  protected host: string
+
+  constructor(provider: Provider) {
+    this.provider = provider
+    this.host = this.getBaseURL()
+  }
+
+  public getBaseURL(): string {
+    const host = this.provider.apiHost
+    return host.endsWith('/') ? host : `${host}/v1/`
+  }
+
+  public get keepAliveTime() {
+    return this.provider.id === 'ollama' ? getOllamaKeepAliveTime() : undefined
+  }
+
+  abstract completions(
+    messages: Message[],
+    assistant: Assistant,
+    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
+  ): Promise<void>
+  abstract translate(message: Message, assistant: Assistant): Promise<string>
+  abstract summaries(messages: Message[], assistant: Assistant): Promise<string | null>
+  abstract suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]>
+  abstract check(): Promise<{ valid: boolean; error: Error | null }>
+  abstract models(): Promise<OpenAI.Models.Model[]>
+}

src/renderer/src/providers/GeminiProvider.ts

@@ -0,0 +1,170 @@
+import { GoogleGenerativeAI } from '@google/generative-ai'
+import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
+import { EVENT_NAMES } from '@renderer/services/event'
+import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import axios from 'axios'
+import { isEmpty, takeRight } from 'lodash'
+import OpenAI from 'openai'
+
+import BaseProvider from './BaseProvider'
+
+export default class GeminiProvider extends BaseProvider {
+  private sdk: GoogleGenerativeAI
+
+  constructor(provider: Provider) {
+    super(provider)
+    this.sdk = new GoogleGenerativeAI(provider.apiKey)
+  }
+
+  public async completions(
+    messages: Message[],
+    assistant: Assistant,
+    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
+  ) {
+    const defaultModel = getDefaultModel()
+    const model = assistant.model || defaultModel
+    const { contextCount, maxTokens } = getAssistantSettings(assistant)
+
+    const userMessages = takeRight(messages, contextCount + 1).map((message) => {
+      return {
+        role: message.role,
+        content: message.content
+      }
+    })
+
+    const geminiModel = this.sdk.getGenerativeModel({
+      model: model.id,
+      systemInstruction: assistant.prompt,
+      generationConfig: {
+        maxOutputTokens: maxTokens,
+        temperature: assistant?.settings?.temperature
+      }
+    })
+
+    const userLastMessage = userMessages.pop()
+
+    const chat = geminiModel.startChat({
+      history: userMessages.map((message) => ({
+        role: message.role === 'user' ? 'user' : 'model',
+        parts: [{ text: message.content }]
+      }))
+    })
+
+    const userMessagesStream = await chat.sendMessageStream(userLastMessage?.content!)
+
+    for await (const chunk of userMessagesStream.stream) {
+      if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) break
+      onChunk({
+        text: chunk.text(),
+        usage: {
+          prompt_tokens: chunk.usageMetadata?.promptTokenCount || 0,
+          completion_tokens: chunk.usageMetadata?.candidatesTokenCount || 0,
+          total_tokens: chunk.usageMetadata?.totalTokenCount || 0
+        }
+      })
+    }
+  }
+
+  async translate(message: Message, assistant: Assistant) {
+    const defaultModel = getDefaultModel()
+    const { maxTokens } = getAssistantSettings(assistant)
+    const model = assistant.model || defaultModel
+
+    const geminiModel = this.sdk.getGenerativeModel({
+      model: model.id,
+      systemInstruction: assistant.prompt,
+      generationConfig: {
+        maxOutputTokens: maxTokens,
+        temperature: assistant?.settings?.temperature
+      }
+    })
+
+    const { response } = await geminiModel.generateContent(message.content)
+
+    return response.text()
+  }
+
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+    const model = getTopNamingModel() || assistant.model || getDefaultModel()
+
+    const userMessages = takeRight(messages, 5).map((message) => ({
+      role: message.role,
+      content: message.content
+    }))
+
+    const systemMessage = {
+      role: 'system',
+      content: '你是一名擅长会话的助理，你需要将用户的会话总结为 10 个字以内的标题，不要使用标点符号和其他特殊符号。'
+    }
+
+    const geminiModel = this.sdk.getGenerativeModel({
+      model: model.id,
+      systemInstruction: systemMessage.content,
+      generationConfig: {
+        temperature: assistant?.settings?.temperature
+      }
+    })
+
+    const lastUserMessage = userMessages.pop()
+
+    const chat = await geminiModel.startChat({
+      history: userMessages.map((message) => ({
+        role: message.role === 'user' ? 'user' : 'model',
+        parts: [{ text: message.content }]
+      }))
+    })
+
+    const { response } = await chat.sendMessage(lastUserMessage?.content!)
+
+    return response.text()
+  }
+
+  public async suggestions(): Promise<Suggestion[]> {
+    return []
+  }
+
+  public async check(): Promise<{ valid: boolean; error: Error | null }> {
+    const model = this.provider.models[0]
+
+    const body = {
+      model: model.id,
+      messages: [{ role: 'user', content: 'hi' }],
+      max_tokens: 100,
+      stream: false
+    }
+
+    try {
+      const geminiModel = this.sdk.getGenerativeModel({ model: body.model })
+      const result = await geminiModel.generateContent(body.messages[0].content)
+      return {
+        valid: !isEmpty(result.response.text()),
+        error: null
+      }
+    } catch (error: any) {
+      return {
+        valid: false,
+        error
+      }
+    }
+  }
+
+  public async models(): Promise<OpenAI.Models.Model[]> {
+    try {
+      const api = this.provider.apiHost + '/v1beta/models'
+      const { data } = await axios.get(api, { params: { key: this.provider.apiKey } })
+      return data.models.map(
+        (m: any) =>
+          ({
+            id: m.name.replace('models/', ''),
+            name: m.displayName,
+            description: m.description,
+            object: 'model',
+            created: Date.now(),
+            owned_by: 'gemini'
+          }) as OpenAI.Models.Model
+      )
+    } catch (error) {
+      return []
+    }
+  }
+}

src/renderer/src/providers/OpenAIProvider.ts

@@ -0,0 +1,185 @@
+import { isLocalAi } from '@renderer/config/env'
+import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
+import { EVENT_NAMES } from '@renderer/services/event'
+import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import { fileToBase64, removeQuotes } from '@renderer/utils'
+import { first, takeRight } from 'lodash'
+import OpenAI from 'openai'
+import {
+  ChatCompletionContentPart,
+  ChatCompletionCreateParamsNonStreaming,
+  ChatCompletionMessageParam
+} from 'openai/resources'
+
+import BaseProvider from './BaseProvider'
+
+export default class OpenAIProvider extends BaseProvider {
+  private sdk: OpenAI
+
+  constructor(provider: Provider) {
+    super(provider)
+    this.sdk = new OpenAI({
+      dangerouslyAllowBrowser: true,
+      apiKey: provider.apiKey,
+      baseURL: this.getBaseURL()
+    })
+  }
+
+  private async getMessageContent(message: Message): Promise<string | ChatCompletionContentPart[]> {
+    const file = first(message.files)
+
+    if (!file) {
+      return message.content
+    }
+
+    if (file.type.includes('image')) {
+      return [
+        { type: 'text', text: message.content },
+        {
+          type: 'image_url',
+          image_url: {
+            url: await fileToBase64(file)
+          }
+        }
+      ]
+    }
+
+    return message.content
+  }
+
+  async completions(
+    messages: Message[],
+    assistant: Assistant,
+    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
+  ): Promise<void> {
+    const defaultModel = getDefaultModel()
+    const model = assistant.model || defaultModel
+    const { contextCount, maxTokens } = getAssistantSettings(assistant)
+
+    const systemMessage = assistant.prompt ? { role: 'system', content: assistant.prompt } : undefined
+
+    const userMessages: ChatCompletionMessageParam[] = []
+
+    for (const message of takeRight(messages, contextCount + 1)) {
+      userMessages.push({
+        role: message.role,
+        content: await this.getMessageContent(message)
+      } as ChatCompletionMessageParam)
+    }
+
+    // @ts-ignore key is not typed
+    const stream = await this.sdk.chat.completions.create({
+      model: model.id,
+      messages: [systemMessage, ...userMessages].filter(Boolean) as ChatCompletionMessageParam[],
+      stream: true,
+      temperature: assistant?.settings?.temperature,
+      max_tokens: maxTokens,
+      keep_alive: this.keepAliveTime
+    })
+
+    for await (const chunk of stream) {
+      if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) break
+      onChunk({ text: chunk.choices[0]?.delta?.content || '', usage: chunk.usage })
+    }
+  }
+
+  async translate(message: Message, assistant: Assistant) {
+    const defaultModel = getDefaultModel()
+    const model = assistant.model || defaultModel
+    const messages = [
+      { role: 'system', content: assistant.prompt },
+      { role: 'user', content: message.content }
+    ]
+
+    // @ts-ignore key is not typed
+    const response = await this.sdk.chat.completions.create({
+      model: model.id,
+      messages: messages as ChatCompletionMessageParam[],
+      stream: false,
+      keep_alive: this.keepAliveTime
+    })
+
+    return response.choices[0].message?.content || ''
+  }
+
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+    const model = getTopNamingModel() || assistant.model || getDefaultModel()
+
+    const userMessages = takeRight(messages, 5).map((message) => ({
+      role: message.role,
+      content: message.content
+    }))
+
+    const systemMessage = {
+      role: 'system',
+      content: '你是一名擅长会话的助理，你需要将用户的会话总结为 10 个字以内的标题，不要使用标点符号和其他特殊符号。'
+    }
+
+    // @ts-ignore key is not typed
+    const response = await this.sdk.chat.completions.create({
+      model: model.id,
+      messages: [systemMessage, ...(isLocalAi ? [first(userMessages)] : userMessages)] as ChatCompletionMessageParam[],
+      stream: false,
+      max_tokens: 50,
+      keep_alive: this.keepAliveTime
+    })
+
+    return removeQuotes(response.choices[0].message?.content?.substring(0, 50) || '')
+  }
+
+  async suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]> {
+    const model = assistant.model
+
+    if (!model) {
+      return []
+    }
+
+    const response: any = await this.sdk.request({
+      method: 'post',
+      path: '/advice_questions',
+      body: {
+        messages: messages.filter((m) => m.role === 'user').map((m) => ({ role: m.role, content: m.content })),
+        model: model.id,
+        max_tokens: 0,
+        temperature: 0,
+        n: 0
+      }
+    })
+
+    return response?.questions?.filter(Boolean)?.map((q: any) => ({ content: q })) || []
+  }
+
+  public async check(): Promise<{ valid: boolean; error: Error | null }> {
+    const model = this.provider.models[0]
+
+    const body = {
+      model: model.id,
+      messages: [{ role: 'user', content: 'hi' }],
+      max_tokens: 100,
+      stream: false
+    }
+
+    try {
+      const response = await this.sdk.chat.completions.create(body as ChatCompletionCreateParamsNonStreaming)
+
+      return {
+        valid: Boolean(response?.choices[0].message),
+        error: null
+      }
+    } catch (error: any) {
+      return {
+        valid: false,
+        error
+      }
+    }
+  }
+
+  public async models(): Promise<OpenAI.Models.Model[]> {
+    try {
+      const response = await this.sdk.models.list()
+      return response.data
+    } catch (error) {
+      return []
+    }
+  }
+}

src/renderer/src/providers/ProviderFactory.ts

@@ -0,0 +1,19 @@
+import { Provider } from '@renderer/types'
+
+import AnthropicProvider from './AnthropicProvider'
+import BaseProvider from './BaseProvider'
+import GeminiProvider from './GeminiProvider'
+import OpenAIProvider from './OpenAIProvider'
+
+export default class ProviderFactory {
+  static create(provider: Provider): BaseProvider {
+    switch (provider.id) {
+      case 'anthropic':
+        return new AnthropicProvider(provider)
+      case 'gemini':
+        return new GeminiProvider(provider)
+      default:
+        return new OpenAIProvider(provider)
+    }
+  }
+}

src/renderer/src/services/ProviderSDK.ts

@@ -1,343 +0,0 @@
-import Anthropic from '@anthropic-ai/sdk'
-import { MessageCreateParamsNonStreaming, MessageParam } from '@anthropic-ai/sdk/resources'
-import { GoogleGenerativeAI } from '@google/generative-ai'
-import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
-import { getOllamaKeepAliveTime } from '@renderer/hooks/useOllama'
-import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
-import { removeQuotes } from '@renderer/utils'
-import axios from 'axios'
-import { isEmpty, sum, takeRight } from 'lodash'
-import OpenAI from 'openai'
-import { ChatCompletionCreateParamsNonStreaming, ChatCompletionMessageParam } from 'openai/resources'
-
-import { getAssistantSettings, getDefaultModel, getTopNamingModel } from './assistant'
-import { EVENT_NAMES } from './event'
-
-export default class ProviderSDK {
-  provider: Provider
-  openaiSdk: OpenAI
-  anthropicSdk: Anthropic
-  geminiSdk: GoogleGenerativeAI
-
-  constructor(provider: Provider) {
-    this.provider = provider
-    const host = provider.apiHost
-    const baseURL = host.endsWith('/') ? host : `${provider.apiHost}/v1/`
-    this.anthropicSdk = new Anthropic({ apiKey: provider.apiKey, baseURL })
-    this.openaiSdk = new OpenAI({ dangerouslyAllowBrowser: true, apiKey: provider.apiKey, baseURL })
-    this.geminiSdk = new GoogleGenerativeAI(provider.apiKey)
-  }
-
-  private get isAnthropic() {
-    return this.provider.id === 'anthropic'
-  }
-
-  private get isGemini() {
-    return this.provider.id === 'gemini'
-  }
-
-  private get keepAliveTime() {
-    return this.provider.id === 'ollama' ? getOllamaKeepAliveTime() : undefined
-  }
-
-  public async completions(
-    messages: Message[],
-    assistant: Assistant,
-    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
-  ) {
-    const defaultModel = getDefaultModel()
-    const model = assistant.model || defaultModel
-    const { contextCount, maxTokens } = getAssistantSettings(assistant)
-
-    const systemMessage = assistant.prompt ? { role: 'system', content: assistant.prompt } : undefined
-    const userMessages = takeRight(messages, contextCount + 1).map((message) => ({
-      role: message.role,
-      content: message.content
-    }))
-
-    if (this.isAnthropic) {
-      return new Promise<void>((resolve, reject) => {
-        const stream = this.anthropicSdk.messages
-          .stream({
-            model: model.id,
-            messages: userMessages.filter(Boolean) as MessageParam[],
-            max_tokens: maxTokens || DEFAULT_MAX_TOKENS,
-            temperature: assistant?.settings?.temperature,
-            system: assistant.prompt,
-            stream: true
-          })
-          .on('text', (text) => {
-            if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) {
-              resolve()
-              return stream.controller.abort()
-            }
-            onChunk({ text })
-          })
-          .on('finalMessage', (message) => {
-            onChunk({
-              text: '',
-              usage: {
-                prompt_tokens: message.usage.input_tokens,
-                completion_tokens: message.usage.output_tokens,
-                total_tokens: sum(Object.values(message.usage))
-              }
-            })
-            resolve()
-          })
-          .on('error', (error) => reject(error))
-      })
-    }
-
-    if (this.isGemini) {
-      const geminiModel = this.geminiSdk.getGenerativeModel({
-        model: model.id,
-        systemInstruction: assistant.prompt,
-        generationConfig: {
-          maxOutputTokens: maxTokens,
-          temperature: assistant?.settings?.temperature
-        }
-      })
-
-      const userLastMessage = userMessages.pop()
-
-      const chat = geminiModel.startChat({
-        history: userMessages.map((message) => ({
-          role: message.role === 'user' ? 'user' : 'model',
-          parts: [{ text: message.content }]
-        }))
-      })
-
-      const userMessagesStream = await chat.sendMessageStream(userLastMessage?.content!)
-
-      for await (const chunk of userMessagesStream.stream) {
-        if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) break
-        onChunk({
-          text: chunk.text(),
-          usage: {
-            prompt_tokens: chunk.usageMetadata?.promptTokenCount || 0,
-            completion_tokens: chunk.usageMetadata?.candidatesTokenCount || 0,
-            total_tokens: chunk.usageMetadata?.totalTokenCount || 0
-          }
-        })
-      }
-
-      return
-    }
-
-    // @ts-ignore key is not typed
-    const stream = await this.openaiSdk.chat.completions.create({
-      model: model.id,
-      messages: [systemMessage, ...userMessages].filter(Boolean) as ChatCompletionMessageParam[],
-      stream: true,
-      temperature: assistant?.settings?.temperature,
-      max_tokens: maxTokens,
-      keep_alive: this.keepAliveTime
-    })
-
-    for await (const chunk of stream) {
-      if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) break
-      onChunk({ text: chunk.choices[0]?.delta?.content || '', usage: chunk.usage })
-    }
-  }
-
-  public async translate(message: Message, assistant: Assistant) {
-    const defaultModel = getDefaultModel()
-    const { maxTokens } = getAssistantSettings(assistant)
-    const model = assistant.model || defaultModel
-    const messages = [
-      { role: 'system', content: assistant.prompt },
-      { role: 'user', content: message.content }
-    ]
-
-    if (this.isAnthropic) {
-      const response = await this.anthropicSdk.messages.create({
-        model: model.id,
-        messages: messages.filter((m) => m.role === 'user') as MessageParam[],
-        max_tokens: 4096,
-        temperature: assistant?.settings?.temperature,
-        system: assistant.prompt,
-        stream: false
-      })
-
-      return response.content[0].type === 'text' ? response.content[0].text : ''
-    }
-
-    if (this.isGemini) {
-      const geminiModel = this.geminiSdk.getGenerativeModel({
-        model: model.id,
-        systemInstruction: assistant.prompt,
-        generationConfig: {
-          maxOutputTokens: maxTokens,
-          temperature: assistant?.settings?.temperature
-        }
-      })
-
-      const { response } = await geminiModel.generateContent(message.content)
-
-      return response.text()
-    }
-
-    // @ts-ignore key is not typed
-    const response = await this.openaiSdk.chat.completions.create({
-      model: model.id,
-      messages: messages as ChatCompletionMessageParam[],
-      stream: false,
-      keep_alive: this.keepAliveTime
-    })
-
-    return response.choices[0].message?.content || ''
-  }
-
-  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
-    const model = getTopNamingModel() || assistant.model || getDefaultModel()
-
-    const userMessages = takeRight(messages, 5).map((message) => ({
-      role: message.role,
-      content: message.content
-    }))
-
-    const systemMessage = {
-      role: 'system',
-      content: '你是一名擅长会话的助理，你需要将用户的会话总结为 10 个字以内的标题，不要使用标点符号和其他特殊符号。'
-    }
-
-    if (this.isAnthropic) {
-      const message = await this.anthropicSdk.messages.create({
-        messages: userMessages as Anthropic.Messages.MessageParam[],
-        model: model.id,
-        system: systemMessage.content,
-        stream: false,
-        max_tokens: 4096
-      })
-
-      return message.content[0].type === 'text' ? message.content[0].text : null
-    }
-
-    if (this.isGemini) {
-      const geminiModel = this.geminiSdk.getGenerativeModel({
-        model: model.id,
-        systemInstruction: systemMessage.content,
-        generationConfig: {
-          temperature: assistant?.settings?.temperature
-        }
-      })
-
-      const lastUserMessage = userMessages.pop()
-
-      const chat = await geminiModel.startChat({
-        history: userMessages.map((message) => ({
-          role: message.role === 'user' ? 'user' : 'model',
-          parts: [{ text: message.content }]
-        }))
-      })
-
-      const { response } = await chat.sendMessage(lastUserMessage?.content!)
-
-      return response.text()
-    }
-
-    // @ts-ignore key is not typed
-    const response = await this.openaiSdk.chat.completions.create({
-      model: model.id,
-      messages: [systemMessage, ...userMessages] as ChatCompletionMessageParam[],
-      stream: false,
-      max_tokens: 50,
-      keep_alive: this.keepAliveTime
-    })
-
-    return removeQuotes(response.choices[0].message?.content || '')
-  }
-
-  public async suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]> {
-    const model = assistant.model
-
-    if (!model) {
-      return []
-    }
-
-    const response: any = await this.openaiSdk.request({
-      method: 'post',
-      path: '/advice_questions',
-      body: {
-        messages: messages.filter((m) => m.role === 'user').map((m) => ({ role: m.role, content: m.content })),
-        model: model.id,
-        max_tokens: 0,
-        temperature: 0,
-        n: 0
-      }
-    })
-
-    return response?.questions?.filter(Boolean)?.map((q: any) => ({ content: q })) || []
-  }
-
-  public async check(): Promise<{ valid: boolean; error: Error | null }> {
-    const model = this.provider.models[0]
-
-    const body = {
-      model: model.id,
-      messages: [{ role: 'user', content: 'hi' }],
-      max_tokens: 100,
-      stream: false
-    }
-
-    try {
-      if (this.isAnthropic) {
-        const message = await this.anthropicSdk.messages.create(body as MessageCreateParamsNonStreaming)
-        return {
-          valid: message.content.length > 0,
-          error: null
-        }
-      }
-
-      if (this.isGemini) {
-        const geminiModel = this.geminiSdk.getGenerativeModel({ model: body.model })
-        const result = await geminiModel.generateContent(body.messages[0].content)
-        return {
-          valid: !isEmpty(result.response.text()),
-          error: null
-        }
-      }
-
-      const response = await this.openaiSdk.chat.completions.create(body as ChatCompletionCreateParamsNonStreaming)
-
-      return {
-        valid: Boolean(response?.choices[0].message),
-        error: null
-      }
-    } catch (error: any) {
-      return {
-        valid: false,
-        error
-      }
-    }
-  }
-
-  public async models(): Promise<OpenAI.Models.Model[]> {
-    try {
-      if (this.isAnthropic) {
-        return []
-      }
-
-      if (this.isGemini) {
-        const api = this.provider.apiHost + '/v1beta/models'
-        const { data } = await axios.get(api, { params: { key: this.provider.apiKey } })
-        return data.models.map(
-          (m: any) =>
-            ({
-              id: m.name.replace('models/', ''),
-              name: m.displayName,
-              description: m.description,
-              object: 'model',
-              created: Date.now(),
-              owned_by: 'gemini'
-            }) as OpenAI.Models.Model
-        )
-      }
-
-      const response = await this.openaiSdk.models.list()
-      return response.data
-    } catch (error) {
-      return []
-    }
-  }
-}

src/renderer/src/services/api.ts

@@ -6,6 +6,7 @@ import { uuid } from '@renderer/utils'
 import dayjs from 'dayjs'
 import { isEmpty } from 'lodash'
 
+import AiProvider from '../providers/AiProvider'
 import {
   getAssistantProvider,
   getDefaultModel,
@@ -15,7 +16,6 @@ import {
 } from './assistant'
 import { EVENT_NAMES, EventEmitter } from './event'
 import { filterMessages } from './messages'
-import ProviderSDK from './ProviderSDK'
 
 export async function fetchChatCompletion({
   messages,
@@ -33,7 +33,7 @@ export async function fetchChatCompletion({
   const provider = getAssistantProvider(assistant)
   const defaultModel = getDefaultModel()
   const model = assistant.model || defaultModel
-  const providerSdk = new ProviderSDK(provider)
+  const AI = new AiProvider(provider)
 
   store.dispatch(setGenerating(true))
 
@@ -61,7 +61,7 @@ export async function fetchChatCompletion({
   }, 1000)
 
   try {
-    await providerSdk.completions(filterMessages(messages), assistant, ({ text, usage }) => {
+    await AI.completions(filterMessages(messages), assistant, ({ text, usage }) => {
       message.content = message.content + text || ''
       message.usage = usage
       onResponse({ ...message, status: 'pending' })
@@ -103,10 +103,10 @@ export async function fetchTranslate({ message, assistant }: { message: Message;
     return ''
   }
 
-  const providerSdk = new ProviderSDK(provider)
+  const AI = new AiProvider(provider)
 
   try {
-    return await providerSdk.translate(message, assistant)
+    return await AI.translate(message, assistant)
   } catch (error: any) {
     return ''
   }
@@ -120,10 +120,10 @@ export async function fetchMessagesSummary({ messages, assistant }: { messages:
     return null
   }
 
-  const providerSdk = new ProviderSDK(provider)
+  const AI = new AiProvider(provider)
 
   try {
-    return await providerSdk.summaries(filterMessages(messages), assistant)
+    return await AI.summaries(filterMessages(messages), assistant)
   } catch (error: any) {
     return null
   }
@@ -136,10 +136,8 @@ export async function fetchSuggestions({
   messages: Message[]
   assistant: Assistant
 }): Promise<Suggestion[]> {
-  console.debug('fetchSuggestions', messages, assistant)
   const provider = getAssistantProvider(assistant)
-  const providerSdk = new ProviderSDK(provider)
-  console.debug('fetchSuggestions', provider)
+  const AI = new AiProvider(provider)
   const model = assistant.model
 
   if (!model) {
@@ -155,7 +153,7 @@ export async function fetchSuggestions({
   }
 
   try {
-    return await providerSdk.suggestions(messages, assistant)
+    return await AI.suggestions(messages, assistant)
   } catch (error: any) {
     return []
   }
@@ -166,9 +164,11 @@ export async function checkApi(provider: Provider) {
   const key = 'api-check'
   const style = { marginTop: '3vh' }
 
-  if (!provider.apiKey) {
-    window.message.error({ content: i18n.t('message.error.enter.api.key'), key, style })
-    return false
+  if (provider.id !== 'ollama') {
+    if (!provider.apiKey) {
+      window.message.error({ content: i18n.t('message.error.enter.api.key'), key, style })
+      return false
+    }
   }
 
   if (!provider.apiHost) {
@@ -181,9 +181,9 @@ export async function checkApi(provider: Provider) {
     return false
   }
 
-  const providerSdk = new ProviderSDK(provider)
+  const AI = new AiProvider(provider)
 
-  const { valid } = await providerSdk.check()
+  const { valid } = await AI.check()
 
   window.message[valid ? 'success' : 'error']({
     key: 'api-check',
@@ -202,10 +202,10 @@ function hasApiKey(provider: Provider) {
 }
 
 export async function fetchModels(provider: Provider) {
-  const providerSdk = new ProviderSDK(provider)
+  const AI = new AiProvider(provider)
 
   try {
-    return await providerSdk.models()
+    return await AI.models()
   } catch (error) {
     return []
   }

src/renderer/src/store/llm.ts

@@ -1,4 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { isLocalAi } from '@renderer/config/env'
 import { SYSTEM_MODELS } from '@renderer/config/models'
 import { Model, Provider } from '@renderer/types'
 import { uniqBy } from 'lodash'
@@ -18,34 +19,52 @@ export interface LlmState {
 }
 
 const initialState: LlmState = {
-  defaultModel: SYSTEM_MODELS.openai[0],
-  topicNamingModel: SYSTEM_MODELS.openai[0],
-  translateModel: SYSTEM_MODELS.openai[0],
+  defaultModel: SYSTEM_MODELS.silicon[0],
+  topicNamingModel: SYSTEM_MODELS.silicon[0],
+  translateModel: SYSTEM_MODELS.silicon[0],
   providers: [
+    {
+      id: 'silicon',
+      name: 'Silicon',
+      apiKey: '',
+      apiHost: 'https://api.siliconflow.cn',
+      models: SYSTEM_MODELS.silicon,
+      isSystem: true,
+      enabled: true
+    },
+    {
+      id: 'ollama',
+      name: 'Ollama',
+      apiKey: '',
+      apiHost: 'http://localhost:11434/v1/',
+      models: SYSTEM_MODELS.ollama,
+      isSystem: true,
+      enabled: false
+    },
+    {
+      id: 'anthropic',
+      name: 'Anthropic',
+      apiKey: '',
+      apiHost: 'https://api.anthropic.com/',
+      models: SYSTEM_MODELS.anthropic,
+      isSystem: true,
+      enabled: false
+    },
     {
       id: 'openai',
       name: 'OpenAI',
       apiKey: '',
       apiHost: 'https://api.openai.com',
-      models: SYSTEM_MODELS.openai.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.openai,
       isSystem: true,
-      enabled: true
+      enabled: false
     },
     {
       id: 'gemini',
       name: 'Gemini',
       apiKey: '',
       apiHost: 'https://generativelanguage.googleapis.com',
-      models: SYSTEM_MODELS.gemini.filter((m) => m.enabled),
-      isSystem: true,
-      enabled: false
-    },
-    {
-      id: 'silicon',
-      name: 'Silicon',
-      apiKey: '',
-      apiHost: 'https://api.siliconflow.cn',
-      models: SYSTEM_MODELS.silicon.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.gemini,
       isSystem: true,
       enabled: false
     },
@@ -54,7 +73,7 @@ const initialState: LlmState = {
       name: 'deepseek',
       apiKey: '',
       apiHost: 'https://api.deepseek.com',
-      models: SYSTEM_MODELS.deepseek.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.deepseek,
       isSystem: true,
       enabled: false
     },
@@ -63,7 +82,7 @@ const initialState: LlmState = {
       name: 'Yi',
       apiKey: '',
       apiHost: 'https://api.lingyiwanwu.com',
-      models: SYSTEM_MODELS.yi.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.yi,
       isSystem: true,
       enabled: false
     },
@@ -72,7 +91,7 @@ const initialState: LlmState = {
       name: 'ZhiPu',
       apiKey: '',
       apiHost: 'https://open.bigmodel.cn/api/paas/v4/',
-      models: SYSTEM_MODELS.zhipu.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.zhipu,
       isSystem: true,
       enabled: false
     },
@@ -81,7 +100,7 @@ const initialState: LlmState = {
       name: 'Moonshot AI',
       apiKey: '',
       apiHost: 'https://api.moonshot.cn',
-      models: SYSTEM_MODELS.moonshot.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.moonshot,
       isSystem: true,
       enabled: false
     },
@@ -90,7 +109,7 @@ const initialState: LlmState = {
       name: 'BAICHUAN AI',
       apiKey: '',
       apiHost: 'https://api.baichuan-ai.com',
-      models: SYSTEM_MODELS.baichuan.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.baichuan,
       isSystem: true,
       enabled: false
     },
@@ -99,7 +118,7 @@ const initialState: LlmState = {
       name: 'DashScope',
       apiKey: '',
       apiHost: 'https://dashscope.aliyuncs.com/compatible-mode/v1/',
-      models: SYSTEM_MODELS.dashscope.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.dashscope,
       isSystem: true,
       enabled: false
     },
@@ -108,7 +127,7 @@ const initialState: LlmState = {
       name: 'StepFun',
       apiKey: '',
       apiHost: 'https://api.stepfun.com',
-      models: SYSTEM_MODELS.stepfun.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.stepfun,
       isSystem: true,
       enabled: false
     },
@@ -117,7 +136,7 @@ const initialState: LlmState = {
       name: 'doubao',
       apiKey: '',
       apiHost: 'https://ark.cn-beijing.volces.com/api/v3/',
-      models: SYSTEM_MODELS.doubao.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.doubao,
       isSystem: true,
       enabled: false
     },
@@ -126,16 +145,7 @@ const initialState: LlmState = {
       name: 'MiniMax',
       apiKey: '',
       apiHost: 'https://api.minimax.chat/v1/',
-      models: SYSTEM_MODELS.minimax.filter((m) => m.enabled),
-      isSystem: true,
-      enabled: false
-    },
-    {
-      id: 'aihubmix',
-      name: 'AiHubMix',
-      apiKey: '',
-      apiHost: 'https://aihubmix.com',
-      models: SYSTEM_MODELS.aihubmix.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.minimax,
       isSystem: true,
       enabled: false
     },
@@ -153,7 +163,7 @@ const initialState: LlmState = {
       name: 'OpenRouter',
       apiKey: '',
       apiHost: 'https://openrouter.ai/api/v1/',
-      models: SYSTEM_MODELS.openrouter.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.openrouter,
       isSystem: true,
       enabled: false
     },
@@ -162,25 +172,16 @@ const initialState: LlmState = {
       name: 'Groq',
       apiKey: '',
       apiHost: 'https://api.groq.com/openai',
-      models: SYSTEM_MODELS.groq.filter((m) => m.enabled),
+      models: SYSTEM_MODELS.groq,
       isSystem: true,
       enabled: false
     },
     {
-      id: 'anthropic',
-      name: 'Anthropic',
+      id: 'aihubmix',
+      name: 'AiHubMix',
       apiKey: '',
-      apiHost: 'https://api.anthropic.com/',
-      models: SYSTEM_MODELS.anthropic.filter((m) => m.enabled),
-      isSystem: true,
-      enabled: false
-    },
-    {
-      id: 'ollama',
-      name: 'Ollama',
-      apiKey: '',
-      apiHost: 'http://localhost:11434/v1/',
-      models: [],
+      apiHost: 'https://aihubmix.com',
+      models: SYSTEM_MODELS.aihubmix,
       isSystem: true,
       enabled: false
     }
@@ -192,9 +193,35 @@ const initialState: LlmState = {
   }
 }
 
+const getIntegratedInitialState = () => {
+  const model = JSON.parse(import.meta.env.VITE_RENDERER_INTEGRATED_MODEL)
+
+  return {
+    defaultModel: model,
+    topicNamingModel: model,
+    translateModel: model,
+    providers: [
+      {
+        id: 'ollama',
+        name: 'Ollama',
+        apiKey: 'ollama',
+        apiHost: 'http://localhost:15537/v1/',
+        models: [model],
+        isSystem: true,
+        enabled: true
+      }
+    ],
+    settings: {
+      ollama: {
+        keepAliveTime: 3600
+      }
+    }
+  } as LlmState
+}
+
 const settingsSlice = createSlice({
   name: 'llm',
-  initialState,
+  initialState: isLocalAi ? getIntegratedInitialState() : initialState,
   reducers: {
     updateProvider: (state, action: PayloadAction<Provider>) => {
       state.providers = state.providers.map((p) => (p.id === action.payload.id ? { ...p, ...action.payload } : p))

src/renderer/src/store/migrate.ts

@@ -20,7 +20,7 @@ const migrateConfig = {
             apiKey: '',
             apiHost: 'https://api.lingyiwanwu.com',
             isSystem: true,
-            models: SYSTEM_MODELS.yi.filter((m) => m.enabled)
+            models: SYSTEM_MODELS.yi
           }
         ]
       }
@@ -39,7 +39,7 @@ const migrateConfig = {
             apiKey: '',
             apiHost: 'https://open.bigmodel.cn/api/paas/v4/',
             isSystem: true,
-            models: SYSTEM_MODELS.zhipu.filter((m) => m.enabled)
+            models: SYSTEM_MODELS.zhipu
           }
         ]
       }
@@ -77,7 +77,7 @@ const migrateConfig = {
             apiKey: '',
             apiHost: 'https://api.moonshot.cn',
             isSystem: true,
-            models: SYSTEM_MODELS.moonshot.filter((m) => m.enabled)
+            models: SYSTEM_MODELS.moonshot
           }
         ]
       }
@@ -95,7 +95,7 @@ const migrateConfig = {
             name: 'OpenRouter',
             apiKey: '',
             apiHost: 'https://openrouter.ai/api/v1/',
-            models: SYSTEM_MODELS.openrouter.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.openrouter,
             isSystem: true
           }
         ]
@@ -143,7 +143,7 @@ const migrateConfig = {
         ...state.llm,
         providers: state.llm.providers.map((provider) => {
           if (provider.id === 'zhipu' && provider.models[0] && provider.models[0].id === 'llama3-70b-8192') {
-            provider.models = SYSTEM_MODELS.zhipu.filter((m) => m.enabled)
+            provider.models = SYSTEM_MODELS.zhipu
           }
           return provider
         })
@@ -162,7 +162,7 @@ const migrateConfig = {
             name: 'BAICHUAN AI',
             apiKey: '',
             apiHost: 'https://api.baichuan-ai.com',
-            models: SYSTEM_MODELS.baichuan.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.baichuan,
             isSystem: true,
             enabled: false
           }
@@ -182,7 +182,7 @@ const migrateConfig = {
             name: 'DashScope',
             apiKey: '',
             apiHost: 'https://dashscope.aliyuncs.com/compatible-mode/v1/',
-            models: SYSTEM_MODELS.dashscope.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.dashscope,
             isSystem: true,
             enabled: false
           },
@@ -191,7 +191,7 @@ const migrateConfig = {
             name: 'Anthropic',
             apiKey: '',
             apiHost: 'https://api.anthropic.com/',
-            models: SYSTEM_MODELS.anthropic.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.anthropic,
             isSystem: true,
             enabled: false
           }
@@ -211,7 +211,7 @@ const migrateConfig = {
             name: 'AiHubMix',
             apiKey: '',
             apiHost: 'https://aihubmix.com',
-            models: SYSTEM_MODELS.aihubmix.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.aihubmix,
             isSystem: true,
             enabled: false
           }
@@ -309,7 +309,7 @@ const migrateConfig = {
             name: 'Gemini',
             apiKey: '',
             apiHost: 'https://generativelanguage.googleapis.com',
-            models: SYSTEM_MODELS.gemini.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.gemini,
             isSystem: true,
             enabled: false
           },
@@ -318,7 +318,7 @@ const migrateConfig = {
             name: 'StepFun',
             apiKey: '',
             apiHost: 'https://api.stepfun.com',
-            models: SYSTEM_MODELS.stepfun.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.stepfun,
             isSystem: true,
             enabled: false
           },
@@ -327,7 +327,7 @@ const migrateConfig = {
             name: 'doubao',
             apiKey: '',
             apiHost: 'https://ark.cn-beijing.volces.com/api/v3/',
-            models: SYSTEM_MODELS.doubao.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.doubao,
             isSystem: true,
             enabled: false
           },
@@ -356,7 +356,7 @@ const migrateConfig = {
             name: 'MiniMax',
             apiKey: '',
             apiHost: 'https://api.minimax.chat/v1/',
-            models: SYSTEM_MODELS.minimax.filter((m) => m.enabled),
+            models: SYSTEM_MODELS.minimax,
             isSystem: true,
             enabled: false
           }

src/renderer/src/store/runtime.ts

@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import Logo from '@renderer/assets/images/logo.png'
+import { AppLogo, UserAvatar } from '@renderer/config/env'
 
 export interface RuntimeState {
   avatar: string
@@ -8,7 +8,7 @@ export interface RuntimeState {
 }
 
 const initialState: RuntimeState = {
-  avatar: Logo,
+  avatar: UserAvatar,
   generating: false,
   minappShow: false
 }
@@ -18,7 +18,7 @@ const runtimeSlice = createSlice({
   initialState,
   reducers: {
     setAvatar: (state, action: PayloadAction<string | null>) => {
-      state.avatar = action.payload || Logo
+      state.avatar = action.payload || AppLogo
     },
     setGenerating: (state, action: PayloadAction<boolean>) => {
       state.generating = action.payload

src/renderer/src/store/settings.ts

@@ -9,7 +9,6 @@ export enum ThemeMode {
 }
 
 export interface SettingsState {
-  showRightSidebar: boolean
   showAssistants: boolean
   sendMessageShortcut: SendMessageShortcut
   language: string
@@ -23,7 +22,6 @@ export interface SettingsState {
 }
 
 const initialState: SettingsState = {
-  showRightSidebar: true,
   showAssistants: true,
   sendMessageShortcut: 'Enter',
   language: navigator.language,
@@ -40,12 +38,6 @@ const settingsSlice = createSlice({
   name: 'settings',
   initialState,
   reducers: {
-    toggleRightSidebar: (state) => {
-      state.showRightSidebar = !state.showRightSidebar
-    },
-    setShowRightSidebar: (state, action: PayloadAction<boolean>) => {
-      state.showRightSidebar = action.payload
-    },
     toggleShowAssistants: (state) => {
       state.showAssistants = !state.showAssistants
     },
@@ -80,8 +72,6 @@ const settingsSlice = createSlice({
 })
 
 export const {
-  setShowRightSidebar,
-  toggleRightSidebar,
   toggleShowAssistants,
   setSendMessageShortcut,
   setLanguage,

src/renderer/src/types/index.ts

@@ -20,13 +20,15 @@ export type AssistantSettings = {
 
 export type Message = {
   id: string
+  assistantId: string
   role: 'user' | 'assistant'
   content: string
-  assistantId: string
   topicId: string
-  modelId?: string
   createdAt: string
   status: 'sending' | 'pending' | 'success' | 'paused' | 'error'
+  modelId?: string
+  files?: File[]
+  images?: string[]
   usage?: OpenAI.Completions.CompletionUsage
   type?: 'text' | '@'
 }

src/renderer/src/utils/index.ts

@@ -223,3 +223,18 @@ export function getBriefInfo(text: string, maxLength: number = 50): string {
   // 截取前面的内容，并在末尾添加 "..."
   return truncatedText + '...'
 }
+
+export async function fileToBase64(file: File): Promise<string> {
+  return new Promise((resolve, reject) => {
+    try {
+      const reader = new FileReader()
+      reader.onload = (e: ProgressEvent<FileReader>) => {
+        const result = e.target?.result
+        resolve(typeof result === 'string' ? result : '')
+      }
+      reader.readAsDataURL(file)
+    } catch (error: any) {
+      reject(error)
+    }
+  })
+}

tsconfig.json

@@ -1,4 +1,11 @@
 {
   "files": [],
-  "references": [{ "path": "./tsconfig.node.json" }, { "path": "./tsconfig.web.json" }]
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    },
+    {
+      "path": "./tsconfig.web.json"
+    }
+  ]
 }

tsconfig.node.json

@@ -1,8 +1,15 @@
 {
   "extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
-  "include": ["electron.vite.config.*", "src/main/**/*", "src/preload/**/*"],
+  "include": [
+    "electron.vite.config.*",
+    "src/main/**/*",
+    "src/preload/**/*",
+    "src/main/env.d.ts",
+  ],
   "compilerOptions": {
     "composite": true,
-    "types": ["electron-vite/node"]
+    "types": [
+      "electron-vite/node"
+    ]
   }
 }

tsconfig.web.json

@@ -4,7 +4,8 @@
     "src/renderer/src/env.d.ts",
     "src/renderer/src/**/*",
     "src/renderer/src/**/*.tsx",
-    "src/preload/*.d.ts"
+    "src/preload/*.d.ts",
+    "local/src/renderer/**/*",
   ],
   "compilerOptions": {
     "composite": true,