diff --git a/electron-builder.yml b/electron-builder.yml index 0da2d7f5fe..d1a70bf896 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -107,9 +107,10 @@ afterSign: scripts/notarize.js artifactBuildCompleted: scripts/artifact-build-completed.js releaseInfo: releaseNotes: | - - 新功能：可选数据保存目录 - - 快捷助手：支持单独选择助手，支持暂停、上下文、思考过程、流式 - - 划词助手：系统托盘菜单开关 - - 翻译：新增 Markdown 预览选项 - - 新供应商：新增 Vertex AI 服务商 - - 错误修复和界面优化 + 界面优化：优化多处界面样式，气泡样式改版，自动调整代码预览边栏宽度 + 知识库：修复知识库引用不显示问题，修复部分嵌入模型适配问题 + 备份与恢复：修复超过 2GB 大文件无法恢复问题 + 文件处理：添加 .doc 文件支持 + 划词助手：支持自定义 CSS 样式 + MCP：基于 Pyodide 实现 Python MCP 服务 + 其他错误修复和优化 diff --git a/package.json b/package.json index 329a527914..664de705ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CherryStudio", - "version": "1.4.4", + "version": "1.4.7", "private": true, "description": "A powerful AI assistant for producer.", "main": "./out/main/index.js", @@ -62,6 +62,7 @@ "@libsql/win32-x64-msvc": "^0.4.7", "@strongtz/win32-arm64-msvc": "^0.4.7", "jsdom": "26.1.0", + "node-stream-zip": "^1.15.0", "notion-helper": "^1.3.22", "os-proxy-config": "^1.1.2", "selection-hook": "^0.9.23", @@ -124,6 +125,7 @@ "@types/react-infinite-scroll-component": "^5.0.0", "@types/react-window": "^1", "@types/tinycolor2": "^1", + "@types/word-extractor": "^1", "@uiw/codemirror-extensions-langs": "^4.23.12", "@uiw/codemirror-themes-all": "^4.23.12", "@uiw/react-codemirror": "^4.23.12", @@ -177,10 +179,10 @@ "mermaid": "^11.6.0", "mime": "^4.0.4", "motion": "^12.10.5", - "node-stream-zip": "^1.15.0", "npx-scope-finder": "^1.2.0", "officeparser": "^4.1.1", "openai": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch", + "opendal": "0.47.11", "p-queue": "^8.1.0", "playwright": "^1.52.0", "prettier": "^3.5.3", @@ -213,12 +215,13 @@ "styled-components": "^6.1.11", "tar": "^7.4.3", "tiny-pinyin": "^1.3.2", - "tokenx": "^0.4.1", + "tokenx": "^1.1.0", "typescript": "^5.6.2", "uuid": "^10.0.0", "vite": "6.2.6", "vitest": "^3.1.4", "webdav": "^5.8.0", + "word-extractor": "^1.0.4", "zipread": "^1.3.3" }, "resolutions": { diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts index d02cd15be8..ca49bd40c5 100644 --- a/packages/shared/IpcChannel.ts +++ b/packages/shared/IpcChannel.ts @@ -3,6 +3,8 @@ export enum IpcChannel { App_ClearCache = 'app:clear-cache', App_SetLaunchOnBoot = 'app:set-launch-on-boot', App_SetLanguage = 'app:set-language', + App_SetEnableSpellCheck = 'app:set-enable-spell-check', + App_SetSpellCheckLanguages = 'app:set-spell-check-languages', App_ShowUpdateDialog = 'app:show-update-dialog', App_CheckForUpdate = 'app:check-for-update', App_Reload = 'app:reload', @@ -13,13 +15,17 @@ export enum IpcChannel { App_SetTrayOnClose = 'app:set-tray-on-close', App_SetTheme = 'app:set-theme', App_SetAutoUpdate = 'app:set-auto-update', - App_SetFeedUrl = 'app:set-feed-url', + App_SetTestPlan = 'app:set-test-plan', + App_SetTestChannel = 'app:set-test-channel', App_HandleZoomFactor = 'app:handle-zoom-factor', App_Select = 'app:select', App_HasWritePermission = 'app:has-write-permission', App_Copy = 'app:copy', App_SetStopQuitApp = 'app:set-stop-quit-app', App_SetAppDataPath = 'app:set-app-data-path', + App_GetDataPathFromArgs = 'app:get-data-path-from-args', + App_FlushAppData = 'app:flush-app-data', + App_IsNotEmptyDir = 'app:is-not-empty-dir', App_RelaunchApp = 'app:relaunch-app', App_IsBinaryExist = 'app:is-binary-exist', App_GetBinaryPath = 'app:get-binary-path', @@ -32,6 +38,7 @@ export enum IpcChannel { Notification_OnClick = 'notification:on-click', Webview_SetOpenLinkExternal = 'webview:set-open-link-external', + Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled', // Open Open_Path = 'open:path', @@ -64,6 +71,9 @@ export enum IpcChannel { Mcp_ServersUpdated = 'mcp:servers-updated', Mcp_CheckConnectivity = 'mcp:check-connectivity', + // Python + Python_Execute = 'python:execute', + //copilot Copilot_GetAuthMessage = 'copilot:get-auth-message', Copilot_GetCopilotToken = 'copilot:get-copilot-token', @@ -143,6 +153,11 @@ export enum IpcChannel { Backup_CheckConnection = 'backup:checkConnection', Backup_CreateDirectory = 'backup:createDirectory', Backup_DeleteWebdavFile = 'backup:deleteWebdavFile', + Backup_BackupToS3 = 'backup:backupToS3', + Backup_RestoreFromS3 = 'backup:restoreFromS3', + Backup_ListS3Files = 'backup:listS3Files', + Backup_DeleteS3File = 'backup:deleteS3File', + Backup_CheckS3Connection = 'backup:checkS3Connection', // zip Zip_Compress = 'zip:compress', diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts index 5a3465f648..e4545d44cb 100644 --- a/packages/shared/config/constant.ts +++ b/packages/shared/config/constant.ts @@ -1,7 +1,7 @@ export const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp'] export const videoExts = ['.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv'] export const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac'] -export const documentExts = ['.pdf', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods'] +export const documentExts = ['.pdf', '.doc', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods'] export const thirdPartyApplicationExts = ['.draftsExport'] export const bookExts = ['.epub'] const textExtsByCategory = new Map([ @@ -406,6 +406,16 @@ export const defaultLanguage = 'en-US' export enum FeedUrl { PRODUCTION = 'https://releases.cherry-ai.com', - EARLY_ACCESS = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download' + GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download', + PRERELEASE_LOWEST = 'https://github.com/CherryHQ/cherry-studio/releases/download/v1.4.0' } + +export enum UpgradeChannel { + LATEST = 'latest', // 最新稳定版本 + RC = 'rc', // 公测版本 + BETA = 'beta' // 预览版本 +} + export const defaultTimeout = 5 * 1000 * 60 + +export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network'] diff --git a/resources/scripts/install-bun.js b/resources/scripts/install-bun.js index 9637c60f3a..8e232dfa9c 100644 --- a/resources/scripts/install-bun.js +++ b/resources/scripts/install-bun.js @@ -2,12 +2,12 @@ const fs = require('fs') const path = require('path') const os = require('os') const { execSync } = require('child_process') -const AdmZip = require('adm-zip') +const StreamZip = require('node-stream-zip') const { downloadWithRedirects } = require('./download') // Base URL for downloading bun binaries const BUN_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/bun/releases/download' -const DEFAULT_BUN_VERSION = '1.2.9' // Default fallback version +const DEFAULT_BUN_VERSION = '1.2.17' // Default fallback version // Mapping of platform+arch to binary package name const BUN_PACKAGES = { @@ -66,35 +66,36 @@ async function downloadBunBinary(platform, arch, version = DEFAULT_BUN_VERSION, // Extract the zip file using adm-zip console.log(`Extracting ${packageName} to ${binDir}...`) - const zip = new AdmZip(tempFilename) - zip.extractAllTo(tempdir, true) + const zip = new StreamZip.async({ file: tempFilename }) - // Move files using Node.js fs - const sourceDir = path.join(tempdir, packageName.split('.')[0]) - const files = fs.readdirSync(sourceDir) + // Get all entries in the zip file + const entries = await zip.entries() - for (const file of files) { - const sourcePath = path.join(sourceDir, file) - const destPath = path.join(binDir, file) + // Extract files directly to binDir, flattening the directory structure + for (const entry of Object.values(entries)) { + if (!entry.isDirectory) { + // Get just the filename without path + const filename = path.basename(entry.name) + const outputPath = path.join(binDir, filename) - fs.copyFileSync(sourcePath, destPath) - fs.unlinkSync(sourcePath) - - // Set executable permissions for non-Windows platforms - if (platform !== 'win32') { - try { - // 755 permission: rwxr-xr-x - fs.chmodSync(destPath, '755') - } catch (error) { - console.warn(`Warning: Failed to set executable permissions: ${error.message}`) + console.log(`Extracting ${entry.name} -> ${filename}`) + await zip.extract(entry.name, outputPath) + // Make executable files executable on Unix-like systems + if (platform !== 'win32') { + try { + fs.chmodSync(outputPath, 0o755) + } catch (chmodError) { + console.error(`Warning: Failed to set executable permissions on ${filename}`) + return false + } } + console.log(`Extracted ${entry.name} -> ${outputPath}`) } } + await zip.close() // Clean up fs.unlinkSync(tempFilename) - fs.rmSync(sourceDir, { recursive: true }) - console.log(`Successfully installed bun ${version} for ${platformKey}`) return true } catch (error) { diff --git a/resources/scripts/install-uv.js b/resources/scripts/install-uv.js index 32892b9c63..2c882d07da 100644 --- a/resources/scripts/install-uv.js +++ b/resources/scripts/install-uv.js @@ -2,34 +2,33 @@ const fs = require('fs') const path = require('path') const os = require('os') const { execSync } = require('child_process') -const tar = require('tar') -const AdmZip = require('adm-zip') +const StreamZip = require('node-stream-zip') const { downloadWithRedirects } = require('./download') // Base URL for downloading uv binaries const UV_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/uv/releases/download' -const DEFAULT_UV_VERSION = '0.6.14' +const DEFAULT_UV_VERSION = '0.7.13' // Mapping of platform+arch to binary package name const UV_PACKAGES = { - 'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz', - 'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz', + 'darwin-arm64': 'uv-aarch64-apple-darwin.zip', + 'darwin-x64': 'uv-x86_64-apple-darwin.zip', 'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip', 'win32-ia32': 'uv-i686-pc-windows-msvc.zip', 'win32-x64': 'uv-x86_64-pc-windows-msvc.zip', - 'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz', - 'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz', - 'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz', - 'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz', - 'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz', - 'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz', - 'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz', + 'linux-arm64': 'uv-aarch64-unknown-linux-gnu.zip', + 'linux-ia32': 'uv-i686-unknown-linux-gnu.zip', + 'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.zip', + 'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.zip', + 'linux-s390x': 'uv-s390x-unknown-linux-gnu.zip', + 'linux-x64': 'uv-x86_64-unknown-linux-gnu.zip', + 'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.zip', // MUSL variants - 'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz', - 'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz', - 'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz', - 'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz', - 'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz' + 'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.zip', + 'linux-musl-ia32': 'uv-i686-unknown-linux-musl.zip', + 'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.zip', + 'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.zip', + 'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.zip' } /** @@ -66,46 +65,35 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is console.log(`Extracting ${packageName} to ${binDir}...`) - // 根据文件扩展名选择解压方法 - if (packageName.endsWith('.zip')) { - // 使用 adm-zip 处理 zip 文件 - const zip = new AdmZip(tempFilename) - zip.extractAllTo(binDir, true) - fs.unlinkSync(tempFilename) - console.log(`Successfully installed uv ${version} for ${platform}-${arch}`) - return true - } else { - // tar.gz 文件的处理保持不变 - await tar.x({ - file: tempFilename, - cwd: tempdir, - z: true - }) + const zip = new StreamZip.async({ file: tempFilename }) - // Move files using Node.js fs - const sourceDir = path.join(tempdir, packageName.split('.')[0]) - const files = fs.readdirSync(sourceDir) - for (const file of files) { - const sourcePath = path.join(sourceDir, file) - const destPath = path.join(binDir, file) - fs.copyFileSync(sourcePath, destPath) - fs.unlinkSync(sourcePath) + // Get all entries in the zip file + const entries = await zip.entries() - // Set executable permissions for non-Windows platforms + // Extract files directly to binDir, flattening the directory structure + for (const entry of Object.values(entries)) { + if (!entry.isDirectory) { + // Get just the filename without path + const filename = path.basename(entry.name) + const outputPath = path.join(binDir, filename) + + console.log(`Extracting ${entry.name} -> ${filename}`) + await zip.extract(entry.name, outputPath) + // Make executable files executable on Unix-like systems if (platform !== 'win32') { try { - fs.chmodSync(destPath, '755') - } catch (error) { - console.warn(`Warning: Failed to set executable permissions: ${error.message}`) + fs.chmodSync(outputPath, 0o755) + } catch (chmodError) { + console.error(`Warning: Failed to set executable permissions on ${filename}`) + return false } } + console.log(`Extracted ${entry.name} -> ${outputPath}`) } - - // Clean up - fs.unlinkSync(tempFilename) - fs.rmSync(sourceDir, { recursive: true }) } + await zip.close() + fs.unlinkSync(tempFilename) console.log(`Successfully installed uv ${version} for ${platform}-${arch}`) return true } catch (error) { diff --git a/src/main/bootstrap.ts b/src/main/bootstrap.ts new file mode 100644 index 0000000000..15648f6ffc --- /dev/null +++ b/src/main/bootstrap.ts @@ -0,0 +1,33 @@ +import { occupiedDirs } from '@shared/config/constant' +import { app } from 'electron' +import fs from 'fs' +import path from 'path' + +import { initAppDataDir } from './utils/file' + +app.isPackaged && initAppDataDir() + +// 在主进程中复制 appData 中某些一直被占用的文件 +// 在renderer进程还没有启动时，主进程可以复制这些文件到新的appData中 +function copyOccupiedDirsInMainProcess() { + const newAppDataPath = process.argv + .slice(1) + .find((arg) => arg.startsWith('--new-data-path=')) + ?.split('--new-data-path=')[1] + if (!newAppDataPath) { + return + } + + if (process.platform === 'win32') { + const appDataPath = app.getPath('userData') + occupiedDirs.forEach((dir) => { + const dirPath = path.join(appDataPath, dir) + const newDirPath = path.join(newAppDataPath, dir) + if (fs.existsSync(dirPath)) { + fs.cpSync(dirPath, newDirPath, { recursive: true }) + } + }) + } +} + +copyOccupiedDirsInMainProcess() diff --git a/src/main/index.ts b/src/main/index.ts index 102264317a..3699335a90 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -1,7 +1,11 @@ +// don't reorder this file, it's used to initialize the app data dir and +// other which should be run before the main process is ready +// eslint-disable-next-line +import './bootstrap' + import '@main/config' import { electronApp, optimizer } from '@electron-toolkit/utils' -import { initAppDataDir } from '@main/utils/file' import { replaceDevtoolsFont } from '@main/utils/windowUtil' import { app } from 'electron' import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer' @@ -22,7 +26,6 @@ import { registerShortcuts } from './services/ShortcutService' import { TrayService } from './services/TrayService' import { windowService } from './services/WindowService' -initAppDataDir() Logger.initialize() /** diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 1fc398b8c6..af043c7c8c 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -1,13 +1,14 @@ import fs from 'node:fs' import { arch } from 'node:os' +import path from 'node:path' import { isMac, isWin } from '@main/constant' import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process' import { handleZoomFactor } from '@main/utils/zoom' -import { FeedUrl } from '@shared/config/constant' +import { UpgradeChannel } from '@shared/config/constant' import { IpcChannel } from '@shared/IpcChannel' import { Shortcut, ThemeMode } from '@types' -import { BrowserWindow, dialog, ipcMain, session, shell } from 'electron' +import { BrowserWindow, dialog, ipcMain, session, shell, webContents } from 'electron' import log from 'electron-log' import { Notification } from 'src/renderer/src/types/notification' @@ -24,6 +25,7 @@ import NotificationService from './services/NotificationService' import * as NutstoreService from './services/NutstoreService' import ObsidianVaultService from './services/ObsidianVaultService' import { ProxyConfig, proxyManager } from './services/ProxyManager' +import { pythonService } from './services/PythonService' import { searchService } from './services/SearchService' import { SelectionService } from './services/SelectionService' import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService' @@ -34,7 +36,7 @@ import { setOpenLinkExternal } from './services/WebviewService' import { windowService } from './services/WindowService' import { calculateDirectorySize, getResourcePath } from './utils' import { decrypt, encrypt } from './utils/aes' -import { getCacheDir, getConfigDir, getFilesDir, hasWritePermission, updateConfig } from './utils/file' +import { getCacheDir, getConfigDir, getFilesDir, hasWritePermission, updateAppDataConfig } from './utils/file' import { compress, decompress } from './utils/zip' const fileManager = new FileStorage() @@ -47,6 +49,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { const appUpdater = new AppUpdater(mainWindow) const notificationService = new NotificationService(mainWindow) + // Initialize Python service with main window + pythonService.setMainWindow(mainWindow) + ipcMain.handle(IpcChannel.App_Info, () => ({ version: app.getVersion(), isPackaged: app.isPackaged, @@ -57,7 +62,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { resourcesPath: getResourcePath(), logsPath: log.transports.file.getFile().path, arch: arch(), - isPortable: isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env + isPortable: isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env, + installPath: path.dirname(app.getPath('exe')) })) ipcMain.handle(IpcChannel.App_Proxy, async (_, proxy: string) => { @@ -85,6 +91,27 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { configManager.setLanguage(language) }) + // spell check + ipcMain.handle(IpcChannel.App_SetEnableSpellCheck, (_, isEnable: boolean) => { + // disable spell check for all webviews + const webviews = webContents.getAllWebContents() + webviews.forEach((webview) => { + webview.session.setSpellCheckerEnabled(isEnable) + }) + }) + + // spell check languages + ipcMain.handle(IpcChannel.App_SetSpellCheckLanguages, (_, languages: string[]) => { + if (languages.length === 0) { + return + } + const windows = BrowserWindow.getAllWindows() + windows.forEach((window) => { + window.webContents.session.setSpellCheckerLanguages(languages) + }) + configManager.set('spellCheckLanguages', languages) + }) + // launch on boot ipcMain.handle(IpcChannel.App_SetLaunchOnBoot, (_, openAtLogin: boolean) => { // Set login item settings for windows and mac @@ -115,8 +142,20 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { configManager.setAutoUpdate(isActive) }) - ipcMain.handle(IpcChannel.App_SetFeedUrl, (_, feedUrl: FeedUrl) => { - appUpdater.setFeedUrl(feedUrl) + ipcMain.handle(IpcChannel.App_SetTestPlan, async (_, isActive: boolean) => { + log.info('set test plan', isActive) + if (isActive !== configManager.getTestPlan()) { + appUpdater.cancelDownload() + configManager.setTestPlan(isActive) + } + }) + + ipcMain.handle(IpcChannel.App_SetTestChannel, async (_, channel: UpgradeChannel) => { + log.info('set test channel', channel) + if (channel !== configManager.getTestChannel()) { + appUpdater.cancelDownload() + configManager.setTestChannel(channel) + } }) ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => { @@ -218,14 +257,46 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { // Set app data path ipcMain.handle(IpcChannel.App_SetAppDataPath, async (_, filePath: string) => { - updateConfig(filePath) + updateAppDataConfig(filePath) app.setPath('userData', filePath) }) + ipcMain.handle(IpcChannel.App_GetDataPathFromArgs, () => { + return process.argv + .slice(1) + .find((arg) => arg.startsWith('--new-data-path=')) + ?.split('--new-data-path=')[1] + }) + + ipcMain.handle(IpcChannel.App_FlushAppData, () => { + BrowserWindow.getAllWindows().forEach((w) => { + w.webContents.session.flushStorageData() + w.webContents.session.cookies.flushStore() + + w.webContents.session.closeAllConnections() + }) + + session.defaultSession.flushStorageData() + session.defaultSession.cookies.flushStore() + session.defaultSession.closeAllConnections() + }) + + ipcMain.handle(IpcChannel.App_IsNotEmptyDir, async (_, path: string) => { + return fs.readdirSync(path).length > 0 + }) + // Copy user data to new location - ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string) => { + ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string, occupiedDirs: string[] = []) => { try { - await fs.promises.cp(oldPath, newPath, { recursive: true }) + await fs.promises.cp(oldPath, newPath, { + recursive: true, + filter: (src) => { + if (occupiedDirs.some((dir) => src.startsWith(path.resolve(dir)))) { + return false + } + return true + } + }) return { success: true } } catch (error: any) { log.error('Failed to copy user data:', error) @@ -234,8 +305,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { }) // Relaunch app - ipcMain.handle(IpcChannel.App_RelaunchApp, () => { - app.relaunch() + ipcMain.handle(IpcChannel.App_RelaunchApp, (_, options?: Electron.RelaunchOptions) => { + app.relaunch(options) app.exit(0) }) @@ -273,6 +344,11 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { ipcMain.handle(IpcChannel.Backup_CheckConnection, backupManager.checkConnection) ipcMain.handle(IpcChannel.Backup_CreateDirectory, backupManager.createDirectory) ipcMain.handle(IpcChannel.Backup_DeleteWebdavFile, backupManager.deleteWebdavFile) + ipcMain.handle(IpcChannel.Backup_BackupToS3, backupManager.backupToS3) + ipcMain.handle(IpcChannel.Backup_RestoreFromS3, backupManager.restoreFromS3) + ipcMain.handle(IpcChannel.Backup_ListS3Files, backupManager.listS3Files) + ipcMain.handle(IpcChannel.Backup_DeleteS3File, backupManager.deleteS3File) + ipcMain.handle(IpcChannel.Backup_CheckS3Connection, backupManager.checkS3Connection) // file ipcMain.handle(IpcChannel.File_Open, fileManager.open) @@ -377,6 +453,14 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo) ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity) + // Register Python execution handler + ipcMain.handle( + IpcChannel.Python_Execute, + async (_, script: string, context?: Record
-
- {tokenLines.map((lineTokens, lineIndex) => (
-
+ return (
+
+
+ {tokenLines.map((lineTokens, lineIndex) => (
+
+ {showLineNumbers && {lineIndex + 1}}
+
{lineTokens.map((token, tokenIndex) => (
{token.content}
))}
- ))}
-
-
- )
- }
-)
+
+ ))}
+
+
+ )
+})
const ContentContainer = styled.div<{
- $lineNumbers: boolean
$wrap: boolean
$fadeIn: boolean
}>`
position: relative;
overflow: auto;
- border: 0.5px solid transparent;
- border-radius: 5px;
+ border-radius: inherit;
margin-top: 0;
+ /* gutter 宽度默认值 */
+ --gutter-width: 0.6rem;
+
.shiki {
padding: 1em;
+ border-radius: inherit;
code {
display: flex;
flex-direction: column;
.line {
- display: block;
+ display: flex;
+ align-items: flex-start;
min-height: 1.3rem;
- padding-left: ${(props) => (props.$lineNumbers ? '2rem' : '0')};
- * {
- overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
- white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+ .line-number {
+ width: var(--gutter-width);
+ text-align: right;
+ opacity: 0.35;
+ margin-right: 1rem;
+ user-select: none;
+ flex-shrink: 0;
+ overflow: hidden;
+ line-height: inherit;
+ font-family: inherit;
+ font-variant-numeric: tabular-nums;
+ }
+
+ .line-content {
+ flex: 1;
+
+ * {
+ overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
+ white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+ }
}
}
}
}
- ${(props) =>
- props.$lineNumbers &&
- `
- code {
- counter-reset: step;
- counter-increment: step 0;
- position: relative;
- }
-
- code .line::before {
- content: counter(step);
- counter-increment: step;
- width: 1rem;
- position: absolute;
- left: 0;
- text-align: right;
- opacity: 0.35;
- }
- `}
-
@keyframes contentFadeIn {
from {
opacity: 0;
@@ -291,7 +294,7 @@ const ContentContainer = styled.div<{
}
}
- animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.3s ease-in-out forwards' : 'none')};
+ animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.1s ease-in forwards' : 'none')};
`
const CodePlaceholder = styled.div`
diff --git a/src/renderer/src/components/CodeBlockView/index.tsx b/src/renderer/src/components/CodeBlockView/index.tsx
index 811b8665cc..c25ab3079d 100644
--- a/src/renderer/src/components/CodeBlockView/index.tsx
+++ b/src/renderer/src/components/CodeBlockView/index.tsx
@@ -273,6 +273,7 @@ const CodeHeader = styled.div<{ $isInSpecialView: boolean }>`
align-items: center;
color: var(--color-text);
font-size: 14px;
+ line-height: 1;
font-weight: bold;
padding: 0 10px;
border-top-left-radius: 8px;
@@ -288,6 +289,10 @@ const SplitViewWrapper = styled.div`
flex: 1 1 auto;
width: 100%;
}
+
+ &:not(:has(+ [class*='Container'])) {
+ border-radius: 0 0 8px 8px;
+ }
`
export default memo(CodeBlockView)
diff --git a/src/renderer/src/components/CodeEditor/index.tsx b/src/renderer/src/components/CodeEditor/index.tsx
index d92fd91e8e..db699fa030 100644
--- a/src/renderer/src/components/CodeEditor/index.tsx
+++ b/src/renderer/src/components/CodeEditor/index.tsx
@@ -227,10 +227,10 @@ const CodeEditor = ({
...customBasicSetup // override basicSetup
}}
style={{
- ...style,
fontSize: `${fontSize - 1}px`,
- border: '0.5px solid transparent',
- marginTop: 0
+ marginTop: 0,
+ borderRadius: 'inherit',
+ ...style
}}
/>
)
diff --git a/src/renderer/src/components/ContentSearch.tsx b/src/renderer/src/components/ContentSearch.tsx
index 08a1fd415a..1f895e348b 100644
--- a/src/renderer/src/components/ContentSearch.tsx
+++ b/src/renderer/src/components/ContentSearch.tsx
@@ -3,13 +3,10 @@ import NarrowLayout from '@renderer/pages/home/Messages/NarrowLayout'
import { Tooltip } from 'antd'
import { debounce } from 'lodash'
import { CaseSensitive, ChevronDown, ChevronUp, User, WholeWord, X } from 'lucide-react'
-import React, { useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
-const HIGHLIGHT_CLASS = 'highlight'
-const HIGHLIGHT_SELECT_CLASS = 'selected'
-
interface Props {
children?: React.ReactNode
searchTarget: React.RefObject
+
+
+
{children}
)
diff --git a/src/renderer/src/pages/home/Markdown/Markdown.tsx b/src/renderer/src/pages/home/Markdown/Markdown.tsx
index 2a6446fec7..454550c5c8 100644
--- a/src/renderer/src/pages/home/Markdown/Markdown.tsx
+++ b/src/renderer/src/pages/home/Markdown/Markdown.tsx
@@ -8,8 +8,8 @@ import { useSettings } from '@renderer/hooks/useSettings'
import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
import type { MainTextMessageBlock, ThinkingMessageBlock, TranslationMessageBlock } from '@renderer/types/newMessage'
import { parseJSON } from '@renderer/utils'
-import { escapeBrackets, removeSvgEmptyLines } from '@renderer/utils/formats'
-import { findCitationInChildren, getCodeBlockId } from '@renderer/utils/markdown'
+import { removeSvgEmptyLines } from '@renderer/utils/formats'
+import { findCitationInChildren, getCodeBlockId, processLatexBrackets } from '@renderer/utils/markdown'
import { isEmpty } from 'lodash'
import { type FC, memo, useCallback, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -52,7 +52,7 @@ const Markdown: FC = ({ block }) => {
const empty = isEmpty(block.content)
const paused = block.status === 'paused'
const content = empty && paused ? t('message.chat.completion.paused') : block.content
- return removeSvgEmptyLines(escapeBrackets(content))
+ return removeSvgEmptyLines(processLatexBrackets(content))
}, [block, t])
const rehypePlugins = useMemo(() => {
diff --git a/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx b/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
index 06a390c06a..072bf3047e 100644
--- a/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
+++ b/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
@@ -93,7 +93,7 @@ describe('CitationTooltip', () => {
const tooltip = screen.getByTestId('tooltip-wrapper')
expect(tooltip).toHaveAttribute('data-placement', 'top')
- expect(tooltip).toHaveAttribute('data-color', 'var(--color-background-mute)')
+ expect(tooltip).toHaveAttribute('data-color', 'var(--color-background)')
const styles = JSON.parse(tooltip.getAttribute('data-styles') || '{}')
expect(styles.body).toEqual({
diff --git a/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx b/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
index abd7067ab0..be9b18c13b 100644
--- a/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
+++ b/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
@@ -42,13 +42,13 @@ vi.mock('@renderer/utils', () => ({
}))
vi.mock('@renderer/utils/formats', () => ({
- escapeBrackets: vi.fn((str) => str),
removeSvgEmptyLines: vi.fn((str) => str)
}))
vi.mock('@renderer/utils/markdown', () => ({
findCitationInChildren: vi.fn(() => '{"id": 1, "url": "https://example.com"}'),
- getCodeBlockId: vi.fn(() => 'code-block-1')
+ getCodeBlockId: vi.fn(() => 'code-block-1'),
+ processLatexBrackets: vi.fn((str) => str)
}))
// Mock components with more realistic behavior
@@ -212,16 +212,6 @@ describe('Markdown', () => {
expect(markdown).not.toHaveTextContent('Paused')
})
- it('should process content through format utilities', async () => {
- const { escapeBrackets, removeSvgEmptyLines } = await import('@renderer/utils/formats')
- const content = 'Content with [brackets] and SVG'
-
- render( = ({ block }) => {
? [`file://${block?.file?.path}`]
: []
return (
-
+
{images.map((src, index) => (
@@ -34,6 +34,5 @@ const Container = styled.div`
display: flex;
flex-direction: row;
gap: 10px;
- margin-top: 8px;
`
export default React.memo(ImageBlock)
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
index 72f2871586..336287a130 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
@@ -3,7 +3,7 @@ import { useSettings } from '@renderer/hooks/useSettings'
import { MessageBlockStatus, type ThinkingMessageBlock } from '@renderer/types/newMessage'
import { lightbulbVariants } from '@renderer/utils/motionVariants'
import { Collapse, message as antdMessage, Tooltip } from 'antd'
-import { Lightbulb } from 'lucide-react'
+import { ChevronRight, Lightbulb } from 'lucide-react'
import { motion } from 'motion/react'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -57,6 +57,14 @@ const ThinkingBlock: React.FC = ({ block }) => {
size="small"
onChange={() => setActiveKey((key) => (key ? '' : 'thought'))}
className="message-thought-container"
+ expandIcon={({ isActive }) => (
+ = ({ citations }) => {
const { t } = useTranslation()
- const [open, setOpen] = useState(false)
const previewItems = citations.slice(0, 3)
const count = citations.length
if (!count) return null
+ const popoverContent = (
+
+ {citations.map((citation) => (
+
+ {citation.type === 'websearch' ? (
+
+
+ ) : (
+
+
+ )}
+
+ ))}
+
+ )
+
return (
- <>
- setOpen(true)}>
+
+ {t('message.citations')}
+
+ }
+ placement="right"
+ trigger="hover"
+ styles={{
+ body: {
+ padding: '0 0 8px 0'
+ }
+ }}>
+
{previewItems.map((c, i) => (
@@ -71,27 +107,7 @@ const CitationsList: React.FC = ({ citations }) => {
{t('message.citation', { count })}
-
- setOpen(false)}
- open={open}
- width={680}
- styles={{ header: { border: 'none' }, body: { paddingTop: 0 } }}
- destroyOnClose={false}>
- {open &&
- citations.map((citation) => (
-
- {citation.type === 'websearch' ? (
-
- ))}
-
-
+
-
- {messageContent}
+ styles={{
+ root: { maxWidth: '60vw', overflowY: 'auto', zIndex: 1000 },
+ body: { padding: 2 }
+ }}>
+ {messageContent}
{t('settings.messages.grid_popover_trigger')}
-
+ options={[
+ { label: t('settings.messages.grid_popover_trigger.hover'), value: 'hover' },
+ { label: t('settings.messages.grid_popover_trigger.click'), value: 'click' }
+ ]}
+ />
+
= ({ base: _base, resolve }) => {
const TopViewKey = 'KnowledgeSettingsPopup'
-const AdvancedSettingsButton = styled.div`
- cursor: pointer;
- margin-bottom: 16px;
- margin-top: -10px;
- color: var(--color-primary);
- display: flex;
- align-items: center;
-`
-
export default class KnowledgeSettingsPopup {
static hide() {
TopView.hide(TopViewKey)
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index 82f11ec7d4..50832da2e6 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -10,7 +10,8 @@ import { useAppDispatch } from '@renderer/store'
import { setUpdateState } from '@renderer/store/runtime'
import { ThemeMode } from '@renderer/types'
import { compareVersions, runAsyncFunction } from '@renderer/utils'
-import { Avatar, Button, Progress, Row, Switch, Tag, Tooltip } from 'antd'
+import { UpgradeChannel } from '@shared/config/constant'
+import { Avatar, Button, Progress, Radio, Row, Switch, Tag, Tooltip } from 'antd'
import { debounce } from 'lodash'
import { Bug, FileCheck, Github, Globe, Mail, Rss } from 'lucide-react'
import { FC, useEffect, useState } from 'react'
@@ -25,7 +26,7 @@ const AboutSettings: FC = () => {
const [version, setVersion] = useState('')
const [isPortable, setIsPortable] = useState(false)
const { t } = useTranslation()
- const { autoCheckUpdate, setAutoCheckUpdate, earlyAccess, setEarlyAccess } = useSettings()
+ const { autoCheckUpdate, setAutoCheckUpdate, testPlan, setTestPlan, testChannel, setTestChannel } = useSettings()
const { theme } = useTheme()
const dispatch = useAppDispatch()
const { update } = useRuntime()
@@ -95,15 +96,82 @@ const AboutSettings: FC = () => {
const hasNewVersion = update?.info?.version && version ? compareVersions(update.info.version, version) > 0 : false
+ const currentChannelByVersion =
+ [
+ { pattern: `-${UpgradeChannel.BETA}.`, channel: UpgradeChannel.BETA },
+ { pattern: `-${UpgradeChannel.RC}.`, channel: UpgradeChannel.RC }
+ ].find(({ pattern }) => version.includes(pattern))?.channel || UpgradeChannel.LATEST
+
+ useEffect(() => {
+ if (testPlan && currentChannelByVersion !== UpgradeChannel.LATEST && testChannel !== currentChannelByVersion) {
+ window.message.warning(t('settings.general.test_plan.version_channel_not_match'))
+ }
+ }, [testPlan, testChannel, currentChannelByVersion, t])
+
+ const handleTestChannelChange = async (value: UpgradeChannel) => {
+ setTestChannel(value)
+ // Clear update info when switching upgrade channel
+ dispatch(
+ setUpdateState({
+ available: false,
+ info: null,
+ downloaded: false,
+ checking: false,
+ downloading: false,
+ downloadProgress: 0
+ })
+ )
+ }
+
+ // Get available test version options based on current version
+ const getAvailableTestChannels = () => {
+ return [
+ {
+ tooltip: t('settings.general.test_plan.rc_version_tooltip'),
+ label: t('settings.general.test_plan.rc_version'),
+ value: UpgradeChannel.RC
+ },
+ {
+ tooltip: t('settings.general.test_plan.beta_version_tooltip'),
+ label: t('settings.general.test_plan.beta_version'),
+ value: UpgradeChannel.BETA
+ }
+ ]
+ }
+
+ const handleSetTestPlan = (value: boolean) => {
+ setTestPlan(value)
+ dispatch(
+ setUpdateState({
+ available: false,
+ info: null,
+ downloaded: false,
+ checking: false,
+ downloading: false,
+ downloadProgress: 0
+ })
+ )
+
+ if (value === true) {
+ setTestChannel(getTestChannel())
+ }
+ }
+
+ const getTestChannel = () => {
+ if (testChannel === UpgradeChannel.LATEST) {
+ return UpgradeChannel.RC
+ }
+ return testChannel
+ }
+
useEffect(() => {
runAsyncFunction(async () => {
const appInfo = await window.api.getAppInfo()
setVersion(appInfo.version)
setIsPortable(appInfo.isPortable)
})
- setEarlyAccess(earlyAccess)
setAutoCheckUpdate(autoCheckUpdate)
- }, [autoCheckUpdate, earlyAccess, setAutoCheckUpdate, setEarlyAccess])
+ }, [autoCheckUpdate, setAutoCheckUpdate])
return (
@@ -165,11 +233,30 @@ const AboutSettings: FC = () => {
- {t('settings.general.early_access.title')}
-
- setEarlyAccess(v)} />
+ {t('settings.general.test_plan.title')}
+
+ handleSetTestPlan(v)} />
+ {testPlan && (
+ <>
+
+ {t('settings.general.test_plan.version_options')}
+ handleTestChannelChange(e.target.value)}>
+ {getAvailableTestChannels().map((option) => (
+
+ {option.label}
+
+ ))}
+
+
+
+ )}
)}
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
index 169ed3ffd5..a593f41cbe 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
@@ -3,7 +3,7 @@ import { Box } from '@renderer/components/Layout'
import { useAppSelector } from '@renderer/store'
import { Assistant, AssistantSettings } from '@renderer/types'
import { Row, Segmented, Select, SelectProps, Tooltip } from 'antd'
-import { CircleHelp } from 'lucide-react'
+import { ChevronDown, CircleHelp } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
@@ -46,6 +46,7 @@ const AssistantKnowledgeBaseSettings: React.FC = ({ assistant, updateAssi
.toLowerCase()
.includes(input.toLowerCase())
}
+ suffixIcon={
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
index 1a22848ce5..31e44abfbb 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
@@ -1,13 +1,16 @@
import { DeleteOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
+import EditableNumber from '@renderer/components/EditableNumber'
import { HStack } from '@renderer/components/Layout'
import SelectModelPopup from '@renderer/components/Popups/SelectModelPopup'
+import Selector from '@renderer/components/Selector'
import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
import { SettingRow } from '@renderer/pages/settings'
import { Assistant, AssistantSettingCustomParameters, AssistantSettings } from '@renderer/types'
import { modalConfirm } from '@renderer/utils'
import { Button, Col, Divider, Input, InputNumber, Row, Select, Slider, Switch, Tooltip } from 'antd'
import { isNull } from 'lodash'
+import { ChevronDown } from 'lucide-react'
import { FC, useCallback, useEffect, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
@@ -107,9 +110,15 @@ const AssistantModelSettings: FC = ({ assistant, updateAssistant, updateA
)
case 'boolean':
return (
- onUpdateCustomParameter(index, 'value', checked)}
+
)}
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
index 7986ea5766..cef0625785 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
@@ -1,6 +1,6 @@
import { NavbarRight } from '@renderer/components/app/Navbar'
import { HStack } from '@renderer/components/Layout'
-import { isLinux, isWindows } from '@renderer/config/constant'
+import { isLinux, isWin } from '@renderer/config/constant'
import { useFullscreen } from '@renderer/hooks/useFullscreen'
import { Button, Dropdown, Menu, type MenuProps } from 'antd'
import { ChevronDown, Search } from 'lucide-react'
@@ -74,7 +74,7 @@ export const McpSettingsNavbar = () => {
}))
return (
-
+
@@ -146,6 +148,7 @@ const ModelSettings: FC = () => {
options={selectOptions}
showSearch
placeholder={t('settings.models.empty')}
+ suffixIcon={
= ({ title, provider, resolve }) => {
tooltip={t('settings.models.add.group_name.tooltip')}>
-
+
-
-
-
+
+ : {showMoreSettings ?
-
+
{showMoreSettings && (
-
- {t('models.type.select')}
+
+ {t('models.type.select')}:
{(() => {
const defaultTypes = [
...(isVisionModel(model) ? ['vision'] : []),
@@ -235,6 +238,7 @@ const ModelEditContent: FC = ({ model, onUpdateModel, ope
}
}}
dropdownMatchSelectWidth={false}
+ suffixIcon={ = ({ model, onUpdateModel, ope
}
const TypeTitle = styled.div`
- margin-top: 16px;
- margin-bottom: 12px;
+ margin: 12px 0;
font-size: 14px;
font-weight: 600;
`
-const ExpandIcon = styled.div`
- font-size: 12px;
- color: var(--color-text-3);
-`
-
-const MoreSettingsRow = styled.div`
- display: flex;
- align-items: center;
- gap: 8px;
- color: var(--color-text-3);
- cursor: pointer;
- padding: 4px 8px;
- border-radius: 4px;
- max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
-
- &:hover {
- background-color: var(--color-background-soft);
- }
-`
-
export default ModelEditContent
diff --git a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
index 4947b00336..0bbebf57e9 100644
--- a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
@@ -1,4 +1,4 @@
-import { isWindows } from '@renderer/config/constant'
+import { isWin } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useSelectionAssistant } from '@renderer/hooks/useSelectionAssistant'
import { FilterMode, TriggerMode } from '@renderer/types/selectionTypes'
@@ -50,10 +50,11 @@ const SelectionAssistantSettings: FC = () => {
setFilterList
} = useSelectionAssistant()
const [isFilterListModalOpen, setIsFilterListModalOpen] = useState(false)
+ const [opacityValue, setOpacityValue] = useState(actionWindowOpacity)
// force disable selection assistant on non-windows systems
useEffect(() => {
- if (!isWindows && selectionEnabled) {
+ if (!isWin && selectionEnabled) {
setSelectionEnabled(false)
}
}, [selectionEnabled, setSelectionEnabled])
@@ -76,12 +77,12 @@ const SelectionAssistantSettings: FC = () => {
{t('selection.settings.enable.title')}
- {!isWindows && {t('selection.settings.enable.description')} }
+ {!isWin && {t('selection.settings.enable.description')} }
setSelectionEnabled(checked)}
- disabled={!isWindows}
+ disabled={!isWin}
/>
@@ -195,14 +196,15 @@ const SelectionAssistantSettings: FC = () => {
{t('selection.settings.window.opacity.title')}
{t('selection.settings.window.opacity.description')}
- = ({ title, resolve }) => {
centered>
)
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
index 098c007ca8..f891e2aee1 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
@@ -1,18 +1,16 @@
import { useTheme } from '@renderer/context/ThemeProvider'
-import { useAppDispatch, useAppSelector } from '@renderer/store'
-import { setContentLimit, setMaxResult, setSearchWithTime } from '@renderer/store/websearch'
-import { Input, Slider, Switch, Tooltip } from 'antd'
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { useAppDispatch } from '@renderer/store'
+import { setMaxResult, setSearchWithTime } from '@renderer/store/websearch'
+import { Slider, Switch } from 'antd'
import { t } from 'i18next'
-import { Info } from 'lucide-react'
import { FC } from 'react'
import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
const BasicSettings: FC = () => {
const { theme } = useTheme()
- const searchWithTime = useAppSelector((state) => state.websearch.searchWithTime)
- const maxResults = useAppSelector((state) => state.websearch.maxResults)
- const contentLimit = useAppSelector((state) => state.websearch.contentLimit)
+ const { searchWithTime, maxResults } = useWebSearchSettings()
const dispatch = useAppDispatch()
@@ -30,36 +28,14 @@ const BasicSettings: FC = () => {
{t('settings.websearch.search_max_result')}
dispatch(setMaxResult(value))}
/>
-
-
- {t('settings.websearch.content_limit')}
-
-
-
- {
- const value = e.target.value
- if (value === '') {
- dispatch(setContentLimit(undefined))
- } else if (!isNaN(Number(value)) && Number(value) > 0) {
- dispatch(setContentLimit(Number(value)))
- }
- }}
- />
-
)
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx
new file mode 100644
index 0000000000..add4024598
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx
@@ -0,0 +1,60 @@
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingRow, SettingRowTitle } from '@renderer/pages/settings'
+import { Input, Select, Space, Tooltip } from 'antd'
+import { ChevronDown, Info } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+
+const INPUT_BOX_WIDTH = '200px'
+
+const CutoffSettings = () => {
+ const { t } = useTranslation()
+ const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+
+ const handleCutoffLimitChange = (value: number | null) => {
+ updateCompressionConfig({ cutoffLimit: value || undefined })
+ }
+
+ const handleCutoffUnitChange = (unit: 'char' | 'token') => {
+ updateCompressionConfig({ cutoffUnit: unit })
+ }
+
+ const unitOptions = [
+ { value: 'char', label: t('settings.websearch.compression.cutoff.unit.char') },
+ { value: 'token', label: t('settings.websearch.compression.cutoff.unit.token') }
+ ]
+
+ return (
+
+
+ {t('settings.websearch.compression.cutoff.limit')}
+
+
+
+
+ {
+ const value = e.target.value
+ if (value === '') {
+ handleCutoffLimitChange(null)
+ } else if (!isNaN(Number(value)) && Number(value) > 0) {
+ handleCutoffLimitChange(Number(value))
+ }
+ }}
+ />
+ }
+ />
+
+
+ )
+}
+
+export default CutoffSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx
new file mode 100644
index 0000000000..c064bfc59b
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx
@@ -0,0 +1,207 @@
+import AiProvider from '@renderer/aiCore'
+import { DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT } from '@renderer/config/constant'
+import Logger from '@renderer/config/logger'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import { NOT_SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
+import { useProviders } from '@renderer/hooks/useProvider'
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingDivider, SettingRow, SettingRowTitle } from '@renderer/pages/settings'
+import { getModelUniqId } from '@renderer/services/ModelService'
+import { Model } from '@renderer/types'
+import { Button, InputNumber, Select, Slider, Tooltip } from 'antd'
+import { find, sortBy } from 'lodash'
+import { ChevronDown, Info, RefreshCw } from 'lucide-react'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const INPUT_BOX_WIDTH = '200px'
+
+const RagSettings = () => {
+ const { t } = useTranslation()
+ const { providers } = useProviders()
+ const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+ const [loadingDimensions, setLoadingDimensions] = useState(false)
+
+ const embeddingModels = useMemo(() => {
+ return providers
+ .map((p) => p.models)
+ .flat()
+ .filter((model) => isEmbeddingModel(model))
+ }, [providers])
+
+ const rerankModels = useMemo(() => {
+ return providers
+ .map((p) => p.models)
+ .flat()
+ .filter((model) => isRerankModel(model))
+ }, [providers])
+
+ const embeddingSelectOptions = useMemo(() => {
+ return providers
+ .filter((p) => p.models.length > 0)
+ .map((p) => ({
+ label: p.isSystem ? t(`provider.${p.id}`) : p.name,
+ title: p.name,
+ options: sortBy(p.models, 'name')
+ .filter((model) => isEmbeddingModel(model))
+ .map((m) => ({
+ label: m.name,
+ value: getModelUniqId(m),
+ providerId: p.id,
+ modelId: m.id
+ }))
+ }))
+ .filter((group) => group.options.length > 0)
+ }, [providers, t])
+
+ const rerankSelectOptions = useMemo(() => {
+ return providers
+ .filter((p) => p.models.length > 0)
+ .filter((p) => !NOT_SUPPORTED_REANK_PROVIDERS.includes(p.id))
+ .map((p) => ({
+ label: p.isSystem ? t(`provider.${p.id}`) : p.name,
+ title: p.name,
+ options: sortBy(p.models, 'name')
+ .filter((model) => isRerankModel(model))
+ .map((m) => ({
+ label: m.name,
+ value: getModelUniqId(m)
+ }))
+ }))
+ .filter((group) => group.options.length > 0)
+ }, [providers, t])
+
+ const handleEmbeddingModelChange = (modelValue: string) => {
+ const selectedModel = find(embeddingModels, JSON.parse(modelValue)) as Model
+ updateCompressionConfig({ embeddingModel: selectedModel })
+ }
+
+ const handleRerankModelChange = (modelValue?: string) => {
+ const selectedModel = modelValue ? (find(rerankModels, JSON.parse(modelValue)) as Model) : undefined
+ updateCompressionConfig({ rerankModel: selectedModel })
+ }
+
+ const handleEmbeddingDimensionsChange = (value: number | null) => {
+ updateCompressionConfig({ embeddingDimensions: value || undefined })
+ }
+
+ const handleDocumentCountChange = (value: number) => {
+ updateCompressionConfig({ documentCount: value })
+ }
+
+ const handleAutoGetDimensions = async () => {
+ if (!compressionConfig?.embeddingModel) {
+ Logger.log('[RagSettings] handleAutoGetDimensions: no embedding model')
+ window.message.error(t('settings.websearch.compression.error.embedding_model_required'))
+ return
+ }
+
+ const provider = providers.find((p) => p.id === compressionConfig.embeddingModel?.provider)
+ if (!provider) {
+ Logger.log('[RagSettings] handleAutoGetDimensions: provider not found')
+ window.message.error(t('settings.websearch.compression.error.provider_not_found'))
+ return
+ }
+
+ setLoadingDimensions(true)
+ try {
+ const aiProvider = new AiProvider(provider)
+ const dimensions = await aiProvider.getEmbeddingDimensions(compressionConfig.embeddingModel)
+
+ updateCompressionConfig({ embeddingDimensions: dimensions })
+
+ window.message.success(t('settings.websearch.compression.info.dimensions_auto_success', { dimensions }))
+ } catch (error) {
+ Logger.error('[RagSettings] handleAutoGetDimensions: failed to get embedding dimensions', error)
+ window.message.error(t('settings.websearch.compression.error.dimensions_auto_failed'))
+ } finally {
+ setLoadingDimensions(false)
+ }
+ }
+
+ return (
+ <>
+
+ {t('models.embedding_model')}
+ }
+ />
+
+
+
+ {t('models.embedding_dimensions')}
+
+
+
+
+
+ {t('models.rerank_model')}
+ }
+ />
+
+
+
+ {t('settings.websearch.compression.rag.document_count')}
+
+
+
+
+
+ )
+}
+
+export default RagSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx
new file mode 100644
index 0000000000..1ae8520add
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx
@@ -0,0 +1,47 @@
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '@renderer/pages/settings'
+import { Select } from 'antd'
+import { ChevronDown } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+
+import CutoffSettings from './CutoffSettings'
+import RagSettings from './RagSettings'
+
+const CompressionSettings = () => {
+ const { t } = useTranslation()
+ const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+
+ const compressionMethodOptions = [
+ { value: 'none', label: t('settings.websearch.compression.method.none') },
+ { value: 'cutoff', label: t('settings.websearch.compression.method.cutoff') },
+ { value: 'rag', label: t('settings.websearch.compression.method.rag') }
+ ]
+
+ const handleCompressionMethodChange = (method: 'none' | 'cutoff' | 'rag') => {
+ updateCompressionConfig({ method })
+ }
+
+ return (
+
+ {t('settings.websearch.compression.title')}
+
+ {t('settings.websearch.compression.method')}
+ }
+ />
+
+
+ )
+}
+
+export default CompressionSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
index e00eb785e7..ecf2b8375b 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
@@ -1,14 +1,15 @@
+import Selector from '@renderer/components/Selector'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useDefaultWebSearchProvider, useWebSearchProviders } from '@renderer/hooks/useWebSearchProviders'
import { WebSearchProvider } from '@renderer/types'
import { hasObjectKey } from '@renderer/utils'
-import { Select } from 'antd'
import { FC, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
import BasicSettings from './BasicSettings'
import BlacklistSettings from './BlacklistSettings'
+import CompressionSettings from './CompressionSettings'
import WebSearchProviderSetting from './WebSearchProviderSetting'
const WebSearchSettings: FC = () => {
@@ -37,9 +38,9 @@ const WebSearchSettings: FC = () => {
{t('settings.websearch.search_provider')}
{actionWindowOpacity}%
+ {opacityValue}%
+
+ }
+ loading={loadingDimensions}
+ disabled={!compressionConfig?.embeddingModel}
+ onClick={handleAutoGetDimensions}
+ />
+
+
+
+
+
-