chore(version): 0.7.4

- Added functionality for handling MinApp window closure and provided a default close event handler.
- Added event listeners to Sidebar menus to interact with MinApp.

.eslintrc.cjs

@@ -15,6 +15,7 @@ module.exports = {
     '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
     'react/prop-types': 'off',
     'simple-import-sort/imports': 'error',
-    'simple-import-sort/exports': 'error'
+    'simple-import-sort/exports': 'error',
+    'react/no-is-mounted': 'off'
   }
 }

.vscode/settings.json

@@ -29,5 +29,6 @@
   },
   "[markdown]": {
     "files.trimTrailingWhitespace": false
-  }
+  },
+  "i18n-ally.localesPaths": ["src/renderer/src/i18n"]
 }

electron-builder.yml

@@ -8,8 +8,10 @@ files:
   - '!{.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/*'
+  - '!src'
   - '!local'
+  - '!scripts'
+  - '!resources'
 asarUnpack:
   - resources/**
 win:
@@ -58,13 +60,10 @@ afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
     本次更新：
-      支持行内公式
-      支持编辑所有集成的服务商API地址
-      新增智能体搜索功能(>10个)
-      修复正则表达式显示错误
-      修复默认模型参数不生效
-      修复暗黑模式下分界线不明显问题
+      增加了30多种文本文档格式选择
+      支持粘贴图片和文件到聊天输入框
+      支持将对话移动到其他智能体了
     近期更新：
-      智能助理和消息列表合并
-      优化输入框样式
-      提升小程序稳定性
+      支持 Vision 模型
+      新增文件功能
+      支持从特定消息创建新分支

electron.vite.config.ts

@@ -7,7 +7,8 @@ export default defineConfig({
     plugins: [externalizeDepsPlugin()],
     resolve: {
       alias: {
-        ollama: resolve('ollama/src')
+        '@types': resolve('src/renderer/src/types'),
+        '@main': resolve('src/main')
       }
     }
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "0.6.13",
+  "version": "0.7.4",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -54,9 +54,12 @@
     "axios": "^1.7.3",
     "browser-image-compression": "^2.0.2",
     "dayjs": "^1.11.11",
+    "dexie": "^4.0.8",
+    "dexie-react-hooks": "^1.1.7",
     "dotenv-cli": "^7.4.2",
     "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",
@@ -65,10 +68,11 @@
     "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",
+    "gpt-tokens": "^1.3.10",
     "i18next": "^23.11.5",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
+    "mime": "^4.0.4",
     "openai": "^4.52.1",
     "prettier": "^3.2.4",
     "react": "^18.2.0",
@@ -87,7 +91,7 @@
     "remark-math": "^6.0.0",
     "sass": "^1.77.2",
     "styled-components": "^6.1.11",
-    "typescript": "^5.3.3",
+    "typescript": "^5.6.2",
     "uuid": "^10.0.0",
     "vite": "^5.0.12"
   },
@@ -96,8 +100,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "resolutions": {
-    "@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"
+  "packageManager": "yarn@4.5.0"
 }

src/main/config.ts

@@ -1,4 +1,22 @@
+import fs from 'node:fs'
+
+import { app } from 'electron'
 import Store from 'electron-store'
+import path from 'path'
+
+const isDev = process.env.NODE_ENV === 'development'
+
+isDev && app.setPath('userData', app.getPath('userData') + 'Dev')
+
+const getDataPath = () => {
+  const dataPath = path.join(app.getPath('userData'), 'Data')
+  if (!fs.existsSync(dataPath)) {
+    fs.mkdirSync(dataPath, { recursive: true })
+  }
+  return dataPath
+}
+
+export const DATA_PATH = getDataPath()
 
 export const appConfig = new Store()
 

src/main/env.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  VITE_MAIN_BUNDLE_ID: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}

src/main/index.ts

@@ -1,5 +1,6 @@
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { app, BrowserWindow } from 'electron'
+import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
 import { updateUserDataPath } from './utils/upgrade'
@@ -12,7 +13,7 @@ app.whenReady().then(async () => {
   await updateUserDataPath()
 
   // Set app user model id for windows
-  electronApp.setAppUserModelId('com.kangfenmao.CherryStudio')
+  electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
   // Default open or close DevTools by F12 in development
   // and ignore CommandOrControl + R in production.
@@ -30,6 +31,12 @@ app.whenReady().then(async () => {
   const mainWindow = createMainWindow()
 
   registerIpc(mainWindow, app)
+
+  if (process.env.NODE_ENV === 'development') {
+    installExtension(REDUX_DEVTOOLS)
+      .then((name) => console.log(`Added Extension:  ${name}`))
+      .catch((err) => console.log('An error occurred: ', err))
+  }
 })
 
 // Quit when all windows are closed, except on macOS. There, it's common

src/main/ipc.ts

@@ -1,11 +1,15 @@
-import { BrowserWindow, ipcMain, session, shell } from 'electron'
+import { FileType } from '@types'
+import { BrowserWindow, ipcMain, OpenDialogOptions, session, shell } from 'electron'
 
 import { appConfig, titleBarOverlayDark, titleBarOverlayLight } from './config'
-import AppUpdater from './updater'
+import AppUpdater from './services/AppUpdater'
+import FileManager from './services/FileManager'
 import { openFile, saveFile } from './utils/file'
 import { compress, decompress } from './utils/zip'
 import { createMinappWindow } from './window'
 
+const fileManager = new FileManager()
+
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const { autoUpdater } = new AppUpdater(mainWindow)
 
@@ -31,6 +35,19 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('zip:compress', (_, text: string) => compress(text))
   ipcMain.handle('zip:decompress', (_, text: Buffer) => decompress(text))
 
+  ipcMain.handle('file:base64Image', async (_, id) => await fileManager.base64Image(id))
+  ipcMain.handle('file:select', async (_, options?: OpenDialogOptions) => await fileManager.selectFile(options))
+  ipcMain.handle('file:upload', async (_, file: FileType) => await fileManager.uploadFile(file))
+  ipcMain.handle('file:clear', async () => await fileManager.clear())
+  ipcMain.handle('file:read', async (_, id: string) => await fileManager.readFile(id))
+  ipcMain.handle('file:delete', async (_, id: string) => await fileManager.deleteFile(id))
+  ipcMain.handle('file:get', async (_, filePath: string) => await fileManager.getFile(filePath))
+  ipcMain.handle('file:create', async (_, fileName: string) => await fileManager.createTempFile(fileName))
+  ipcMain.handle(
+    'file:write',
+    async (_, filePath: string, data: Uint8Array | string) => await fileManager.writeFile(filePath, data)
+  )
+
   ipcMain.handle('minapp', (_, args) => {
     createMinappWindow({
       url: args.url,

src/main/services/FileManager.ts

@@ -0,0 +1,198 @@
+import { getFileType } from '@main/utils/file'
+import { FileType } from '@types'
+import * as crypto from 'crypto'
+import { app, dialog, OpenDialogOptions } from 'electron'
+import * as fs from 'fs'
+import * as path from 'path'
+import { v4 as uuidv4 } from 'uuid'
+
+class FileManager {
+  private storageDir: string
+
+  constructor() {
+    this.storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
+    this.initStorageDir()
+  }
+
+  private initStorageDir(): void {
+    if (!fs.existsSync(this.storageDir)) {
+      fs.mkdirSync(this.storageDir, { recursive: true })
+    }
+  }
+
+  private async getFileHash(filePath: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      const hash = crypto.createHash('md5')
+      const stream = fs.createReadStream(filePath)
+      stream.on('data', (data) => hash.update(data))
+      stream.on('end', () => resolve(hash.digest('hex')))
+      stream.on('error', reject)
+    })
+  }
+
+  async findDuplicateFile(filePath: string): Promise<FileType | null> {
+    const stats = fs.statSync(filePath)
+    const fileSize = stats.size
+
+    const files = await fs.promises.readdir(this.storageDir)
+    for (const file of files) {
+      const storedFilePath = path.join(this.storageDir, file)
+      const storedStats = fs.statSync(storedFilePath)
+
+      if (storedStats.size === fileSize) {
+        const [originalHash, storedHash] = await Promise.all([
+          this.getFileHash(filePath),
+          this.getFileHash(storedFilePath)
+        ])
+
+        if (originalHash === storedHash) {
+          const ext = path.extname(file)
+          const id = path.basename(file, ext)
+          return {
+            id,
+            origin_name: file,
+            name: file + ext,
+            path: storedFilePath,
+            created_at: storedStats.birthtime,
+            size: storedStats.size,
+            ext,
+            type: getFileType(ext),
+            count: 2
+          }
+        }
+      }
+    }
+
+    return null
+  }
+
+  async selectFile(options?: OpenDialogOptions): Promise<FileType[] | null> {
+    const defaultOptions: OpenDialogOptions = {
+      properties: ['openFile']
+    }
+
+    const dialogOptions = { ...defaultOptions, ...options }
+
+    const result = await dialog.showOpenDialog(dialogOptions)
+
+    if (result.canceled || result.filePaths.length === 0) {
+      return null
+    }
+
+    const fileMetadataPromises = result.filePaths.map(async (filePath) => {
+      const stats = fs.statSync(filePath)
+      const ext = path.extname(filePath)
+      const fileType = getFileType(ext)
+
+      return {
+        id: uuidv4(),
+        origin_name: path.basename(filePath),
+        name: path.basename(filePath),
+        path: filePath,
+        created_at: stats.birthtime,
+        size: stats.size,
+        ext: ext,
+        type: fileType,
+        count: 1
+      }
+    })
+
+    return Promise.all(fileMetadataPromises)
+  }
+
+  async uploadFile(file: FileType): Promise<FileType> {
+    const duplicateFile = await this.findDuplicateFile(file.path)
+
+    if (duplicateFile) {
+      return duplicateFile
+    }
+
+    const uuid = uuidv4()
+    const origin_name = path.basename(file.path)
+    const ext = path.extname(origin_name)
+    const destPath = path.join(this.storageDir, uuid + ext)
+
+    await fs.promises.copyFile(file.path, destPath)
+    const stats = await fs.promises.stat(destPath)
+    const fileType = getFileType(ext)
+
+    const fileMetadata: FileType = {
+      id: uuid,
+      origin_name,
+      name: uuid + ext,
+      path: destPath,
+      created_at: stats.birthtime,
+      size: stats.size,
+      ext: ext,
+      type: fileType,
+      count: 1
+    }
+
+    return fileMetadata
+  }
+
+  async getFile(filePath: string): Promise<FileType | null> {
+    if (!fs.existsSync(filePath)) {
+      return null
+    }
+
+    const stats = fs.statSync(filePath)
+    const ext = path.extname(filePath)
+    const fileType = getFileType(ext)
+
+    const fileInfo: FileType = {
+      id: uuidv4(),
+      origin_name: path.basename(filePath),
+      name: path.basename(filePath),
+      path: filePath,
+      created_at: stats.birthtime,
+      size: stats.size,
+      ext: ext,
+      type: fileType,
+      count: 1
+    }
+
+    return fileInfo
+  }
+
+  async deleteFile(id: string): Promise<void> {
+    await fs.promises.unlink(path.join(this.storageDir, id))
+  }
+
+  async readFile(id: string): Promise<string> {
+    const filePath = path.join(this.storageDir, id)
+    return fs.readFileSync(filePath, 'utf8')
+  }
+
+  async createTempFile(fileName: string): Promise<string> {
+    const tempDir = path.join(app.getPath('temp'), 'CherryStudio')
+    if (!fs.existsSync(tempDir)) {
+      fs.mkdirSync(tempDir, { recursive: true })
+    }
+    const tempFilePath = path.join(tempDir, `temp_file_${uuidv4()}_${fileName}`)
+    return tempFilePath
+  }
+
+  async writeFile(filePath: string, data: Uint8Array | string): Promise<void> {
+    await fs.promises.writeFile(filePath, data)
+  }
+
+  async base64Image(id: string): Promise<{ mime: string; base64: string; data: string }> {
+    const filePath = path.join(this.storageDir, id)
+    const data = await fs.promises.readFile(filePath)
+    const base64 = data.toString('base64')
+    const mime = `image/${path.extname(filePath).slice(1)}`
+    return {
+      mime,
+      base64,
+      data: `data:${mime};base64,${base64}`
+    }
+  }
+
+  async clear(): Promise<void> {
+    await fs.promises.rmdir(this.storageDir, { recursive: true })
+    await this.initStorageDir()
+  }
+}
+
+export default FileManager

src/main/utils/file.ts

@@ -1,8 +1,10 @@
 import { dialog, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
 import logger from 'electron-log'
-import { writeFile } from 'fs'
+import { writeFileSync } from 'fs'
 import { readFile } from 'fs/promises'
 
+import { FileTypes } from '../../renderer/src/types'
+
 export async function saveFile(
   _: Electron.IpcMainInvokeEvent,
   fileName: string,
@@ -17,11 +19,7 @@ export async function saveFile(
     })
 
     if (!result.canceled && result.filePath) {
-      writeFile(result.filePath, content, { encoding: 'utf-8' }, (err) => {
-        if (err) {
-          logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
-        }
-      })
+      await writeFileSync(result.filePath, content, { encoding: 'utf-8' })
     }
   } catch (err) {
     logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
@@ -53,3 +51,108 @@ export async function openFile(
     return null
   }
 }
+
+export function getFileType(ext: string): FileTypes {
+  const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+  const videoExts = ['.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv']
+  const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac']
+  const documentExts = ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx']
+  const textExts = [
+    '.txt', // 普通文本文件
+    '.md', // Markdown 文件
+    '.mdx', // Markdown 文件
+    '.html', // HTML 文件
+    '.htm', // HTML 文件的另一种扩展名
+    '.xml', // XML 文件
+    '.json', // JSON 文件
+    '.yaml', // YAML 文件
+    '.yml', // YAML 文件的另一种扩展名
+    '.csv', // 逗号分隔值文件
+    '.tsv', // 制表符分隔值文件
+    '.ini', // 配置文件
+    '.log', // 日志文件
+    '.rtf', // 富文本格式文件
+    '.tex', // LaTeX 文件
+    '.srt', // 字幕文件
+    '.xhtml', // XHTML 文件
+    '.nfo', // 信息文件（主要用于场景发布）
+    '.conf', // 配置文件
+    '.config', // 配置文件
+    '.env', // 环境变量文件
+    '.properties', // 配置属性文件
+    '.latex', // LaTeX 文档文件
+    '.rst', // reStructuredText 文件
+    '.php', // PHP 脚本文件，包含嵌入的 HTML
+    '.js', // JavaScript 文件（部分是文本，部分可能包含代码）
+    '.ts', // TypeScript 文件
+    '.jsp', // JavaServer Pages 文件
+    '.aspx', // ASP.NET 文件
+    '.bat', // Windows 批处理文件
+    '.sh', // Unix/Linux Shell 脚本文件
+    '.py', // Python 脚本文件
+    '.rb', // Ruby 脚本文件
+    '.pl', // Perl 脚本文件
+    '.sql', // SQL 脚本文件
+    '.css', // Cascading Style Sheets 文件
+    '.less', // Less CSS 预处理器文件
+    '.scss', // Sass CSS 预处理器文件
+    '.sass', // Sass 文件
+    '.styl', // Stylus CSS 预处理器文件
+    '.coffee', // CoffeeScript 文件
+    '.ino', // Arduino 代码文件
+    '.ino', // Arduino 代码文件
+    '.asm', // Assembly 语言文件
+    '.go', // Go 语言文件
+    '.scala', // Scala 语言文件
+    '.swift', // Swift 语言文件
+    '.kt', // Kotlin 语言文件
+    '.rs', // Rust 语言文件
+    '.lua', // Lua 语言文件
+    '.groovy', // Groovy 语言文件
+    '.dart', // Dart 语言文件
+    '.hs', // Haskell 语言文件
+    '.clj', // Clojure 语言文件
+    '.cljs', // ClojureScript 语言文件
+    '.elm', // Elm 语言文件
+    '.erl', // Erlang 语言文件
+    '.ex', // Elixir 语言文件
+    '.exs', // Elixir 脚本文件
+    '.pug', // Pug (formerly Jade) 模板文件
+    '.haml', // Haml 模板文件
+    '.slim', // Slim 模板文件
+    '.tpl', // 模板文件（通用）
+    '.ejs', // Embedded JavaScript 模板文件
+    '.hbs', // Handlebars 模板文件
+    '.mustache', // Mustache 模板文件
+    '.jade', // Jade 模板文件 (已重命名为 Pug)
+    '.twig', // Twig 模板文件
+    '.blade', // Blade 模板文件 (Laravel)
+    '.vue', // Vue.js 单文件组件
+    '.jsx', // React JSX 文件
+    '.tsx', // React TSX 文件
+    '.graphql', // GraphQL 查询语言文件
+    '.gql', // GraphQL 查询语言文件
+    '.proto', // Protocol Buffers 文件
+    '.thrift', // Thrift 文件
+    '.toml', // TOML 配置文件
+    '.edn', // Clojure 数据表示文件
+    '.cake', // CakePHP 配置文件
+    '.ctp', // CakePHP 视图文件
+    '.cfm', // ColdFusion 标记语言文件
+    '.cfc', // ColdFusion 组件文件
+    '.m', // Objective-C 源文件
+    '.mm', // Objective-C++ 源文件
+    '.gradle', // Gradle 构建文件
+    '.groovy', // Gradle 构建文件
+    '.gradle', // Gradle 构建文件
+    '.kts' // Kotlin Script 文件
+  ]
+
+  ext = ext.toLowerCase()
+  if (imageExts.includes(ext)) return FileTypes.IMAGE
+  if (videoExts.includes(ext)) return FileTypes.VIDEO
+  if (audioExts.includes(ext)) return FileTypes.AUDIO
+  if (textExts.includes(ext)) return FileTypes.TEXT
+  if (documentExts.includes(ext)) return FileTypes.DOCUMENT
+  return FileTypes.OTHER
+}

src/main/utils/index.ts

@@ -0,0 +1,7 @@
+import path from 'node:path'
+
+import { app } from 'electron'
+
+export function getResourcePath() {
+  return path.join(app.getAppPath(), 'resources')
+}

src/preload/index.d.ts

@@ -1,4 +1,5 @@
 import { ElectronAPI } from '@electron-toolkit/preload'
+import { FileType } from '@renderer/types'
 import type { OpenDialogOptions } from 'electron'
 
 declare global {
@@ -20,6 +21,17 @@ declare global {
       reload: () => void
       compress: (text: string) => Promise<Buffer>
       decompress: (text: Buffer) => Promise<string>
+      file: {
+        select: (options?: OpenDialogOptions) => Promise<FileType[] | null>
+        upload: (file: FileType) => Promise<FileType>
+        delete: (fileId: string) => Promise<void>
+        read: (fileId: string) => Promise<string>
+        base64Image: (fileId: string) => Promise<{ mime: string; base64: string; data: string }>
+        clear: () => Promise<void>
+        get: (filePath: string) => Promise<FileType | null>
+        create: (fileName: string) => Promise<string>
+        write: (filePath: string, data: Uint8Array | string) => Promise<void>
+      }
     }
   }
 }

src/preload/index.ts

@@ -1,5 +1,5 @@
 import { electronAPI } from '@electron-toolkit/preload'
-import { contextBridge, ipcRenderer } from 'electron'
+import { contextBridge, ipcRenderer, OpenDialogOptions } from 'electron'
 
 // Custom APIs for renderer
 const api = {
@@ -12,10 +12,21 @@ const api = {
   openFile: (options?: { decompress: boolean }) => ipcRenderer.invoke('open-file', options),
   reload: () => ipcRenderer.invoke('reload'),
   saveFile: (path: string, content: string, options?: { compress: boolean }) => {
-    ipcRenderer.invoke('save-file', path, content, options)
+    return ipcRenderer.invoke('save-file', path, content, options)
   },
   compress: (text: string) => ipcRenderer.invoke('zip:compress', text),
-  decompress: (text: Buffer) => ipcRenderer.invoke('zip:decompress', text)
+  decompress: (text: Buffer) => ipcRenderer.invoke('zip:decompress', text),
+  file: {
+    select: (options?: OpenDialogOptions) => ipcRenderer.invoke('file:select', options),
+    upload: (filePath: string) => ipcRenderer.invoke('file:upload', filePath),
+    delete: (fileId: string) => ipcRenderer.invoke('file:delete', fileId),
+    read: (fileId: string) => ipcRenderer.invoke('file:read', fileId),
+    base64Image: (fileId: string) => ipcRenderer.invoke('file:base64Image', fileId),
+    clear: () => ipcRenderer.invoke('file:clear'),
+    get: (filePath: string) => ipcRenderer.invoke('file:get', filePath),
+    create: (fileName: string) => ipcRenderer.invoke('file:create', fileName),
+    write: (filePath: string, data: Uint8Array | string) => ipcRenderer.invoke('file:write', filePath, data)
+  }
 }
 
 // Use `contextBridge` APIs to expose Electron APIs to

src/renderer/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1, width=device-width" />
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: *; frame-src * file:" />
+      content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: *; frame-src * file:" />
   </head>
   <body>
     <div id="root"></div>

src/renderer/src/App.tsx

@@ -1,3 +1,5 @@
+import '@renderer/databases'
+
 import store, { persistor } from '@renderer/store'
 import { Provider } from 'react-redux'
 import { HashRouter, Route, Routes } from 'react-router-dom'
@@ -9,6 +11,7 @@ import AntdProvider from './context/AntdProvider'
 import { ThemeProvider } from './context/ThemeProvider'
 import AgentsPage from './pages/agents/AgentsPage'
 import AppsPage from './pages/apps/AppsPage'
+import FilesPage from './pages/files/FilesPage'
 import HomePage from './pages/home/HomePage'
 import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
@@ -24,6 +27,7 @@ function App(): JSX.Element {
                 <Sidebar />
                 <Routes>
                   <Route path="/" element={<HomePage />} />
+                  <Route path="/files" element={<FilesPage />} />
                   <Route path="/agents" element={<AgentsPage />} />
                   <Route path="/translate" element={<TranslatePage />} />
                   <Route path="/apps" element={<AppsPage />} />

src/renderer/src/assets/styles/index.scss

@@ -24,9 +24,9 @@
   --color-background-soft: var(--color-black-soft);
   --color-background-mute: var(--color-black-mute);
 
-  --color-primary: #135200;
-  --color-primary-soft: #13520099;
-  --color-primary-mute: #13520033;
+  --color-primary: #00b96b;
+  --color-primary-soft: #00b96b99;
+  --color-primary-mute: #00b96b33;
 
   --color-text: var(--color-text-1);
   --color-icon: #ffffff99;
@@ -182,6 +182,12 @@ body,
   -webkit-app-region: no-drag;
 }
 
+.text-nowrap {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .minapp-drawer {
   .ant-drawer-content-wrapper {
     box-shadow: none;

src/renderer/src/assets/styles/markdown.scss

@@ -130,6 +130,10 @@
     }
   }
 
+  pre + pre {
+    margin-top: 10px;
+  }
+
   blockquote {
     margin: 1em 0;
     padding-left: 1em;

src/renderer/src/components/Icons/VisionIcon.tsx

@@ -0,0 +1,15 @@
+import { EyeOutlined } from '@ant-design/icons'
+import React, { FC } from 'react'
+import styled from 'styled-components'
+
+const VisionIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
+  return <Icon {...(props as any)} />
+}
+
+const Icon = styled(EyeOutlined)`
+  color: var(--color-primary);
+  font-size: 14px;
+  margin-left: 4px;
+`
+
+export default VisionIcon

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

@@ -30,6 +30,8 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
     setTimeout(() => resolve({}), 300)
   }
 
+  MinApp.onClose = onClose
+
   const onReload = () => {
     if (webviewRef.current) {
       webviewRef.current.src = app.url
@@ -163,6 +165,7 @@ const Button = styled.div`
 
 export default class MinApp {
   static topviewId = 0
+  static onClose = () => {}
   static close() {
     TopView.hide('MinApp')
     store.dispatch(setMinappShow(false))

src/renderer/src/components/Popups/UserPopup.tsx

@@ -1,6 +1,6 @@
 import useAvatar from '@renderer/hooks/useAvatar'
 import { useSettings } from '@renderer/hooks/useSettings'
-import LocalStorage from '@renderer/services/storage'
+import ImageStorage from '@renderer/services/storage'
 import { useAppDispatch } from '@renderer/store'
 import { setAvatar } from '@renderer/store/runtime'
 import { setUserName } from '@renderer/store/settings'
@@ -55,8 +55,8 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
             try {
               const _file = file.originFileObj as File
               const compressedFile = await compressImage(_file)
-              await LocalStorage.storeImage('avatar', compressedFile)
-              dispatch(setAvatar(await LocalStorage.getImage('avatar')))
+              await ImageStorage.set('avatar', compressedFile)
+              dispatch(setAvatar(await ImageStorage.get('avatar')))
             } catch (error: any) {
               window.message.error(error.message)
             }

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

@@ -1,4 +1,4 @@
-import { TranslationOutlined } from '@ant-design/icons'
+import { FolderOutlined, TranslationOutlined } from '@ant-design/icons'
 import { isMac } from '@renderer/config/constant'
 import { isLocalAi, UserAvatar } from '@renderer/config/env'
 import useAvatar from '@renderer/hooks/useAvatar'
@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'
 import { useLocation, useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
+import MinApp from '../MinApp'
 import UserPopup from '../Popups/UserPopup'
 
 const Sidebar: FC = () => {
@@ -45,7 +46,7 @@ const Sidebar: FC = () => {
     <Container style={{ backgroundColor: minappShow ? 'var(--navbar-background)' : sidebarBgColor }}>
       <AvatarImg src={avatar || UserAvatar} draggable={false} className="nodrag" onClick={onEditUser} />
       <MainMenus>
-        <Menus>
+        <Menus onClick={MinApp.onClose}>
           <StyledLink onClick={onToggleShowAssistants}>
             <Icon className={isRoute('/')}>
               <i className="iconfont icon-chat"></i>
@@ -66,9 +67,14 @@ const Sidebar: FC = () => {
               <i className="iconfont icon-appstore"></i>
             </Icon>
           </StyledLink>
+          <StyledLink onClick={() => to('/files')}>
+            <Icon className={isRoute('/files')}>
+              <FolderOutlined />
+            </Icon>
+          </StyledLink>
         </Menus>
       </MainMenus>
-      <Menus>
+      <Menus onClick={MinApp.onClose}>
         <StyledLink onClick={() => to(isLocalAi ? '/settings/assistant' : '/settings/provider')}>
           <Icon className={pathname.startsWith('/settings') ? 'active' : ''}>
             <i className="iconfont icon-setting"></i>
@@ -91,6 +97,7 @@ const Container = styled.div`
   border-right: 0.5px solid var(--color-border);
   margin-top: ${isMac ? 'var(--navbar-height)' : 0};
   transition: background-color 0.3s ease;
+  z-index: 10000;
 `
 
 const AvatarImg = styled(Avatar)`

src/renderer/src/config/constant.ts

@@ -7,3 +7,95 @@ export const platform = window.electron?.process?.platform
 export const isMac = platform === 'darwin'
 export const isWindows = platform === 'win32' || platform === 'win64'
 export const isLinux = platform === 'linux'
+
+export const imageExts = ['.jpg', '.png', '.jpeg']
+export const textExts = [
+  '.txt', // 普通文本文件
+  '.md', // Markdown 文件
+  '.mdx', // Markdown 文件
+  '.html', // HTML 文件
+  '.htm', // HTML 文件的另一种扩展名
+  '.xml', // XML 文件
+  '.json', // JSON 文件
+  '.yaml', // YAML 文件
+  '.yml', // YAML 文件的另一种扩展名
+  '.csv', // 逗号分隔值文件
+  '.tsv', // 制表符分隔值文件
+  '.ini', // 配置文件
+  '.log', // 日志文件
+  '.rtf', // 富文本格式文件
+  '.tex', // LaTeX 文件
+  '.srt', // 字幕文件
+  '.xhtml', // XHTML 文件
+  '.nfo', // 信息文件（主要用于场景发布）
+  '.conf', // 配置文件
+  '.config', // 配置文件
+  '.env', // 环境变量文件
+  '.properties', // 配置属性文件
+  '.latex', // LaTeX 文档文件
+  '.rst', // reStructuredText 文件
+  '.php', // PHP 脚本文件，包含嵌入的 HTML
+  '.js', // JavaScript 文件（部分是文本，部分可能包含代码）
+  '.ts', // TypeScript 文件
+  '.jsp', // JavaServer Pages 文件
+  '.aspx', // ASP.NET 文件
+  '.bat', // Windows 批处理文件
+  '.sh', // Unix/Linux Shell 脚本文件
+  '.py', // Python 脚本文件
+  '.rb', // Ruby 脚本文件
+  '.pl', // Perl 脚本文件
+  '.sql', // SQL 脚本文件
+  '.css', // Cascading Style Sheets 文件
+  '.less', // Less CSS 预处理器文件
+  '.scss', // Sass CSS 预处理器文件
+  '.sass', // Sass 文件
+  '.styl', // Stylus CSS 预处理器文件
+  '.coffee', // CoffeeScript 文件
+  '.ino', // Arduino 代码文件
+  '.ino', // Arduino 代码文件
+  '.asm', // Assembly 语言文件
+  '.go', // Go 语言文件
+  '.scala', // Scala 语言文件
+  '.swift', // Swift 语言文件
+  '.kt', // Kotlin 语言文件
+  '.rs', // Rust 语言文件
+  '.lua', // Lua 语言文件
+  '.groovy', // Groovy 语言文件
+  '.dart', // Dart 语言文件
+  '.hs', // Haskell 语言文件
+  '.clj', // Clojure 语言文件
+  '.cljs', // ClojureScript 语言文件
+  '.elm', // Elm 语言文件
+  '.erl', // Erlang 语言文件
+  '.ex', // Elixir 语言文件
+  '.exs', // Elixir 脚本文件
+  '.pug', // Pug (formerly Jade) 模板文件
+  '.haml', // Haml 模板文件
+  '.slim', // Slim 模板文件
+  '.tpl', // 模板文件（通用）
+  '.ejs', // Embedded JavaScript 模板文件
+  '.hbs', // Handlebars 模板文件
+  '.mustache', // Mustache 模板文件
+  '.jade', // Jade 模板文件 (已重命名为 Pug)
+  '.twig', // Twig 模板文件
+  '.blade', // Blade 模板文件 (Laravel)
+  '.vue', // Vue.js 单文件组件
+  '.jsx', // React JSX 文件
+  '.tsx', // React TSX 文件
+  '.graphql', // GraphQL 查询语言文件
+  '.gql', // GraphQL 查询语言文件
+  '.proto', // Protocol Buffers 文件
+  '.thrift', // Thrift 文件
+  '.toml', // TOML 配置文件
+  '.edn', // Clojure 数据表示文件
+  '.cake', // CakePHP 配置文件
+  '.ctp', // CakePHP 视图文件
+  '.cfm', // ColdFusion 标记语言文件
+  '.cfc', // ColdFusion 组件文件
+  '.m', // Objective-C 源文件
+  '.mm', // Objective-C++ 源文件
+  '.gradle', // Gradle 构建文件
+  '.groovy', // Gradle 构建文件
+  '.gradle', // Gradle 构建文件
+  '.kts' // Kotlin Script 文件
+]

src/renderer/src/config/env.ts

@@ -2,5 +2,4 @@ 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/minapp.ts

@@ -4,6 +4,7 @@ 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 PoeAppLogo from '@renderer/assets/images/apps/poe.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'
@@ -15,56 +16,73 @@ import { MinAppType } from '@renderer/types'
 
 const _apps: MinAppType[] = [
   {
-    name: 'AI 助手',
-    logo: AiAssistantAppLogo,
-    url: 'https://bot.360.com/'
-  },
-  {
-    name: '文心一言',
-    logo: BaiduAiAppLogo,
-    url: 'https://yiyan.baidu.com/'
-  },
-  {
-    name: 'SparkDesk',
-    logo: SparkDeskAppLogo,
-    url: 'https://xinghuo.xfyun.cn/desk'
-  },
-  {
-    name: '腾讯元宝',
-    logo: TencentYuanbaoAppLogo,
-    url: 'https://yuanbao.tencent.com/chat'
-  },
-  {
-    name: '商量',
-    logo: SensetimeAppLogo,
-    url: 'https://chat.sensetime.com/wb/chat'
-  },
-  {
+    id: '360-ai-so',
     name: '360AI搜索',
     logo: AiSearchAppLogo,
     url: 'https://so.360.com/'
   },
   {
+    id: '360-ai-bot',
+    name: 'AI 助手',
+    logo: AiAssistantAppLogo,
+    url: 'https://bot.360.com/'
+  },
+  {
+    id: 'baidu-ai-chat',
+    name: '文心一言',
+    logo: BaiduAiAppLogo,
+    url: 'https://yiyan.baidu.com/'
+  },
+  {
+    id: 'tencent-yuanbao',
+    name: '腾讯元宝',
+    logo: TencentYuanbaoAppLogo,
+    url: 'https://yuanbao.tencent.com/chat'
+  },
+  {
+    id: 'sensetime-chat',
+    name: '商量',
+    logo: SensetimeAppLogo,
+    url: 'https://chat.sensetime.com/wb/chat'
+  },
+  {
+    id: 'spark-desk',
+    name: 'SparkDesk',
+    logo: SparkDeskAppLogo,
+    url: 'https://xinghuo.xfyun.cn/desk'
+  },
+  {
+    id: 'metaso',
     name: '秘塔AI搜索',
     logo: MetasoAppLogo,
     url: 'https://metaso.cn/'
   },
   {
-    name: '天工AI',
-    logo: TiangongAiLogo,
-    url: 'https://www.tiangong.cn/'
-  },
-  {
-    name: 'DEVV_',
-    logo: DevvAppLogo,
-    url: 'https://devv.ai/'
+    id: 'poe',
+    name: 'Poe',
+    logo: PoeAppLogo,
+    url: 'https://poe.com'
   },
   {
+    id: 'perplexity',
     name: 'perplexity',
     logo: PerplexityAppLogo,
     url: 'https://www.perplexity.ai/'
   },
   {
+    id: 'devv',
+    name: 'DEVV_',
+    logo: DevvAppLogo,
+    url: 'https://devv.ai/'
+  },
+  {
+    id: 'tiangong-ai',
+    name: '天工AI',
+    logo: TiangongAiLogo,
+    url: 'https://www.tiangong.cn/'
+  },
+  {
+    id: 'zhihu-zhiada',
     name: '知乎直答',
     logo: ZhihuAppLogo,
     url: 'https://zhida.zhihu.com/'

src/renderer/src/config/models.ts

@@ -1,6 +1,7 @@
 import { Model } from '@renderer/types'
 
 const TEXT_TO_IMAGE_REGEX = /flux|diffusion|stabilityai|sd-turbo|dall|cogview/i
+const VISION_REGEX = /llava|moondream|minicpm|gemini-1.5|claude-3|vision|glm-4v|gpt-4|qwen-vl/i
 const EMBEDDING_REGEX = /embedding/i
 
 export const SYSTEM_MODELS: Record<string, Model[]> = {
@@ -395,3 +396,7 @@ export function isTextToImageModel(model: Model): boolean {
 export function isEmbeddingModel(model: Model): boolean {
   return EMBEDDING_REGEX.test(model.id)
 }
+
+export function isVisionModel(model: Model): boolean {
+  return VISION_REGEX.test(model.id)
+}

src/renderer/src/config/provider.ts

@@ -14,6 +14,7 @@ import GemmaModelLogo from '@renderer/assets/images/models/gemma.jpeg'
 import HailuoModelLogo from '@renderer/assets/images/models/hailuo.png'
 import LlamaModelLogo from '@renderer/assets/images/models/llama.jpeg'
 import MicrosoftModelLogo from '@renderer/assets/images/models/microsoft.png'
+import MinicpmModelLogo from '@renderer/assets/images/models/minicpm.webp'
 import MixtralModelLogo from '@renderer/assets/images/models/mixtral.jpeg'
 import PalmModelLogo from '@renderer/assets/images/models/palm.svg'
 import QwenModelLogo from '@renderer/assets/images/models/qwen.png'
@@ -91,6 +92,7 @@ export function getModelLogo(modelId: string) {
   }
 
   const logoMap = {
+    o1: OpenAiProviderLogo,
     gpt: ChatGPTModelLogo,
     glm: ChatGLMModelLogo,
     deepseek: DeepSeekModelLogo,
@@ -112,7 +114,8 @@ export function getModelLogo(modelId: string) {
     abab: HailuoModelLogo,
     'ep-202': DoubaoModelLogo,
     cohere: CohereModelLogo,
-    command: CohereModelLogo
+    command: CohereModelLogo,
+    minicpm: MinicpmModelLogo
   }
 
   for (const key in logoMap) {
@@ -136,6 +139,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.openai.com/docs/models'
     },
     app: {
+      id: 'openai',
       name: 'ChatGPT',
       url: 'https://chatgpt.com/',
       logo: OpenAiProviderLogo
@@ -152,6 +156,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://ai.google.dev/gemini-api/docs/models/gemini'
     },
     app: {
+      id: 'gemini',
       name: 'Gemini',
       url: 'https://gemini.google.com/',
       logo: GeminiProviderLogo
@@ -168,6 +173,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://docs.siliconflow.cn/docs/model-names'
     },
     app: {
+      id: 'silicon',
       name: 'SiliconFlow',
       url: 'https://cloud.siliconflow.cn/playground/chat',
       logo: SiliconFlowProviderLogo
@@ -184,6 +190,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.deepseek.com/api-docs/'
     },
     app: {
+      id: 'deepseek',
       name: 'DeepSeek',
       url: 'https://chat.deepseek.com/',
       logo: DeepSeekProviderLogo
@@ -198,11 +205,6 @@ export const PROVIDER_CONFIG = {
       apiKey: 'https://github.com/settings/tokens',
       docs: 'https://docs.github.com/en/github-models',
       models: 'https://github.com/marketplace/models'
-    },
-    app: {
-      name: 'Github Models',
-      url: 'https://github.com/marketplace/models/azure-openai/gpt-4o/playground',
-      logo: GithubProviderLogo
     }
   },
   yi: {
@@ -216,6 +218,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.lingyiwanwu.com/docs#%E6%A8%A1%E5%9E%8B'
     },
     app: {
+      id: 'yi',
       name: 'Yi',
       url: 'https://www.wanzhi.com/',
       logo: YiProviderLogo
@@ -232,6 +235,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://open.bigmodel.cn/modelcenter/square'
     },
     app: {
+      id: 'zhipu',
       name: '智谱',
       url: 'https://chatglm.cn/main/alltoolsdetail',
       logo: ZhipuProviderLogo
@@ -248,6 +252,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.moonshot.cn/docs/intro#%E6%A8%A1%E5%9E%8B%E5%88%97%E8%A1%A8'
     },
     app: {
+      id: 'moonshot',
       name: 'Kimi',
       url: 'https://kimi.moonshot.cn/',
       logo: KimiAppLogo
@@ -264,6 +269,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.baichuan-ai.com/price'
     },
     app: {
+      id: 'baichuan',
       name: '百小应',
       url: 'https://ying.baichuan-ai.com/chat',
       logo: BaicuanAppLogo
@@ -280,6 +286,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://dashscope.console.aliyun.com/model'
     },
     app: {
+      id: 'dashscope',
       name: '通义千问',
       url: 'https://tongyi.aliyun.com/qianwen/',
       logo: QwenModelLogo
@@ -296,6 +303,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.stepfun.com/docs/llm/text'
     },
     app: {
+      id: 'stepfun',
       name: '跃问',
       url: 'https://yuewen.cn/chats/new',
       logo: YuewenAppLogo
@@ -312,6 +320,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://console.volcengine.com/ark/region:ark+cn-beijing/endpoint'
     },
     app: {
+      id: 'doubao',
       name: '豆包',
       url: 'https://www.doubao.com/chat/',
       logo: DoubaoProviderLogo
@@ -328,6 +337,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://platform.minimaxi.com/document/Models'
     },
     app: {
+      id: 'minimax',
       name: '海螺',
       url: 'https://hailuoai.com/',
       logo: HailuoModelLogo
@@ -360,6 +370,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://console.groq.com/docs/models'
     },
     app: {
+      id: 'groq',
       name: 'Groq',
       url: 'https://chat.groq.com/',
       logo: GroqProviderLogo
@@ -386,6 +397,7 @@ export const PROVIDER_CONFIG = {
       models: 'https://docs.anthropic.com/en/docs/about-claude/models'
     },
     app: {
+      id: 'anthropic',
       name: 'Claude',
       url: 'https://claude.ai/',
       logo: AnthropicProviderLogo

src/renderer/src/context/ThemeProvider.tsx

@@ -1,5 +1,5 @@
 import { useSettings } from '@renderer/hooks/useSettings'
-import { ThemeMode } from '@renderer/store/settings'
+import { ThemeMode } from '@renderer/types'
 import React, { createContext, PropsWithChildren, useContext, useEffect, useState } from 'react'
 
 interface ThemeContextType {

src/renderer/src/databases/index.ts

@@ -0,0 +1,27 @@
+import { FileType, Topic } from '@renderer/types'
+import { Dexie, type EntityTable } from 'dexie'
+
+import { populateTopics } from './populate'
+
+// Database declaration (move this to its own module also)
+export const db = new Dexie('CherryStudio') as Dexie & {
+  files: EntityTable<FileType, 'id'>
+  topics: EntityTable<Pick<Topic, 'id' | 'messages'>, 'id'>
+  settings: EntityTable<{ id: string; value: any }, 'id'>
+}
+
+db.version(1).stores({
+  files: 'id, name, origin_name, path, size, ext, type, created_at, count'
+})
+
+db.version(2)
+  .stores({
+    files: 'id, name, origin_name, path, size, ext, type, created_at, count',
+    topics: '&id, messages',
+    settings: '&id, value'
+  })
+  .upgrade(populateTopics)
+
+db.on('populate', populateTopics)
+
+export default db

src/renderer/src/databases/populate.ts

@@ -0,0 +1,27 @@
+import i18n from '@renderer/i18n'
+import { Transaction } from 'dexie'
+import localforage from 'localforage'
+
+export async function populateTopics(trans: Transaction) {
+  const indexedKeys = await localforage.keys()
+
+  if (indexedKeys.length > 0) {
+    for (const key of indexedKeys) {
+      const value: any = await localforage.getItem(key)
+      if (key.startsWith('topic:')) {
+        await trans.db.table('topics').add({ id: value.id, messages: value.messages })
+      }
+      if (key === 'image://avatar') {
+        await trans.db.table('settings').add({ id: key, value: await localforage.getItem(key) })
+      }
+    }
+
+    window.modal.success({
+      title: i18n.t('message.upgrade.success.title'),
+      content: i18n.t('message.upgrade.success.content'),
+      okText: i18n.t('message.upgrade.success.button'),
+      centered: true,
+      onOk: () => window.api.reload()
+    })
+  }
+}

src/renderer/src/hooks/useAppInit.ts

@@ -1,9 +1,10 @@
 import { isLocalAi } from '@renderer/config/env'
+import db from '@renderer/databases'
 import i18n from '@renderer/i18n'
-import LocalStorage from '@renderer/services/storage'
 import { useAppDispatch } from '@renderer/store'
 import { setAvatar } from '@renderer/store/runtime'
 import { runAsyncFunction } from '@renderer/utils'
+import { useLiveQuery } from 'dexie-react-hooks'
 import { useEffect } from 'react'
 
 import { useDefaultModel } from './useAssistant'
@@ -11,16 +12,13 @@ import { useSettings } from './useSettings'
 
 export function useAppInit() {
   const dispatch = useAppDispatch()
-  const { proxyUrl } = useSettings()
-  const { language } = useSettings()
+  const { proxyUrl, language } = useSettings()
   const { setDefaultModel, setTopicNamingModel, setTranslateModel } = useDefaultModel()
+  const avatar = useLiveQuery(() => db.settings.get('image://avatar'))
 
   useEffect(() => {
-    runAsyncFunction(async () => {
-      const storedImage = await LocalStorage.getImage('avatar')
-      storedImage && dispatch(setAvatar(storedImage))
-    })
-  }, [dispatch])
+    avatar?.value && dispatch(setAvatar(avatar.value))
+  }, [avatar, dispatch])
 
   useEffect(() => {
     runAsyncFunction(async () => {

src/renderer/src/hooks/useAssistant.ts

@@ -16,7 +16,8 @@ import {
 } from '@renderer/store/assistants'
 import { setDefaultModel, setTopicNamingModel, setTranslateModel } from '@renderer/store/llm'
 import { Assistant, AssistantSettings, Model, Topic } from '@renderer/types'
-import localforage from 'localforage'
+
+import { TopicManager } from './useTopic'
 
 export function useAssistants() {
   const { assistants } = useAppSelector((state) => state.assistants)
@@ -29,9 +30,8 @@ export function useAssistants() {
     removeAssistant: (id: string) => {
       dispatch(removeAssistant({ id }))
       const assistant = assistants.find((a) => a.id === id)
-      if (assistant) {
-        assistant.topics.forEach((id) => localforage.removeItem(`topic:${id}`))
-      }
+      const topics = assistant?.topics || []
+      topics.forEach(({ id }) => TopicManager.removeTopic(id))
     }
   }
 }
@@ -45,7 +45,14 @@ export function useAssistant(id: string) {
     assistant,
     model: assistant?.model ?? defaultModel,
     addTopic: (topic: Topic) => dispatch(addTopic({ assistantId: assistant.id, topic })),
-    removeTopic: (topic: Topic) => dispatch(removeTopic({ assistantId: assistant.id, topic })),
+    removeTopic: (topic: Topic) => {
+      TopicManager.removeTopic(topic.id)
+      dispatch(removeTopic({ assistantId: assistant.id, topic }))
+    },
+    moveTopic: (topic: Topic, toAssistant: Assistant) => {
+      dispatch(addTopic({ assistantId: toAssistant.id, topic: { ...topic } }))
+      dispatch(removeTopic({ assistantId: assistant.id, topic }))
+    },
     updateTopic: (topic: Topic) => dispatch(updateTopic({ assistantId: assistant.id, topic })),
     updateTopics: (topics: Topic[]) => dispatch(updateTopics({ assistantId: assistant.id, topics })),
     removeAllTopics: () => dispatch(removeAllTopics({ assistantId: assistant.id })),

src/renderer/src/hooks/useSettings.ts

@@ -4,9 +4,9 @@ import {
   setSendMessageShortcut as _setSendMessageShortcut,
   setTheme,
   setTopicPosition,
-  setWindowStyle,
-  ThemeMode
+  setWindowStyle
 } from '@renderer/store/settings'
+import { ThemeMode } from '@renderer/types'
 
 export function useSettings() {
   const settings = useAppSelector((state) => state.settings)

src/renderer/src/hooks/useTopic.ts

@@ -1,3 +1,5 @@
+import db from '@renderer/databases'
+import { deleteMessageFiles } from '@renderer/services/messages'
 import { Assistant, Topic } from '@renderer/types'
 import { find } from 'lodash'
 import { useEffect, useState } from 'react'
@@ -25,3 +27,38 @@ export function useActiveTopic(_assistant: Assistant) {
 export function getTopic(assistant: Assistant, topicId: string) {
   return assistant?.topics.find((topic) => topic.id === topicId)
 }
+
+export class TopicManager {
+  static async getTopic(id: string) {
+    return await db.topics.get(id)
+  }
+
+  static async getTopicMessages(id: string) {
+    const topic = await this.getTopic(id)
+    return topic ? topic.messages : []
+  }
+
+  static async removeTopic(id: string) {
+    const messages = await this.getTopicMessages(id)
+
+    for (const message of messages) {
+      await deleteMessageFiles(message)
+    }
+
+    db.topics.delete(id)
+  }
+
+  static async clearTopicMessages(id: string) {
+    const topic = await this.getTopic(id)
+
+    if (topic) {
+      for (const message of topic?.messages ?? []) {
+        await deleteMessageFiles(message)
+      }
+
+      topic.messages = []
+
+      await db.topics.update(id, topic)
+    }
+  }
+}

src/renderer/src/i18n/index.ts

@@ -55,9 +55,13 @@ const resources = {
         'chat.completion.paused': 'Chat completion paused',
         'switch.disabled': 'Switching is disabled while the assistant is generating',
         'restore.success': 'Restored successfully',
+        'backup.success': 'Backup successful',
         'reset.confirm.content': 'Are you sure you want to clear all data?',
         'reset.double.confirm.title': 'DATA LOST !!!',
-        'reset.double.confirm.content': 'All data will be lost, do you want to continue?'
+        'reset.double.confirm.content': 'All data will be lost, do you want to continue?',
+        'upgrade.success.title': 'Upgrade successfully',
+        'upgrade.success.content': 'Please restart the application to complete the upgrade',
+        'upgrade.success.button': 'Restart'
       },
       chat: {
         save: 'Save',
@@ -66,10 +70,11 @@ const resources = {
         'default.topic.name': 'Default Topic',
         'topics.title': 'Topics',
         'topics.auto_rename': 'Auto Rename',
-        'topics.edit.title': 'Rename',
+        'topics.edit.title': 'Edit Name',
         'topics.edit.placeholder': 'Enter new name',
         'topics.delete.all.title': 'Delete all topics',
         'topics.delete.all.content': 'Are you sure you want to delete all topics?',
+        'topics.move_to': 'Move to',
         'topics.list': 'Topic List',
         'input.new_topic': 'New Topic',
         'input.topics': ' Topics ',
@@ -83,7 +88,7 @@ const resources = {
         'input.send': 'Send',
         'input.pause': 'Pause',
         'input.settings': 'Settings',
-        'input.upload': 'Upload image png、jpg、jpeg',
+        'input.upload': 'Upload image or text file',
         'input.context_count.tip': 'Context Count',
         'input.estimated_tokens.tip': 'Estimated tokens',
         'settings.temperature': 'Temperature',
@@ -100,8 +105,17 @@ const resources = {
         'suggestions.title': 'Suggested Questions',
         'add.assistant.title': 'Add Assistant',
         'message.new.context': 'New Context',
+        'message.new.branch': 'New Branch',
         'assistant.search.placeholder': 'Search'
       },
+      files: {
+        title: 'Files',
+        file: 'File',
+        name: 'Name',
+        size: 'Size',
+        count: 'Count',
+        created_at: 'Created At'
+      },
       agents: {
         title: 'Assistants',
         my_agents: 'My Assistants',
@@ -153,6 +167,7 @@ const resources = {
         'messages.input.title': 'Input Settings',
         'messages.input.show_estimated_tokens': 'Show estimated input tokens',
         'messages.input.send_shortcuts': 'Send shortcuts',
+        'messages.input.paste_long_text_as_file': 'Paste long text as file',
         'general.title': 'General Settings',
         'general.user_name': 'User Name',
         'general.user_name.placeholder': 'Enter your name',
@@ -161,6 +176,8 @@ const resources = {
         'general.restore.button': 'Restore',
         'general.reset.title': 'Data Reset',
         'general.reset.button': 'Reset',
+        'advanced.title': 'Advanced Settings',
+        'advanced.click_assistant_switch_to_topics': 'Auto switch to topic',
         'provider.api_key': 'API Key',
         'provider.check': 'Check',
         'provider.get_api_key': 'Get API Key',
@@ -310,9 +327,13 @@ const resources = {
         'chat.completion.paused': '会话已停止',
         'switch.disabled': '模型回复完成后才能切换',
         'restore.success': '恢复成功',
+        'backup.success': '备份成功',
         'reset.confirm.content': '确定要重置所有数据吗？',
         'reset.double.confirm.title': '数据丢失！！！',
-        'reset.double.confirm.content': '你的全部数据都会丢失，如果没有备份数据，将无法恢复，确定要继续吗？'
+        'reset.double.confirm.content': '你的全部数据都会丢失，如果没有备份数据，将无法恢复，确定要继续吗？',
+        'upgrade.success.title': '升级成功',
+        'upgrade.success.content': '重启应用以完成升级',
+        'upgrade.success.button': '重启'
       },
       chat: {
         save: '保存',
@@ -325,6 +346,7 @@ const resources = {
         'topics.edit.placeholder': '输入新名称',
         'topics.delete.all.title': '删除所有话题',
         'topics.delete.all.content': '确定要删除所有话题吗?',
+        'topics.move_to': '移动到',
         'topics.list': '话题列表',
         'input.new_topic': '新话题',
         'input.topics': ' 话题 ',
@@ -338,7 +360,7 @@ const resources = {
         'input.send': '发送',
         'input.pause': '暂停',
         'input.settings': '设置',
-        'input.upload': '上传图片 png、jpg、jpeg',
+        'input.upload': '上传图片或纯文本文件',
         'input.context_count.tip': '上下文数',
         'input.estimated_tokens.tip': '预估 token 数',
         'settings.temperature': '模型温度',
@@ -356,8 +378,17 @@ const resources = {
         'suggestions.title': '建议的问题',
         'add.assistant.title': '添加智能体',
         'message.new.context': '清除上下文',
+        'message.new.branch': '新分支',
         'assistant.search.placeholder': '搜索'
       },
+      files: {
+        title: '文件',
+        file: '文件',
+        name: '文件名',
+        size: '大小',
+        count: '文件数',
+        created_at: '创建时间'
+      },
       agents: {
         title: '智能体',
         my_agents: '我的智能体',
@@ -409,6 +440,7 @@ const resources = {
         'messages.input.title': '输入设置',
         'messages.input.show_estimated_tokens': '状态显示',
         'messages.input.send_shortcuts': '发送快捷键',
+        'messages.input.paste_long_text_as_file': '长文本粘贴为文件',
         'general.title': '常规设置',
         'general.user_name': '用户名',
         'general.user_name.placeholder': '请输入用户名',
@@ -417,6 +449,8 @@ const resources = {
         'general.restore.button': '恢复',
         'general.reset.title': '重置数据',
         'general.reset.button': '重置',
+        'advanced.title': '高级设置',
+        'advanced.click_assistant_switch_to_topics': '点击助手切换到话题',
         'provider.api_key': 'API 密钥',
         'provider.check': '检查',
         'provider.get_api_key': '点击这里获取密钥',

src/renderer/src/init.ts

@@ -2,7 +2,7 @@ import KeyvStorage from '@kangfenmao/keyv-storage'
 import localforage from 'localforage'
 
 import { APP_NAME } from './config/env'
-import { ThemeMode } from './store/settings'
+import { ThemeMode } from './types'
 import { loadScript } from './utils'
 
 export async function initMermaid(theme: ThemeMode) {

src/renderer/src/pages/agents/components/AddAgentPopup.tsx

@@ -1,8 +1,10 @@
 import 'emoji-picker-element'
 
+import { LoadingOutlined, ThunderboltOutlined } from '@ant-design/icons'
 import EmojiPicker from '@renderer/components/EmojiPicker'
 import { TopView } from '@renderer/components/TopView'
 import { useAgents } from '@renderer/hooks/useAgents'
+import { fetchGenerate } from '@renderer/services/api'
 import { syncAgentToAssistant } from '@renderer/services/assistant'
 import { Agent } from '@renderer/types'
 import { getLeadingEmoji, uuid } from '@renderer/utils'
@@ -29,6 +31,7 @@ const PopupContainer: React.FC<Props> = ({ agent, resolve }) => {
   const { addAgent, updateAgent } = useAgents()
   const formRef = useRef<FormInstance>(null)
   const [emoji, setEmoji] = useState(agent?.emoji)
+  const [loading, setLoading] = useState(false)
 
   const onFinish = (values: FieldType) => {
     const _emoji = emoji || getLeadingEmoji(values.name)
@@ -81,6 +84,34 @@ const PopupContainer: React.FC<Props> = ({ agent, resolve }) => {
     }
   }, [agent, form])
 
+  const handleButtonClick = async () => {
+    const prompt = `你是一个专业的 prompt 优化助手，我会给你一段prompt，你需要帮我优化它，仅回复优化后的 prompt 不要添加任何解释，使用 [CRISPE提示框架] 回复。`
+
+    const name = formRef.current?.getFieldValue('name')
+    const content = formRef.current?.getFieldValue('prompt')
+    const promptText = content || name
+
+    if (!promptText) {
+      return
+    }
+
+    if (content) {
+      navigator.clipboard.writeText(content)
+    }
+
+    setLoading(true)
+
+    try {
+      const prefixedContent = `请帮我优化下面这段 prompt，使用 CRISPE 提示框架，请使用 Markdown 格式回复，不要使用 codeblock: ${promptText}`
+      const generatedText = await fetchGenerate({ prompt, content: prefixedContent })
+      formRef.current?.setFieldValue('prompt', generatedText)
+    } catch (error) {
+      console.error('Error fetching data:', error)
+    }
+
+    setLoading(false)
+  }
+
   return (
     <Modal
       title={agent ? t('agents.edit.title') : t('agents.add.title')}
@@ -100,16 +131,28 @@ const PopupContainer: React.FC<Props> = ({ agent, resolve }) => {
         style={{ marginTop: 25 }}
         onFinish={onFinish}>
         <Form.Item name="name" label="Emoji">
-          <Popover content={<EmojiPicker onEmojiClick={setEmoji} />} trigger="click" arrow>
+          <Popover content={<EmojiPicker onEmojiClick={setEmoji} />} arrow>
             <Button icon={emoji && <span style={{ fontSize: 20 }}>{emoji}</span>}>{t('common.select')}</Button>
           </Popover>
         </Form.Item>
         <Form.Item name="name" label={t('agents.add.name')} rules={[{ required: true }]}>
           <Input placeholder={t('agents.add.name.placeholder')} spellCheck={false} allowClear />
         </Form.Item>
-        <Form.Item name="prompt" label={t('agents.add.prompt')} rules={[{ required: true }]}>
-          <TextArea placeholder={t('agents.add.prompt.placeholder')} spellCheck={false} rows={10} />
-        </Form.Item>
+        <div style={{ position: 'relative' }}>
+          <Form.Item
+            name="prompt"
+            label={t('agents.add.prompt')}
+            rules={[{ required: true }]}
+            style={{ position: 'relative' }}>
+            <TextArea placeholder={t('agents.add.prompt.placeholder')} spellCheck={false} rows={10} />
+          </Form.Item>
+          <Button
+            icon={loading ? <LoadingOutlined /> : <ThunderboltOutlined />}
+            onClick={handleButtonClick}
+            style={{ position: 'absolute', top: 8, right: 8 }}
+            disabled={loading}
+          />
+        </div>
       </Form>
     </Modal>
   )

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

@@ -4,23 +4,22 @@ import { Center } from '@renderer/components/Layout'
 import { getAllMinApps } from '@renderer/config/minapp'
 import { Empty, Input } from 'antd'
 import { isEmpty } from 'lodash'
-import { FC, useState } from 'react'
+import { FC, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import App from './App'
 
-const list = getAllMinApps()
-
 const AppsPage: FC = () => {
   const { t } = useTranslation()
   const [search, setSearch] = useState('')
+  const apps = useMemo(() => getAllMinApps(), [])
 
-  const apps = search
-    ? list.filter(
+  const filteredApps = search
+    ? apps.filter(
         (app) => app.name.toLowerCase().includes(search.toLowerCase()) || app.url.includes(search.toLowerCase())
       )
-    : list
+    : apps
 
   return (
     <Container>
@@ -42,10 +41,10 @@ const AppsPage: FC = () => {
       </Navbar>
       <ContentContainer>
         <AppsContainer>
-          {apps.map((app) => (
-            <App key={app.name} app={app} />
+          {filteredApps.map((app) => (
+            <App key={app.id} app={app} />
           ))}
-          {isEmpty(apps) && (
+          {isEmpty(filteredApps) && (
             <Center style={{ flex: 1 }}>
               <Empty />
             </Center>

src/renderer/src/pages/files/FilesPage.tsx

@@ -0,0 +1,100 @@
+import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
+import { VStack } from '@renderer/components/Layout'
+import db from '@renderer/databases'
+import FileManager from '@renderer/services/file'
+import { FileType, FileTypes } from '@renderer/types'
+import { Image, Table } from 'antd'
+import dayjs from 'dayjs'
+import { useLiveQuery } from 'dexie-react-hooks'
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+const FilesPage: FC = () => {
+  const { t } = useTranslation()
+  const files = useLiveQuery<FileType[]>(() => db.files.orderBy('created_at').reverse().toArray())
+
+  const dataSource = files?.map((file) => {
+    const isImage = file.type === FileTypes.IMAGE
+    const ImageView = <Image src={'file://' + file.path} preview={false} style={{ maxHeight: '40px' }} />
+    return {
+      key: file.id,
+      file: isImage ? ImageView : <FileNameText className="text-nowrap">{file.origin_name}</FileNameText>,
+      name: <a href={'file://' + FileManager.getSafePath(file)}>{file.origin_name}</a>,
+      size: `${(file.size / 1024 / 1024).toFixed(2)} MB`,
+      count: file.count,
+      created_at: dayjs(file.created_at).format('MM-DD HH:mm')
+    }
+  })
+
+  const columns = [
+    {
+      title: t('files.file'),
+      dataIndex: 'file',
+      key: 'file',
+      width: '300px'
+    },
+    {
+      title: t('files.name'),
+      dataIndex: 'name',
+      key: 'name'
+    },
+    {
+      title: t('files.size'),
+      dataIndex: 'size',
+      key: 'size',
+      width: '100px'
+    },
+    {
+      title: t('files.count'),
+      dataIndex: 'count',
+      key: 'count',
+      width: '100px'
+    },
+    {
+      title: t('files.created_at'),
+      dataIndex: 'created_at',
+      key: 'created_at',
+      width: '120px'
+    }
+  ]
+
+  return (
+    <Container>
+      <Navbar>
+        <NavbarCenter style={{ borderRight: 'none' }}>{t('files.title')}</NavbarCenter>
+      </Navbar>
+      <ContentContainer>
+        <VStack style={{ flex: 1 }}>
+          <Table dataSource={dataSource} columns={columns} style={{ width: '100%', height: '100%' }} size="small" />
+        </VStack>
+      </ContentContainer>
+    </Container>
+  )
+}
+
+const Container = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  height: 100%;
+`
+
+const ContentContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  height: 100%;
+  overflow-y: scroll;
+  background-color: var(--color-background);
+  padding: 20px;
+`
+
+const FileNameText = styled.div`
+  font-size: 14px;
+  color: var(--color-text);
+  max-width: 300px;
+`
+
+export default FilesPage

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

@@ -3,6 +3,7 @@ import DragableList from '@renderer/components/DragableList'
 import CopyIcon from '@renderer/components/Icons/CopyIcon'
 import AssistantSettingPopup from '@renderer/components/Popups/AssistantSettingPopup'
 import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant'
+import { useSettings } from '@renderer/hooks/useSettings'
 import { getDefaultTopic, syncAsistantToAgent } from '@renderer/services/assistant'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
 import { useAppDispatch, useAppSelector } from '@renderer/store'
@@ -27,6 +28,7 @@ const Assistants: FC<Props> = ({ activeAssistant, setActiveAssistant, onCreateAs
   const generating = useAppSelector((state) => state.runtime.generating)
   const [search, setSearch] = useState('')
   const { updateAssistant, removeAllTopics } = useAssistant(activeAssistant.id)
+  const { clickAssistantToShowTopic, topicPosition } = useSettings()
   const searchRef = useRef<InputRef>(null)
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
@@ -103,9 +105,13 @@ const Assistants: FC<Props> = ({ activeAssistant, setActiveAssistant, onCreateAs
         })
       }
 
+      if (topicPosition === 'left' && clickAssistantToShowTopic) {
+        EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR)
+      }
+
       setActiveAssistant(assistant)
     },
-    [generating, setActiveAssistant, t]
+    [clickAssistantToShowTopic, generating, setActiveAssistant, t, topicPosition]
   )
 
   const list = assistants.filter((assistant) => assistant.name?.toLowerCase().includes(search.toLowerCase().trim()))

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

@@ -1,29 +1,44 @@
 import { PaperClipOutlined } from '@ant-design/icons'
-import { Tooltip, Upload } from 'antd'
+import { imageExts, textExts } from '@renderer/config/constant'
+import { isVisionModel } from '@renderer/config/models'
+import { FileType, Model } from '@renderer/types'
+import { Tooltip } from 'antd'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
 
 interface Props {
-  files: File[]
-  setFiles: (files: File[]) => void
+  model: Model
+  files: FileType[]
+  setFiles: (files: FileType[]) => void
   ToolbarButton: any
 }
 
-const AttachmentButton: FC<Props> = ({ files, setFiles, ToolbarButton }) => {
+const AttachmentButton: FC<Props> = ({ model, files, setFiles, ToolbarButton }) => {
   const { t } = useTranslation()
+  const extensions = isVisionModel(model) ? [...imageExts, ...textExts] : [...textExts]
+
+  const onSelectFile = async () => {
+    if (files.length > 0) {
+      return setFiles([])
+    }
+
+    const _files = await window.api.file.select({
+      filters: [
+        {
+          name: 'Files',
+          extensions: extensions.map((i) => i.replace('.', ''))
+        }
+      ]
+    })
+
+    _files && setFiles(_files)
+  }
 
   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>
+      <ToolbarButton type="text" className={files.length ? 'active' : ''} onClick={onSelectFile}>
+        <PaperClipOutlined style={{ rotate: '135deg' }} />
+      </ToolbarButton>
     </Tooltip>
   )
 }

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

@@ -0,0 +1,42 @@
+import FileManager from '@renderer/services/file'
+import { FileType } from '@renderer/types'
+import { Upload } from 'antd'
+import { isEmpty } from 'lodash'
+import { FC } from 'react'
+import styled from 'styled-components'
+
+interface Props {
+  files: FileType[]
+  setFiles: (files: FileType[]) => void
+}
+
+const AttachmentPreview: FC<Props> = ({ files, setFiles }) => {
+  if (isEmpty(files)) {
+    return null
+  }
+
+  return (
+    <Container>
+      <Upload
+        listType="picture-card"
+        fileList={files.map((file) => ({
+          uid: file.id,
+          url: 'file://' + FileManager.getSafePath(file),
+          status: 'done',
+          name: file.name
+        }))}
+        onRemove={(item) => setFiles(files.filter((file) => item.uid !== file.id))}
+      />
+    </Container>
+  )
+}
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  margin: 10px 20px;
+  margin-right: 0;
+`
+
+export default AttachmentPreview

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

@@ -1,23 +1,27 @@
 import {
   ClearOutlined,
   ControlOutlined,
+  FormOutlined,
   FullscreenExitOutlined,
   FullscreenOutlined,
   HistoryOutlined,
   PauseCircleOutlined,
-  PlusCircleOutlined,
   QuestionCircleOutlined
 } from '@ant-design/icons'
+import { imageExts, textExts } from '@renderer/config/constant'
+import { isVisionModel } from '@renderer/config/models'
+import db from '@renderer/databases'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useRuntime, useShowTopics } from '@renderer/hooks/useStore'
 import { getDefaultTopic } from '@renderer/services/assistant'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
-import { estimateInputTokenCount } from '@renderer/services/messages'
+import FileManager from '@renderer/services/file'
+import { estimateTextTokens } from '@renderer/services/tokens'
 import store, { useAppDispatch, useAppSelector } from '@renderer/store'
 import { setGenerating, setSearching } from '@renderer/store/runtime'
-import { Assistant, Message, Topic } from '@renderer/types'
-import { delay, uuid } from '@renderer/utils'
+import { Assistant, FileType, Message, Topic } from '@renderer/types'
+import { delay, getFileExtension, uuid } from '@renderer/utils'
 import { Button, Popconfirm, Tooltip } from 'antd'
 import TextArea, { TextAreaRef } from 'antd/es/input/TextArea'
 import dayjs from 'dayjs'
@@ -26,6 +30,8 @@ import { CSSProperties, FC, useCallback, useEffect, useMemo, useRef, useState }
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+import AttachmentButton from './AttachmentButton'
+import AttachmentPreview from './AttachmentPreview'
 import SendMessageButton from './SendMessageButton'
 import TokenCount from './TokenCount'
 
@@ -39,23 +45,26 @@ let _text = ''
 const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
   const [text, setText] = useState(_text)
   const [inputFocus, setInputFocus] = useState(false)
-  const { addTopic } = useAssistant(assistant.id)
-  const { sendMessageShortcut, fontSize } = useSettings()
+  const { addTopic, model } = useAssistant(assistant.id)
+  const { sendMessageShortcut, fontSize, pasteLongTextAsFile } = useSettings()
   const [expended, setExpend] = useState(false)
   const [estimateTokenCount, setEstimateTokenCount] = useState(0)
   const [contextCount, setContextCount] = useState(0)
   const generating = useAppSelector((state) => state.runtime.generating)
   const textareaRef = useRef<TextAreaRef>(null)
-  const [files, setFiles] = useState<File[]>([])
+  const [files, setFiles] = useState<FileType[]>([])
   const { t } = useTranslation()
   const containerRef = useRef(null)
   const { showTopics, toggleShowTopics } = useShowTopics()
   const { searching } = useRuntime()
   const dispatch = useAppDispatch()
 
+  const isVision = useMemo(() => isVisionModel(model), [model])
+  const supportExts = useMemo(() => [...textExts, ...(isVision ? imageExts : [])], [isVision])
+
   _text = text
 
-  const sendMessage = useCallback(() => {
+  const sendMessage = useCallback(async () => {
     if (generating) {
       return
     }
@@ -75,7 +84,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     }
 
     if (files.length > 0) {
-      message.files = files
+      message.files = await FileManager.uploadFiles(files)
     }
 
     EventEmitter.emit(EVENT_NAMES.SEND_MESSAGE, message)
@@ -88,7 +97,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     setExpend(false)
   }, [assistant.id, assistant.topics, generating, files, text])
 
-  const inputTokenCount = useMemo(() => estimateInputTokenCount(text), [text])
+  const inputTokenCount = useMemo(() => estimateTextTokens(text), [text])
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
     const isEnterPressed = event.keyCode == 13
@@ -117,6 +126,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     const topic = getDefaultTopic()
     addTopic(topic)
     setActiveTopic(topic)
+    db.topics.add({ id: topic.id, messages: [] })
   }, [addTopic, setActiveTopic])
 
   const clearTopic = async () => {
@@ -166,6 +176,53 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
 
   const onInput = () => !expended && resizeTextArea()
 
+  const onPaste = useCallback(
+    async (event: ClipboardEvent) => {
+      for (const file of event.clipboardData?.files || []) {
+        event.preventDefault()
+
+        if (file.path === '') {
+          if (file.type.startsWith('image/')) {
+            const tempFilePath = await window.api.file.create(file.name)
+            const arrayBuffer = await file.arrayBuffer()
+            const uint8Array = new Uint8Array(arrayBuffer)
+            await window.api.file.write(tempFilePath, uint8Array)
+            const selectedFile = await window.api.file.get(tempFilePath)
+            selectedFile && setFiles((prevFiles) => [...prevFiles, selectedFile])
+            break
+          }
+        }
+
+        if (file.path) {
+          if (supportExts.includes(getFileExtension(file.path))) {
+            const selectedFile = await window.api.file.get(file.path)
+            selectedFile && setFiles((prevFiles) => [...prevFiles, selectedFile])
+          }
+        }
+      }
+
+      if (pasteLongTextAsFile) {
+        const item = event.clipboardData?.items[0]
+        if (item && item.kind === 'string' && item.type === 'text/plain') {
+          event.preventDefault()
+          item.getAsString(async (text) => {
+            if (text.length > 1500) {
+              console.debug(item.getAsFile())
+              const tempFilePath = await window.api.file.create('pasted_text.txt')
+              await window.api.file.write(tempFilePath, text)
+              const selectedFile = await window.api.file.get(tempFilePath)
+              selectedFile && setFiles((prevFiles) => [...prevFiles, selectedFile])
+            } else {
+              setText((prevText) => prevText + text)
+              setTimeout(() => resizeTextArea(), 0)
+            }
+          })
+        }
+      }
+    },
+    [supportExts, pasteLongTextAsFile]
+  )
+
   // Command or Ctrl + N create new topic
   useEffect(() => {
     const onKeydown = (e) => {
@@ -187,6 +244,7 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
       EventEmitter.on(EVENT_NAMES.EDIT_MESSAGE, (message: Message) => {
         setText(message.content)
         textareaRef.current?.focus()
+        setTimeout(() => resizeTextArea(), 0)
       }),
       EventEmitter.on(EVENT_NAMES.ESTIMATED_TOKEN_COUNT, ({ tokensCount, contextCount }) => {
         _setEstimateTokenCount(tokensCount)
@@ -200,101 +258,114 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
     textareaRef.current?.focus()
   }, [assistant])
 
+  useEffect(() => {
+    document.addEventListener('paste', onPaste)
+    return () => document.removeEventListener('paste', onPaste)
+  }, [onPaste])
+
   return (
-    <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}
-        disabled={searching}
-        onClick={() => searching && dispatch(setSearching(false))}
-      />
-      <Toolbar>
-        <ToolbarMenu>
-          <Tooltip placement="top" title={t('chat.input.new_topic')} arrow>
-            <ToolbarButton type="text" onClick={addNewTopic}>
-              <PlusCircleOutlined />
-            </ToolbarButton>
-          </Tooltip>
-          <Tooltip placement="top" title={t('chat.input.clear')} arrow>
-            <Popconfirm
-              title={t('chat.input.clear.content')}
-              placement="top"
-              onConfirm={clearTopic}
-              okButtonProps={{ danger: true }}
-              icon={<QuestionCircleOutlined style={{ color: 'red' }} />}
-              okText={t('chat.input.clear')}>
-              <ToolbarButton type="text">
-                <ClearOutlined />
-              </ToolbarButton>
-            </Popconfirm>
-          </Tooltip>
-          <Tooltip placement="top" title={t('chat.input.topics')} arrow>
-            <ToolbarButton
-              type="text"
-              onClick={() => {
-                !showTopics && toggleShowTopics()
-                setTimeout(() => EventEmitter.emit(EVENT_NAMES.SHOW_TOPIC_SIDEBAR), 0)
-              }}>
-              <HistoryOutlined />
-            </ToolbarButton>
-          </Tooltip>
-          <Tooltip placement="top" title={t('chat.input.settings')} arrow>
-            <ToolbarButton
-              type="text"
-              onClick={() => {
-                !showTopics && toggleShowTopics()
-                setTimeout(() => EventEmitter.emit(EVENT_NAMES.SHOW_CHAT_SETTINGS), 0)
-              }}>
-              <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={onToggleExpended}>
-              {expended ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
-            </ToolbarButton>
-          </Tooltip>
-          <TokenCount
-            estimateTokenCount={estimateTokenCount}
-            inputTokenCount={inputTokenCount}
-            contextCount={contextCount}
-            ToolbarButton={ToolbarButton}
-            onClick={onNewContext}
-          />
-        </ToolbarMenu>
-        <ToolbarMenu>
-          {generating && (
-            <Tooltip placement="top" title={t('chat.input.pause')} arrow>
-              <ToolbarButton type="text" onClick={onPause} style={{ marginRight: -2, marginTop: 1 }}>
-                <PauseCircleOutlined style={{ color: 'var(--color-error)', fontSize: 20 }} />
+    <Container>
+      <AttachmentPreview files={files} setFiles={setFiles} />
+      <InputBarContainer 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}
+          disabled={searching}
+          onClick={() => searching && dispatch(setSearching(false))}
+        />
+        <Toolbar>
+          <ToolbarMenu>
+            <Tooltip placement="top" title={t('chat.input.new_topic')} arrow>
+              <ToolbarButton type="text" onClick={addNewTopic}>
+                <FormOutlined />
               </ToolbarButton>
             </Tooltip>
-          )}
-          {!generating && <SendMessageButton sendMessage={sendMessage} disabled={generating || !text} />}
-        </ToolbarMenu>
-      </Toolbar>
+            <Tooltip placement="top" title={t('chat.input.clear')} arrow>
+              <Popconfirm
+                title={t('chat.input.clear.content')}
+                placement="top"
+                onConfirm={clearTopic}
+                okButtonProps={{ danger: true }}
+                icon={<QuestionCircleOutlined style={{ color: 'red' }} />}
+                okText={t('chat.input.clear')}>
+                <ToolbarButton type="text">
+                  <ClearOutlined />
+                </ToolbarButton>
+              </Popconfirm>
+            </Tooltip>
+            <Tooltip placement="top" title={t('chat.input.topics')} arrow>
+              <ToolbarButton
+                type="text"
+                onClick={() => {
+                  !showTopics && toggleShowTopics()
+                  setTimeout(() => EventEmitter.emit(EVENT_NAMES.SHOW_TOPIC_SIDEBAR), 0)
+                }}>
+                <HistoryOutlined />
+              </ToolbarButton>
+            </Tooltip>
+            <Tooltip placement="top" title={t('chat.input.settings')} arrow>
+              <ToolbarButton
+                type="text"
+                onClick={() => {
+                  !showTopics && toggleShowTopics()
+                  setTimeout(() => EventEmitter.emit(EVENT_NAMES.SHOW_CHAT_SETTINGS), 0)
+                }}>
+                <ControlOutlined />
+              </ToolbarButton>
+            </Tooltip>
+            <AttachmentButton model={model} files={files} setFiles={setFiles} ToolbarButton={ToolbarButton} />
+            <Tooltip placement="top" title={expended ? t('chat.input.collapse') : t('chat.input.expand')} arrow>
+              <ToolbarButton type="text" onClick={onToggleExpended}>
+                {expended ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
+              </ToolbarButton>
+            </Tooltip>
+            <TokenCount
+              estimateTokenCount={estimateTokenCount}
+              inputTokenCount={inputTokenCount}
+              contextCount={contextCount}
+              ToolbarButton={ToolbarButton}
+              onClick={onNewContext}
+            />
+          </ToolbarMenu>
+          <ToolbarMenu>
+            {generating && (
+              <Tooltip placement="top" title={t('chat.input.pause')} arrow>
+                <ToolbarButton type="text" onClick={onPause} style={{ marginRight: -2, marginTop: 1 }}>
+                  <PauseCircleOutlined style={{ color: 'var(--color-error)', fontSize: 20 }} />
+                </ToolbarButton>
+              </Tooltip>
+            )}
+            {!generating && <SendMessageButton sendMessage={sendMessage} disabled={generating || !text} />}
+          </ToolbarMenu>
+        </Toolbar>
+      </InputBarContainer>
     </Container>
   )
 }
 
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+`
+
 const TextareaStyle: CSSProperties = {
   paddingLeft: 0,
   padding: '10px 15px 8px'
 }
 
-const Container = styled.div`
+const InputBarContainer = styled.div`
   border: 1px solid var(--color-border-soft);
   transition: all 0.3s ease;
   position: relative;
@@ -350,14 +421,23 @@ const ToolbarButton = styled(Button)`
     transition: all 0.3s ease;
     color: var(--color-icon);
   }
-  &:hover,
-  &.active {
+  &:hover {
     background-color: var(--color-background-soft);
     .anticon,
     .iconfont {
       color: var(--color-text-1);
     }
   }
+  &.active {
+    background-color: var(--color-primary) !important;
+    .anticon,
+    .iconfont {
+      color: var(--color-white-soft);
+    }
+    &:hover {
+      background-color: var(--color-primary);
+    }
+  }
 `
 
 export default Inputbar

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

@@ -44,8 +44,8 @@ const TokenCount: FC<Props> = ({ estimateTokenCount, inputTokenCount, contextCou
           <PicCenterOutlined />
         </Tooltip>
       </ToolbarButton>
-      <Container {...props}>
-        <Popover content={PopoverContent} title="" mouseEnterDelay={0.6}>
+      <Container>
+        <Popover content={PopoverContent}>
           <MenuOutlined /> {contextCount}
           <Divider type="vertical" style={{ marginTop: 0, marginLeft: 5, marginRight: 5 }} />
           <ArrowUpOutlined />

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

@@ -2,8 +2,8 @@ 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 { ThemeMode } from '@renderer/store/settings'
-import React, { useState } from 'react'
+import { ThemeMode } from '@renderer/types'
+import React, { memo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
 import { atomDark, oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism'
@@ -17,34 +17,23 @@ interface CodeBlockProps {
   [key: string]: any
 }
 
-const CodeBlock: React.FC<CodeBlockProps> = ({ children, className, ...rest }) => {
+const CodeBlock: React.FC<CodeBlockProps> = ({ children, className }) => {
   const match = /language-(\w+)/.exec(className || '')
-  const [copied, setCopied] = useState(false)
+  const showFooterCopyButton = children && children.length > 500
   const { theme } = useTheme()
 
-  const { t } = useTranslation()
-
-  const onCopy = () => {
-    navigator.clipboard.writeText(children)
-    window.message.success({ content: t('message.copied'), key: 'copy-code' })
-    setCopied(true)
-    setTimeout(() => setCopied(false), 2000)
-  }
-
   if (match && match[1] === 'mermaid') {
     initMermaid(theme)
     return <Mermaid chart={children} />
   }
 
   return match ? (
-    <>
+    <div className="code-block">
       <CodeHeader>
         <CodeLanguage>{'<' + match[1].toUpperCase() + '>'}</CodeLanguage>
-        {!copied && <CopyIcon className="copy" onClick={onCopy} />}
-        {copied && <CheckOutlined style={{ color: 'var(--color-primary)' }} />}
+        <CopyButton text={children} />
       </CodeHeader>
       <SyntaxHighlighter
-        {...rest}
         language={match[1]}
         style={theme === ThemeMode.dark ? atomDark : oneLight}
         wrapLongLines={true}
@@ -56,11 +45,32 @@ const CodeBlock: React.FC<CodeBlockProps> = ({ children, className, ...rest }) =
         }}>
         {String(children).replace(/\n$/, '')}
       </SyntaxHighlighter>
-    </>
+      {showFooterCopyButton && (
+        <CodeFooter>
+          <CopyButton text={children} style={{ marginTop: -40, marginRight: 10 }} />
+        </CodeFooter>
+      )}
+    </div>
   ) : (
-    <code {...rest} className={className}>
-      {children}
-    </code>
+    <code className={className}>{children}</code>
+  )
+}
+
+const CopyButton: React.FC<{ text: string; style?: React.CSSProperties }> = ({ text, style }) => {
+  const [copied, setCopied] = useState(false)
+  const { t } = useTranslation()
+
+  const onCopy = () => {
+    navigator.clipboard.writeText(text)
+    window.message.success({ content: t('message.copied'), key: 'copy-code' })
+    setCopied(true)
+    setTimeout(() => setCopied(false), 2000)
+  }
+
+  return copied ? (
+    <CheckOutlined style={{ color: 'var(--color-primary)', ...style }} />
+  ) : (
+    <CopyIcon className="copy" style={style} onClick={onCopy} />
   )
 }
 
@@ -90,4 +100,19 @@ const CodeLanguage = styled.div`
   font-weight: bold;
 `
 
-export default CodeBlock
+const CodeFooter = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+  .copy {
+    cursor: pointer;
+    color: var(--color-text-3);
+    transition: color 0.3s;
+  }
+  .copy:hover {
+    color: var(--color-text-1);
+  }
+`
+
+export default memo(CodeBlock)

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

@@ -4,7 +4,7 @@ import { Message } from '@renderer/types'
 import { isEmpty } from 'lodash'
 import { FC, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import ReactMarkdown from 'react-markdown'
+import ReactMarkdown, { Components } from 'react-markdown'
 import rehypeKatex from 'rehype-katex'
 import remarkGfm from 'remark-gfm'
 import remarkMath from 'remark-math'
@@ -16,6 +16,14 @@ interface Props {
   message: Message
 }
 
+const rehypePlugins = [rehypeKatex]
+const remarkPlugins = [remarkMath, remarkGfm]
+
+const components = {
+  code: CodeBlock,
+  a: Link
+}
+
 const Markdown: FC<Props> = ({ message }) => {
   const { t } = useTranslation()
 
@@ -23,25 +31,54 @@ const Markdown: FC<Props> = ({ message }) => {
     const empty = isEmpty(message.content)
     const paused = message.status === 'paused'
     const content = empty && paused ? t('message.chat.completion.paused') : message.content
-    return content
+    return escapeBrackets(escapeDollarNumber(content))
   }, [message.content, message.status, t])
 
-  return useMemo(() => {
-    return (
-      <ReactMarkdown
-        className="markdown"
-        rehypePlugins={[rehypeKatex]}
-        remarkPlugins={[remarkMath, remarkGfm]}
-        remarkRehypeOptions={{
-          footnoteLabel: t('common.footnotes'),
-          footnoteLabelTagName: 'h4',
-          footnoteBackContent: ' '
-        }}
-        components={{ code: CodeBlock as any, a: Link as any }}>
-        {messageContent}
-      </ReactMarkdown>
-    )
-  }, [messageContent, t])
+  return (
+    <ReactMarkdown
+      className="markdown"
+      rehypePlugins={rehypePlugins}
+      remarkPlugins={remarkPlugins}
+      components={components as Partial<Components>}
+      remarkRehypeOptions={{
+        footnoteLabel: t('common.footnotes'),
+        footnoteLabelTagName: 'h4',
+        footnoteBackContent: ' '
+      }}>
+      {messageContent}
+    </ReactMarkdown>
+  )
+}
+
+function escapeDollarNumber(text: string) {
+  let escapedText = ''
+
+  for (let i = 0; i < text.length; i += 1) {
+    let char = text[i]
+    const nextChar = text[i + 1] || ' '
+
+    if (char === '$' && nextChar >= '0' && nextChar <= '9') {
+      char = '\\$'
+    }
+
+    escapedText += char
+  }
+
+  return escapedText
+}
+
+function escapeBrackets(text: string) {
+  const pattern = /(```[\s\S]*?```|`.*?`)|\\\[([\s\S]*?[^\\])\\\]|\\\((.*?)\\\)/g
+  return text.replace(pattern, (match, codeBlock, squareBracket, roundBracket) => {
+    if (codeBlock) {
+      return codeBlock
+    } else if (squareBracket) {
+      return `$$${squareBracket}$$`
+    } else if (roundBracket) {
+      return `$${roundBracket}$`
+    }
+    return match
+  })
 }
 
 export default Markdown

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

@@ -2,6 +2,7 @@ import {
   CheckOutlined,
   DeleteOutlined,
   EditOutlined,
+  ForkOutlined,
   MenuOutlined,
   QuestionCircleOutlined,
   SaveOutlined,
@@ -9,16 +10,16 @@ import {
 } from '@ant-design/icons'
 import UserPopup from '@renderer/components/Popups/UserPopup'
 import { FONT_FAMILY } from '@renderer/config/constant'
+import { APP_NAME, AppLogo, isLocalAi } from '@renderer/config/env'
 import { startMinAppById } from '@renderer/config/minapp'
 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'
 import { Message, Model } from '@renderer/types'
-import { firstLetter, removeLeadingEmoji } from '@renderer/utils'
+import { firstLetter, removeLeadingEmoji, removeTrailingDoubleSpaces } from '@renderer/utils'
 import { Alert, Avatar, Divider, Dropdown, Popconfirm, Tooltip } from 'antd'
 import dayjs from 'dayjs'
 import { upperFirst } from 'lodash'
@@ -29,6 +30,7 @@ import styled from 'styled-components'
 import SelectModelDropdown from '../components/SelectModelDropdown'
 import Markdown from '../Markdown/Markdown'
 import MessageAttachments from './MessageAttachments'
+import MessgeTokens from './MessageTokens'
 
 interface Props {
   message: Message
@@ -44,17 +46,15 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
   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)
 
   const isLastMessage = index === 0
   const isUserMessage = message.role === 'user'
   const isAssistantMessage = message.role === 'assistant'
   const canRegenerate = isLastMessage && isAssistantMessage
-  const showMetadata = Boolean(message.usage) && !generating
 
   const onCopy = useCallback(() => {
-    navigator.clipboard.writeText(message.content)
+    navigator.clipboard.writeText(removeTrailingDoubleSpaces(message.content))
     window.message.success({ content: t('message.copied'), key: 'copy-message' })
     setCopied(true)
     setTimeout(() => setCopied(false), 2000)
@@ -70,19 +70,29 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
     [setModel]
   )
 
+  const onNewBranch = useCallback(() => {
+    EventEmitter.emit(EVENT_NAMES.NEW_BRANCH, index)
+  }, [index])
+
   const getUserName = useCallback(() => {
-    if (message.id === 'assistant') return assistant?.name
+    if (isLocalAi && message.role !== 'user') return APP_NAME
     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])
+  }, [message.role, model?.id, model?.name, t, userName])
 
   const fontFamily = useMemo(() => {
     return messageFont === 'serif' ? FONT_FAMILY.replace('sans-serif', 'serif').replace('Ubuntu, ', '') : FONT_FAMILY
   }, [messageFont])
 
   const messageBorder = showMessageDivider ? undefined : 'none'
-  const avatarSource = useMemo(() => (message.modelId ? getModelLogo(message.modelId) : undefined), [message.modelId])
+
+  const avatarSource = useMemo(() => {
+    if (isLocalAi) return AppLogo
+    return message.modelId ? getModelLogo(message.modelId) : undefined
+  }, [message.modelId])
+
   const avatarName = useMemo(() => firstLetter(assistant?.name).toUpperCase(), [assistant?.name])
+
   const username = useMemo(() => removeLeadingEmoji(getUserName()), [getUserName])
 
   const dropdownItems = useMemo(
@@ -100,34 +110,6 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
     [t, message]
   )
 
-  const MessageItem = useCallback(() => {
-    if (message.status === 'sending') {
-      return (
-        <MessageContentLoading>
-          <SyncOutlined spin size={24} />
-        </MessageContentLoading>
-      )
-    }
-
-    if (message.status === 'error') {
-      return (
-        <Alert
-          message={<div style={{ fontSize: 14 }}>{t('error.chat.response')}</div>}
-          description={<Markdown message={message} />}
-          type="error"
-          style={{ marginBottom: 15, padding: 10, fontSize: 12 }}
-        />
-      )
-    }
-
-    return (
-      <>
-        <Markdown message={message} />
-        <MessageAttachments message={message} />
-      </>
-    )
-  }, [message, t])
-
   const showMiniApp = () => model?.provider && startMinAppById(model?.provider)
 
   if (message.type === 'clear') {
@@ -146,7 +128,11 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
             <Avatar
               src={avatarSource}
               size={35}
-              style={{ borderRadius: '20%', cursor: 'pointer' }}
+              style={{
+                borderRadius: '20%',
+                cursor: 'pointer',
+                border: '1px solid var(--color-border)'
+              }}
               onClick={showMiniApp}>
               {avatarName}
             </Avatar>
@@ -164,11 +150,12 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
           </UserWrap>
         </AvatarWrapper>
       </MessageHeader>
-      <MessageContent style={{ fontFamily, fontSize }}>
-        <MessageItem />
-        <MessageFooter style={{ border: messageBorder }}>
+      <MessageContentContainer style={{ fontFamily, fontSize }}>
+        <MessageContent message={message} />
+        <MessageFooter style={{ border: messageBorder, flexDirection: isLastMessage ? 'row-reverse' : undefined }}>
+          <MessgeTokens message={message} />
           {showMenu && (
-            <MenusBar className={`menubar ${isLastMessage && 'show'} ${(!isLastMessage || isUserMessage) && 'user'}`}>
+            <MenusBar className={`menubar ${isLastMessage && 'show'}`}>
               {message.role === 'user' && (
                 <Tooltip title="Edit" mouseEnterDelay={0.8}>
                   <ActionButton onClick={onEdit}>
@@ -191,6 +178,13 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
                   </Tooltip>
                 </SelectModelDropdown>
               )}
+              {isAssistantMessage && (
+                <Tooltip title={t('chat.message.new.branch')} mouseEnterDelay={0.8}>
+                  <ActionButton onClick={onNewBranch}>
+                    <ForkOutlined />
+                  </ActionButton>
+                </Tooltip>
+              )}
               <Popconfirm
                 title={t('message.message.delete.content')}
                 okButtonProps={{ danger: true }}
@@ -211,18 +205,42 @@ const MessageItem: FC<Props> = ({ message, index, showMenu, onDeleteMessage }) =
               )}
             </MenusBar>
           )}
-          {showMetadata && (
-            <MessageMetadata>
-              Tokens: {message?.usage?.total_tokens} | ↑{message?.usage?.prompt_tokens} | ↓
-              {message?.usage?.completion_tokens}
-            </MessageMetadata>
-          )}
         </MessageFooter>
-      </MessageContent>
+      </MessageContentContainer>
     </MessageContainer>
   )
 }
 
+const MessageContent: React.FC<{ message: Message }> = ({ message }) => {
+  const { t } = useTranslation()
+
+  if (message.status === 'sending') {
+    return (
+      <MessageContentLoading>
+        <SyncOutlined spin size={24} />
+      </MessageContentLoading>
+    )
+  }
+
+  if (message.status === 'error') {
+    return (
+      <Alert
+        message={<div style={{ fontSize: 14 }}>{t('error.chat.response')}</div>}
+        description={<Markdown message={message} />}
+        type="error"
+        style={{ marginBottom: 15, padding: 10, fontSize: 12 }}
+      />
+    )
+  }
+
+  return (
+    <>
+      <Markdown message={message} />
+      <MessageAttachments message={message} />
+    </>
+  )
+}
+
 const MessageContainer = styled.div`
   display: flex;
   flex-direction: column;
@@ -279,7 +297,7 @@ const MessageTime = styled.div`
   color: var(--color-text-3);
 `
 
-const MessageContent = styled.div`
+const MessageContentContainer = styled.div`
   display: flex;
   flex: 1;
   flex-direction: column;
@@ -314,13 +332,6 @@ const MenusBar = styled.div`
   margin-left: -5px;
 `
 
-const MessageMetadata = styled.div`
-  font-size: 12px;
-  color: var(--color-text-2);
-  user-select: text;
-  margin: 2px 0;
-`
-
 const ActionButton = styled.div`
   cursor: pointer;
   border-radius: 8px;

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

@@ -1,5 +1,6 @@
-import { Message } from '@renderer/types'
-import { Image as AntdImage } from 'antd'
+import { FileTypes, Message } from '@renderer/types'
+import { getFileDirectory } from '@renderer/utils'
+import { Image as AntdImage, Upload } from 'antd'
 import { FC } from 'react'
 import styled from 'styled-components'
 
@@ -8,7 +9,29 @@ interface Props {
 }
 
 const MessageAttachments: FC<Props> = ({ message }) => {
-  return <Container>{message.images?.map((image) => <Image src={image} key={image} width="33%" />)}</Container>
+  if (message?.files && message.files[0]?.type === FileTypes.IMAGE) {
+    return (
+      <Container>
+        {message.files?.map((image) => <Image src={'file://' + image.path} key={image.id} width="33%" />)}
+      </Container>
+    )
+  }
+
+  return (
+    <Container style={{ marginTop: 2, marginBottom: 8 }}>
+      <Upload
+        listType="picture"
+        disabled
+        onPreview={(item) => item.url && window.open(getFileDirectory(item.url))}
+        fileList={message.files?.map((file) => ({
+          uid: file.id,
+          url: 'file://' + file.path,
+          status: 'done',
+          name: file.origin_name
+        }))}
+      />
+    </Container>
+  )
 }
 
 const Container = styled.div`

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

@@ -0,0 +1,38 @@
+import { useRuntime } from '@renderer/hooks/useStore'
+import { Message } from '@renderer/types'
+import styled from 'styled-components'
+
+const MessgeTokens: React.FC<{ message: Message }> = ({ message }) => {
+  const { generating } = useRuntime()
+
+  if (!message.usage) {
+    return null
+  }
+
+  if (message.role === 'user') {
+    return <MessageMetadata>Tokens: {message?.usage?.total_tokens}</MessageMetadata>
+  }
+
+  if (generating) {
+    return null
+  }
+
+  if (message.role === 'assistant') {
+    return (
+      <MessageMetadata>
+        Tokens: {message?.usage?.total_tokens} | ↑{message?.usage?.prompt_tokens} | ↓{message?.usage?.completion_tokens}
+      </MessageMetadata>
+    )
+  }
+
+  return null
+}
+
+const MessageMetadata = styled.div`
+  font-size: 12px;
+  color: var(--color-text-2);
+  user-select: text;
+  margin: 2px 0;
+`
+
+export default MessgeTokens

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

@@ -1,15 +1,15 @@
+import db from '@renderer/databases'
 import { useAssistant } from '@renderer/hooks/useAssistant'
-import { useProviderByAssistant } from '@renderer/hooks/useProvider'
-import { getTopic } from '@renderer/hooks/useTopic'
+import { getTopic, TopicManager } from '@renderer/hooks/useTopic'
 import { fetchChatCompletion, fetchMessagesSummary } from '@renderer/services/api'
+import { getDefaultTopic } from '@renderer/services/assistant'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
-import { estimateHistoryTokenCount, filterMessages, getContextCount } from '@renderer/services/messages'
-import LocalStorage from '@renderer/services/storage'
+import { deleteMessageFiles, filterMessages, getContextCount } from '@renderer/services/messages'
+import { estimateHistoryTokens, estimateMessageUsage } from '@renderer/services/tokens'
 import { Assistant, Message, Model, Topic } from '@renderer/types'
 import { getBriefInfo, runAsyncFunction, uuid } from '@renderer/utils'
 import { t } from 'i18next'
-import localforage from 'localforage'
-import { last, reverse } from 'lodash'
+import { flatten, last, reverse, take } from 'lodash'
 import { FC, useCallback, useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 
@@ -26,17 +26,25 @@ interface Props {
 const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
   const [messages, setMessages] = useState<Message[]>([])
   const [lastMessage, setLastMessage] = useState<Message | null>(null)
-  const provider = useProviderByAssistant(assistant)
   const containerRef = useRef<HTMLDivElement>(null)
-  const { updateTopic } = useAssistant(assistant.id)
+  const { updateTopic, addTopic } = useAssistant(assistant.id)
 
   const onSendMessage = useCallback(
-    (message: Message) => {
+    async (message: Message) => {
+      if (message.role === 'user') {
+        estimateMessageUsage(message).then((usage) => {
+          setMessages((prev) => {
+            const _messages = prev.map((m) => (m.id === message.id ? { ...m, usage } : m))
+            db.topics.update(topic.id, { messages: _messages })
+            return _messages
+          })
+        })
+      }
       const _messages = [...messages, message]
       setMessages(_messages)
-      localforage.setItem(`topic:${topic.id}`, { id: topic.id, messages: _messages })
+      db.topics.put({ id: topic.id, messages: _messages })
     },
-    [messages, topic]
+    [messages, topic.id]
   )
 
   const autoRenameTopic = useCallback(async () => {
@@ -55,7 +63,8 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
     (message: Message) => {
       const _messages = messages.filter((m) => m.id !== message.id)
       setMessages(_messages)
-      localforage.setItem(`topic:${topic.id}`, { id: topic.id, messages: _messages })
+      db.topics.update(topic.id, { messages: _messages })
+      deleteMessageFiles(message)
     },
     [messages, topic.id]
   )
@@ -63,10 +72,15 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
   useEffect(() => {
     const unsubscribes = [
       EventEmitter.on(EVENT_NAMES.SEND_MESSAGE, async (msg: Message) => {
-        onSendMessage(msg)
-        fetchChatCompletion({ assistant, messages: [...messages, msg], topic, onResponse: setLastMessage })
+        await onSendMessage(msg)
+        fetchChatCompletion({
+          assistant,
+          messages: [...messages, msg],
+          topic,
+          onResponse: setLastMessage
+        })
       }),
-      EventEmitter.on(EVENT_NAMES.AI_CHAT_COMPLETION, async (msg: Message) => {
+      EventEmitter.on(EVENT_NAMES.RECEIVE_MESSAGE, async (msg: Message) => {
         setLastMessage(null)
         onSendMessage(msg)
         setTimeout(() => EventEmitter.emit(EVENT_NAMES.AI_AUTO_RENAME), 100)
@@ -88,12 +102,13 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
       EventEmitter.on(EVENT_NAMES.CLEAR_MESSAGES, () => {
         setMessages([])
         updateTopic({ ...topic, messages: [] })
-        LocalStorage.clearTopicMessages(topic.id)
+        TopicManager.clearTopicMessages(topic.id)
       }),
       EventEmitter.on(EVENT_NAMES.NEW_CONTEXT, () => {
         const lastMessage = last(messages)
 
         if (lastMessage && lastMessage.type === 'clear') {
+          onDeleteMessage(lastMessage)
           return
         }
 
@@ -111,14 +126,43 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
           status: 'success',
           type: 'clear'
         } as Message)
+      }),
+      EventEmitter.on(EVENT_NAMES.NEW_BRANCH, async (index: number) => {
+        const newTopic = getDefaultTopic()
+        newTopic.name = topic.name
+        const branchMessages = take(messages, messages.length - index)
+
+        // 将分支的消息放入数据库
+        await db.topics.add({ id: newTopic.id, messages: branchMessages })
+        addTopic(newTopic)
+        setActiveTopic(newTopic)
+        autoRenameTopic()
+
+        // 由于复制了消息，消息中附带的文件的总数变了，需要更新
+        const filesArr = branchMessages.map((m) => m.files)
+        const files = flatten(filesArr).filter(Boolean)
+        files.map(async (f) => {
+          const file = await db.files.get({ id: f?.id })
+          file && db.files.update(file.id, { count: file.count + 1 })
+        })
       })
     ]
     return () => unsubscribes.forEach((unsub) => unsub())
-  }, [assistant, messages, provider, topic, autoRenameTopic, updateTopic, onSendMessage])
+  }, [
+    addTopic,
+    assistant,
+    autoRenameTopic,
+    messages,
+    onDeleteMessage,
+    onSendMessage,
+    setActiveTopic,
+    topic,
+    updateTopic
+  ])
 
   useEffect(() => {
     runAsyncFunction(async () => {
-      const messages = (await LocalStorage.getTopicMessages(topic.id)) || []
+      const messages = (await TopicManager.getTopicMessages(topic.id)) || []
       setMessages(messages)
     })
   }, [topic.id])
@@ -128,16 +172,18 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
   }, [messages])
 
   useEffect(() => {
-    EventEmitter.emit(EVENT_NAMES.ESTIMATED_TOKEN_COUNT, {
-      tokensCount: estimateHistoryTokenCount(assistant, messages),
-      contextCount: getContextCount(assistant, messages)
+    runAsyncFunction(async () => {
+      EventEmitter.emit(EVENT_NAMES.ESTIMATED_TOKEN_COUNT, {
+        tokensCount: await estimateHistoryTokens(assistant, messages),
+        contextCount: getContextCount(assistant, messages)
+      })
     })
   }, [assistant, messages])
 
   return (
     <Container id="messages" key={assistant.id} ref={containerRef}>
       <Suggestions assistant={assistant} messages={messages} lastMessage={lastMessage} />
-      {lastMessage && <MessageItem message={lastMessage} />}
+      {lastMessage && <MessageItem key={lastMessage.id} message={lastMessage} />}
       {reverse([...messages]).map((message, index) => (
         <MessageItem key={message.id} message={message} showMenu index={index} onDeleteMessage={onDeleteMessage} />
       ))}

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

@@ -8,6 +8,7 @@ import { useAppDispatch } from '@renderer/store'
 import {
   setFontSize,
   setMessageFont,
+  setPasteLongTextAsFile,
   setShowInputEstimatedTokens,
   setShowMessageDivider
 } from '@renderer/store/settings'
@@ -33,8 +34,14 @@ const SettingsTab: FC<Props> = (props) => {
 
   const dispatch = useAppDispatch()
 
-  const { showMessageDivider, messageFont, showInputEstimatedTokens, sendMessageShortcut, setSendMessageShortcut } =
-    useSettings()
+  const {
+    showMessageDivider,
+    messageFont,
+    showInputEstimatedTokens,
+    sendMessageShortcut,
+    setSendMessageShortcut,
+    pasteLongTextAsFile
+  } = useSettings()
 
   const onUpdateAssistantSettings = (settings: Partial<AssistantSettings>) => {
     updateAssistantSettings({
@@ -210,6 +217,15 @@ const SettingsTab: FC<Props> = (props) => {
         />
       </SettingRow>
       <SettingDivider />
+      <SettingRow>
+        <SettingRowTitleSmall>{t('settings.messages.input.paste_long_text_as_file')}</SettingRowTitleSmall>
+        <Switch
+          size="small"
+          checked={pasteLongTextAsFile}
+          onChange={(checked) => dispatch(setPasteLongTextAsFile(checked))}
+        />
+      </SettingRow>
+      <SettingDivider />
       <SettingRow>
         <SettingRowTitleSmall>{t('settings.messages.input.send_shortcuts')}</SettingRowTitleSmall>
       </SettingRow>

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

@@ -1,9 +1,9 @@
-import { CloseOutlined, DeleteOutlined, EditOutlined, OpenAIOutlined } from '@ant-design/icons'
+import { CloseOutlined, DeleteOutlined, EditOutlined, FolderOutlined } from '@ant-design/icons'
 import DragableList from '@renderer/components/DragableList'
 import PromptPopup from '@renderer/components/Popups/PromptPopup'
-import { useAssistant } from '@renderer/hooks/useAssistant'
+import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant'
+import { TopicManager } from '@renderer/hooks/useTopic'
 import { fetchMessagesSummary } from '@renderer/services/api'
-import LocalStorage from '@renderer/services/storage'
 import { useAppSelector } from '@renderer/store'
 import { Assistant, Topic } from '@renderer/types'
 import { Dropdown, MenuProps } from 'antd'
@@ -19,25 +19,43 @@ interface Props {
 }
 
 const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic }) => {
-  const { assistant, removeTopic, updateTopic, updateTopics } = useAssistant(_assistant.id)
+  const { assistants } = useAssistants()
+  const { assistant, removeTopic, moveTopic, updateTopic, updateTopics } = useAssistant(_assistant.id)
   const { t } = useTranslation()
   const generating = useAppSelector((state) => state.runtime.generating)
 
   const onDeleteTopic = useCallback(
     (topic: Topic) => {
+      if (generating) {
+        window.message.warning({ content: t('message.switch.disabled'), key: 'generating' })
+        return
+      }
       if (assistant.topics.length > 1) {
         const index = findIndex(assistant.topics, (t) => t.id === topic.id)
         setActiveTopic(assistant.topics[index + 1 === assistant.topics.length ? 0 : index + 1])
         removeTopic(topic)
       }
     },
-    [assistant.topics, removeTopic, setActiveTopic]
+    [assistant.topics, generating, removeTopic, setActiveTopic, t]
+  )
+
+  const onMoveTopic = useCallback(
+    (topic: Topic, toAssistant: Assistant) => {
+      if (generating) {
+        window.message.warning({ content: t('message.switch.disabled'), key: 'generating' })
+        return
+      }
+      const index = findIndex(assistant.topics, (t) => t.id === topic.id)
+      setActiveTopic(assistant.topics[index + 1 === assistant.topics.length ? 0 : index + 1])
+      moveTopic(topic, toAssistant)
+    },
+    [assistant.topics, generating, moveTopic, setActiveTopic, t]
   )
 
   const onSwitchTopic = useCallback(
     (topic: Topic) => {
       if (generating) {
-        window.message.warning({ content: t('message.switch.disabled'), key: 'switch-assistant' })
+        window.message.warning({ content: t('message.switch.disabled'), key: 'generating' })
         return
       }
       setActiveTopic(topic)
@@ -51,9 +69,9 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
         {
           label: t('chat.topics.auto_rename'),
           key: 'auto-rename',
-          icon: <OpenAIOutlined />,
+          icon: <i className="iconfont icon-business-smart-assistant" style={{ fontSize: '14px' }} />,
           async onClick() {
-            const messages = await LocalStorage.getTopicMessages(topic.id)
+            const messages = await TopicManager.getTopicMessages(topic.id)
             if (messages.length >= 2) {
               const summaryText = await fetchMessagesSummary({ messages, assistant })
               if (summaryText) {
@@ -79,6 +97,21 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
         }
       ]
 
+      if (assistants.length > 1 && assistant.topics.length > 1) {
+        menus.push({
+          label: t('chat.topics.move_to'),
+          key: 'move',
+          icon: <FolderOutlined />,
+          children: assistants
+            .filter((a) => a.id !== assistant.id)
+            .map((a) => ({
+              label: a.name,
+              key: a.id,
+              onClick: () => onMoveTopic(topic, a)
+            }))
+        })
+      }
+
       if (assistant.topics.length > 1) {
         menus.push({ type: 'divider' })
         menus.push({
@@ -92,7 +125,7 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
 
       return menus
     },
-    [assistant, onDeleteTopic, t, updateTopic]
+    [assistant, assistants, onDeleteTopic, onMoveTopic, t, updateTopic]
   )
 
   return (

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

@@ -1,5 +1,7 @@
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
+import VisionIcon from '@renderer/components/Icons/VisionIcon'
 import { isLocalAi } from '@renderer/config/env'
+import { isVisionModel } from '@renderer/config/models'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { Assistant } from '@renderer/types'
 import { Button } from 'antd'
@@ -27,6 +29,7 @@ const SelectModelButton: FC<Props> = ({ assistant }) => {
       <DropdownButton size="small" type="default">
         <ModelAvatar model={model} size={20} />
         <ModelName>{model ? upperFirst(model.name) : t('button.select_model')}</ModelName>
+        {isVisionModel(model) && <VisionIcon style={{ marginLeft: 0 }} />}
       </DropdownButton>
     </SelectModelDropdown>
   )

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

@@ -1,3 +1,5 @@
+import VisionIcon from '@renderer/components/Icons/VisionIcon'
+import { isVisionModel } from '@renderer/config/models'
 import { getModelLogo } from '@renderer/config/provider'
 import { useProviders } from '@renderer/hooks/useProvider'
 import { getModelUniqId } from '@renderer/services/model'
@@ -25,8 +27,11 @@ const SelectModelDropdown: FC<Props & PropsWithChildren> = ({ children, model, o
       type: 'group',
       children: reverse(sortBy(p.models, 'name')).map((m) => ({
         key: getModelUniqId(m),
-        label: upperFirst(m?.name),
-        defaultSelectedKeys: model ? [getModelUniqId(model)] : [],
+        label: (
+          <div>
+            {upperFirst(m?.name)} {isVisionModel(m) && <VisionIcon />}
+          </div>
+        ),
         icon: (
           <Avatar src={getModelLogo(m?.id || '')} size={24}>
             {first(m?.name)}

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

@@ -37,7 +37,7 @@ const Suggestions: FC<Props> = ({ assistant, messages, lastMessage }) => {
 
   useEffect(() => {
     const unsubscribes = [
-      EventEmitter.on(EVENT_NAMES.AI_CHAT_COMPLETION, async (msg: Message) => {
+      EventEmitter.on(EVENT_NAMES.RECEIVE_MESSAGE, async (msg: Message) => {
         setLoadingSuggestions(true)
         const _suggestions = await fetchSuggestions({ assistant, messages: [...messages, msg] })
         if (_suggestions.length) {

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

@@ -5,10 +5,11 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import i18n from '@renderer/i18n'
 import { backup, reset, restore } from '@renderer/services/backup'
 import { useAppDispatch } from '@renderer/store'
-import { setLanguage, setUserName, ThemeMode } from '@renderer/store/settings'
+import { setClickAssistantToShowTopic, setLanguage } from '@renderer/store/settings'
 import { setProxyUrl as _setProxyUrl } from '@renderer/store/settings'
+import { ThemeMode } from '@renderer/types'
 import { isValidProxyUrl } from '@renderer/utils'
-import { Button, Input, Select } from 'antd'
+import { Button, Input, Select, Switch } from 'antd'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -18,10 +19,10 @@ const GeneralSettings: FC = () => {
   const {
     language,
     proxyUrl: storeProxyUrl,
-    userName,
     theme,
     windowStyle,
     topicPosition,
+    clickAssistantToShowTopic,
     setTheme,
     setWindowStyle,
     setTopicPosition
@@ -76,20 +77,22 @@ const GeneralSettings: FC = () => {
           ]}
         />
       </SettingRow>
-      <SettingDivider />
       {isMac && (
-        <SettingRow>
-          <SettingRowTitle>{t('settings.theme.window.style.title')}</SettingRowTitle>
-          <Select
-            defaultValue={windowStyle || 'opaque'}
-            style={{ width: 180 }}
-            onChange={setWindowStyle}
-            options={[
-              { value: 'transparent', label: t('settings.theme.window.style.transparent') },
-              { value: 'opaque', label: t('settings.theme.window.style.opaque') }
-            ]}
-          />
-        </SettingRow>
+        <>
+          <SettingDivider />
+          <SettingRow>
+            <SettingRowTitle>{t('settings.theme.window.style.title')}</SettingRowTitle>
+            <Select
+              defaultValue={windowStyle || 'opaque'}
+              style={{ width: 180 }}
+              onChange={setWindowStyle}
+              options={[
+                { value: 'transparent', label: t('settings.theme.window.style.transparent') },
+                { value: 'opaque', label: t('settings.theme.window.style.opaque') }
+              ]}
+            />
+          </SettingRow>
+        </>
       )}
       <SettingDivider />
       <SettingRow>
@@ -105,17 +108,18 @@ const GeneralSettings: FC = () => {
         />
       </SettingRow>
       <SettingDivider />
-      <SettingRow>
-        <SettingRowTitle>{t('settings.general.user_name')}</SettingRowTitle>
-        <Input
-          placeholder={t('settings.general.user_name.placeholder')}
-          value={userName}
-          onChange={(e) => dispatch(setUserName(e.target.value))}
-          style={{ width: 180 }}
-          maxLength={30}
-        />
-      </SettingRow>
-      <SettingDivider />
+      {topicPosition === 'left' && (
+        <>
+          <SettingRow style={{ minHeight: 32 }}>
+            <SettingRowTitle>{t('settings.advanced.click_assistant_switch_to_topics')}</SettingRowTitle>
+            <Switch
+              checked={clickAssistantToShowTopic}
+              onChange={(checked) => dispatch(setClickAssistantToShowTopic(checked))}
+            />
+          </SettingRow>
+          <SettingDivider />
+        </>
+      )}
       <SettingRow>
         <SettingRowTitle>{t('settings.proxy.title')}</SettingRowTitle>
         <Input

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

@@ -1,5 +1,6 @@
 import { LoadingOutlined, MinusOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
-import { SYSTEM_MODELS } from '@renderer/config/models'
+import VisionIcon from '@renderer/components/Icons/VisionIcon'
+import { isVisionModel, SYSTEM_MODELS } from '@renderer/config/models'
 import { getModelLogo } from '@renderer/config/provider'
 import { useProvider } from '@renderer/hooks/useProvider'
 import { fetchModels } from '@renderer/services/api'
@@ -126,6 +127,7 @@ const PopupContainer: React.FC<Props> = ({ provider: _provider, resolve }) => {
                     </Avatar>
                     <ListItemName>
                       {model.name}
+                      {isVisionModel(model) && <VisionIcon />}
                       {isFreeModel(model) && (
                         <Tag style={{ marginLeft: 10 }} color="green">
                           Free

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

@@ -6,6 +6,8 @@ import {
   MinusCircleOutlined,
   PlusOutlined
 } from '@ant-design/icons'
+import VisionIcon from '@renderer/components/Icons/VisionIcon'
+import { isVisionModel } from '@renderer/config/models'
 import { getModelLogo } from '@renderer/config/provider'
 import { PROVIDER_CONFIG } from '@renderer/config/provider'
 import { useTheme } from '@renderer/context/ThemeProvider'
@@ -148,7 +150,7 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
                 <Avatar src={getModelLogo(model.id)} size={22} style={{ marginRight: '8px' }}>
                   {model.name[0].toUpperCase()}
                 </Avatar>
-                {model.name}
+                {model.name} {isVisionModel(model) && <VisionIcon />}
               </ModelListHeader>
               <RemoveIcon onClick={() => removeModel(model)} />
             </ModelListItem>

src/renderer/src/providers/AiProvider.ts

@@ -10,19 +10,15 @@ export default class AiProvider {
     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 completions({ messages, assistant, onChunk, onFilterMessages }: CompletionsParams): Promise<void> {
+    return this.sdk.completions({ messages, assistant, onChunk, onFilterMessages })
   }
 
   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> {
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string> {
     return this.sdk.summaries(messages, assistant)
   }
 
@@ -30,6 +26,10 @@ export default class AiProvider {
     return this.sdk.suggestions(messages, assistant)
   }
 
+  public async generateText({ prompt, content }: { prompt: string; content: string }): Promise<string> {
+    return this.sdk.generateText({ prompt, content })
+  }
+
   public async check(): Promise<{ valid: boolean; error: Error | null }> {
     return this.sdk.check()
   }

src/renderer/src/providers/AnthropicProvider.ts

@@ -4,8 +4,8 @@ import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
 import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
 import { EVENT_NAMES } from '@renderer/services/event'
 import { filterContextMessages, filterMessages } from '@renderer/services/messages'
-import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
-import { first, sum, takeRight } from 'lodash'
+import { Assistant, FileTypes, Message, Provider, Suggestion } from '@renderer/types'
+import { first, flatten, sum, takeRight } from 'lodash'
 import OpenAI from 'openai'
 
 import BaseProvider from './BaseProvider'
@@ -18,21 +18,51 @@ export default class AnthropicProvider extends BaseProvider {
     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
-  ) {
+  private async getMessageParam(message: Message): Promise<MessageParam> {
+    const parts: MessageParam['content'] = [{ type: 'text', text: message.content }]
+
+    for (const file of message.files || []) {
+      if (file.type === FileTypes.IMAGE) {
+        const base64Data = await window.api.file.base64Image(file.id + file.ext)
+        parts.push({
+          type: 'image',
+          source: {
+            data: base64Data.base64,
+            media_type: base64Data.mime.replace('jpg', 'jpeg') as any,
+            type: 'base64'
+          }
+        })
+      }
+      if (file.type === FileTypes.TEXT) {
+        const fileContent = await (await window.api.file.read(file.id + file.ext)).trim()
+        parts.push({
+          type: 'text',
+          text: file.origin_name + '\n' + fileContent
+        })
+      }
+    }
+
+    return {
+      role: message.role,
+      content: parts
+    }
+  }
+
+  public async completions({ messages, assistant, onChunk, onFilterMessages }: CompletionsParams) {
     const defaultModel = getDefaultModel()
     const model = assistant.model || defaultModel
     const { contextCount, maxTokens } = getAssistantSettings(assistant)
 
-    const userMessages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 2))).map((message) => {
-      return {
-        role: message.role,
-        content: message.content
-      }
-    })
+    const userMessagesParams: MessageParam[] = []
+    const _messages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 2)))
+
+    onFilterMessages(_messages)
+
+    for (const message of _messages) {
+      userMessagesParams.push(await this.getMessageParam(message))
+    }
+
+    const userMessages = flatten(userMessagesParams)
 
     if (first(userMessages)?.role === 'assistant') {
       userMessages.shift()
@@ -42,7 +72,7 @@ export default class AnthropicProvider extends BaseProvider {
       const stream = this.sdk.messages
         .stream({
           model: model.id,
-          messages: userMessages.filter(Boolean) as MessageParam[],
+          messages: userMessages,
           max_tokens: maxTokens || DEFAULT_MAX_TOKENS,
           temperature: assistant?.settings?.temperature,
           system: assistant.prompt,
@@ -90,7 +120,7 @@ export default class AnthropicProvider extends BaseProvider {
     return response.content[0].type === 'text' ? response.content[0].text : ''
   }
 
-  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string> {
     const model = getTopNamingModel() || assistant.model || getDefaultModel()
 
     const userMessages = takeRight(messages, 5).map((message) => ({
@@ -115,7 +145,26 @@ export default class AnthropicProvider extends BaseProvider {
       max_tokens: 4096
     })
 
-    return message.content[0].type === 'text' ? message.content[0].text : null
+    return message.content[0].type === 'text' ? message.content[0].text : ''
+  }
+
+  public async generateText({ prompt, content }: { prompt: string; content: string }): Promise<string> {
+    const model = getDefaultModel()
+
+    const message = await this.sdk.messages.create({
+      messages: [
+        {
+          role: 'user',
+          content
+        }
+      ],
+      model: model.id,
+      system: prompt,
+      stream: false,
+      max_tokens: 4096
+    })
+
+    return message.content[0].type === 'text' ? message.content[0].text : ''
   }
 
   public async suggestions(): Promise<Suggestion[]> {

src/renderer/src/providers/BaseProvider.ts

@@ -20,14 +20,11 @@ export default abstract class BaseProvider {
     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 completions({ messages, assistant, onChunk, onFilterMessages }: CompletionsParams): Promise<void>
   abstract translate(message: Message, assistant: Assistant): Promise<string>
-  abstract summaries(messages: Message[], assistant: Assistant): Promise<string | null>
+  abstract summaries(messages: Message[], assistant: Assistant): Promise<string>
   abstract suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]>
+  abstract generateText({ prompt, content }: { prompt: string; content: string }): Promise<string>
   abstract check(): Promise<{ valid: boolean; error: Error | null }>
   abstract models(): Promise<OpenAI.Models.Model[]>
 }

src/renderer/src/providers/GeminiProvider.ts

@@ -1,8 +1,8 @@
-import { GoogleGenerativeAI } from '@google/generative-ai'
+import { Content, GoogleGenerativeAI, InlineDataPart, Part, TextPart } from '@google/generative-ai'
 import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
 import { EVENT_NAMES } from '@renderer/services/event'
 import { filterContextMessages, filterMessages } from '@renderer/services/messages'
-import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
+import { Assistant, FileTypes, Message, Provider, Suggestion } from '@renderer/types'
 import axios from 'axios'
 import { isEmpty, takeRight } from 'lodash'
 import OpenAI from 'openai'
@@ -17,21 +17,50 @@ export default class GeminiProvider extends BaseProvider {
     this.sdk = new GoogleGenerativeAI(provider.apiKey)
   }
 
-  public async completions(
-    messages: Message[],
-    assistant: Assistant,
-    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
-  ) {
+  private async getMessageContents(message: Message): Promise<Content> {
+    const role = message.role === 'user' ? 'user' : 'model'
+
+    const parts: Part[] = [{ text: message.content }]
+
+    for (const file of message.files || []) {
+      if (file.type === FileTypes.IMAGE) {
+        const base64Data = await window.api.file.base64Image(file.id + file.ext)
+        parts.push({
+          inlineData: {
+            data: base64Data.base64,
+            mimeType: base64Data.mime
+          }
+        } as InlineDataPart)
+      }
+      if (file.type === FileTypes.TEXT) {
+        const fileContent = await (await window.api.file.read(file.id + file.ext)).trim()
+        parts.push({
+          text: file.origin_name + '\n' + fileContent
+        } as TextPart)
+      }
+    }
+
+    return {
+      role,
+      parts
+    }
+  }
+
+  public async completions({ messages, assistant, onChunk, onFilterMessages }: CompletionsParams) {
     const defaultModel = getDefaultModel()
     const model = assistant.model || defaultModel
     const { contextCount, maxTokens } = getAssistantSettings(assistant)
 
-    const userMessages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 1))).map((message) => {
-      return {
-        role: message.role,
-        content: message.content
-      }
-    })
+    const userMessages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 1)))
+    onFilterMessages(userMessages)
+
+    const userLastMessage = userMessages.pop()
+
+    const history: Content[] = []
+
+    for (const message of userMessages) {
+      history.push(await this.getMessageContents(message))
+    }
 
     const geminiModel = this.sdk.getGenerativeModel({
       model: model.id,
@@ -42,16 +71,9 @@ export default class GeminiProvider extends BaseProvider {
       }
     })
 
-    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!)
+    const chat = geminiModel.startChat({ history })
+    const messageContents = await this.getMessageContents(userLastMessage!)
+    const userMessagesStream = await chat.sendMessageStream(messageContents.parts)
 
     for await (const chunk of userMessagesStream.stream) {
       if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) break
@@ -85,7 +107,7 @@ export default class GeminiProvider extends BaseProvider {
     return response.text()
   }
 
-  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string> {
     const model = getTopNamingModel() || assistant.model || getDefaultModel()
 
     const userMessages = takeRight(messages, 5).map((message) => ({
@@ -120,6 +142,18 @@ export default class GeminiProvider extends BaseProvider {
     return response.text()
   }
 
+  public async generateText({ prompt, content }: { prompt: string; content: string }): Promise<string> {
+    const model = getDefaultModel()
+    const systemMessage = { role: 'system', content: prompt }
+
+    const geminiModel = this.sdk.getGenerativeModel({ model: model.id })
+
+    const chat = await geminiModel.startChat({ systemInstruction: systemMessage.content })
+    const { response } = await chat.sendMessage(content)
+
+    return response.text()
+  }
+
   public async suggestions(): Promise<Suggestion[]> {
     return []
   }

src/renderer/src/providers/OpenAIProvider.ts

@@ -1,9 +1,10 @@
 import { isLocalAi } from '@renderer/config/env'
+import { isVisionModel } from '@renderer/config/models'
 import { getAssistantSettings, getDefaultModel, getTopNamingModel } from '@renderer/services/assistant'
 import { EVENT_NAMES } from '@renderer/services/event'
 import { filterContextMessages, filterMessages } from '@renderer/services/messages'
-import { Assistant, Message, Provider, Suggestion } from '@renderer/types'
-import { fileToBase64, removeQuotes } from '@renderer/utils'
+import { Assistant, FileTypes, Message, Model, Provider, Suggestion } from '@renderer/types'
+import { removeQuotes } from '@renderer/utils'
 import { first, takeRight } from 'lodash'
 import OpenAI from 'openai'
 import {
@@ -26,61 +27,122 @@ export default class OpenAIProvider extends BaseProvider {
     })
   }
 
-  private async getMessageContent(message: Message): Promise<string | ChatCompletionContentPart[]> {
-    const file = first(message.files)
-
-    if (!file) {
-      return message.content
+  private isSupportStreamOutput(modelId: string): boolean {
+    if (this.provider.id === 'openai' && modelId.includes('o1-')) {
+      return false
     }
-
-    if (file.type.includes('image')) {
-      return [
-        { type: 'text', text: message.content },
-        {
-          type: 'image_url',
-          image_url: {
-            url: await fileToBase64(file)
-          }
-        }
-      ]
-    }
-
-    return message.content
+    return true
   }
 
-  async completions(
-    messages: Message[],
-    assistant: Assistant,
-    onChunk: ({ text, usage }: { text?: string; usage?: OpenAI.Completions.CompletionUsage }) => void
-  ): Promise<void> {
+  private get isNotSupportFiles() {
+    const providers = ['deepseek', 'baichuan', 'minimax', 'yi', 'doubao']
+    return providers.includes(this.provider.id)
+  }
+
+  private async getMessageParam(
+    message: Message,
+    model: Model
+  ): Promise<OpenAI.Chat.Completions.ChatCompletionMessageParam> {
+    const isVision = isVisionModel(model)
+
+    if (!message.files) {
+      return {
+        role: message.role,
+        content: message.content
+      }
+    }
+
+    if (this.isNotSupportFiles) {
+      if (message.files) {
+        const textFiles = message.files.filter((file) => file.type === FileTypes.TEXT)
+
+        if (textFiles.length > 0) {
+          let text = ''
+          const divider = '\n\n---\n\n'
+
+          for (const file of textFiles) {
+            const fileContent = (await window.api.file.read(file.id + file.ext)).trim()
+            const fileNameRow = 'file: ' + file.origin_name + '\n\n'
+            text = text + fileNameRow + fileContent + divider
+          }
+
+          return {
+            role: message.role,
+            content: message.content + divider + text
+          }
+        }
+      }
+
+      return {
+        role: message.role,
+        content: message.content
+      }
+    }
+
+    const parts: ChatCompletionContentPart[] = [
+      {
+        type: 'text',
+        text: message.content
+      }
+    ]
+
+    for (const file of message.files || []) {
+      if (file.type === FileTypes.IMAGE && isVision) {
+        const image = await window.api.file.base64Image(file.id + file.ext)
+        parts.push({
+          type: 'image_url',
+          image_url: { url: image.data }
+        })
+      }
+      if (file.type === FileTypes.TEXT) {
+        const fileContent = await (await window.api.file.read(file.id + file.ext)).trim()
+        parts.push({
+          type: 'text',
+          text: file.origin_name + '\n' + fileContent
+        })
+      }
+    }
+
+    return {
+      role: message.role,
+      content: parts
+    } as ChatCompletionMessageParam
+  }
+
+  async completions({ messages, assistant, onChunk, onFilterMessages }: CompletionsParams): 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 filterMessages(filterContextMessages(takeRight(messages, contextCount + 1)))) {
-      userMessages.push({
-        role: message.role,
-        content: await this.getMessageContent(message)
-      } as ChatCompletionMessageParam)
+    const _messages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 1)))
+    onFilterMessages(_messages)
+
+    for (const message of _messages) {
+      userMessages.push(await this.getMessageParam(message, model))
     }
 
     // @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,
+      stream: this.isSupportStreamOutput(model.id),
       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 })
+      if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) {
+        break
+      }
+
+      onChunk({
+        text: chunk.choices[0]?.delta?.content || '',
+        usage: chunk.usage
+      })
     }
   }
 
@@ -103,7 +165,7 @@ export default class OpenAIProvider extends BaseProvider {
     return response.choices[0].message?.content || ''
   }
 
-  public async summaries(messages: Message[], assistant: Assistant): Promise<string | null> {
+  public async summaries(messages: Message[], assistant: Assistant): Promise<string> {
     const model = getTopNamingModel() || assistant.model || getDefaultModel()
 
     const userMessages = takeRight(messages, 5).map((message) => ({
@@ -128,6 +190,21 @@ export default class OpenAIProvider extends BaseProvider {
     return removeQuotes(response.choices[0].message?.content?.substring(0, 50) || '')
   }
 
+  public async generateText({ prompt, content }: { prompt: string; content: string }): Promise<string> {
+    const model = getDefaultModel()
+
+    const response = await this.sdk.chat.completions.create({
+      model: model.id,
+      stream: false,
+      messages: [
+        { role: 'user', content },
+        { role: 'system', content: prompt }
+      ]
+    })
+
+    return response.choices[0].message?.content || ''
+  }
+
   async suggestions(messages: Message[], assistant: Assistant): Promise<Suggestion[]> {
     const model = assistant.model
 

src/renderer/src/providers/index.d.ts

@@ -0,0 +1,11 @@
+interface ChunkCallbackData {
+  text?: string
+  usage?: OpenAI.Completions.CompletionUsage
+}
+
+interface CompletionsParams {
+  messages: Message[]
+  assistant: Assistant
+  onChunk: ({ text, usage }: ChunkCallbackData) => void
+  onFilterMessages: (messages: Message[]) => void
+}

src/renderer/src/services/api.ts

@@ -16,6 +16,7 @@ import {
 } from './assistant'
 import { EVENT_NAMES, EventEmitter } from './event'
 import { filterMessages } from './messages'
+import { estimateMessagesUsage } from './tokens'
 
 export async function fetchChatCompletion({
   messages,
@@ -61,12 +62,27 @@ export async function fetchChatCompletion({
   }, 1000)
 
   try {
-    await AI.completions(messages, assistant, ({ text, usage }) => {
-      message.content = message.content + text || ''
-      message.usage = usage
-      onResponse({ ...message, status: 'pending' })
+    let _messages: Message[] = []
+
+    await AI.completions({
+      messages,
+      assistant,
+      onFilterMessages: (messages) => (_messages = messages),
+      onChunk: ({ text, usage }) => {
+        message.content = message.content + text || ''
+        message.usage = usage
+        onResponse({ ...message, status: 'pending' })
+      }
     })
+
     message.status = 'success'
+
+    if (!message.usage) {
+      message.usage = await estimateMessagesUsage({
+        assistant,
+        messages: [..._messages, message]
+      })
+    }
   } catch (error: any) {
     message.content = `Error: ${error.message}`
     message.status = 'error'
@@ -82,7 +98,7 @@ export async function fetchChatCompletion({
   message.status = window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED) ? 'paused' : message.status
 
   // Emit chat completion event
-  EventEmitter.emit(EVENT_NAMES.AI_CHAT_COMPLETION, message)
+  EventEmitter.emit(EVENT_NAMES.RECEIVE_MESSAGE, message)
 
   // Reset generating state
   store.dispatch(setGenerating(false))
@@ -129,6 +145,23 @@ export async function fetchMessagesSummary({ messages, assistant }: { messages:
   }
 }
 
+export async function fetchGenerate({ prompt, content }: { prompt: string; content: string }): Promise<string> {
+  const model = getDefaultModel()
+  const provider = getProviderByModel(model)
+
+  if (!hasApiKey(provider)) {
+    return ''
+  }
+
+  const AI = new AiProvider(provider)
+
+  try {
+    return await AI.generateText({ prompt, content })
+  } catch (error: any) {
+    return ''
+  }
+}
+
 export async function fetchSuggestions({
   messages,
   assistant

src/renderer/src/services/backup.ts

@@ -1,31 +1,26 @@
+import db from '@renderer/databases'
 import i18n from '@renderer/i18n'
 import dayjs from 'dayjs'
 import localforage from 'localforage'
 
 export async function backup() {
-  const indexedKeys = await localforage.keys()
-  const version = 1
+  const version = 2
   const time = new Date().getTime()
 
   const data = {
     time,
     version,
     localStorage,
-    indexedDB: [] as { key: string; value: any }[]
-  }
-
-  for (const key of indexedKeys) {
-    data.indexedDB.push({
-      key,
-      value: await localforage.getItem(key)
-    })
+    indexedDB: await backupDatabase()
   }
 
   const filename = `cherry-studio.${dayjs().format('YYYYMMDD')}.bak`
   const fileContnet = JSON.stringify(data)
   const file = await window.api.compress(fileContnet)
 
-  window.api.saveFile(filename, file)
+  await window.api.saveFile(filename, file)
+
+  window.message.success({ content: i18n.t('message.backup.success'), key: 'backup' })
 }
 
 export async function restore() {
@@ -37,17 +32,32 @@ export async function restore() {
       const data = JSON.parse(content)
 
       if (data.version === 1) {
-        localStorage.setItem('persist:cherry-studio', data.localStorage['persist:cherry-studio'])
+        await clearDatabase()
 
         for (const { key, value } of data.indexedDB) {
-          await localforage.setItem(key, value)
+          if (key.startsWith('topic:')) {
+            await db.table('topics').add({ id: value.id, messages: value.messages })
+          }
+          if (key === 'image://avatar') {
+            await db.table('settings').add({ id: key, value })
+          }
         }
 
+        await localStorage.setItem('persist:cherry-studio', data.localStorage['persist:cherry-studio'])
         window.message.success({ content: i18n.t('message.restore.success'), key: 'restore' })
-        setTimeout(() => window.api.reload(), 1500)
-      } else {
-        window.message.error({ content: i18n.t('error.backup.file_format'), key: 'restore' })
+        setTimeout(() => window.api.reload(), 1000)
+        return
       }
+
+      if (data.version === 2) {
+        localStorage.setItem('persist:cherry-studio', data.localStorage['persist:cherry-studio'])
+        await restoreDatabase(data.indexedDB)
+        window.message.success({ content: i18n.t('message.restore.success'), key: 'restore' })
+        setTimeout(() => window.api.reload(), 1000)
+        return
+      }
+
+      window.message.error({ content: i18n.t('error.backup.file_format'), key: 'restore' })
     } catch (error) {
       console.error(error)
       window.message.error({ content: i18n.t('error.backup.file_format'), key: 'restore' })
@@ -59,6 +69,7 @@ export async function reset() {
   window.modal.confirm({
     title: i18n.t('common.warning'),
     content: i18n.t('message.reset.confirm.content'),
+    centered: true,
     onOk: async () => {
       window.modal.confirm({
         title: i18n.t('message.reset.double.confirm.title'),
@@ -67,9 +78,43 @@ export async function reset() {
         onOk: async () => {
           await localStorage.clear()
           await localforage.clear()
+          await clearDatabase()
+          await window.api.file.clear()
           window.api.reload()
         }
       })
     }
   })
 }
+
+/************************************* Backup Utils ************************************** */
+
+async function backupDatabase() {
+  const tables = db.tables
+  const backup = {}
+
+  for (const table of tables) {
+    backup[table.name] = await table.toArray()
+  }
+
+  return backup
+}
+
+async function restoreDatabase(backup: Record<string, any>) {
+  await db.transaction('rw', db.tables, async () => {
+    for (const tableName in backup) {
+      await db.table(tableName).clear()
+      await db.table(tableName).bulkAdd(backup[tableName])
+    }
+  })
+}
+
+async function clearDatabase() {
+  const storeNames = await db.tables.map((table) => table.name)
+
+  await db.transaction('rw', db.tables, async () => {
+    for (const storeName of storeNames) {
+      await db[storeName].clear()
+    }
+  })
+}

