@@ -167,6 +197,78 @@ For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIB Thank you for your support and contributions! +# 🔧 Developer Co-creation Program + +We are launching the Cherry Studio Developer Co-creation Program to foster a healthy and positive-feedback loop within the open-source ecosystem. We believe that great software is built collaboratively, and every merged pull request breathes new life into the project. + +We sincerely invite you to join our ranks of contributors and shape the future of Cherry Studio with us. + +## Contributor Rewards Program + +To give back to our core contributors and create a virtuous cycle, we have established the following long-term incentive plan. + +**The inaugural tracking period for this program will be Q3 2025 (July, August, September). Rewards for this cycle will be distributed on October 1st.** + +Within any tracking period (e.g., July 1st to September 30th for the first cycle), any developer who contributes more than **30 meaningful commits** to any of Cherry Studio's open-source projects on GitHub is eligible for the following benefits: + +- **Cursor Subscription Sponsorship**: Receive a **$70 USD** credit or reimbursement for your [Cursor](https://cursor.sh/) subscription, making AI your most efficient coding partner. +- **Unlimited Model Access**: Get **unlimited** API calls for the **DeepSeek** and **Qwen** models. +- **Cutting-Edge Tech Access**: Enjoy occasional perks, including API access to models like **Claude**, **Gemini**, and **OpenAI**, keeping you at the forefront of technology. + +## Growing Together & Future Plans + +A vibrant community is the driving force behind any sustainable open-source project. As Cherry Studio grows, so will our rewards program. We are committed to continuously aligning our benefits with the best-in-class tools and resources in the industry. This ensures our core contributors receive meaningful support, creating a positive cycle where developers, the community, and the project grow together. + +**Moving forward, the project will also embrace an increasingly open stance to give back to the entire open-source community.** + +## How to Get Started? + +We look forward to your first Pull Request! + +You can start by exploring our repositories, picking up a `good first issue`, or proposing your own enhancements. Every commit is a testament to the spirit of open source. + +Thank you for your interest and contributions. + +Let's build together. + +# 🏢 Enterprise Edition + +Building on the Community Edition, we are proud to introduce **Cherry Studio Enterprise Edition**—a privately deployable AI productivity and management platform designed for modern teams and enterprises. + +The Enterprise Edition addresses core challenges in team collaboration by centralizing the management of AI resources, knowledge, and data. It empowers organizations to enhance efficiency, foster innovation, and ensure compliance, all while maintaining 100% control over their data in a secure environment. + +## Core Advantages + +- **Unified Model Management**: Centrally integrate and manage various cloud-based LLMs (e.g., OpenAI, Anthropic, Google Gemini) and locally deployed private models. Employees can use them out-of-the-box without individual configuration. +- **Enterprise-Grade Knowledge Base**: Build, manage, and share team-wide knowledge bases. Ensure knowledge is retained and consistent, enabling team members to interact with AI based on unified and accurate information. +- **Fine-Grained Access Control**: Easily manage employee accounts and assign role-based permissions for different models, knowledge bases, and features through a unified admin backend. +- **Fully Private Deployment**: Deploy the entire backend service on your on-premises servers or private cloud, ensuring your data remains 100% private and under your control to meet the strictest security and compliance standards. +- **Reliable Backend Services**: Provides stable API services, enterprise-grade data backup and recovery mechanisms to ensure business continuity. + +## ✨ Online Demo + +> 🚧 **Public Beta Notice** +> +> The Enterprise Edition is currently in its early public beta stage, and we are actively iterating and optimizing its features. We are aware that it may not be perfectly stable yet. If you encounter any issues or have valuable suggestions during your trial, we would be very grateful if you could contact us via email to provide feedback. + +**🔗 [Cherry Studio Enterprise](https://www.cherry-ai.com/enterprise)** + +## Version Comparison + +| Feature | Community Edition | Enterprise Edition | +| :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- | +| **Open Source** | ✅ Yes | ⭕️ part. released to cust. | +| **Cost** | Free for Personal Use / Commercial License | Buyout / Subscription Fee | +| **Admin Backend** | — | ● Centralized **Model** Access
● **Employee** Management
● Shared **Knowledge Base**
● **Access** Control
● **Data** Backup | +| **Server** | — | ✅ Dedicated Private Deployment | + +## Get the Enterprise Edition + +We believe the Enterprise Edition will become your team's AI productivity engine. If you are interested in Cherry Studio Enterprise Edition and would like to learn more, request a quote, or schedule a demo, please contact us. + +- **For Business Inquiries & Purchasing**: + **📧 [bd@cherry-ai.com](mailto:bd@cherry-ai.com)** + # 🔗 Related Projects - [one-api](https://github.com/songquanpeng/one-api):LLM API management and distribution system, supporting mainstream models like OpenAI, Azure, and Anthropic. Features unified API interface, suitable for key management and secondary distribution. @@ -185,6 +287,7 @@ Thank you for your support and contributions! [](https://star-history.com/#CherryHQ/cherry-studio&Timeline) + [deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?style=plastic [deepwiki-link]: https://deepwiki.com/CherryHQ/cherry-studio [twitter-shield]: https://img.shields.io/badge/Twitter-CherryStudioApp-0088CC?style=plastic&logo=x @@ -195,6 +298,7 @@ Thank you for your support and contributions! [telegram-link]: https://t.me/CherryStudioAI + [github-stars-shield]: https://img.shields.io/github/stars/CherryHQ/cherry-studio?style=social [github-stars-link]: https://github.com/CherryHQ/cherry-studio/stargazers [github-forks-shield]: https://img.shields.io/github/forks/CherryHQ/cherry-studio?style=social @@ -205,6 +309,7 @@ Thank you for your support and contributions! [github-contributors-link]: https://github.com/CherryHQ/cherry-studio/graphs/contributors + [license-shield]: https://img.shields.io/badge/License-AGPLv3-important.svg?style=plastic&logo=gnu [license-link]: https://www.gnu.org/licenses/agpl-3.0 [commercial-shield]: https://img.shields.io/badge/License-Contact-white.svg?style=plastic&logoColor=white&logo=telegram&color=blue diff --git a/electron-builder.yml b/electron-builder.yml index c1279a67e2..ecbbc10057 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -90,6 +90,7 @@ linux: artifactName: ${productName}-${version}-${arch}.${ext} target: - target: AppImage + - target: deb maintainer: electronjs.org category: Utility desktop: @@ -107,11 +108,10 @@ afterSign: scripts/notarize.js artifactBuildCompleted: scripts/artifact-build-completed.js releaseInfo: releaseNotes: | - 划词助手：支持文本选择快捷键、开关快捷键、思考块支持和引用功能 - 复制功能：新增纯文本复制（去除Markdown格式符号） - 知识库：支持设置向量维度，修复Ollama分数错误和维度编辑问题 - 多语言：增加模型名称多语言提示和翻译源语言手动选择 - 文件管理：修复主题/消息删除时文件未清理问题，优化文件选择流程 - 模型：修复Gemini模型推理预算、Voyage AI嵌入问题和DeepSeek翻译模型更新 - 图像功能：统一图片查看器，支持Base64图片渲染，修复图片预览相关问题 - UI：实现标签折叠/拖拽排序，修复气泡溢出，增加引文索引显示 + 界面优化：优化多处界面样式，气泡样式改版，自动调整代码预览边栏宽度 + 知识库：修复知识库引用不显示问题，修复部分嵌入模型适配问题 + 备份与恢复：修复超过 2GB 大文件无法恢复问题 + 文件处理：添加 .doc 文件支持 + 划词助手：支持自定义 CSS 样式 + MCP：基于 Pyodide 实现 Python MCP 服务 + 其他错误修复和优化 diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 9b22ffc33b..fa4b234a54 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -68,12 +68,16 @@ export default defineConfig({ } }, optimizeDeps: { - exclude: ['pyodide'] + exclude: ['pyodide'], + esbuildOptions: { + target: 'esnext' // for dev + } }, worker: { format: 'es' }, build: { + target: 'esnext', // for build rollupOptions: { input: { index: resolve(__dirname, 'src/renderer/index.html'), diff --git a/package.json b/package.json index 67cb221c4e..0bfc8c30bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CherryStudio", - "version": "1.4.2", + "version": "1.4.7", "private": true, "description": "A powerful AI assistant for producer.", "main": "./out/main/index.js", @@ -62,7 +62,9 @@ "@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", + "opendal": "0.47.11", "os-proxy-config": "^1.1.2", "selection-hook": "^0.9.23", "turndown": "7.2.0" @@ -123,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", @@ -132,12 +135,13 @@ "@vitest/ui": "^3.1.4", "@vitest/web-worker": "^3.1.4", "@xyflow/react": "^12.4.4", - "antd": "^5.22.5", + "antd": "patch:antd@npm%3A5.24.7#~/.yarn/patches/antd-npm-5.24.7-356a553ae5.patch", "archiver": "^7.0.1", "async-mutex": "^0.5.0", "axios": "^1.7.3", "browser-image-compression": "^2.0.2", "color": "^5.0.0", + "country-flag-emoji-polyfill": "0.1.8", "dayjs": "^1.11.11", "dexie": "^4.0.8", "dexie-react-hooks": "^1.1.7", @@ -177,7 +181,6 @@ "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", @@ -191,7 +194,7 @@ "react-hotkeys-hook": "^4.6.1", "react-i18next": "^14.1.2", "react-infinite-scroll-component": "^6.1.0", - "react-markdown": "^9.0.1", + "react-markdown": "^10.1.0", "react-redux": "^9.1.2", "react-router": "^7.6.2", "react-router-dom": "^7.6.2", @@ -200,10 +203,10 @@ "redux": "^5.0.1", "redux-persist": "^6.0.0", "rehype-katex": "^7.0.1", - "rehype-mathjax": "^7.0.0", + "rehype-mathjax": "^7.1.0", "rehype-raw": "^7.0.0", - "remark-cjk-friendly": "^1.1.0", - "remark-gfm": "^4.0.0", + "remark-cjk-friendly": "^1.2.0", + "remark-gfm": "^4.0.1", "remark-math": "^6.0.0", "remove-markdown": "^0.6.2", "rollup-plugin-visualizer": "^5.12.0", @@ -213,12 +216,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 eee8f6d740..0d90b41c0e 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..2ed5dbc7cc 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 const defaultTimeout = 5 * 1000 * 60 + +export enum UpgradeChannel { + LATEST = 'latest', // 最新稳定版本 + RC = 'rc', // 公测版本 + BETA = 'beta' // 预览版本 +} + +export const defaultTimeout = 10 * 1000 * 60 + +export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network'] diff --git a/packages/shared/config/languages.ts b/packages/shared/config/languages.ts new file mode 100644 index 0000000000..4cd7d533b4 --- /dev/null +++ b/packages/shared/config/languages.ts @@ -0,0 +1,2904 @@ +/** + * 代码语言扩展名列表 + */ + +type LanguageData = { + type: string + aliases?: string[] + extensions?: string[] +} + +export const languages: 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
}>`
@@ -241,6 +244,9 @@ const ContentContainer = styled.div<{
border-radius: inherit;
margin-top: 0;
+ /* gutter 宽度默认值 */
+ --gutter-width: 0.6rem;
+
.shiki {
padding: 1em;
border-radius: inherit;
@@ -250,38 +256,35 @@ const ContentContainer = styled.div<{
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 64a3bb6c02..074616a8b8 100644
--- a/src/renderer/src/components/CodeBlockView/index.tsx
+++ b/src/renderer/src/components/CodeBlockView/index.tsx
@@ -4,7 +4,7 @@ import { CodeTool, CodeToolbar, TOOL_SPECS, useCodeTool } from '@renderer/compon
import { useSettings } from '@renderer/hooks/useSettings'
import { pyodideService } from '@renderer/services/PyodideService'
import { extractTitle } from '@renderer/utils/formats'
-import { isValidPlantUML } from '@renderer/utils/markdown'
+import { getExtensionByLanguage, isValidPlantUML } from '@renderer/utils/markdown'
import dayjs from 'dayjs'
import { CirclePlay, CodeXml, Copy, Download, Eye, Square, SquarePen, SquareSplitHorizontal } from 'lucide-react'
import React, { memo, useCallback, useEffect, useMemo, useState } from 'react'
@@ -67,23 +67,21 @@ const CodeBlockView: React.FC