src/renderer/src/services/event.ts

@@ -4,7 +4,7 @@ export const EventEmitter = new Emittery()
 
 export const EVENT_NAMES = {
   SEND_MESSAGE: 'SEND_MESSAGE',
-  AI_CHAT_COMPLETION: 'AI_CHAT_COMPLETION',
+  RECEIVE_MESSAGE: 'RECEIVE_MESSAGE',
   AI_AUTO_RENAME: 'AI_AUTO_RENAME',
   CLEAR_MESSAGES: 'CLEAR_MESSAGES',
   ADD_ASSISTANT: 'ADD_ASSISTANT',
@@ -16,5 +16,6 @@ export const EVENT_NAMES = {
   SHOW_CHAT_SETTINGS: 'SHOW_CHAT_SETTINGS',
   SHOW_TOPIC_SIDEBAR: 'SHOW_TOPIC_SIDEBAR',
   SWITCH_TOPIC_SIDEBAR: 'SWITCH_TOPIC_SIDEBAR',
-  NEW_CONTEXT: 'NEW_CONTEXT'
+  NEW_CONTEXT: 'NEW_CONTEXT',
+  NEW_BRANCH: 'NEW_BRANCH'
 }

src/renderer/src/services/file.ts

@@ -0,0 +1,66 @@
+import db from '@renderer/databases'
+import { FileType } from '@renderer/types'
+import { getFileDirectory } from '@renderer/utils'
+
+class FileManager {
+  static async selectFiles(options?: Electron.OpenDialogOptions): Promise<FileType[] | null> {
+    const files = await window.api.file.select(options)
+    return files
+  }
+
+  static async uploadFile(file: FileType): Promise<FileType> {
+    const uploadFile = await window.api.file.upload(file)
+    const fileRecord = await db.files.get(uploadFile.id)
+
+    if (fileRecord) {
+      await db.files.update(fileRecord.id, { ...fileRecord, count: fileRecord.count + 1 })
+      return fileRecord
+    }
+
+    await db.files.add(uploadFile)
+
+    return uploadFile
+  }
+
+  static async uploadFiles(files: FileType[]): Promise<FileType[]> {
+    return Promise.all(files.map((file) => this.uploadFile(file)))
+  }
+
+  static async getFile(id: string): Promise<FileType | undefined> {
+    return db.files.get(id)
+  }
+
+  static async deleteFile(id: string): Promise<void> {
+    const file = await this.getFile(id)
+
+    if (!file) {
+      return
+    }
+
+    if (file.count > 1) {
+      await db.files.update(id, { ...file, count: file.count - 1 })
+      return
+    }
+
+    db.files.delete(id)
+    await window.api.file.delete(id + file.ext)
+  }
+
+  static async deleteFiles(ids: string[]): Promise<void> {
+    await Promise.all(ids.map((id) => this.deleteFile(id)))
+  }
+
+  static async allFiles(): Promise<FileType[]> {
+    return db.files.toArray()
+  }
+
+  static isDangerFile(file: FileType) {
+    return ['.sh', '.bat', '.cmd', '.ps1'].includes(file.ext)
+  }
+
+  static getSafePath(file: FileType) {
+    return this.isDangerFile(file) ? getFileDirectory(file.path) : file.path
+  }
+}
+
+export default FileManager

src/renderer/src/services/messages.ts

@@ -1,9 +1,8 @@
 import { DEFAULT_CONEXTCOUNT } from '@renderer/config/constant'
 import { Assistant, Message } from '@renderer/types'
-import { GPTTokens } from 'gpt-tokens'
 import { isEmpty, takeRight } from 'lodash'
 
-import { getAssistantSettings } from './assistant'
+import FileManager from './file'
 
 export const filterMessages = (messages: Message[]) => {
   return messages
@@ -34,28 +33,6 @@ export function getContextCount(assistant: Assistant, messages: Message[]) {
   return messagesCount - (clearIndex + 1)
 }
 
-export function estimateInputTokenCount(text: string) {
-  const input = new GPTTokens({
-    model: 'gpt-4o',
-    messages: [{ role: 'user', content: text }]
-  })
-
-  return input.usedTokens - 7
-}
-
-export function estimateHistoryTokenCount(assistant: Assistant, msgs: Message[]) {
-  const { contextCount } = getAssistantSettings(assistant)
-
-  const all = new GPTTokens({
-    model: 'gpt-4o',
-    messages: [
-      { role: 'system', content: assistant.prompt },
-      ...filterMessages(filterContextMessages(takeRight(msgs, contextCount))).map((message) => ({
-        role: message.role,
-        content: message.content
-      }))
-    ]
-  })
-
-  return all.usedTokens - 7
+export function deleteMessageFiles(message: Message) {
+  message.files && FileManager.deleteFiles(message.files.map((f) => f.id))
 }

src/renderer/src/services/storage.ts

@@ -1,47 +1,27 @@
-import { Topic } from '@renderer/types'
+import db from '@renderer/databases'
 import { convertToBase64 } from '@renderer/utils'
-import localforage from 'localforage'
 
 const IMAGE_PREFIX = 'image://'
 
-export default class LocalStorage {
-  static async getTopic(id: string) {
-    return localforage.getItem<Topic>(`topic:${id}`)
-  }
-
-  static async getTopicMessages(id: string) {
-    const topic = await this.getTopic(id)
-    return topic ? topic.messages : []
-  }
-
-  static async removeTopic(id: string) {
-    localforage.removeItem(`topic:${id}`)
-  }
-
-  static async clearTopicMessages(id: string) {
-    const topic = await this.getTopic(id)
-    if (topic) {
-      topic.messages = []
-      await localforage.setItem(`topic:${id}`, topic)
-    }
-  }
-
-  static async storeImage(name: string, file: File) {
+export default class ImageStorage {
+  static async set(key: string, file: File) {
+    const id = IMAGE_PREFIX + key
     try {
       const base64Image = await convertToBase64(file)
       if (typeof base64Image === 'string') {
-        await localforage.setItem(IMAGE_PREFIX + name, base64Image)
+        if (await db.settings.get(id)) {
+          db.settings.update(id, { value: base64Image })
+          return
+        }
+        await db.settings.add({ id, value: base64Image })
       }
     } catch (error) {
       console.error('Error storing the image', error)
     }
   }
 
-  static async getImage(name: string) {
-    return localforage.getItem<string>(IMAGE_PREFIX + name)
-  }
-
-  static async removeImage(name: string) {
-    await localforage.removeItem(IMAGE_PREFIX + name)
+  static async get(key: string): Promise<string> {
+    const id = IMAGE_PREFIX + key
+    return (await db.settings.get(id))?.value
   }
 }

src/renderer/src/services/tokens.ts

@@ -0,0 +1,130 @@
+import { Assistant, FileType, FileTypes, Message } from '@renderer/types'
+import { GPTTokens } from 'gpt-tokens'
+import { flatten, takeRight } from 'lodash'
+import { CompletionUsage } from 'openai/resources'
+
+import { getAssistantSettings } from './assistant'
+import { filterContextMessages, filterMessages } from './messages'
+
+interface MessageItem {
+  name?: string
+  role: 'system' | 'user' | 'assistant'
+  content: string
+}
+
+async function getFileContent(file: FileType) {
+  if (!file) {
+    return ''
+  }
+
+  const fileId = file.id + file.ext
+
+  if (file.type === FileTypes.IMAGE) {
+    const data = await window.api.file.base64Image(fileId)
+    return data.data
+  }
+
+  if (file.type === FileTypes.TEXT) {
+    return await window.api.file.read(fileId)
+  }
+
+  return ''
+}
+
+async function getMessageParam(message: Message): Promise<MessageItem[]> {
+  const param: MessageItem[] = []
+
+  param.push({
+    role: message.role,
+    content: message.content
+  })
+
+  if (message.files) {
+    for (const file of message.files) {
+      param.push({
+        role: 'assistant',
+        content: await getFileContent(file)
+      })
+    }
+  }
+
+  return param
+}
+
+export function estimateTextTokens(text: string) {
+  const { usedTokens } = new GPTTokens({
+    model: 'gpt-4o',
+    messages: [{ role: 'user', content: text }]
+  })
+
+  return usedTokens - 7
+}
+
+export async function estimateMessageUsage(message: Message): Promise<CompletionUsage> {
+  const { usedTokens, promptUsedTokens, completionUsedTokens } = new GPTTokens({
+    model: 'gpt-4o',
+    messages: await getMessageParam(message)
+  })
+
+  const hasImage = message.files?.some((f) => f.type === FileTypes.IMAGE)
+
+  return {
+    prompt_tokens: promptUsedTokens,
+    completion_tokens: completionUsedTokens,
+    total_tokens: hasImage ? Math.floor(usedTokens / 80) : usedTokens - 7
+  }
+}
+
+export async function estimateMessagesUsage({
+  assistant,
+  messages
+}: {
+  assistant: Assistant
+  messages: Message[]
+}): Promise<CompletionUsage> {
+  const outputMessage = messages.pop()!
+
+  const prompt_tokens = await estimateHistoryTokens(assistant, messages)
+  const { completion_tokens } = await estimateMessageUsage(outputMessage)
+
+  return {
+    prompt_tokens: await estimateHistoryTokens(assistant, messages),
+    completion_tokens,
+    total_tokens: prompt_tokens + completion_tokens
+  } as CompletionUsage
+}
+
+export async function estimateHistoryTokens(assistant: Assistant, msgs: Message[]) {
+  const { contextCount } = getAssistantSettings(assistant)
+  const messages = filterMessages(filterContextMessages(takeRight(msgs, contextCount)))
+
+  // 有 usage 数据的消息，快速计算总数
+  const uasageTokens = messages
+    .filter((m) => m.usage)
+    .reduce((acc, message) => {
+      const inputTokens = message.usage?.total_tokens ?? 0
+      const outputTokens = message.usage!.completion_tokens ?? 0
+      return acc + (message.role === 'user' ? inputTokens : outputTokens)
+    }, 0)
+
+  // 没有 usage 数据的消息，需要计算每条消息的 token
+  let allMessages: MessageItem[][] = []
+
+  for (const message of messages.filter((m) => !m.usage)) {
+    const items = await getMessageParam(message)
+    allMessages = allMessages.concat(items)
+  }
+
+  const { usedTokens } = new GPTTokens({
+    model: 'gpt-4o',
+    messages: [
+      {
+        role: 'system',
+        content: assistant.prompt
+      },
+      ...flatten(allMessages)
+    ]
+  })
+
+  return usedTokens - 7 + uasageTokens
+}

src/renderer/src/store/assistants.ts

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { TopicManager } from '@renderer/hooks/useTopic'
 import { getDefaultAssistant, getDefaultTopic } from '@renderer/services/assistant'
-import LocalStorage from '@renderer/services/storage'
 import { Assistant, AssistantSettings, Model, Topic } from '@renderer/types'
 import { uniqBy } from 'lodash'
 
@@ -91,7 +91,7 @@ const assistantsSlice = createSlice({
     removeAllTopics: (state, action: PayloadAction<{ assistantId: string }>) => {
       state.assistants = state.assistants.map((assistant) => {
         if (assistant.id === action.payload.assistantId) {
-          assistant.topics.forEach((topic) => LocalStorage.removeTopic(topic.id))
+          assistant.topics.forEach((topic) => TopicManager.removeTopic(topic.id))
           return {
             ...assistant,
             topics: [getDefaultTopic()]

src/renderer/src/store/migrate.ts

@@ -1,8 +1,7 @@
 import { SYSTEM_MODELS } from '@renderer/config/models'
 import i18n from '@renderer/i18n'
 import { Assistant } from '@renderer/types'
-import localforage from 'localforage'
-import { isEmpty, pick } from 'lodash'
+import { isEmpty } from 'lodash'
 import { createMigrate } from 'redux-persist'
 
 import { RootState } from '.'
@@ -375,12 +374,7 @@ const migrateConfig = {
       }
     }
   },
-  '24': async (state: RootState) => {
-    for (const key of await localforage.keys()) {
-      if (key.startsWith('topic:')) {
-        localforage.getItem(key).then((topic) => localforage.setItem(key, pick(topic, ['id', 'messages'])))
-      }
-    }
+  '24': (state: RootState) => {
     return {
       ...state,
       assistants: {

src/renderer/src/store/settings.ts

@@ -1,13 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { ThemeMode } from '@renderer/types'
 
 export type SendMessageShortcut = 'Enter' | 'Shift+Enter'
 
-export enum ThemeMode {
-  light = 'light',
-  dark = 'dark',
-  auto = 'auto'
-}
-
 export interface SettingsState {
   showAssistants: boolean
   showTopics: boolean
@@ -22,6 +17,8 @@ export interface SettingsState {
   windowStyle: 'transparent' | 'opaque'
   fontSize: number
   topicPosition: 'left' | 'right'
+  pasteLongTextAsFile: boolean
+  clickAssistantToShowTopic: boolean
 }
 
 const initialState: SettingsState = {
@@ -37,7 +34,9 @@ const initialState: SettingsState = {
   theme: ThemeMode.light,
   windowStyle: 'opaque',
   fontSize: 14,
-  topicPosition: 'right'
+  topicPosition: 'right',
+  pasteLongTextAsFile: true,
+  clickAssistantToShowTopic: false
 }
 
 const settingsSlice = createSlice({
@@ -89,6 +88,12 @@ const settingsSlice = createSlice({
     },
     setTopicPosition: (state, action: PayloadAction<'left' | 'right'>) => {
       state.topicPosition = action.payload
+    },
+    setPasteLongTextAsFile: (state, action: PayloadAction<boolean>) => {
+      state.pasteLongTextAsFile = action.payload
+    },
+    setClickAssistantToShowTopic: (state, action: PayloadAction<boolean>) => {
+      state.clickAssistantToShowTopic = action.payload
     }
   }
 })
@@ -108,7 +113,9 @@ export const {
   setTheme,
   setFontSize,
   setWindowStyle,
-  setTopicPosition
+  setTopicPosition,
+  setPasteLongTextAsFile,
+  setClickAssistantToShowTopic
 } = settingsSlice.actions
 
 export default settingsSlice.reducer

src/renderer/src/types/index.ts

@@ -27,7 +27,7 @@ export type Message = {
   createdAt: string
   status: 'sending' | 'pending' | 'success' | 'paused' | 'error'
   modelId?: string
-  files?: File[]
+  files?: FileType[]
   images?: string[]
   usage?: OpenAI.Completions.CompletionUsage
   type?: 'text' | '@' | 'clear'
@@ -86,3 +86,31 @@ export type MinAppType = {
   logo: string
   url: string
 }
+
+export interface FileType {
+  id: string
+  name: string
+  origin_name: string
+  path: string
+  size: number
+  ext: string
+  type: FileTypes
+  created_at: Date
+  count: number
+  tokens?: number
+}
+
+export enum FileTypes {
+  IMAGE = 'image',
+  VIDEO = 'video',
+  AUDIO = 'audio',
+  TEXT = 'text',
+  DOCUMENT = 'document',
+  OTHER = 'other'
+}
+
+export enum ThemeMode {
+  light = 'light',
+  dark = 'dark',
+  auto = 'auto'
+}

src/renderer/src/utils/index.ts

@@ -1,5 +1,6 @@
 import { Model } from '@renderer/types'
 import imageCompression from 'browser-image-compression'
+// @ts-ignore next-line`
 import { v4 as uuidv4 } from 'uuid'
 
 export const runAsyncFunction = async (fn: () => void) => {
@@ -224,17 +225,19 @@ 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)
-    }
-  })
+export function removeTrailingDoubleSpaces(markdown: string): string {
+  // 使用正则表达式匹配末尾的两个空格，并替换为空字符串
+  return markdown.replace(/ {2}$/gm, '')
+}
+
+export function getFileDirectory(filePath: string) {
+  const parts = filePath.split('/')
+  const directory = parts.slice(0, -1).join('/')
+  return directory
+}
+
+export function getFileExtension(filePath: string) {
+  const parts = filePath.split('.')
+  const extension = parts.slice(-1)[0]
+  return '.' + extension
 }

tsconfig.node.json

@@ -5,11 +5,20 @@
     "src/main/**/*",
     "src/preload/**/*",
     "src/main/env.d.ts",
+    "src/renderer/src/types/index.ts"
   ],
   "compilerOptions": {
     "composite": true,
     "types": [
       "electron-vite/node"
-    ]
+    ],
+    "paths": {
+      "@types": [
+        "./src/renderer/src/types/index.ts"
+      ],
+      "@main/*": [
+        "./src/main/*"
+      ]
+    }
   }
 }