From 060fcd2ce67ccca74fbc939837449d685382641a Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Thu, 13 Nov 2025 09:55:05 +0800 Subject: [PATCH 01/16] chore: update release notes for v1.7.0-beta.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update releaseNotes in electron-builder.yml with comprehensive changelog - Document inputbar system refactor with scope-based architecture - Include AI SDK provider integration details - Add bug fixes and improvements documentation - Provide bilingual release notes (English/Chinese) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude chore: simplify release notes for v1.7.0-beta.6 - Rewrite release notes to focus on user-facing improvements - Remove technical jargon and developer-specific details - Use clear, user-friendly language for features and fixes - Maintain bilingual support (English/Chinese) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- electron-builder.yml | 56 +++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 9128f4c654..2918179152 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -135,50 +135,42 @@ artifactBuildCompleted: scripts/artifact-build-completed.js releaseInfo: releaseNotes: | - What's New in v1.7.0-beta.5 + What's New in v1.7.0-beta.6 New Features: - - MCPRouter Provider: Added MCPRouter provider integration with token management and server synchronization - - MCP Marketplace: Enhanced MCP server discovery and management with multi-provider marketplace support - - Agent Permission Mode Display: Visual permission mode cards in empty session states - - Assistant Subscription Settings: Added subscription URL management in assistant presets + - Enhanced Input Bar: Completely redesigned input bar with improved responsiveness and functionality + - Better File Handling: Improved drag-and-drop and paste support for images and documents + - Smart Tool Suggestions: Enhanced quick panel with better item selection and keyboard shortcuts Improvements: - - UI Optimization: Sidebar tooltip placement improved on macOS to avoid overlapping window controls - - MCP Server Logos: Display server logos in Agent settings tooling section - - Long Command Handling: Bash command tags now auto-truncate (hover to view full command for commands over 100 chars) - - MCP OAuth Callback: Fixed callback page hanging and added multilingual support (10 languages) - - Error Display: Improved error block display order for better readability - - Plugin Browser: Centered tab alignment for better visual consistency + - Smoother Input Experience: Better auto-resizing and text handling in chat input + - Enhanced AI Performance: Improved connection stability and response speed + - More Reliable File Uploads: Better support for various file types and upload scenarios + - Cleaner Interface: Optimized UI elements for better visual consistency Bug Fixes: - - Fixed Agent sessions not inheriting allowed_tools configuration - - Fixed Gemini endpoint thinking budget spelling error - - Fixed MCP card description text overflow - - Fixed unnecessary message timestamp updates on UI-only state changes - - Updated dependencies: Bun to 1.3.1, uv to 0.9.5 + - Fixed image selection issue when adding custom AI providers + - Fixed file upload problems with certain API configurations + - Fixed input bar responsiveness issues + - Fixed quick panel not working properly in some situations - v1.7.0-beta.5 新特性 + v1.7.0-beta.6 新特性 新功能: - - MCPRouter 提供商：新增 MCPRouter 提供商集成，支持 token 管理和服务器同步 - - MCP 市场：增强 MCP 服务器发现和管理功能，支持多提供商市场 - - Agent 权限模式展示：空会话状态显示可视化权限模式卡片 - - 助手订阅设置：在助手预设中添加订阅 URL 管理功能 + - 增强输入栏：完全重新设计的输入栏，响应更灵敏，功能更强大 + - 更好的文件处理：改进的拖拽和粘贴功能，支持图片和文档 + - 智能工具建议：增强的快速面板，更好的项目选择和键盘快捷键 改进: - - UI 优化：macOS 上侧边栏工具提示位置优化，避免与窗口控制按钮重叠 - - MCP 服务器标志：在 Agent 设置工具部分显示服务器 logo - - 长命令处理：Bash 命令标签自动截断（超过 100 字符时悬停查看完整内容） - - MCP OAuth 回调：修复回调页面挂起问题并添加多语言支持（10 种语言） - - 错误信息展示：改进错误块显示顺序，提高可读性 - - 插件浏览器：标签页居中对齐，视觉效果更统一 + - 更流畅的输入体验：聊天输入框的自动调整和文本处理更佳 + - 增强 AI 性能：改进连接稳定性和响应速度 + - 更可靠的文件上传：更好地支持各种文件类型和上传场景 + - 更简洁的界面：优化 UI 元素，视觉一致性更好 问题修复: - - 修复 Agent 会话未继承 allowed_tools 配置 - - 修复 Gemini 端点 thinking budget 拼写错误 - - 修复 MCP 卡片描述文本溢出问题 - - 修复仅 UI 状态变化时消息时间戳不必要的更新 - - 依赖更新：Bun 升级到 1.3.1，uv 升级到 0.9.5 + - 修复添加自定义 AI 提供商时的图片选择问题 + - 修复某些 API 配置下的文件上传问题 + - 修复输入栏响应性问题 + - 修复快速面板在某些情况下无法正常工作的问题 From 2b5ac5ab51e9191b46b5ddfdfeb358c498e8b929 Mon Sep 17 00:00:00 2001 From: SuYao Date: Thu, 13 Nov 2025 16:09:49 +0800 Subject: [PATCH 02/16] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20AI=20Gateway?= =?UTF-8?q?=20=20Provider=20(#11064)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 添加 AI Gateway 提供者支持，包括配置、类型定义和本地化文本 * fix(i18n): Auto update translations for PR #11064 * fix/typecheck * fix(i18n): Auto update translations for PR #11064 * fix(i18n): Auto update translations for PR #11064 * feat: cerebras * fix: glm * fix: minimax api host --------- Co-authored-by: GitHub Action --- package.json | 2 + src/renderer/src/aiCore/index_new.ts | 17 ++++- .../aiCore/provider/providerInitialization.ts | 15 +++++ src/renderer/src/aiCore/utils/options.ts | 5 +- src/renderer/src/aiCore/utils/reasoning.ts | 8 +++ .../src/assets/images/providers/cerebras.webp | Bin 0 -> 37604 bytes .../src/assets/images/providers/vercel.svg | 1 + src/renderer/src/config/models/default.ts | 23 ++++++- src/renderer/src/config/providers.ts | 58 ++++++++++++++++-- src/renderer/src/i18n/label.ts | 4 +- src/renderer/src/i18n/locales/en-us.json | 2 + src/renderer/src/i18n/locales/zh-cn.json | 2 + src/renderer/src/i18n/locales/zh-tw.json | 2 + src/renderer/src/i18n/translate/de-de.json | 2 + src/renderer/src/i18n/translate/el-gr.json | 2 + src/renderer/src/i18n/translate/es-es.json | 2 + src/renderer/src/i18n/translate/fr-fr.json | 2 + src/renderer/src/i18n/translate/ja-jp.json | 2 + src/renderer/src/i18n/translate/pt-pt.json | 2 + src/renderer/src/i18n/translate/ru-ru.json | 2 + .../ProviderSettings/ProviderSetting.tsx | 33 +++++----- src/renderer/src/store/index.ts | 2 +- src/renderer/src/store/migrate.ts | 17 +++++ src/renderer/src/types/provider.ts | 7 ++- src/renderer/src/types/sdk.ts | 1 + yarn.lock | 55 ++++++++++++++++- 26 files changed, 236 insertions(+), 32 deletions(-) create mode 100644 src/renderer/src/assets/images/providers/cerebras.webp create mode 100644 src/renderer/src/assets/images/providers/vercel.svg diff --git a/package.json b/package.json index a207b9d8aa..fccb139449 100644 --- a/package.json +++ b/package.json @@ -107,6 +107,8 @@ "@agentic/searxng": "^7.3.3", "@agentic/tavily": "^7.3.3", "@ai-sdk/amazon-bedrock": "^3.0.53", + "@ai-sdk/cerebras": "^1.0.31", + "@ai-sdk/gateway": "^2.0.9", "@ai-sdk/google-vertex": "^3.0.62", "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.8#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch", "@ai-sdk/mistral": "^2.0.23", diff --git a/src/renderer/src/aiCore/index_new.ts b/src/renderer/src/aiCore/index_new.ts index 800d2ff302..434b2322cd 100644 --- a/src/renderer/src/aiCore/index_new.ts +++ b/src/renderer/src/aiCore/index_new.ts @@ -7,16 +7,17 @@ * 2. 暂时保持接口兼容性 */ +import type { GatewayLanguageModelEntry } from '@ai-sdk/gateway' import { createExecutor } from '@cherrystudio/ai-core' import { loggerService } from '@logger' import { getEnableDeveloperMode } from '@renderer/hooks/useSettings' import { addSpan, endSpan } from '@renderer/services/SpanManagerService' import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity' -import type { Assistant, GenerateImageParams, Model, Provider } from '@renderer/types' +import { type Assistant, type GenerateImageParams, type Model, type Provider, SystemProviderIds } from '@renderer/types' import type { AiSdkModel, StreamTextParams } from '@renderer/types/aiCoreTypes' import { SUPPORTED_IMAGE_ENDPOINT_LIST } from '@renderer/utils' import { buildClaudeCodeSystemModelMessage } from '@shared/anthropic' -import { type ImageModel, type LanguageModel, type Provider as AiSdkProvider, wrapLanguageModel } from 'ai' +import { gateway, type ImageModel, type LanguageModel, type Provider as AiSdkProvider, wrapLanguageModel } from 'ai' import AiSdkToChunkAdapter from './chunk/AiSdkToChunkAdapter' import LegacyAiProvider from './legacy/index' @@ -439,6 +440,18 @@ export default class ModernAiProvider { // 代理其他方法到原有实现 public async models() { + if (this.actualProvider.id === SystemProviderIds['ai-gateway']) { + const formatModel = function (models: GatewayLanguageModelEntry[]): Model[] { + return models.map((m) => ({ + id: m.id, + name: m.name, + provider: 'gateway', + group: m.id.split('/')[0], + description: m.description ?? undefined + })) + } + return formatModel((await gateway.getAvailableModels()).models) + } return this.legacyProvider.models() } diff --git a/src/renderer/src/aiCore/provider/providerInitialization.ts b/src/renderer/src/aiCore/provider/providerInitialization.ts index 665f2bd05c..baf400508a 100644 --- a/src/renderer/src/aiCore/provider/providerInitialization.ts +++ b/src/renderer/src/aiCore/provider/providerInitialization.ts @@ -71,6 +71,21 @@ export const NEW_PROVIDER_CONFIGS: ProviderConfig[] = [ creatorFunctionName: 'createHuggingFace', supportsImageGeneration: true, aliases: ['hf', 'hugging-face'] + }, + { + id: 'ai-gateway', + name: 'AI Gateway', + import: () => import('@ai-sdk/gateway'), + creatorFunctionName: 'createGateway', + supportsImageGeneration: true, + aliases: ['gateway'] + }, + { + id: 'cerebras', + name: 'Cerebras', + import: () => import('@ai-sdk/cerebras'), + creatorFunctionName: 'createCerebras', + supportsImageGeneration: false } ] as const diff --git a/src/renderer/src/aiCore/utils/options.ts b/src/renderer/src/aiCore/utils/options.ts index 9e296597c2..88f556438b 100644 --- a/src/renderer/src/aiCore/utils/options.ts +++ b/src/renderer/src/aiCore/utils/options.ts @@ -151,11 +151,12 @@ export function buildProviderOptions( ...providerSpecificOptions, ...getCustomParameters(assistant) } - // vertex需要映射到google或anthropic + const rawProviderKey = { 'google-vertex': 'google', - 'google-vertex-anthropic': 'anthropic' + 'google-vertex-anthropic': 'anthropic', + 'ai-gateway': 'gateway' }[rawProviderId] || rawProviderId // 返回 AI Core SDK 要求的格式：{ 'providerId': providerOptions } diff --git a/src/renderer/src/aiCore/utils/reasoning.ts b/src/renderer/src/aiCore/utils/reasoning.ts index 1d7123a47b..d0b6f1df25 100644 --- a/src/renderer/src/aiCore/utils/reasoning.ts +++ b/src/renderer/src/aiCore/utils/reasoning.ts @@ -109,6 +109,11 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin // use thinking, doubao, zhipu, etc. if (isSupportedThinkingTokenDoubaoModel(model) || isSupportedThinkingTokenZhipuModel(model)) { + if (provider.id === SystemProviderIds.cerebras) { + return { + disable_reasoning: true + } + } return { thinking: { type: 'disabled' } } } @@ -306,6 +311,9 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin return {} } if (isSupportedThinkingTokenZhipuModel(model)) { + if (provider.id === SystemProviderIds.cerebras) { + return {} + } return { thinking: { type: 'enabled' } } } diff --git a/src/renderer/src/assets/images/providers/cerebras.webp b/src/renderer/src/assets/images/providers/cerebras.webp new file mode 100644 index 0000000000000000000000000000000000000000..1c21b6ff269148005f01ad0f72a75d513bf512be GIT binary patch literal 37604 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ⅈuWjRk;4g_5=>!rTv>1? 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 \ No newline at end of file diff --git a/src/renderer/src/config/models/default.ts b/src/renderer/src/config/models/default.ts index a56ea7f6cb..ea149d3799 100644 --- a/src/renderer/src/config/models/default.ts +++ b/src/renderer/src/config/models/default.ts @@ -1840,5 +1840,26 @@ export const SYSTEM_MODELS: Record = group: 'LongCat' } ], - huggingface: [] + huggingface: [], + 'ai-gateway': [], + cerebras: [ + { + id: 'gpt-oss-120b', + name: 'GPT oss 120B', + provider: 'cerebras', + group: 'openai' + }, + { + id: 'zai-glm-4.6', + name: 'GLM 4.6', + provider: 'cerebras', + group: 'zai' + }, + { + id: 'qwen-3-235b-a22b-instruct-2507', + name: 'Qwen 3 235B A22B Instruct', + provider: 'cerebras', + group: 'qwen' + } + ] } diff --git a/src/renderer/src/config/providers.ts b/src/renderer/src/config/providers.ts index 50b0dbaece..04ef107d14 100644 --- a/src/renderer/src/config/providers.ts +++ b/src/renderer/src/config/providers.ts @@ -12,6 +12,7 @@ import BaiduCloudProviderLogo from '@renderer/assets/images/providers/baidu-clou import BailianProviderLogo from '@renderer/assets/images/providers/bailian.png' import BurnCloudProviderLogo from '@renderer/assets/images/providers/burncloud.png' import CephalonProviderLogo from '@renderer/assets/images/providers/cephalon.jpeg' +import CerebrasProviderLogo from '@renderer/assets/images/providers/cerebras.webp' import CherryInProviderLogo from '@renderer/assets/images/providers/cherryin.png' import DeepSeekProviderLogo from '@renderer/assets/images/providers/deepseek.png' import DmxapiProviderLogo from '@renderer/assets/images/providers/DMXAPI.png' @@ -51,6 +52,7 @@ import StepProviderLogo from '@renderer/assets/images/providers/step.png' import TencentCloudProviderLogo from '@renderer/assets/images/providers/tencent-cloud-ti.png' import TogetherProviderLogo from '@renderer/assets/images/providers/together.png' import TokenFluxProviderLogo from '@renderer/assets/images/providers/tokenflux.png' +import AIGatewayProviderLogo from '@renderer/assets/images/providers/vercel.svg' import VertexAIProviderLogo from '@renderer/assets/images/providers/vertexai.svg' import BytedanceProviderLogo from '@renderer/assets/images/providers/volcengine.png' import VoyageAIProviderLogo from '@renderer/assets/images/providers/voyageai.png' @@ -470,7 +472,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record = name: 'MiniMax', type: 'openai', apiKey: '', - apiHost: 'https://api.minimax.chat/v1/', + apiHost: 'https://api.minimax.com/v1/', models: SYSTEM_MODELS.minimax, isSystem: true, enabled: false @@ -675,6 +677,26 @@ export const SYSTEM_PROVIDERS_CONFIG: Record = models: [], isSystem: true, enabled: false + }, + 'ai-gateway': { + id: 'ai-gateway', + name: 'AI Gateway', + type: 'ai-gateway', + apiKey: '', + apiHost: 'https://ai-gateway.vercel.sh/v1', + models: [], + isSystem: true, + enabled: false + }, + cerebras: { + id: 'cerebras', + name: 'Cerebras AI', + type: 'openai', + apiKey: '', + apiHost: 'https://api.cerebras.ai/v1', + models: SYSTEM_MODELS.cerebras, + isSystem: true, + enabled: false } } as const @@ -741,7 +763,9 @@ export const PROVIDER_LOGO_MAP: AtLeast = { aionly: AiOnlyProviderLogo, longcat: LongCatProviderLogo, huggingface: HuggingfaceProviderLogo, - sophnet: SophnetProviderLogo + sophnet: SophnetProviderLogo, + 'ai-gateway': AIGatewayProviderLogo, + cerebras: CerebrasProviderLogo } as const export function getProviderLogo(providerId: string) { @@ -1048,7 +1072,7 @@ export const PROVIDER_URLS: Record = { }, minimax: { api: { - url: 'https://api.minimax.chat/v1/' + url: 'https://api.minimax.com/v1/' }, websites: { official: 'https://platform.minimaxi.com/', @@ -1390,6 +1414,28 @@ export const PROVIDER_URLS: Record = { docs: 'https://huggingface.co/docs', models: 'https://huggingface.co/models' } + }, + 'ai-gateway': { + api: { + url: 'https://ai-gateway.vercel.sh/v1/ai' + }, + websites: { + official: 'https://vercel.com/ai-gateway', + apiKey: 'https://vercel.com/', + docs: 'https://vercel.com/docs/ai-gateway', + models: 'https://vercel.com/ai-gateway/models' + } + }, + cerebras: { + api: { + url: 'https://api.cerebras.ai/v1' + }, + websites: { + official: 'https://www.cerebras.ai', + apiKey: 'https://cloud.cerebras.ai', + docs: 'https://inference-docs.cerebras.ai/introduction', + models: 'https://inference-docs.cerebras.ai/models/overview' + } } } @@ -1452,7 +1498,7 @@ export const isSupportEnableThinkingProvider = (provider: Provider) => { ) } -const NOT_SUPPORT_SERVICE_TIER_PROVIDERS = ['github', 'copilot'] as const satisfies SystemProviderId[] +const NOT_SUPPORT_SERVICE_TIER_PROVIDERS = ['github', 'copilot', 'cerebras'] as const satisfies SystemProviderId[] /** * 判断提供商是否支持 service_tier 设置。 Only for OpenAI API. @@ -1519,6 +1565,10 @@ export function isGeminiProvider(provider: Provider): boolean { return provider.type === 'gemini' } +export function isAIGatewayProvider(provider: Provider): boolean { + return provider.type === 'ai-gateway' +} + const NOT_SUPPORT_API_VERSION_PROVIDERS = ['github', 'copilot', 'perplexity'] as const satisfies SystemProviderId[] export const isSupportAPIVersionProvider = (provider: Provider) => { diff --git a/src/renderer/src/i18n/label.ts b/src/renderer/src/i18n/label.ts index f8806359d4..f657fd0e08 100644 --- a/src/renderer/src/i18n/label.ts +++ b/src/renderer/src/i18n/label.ts @@ -86,7 +86,9 @@ const providerKeyMap = { aionly: 'provider.aionly', longcat: 'provider.longcat', huggingface: 'provider.huggingface', - sophnet: 'provider.sophnet' + sophnet: 'provider.sophnet', + 'ai-gateway': 'provider.ai-gateway', + cerebras: 'provider.cerebras' } as const /** diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 277598c9ef..1d41d6964e 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "AI Gateway", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "Alibaba Cloud", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 7c5c9b8e3a..f12efbaba5 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "AI Gateway", "aihubmix": "AiHubMix", "aionly": "唯一AI (AiOnly)", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "百度云千帆", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "阿里云百炼", diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index 364ccf573e..c3420c4b38 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "AI 閘道器", "aihubmix": "AiHubMix", "aionly": "唯一AI (AiOnly)", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "百度雲千帆", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "阿里雲百鍊", diff --git a/src/renderer/src/i18n/translate/de-de.json b/src/renderer/src/i18n/translate/de-de.json index 9b51fd3a6a..fbf7f04956 100644 --- a/src/renderer/src/i18n/translate/de-de.json +++ b/src/renderer/src/i18n/translate/de-de.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "KI-Gateway", "aihubmix": "AiHubMix", "aionly": "Einzige KI (AiOnly)", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud Qianfan", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "Alibaba Cloud Bailian", diff --git a/src/renderer/src/i18n/translate/el-gr.json b/src/renderer/src/i18n/translate/el-gr.json index 00ec9dd9aa..1ea17fc20c 100644 --- a/src/renderer/src/i18n/translate/el-gr.json +++ b/src/renderer/src/i18n/translate/el-gr.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "Πύλη Τεχνητής Νοημοσύνης", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud Qianfan", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "AliCloud Bailian", diff --git a/src/renderer/src/i18n/translate/es-es.json b/src/renderer/src/i18n/translate/es-es.json index d17b42cbd6..4cd8f8ad1b 100644 --- a/src/renderer/src/i18n/translate/es-es.json +++ b/src/renderer/src/i18n/translate/es-es.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "Puerta de enlace de IA", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Nube Qiánfān", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copiloto", "dashscope": "Álibaba Nube BaiLiàn", diff --git a/src/renderer/src/i18n/translate/fr-fr.json b/src/renderer/src/i18n/translate/fr-fr.json index f08e127db9..b0a0f0ef49 100644 --- a/src/renderer/src/i18n/translate/fr-fr.json +++ b/src/renderer/src/i18n/translate/fr-fr.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "Passerelle IA", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud Qianfan", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilote", "dashscope": "AliCloud BaiLian", diff --git a/src/renderer/src/i18n/translate/ja-jp.json b/src/renderer/src/i18n/translate/ja-jp.json index 3fa82cbd57..57c87ffde2 100644 --- a/src/renderer/src/i18n/translate/ja-jp.json +++ b/src/renderer/src/i18n/translate/ja-jp.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "AIゲートウェイ", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "Alibaba Cloud", diff --git a/src/renderer/src/i18n/translate/pt-pt.json b/src/renderer/src/i18n/translate/pt-pt.json index c3431cac53..b8934b3f06 100644 --- a/src/renderer/src/i18n/translate/pt-pt.json +++ b/src/renderer/src/i18n/translate/pt-pt.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "Gateway de IA", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Nuvem Baidu", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copiloto", "dashscope": "Área de Atuação AliCloud", diff --git a/src/renderer/src/i18n/translate/ru-ru.json b/src/renderer/src/i18n/translate/ru-ru.json index e14352886d..5b66ef559a 100644 --- a/src/renderer/src/i18n/translate/ru-ru.json +++ b/src/renderer/src/i18n/translate/ru-ru.json @@ -2484,6 +2484,7 @@ }, "provider": { "302ai": "302.AI", + "ai-gateway": "AI-шлюз", "aihubmix": "AiHubMix", "aionly": "AiOnly", "alayanew": "Alaya NeW", @@ -2494,6 +2495,7 @@ "baidu-cloud": "Baidu Cloud", "burncloud": "BurnCloud", "cephalon": "Cephalon", + "cerebras": "Cerebras AI", "cherryin": "CherryIN", "copilot": "GitHub Copilot", "dashscope": "Alibaba Cloud", diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx index 3f8743b66e..f135d83e40 100644 --- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx +++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx @@ -5,6 +5,7 @@ import { ApiKeyListPopup } from '@renderer/components/Popups/ApiKeyListPopup' import Selector from '@renderer/components/Selector' import { isEmbeddingModel, isRerankModel } from '@renderer/config/models' import { + isAIGatewayProvider, isAnthropicProvider, isAzureOpenAIProvider, isGeminiProvider, @@ -305,6 +306,9 @@ const ProviderSetting: FC = ({ providerId }) => { if (isVertexProvider(provider)) { return formatVertexApiHost(provider) + '/publishers/google' } + if (isAIGatewayProvider(provider)) { + return formatApiHost(apiHost) + '/language-model' + } return formatApiHost(apiHost) } @@ -520,24 +524,17 @@ const ProviderSetting: FC = ({ providerId }) => { {t('settings.provider.vertex_ai.api_host_help')} )} - {(isOpenAICompatibleProvider(provider) || - isAzureOpenAIProvider(provider) || - isAnthropicProvider(provider) || - isGeminiProvider(provider) || - isVertexProvider(provider) || - isOpenAIProvider(provider)) && ( - - - {t('settings.provider.api_host_preview', { url: hostPreview() })} - - - )} + + + {t('settings.provider.api_host_preview', { url: hostPreview() })} + + )} diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts index d718ba1fc1..4baeeddfde 100644 --- a/src/renderer/src/store/index.ts +++ b/src/renderer/src/store/index.ts @@ -67,7 +67,7 @@ const persistedReducer = persistReducer( { key: 'cherry-studio', storage, - version: 173, + version: 174, blacklist: ['runtime', 'messages', 'messageBlocks', 'tabs', 'toolPermissions'], migrate }, diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 4659f1ce7c..10073de1f3 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -2802,6 +2802,23 @@ const migrateConfig = { logger.error('migrate 173 error', error as Error) return state } + }, + '174': (state: RootState) => { + try { + addProvider(state, SystemProviderIds.longcat) + + addProvider(state, SystemProviderIds['ai-gateway']) + addProvider(state, 'cerebras') + state.llm.providers.forEach((provider) => { + if (provider.id === SystemProviderIds.minimax) { + provider.anthropicApiHost = 'https://api.minimaxi.com/anthropic' + } + }) + return state + } catch (error) { + logger.error('migrate 174 error', error as Error) + return state + } } } diff --git a/src/renderer/src/types/provider.ts b/src/renderer/src/types/provider.ts index b7d669e1f2..5bd605007e 100644 --- a/src/renderer/src/types/provider.ts +++ b/src/renderer/src/types/provider.ts @@ -11,7 +11,8 @@ export const ProviderTypeSchema = z.enum([ 'mistral', 'aws-bedrock', 'vertex-anthropic', - 'new-api' + 'new-api', + 'ai-gateway' ]) export type ProviderType = z.infer @@ -176,7 +177,9 @@ export const SystemProviderIds = { poe: 'poe', aionly: 'aionly', longcat: 'longcat', - huggingface: 'huggingface' + huggingface: 'huggingface', + 'ai-gateway': 'ai-gateway', + cerebras: 'cerebras' } as const export type SystemProviderId = keyof typeof SystemProviderIds diff --git a/src/renderer/src/types/sdk.ts b/src/renderer/src/types/sdk.ts index 90a0101563..66e6b3627a 100644 --- a/src/renderer/src/types/sdk.ts +++ b/src/renderer/src/types/sdk.ts @@ -97,6 +97,7 @@ export type ReasoningEffortOptionalParams = { } } } + disable_reasoning?: boolean // Add any other potential reasoning-related keys here if they exist } diff --git a/yarn.lock b/yarn.lock index 93aa3cbbfb..d06f134acd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -127,6 +127,19 @@ __metadata: languageName: node linkType: hard +"@ai-sdk/cerebras@npm:^1.0.31": + version: 1.0.31 + resolution: "@ai-sdk/cerebras@npm:1.0.31" + dependencies: + "@ai-sdk/openai-compatible": "npm:1.0.27" + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/0723f0041b767acfb7a9d903d51d5c95af83c31c89b83f242cb5c02a076d8b98f6567334eb32dcdbc8565b55ded2aa5195ca68612bbe7b13e68253cf4ef412d6 + languageName: node + linkType: hard + "@ai-sdk/deepseek@npm:^1.0.27": version: 1.0.27 resolution: "@ai-sdk/deepseek@npm:1.0.27" @@ -153,6 +166,19 @@ __metadata: languageName: node linkType: hard +"@ai-sdk/gateway@npm:^2.0.9": + version: 2.0.9 + resolution: "@ai-sdk/gateway@npm:2.0.9" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + "@vercel/oidc": "npm:3.0.3" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/840f94795b96c0fa6e73897ea8dba95fc78af1f8482f3b7d8439b6233b4f4de6979a8b67206f4bbf32649baf2acfb1153a46792dfa20259ca9f5fd214fb25fa5 + languageName: node + linkType: hard + "@ai-sdk/google-vertex@npm:^3.0.62": version: 3.0.62 resolution: "@ai-sdk/google-vertex@npm:3.0.62" @@ -242,6 +268,18 @@ __metadata: languageName: node linkType: hard +"@ai-sdk/openai-compatible@npm:1.0.27": + version: 1.0.27 + resolution: "@ai-sdk/openai-compatible@npm:1.0.27" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/9f656e4f2ea4d714dc05be588baafd962b2e0360e9195fef373e745efeb20172698ea87e1033c0c5e1f1aa6e0db76a32629427bc8433eb42bd1a0ee00e04af0c + languageName: node + linkType: hard + "@ai-sdk/openai-compatible@npm:^1.0.19": version: 1.0.19 resolution: "@ai-sdk/openai-compatible@npm:1.0.19" @@ -316,7 +354,7 @@ __metadata: languageName: node linkType: hard -"@ai-sdk/provider-utils@npm:3.0.17, @ai-sdk/provider-utils@npm:^3.0.10, @ai-sdk/provider-utils@npm:^3.0.12": +"@ai-sdk/provider-utils@npm:3.0.17, @ai-sdk/provider-utils@npm:^3.0.10": version: 3.0.17 resolution: "@ai-sdk/provider-utils@npm:3.0.17" dependencies: @@ -329,6 +367,19 @@ __metadata: languageName: node linkType: hard +"@ai-sdk/provider-utils@npm:^3.0.12": + version: 3.0.12 + resolution: "@ai-sdk/provider-utils@npm:3.0.12" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@standard-schema/spec": "npm:^1.0.0" + eventsource-parser: "npm:^3.0.5" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/83886bf188cad0cc655b680b710a10413989eaba9ec59dd24a58b985c02a8a1d50ad0f96dd5259385c07592ec3c37a7769fdf4a1ef569a73c9edbdb2cd585915 + languageName: node + linkType: hard + "@ai-sdk/provider@npm:2.0.0, @ai-sdk/provider@npm:^2.0.0": version: 2.0.0 resolution: "@ai-sdk/provider@npm:2.0.0" @@ -9879,6 +9930,8 @@ __metadata: "@agentic/searxng": "npm:^7.3.3" "@agentic/tavily": "npm:^7.3.3" "@ai-sdk/amazon-bedrock": "npm:^3.0.53" + "@ai-sdk/cerebras": "npm:^1.0.31" + "@ai-sdk/gateway": "npm:^2.0.9" "@ai-sdk/google-vertex": "npm:^3.0.62" "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.8#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch" "@ai-sdk/mistral": "npm:^2.0.23" From 4f7d8731eac03a01d17690541db87872b111e330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E4=BA=9A?= <47618005+MapleWithered@users.noreply.github.com> Date: Thu, 13 Nov 2025 17:04:39 +0800 Subject: [PATCH 03/16] fix: correct typo in zh-cn locale (#11270) --- src/renderer/src/i18n/locales/zh-cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index f12efbaba5..a317aa931f 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -904,7 +904,7 @@ "show_line_numbers": "代码显示行号", "temperature": { "label": "模型温度", - "tip": "模型生成文本的随机程度。值越大，回复内容越赋有多样性、创造性、随机性；设为 0 根据事实回答。日常聊天建议设置为 0.7" + "tip": "模型生成文本的随机程度。值越大，回复内容越富有多样性、创造性、随机性；设为 0 根据事实回答。日常聊天建议设置为 0.7" }, "thought_auto_collapse": { "label": "思考内容自动折叠", From d6e7ce330e77e11ea1e9b82ad8e41425ce91d033 Mon Sep 17 00:00:00 2001 From: defi-failure <159208748+defi-failure@users.noreply.github.com> Date: Thu, 13 Nov 2025 18:22:00 +0800 Subject: [PATCH 04/16] feat: move error response to top and enlarge window for easier debugging (#11169) --- .../pages/home/Messages/Blocks/ErrorBlock.tsx | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx index f3ed182aee..b8d1950df7 100644 --- a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx +++ b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx @@ -207,14 +207,15 @@ const ErrorDetailModal: React.FC = ({ open, onClose, erro {t('common.close')} ]} - width={600}> + width="80%" + style={{ maxWidth: '1200px', minWidth: '600px' }}> {renderErrorDetails(error)} ) } const ErrorDetailContainer = styled.div` - max-height: 400px; + max-height: 60vh; overflow-y: auto; ` @@ -347,16 +348,8 @@ const AiSdkError = ({ error }: { error: SerializedAiSdkErrorUnion }) => { return ( - - {(isSerializedAiSdkAPICallError(error) || isSerializedAiSdkDownloadError(error)) && ( <> - {error.statusCode && ( - - {t('error.statusCode')}: - {error.statusCode} - - )} {error.url && ( {t('error.requestUrl')}: @@ -374,12 +367,27 @@ const AiSdkError = ({ error }: { error: SerializedAiSdkErrorUnion }) => { )} + + )} - {error.requestBodyValues && ( + {(isSerializedAiSdkAPICallError(error) || isSerializedAiSdkDownloadError(error)) && ( + <> + {error.statusCode && ( - {t('error.requestBodyValues')}: + {t('error.statusCode')}: + {error.statusCode} + + )} + + )} + + {isSerializedAiSdkAPICallError(error) && ( + <> + {error.responseHeaders && ( + + {t('error.responseHeaders')}: { )} - {error.responseHeaders && ( + {error.requestBodyValues && ( - {t('error.responseHeaders')}: + {t('error.requestBodyValues')}: { {error.functionality} )} + + ) } From 45fc6c2afde7ee81e35afe80376528acd9e4c2aa Mon Sep 17 00:00:00 2001 From: Phantom Date: Fri, 14 Nov 2025 10:55:41 +0800 Subject: [PATCH 05/16] fix: minimax new api host & anthropic api support (#11269) * feat(models): add MiniMax M2 models to default configuration * fix(config): update minimax api host and add anthropic host Update the API endpoint for MiniMax provider and add a new endpoint for Anthropic integration * feat: add minimax to ANTHROPIC_COMPATIBLE_PROVIDER_IDS * docs(ProviderSetting): add todo comment for reset button * fix(store): update minimax provider config in migration 174 Add anthropicApiHost to minimax provider configuration during state migration * fix(store): revert version and remove unused migration Remove migration for version 175 and revert persisted reducer version to 174 --- src/renderer/src/config/models/default.ts | 12 ++++++++++++ src/renderer/src/config/providers.ts | 5 +++-- .../settings/ProviderSettings/ProviderSetting.tsx | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/config/models/default.ts b/src/renderer/src/config/models/default.ts index ea149d3799..3adf0da53d 100644 --- a/src/renderer/src/config/models/default.ts +++ b/src/renderer/src/config/models/default.ts @@ -1003,6 +1003,18 @@ export const SYSTEM_MODELS: Record = provider: 'minimax', name: 'minimax-01', group: 'minimax-01' + }, + { + id: 'MiniMax-M2', + provider: 'minimax', + name: 'MiniMax M2', + group: 'minimax-m2' + }, + { + id: 'MiniMax-M2-Stable', + provider: 'minimax', + name: 'MiniMax M2 Stable', + group: 'minimax-m2' } ], hyperbolic: [ diff --git a/src/renderer/src/config/providers.ts b/src/renderer/src/config/providers.ts index 04ef107d14..965c620ba9 100644 --- a/src/renderer/src/config/providers.ts +++ b/src/renderer/src/config/providers.ts @@ -472,7 +472,8 @@ export const SYSTEM_PROVIDERS_CONFIG: Record = name: 'MiniMax', type: 'openai', apiKey: '', - apiHost: 'https://api.minimax.com/v1/', + apiHost: 'https://api.minimaxi.com/v1', + anthropicApiHost: 'https://api.minimaxi.com/anthropic', models: SYSTEM_MODELS.minimax, isSystem: true, enabled: false @@ -1072,7 +1073,7 @@ export const PROVIDER_URLS: Record = { }, minimax: { api: { - url: 'https://api.minimax.com/v1/' + url: 'https://api.minimaxi.com/v1/' }, websites: { official: 'https://platform.minimaxi.com/', diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx index f135d83e40..cdd71936fb 100644 --- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx +++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx @@ -81,7 +81,8 @@ const ANTHROPIC_COMPATIBLE_PROVIDER_IDS = [ SystemProviderIds.aihubmix, SystemProviderIds.grok, SystemProviderIds.cherryin, - SystemProviderIds.longcat + SystemProviderIds.longcat, + SystemProviderIds.minimax ] as const type AnthropicCompatibleProviderId = (typeof ANTHROPIC_COMPATIBLE_PROVIDER_IDS)[number] @@ -547,6 +548,7 @@ const ProviderSetting: FC = ({ providerId }) => { onChange={(e) => setAnthropicHost(e.target.value)} onBlur={onUpdateAnthropicHost} /> + {/* TODO: Add a reset button here. */} From b08aecb22bc7547c86fa01b2d0666f1948fb35dd Mon Sep 17 00:00:00 2001 From: Pleasure1234 <3196812536@qq.com> Date: Fri, 14 Nov 2025 03:37:19 +0000 Subject: [PATCH 06/16] fix: enable numeric sorting for note names (#11261) Updated the sorting logic in getSorter to use the 'numeric' option in localeCompare for all name-based sorts. This ensures that note names containing numbers are sorted in a more natural, human-friendly order. --- src/renderer/src/services/NotesService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/services/NotesService.ts b/src/renderer/src/services/NotesService.ts index 4cd73d12dd..940c8db106 100644 --- a/src/renderer/src/services/NotesService.ts +++ b/src/renderer/src/services/NotesService.ts @@ -128,9 +128,9 @@ export async function uploadNotes(files: File[], targetPath: string): Promise number { switch (sortType) { case 'sort_a2z': - return (a, b) => a.name.localeCompare(b.name, undefined, { sensitivity: 'accent' }) + return (a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'accent' }) case 'sort_z2a': - return (a, b) => b.name.localeCompare(a.name, undefined, { sensitivity: 'accent' }) + return (a, b) => b.name.localeCompare(a.name, undefined, { numeric: true, sensitivity: 'accent' }) case 'sort_updated_desc': return (a, b) => getTime(b.updatedAt) - getTime(a.updatedAt) case 'sort_updated_asc': @@ -140,7 +140,7 @@ function getSorter(sortType: NotesSortType): (a: NotesTreeNode, b: NotesTreeNode case 'sort_created_asc': return (a, b) => getTime(a.createdAt) - getTime(b.createdAt) default: - return (a, b) => a.name.localeCompare(b.name) + return (a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'accent' }) } } From 35aa9d7355a0a8a99777815f565dd6c4e97b74ce Mon Sep 17 00:00:00 2001 From: Phantom Date: Fri, 14 Nov 2025 11:45:10 +0800 Subject: [PATCH 07/16] fix: Incorrect navigation when creating new message with @ (#10930) * fix(message): Incorrect navigation when creating new message with @ Update variable name from newAssistantStub to newAssistantMessageStub for clarity Add dispatch calls to update message folding state Remove unused message length tracking effect in MessageGroup Fixes #10928 * refactor(MessageGroup): remove unused prevMessageLengthRef variable --- .../src/pages/home/Messages/MessageGroup.tsx | 27 +++---------------- src/renderer/src/store/thunk/messageThunk.ts | 13 ++++++--- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/renderer/src/pages/home/Messages/MessageGroup.tsx b/src/renderer/src/pages/home/Messages/MessageGroup.tsx index 8b4c35e103..0f5a7e83f7 100644 --- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx +++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx @@ -11,7 +11,7 @@ import type { Topic } from '@renderer/types' import type { Message } from '@renderer/types/newMessage' import { classNames } from '@renderer/utils' import { Popover } from 'antd' -import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' +import { ComponentProps, memo, useCallback, useEffect, useMemo, useState } from 'react' import styled from 'styled-components' import { useChatMaxWidth } from '../Chat' @@ -43,9 +43,6 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => { ) const [selectedIndex, setSelectedIndex] = useState(messageLength - 1) - // Refs - const prevMessageLengthRef = useRef(messageLength) - // 对于单模型消息，采用简单的样式，避免 overflow 影响内部的 sticky 效果 const multiModelMessageStyle = useMemo( () => (messageLength < 2 ? 'fold' : _multiModelMessageStyle), @@ -83,24 +80,6 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => { }, [editMessage, selectedMessageId, setTimeoutTimer] ) - - useEffect(() => { - if (messageLength > prevMessageLengthRef.current) { - setSelectedIndex(messageLength - 1) - const lastMessage = messages[messageLength - 1] - if (lastMessage) { - setSelectedMessage(lastMessage) - } - } else { - const newIndex = messages.findIndex((msg) => msg.id === selectedMessageId) - if (newIndex !== -1) { - setSelectedIndex(newIndex) - } - } - prevMessageLengthRef.current = messageLength - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [messageLength]) - // 添加对流程图节点点击事件的监听 useEffect(() => { // 只在组件挂载和消息数组变化时添加监听器 @@ -223,7 +202,7 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => { message, topic, index: message.index - } + } satisfies ComponentProps const messageContent = ( { isGrouped, topic, multiModelMessageStyle, - messages.length, + messages, selectedMessageId, onUpdateUseful, groupContextMessageId, diff --git a/src/renderer/src/store/thunk/messageThunk.ts b/src/renderer/src/store/thunk/messageThunk.ts index 665127e603..c9b33eea8e 100644 --- a/src/renderer/src/store/thunk/messageThunk.ts +++ b/src/renderer/src/store/thunk/messageThunk.ts @@ -1446,7 +1446,7 @@ export const appendAssistantResponseThunk = } // 2. Create the new assistant message stub - const newAssistantStub = createAssistantMessage(assistant.id, topicId, { + const newAssistantMessageStub = createAssistantMessage(assistant.id, topicId, { askId: askId, // Crucial: Use the original askId model: newModel, modelId: newModel.id, @@ -1459,9 +1459,14 @@ export const appendAssistantResponseThunk = const insertAtIndex = existingMessageIndex !== -1 ? existingMessageIndex + 1 : currentTopicMessageIds.length // 4. Update Database (Save the stub to the topic's message list) - await saveMessageAndBlocksToDB(newAssistantStub, [], insertAtIndex) + await saveMessageAndBlocksToDB(newAssistantMessageStub, [], insertAtIndex) - dispatch(newMessagesActions.insertMessageAtIndex({ topicId, message: newAssistantStub, index: insertAtIndex })) + dispatch( + newMessagesActions.insertMessageAtIndex({ topicId, message: newAssistantMessageStub, index: insertAtIndex }) + ) + + dispatch(updateMessageAndBlocksThunk(topicId, { id: existingAssistantMessageId, foldSelected: false }, [])) + dispatch(updateMessageAndBlocksThunk(topicId, { id: newAssistantMessageStub.id, foldSelected: true }, [])) // 5. Prepare and queue the processing task const assistantConfigForThisCall = { @@ -1475,7 +1480,7 @@ export const appendAssistantResponseThunk = getState, topicId, assistantConfigForThisCall, - newAssistantStub // Pass the newly created stub + newAssistantMessageStub // Pass the newly created stub ) }) } catch (error) { From 75fcf8fbb540962ecc8478e0a521de62ccb03c1f Mon Sep 17 00:00:00 2001 From: Zhaokun Date: Fri, 14 Nov 2025 11:51:18 +0800 Subject: [PATCH 08/16] fix: notes content search next scroll (#10908) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: topic branch incomplete copy - split ID mapping into two passes Fix the bug where topic branching would not copy all message relationships completely.The issue was that askId mapping lookup happened in the same loop as ID generation, causing later messages' askIds to fail mapping when they referenced messages that hadn't been processed yet. Solution: Split into two passes: 1. First pass: Generate new IDs for all messages and build complete mapping 2. Second pass: Clone messages and blocks using the complete ID mapping This ensures all message relationships (especially assistant message askId references)are properly maintained in the new topic. * fix(notes): 保持 Ctrl+F ‘下一个’在编辑器容器内滚动，避免索引提前回到第一条 - 使用传入的滚动容器计算相对偏移并 target.scrollTo 居中 - 容器不可滚动时回退到 scrollIntoView，兼容其他页面 - 将 target 纳入依赖，确保引用最新容器 受影响文件： - src/renderer/src/components/ContentSearch.tsx:165 * fix(search): improve notes content search next-scroll behavior * Update dom.ts --------- Co-authored-by: Pleasurecruise <3196812536@qq.com> --- src/renderer/src/components/ContentSearch.tsx | 12 ++-- src/renderer/src/utils/dom.ts | 55 +++++++++++++++++++ src/renderer/src/utils/index.ts | 1 + 3 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 src/renderer/src/utils/dom.ts diff --git a/src/renderer/src/components/ContentSearch.tsx b/src/renderer/src/components/ContentSearch.tsx index d322f41616..0dd0acb625 100644 --- a/src/renderer/src/components/ContentSearch.tsx +++ b/src/renderer/src/components/ContentSearch.tsx @@ -1,5 +1,6 @@ import { ActionIconButton } from '@renderer/components/Buttons' import NarrowLayout from '@renderer/pages/home/Messages/NarrowLayout' +import { scrollElementIntoView } from '@renderer/utils' import { Tooltip } from 'antd' import { debounce } from 'lodash' import { CaseSensitive, ChevronDown, ChevronUp, User, WholeWord, X } from 'lucide-react' @@ -181,17 +182,14 @@ export const ContentSearch = React.forwardRef( // 3. 将当前项滚动到视图中 // 获取第一个文本节点的父元素来进行滚动 const parentElement = currentMatchRange.startContainer.parentElement - if (shouldScroll) { - parentElement?.scrollIntoView({ - behavior: 'smooth', - block: 'center', - inline: 'nearest' - }) + if (shouldScroll && parentElement) { + // 优先在指定的滚动容器内滚动，避免滚动整个页面导致索引错乱/看起来"跳到第一条" + scrollElementIntoView(parentElement, target) } } } }, - [allRanges, currentIndex] + [allRanges, currentIndex, target] ) const search = useCallback( diff --git a/src/renderer/src/utils/dom.ts b/src/renderer/src/utils/dom.ts new file mode 100644 index 0000000000..6dd09cda5e --- /dev/null +++ b/src/renderer/src/utils/dom.ts @@ -0,0 +1,55 @@ +/** + * Simple wrapper for scrollIntoView with common default options. + * Provides a unified interface with sensible defaults. + * + * @param element - The target element to scroll into view + * @param options - Scroll options. If not provided, uses { behavior: 'smooth', block: 'center', inline: 'nearest' } + */ +export function scrollIntoView(element: HTMLElement, options?: ScrollIntoViewOptions): void { + const defaultOptions: ScrollIntoViewOptions = { + behavior: 'smooth', + block: 'center', + inline: 'nearest' + } + element.scrollIntoView(options ?? defaultOptions) +} + +/** + * Intelligently scrolls an element into view at the center position. + * Prioritizes scrolling within the specified container to avoid scrolling the entire page. + * + * @param element - The target element to scroll into view + * @param scrollContainer - Optional scroll container. If provided and scrollable, scrolling happens within it; otherwise uses browser default scrolling + * @param behavior - Scroll behavior, defaults to 'smooth' + */ +export function scrollElementIntoView( + element: HTMLElement, + scrollContainer?: HTMLElement | null, + behavior: ScrollBehavior = 'smooth' +): void { + if (!scrollContainer) { + // No container specified, use browser default scrolling + scrollIntoView(element, { behavior, block: 'center', inline: 'nearest' }) + return + } + + // Check if container is scrollable + const canScroll = + scrollContainer.scrollHeight > scrollContainer.clientHeight || + scrollContainer.scrollWidth > scrollContainer.clientWidth + + if (canScroll) { + // Container is scrollable, scroll within the container + const containerRect = scrollContainer.getBoundingClientRect() + const elRect = element.getBoundingClientRect() + + // Calculate element's scrollable offset position relative to the container + const elementTopWithinContainer = elRect.top - containerRect.top + scrollContainer.scrollTop + const desiredTop = elementTopWithinContainer - Math.max(0, scrollContainer.clientHeight - elRect.height) / 2 + + scrollContainer.scrollTo({ top: Math.max(0, desiredTop), behavior }) + } else { + // Container is not scrollable, fallback to browser default scrolling + scrollIntoView(element, { behavior, block: 'center', inline: 'nearest' }) + } +} diff --git a/src/renderer/src/utils/index.ts b/src/renderer/src/utils/index.ts index 91d4961ec6..9822c7f536 100644 --- a/src/renderer/src/utils/index.ts +++ b/src/renderer/src/utils/index.ts @@ -214,6 +214,7 @@ export function uniqueObjectArray(array: T[]): T[] { export * from './api' export * from './collection' export * from './dataLimit' +export * from './dom' export * from './file' export * from './image' export * from './json' From 4e699c48bc2fed6b268497bbd57502364d59af69 Mon Sep 17 00:00:00 2001 From: SuYao Date: Fri, 14 Nov 2025 13:10:13 +0800 Subject: [PATCH 09/16] fix: update Azure OpenAI API version references to v1 in configuration and translations (#10799) * fix: update Azure OpenAI API version references to v1 in configuration and translations * fix: support Azure OpenAI API v1 in client compatibility check * fix: lint/ format --- .../aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts | 2 +- src/renderer/src/aiCore/provider/providerConfig.ts | 6 ++++-- src/renderer/src/i18n/locales/en-us.json | 2 +- src/renderer/src/i18n/locales/zh-cn.json | 2 +- src/renderer/src/i18n/locales/zh-tw.json | 2 +- src/renderer/src/i18n/translate/el-gr.json | 2 +- src/renderer/src/i18n/translate/fr-fr.json | 2 +- src/renderer/src/i18n/translate/ja-jp.json | 2 +- src/renderer/src/i18n/translate/pt-pt.json | 2 +- src/renderer/src/i18n/translate/ru-ru.json | 2 +- src/renderer/src/pages/home/Messages/MessageGroup.tsx | 3 ++- 11 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts index b9131be661..40cace50ea 100644 --- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts +++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts @@ -90,7 +90,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient< if (isOpenAILLMModel(model) && !isOpenAIChatCompletionOnlyModel(model)) { if (this.provider.id === 'azure-openai' || this.provider.type === 'azure-openai') { this.provider = { ...this.provider, apiHost: this.formatApiHost() } - if (this.provider.apiVersion === 'preview') { + if (this.provider.apiVersion === 'preview' || this.provider.apiVersion === 'v1') { return this } else { return this.client diff --git a/src/renderer/src/aiCore/provider/providerConfig.ts b/src/renderer/src/aiCore/provider/providerConfig.ts index 4eb1ffeed7..07b4ceaa7d 100644 --- a/src/renderer/src/aiCore/provider/providerConfig.ts +++ b/src/renderer/src/aiCore/provider/providerConfig.ts @@ -189,9 +189,11 @@ export function providerToAiSdkConfig( } } // azure + // https://learn.microsoft.com/en-us/azure/ai-foundry/openai/latest + // https://learn.microsoft.com/en-us/azure/ai-foundry/openai/how-to/responses?tabs=python-key#responses-api if (aiSdkProviderId === 'azure' || actualProvider.type === 'azure-openai') { - // extraOptions.apiVersion = actualProvider.apiVersion 默认使用v1，不使用azure endpoint - if (actualProvider.apiVersion === 'preview') { + // extraOptions.apiVersion = actualProvider.apiVersion === 'preview' ? 'v1' : actualProvider.apiVersion 默认使用v1，不使用azure endpoint + if (actualProvider.apiVersion === 'preview' || actualProvider.apiVersion === 'v1') { extraOptions.mode = 'responses' } else { extraOptions.mode = 'chat' diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 1d41d6964e..47ebef1ffb 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "The API version of Azure OpenAI, if you want to use Response API, please enter the preview version" + "tip": "The API version of Azure OpenAI, if you want to use Response API, please enter the v1 version" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index a317aa931f..aaf337b39e 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Azure OpenAI 的 API 版本，如果想要使用 Response API，请输入 preview 版本" + "tip": "Azure OpenAI 的 API 版本，如果想要使用 Response API，请输入 v1 版本" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index c3420c4b38..fc5516b11f 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Azure OpenAI 的 API 版本，如果想要使用 Response API，請輸入 preview 版本" + "tip": "Azure OpenAI 的 API 版本，如果想要使用 Response API，請輸入 v1 版本" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/translate/el-gr.json b/src/renderer/src/i18n/translate/el-gr.json index 1ea17fc20c..ed87590ce0 100644 --- a/src/renderer/src/i18n/translate/el-gr.json +++ b/src/renderer/src/i18n/translate/el-gr.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Η έκδοση του API για Azure OpenAI. Αν θέλετε να χρησιμοποιήσετε το Response API, εισάγετε μια προεπισκόπηση έκδοσης" + "tip": "Η έκδοση του API για Azure OpenAI. Αν θέλετε να χρησιμοποιήσετε το Response API, εισάγετε μια v1 έκδοσης" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/translate/fr-fr.json b/src/renderer/src/i18n/translate/fr-fr.json index b0a0f0ef49..0c62faf907 100644 --- a/src/renderer/src/i18n/translate/fr-fr.json +++ b/src/renderer/src/i18n/translate/fr-fr.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Version de l'API Azure OpenAI, veuillez saisir une version preview si vous souhaitez utiliser l'API de réponse" + "tip": "Version de l'API Azure OpenAI, veuillez saisir une version v1 si vous souhaitez utiliser l'API de réponse" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/translate/ja-jp.json b/src/renderer/src/i18n/translate/ja-jp.json index 57c87ffde2..d67c26c968 100644 --- a/src/renderer/src/i18n/translate/ja-jp.json +++ b/src/renderer/src/i18n/translate/ja-jp.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Azure OpenAIのAPIバージョン。Response APIを使用する場合は、previewバージョンを入力してください" + "tip": "Azure OpenAIのAPIバージョン。Response APIを使用する場合は、v1バージョンを入力してください" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/translate/pt-pt.json b/src/renderer/src/i18n/translate/pt-pt.json index b8934b3f06..968167906b 100644 --- a/src/renderer/src/i18n/translate/pt-pt.json +++ b/src/renderer/src/i18n/translate/pt-pt.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Versão da API do Azure OpenAI. Se desejar usar a API de Resposta, insira a versão de visualização" + "tip": "Versão da API do Azure OpenAI. Se desejar usar a API de Resposta, insira a versão de v1" } }, "basic_auth": { diff --git a/src/renderer/src/i18n/translate/ru-ru.json b/src/renderer/src/i18n/translate/ru-ru.json index 5b66ef559a..5e60e7247c 100644 --- a/src/renderer/src/i18n/translate/ru-ru.json +++ b/src/renderer/src/i18n/translate/ru-ru.json @@ -4343,7 +4343,7 @@ }, "azure": { "apiversion": { - "tip": "Версия API Azure OpenAI. Если вы хотите использовать Response API, введите версию preview" + "tip": "Версия API Azure OpenAI. Если вы хотите использовать Response API, введите версию v1" } }, "basic_auth": { diff --git a/src/renderer/src/pages/home/Messages/MessageGroup.tsx b/src/renderer/src/pages/home/Messages/MessageGroup.tsx index 0f5a7e83f7..1e1eca27a1 100644 --- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx +++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx @@ -11,7 +11,8 @@ import type { Topic } from '@renderer/types' import type { Message } from '@renderer/types/newMessage' import { classNames } from '@renderer/utils' import { Popover } from 'antd' -import { ComponentProps, memo, useCallback, useEffect, useMemo, useState } from 'react' +import type { ComponentProps } from 'react' +import { memo, useCallback, useEffect, useMemo, useState } from 'react' import styled from 'styled-components' import { useChatMaxWidth } from '../Chat' From a1a3b9bd96571525935379a06f7d550a9a7ae76b Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Fri, 14 Nov 2025 16:52:09 +0800 Subject: [PATCH 10/16] fix: can hide when close the app to tray (#11282) * fix: can hide when close the app to tray * format code * udpate version --- package.json | 4 ++-- src/main/services/WindowService.ts | 17 ++++++++++------- yarn.lock | 18 +++++++++--------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index fccb139449..537d708f9e 100644 --- a/package.json +++ b/package.json @@ -259,7 +259,7 @@ "dotenv-cli": "^7.4.2", "drizzle-kit": "^0.31.4", "drizzle-orm": "^0.44.5", - "electron": "38.4.0", + "electron": "38.7.0", "electron-builder": "26.0.15", "electron-devtools-installer": "^3.2.0", "electron-reload": "^2.0.0-alpha.1", @@ -387,7 +387,7 @@ "esbuild": "^0.25.0", "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch", "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch", - "node-abi": "4.12.0", + "node-abi": "4.24.0", "openai@npm:^4.77.0": "npm:@cherrystudio/openai@6.5.0", "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.5.0", "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch", diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts index 66aed098e7..63eaaba995 100644 --- a/src/main/services/WindowService.ts +++ b/src/main/services/WindowService.ts @@ -375,13 +375,16 @@ export class WindowService { mainWindow.hide() - // TODO: don't hide dock icon when close to tray - // will cause the cmd+h behavior not working - // after the electron fix the bug, we can restore this code - // //for mac users, should hide dock icon if close to tray - // if (isMac && isTrayOnClose) { - // app.dock?.hide() - // } + //for mac users, should hide dock icon if close to tray + if (isMac && isTrayOnClose) { + app.dock?.hide() + + mainWindow.once('show', () => { + //restore the window can hide by cmd+h when the window is shown again + // https://github.com/electron/electron/pull/47970 + app.dock?.show() + }) + } }) mainWindow.on('closed', () => { diff --git a/yarn.lock b/yarn.lock index d06f134acd..bb178dcbc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10088,7 +10088,7 @@ __metadata: dotenv-cli: "npm:^7.4.2" drizzle-kit: "npm:^0.31.4" drizzle-orm: "npm:^0.44.5" - electron: "npm:38.4.0" + electron: "npm:38.7.0" electron-builder: "npm:26.0.15" electron-devtools-installer: "npm:^3.2.0" electron-reload: "npm:^2.0.0-alpha.1" @@ -13756,16 +13756,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:38.4.0": - version: 38.4.0 - resolution: "electron@npm:38.4.0" +"electron@npm:38.7.0": + version: 38.7.0 + resolution: "electron@npm:38.7.0" dependencies: "@electron/get": "npm:^2.0.0" "@types/node": "npm:^22.7.7" extract-zip: "npm:^2.0.1" bin: electron: cli.js - checksum: 10c0/3458409151d12f1fcd5e95374aa36e0d2f4aa0d3421c9f57dc521c606070294f33b24a681b3f93b49b02f4a3a07eb0070100ebda51b1198efd4b49dbf1260713 + checksum: 10c0/78a0917141b7a90253aff16e83b9683fb0facb098e8d9d5a71e7100b15fc3c00cd5d92e2ed3aba70067365022920293a7335ccfda5e8de1ef0d9a7d350e24c3c languageName: node linkType: hard @@ -19637,12 +19637,12 @@ __metadata: languageName: node linkType: hard -"node-abi@npm:4.12.0": - version: 4.12.0 - resolution: "node-abi@npm:4.12.0" +"node-abi@npm:4.24.0": + version: 4.24.0 + resolution: "node-abi@npm:4.24.0" dependencies: semver: "npm:^7.6.3" - checksum: 10c0/78a0697b1ea7da95bee5465d92772a883fb829ae01e89cf2b60c2af79bf784e422cdde9cc2f15684d5bafb9a0ac3d8e16292520107dc36eff30c541e23ac9fb7 + checksum: 10c0/9bf9f4e79c875b98f8026f2ad80150b2d5077f48529444232c9574cfd82e45d42a3ab2dcf6fb374cf7775becbf58e7c1b8704596ad3bef27cdeab7bc93eca7a3 languageName: node linkType: hard From 68ee5164f0c2b1168a11356f29bb5a9f8bb86b99 Mon Sep 17 00:00:00 2001 From: defi-failure <159208748+defi-failure@users.noreply.github.com> Date: Fri, 14 Nov 2025 17:10:13 +0800 Subject: [PATCH 11/16] fix: session list can't scroll (#11285) --- src/renderer/src/pages/home/Tabs/components/Sessions.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx index 9373c259d4..45a93ef660 100644 --- a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx +++ b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx @@ -131,6 +131,7 @@ const Container = styled(Scrollbar)` flex-direction: column; padding: 12px 10px; overflow-x: hidden; + height: 100%; ` export default memo(Sessions) From 038d30831c224e696fd38f4222e9a761c73f97ad Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Fri, 14 Nov 2025 17:49:40 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20implemen?= =?UTF-8?q?t=20config-based=20update=20system=20with=20version=20compatibi?= =?UTF-8?q?lity=20control=20(#11147)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ♻️ refactor: implement config-based update system with version compatibility control Replace GitHub API-based update discovery with JSON config file system. Support version gating (users below v1.7 must upgrade to v1.7.0 before v2.0). Auto-select GitHub/GitCode config source based on IP location. Simplify fallback logic. Changes: - Add update-config.json with version compatibility rules - Implement _fetchUpdateConfig() and _findCompatibleChannel() - Remove legacy _getReleaseVersionFromGithub() and GitHub API dependency - Refactor _setFeedUrl() with simplified fallback to default feed URLs - Add design documentation in docs/UPDATE_CONFIG_DESIGN.md 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * fix(i18n): Auto update translations for PR #11147 * format code * 🔧 chore: update config for v1.7.5 → v2.0.0 → v2.1.6 upgrade path Update version configuration to support multi-step upgrade path: - v1.6.x users → v1.7.5 (last v1.x release) - v1.7.x users → v2.0.0 (v2.x intermediate version) - v2.0.0+ users → v2.1.6 (current latest) Changes: - Update 1.7.0 → 1.7.5 with fixed feedUrl - Set 2.0.0 as intermediate version with fixed feedUrl - Add 2.1.6 as current latest pointing to releases/latest This ensures users upgrade through required intermediate versions before jumping to major releases. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * 🔧 chore: refactor update config with constants and adjust versions Refactor update configuration system and adjust to actual versions: - Add UpdateConfigUrl enum in constant.ts for centralized config URLs - Point to test server (birdcat.top) for development testing - Update AppUpdater.ts to use UpdateConfigUrl constants - Adjust update-config.json to actual v1.6.7 with rc/beta channels - Remove v2.1.6 entry (not yet released) - Set package version to 1.6.5 for testing upgrade path - Add update-config.example.json for reference 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * update version * ✅ test: add comprehensive unit tests for AppUpdater config system Add extensive test coverage for new config-based update system including: - Config fetching with IP-based source selection (GitHub/GitCode) - Channel compatibility matching with version constraints - Smart fallback from rc/beta to latest when appropriate - Multi-step upgrade path validation (1.6.3 → 1.6.7 → 2.0.0) - Error handling for network and HTTP failures Test Coverage: - _fetchUpdateConfig: 4 tests (GitHub/GitCode selection, error handling) - _findCompatibleChannel: 9 tests (channel matching, version comparison) - Upgrade Path: 3 tests (version gating scenarios) - Total: 30 tests, 100% passing Also optimize _findCompatibleChannel logic with better variable naming and log messages. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * ✅ test: add complete multi-step upgrade path tests (1.6.3 → 1.7.5 → 2.0.0 → 2.1.6) Add comprehensive test suite for complete upgrade journey including: - Individual step validation (1.6.3→1.7.5, 1.7.5→2.0.0, 2.0.0→2.1.6) - Full multi-step upgrade simulation with version progression - Version gating enforcement (block skipping intermediate versions) - Verification that 1.6.3 cannot directly upgrade to 2.0.0 or 2.1.6 - Verification that 1.7.5 cannot skip 2.0.0 to reach 2.1.6 Test Coverage: - 6 new tests for complete upgrade path scenarios - Total: 36 tests, 100% passing This ensures the version compatibility system correctly enforces intermediate version upgrades for major releases. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * 📝 docs: reorganize update config documentation with English translation Move update configuration design document to docs/technical/ directory and add English translation for international contributors. Changes: - Move docs/UPDATE_CONFIG_DESIGN.md → docs/technical/app-update-config-zh.md - Add docs/technical/app-update-config-en.md (English translation) - Organize technical documentation in dedicated directory Documentation covers: - Config-based update system design and rationale - JSON schema with version compatibility control - Multi-step upgrade path examples (1.6.3 → 1.7.5 → 2.0.0 → 2.1.6) - TypeScript type definitions and matching algorithms - GitHub/GitCode source selection for different regions 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * format code * ✅ test: add tests for latest channel self-comparison prevention Add tests to verify the optimization that prevents comparing latest channel with itself when latest is requested, and ensures rc/beta channels are returned when they are newer than latest. New tests: - should not compare latest with itself when requesting latest channel - should return rc when rc version > latest version - should return beta when beta version > latest version These tests ensure the requestedChannel !== UpgradeChannel.LATEST check works correctly and users get the right channel based on version comparisons. Test Coverage: 39 tests, 100% passing 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * update github/gitcode * format code * update rc version * ♻️ refactor: merge update configs into single multi-mirror file - Merge app-upgrade-config-github.json and app-upgrade-config-gitcode.json into single app-upgrade-config.json - Add UpdateMirror enum for type-safe mirror selection - Optimize _fetchUpdateConfig to receive mirror parameter, eliminating duplicate IP country checks - Update ChannelConfig interface to use Record for feedUrls - Rename documentation files from app-update-config-* to app-upgrade-config-* - Update docs with new multi-mirror configuration structure 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * ✅ test: update AppUpdater tests for multi-mirror configuration - Add UpdateMirror enum import - Update _fetchUpdateConfig tests to accept mirror parameter - Convert all feedUrl to feedUrls structure in test mocks - Update test expectations to match new ChannelConfig interface - All 39 tests passing 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * format code * delete files * 📝 docs: add UpdateMirror enum to type definitions - Add UpdateMirror enum definition in both EN and ZH docs - Update ChannelConfig to use Record - Add comments showing equivalent structure for clarity 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * 🐛 fix: return actual channel from _findCompatibleChannel Fix channel mismatch issue where requesting rc/beta but getting latest: - Change _findCompatibleChannel return type to include actual channel - Return { config, channel } instead of just config - Update _setFeedUrl to use actualChannel instead of requestedChannel - Update all test expectations to match new return structure - Add channel assertions to key tests This ensures autoUpdater.channel matches the actual feed URL being used. Fixes issue where: - User requests 'rc' channel - latest >= rc, so latest config is returned - But channel was set to 'rc' with latest URL ❌ - Now channel is correctly set to 'latest' ✅ All 39 tests passing ✅ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * update version * udpate version * update config * add no cache header * update files * 🤖 chore: automate app upgrade config updates * format code * update workflow * update get method * docs: document upgrade workflow automation --------- Co-authored-by: Claude Co-authored-by: GitHub Action --- .../workflows/update-app-upgrade-config.yml | 212 ++++++ ...p-builder-lib-npm-26.0.15-360e5b0476.patch | 276 ------- ...lectron-updater-npm-6.7.0-47b11bb0d4.patch | 14 + app-upgrade-config.json | 49 ++ config/app-upgrade-segments.json | 81 ++ docs/technical/app-upgrade-config-en.md | 430 +++++++++++ docs/technical/app-upgrade-config-zh.md | 430 +++++++++++ electron-builder.yml | 1 - package.json | 9 +- packages/shared/config/constant.ts | 10 + scripts/update-app-upgrade-config.ts | 532 +++++++++++++ src/main/services/AppUpdater.ts | 227 +++--- .../services/__tests__/AppUpdater.test.ts | 710 ++++++++++++++++++ yarn.lock | 632 ++++------------ 14 files changed, 2778 insertions(+), 835 deletions(-) create mode 100644 .github/workflows/update-app-upgrade-config.yml delete mode 100644 .yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch create mode 100644 .yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch create mode 100644 app-upgrade-config.json create mode 100644 config/app-upgrade-segments.json create mode 100644 docs/technical/app-upgrade-config-en.md create mode 100644 docs/technical/app-upgrade-config-zh.md create mode 100644 scripts/update-app-upgrade-config.ts diff --git a/.github/workflows/update-app-upgrade-config.yml b/.github/workflows/update-app-upgrade-config.yml new file mode 100644 index 0000000000..acb8381171 --- /dev/null +++ b/.github/workflows/update-app-upgrade-config.yml @@ -0,0 +1,212 @@ +name: Update App Upgrade Config + +on: + release: + types: + - released + - prereleased + workflow_dispatch: + inputs: + tag: + description: "Release tag (e.g., v1.2.3)" + required: true + type: string + is_prerelease: + description: "Mark the tag as a prerelease when running manually" + required: false + default: false + type: boolean + +permissions: + contents: write + pull-requests: write + +jobs: + propose-update: + runs-on: ubuntu-latest + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && github.event.release.draft == false) + + steps: + - name: Check if should proceed + id: check + run: | + EVENT="${{ github.event_name }}" + + if [ "$EVENT" = "workflow_dispatch" ]; then + TAG="${{ github.event.inputs.tag }}" + else + TAG="${{ github.event.release.tag_name }}" + fi + + latest_tag=$( + curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ github.token }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ github.repository }}/releases/latest \ + | jq -r '.tag_name' + ) + + if [ "$EVENT" = "workflow_dispatch" ]; then + MANUAL_IS_PRERELEASE="${{ github.event.inputs.is_prerelease }}" + if [ -z "$MANUAL_IS_PRERELEASE" ]; then + MANUAL_IS_PRERELEASE="false" + fi + if [ "$MANUAL_IS_PRERELEASE" = "true" ]; then + if ! echo "$TAG" | grep -E '(-beta([.-][0-9]+)?|-rc([.-][0-9]+)?)' >/dev/null; then + echo "Manual prerelease flag set but tag $TAG lacks beta/rc suffix. Skipping." >&2 + echo "should_run=false" >> "$GITHUB_OUTPUT" + echo "is_prerelease=false" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + exit 0 + fi + fi + echo "should_run=true" >> "$GITHUB_OUTPUT" + echo "is_prerelease=$MANUAL_IS_PRERELEASE" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + exit 0 + fi + + IS_PRERELEASE="${{ github.event.release.prerelease }}" + + if [ "$IS_PRERELEASE" = "true" ]; then + if ! echo "$TAG" | grep -E '(-beta([.-][0-9]+)?|-rc([.-][0-9]+)?)' >/dev/null; then + echo "Release marked as prerelease but tag $TAG lacks beta/rc suffix. Skipping." >&2 + echo "should_run=false" >> "$GITHUB_OUTPUT" + echo "is_prerelease=false" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + exit 0 + fi + echo "should_run=true" >> "$GITHUB_OUTPUT" + echo "is_prerelease=true" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + echo "Release is prerelease, proceeding" + exit 0 + fi + + if [[ "${latest_tag}" == "$TAG" ]]; then + echo "should_run=true" >> "$GITHUB_OUTPUT" + echo "is_prerelease=false" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + echo "Release is latest, proceeding" + else + echo "should_run=false" >> "$GITHUB_OUTPUT" + echo "is_prerelease=false" >> "$GITHUB_OUTPUT" + echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT" + echo "Release is neither prerelease nor latest, skipping" + fi + + - name: Prepare metadata + id: meta + if: steps.check.outputs.should_run == 'true' + run: | + EVENT="${{ github.event_name }}" + LATEST_TAG="${{ steps.check.outputs.latest_tag }}" + if [ "$EVENT" = "release" ]; then + TAG="${{ github.event.release.tag_name }}" + PRE="${{ github.event.release.prerelease }}" + + if [ -n "$LATEST_TAG" ] && [ "$LATEST_TAG" = "$TAG" ]; then + LATEST="true" + else + LATEST="false" + fi + TRIGGER="release" + else + TAG="${{ github.event.inputs.tag }}" + PRE="${{ github.event.inputs.is_prerelease }}" + if [ -z "$PRE" ]; then + PRE="false" + fi + if [ -n "$LATEST_TAG" ] && [ "$LATEST_TAG" = "$TAG" ] && [ "$PRE" != "true" ]; then + LATEST="true" + else + LATEST="false" + fi + TRIGGER="manual" + fi + + SAFE_TAG=$(echo "$TAG" | sed 's/[^A-Za-z0-9._-]/-/g') + echo "tag=$TAG" >> "$GITHUB_OUTPUT" + echo "safe_tag=$SAFE_TAG" >> "$GITHUB_OUTPUT" + echo "prerelease=$PRE" >> "$GITHUB_OUTPUT" + echo "latest=$LATEST" >> "$GITHUB_OUTPUT" + echo "trigger=$TRIGGER" >> "$GITHUB_OUTPUT" + + - name: Checkout default branch + if: steps.check.outputs.should_run == 'true' + uses: actions/checkout@v5 + with: + ref: ${{ github.event.repository.default_branch }} + path: main + fetch-depth: 0 + + - name: Checkout cs-releases branch + if: steps.check.outputs.should_run == 'true' + uses: actions/checkout@v5 + with: + ref: cs-releases + path: cs + fetch-depth: 0 + + - name: Setup Node.js + if: steps.check.outputs.should_run == 'true' + uses: actions/setup-node@v4 + with: + node-version: 22 + + - name: Enable Corepack + if: steps.check.outputs.should_run == 'true' + run: corepack enable && corepack prepare yarn@4.9.1 --activate + + - name: Install dependencies + if: steps.check.outputs.should_run == 'true' + working-directory: main + run: yarn install --immutable + + - name: Update upgrade config + if: steps.check.outputs.should_run == 'true' + working-directory: main + env: + RELEASE_TAG: ${{ steps.meta.outputs.tag }} + IS_PRERELEASE: ${{ steps.check.outputs.is_prerelease }} + run: | + yarn tsx scripts/update-app-upgrade-config.ts \ + --tag "$RELEASE_TAG" \ + --config ../cs/app-upgrade-config.json \ + --is-prerelease "$IS_PRERELEASE" + + - name: Detect changes + if: steps.check.outputs.should_run == 'true' + id: diff + working-directory: cs + run: | + if git diff --quiet -- app-upgrade-config.json; then + echo "changed=false" >> "$GITHUB_OUTPUT" + else + echo "changed=true" >> "$GITHUB_OUTPUT" + fi + + - name: Create pull request + if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed == 'true' + uses: peter-evans/create-pull-request@v7 + with: + path: cs + base: cs-releases + branch: chore/update-app-upgrade-config/${{ steps.meta.outputs.safe_tag }} + commit-message: "🤖 chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}" + title: "chore: update app-upgrade-config for ${{ steps.meta.outputs.tag }}" + body: | + Automated update triggered by `${{ steps.meta.outputs.trigger }}`. + + - Source tag: `${{ steps.meta.outputs.tag }}` + - Pre-release: `${{ steps.meta.outputs.prerelease }}` + - Latest: `${{ steps.meta.outputs.latest }}` + - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} + labels: | + automation + app-upgrade + + - name: No changes detected + if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed != 'true' + run: echo "No updates required for cs-releases/app-upgrade-config.json" diff --git a/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch b/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch deleted file mode 100644 index e9ca84e6cd..0000000000 --- a/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch +++ /dev/null @@ -1,276 +0,0 @@ -diff --git a/out/macPackager.js b/out/macPackager.js -index 852f6c4d16f86a7bb8a78bf1ed5a14647a279aa1..60e7f5f16a844541eb1909b215fcda1811e924b8 100644 ---- a/out/macPackager.js -+++ b/out/macPackager.js -@@ -423,7 +423,7 @@ class MacPackager extends platformPackager_1.PlatformPackager { - } - appPlist.CFBundleName = appInfo.productName; - appPlist.CFBundleDisplayName = appInfo.productName; -- const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion; -+ const minimumSystemVersion = this.platformSpecificBuildOptions.LSMinimumSystemVersion; - if (minimumSystemVersion != null) { - appPlist.LSMinimumSystemVersion = minimumSystemVersion; - } -diff --git a/out/publish/updateInfoBuilder.js b/out/publish/updateInfoBuilder.js -index 7924c5b47d01f8dfccccb8f46658015fa66da1f7..1a1588923c3939ae1297b87931ba83f0ebc052d8 100644 ---- a/out/publish/updateInfoBuilder.js -+++ b/out/publish/updateInfoBuilder.js -@@ -133,6 +133,7 @@ async function createUpdateInfo(version, event, releaseInfo) { - const customUpdateInfo = event.updateInfo; - const url = path.basename(event.file); - const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await (0, hash_1.hashFile)(event.file)); -+ const minimumSystemVersion = customUpdateInfo == null ? null : customUpdateInfo.minimumSystemVersion; - const files = [{ url, sha512 }]; - const result = { - // @ts-ignore -@@ -143,9 +144,13 @@ async function createUpdateInfo(version, event, releaseInfo) { - path: url /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */, - // @ts-ignore - sha512 /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */, -+ minimumSystemVersion, - ...releaseInfo, - }; - if (customUpdateInfo != null) { -+ if (customUpdateInfo.minimumSystemVersion) { -+ delete customUpdateInfo.minimumSystemVersion; -+ } - // file info or nsis web installer packages info - Object.assign("sha512" in customUpdateInfo ? files[0] : result, customUpdateInfo); - } -diff --git a/out/targets/ArchiveTarget.js b/out/targets/ArchiveTarget.js -index e1f52a5fa86fff6643b2e57eaf2af318d541f865..47cc347f154a24b365e70ae5e1f6d309f3582ed0 100644 ---- a/out/targets/ArchiveTarget.js -+++ b/out/targets/ArchiveTarget.js -@@ -69,6 +69,9 @@ class ArchiveTarget extends core_1.Target { - } - } - } -+ if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) { -+ updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion; -+ } - await packager.info.emitArtifactBuildCompleted({ - updateInfo, - file: artifactPath, -diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js -index e8bd7bb46c8a54b3f55cf3a853ef924195271e01..f956e9f3fe9eb903c78aef3502553b01de4b89b1 100644 ---- a/out/targets/nsis/NsisTarget.js -+++ b/out/targets/nsis/NsisTarget.js -@@ -305,6 +305,9 @@ class NsisTarget extends core_1.Target { - if (updateInfo != null && isPerMachine && (oneClick || options.packElevateHelper)) { - updateInfo.isAdminRightsRequired = true; - } -+ if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) { -+ updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion; -+ } - await packager.info.emitArtifactBuildCompleted({ - file: installerPath, - updateInfo, -diff --git a/out/util/yarn.js b/out/util/yarn.js -index 1ee20f8b252a8f28d0c7b103789cf0a9a427aec1..c2878ec54d57da50bf14225e0c70c9c88664eb8a 100644 ---- a/out/util/yarn.js -+++ b/out/util/yarn.js -@@ -140,6 +140,7 @@ async function rebuild(config, { appDir, projectDir }, options) { - arch, - platform, - buildFromSource, -+ ignoreModules: config.excludeReBuildModules || undefined, - projectRootPath: projectDir, - mode: config.nativeRebuilder || "sequential", - disablePreGypCopy: true, -diff --git a/scheme.json b/scheme.json -index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..0167441bf928a92f59b5dbe70b2317a74dda74c9 100644 ---- a/scheme.json -+++ b/scheme.json -@@ -1825,6 +1825,20 @@ - "string" - ] - }, -+ "excludeReBuildModules": { -+ "anyOf": [ -+ { -+ "items": { -+ "type": "string" -+ }, -+ "type": "array" -+ }, -+ { -+ "type": "null" -+ } -+ ], -+ "description": "The modules to exclude from the rebuild." -+ }, - "executableArgs": { - "anyOf": [ - { -@@ -1975,6 +1989,13 @@ - ], - "description": "The mime types in addition to specified in the file associations. Use it if you don't want to register a new mime type, but reuse existing." - }, -+ "minimumSystemVersion": { -+ "description": "The minimum os kernel version required to install the application.", -+ "type": [ -+ "null", -+ "string" -+ ] -+ }, - "packageCategory": { - "description": "backward compatibility + to allow specify fpm-only category for all possible fpm targets in one place", - "type": [ -@@ -2327,6 +2348,13 @@ - "MacConfiguration": { - "additionalProperties": false, - "properties": { -+ "LSMinimumSystemVersion": { -+ "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.", -+ "type": [ -+ "null", -+ "string" -+ ] -+ }, - "additionalArguments": { - "anyOf": [ - { -@@ -2527,6 +2555,20 @@ - "string" - ] - }, -+ "excludeReBuildModules": { -+ "anyOf": [ -+ { -+ "items": { -+ "type": "string" -+ }, -+ "type": "array" -+ }, -+ { -+ "type": "null" -+ } -+ ], -+ "description": "The modules to exclude from the rebuild." -+ }, - "executableName": { - "description": "The executable name. Defaults to `productName`.", - "type": [ -@@ -2737,7 +2779,7 @@ - "type": "boolean" - }, - "minimumSystemVersion": { -- "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.", -+ "description": "The minimum os kernel version required to install the application.", - "type": [ - "null", - "string" -@@ -2959,6 +3001,13 @@ - "MasConfiguration": { - "additionalProperties": false, - "properties": { -+ "LSMinimumSystemVersion": { -+ "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.", -+ "type": [ -+ "null", -+ "string" -+ ] -+ }, - "additionalArguments": { - "anyOf": [ - { -@@ -3159,6 +3208,20 @@ - "string" - ] - }, -+ "excludeReBuildModules": { -+ "anyOf": [ -+ { -+ "items": { -+ "type": "string" -+ }, -+ "type": "array" -+ }, -+ { -+ "type": "null" -+ } -+ ], -+ "description": "The modules to exclude from the rebuild." -+ }, - "executableName": { - "description": "The executable name. Defaults to `productName`.", - "type": [ -@@ -3369,7 +3432,7 @@ - "type": "boolean" - }, - "minimumSystemVersion": { -- "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.", -+ "description": "The minimum os kernel version required to install the application.", - "type": [ - "null", - "string" -@@ -6381,6 +6444,20 @@ - "string" - ] - }, -+ "excludeReBuildModules": { -+ "anyOf": [ -+ { -+ "items": { -+ "type": "string" -+ }, -+ "type": "array" -+ }, -+ { -+ "type": "null" -+ } -+ ], -+ "description": "The modules to exclude from the rebuild." -+ }, - "executableName": { - "description": "The executable name. Defaults to `productName`.", - "type": [ -@@ -6507,6 +6584,13 @@ - "string" - ] - }, -+ "minimumSystemVersion": { -+ "description": "The minimum os kernel version required to install the application.", -+ "type": [ -+ "null", -+ "string" -+ ] -+ }, - "protocols": { - "anyOf": [ - { -@@ -7153,6 +7237,20 @@ - "string" - ] - }, -+ "excludeReBuildModules": { -+ "anyOf": [ -+ { -+ "items": { -+ "type": "string" -+ }, -+ "type": "array" -+ }, -+ { -+ "type": "null" -+ } -+ ], -+ "description": "The modules to exclude from the rebuild." -+ }, - "executableName": { - "description": "The executable name. Defaults to `productName`.", - "type": [ -@@ -7376,6 +7474,13 @@ - ], - "description": "MAS (Mac Application Store) development options (`mas-dev` target)." - }, -+ "minimumSystemVersion": { -+ "description": "The minimum os kernel version required to install the application.", -+ "type": [ -+ "null", -+ "string" -+ ] -+ }, - "msi": { - "anyOf": [ - { diff --git a/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch b/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch new file mode 100644 index 0000000000..f9e54ac947 --- /dev/null +++ b/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch @@ -0,0 +1,14 @@ +diff --git a/out/util.js b/out/util.js +index 9294ffd6ca8f02c2e0f90c663e7e9cdc02c1ac37..f52107493e2995320ee4efd0eb2a8c9bf03291a2 100644 +--- a/out/util.js ++++ b/out/util.js +@@ -23,7 +23,8 @@ function newUrlFromBase(pathname, baseUrl, addRandomQueryToAvoidCaching = false) + result.search = search; + } + else if (addRandomQueryToAvoidCaching) { +- result.search = `noCache=${Date.now().toString(32)}`; ++ // use no cache header instead ++ // result.search = `noCache=${Date.now().toString(32)}`; + } + return result; + } diff --git a/app-upgrade-config.json b/app-upgrade-config.json new file mode 100644 index 0000000000..84e381c86a --- /dev/null +++ b/app-upgrade-config.json @@ -0,0 +1,49 @@ +{ + "lastUpdated": "2025-11-10T08:14:28Z", + "versions": { + "1.6.7": { + "metadata": { + "segmentId": "legacy-v1", + "segmentType": "legacy" + }, + "minCompatibleVersion": "1.0.0", + "description": "Last stable v1.7.x release - required intermediate version for users below v1.7", + "channels": { + "latest": { + "version": "1.6.7", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7", + "gitcode": "https://releases.cherry-ai.com" + } + }, + "rc": { + "version": "1.6.0-rc.5", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5" + } + }, + "beta": { + "version": "1.7.0-beta.3", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3" + } + } + } + }, + "2.0.0": { + "metadata": { + "segmentId": "gateway-v2", + "segmentType": "breaking" + }, + "minCompatibleVersion": "1.7.0", + "description": "Major release v2.0 - required intermediate version for v2.x upgrades", + "channels": { + "latest": null, + "rc": null, + "beta": null + } + } + } +} diff --git a/config/app-upgrade-segments.json b/config/app-upgrade-segments.json new file mode 100644 index 0000000000..70c8ac25f0 --- /dev/null +++ b/config/app-upgrade-segments.json @@ -0,0 +1,81 @@ +{ + "segments": [ + { + "id": "legacy-v1", + "type": "legacy", + "match": { + "range": ">=1.0.0 <2.0.0" + }, + "minCompatibleVersion": "1.0.0", + "description": "Last stable v1.7.x release - required intermediate version for users below v1.7", + "channelTemplates": { + "latest": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://releases.cherry-ai.com" + } + }, + "rc": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + }, + "beta": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + } + } + }, + { + "id": "gateway-v2", + "type": "breaking", + "match": { + "exact": ["2.0.0"] + }, + "lockedVersion": "2.0.0", + "minCompatibleVersion": "1.7.0", + "description": "Major release v2.0 - required intermediate version for v2.x upgrades", + "channelTemplates": { + "latest": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + } + } + }, + { + "id": "current-v2", + "type": "latest", + "match": { + "range": ">=2.0.0 <3.0.0", + "excludeExact": ["2.0.0"] + }, + "minCompatibleVersion": "2.0.0", + "description": "Current latest v2.x release", + "channelTemplates": { + "latest": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + }, + "rc": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + }, + "beta": { + "feedTemplates": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}" + } + } + } + } + ] +} diff --git a/docs/technical/app-upgrade-config-en.md b/docs/technical/app-upgrade-config-en.md new file mode 100644 index 0000000000..993c130d76 --- /dev/null +++ b/docs/technical/app-upgrade-config-en.md @@ -0,0 +1,430 @@ +# Update Configuration System Design Document + +## Background + +Currently, AppUpdater directly queries the GitHub API to retrieve beta and rc update information. To support users in China, we need to fetch a static JSON configuration file from GitHub/GitCode based on IP geolocation, which contains update URLs for all channels. + +## Design Goals + +1. Support different configuration sources based on IP geolocation (GitHub/GitCode) +2. Support version compatibility control (e.g., users below v1.x must upgrade to v1.7.0 before upgrading to v2.0) +3. Easy to extend, supporting future multi-major-version upgrade paths (v1.6 → v1.7 → v2.0 → v2.8 → v3.0) +4. Maintain compatibility with existing electron-updater mechanism + +## Current Version Strategy + +- **v1.7.x** is the last version of the 1.x series +- Users **below v1.7.0** must first upgrade to v1.7.0 (or higher 1.7.x version) +- Users **v1.7.0 and above** can directly upgrade to v2.x.x + +## Automation Workflow + +The `cs-releases/app-upgrade-config.json` file is synchronized by the [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow. The workflow runs the [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) helper so that every release tag automatically updates the JSON in `cs-releases`. + +### Trigger Conditions + +- **Release events (`release: released/prereleased`)** + - Draft releases are ignored. + - When GitHub marks the release as _prerelease_, the tag must include `-beta`/`-rc` (with optional numeric suffix). Otherwise the workflow exits early. + - When GitHub marks the release as stable, the tag must match the latest release returned by the GitHub API. This prevents out-of-order updates when publishing historical tags. + - If the guard clauses pass, the version is tagged as `latest` or `beta/rc` based on its semantic suffix and propagated to the script through the `IS_PRERELEASE` flag. +- **Manual dispatch (`workflow_dispatch`)** + - Required input: `tag` (e.g., `v2.0.1`). Optional input: `is_prerelease` (defaults to `false`). + - When `is_prerelease=true`, the tag must carry a beta/rc suffix, mirroring the automatic validation. + - Manual runs still download the latest release metadata so that the workflow knows whether the tag represents the newest stable version (for documentation inside the PR body). + +### Workflow Steps + +1. **Guard + metadata preparation** – the `Check if should proceed` and `Prepare metadata` steps compute the target tag, prerelease flag, whether the tag is the newest release, and a `safe_tag` slug used for branch names. When any rule fails, the workflow stops without touching the config. +2. **Checkout source branches** – the default branch is checked out into `main/`, while the long-lived `cs-releases` branch lives in `cs/`. All modifications happen in the latter directory. +3. **Install toolchain** – Node.js 22, Corepack, and frozen Yarn dependencies are installed inside `main/`. +4. **Run the update script** – `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json --is-prerelease ` updates the JSON in-place. + - The script normalizes the tag (e.g., strips `v` prefix), detects the release channel (`latest`, `rc`, `beta`), and loads segment rules from `config/app-upgrade-segments.json`. + - It validates that prerelease flags and semantic suffixes agree, enforces locked segments, builds mirror feed URLs, and performs release-availability checks (GitHub HEAD request for every channel; GitCode GET for latest channels, falling back to `https://releases.cherry-ai.com` when gitcode is delayed). + - After updating the relevant channel entry, the script rewrites the config with semver-sort order and a new `lastUpdated` timestamp. +5. **Detect changes + create PR** – if `cs/app-upgrade-config.json` changed, the workflow opens a PR `chore/update-app-upgrade-config/` against `cs-releases` with a commit message `🤖 chore: sync app-upgrade-config for `. Otherwise it logs that no update is required. + +### Manual Trigger Guide + +1. Open the Cherry Studio repository on GitHub → **Actions** tab → select **Update App Upgrade Config**. +2. Click **Run workflow**, choose the default branch (usually `main`), and fill in the `tag` input (e.g., `v2.1.0`). +3. Toggle `is_prerelease` only when the tag carries a prerelease suffix (`-beta`, `-rc`). Leave it unchecked for stable releases. +4. Start the run and wait for it to finish. Check the generated PR in the `cs-releases` branch, verify the diff in `app-upgrade-config.json`, and merge once validated. + +## JSON Configuration File Format + +### File Location + +- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json` +- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json` + +**Note**: Both mirrors provide the same configuration file hosted on the `cs-releases` branch. The client automatically selects the optimal mirror based on IP geolocation. + +### Configuration Structure (Current Implementation) + +```json +{ + "lastUpdated": "2025-01-05T00:00:00Z", + "versions": { + "1.6.7": { + "minCompatibleVersion": "1.0.0", + "description": "Last stable v1.7.x release - required intermediate version for users below v1.7", + "channels": { + "latest": { + "version": "1.6.7", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v1.6.7" + } + }, + "rc": { + "version": "1.6.0-rc.5", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5" + } + }, + "beta": { + "version": "1.6.7-beta.3", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3" + } + } + } + }, + "2.0.0": { + "minCompatibleVersion": "1.7.0", + "description": "Major release v2.0 - required intermediate version for v2.x upgrades", + "channels": { + "latest": null, + "rc": null, + "beta": null + } + } + } +} +``` + +### Future Extension Example + +When releasing v3.0, if users need to first upgrade to v2.8, you can add: + +```json +{ + "2.8.0": { + "minCompatibleVersion": "2.0.0", + "description": "Stable v2.8 - required for v3 upgrade", + "channels": { + "latest": { + "version": "2.8.0", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v2.8.0", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v2.8.0" + } + }, + "rc": null, + "beta": null + } + }, + "3.0.0": { + "minCompatibleVersion": "2.8.0", + "description": "Major release v3.0", + "channels": { + "latest": { + "version": "3.0.0", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/latest", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/latest" + } + }, + "rc": { + "version": "3.0.0-rc.1", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1" + } + }, + "beta": null + } + } +} +``` + +### Field Descriptions + +- `lastUpdated`: Last update time of the configuration file (ISO 8601 format) +- `versions`: Version configuration object, key is the version number, sorted by semantic versioning + - `minCompatibleVersion`: Minimum compatible version that can upgrade to this version + - `description`: Version description + - `channels`: Update channel configuration + - `latest`: Stable release channel + - `rc`: Release Candidate channel + - `beta`: Beta testing channel + - Each channel contains: + - `version`: Version number for this channel + - `feedUrls`: Multi-mirror URL configuration + - `github`: electron-updater feed URL for GitHub mirror + - `gitcode`: electron-updater feed URL for GitCode mirror + - `metadata`: Stable mapping info for automation + - `segmentId`: ID from `config/app-upgrade-segments.json` + - `segmentType`: Optional flag (`legacy` | `breaking` | `latest`) for documentation/debugging + +## TypeScript Type Definitions + +```typescript +// Mirror enum +enum UpdateMirror { + GITHUB = 'github', + GITCODE = 'gitcode' +} + +interface UpdateConfig { + lastUpdated: string + versions: { + [versionKey: string]: VersionConfig + } +} + +interface VersionConfig { + minCompatibleVersion: string + description: string + channels: { + latest: ChannelConfig | null + rc: ChannelConfig | null + beta: ChannelConfig | null + } + metadata?: { + segmentId: string + segmentType?: 'legacy' | 'breaking' | 'latest' + } +} + +interface ChannelConfig { + version: string + feedUrls: Record + // Equivalent to: + // feedUrls: { + // github: string + // gitcode: string + // } +} +``` + +## Segment Metadata & Breaking Markers + +- **Segment definitions** now live in `config/app-upgrade-segments.json`. Each segment describes a semantic-version range (or exact matches) plus metadata such as `segmentId`, `segmentType`, `minCompatibleVersion`, and per-channel feed URL templates. +- Each entry under `versions` carries a `metadata.segmentId`. This acts as the stable key that scripts use to decide which slot to update, even if the actual semantic version string changes. +- Mark major upgrade gateways (e.g., `2.0.0`) by giving the related segment a `segmentType: "breaking"` and (optionally) `lockedVersion`. This prevents automation from accidentally moving that entry when other 2.x builds ship. +- Adding another breaking hop (e.g., `3.0.0`) only requires defining a new segment in the JSON file; the automation will pick it up on the next run. + +## Automation Workflow + +Starting from this change, `.github/workflows/update-app-upgrade-config.yml` listens to GitHub release events (published + prerelease). The workflow: + +1. Checks out the default branch (for scripts) and the `cs-releases` branch (where the config is hosted). +2. Runs `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json` to regenerate the config directly inside the `cs-releases` working tree. +3. If the file changed, it opens a PR against `cs-releases` via `peter-evans/create-pull-request`, with the generated diff limited to `app-upgrade-config.json`. + +You can run the same script locally via `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json` (add `--dry-run` to preview) to reproduce or debug whatever the workflow does. Passing `--skip-release-checks` along with `--dry-run` lets you bypass the release-page existence check (useful when the GitHub/GitCode pages aren’t published yet). Running without `--config` continues to update the copy in your current working directory (main branch) for documentation purposes. + +## Version Matching Logic + +### Algorithm Flow + +1. Get user's current version (`currentVersion`) and requested channel (`requestedChannel`) +2. Get all version numbers from configuration file, sort in descending order by semantic versioning +3. Iterate through the sorted version list: + - Check if `currentVersion >= minCompatibleVersion` + - Check if the requested `channel` exists and is not `null` + - If conditions are met, return the channel configuration +4. If no matching version is found, return `null` + +### Pseudocode Implementation + +```typescript +function findCompatibleVersion( + currentVersion: string, + requestedChannel: UpgradeChannel, + config: UpdateConfig +): ChannelConfig | null { + // Get all version numbers and sort in descending order + const versions = Object.keys(config.versions).sort(semver.rcompare) + + for (const versionKey of versions) { + const versionConfig = config.versions[versionKey] + const channelConfig = versionConfig.channels[requestedChannel] + + // Check version compatibility and channel availability + if ( + semver.gte(currentVersion, versionConfig.minCompatibleVersion) && + channelConfig !== null + ) { + return channelConfig + } + } + + return null // No compatible version found +} +``` + +## Upgrade Path Examples + +### Scenario 1: v1.6.5 User Upgrade (Below 1.7) + +- **Current Version**: 1.6.5 +- **Requested Channel**: latest +- **Match Result**: 1.7.0 +- **Reason**: 1.6.5 >= 0.0.0 (satisfies 1.7.0's minCompatibleVersion), but doesn't satisfy 2.0.0's minCompatibleVersion (1.7.0) +- **Action**: Prompt user to upgrade to 1.7.0, which is the required intermediate version for v2.x upgrade + +### Scenario 2: v1.6.5 User Requests rc/beta + +- **Current Version**: 1.6.5 +- **Requested Channel**: rc or beta +- **Match Result**: 1.7.0 (latest) +- **Reason**: 1.7.0 version doesn't provide rc/beta channels (values are null) +- **Action**: Upgrade to 1.7.0 stable version + +### Scenario 3: v1.7.0 User Upgrades to Latest + +- **Current Version**: 1.7.0 +- **Requested Channel**: latest +- **Match Result**: 2.0.0 +- **Reason**: 1.7.0 >= 1.7.0 (satisfies 2.0.0's minCompatibleVersion) +- **Action**: Directly upgrade to 2.0.0 (current latest stable version) + +### Scenario 4: v1.7.2 User Upgrades to RC Version + +- **Current Version**: 1.7.2 +- **Requested Channel**: rc +- **Match Result**: 2.0.0-rc.1 +- **Reason**: 1.7.2 >= 1.7.0 (satisfies 2.0.0's minCompatibleVersion), and rc channel exists +- **Action**: Upgrade to 2.0.0-rc.1 + +### Scenario 5: v1.7.0 User Upgrades to Beta Version + +- **Current Version**: 1.7.0 +- **Requested Channel**: beta +- **Match Result**: 2.0.0-beta.1 +- **Reason**: 1.7.0 >= 1.7.0, and beta channel exists +- **Action**: Upgrade to 2.0.0-beta.1 + +### Scenario 6: v2.5.0 User Upgrade (Future) + +Assuming v2.8.0 and v3.0.0 configurations have been added: +- **Current Version**: 2.5.0 +- **Requested Channel**: latest +- **Match Result**: 2.8.0 +- **Reason**: 2.5.0 >= 2.0.0 (satisfies 2.8.0's minCompatibleVersion), but doesn't satisfy 3.0.0's requirement +- **Action**: Prompt user to upgrade to 2.8.0, which is the required intermediate version for v3.x upgrade + +## Code Changes + +### Main Modifications + +1. **New Methods** + - `_fetchUpdateConfig(ipCountry: string): Promise` - Fetch configuration file based on IP + - `_findCompatibleChannel(currentVersion: string, channel: UpgradeChannel, config: UpdateConfig): ChannelConfig | null` - Find compatible channel configuration + +2. **Modified Methods** + - `_getReleaseVersionFromGithub()` → Remove or refactor to `_getChannelFeedUrl()` + - `_setFeedUrl()` - Use new configuration system to replace existing logic + +3. **New Type Definitions** + - `UpdateConfig` + - `VersionConfig` + - `ChannelConfig` + +### Mirror Selection Logic + +The client automatically selects the optimal mirror based on IP geolocation: + +```typescript +private async _setFeedUrl() { + const currentVersion = app.getVersion() + const testPlan = configManager.getTestPlan() + const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST + + // Determine mirror based on IP country + const ipCountry = await getIpCountry() + const mirror = ipCountry.toLowerCase() === 'cn' ? 'gitcode' : 'github' + + // Fetch update config + const config = await this._fetchUpdateConfig(mirror) + + if (config) { + const channelConfig = this._findCompatibleChannel(currentVersion, requestedChannel, config) + if (channelConfig) { + // Select feed URL from the corresponding mirror + const feedUrl = channelConfig.feedUrls[mirror] + this._setChannel(requestedChannel, feedUrl) + return + } + } + + // Fallback logic + const defaultFeedUrl = mirror === 'gitcode' + ? FeedUrl.PRODUCTION + : FeedUrl.GITHUB_LATEST + this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl) +} + +private async _fetchUpdateConfig(mirror: 'github' | 'gitcode'): Promise { + const configUrl = mirror === 'gitcode' + ? UpdateConfigUrl.GITCODE + : UpdateConfigUrl.GITHUB + + try { + const response = await net.fetch(configUrl, { + headers: { + 'User-Agent': generateUserAgent(), + 'Accept': 'application/json', + 'X-Client-Id': configManager.getClientId() + } + }) + return await response.json() as UpdateConfig + } catch (error) { + logger.error('Failed to fetch update config:', error) + return null + } +} +``` + +## Fallback and Error Handling Strategy + +1. **Configuration file fetch failure**: Log error, return current version, don't offer updates +2. **No matching version**: Notify user that current version doesn't support automatic upgrade +3. **Network exception**: Cache last successfully fetched configuration (optional) + +## GitHub Release Requirements + +To support intermediate version upgrades, the following files need to be retained: + +- **v1.7.0 release** and its latest*.yml files (as upgrade target for users below v1.7) +- Future intermediate versions (e.g., v2.8.0) need to retain corresponding release and latest*.yml files +- Complete installation packages for each version + +### Currently Required Releases + +| Version | Purpose | Must Retain | +|---------|---------|-------------| +| v1.7.0 | Upgrade target for users below 1.7 | ✅ Yes | +| v2.0.0-rc.1 | RC testing channel | ❌ Optional | +| v2.0.0-beta.1 | Beta testing channel | ❌ Optional | +| latest | Latest stable version (automatic) | ✅ Yes | + +## Advantages + +1. **Flexibility**: Supports arbitrarily complex upgrade paths +2. **Extensibility**: Adding new versions only requires adding new entries to the configuration file +3. **Maintainability**: Configuration is separated from code, allowing upgrade strategy adjustments without releasing new versions +4. **Multi-source support**: Automatically selects optimal configuration source based on geolocation +5. **Version control**: Enforces intermediate version upgrades, ensuring data migration and compatibility + +## Future Extensions + +- Support more granular version range control (e.g., `>=1.5.0 <1.8.0`) +- Support multi-step upgrade path hints (e.g., notify user needs 1.5 → 1.8 → 2.0) +- Support A/B testing and gradual rollout +- Support local caching and expiration strategy for configuration files diff --git a/docs/technical/app-upgrade-config-zh.md b/docs/technical/app-upgrade-config-zh.md new file mode 100644 index 0000000000..d8812d4943 --- /dev/null +++ b/docs/technical/app-upgrade-config-zh.md @@ -0,0 +1,430 @@ +# 更新配置系统设计文档 + +## 背景 + +当前 AppUpdater 直接请求 GitHub API 获取 beta 和 rc 的更新信息。为了支持国内用户，需要根据 IP 地理位置，分别从 GitHub/GitCode 获取一个固定的 JSON 配置文件，该文件包含所有渠道的更新地址。 + +## 设计目标 + +1. 支持根据 IP 地理位置选择不同的配置源（GitHub/GitCode） +2. 支持版本兼容性控制（如 v1.x 以下必须先升级到 v1.7.0 才能升级到 v2.0） +3. 易于扩展，支持未来多个主版本的升级路径（v1.6 → v1.7 → v2.0 → v2.8 → v3.0） +4. 保持与现有 electron-updater 机制的兼容性 + +## 当前版本策略 + +- **v1.7.x** 是 1.x 系列的最后版本 +- **v1.7.0 以下**的用户必须先升级到 v1.7.0（或更高的 1.7.x 版本） +- **v1.7.0 及以上**的用户可以直接升级到 v2.x.x + +## 自动化工作流 + +`cs-releases/app-upgrade-config.json` 由 [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow 自动同步。工作流会调用 [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) 脚本，根据指定 tag 更新 `cs-releases` 分支上的配置文件。 + +### 触发条件 + +- **Release 事件（`release: released/prereleased`）** + - Draft release 会被忽略。 + - 当 GitHub 将 release 标记为 *prerelease* 时，tag 必须包含 `-beta`/`-rc`（可带序号），否则直接跳过。 + - 当 release 标记为稳定版时，tag 必须与 GitHub API 返回的最新稳定版本一致，防止发布历史 tag 时意外挂起工作流。 + - 满足上述条件后，工作流会根据语义化版本判断渠道（`latest`/`beta`/`rc`），并通过 `IS_PRERELEASE` 传递给脚本。 +- **手动触发（`workflow_dispatch`）** + - 必填：`tag`（例：`v2.0.1`）；选填：`is_prerelease`（默认 `false`）。 + - 当 `is_prerelease=true` 时，同样要求 tag 带有 beta/rc 后缀。 + - 手动运行仍会请求 GitHub 最新 release 信息，用于在 PR 说明中标注该 tag 是否是最新稳定版。 + +### 工作流步骤 + +1. **检查与元数据准备**：`Check if should proceed` 和 `Prepare metadata` 步骤会计算 tag、prerelease 标志、是否最新版本以及用于分支名的 `safe_tag`。若任意校验失败，工作流立即退出。 +2. **检出分支**：默认分支被检出到 `main/`，长期维护的 `cs-releases` 分支则在 `cs/` 中，所有改动都发生在 `cs/`。 +3. **安装工具链**：安装 Node.js 22、启用 Corepack，并在 `main/` 目录执行 `yarn install --immutable`。 +4. **运行更新脚本**：执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json --is-prerelease `。 + - 脚本会标准化 tag（去掉 `v` 前缀等）、识别渠道、加载 `config/app-upgrade-segments.json` 中的分段规则。 + - 校验 prerelease 标志与语义后缀是否匹配、强制锁定的 segment 是否满足、生成镜像的下载地址，并检查 release 是否已经在 GitHub/GitCode 可用（latest 渠道在 GitCode 不可用时会回退到 `https://releases.cherry-ai.com`）。 + - 更新对应的渠道配置后，脚本会按 semver 排序写回 JSON，并刷新 `lastUpdated`。 +5. **检测变更并创建 PR**：若 `cs/app-upgrade-config.json` 有变更，则创建 `chore/update-app-upgrade-config/` 分支，提交信息为 `🤖 chore: sync app-upgrade-config for `，并向 `cs-releases` 提 PR；无变更则输出提示。 + +### 手动触发指南 + +1. 进入 Cherry Studio 仓库的 GitHub **Actions** 页面，选择 **Update App Upgrade Config** 工作流。 +2. 点击 **Run workflow**，保持默认分支（通常为 `main`），填写 `tag`（如 `v2.1.0`）。 +3. 只有在 tag 带 `-beta`/`-rc` 后缀时才勾选 `is_prerelease`，稳定版保持默认。 +4. 启动运行并等待完成，随后到 `cs-releases` 分支的 PR 查看 `app-upgrade-config.json` 的变更并在验证后合并。 + +## JSON 配置文件格式 + +### 文件位置 + +- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json` +- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json` + +**说明**：两个镜像源提供相同的配置文件，统一托管在 `cs-releases` 分支上。客户端根据 IP 地理位置自动选择最优镜像源。 + +### 配置结构（当前实际配置） + +```json +{ + "lastUpdated": "2025-01-05T00:00:00Z", + "versions": { + "1.6.7": { + "minCompatibleVersion": "1.0.0", + "description": "Last stable v1.7.x release - required intermediate version for users below v1.7", + "channels": { + "latest": { + "version": "1.6.7", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v1.6.7" + } + }, + "rc": { + "version": "1.6.0-rc.5", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5" + } + }, + "beta": { + "version": "1.6.7-beta.3", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3", + "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3" + } + } + } + }, + "2.0.0": { + "minCompatibleVersion": "1.7.0", + "description": "Major release v2.0 - required intermediate version for v2.x upgrades", + "channels": { + "latest": null, + "rc": null, + "beta": null + } + } + } +} +``` + +### 未来扩展示例 + +当需要发布 v3.0 时，如果需要强制用户先升级到 v2.8，可以添加： + +```json +{ + "2.8.0": { + "minCompatibleVersion": "2.0.0", + "description": "Stable v2.8 - required for v3 upgrade", + "channels": { + "latest": { + "version": "2.8.0", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v2.8.0", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v2.8.0" + } + }, + "rc": null, + "beta": null + } + }, + "3.0.0": { + "minCompatibleVersion": "2.8.0", + "description": "Major release v3.0", + "channels": { + "latest": { + "version": "3.0.0", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/latest", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/latest" + } + }, + "rc": { + "version": "3.0.0-rc.1", + "feedUrls": { + "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1", + "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1" + } + }, + "beta": null + } + } +} +``` + +### 字段说明 + +- `lastUpdated`: 配置文件最后更新时间（ISO 8601 格式） +- `versions`: 版本配置对象，key 为版本号，按语义化版本排序 + - `minCompatibleVersion`: 可以升级到此版本的最低兼容版本 + - `description`: 版本描述 + - `channels`: 更新渠道配置 + - `latest`: 稳定版渠道 + - `rc`: Release Candidate 渠道 + - `beta`: Beta 测试渠道 + - 每个渠道包含： + - `version`: 该渠道的版本号 + - `feedUrls`: 多镜像源 URL 配置 + - `github`: GitHub 镜像源的 electron-updater feed URL + - `gitcode`: GitCode 镜像源的 electron-updater feed URL + - `metadata`: 自动化匹配所需的稳定标识 + - `segmentId`: 来自 `config/app-upgrade-segments.json` 的段位 ID + - `segmentType`: 可选字段（`legacy` | `breaking` | `latest`），便于文档/调试 + +## TypeScript 类型定义 + +```typescript +// 镜像源枚举 +enum UpdateMirror { + GITHUB = 'github', + GITCODE = 'gitcode' +} + +interface UpdateConfig { + lastUpdated: string + versions: { + [versionKey: string]: VersionConfig + } +} + +interface VersionConfig { + minCompatibleVersion: string + description: string + channels: { + latest: ChannelConfig | null + rc: ChannelConfig | null + beta: ChannelConfig | null + } + metadata?: { + segmentId: string + segmentType?: 'legacy' | 'breaking' | 'latest' + } +} + +interface ChannelConfig { + version: string + feedUrls: Record + // 等同于: + // feedUrls: { + // github: string + // gitcode: string + // } +} +``` + +## 段位元数据（Break Change 标记） + +- 所有段位定义（如 `legacy-v1`、`gateway-v2` 等）集中在 `config/app-upgrade-segments.json`，用于描述匹配范围、`segmentId`、`segmentType`、默认 `minCompatibleVersion/description` 以及各渠道的 URL 模板。 +- `versions` 下的每个节点都会带上 `metadata.segmentId`。自动脚本始终依据该 ID 来定位并更新条目，即便 key 从 `2.1.5` 切换到 `2.1.6` 也不会错位。 +- 如果某段需要锁死在特定版本（例如 `2.0.0` 的 break change），可在段定义中设置 `segmentType: "breaking"` 并提供 `lockedVersion`，脚本在遇到不匹配的 tag 时会短路报错，保证升级路径安全。 +- 面对未来新的断层（例如 `3.0.0`），只需要在段定义里新增一段，自动化即可识别并更新。 + +## 自动化工作流 + +`.github/workflows/update-app-upgrade-config.yml` 会在 GitHub Release（包含正常发布与 Pre Release）触发： + +1. 同时 Checkout 仓库默认分支（用于脚本）和 `cs-releases` 分支（真实托管配置的分支）。 +2. 在默认分支目录执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json`，直接重写 `cs-releases` 分支里的配置文件。 +3. 如果 `app-upgrade-config.json` 有变化，则通过 `peter-evans/create-pull-request` 自动创建一个指向 `cs-releases` 的 PR，Diff 仅包含该文件。 + +如需本地调试，可执行 `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json`（加 `--dry-run` 仅打印结果）来复现 CI 行为。若需要暂时跳过 GitHub/GitCode Release 页面是否就绪的校验，可在 `--dry-run` 的同时附加 `--skip-release-checks`。不加 `--config` 时默认更新当前工作目录（通常是 main 分支）下的副本，方便文档/审查。 + +## 版本匹配逻辑 + +### 算法流程 + +1. 获取用户当前版本（`currentVersion`）和请求的渠道（`requestedChannel`） +2. 获取配置文件中所有版本号，按语义化版本从大到小排序 +3. 遍历排序后的版本列表： + - 检查 `currentVersion >= minCompatibleVersion` + - 检查请求的 `channel` 是否存在且不为 `null` + - 如果满足条件，返回该渠道配置 +4. 如果没有找到匹配版本，返回 `null` + +### 伪代码实现 + +```typescript +function findCompatibleVersion( + currentVersion: string, + requestedChannel: UpgradeChannel, + config: UpdateConfig +): ChannelConfig | null { + // 获取所有版本号并从大到小排序 + const versions = Object.keys(config.versions).sort(semver.rcompare) + + for (const versionKey of versions) { + const versionConfig = config.versions[versionKey] + const channelConfig = versionConfig.channels[requestedChannel] + + // 检查版本兼容性和渠道可用性 + if ( + semver.gte(currentVersion, versionConfig.minCompatibleVersion) && + channelConfig !== null + ) { + return channelConfig + } + } + + return null // 没有找到兼容版本 +} +``` + +## 升级路径示例 + +### 场景 1: v1.6.5 用户升级（低于 1.7） + +- **当前版本**: 1.6.5 +- **请求渠道**: latest +- **匹配结果**: 1.7.0 +- **原因**: 1.6.5 >= 0.0.0（满足 1.7.0 的 minCompatibleVersion），但不满足 2.0.0 的 minCompatibleVersion (1.7.0) +- **操作**: 提示用户升级到 1.7.0，这是升级到 v2.x 的必要中间版本 + +### 场景 2: v1.6.5 用户请求 rc/beta + +- **当前版本**: 1.6.5 +- **请求渠道**: rc 或 beta +- **匹配结果**: 1.7.0 (latest) +- **原因**: 1.7.0 版本不提供 rc/beta 渠道（值为 null） +- **操作**: 升级到 1.7.0 稳定版 + +### 场景 3: v1.7.0 用户升级到最新版 + +- **当前版本**: 1.7.0 +- **请求渠道**: latest +- **匹配结果**: 2.0.0 +- **原因**: 1.7.0 >= 1.7.0（满足 2.0.0 的 minCompatibleVersion） +- **操作**: 直接升级到 2.0.0（当前最新稳定版） + +### 场景 4: v1.7.2 用户升级到 RC 版本 + +- **当前版本**: 1.7.2 +- **请求渠道**: rc +- **匹配结果**: 2.0.0-rc.1 +- **原因**: 1.7.2 >= 1.7.0（满足 2.0.0 的 minCompatibleVersion），且 rc 渠道存在 +- **操作**: 升级到 2.0.0-rc.1 + +### 场景 5: v1.7.0 用户升级到 Beta 版本 + +- **当前版本**: 1.7.0 +- **请求渠道**: beta +- **匹配结果**: 2.0.0-beta.1 +- **原因**: 1.7.0 >= 1.7.0，且 beta 渠道存在 +- **操作**: 升级到 2.0.0-beta.1 + +### 场景 6: v2.5.0 用户升级（未来） + +假设已添加 v2.8.0 和 v3.0.0 配置： +- **当前版本**: 2.5.0 +- **请求渠道**: latest +- **匹配结果**: 2.8.0 +- **原因**: 2.5.0 >= 2.0.0（满足 2.8.0 的 minCompatibleVersion），但不满足 3.0.0 的要求 +- **操作**: 提示用户升级到 2.8.0，这是升级到 v3.x 的必要中间版本 + +## 代码改动计划 + +### 主要修改 + +1. **新增方法** + - `_fetchUpdateConfig(ipCountry: string): Promise` - 根据 IP 获取配置文件 + - `_findCompatibleChannel(currentVersion: string, channel: UpgradeChannel, config: UpdateConfig): ChannelConfig | null` - 查找兼容的渠道配置 + +2. **修改方法** + - `_getReleaseVersionFromGithub()` → 移除或重构为 `_getChannelFeedUrl()` + - `_setFeedUrl()` - 使用新的配置系统替代现有逻辑 + +3. **新增类型定义** + - `UpdateConfig` + - `VersionConfig` + - `ChannelConfig` + +### 镜像源选择逻辑 + +客户端根据 IP 地理位置自动选择最优镜像源： + +```typescript +private async _setFeedUrl() { + const currentVersion = app.getVersion() + const testPlan = configManager.getTestPlan() + const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST + + // 根据 IP 国家确定镜像源 + const ipCountry = await getIpCountry() + const mirror = ipCountry.toLowerCase() === 'cn' ? 'gitcode' : 'github' + + // 获取更新配置 + const config = await this._fetchUpdateConfig(mirror) + + if (config) { + const channelConfig = this._findCompatibleChannel(currentVersion, requestedChannel, config) + if (channelConfig) { + // 从配置中选择对应镜像源的 URL + const feedUrl = channelConfig.feedUrls[mirror] + this._setChannel(requestedChannel, feedUrl) + return + } + } + + // Fallback 逻辑 + const defaultFeedUrl = mirror === 'gitcode' + ? FeedUrl.PRODUCTION + : FeedUrl.GITHUB_LATEST + this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl) +} + +private async _fetchUpdateConfig(mirror: 'github' | 'gitcode'): Promise { + const configUrl = mirror === 'gitcode' + ? UpdateConfigUrl.GITCODE + : UpdateConfigUrl.GITHUB + + try { + const response = await net.fetch(configUrl, { + headers: { + 'User-Agent': generateUserAgent(), + 'Accept': 'application/json', + 'X-Client-Id': configManager.getClientId() + } + }) + return await response.json() as UpdateConfig + } catch (error) { + logger.error('Failed to fetch update config:', error) + return null + } +} +``` + +## 降级和容错策略 + +1. **配置文件获取失败**: 记录错误日志，返回当前版本，不提供更新 +2. **没有匹配的版本**: 提示用户当前版本不支持自动升级 +3. **网络异常**: 缓存上次成功获取的配置（可选） + +## GitHub Release 要求 + +为支持中间版本升级，需要保留以下文件： + +- **v1.7.0 release** 及其 latest*.yml 文件（作为 v1.7 以下用户的升级目标） +- 未来如需强制中间版本（如 v2.8.0），需要保留对应的 release 和 latest*.yml 文件 +- 各版本的完整安装包 + +### 当前需要的 Release + +| 版本 | 用途 | 必须保留 | +|------|------|---------| +| v1.7.0 | 1.7 以下用户的升级目标 | ✅ 是 | +| v2.0.0-rc.1 | RC 测试渠道 | ❌ 可选 | +| v2.0.0-beta.1 | Beta 测试渠道 | ❌ 可选 | +| latest | 最新稳定版（自动） | ✅ 是 | + +## 优势 + +1. **灵活性**: 支持任意复杂的升级路径 +2. **可扩展性**: 新增版本只需在配置文件中添加新条目 +3. **可维护性**: 配置与代码分离，无需发版即可调整升级策略 +4. **多源支持**: 自动根据地理位置选择最优配置源 +5. **版本控制**: 强制中间版本升级，确保数据迁移和兼容性 + +## 未来扩展 + +- 支持更细粒度的版本范围控制（如 `>=1.5.0 <1.8.0`） +- 支持多步升级路径提示（如提示用户需要 1.5 → 1.8 → 2.0） +- 支持 A/B 测试和灰度发布 +- 支持配置文件的本地缓存和过期策略 diff --git a/electron-builder.yml b/electron-builder.yml index 2918179152..802c0d2c64 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -97,7 +97,6 @@ mac: entitlementsInherit: build/entitlements.mac.plist notarize: false artifactName: ${productName}-${version}-${arch}.${ext} - minimumSystemVersion: "20.1.0" # 最低支持 macOS 11.0 extendInfo: - NSCameraUsageDescription: Application requests access to the device's camera. - NSMicrophoneUsageDescription: Application requests access to the device's microphone. diff --git a/package.json b/package.json index 537d708f9e..2a0b557c61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CherryStudio", - "version": "1.7.0-beta.3", + "version": "1.6.5", "private": true, "description": "A powerful AI assistant for producer.", "main": "./out/main/index.js", @@ -58,6 +58,7 @@ "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts", "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts", "update:languages": "tsx scripts/update-languages.ts", + "update:upgrade-config": "tsx scripts/update-app-upgrade-config.ts", "test": "vitest run --silent", "test:main": "vitest run --project main", "test:renderer": "vitest run --project renderer", @@ -260,11 +261,11 @@ "drizzle-kit": "^0.31.4", "drizzle-orm": "^0.44.5", "electron": "38.7.0", - "electron-builder": "26.0.15", + "electron-builder": "26.1.0", "electron-devtools-installer": "^3.2.0", "electron-reload": "^2.0.0-alpha.1", "electron-store": "^8.2.0", - "electron-updater": "6.6.4", + "electron-updater": "patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch", "electron-vite": "4.0.1", "electron-window-state": "^5.0.3", "emittery": "^1.0.3", @@ -381,8 +382,6 @@ "@codemirror/lint": "6.8.5", "@codemirror/view": "6.38.1", "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch", - "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch", - "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch", "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch", "esbuild": "^0.25.0", "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch", diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts index 9d9240223a..e3d7af823d 100644 --- a/packages/shared/config/constant.ts +++ b/packages/shared/config/constant.ts @@ -197,12 +197,22 @@ export enum FeedUrl { GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download' } +export enum UpdateConfigUrl { + GITHUB = 'https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json', + GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json' +} + export enum UpgradeChannel { LATEST = 'latest', // 最新稳定版本 RC = 'rc', // 公测版本 BETA = 'beta' // 预览版本 } +export enum UpdateMirror { + GITHUB = 'github', + GITCODE = 'gitcode' +} + export const defaultTimeout = 10 * 1000 * 60 export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network'] diff --git a/scripts/update-app-upgrade-config.ts b/scripts/update-app-upgrade-config.ts new file mode 100644 index 0000000000..4fcfa647f7 --- /dev/null +++ b/scripts/update-app-upgrade-config.ts @@ -0,0 +1,532 @@ +import fs from 'fs/promises' +import path from 'path' +import semver from 'semver' + +type UpgradeChannel = 'latest' | 'rc' | 'beta' +type UpdateMirror = 'github' | 'gitcode' + +const CHANNELS: UpgradeChannel[] = ['latest', 'rc', 'beta'] +const MIRRORS: UpdateMirror[] = ['github', 'gitcode'] +const GITHUB_REPO = 'CherryHQ/cherry-studio' +const GITCODE_REPO = 'CherryHQ/cherry-studio' +const DEFAULT_FEED_TEMPLATES: Record = { + github: `https://github.com/${GITHUB_REPO}/releases/download/{{tag}}`, + gitcode: `https://gitcode.com/${GITCODE_REPO}/releases/download/{{tag}}` +} +const GITCODE_LATEST_FALLBACK = 'https://releases.cherry-ai.com' + +interface CliOptions { + tag?: string + configPath?: string + segmentsPath?: string + dryRun?: boolean + skipReleaseChecks?: boolean + isPrerelease?: boolean +} + +interface ChannelTemplateConfig { + feedTemplates?: Partial> +} + +interface SegmentMatchRule { + range?: string + exact?: string[] + excludeExact?: string[] +} + +interface SegmentDefinition { + id: string + type: 'legacy' | 'breaking' | 'latest' + match: SegmentMatchRule + lockedVersion?: string + minCompatibleVersion: string + description: string + channelTemplates?: Partial> +} + +interface SegmentMetadataFile { + segments: SegmentDefinition[] +} + +interface ChannelConfig { + version: string + feedUrls: Record +} + +interface VersionMetadata { + segmentId: string + segmentType?: string +} + +interface VersionEntry { + metadata?: VersionMetadata + minCompatibleVersion: string + description: string + channels: Record +} + +interface UpgradeConfigFile { + lastUpdated: string + versions: Record +} + +interface ReleaseInfo { + tag: string + version: string + channel: UpgradeChannel +} + +interface UpdateVersionsResult { + versions: Record + updated: boolean +} + +const ROOT_DIR = path.resolve(__dirname, '..') +const DEFAULT_CONFIG_PATH = path.join(ROOT_DIR, 'app-upgrade-config.json') +const DEFAULT_SEGMENTS_PATH = path.join(ROOT_DIR, 'config/app-upgrade-segments.json') + +async function main() { + const options = parseArgs() + const releaseTag = resolveTag(options) + const normalizedVersion = normalizeVersion(releaseTag) + const releaseChannel = detectChannel(normalizedVersion) + if (!releaseChannel) { + console.warn(`[update-app-upgrade-config] Tag ${normalizedVersion} does not map to beta/rc/latest. Skipping.`) + return + } + + // Validate version format matches prerelease status + if (options.isPrerelease !== undefined) { + const hasPrereleaseSuffix = releaseChannel === 'beta' || releaseChannel === 'rc' + + if (options.isPrerelease && !hasPrereleaseSuffix) { + console.warn( + `[update-app-upgrade-config] ⚠️ Release marked as prerelease but version ${normalizedVersion} has no beta/rc suffix. Skipping.` + ) + return + } + + if (!options.isPrerelease && hasPrereleaseSuffix) { + console.warn( + `[update-app-upgrade-config] ⚠️ Release marked as latest but version ${normalizedVersion} has prerelease suffix (${releaseChannel}). Skipping.` + ) + return + } + } + + const [config, segmentFile] = await Promise.all([ + readJson(options.configPath ?? DEFAULT_CONFIG_PATH), + readJson(options.segmentsPath ?? DEFAULT_SEGMENTS_PATH) + ]) + + const segment = pickSegment(segmentFile.segments, normalizedVersion) + if (!segment) { + throw new Error(`Unable to find upgrade segment for version ${normalizedVersion}`) + } + + if (segment.lockedVersion && segment.lockedVersion !== normalizedVersion) { + throw new Error(`Segment ${segment.id} is locked to ${segment.lockedVersion}, but received ${normalizedVersion}`) + } + + const releaseInfo: ReleaseInfo = { + tag: formatTag(releaseTag), + version: normalizedVersion, + channel: releaseChannel + } + + const { versions: updatedVersions, updated } = await updateVersions( + config.versions, + segment, + releaseInfo, + Boolean(options.skipReleaseChecks) + ) + + if (!updated) { + throw new Error( + `[update-app-upgrade-config] Feed URLs are not ready for ${releaseInfo.version} (${releaseInfo.channel}). Try again after the release mirrors finish syncing.` + ) + } + + const updatedConfig: UpgradeConfigFile = { + ...config, + lastUpdated: new Date().toISOString(), + versions: updatedVersions + } + + const output = JSON.stringify(updatedConfig, null, 2) + '\n' + + if (options.dryRun) { + console.log('Dry run enabled. Generated configuration:\n') + console.log(output) + return + } + + await fs.writeFile(options.configPath ?? DEFAULT_CONFIG_PATH, output, 'utf-8') + console.log( + `✅ Updated ${path.relative(process.cwd(), options.configPath ?? DEFAULT_CONFIG_PATH)} for ${segment.id} (${releaseInfo.channel}) -> ${releaseInfo.version}` + ) +} + +function parseArgs(): CliOptions { + const args = process.argv.slice(2) + const options: CliOptions = {} + + for (let i = 0; i < args.length; i += 1) { + const arg = args[i] + if (arg === '--tag') { + options.tag = args[i + 1] + i += 1 + } else if (arg === '--config') { + options.configPath = args[i + 1] + i += 1 + } else if (arg === '--segments') { + options.segmentsPath = args[i + 1] + i += 1 + } else if (arg === '--dry-run') { + options.dryRun = true + } else if (arg === '--skip-release-checks') { + options.skipReleaseChecks = true + } else if (arg === '--is-prerelease') { + options.isPrerelease = args[i + 1] === 'true' + i += 1 + } else if (arg === '--help') { + printHelp() + process.exit(0) + } else { + console.warn(`Ignoring unknown argument "${arg}"`) + } + } + + if (options.skipReleaseChecks && !options.dryRun) { + throw new Error('--skip-release-checks can only be used together with --dry-run') + } + + return options +} + +function printHelp() { + console.log(`Usage: tsx scripts/update-app-upgrade-config.ts [options] + +Options: + --tag Release tag (e.g. v2.1.6). Falls back to GITHUB_REF_NAME/RELEASE_TAG. + --config Path to app-upgrade-config.json. + --segments Path to app-upgrade-segments.json. + --is-prerelease Whether this is a prerelease (validates version format). + --dry-run Print the result without writing to disk. + --skip-release-checks Skip release page availability checks (only valid with --dry-run). + --help Show this help message.`) +} + +function resolveTag(options: CliOptions): string { + const envTag = process.env.RELEASE_TAG ?? process.env.GITHUB_REF_NAME ?? process.env.TAG_NAME + const tag = options.tag ?? envTag + + if (!tag) { + throw new Error('A release tag is required. Pass --tag or set RELEASE_TAG/GITHUB_REF_NAME.') + } + + return tag +} + +function normalizeVersion(tag: string): string { + const cleaned = semver.clean(tag, { loose: true }) + if (!cleaned) { + throw new Error(`Tag "${tag}" is not a valid semantic version`) + } + + const valid = semver.valid(cleaned, { loose: true }) + if (!valid) { + throw new Error(`Unable to normalize tag "${tag}" to a valid semantic version`) + } + + return valid +} + +function detectChannel(version: string): UpgradeChannel | null { + const parsed = semver.parse(version, { loose: true, includePrerelease: true }) + if (!parsed) { + return null + } + + if (parsed.prerelease.length === 0) { + return 'latest' + } + + const label = String(parsed.prerelease[0]).toLowerCase() + if (label === 'beta') { + return 'beta' + } + if (label === 'rc') { + return 'rc' + } + + return null +} + +async function readJson(filePath: string): Promise { + const absolute = path.isAbsolute(filePath) ? filePath : path.resolve(filePath) + const data = await fs.readFile(absolute, 'utf-8') + return JSON.parse(data) as T +} + +function pickSegment(segments: SegmentDefinition[], version: string): SegmentDefinition | null { + for (const segment of segments) { + if (matchesSegment(segment.match, version)) { + return segment + } + } + return null +} + +function matchesSegment(matchRule: SegmentMatchRule, version: string): boolean { + if (matchRule.exact && matchRule.exact.includes(version)) { + return true + } + + if (matchRule.excludeExact && matchRule.excludeExact.includes(version)) { + return false + } + + if (matchRule.range && !semver.satisfies(version, matchRule.range, { includePrerelease: true })) { + return false + } + + if (matchRule.exact) { + return matchRule.exact.includes(version) + } + + return Boolean(matchRule.range) +} + +function formatTag(tag: string): string { + if (tag.startsWith('refs/tags/')) { + return tag.replace('refs/tags/', '') + } + return tag +} + +async function updateVersions( + versions: Record, + segment: SegmentDefinition, + releaseInfo: ReleaseInfo, + skipReleaseValidation: boolean +): Promise { + const versionsCopy: Record = { ...versions } + const existingKey = findVersionKeyBySegment(versionsCopy, segment.id) + const targetKey = resolveVersionKey(existingKey, segment, releaseInfo) + const shouldRename = existingKey && existingKey !== targetKey + + let entry: VersionEntry + if (existingKey) { + entry = { ...versionsCopy[existingKey], channels: { ...versionsCopy[existingKey].channels } } + } else { + entry = createEmptyVersionEntry() + } + + entry.channels = ensureChannelSlots(entry.channels) + + const channelUpdated = await applyChannelUpdate(entry, segment, releaseInfo, skipReleaseValidation) + if (!channelUpdated) { + return { versions, updated: false } + } + + if (shouldRename && existingKey) { + delete versionsCopy[existingKey] + } + + entry.metadata = { + segmentId: segment.id, + segmentType: segment.type + } + entry.minCompatibleVersion = segment.minCompatibleVersion + entry.description = segment.description + + versionsCopy[targetKey] = entry + return { + versions: sortVersionMap(versionsCopy), + updated: true + } +} + +function findVersionKeyBySegment(versions: Record, segmentId: string): string | null { + for (const [key, value] of Object.entries(versions)) { + if (value.metadata?.segmentId === segmentId) { + return key + } + } + return null +} + +function resolveVersionKey(existingKey: string | null, segment: SegmentDefinition, releaseInfo: ReleaseInfo): string { + if (segment.lockedVersion) { + return segment.lockedVersion + } + + if (releaseInfo.channel === 'latest') { + return releaseInfo.version + } + + if (existingKey) { + return existingKey + } + + const baseVersion = getBaseVersion(releaseInfo.version) + return baseVersion ?? releaseInfo.version +} + +function getBaseVersion(version: string): string | null { + const parsed = semver.parse(version, { loose: true, includePrerelease: true }) + if (!parsed) { + return null + } + return `${parsed.major}.${parsed.minor}.${parsed.patch}` +} + +function createEmptyVersionEntry(): VersionEntry { + return { + minCompatibleVersion: '', + description: '', + channels: { + latest: null, + rc: null, + beta: null + } + } +} + +function ensureChannelSlots( + channels: Record +): Record { + return CHANNELS.reduce( + (acc, channel) => { + acc[channel] = channels[channel] ?? null + return acc + }, + {} as Record + ) +} + +async function applyChannelUpdate( + entry: VersionEntry, + segment: SegmentDefinition, + releaseInfo: ReleaseInfo, + skipReleaseValidation: boolean +): Promise { + if (!CHANNELS.includes(releaseInfo.channel)) { + throw new Error(`Unsupported channel "${releaseInfo.channel}"`) + } + + const feedUrls = buildFeedUrls(segment, releaseInfo) + + if (skipReleaseValidation) { + console.warn( + `[update-app-upgrade-config] Skipping release availability validation for ${releaseInfo.version} (${releaseInfo.channel}).` + ) + } else { + const availability = await ensureReleaseAvailability(releaseInfo) + if (!availability.github) { + return false + } + if (releaseInfo.channel === 'latest' && !availability.gitcode) { + console.warn( + `[update-app-upgrade-config] gitcode release page not ready for ${releaseInfo.tag}. Falling back to ${GITCODE_LATEST_FALLBACK}.` + ) + feedUrls.gitcode = GITCODE_LATEST_FALLBACK + } + } + + entry.channels[releaseInfo.channel] = { + version: releaseInfo.version, + feedUrls + } + + return true +} + +function buildFeedUrls(segment: SegmentDefinition, releaseInfo: ReleaseInfo): Record { + return MIRRORS.reduce( + (acc, mirror) => { + const template = resolveFeedTemplate(segment, releaseInfo, mirror) + acc[mirror] = applyTemplate(template, releaseInfo) + return acc + }, + {} as Record + ) +} + +function resolveFeedTemplate(segment: SegmentDefinition, releaseInfo: ReleaseInfo, mirror: UpdateMirror): string { + if (mirror === 'gitcode' && releaseInfo.channel !== 'latest') { + return segment.channelTemplates?.[releaseInfo.channel]?.feedTemplates?.github ?? DEFAULT_FEED_TEMPLATES.github + } + + return segment.channelTemplates?.[releaseInfo.channel]?.feedTemplates?.[mirror] ?? DEFAULT_FEED_TEMPLATES[mirror] +} + +function applyTemplate(template: string, releaseInfo: ReleaseInfo): string { + return template.replace(/{{\s*tag\s*}}/gi, releaseInfo.tag).replace(/{{\s*version\s*}}/gi, releaseInfo.version) +} + +function sortVersionMap(versions: Record): Record { + const sorted = Object.entries(versions).sort(([a], [b]) => semver.rcompare(a, b)) + return sorted.reduce( + (acc, [version, entry]) => { + acc[version] = entry + return acc + }, + {} as Record + ) +} + +interface ReleaseAvailability { + github: boolean + gitcode: boolean +} + +async function ensureReleaseAvailability(releaseInfo: ReleaseInfo): Promise { + const mirrorsToCheck: UpdateMirror[] = releaseInfo.channel === 'latest' ? MIRRORS : ['github'] + const availability: ReleaseAvailability = { + github: false, + gitcode: releaseInfo.channel === 'latest' ? false : true + } + + for (const mirror of mirrorsToCheck) { + const url = getReleasePageUrl(mirror, releaseInfo.tag) + try { + const response = await fetch(url, { + method: mirror === 'github' ? 'HEAD' : 'GET', + redirect: 'follow' + }) + + if (response.ok) { + availability[mirror] = true + } else { + console.warn( + `[update-app-upgrade-config] ${mirror} release not available for ${releaseInfo.tag} (status ${response.status}, ${url}).` + ) + availability[mirror] = false + } + } catch (error) { + console.warn( + `[update-app-upgrade-config] Failed to verify ${mirror} release page for ${releaseInfo.tag} (${url}). Continuing.`, + error + ) + availability[mirror] = false + } + } + + return availability +} + +function getReleasePageUrl(mirror: UpdateMirror, tag: string): string { + if (mirror === 'github') { + return `https://github.com/${GITHUB_REPO}/releases/tag/${encodeURIComponent(tag)}` + } + // Use latest.yml download URL for GitCode to check if release exists + // Note: GitCode returns 401 for HEAD requests, so we use GET in ensureReleaseAvailability + return `https://gitcode.com/${GITCODE_REPO}/releases/download/${encodeURIComponent(tag)}/latest.yml` +} + +main().catch((error) => { + console.error('❌ Failed to update app-upgrade-config:', error) + process.exit(1) +}) diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index 168084bd32..57dc3fb2a8 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -2,7 +2,7 @@ import { loggerService } from '@logger' import { isWin } from '@main/constant' import { getIpCountry } from '@main/utils/ipService' import { generateUserAgent } from '@main/utils/systemInfo' -import { FeedUrl, UpgradeChannel } from '@shared/config/constant' +import { FeedUrl, UpdateConfigUrl, UpdateMirror, UpgradeChannel } from '@shared/config/constant' import { IpcChannel } from '@shared/IpcChannel' import type { UpdateInfo } from 'builder-util-runtime' import { CancellationToken } from 'builder-util-runtime' @@ -22,7 +22,29 @@ const LANG_MARKERS = { EN_START: '', ZH_CN_START: '', END: '' -} as const +} + +interface UpdateConfig { + lastUpdated: string + versions: { + [versionKey: string]: VersionConfig + } +} + +interface VersionConfig { + minCompatibleVersion: string + description: string + channels: { + latest: ChannelConfig | null + rc: ChannelConfig | null + beta: ChannelConfig | null + } +} + +interface ChannelConfig { + version: string + feedUrls: Record +} export default class AppUpdater { autoUpdater: _AppUpdater = autoUpdater @@ -37,7 +59,9 @@ export default class AppUpdater { autoUpdater.requestHeaders = { ...autoUpdater.requestHeaders, 'User-Agent': generateUserAgent(), - 'X-Client-Id': configManager.getClientId() + 'X-Client-Id': configManager.getClientId(), + // no-cache + 'Cache-Control': 'no-cache' } autoUpdater.on('error', (error) => { @@ -75,61 +99,6 @@ export default class AppUpdater { this.autoUpdater = autoUpdater } - private async _getReleaseVersionFromGithub(channel: UpgradeChannel) { - const headers = { - Accept: 'application/vnd.github+json', - 'X-GitHub-Api-Version': '2022-11-28', - 'Accept-Language': 'en-US,en;q=0.9' - } - try { - logger.info(`get release version from github: ${channel}`) - const responses = await net.fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', { - headers - }) - const data = (await responses.json()) as GithubReleaseInfo[] - let mightHaveLatest = false - const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => { - if (!item.draft && !item.prerelease) { - mightHaveLatest = true - } - - return item.prerelease && item.tag_name.includes(`-${channel}.`) - }) - - if (!release) { - return null - } - - // if the release version is the same as the current version, return null - if (release.tag_name === app.getVersion()) { - return null - } - - if (mightHaveLatest) { - logger.info(`might have latest release, get latest release`) - const latestReleaseResponse = await net.fetch( - 'https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest', - { - headers - } - ) - const latestRelease = (await latestReleaseResponse.json()) as GithubReleaseInfo - if (semver.gt(latestRelease.tag_name, release.tag_name)) { - logger.info( - `latest release version is ${latestRelease.tag_name}, prerelease version is ${release.tag_name}, return null` - ) - return null - } - } - - logger.info(`release url is ${release.tag_name}, set channel to ${channel}`) - return `https://github.com/CherryHQ/cherry-studio/releases/download/${release.tag_name}` - } catch (error) { - logger.error('Failed to get latest not draft version from github:', error as Error) - return null - } - } - public setAutoUpdate(isActive: boolean) { autoUpdater.autoDownload = isActive autoUpdater.autoInstallOnAppQuit = isActive @@ -161,6 +130,88 @@ export default class AppUpdater { return UpgradeChannel.LATEST } + /** + * Fetch update configuration from GitHub or GitCode based on mirror + * @param mirror - Mirror to fetch config from + * @returns UpdateConfig object or null if fetch fails + */ + private async _fetchUpdateConfig(mirror: UpdateMirror): Promise { + const configUrl = mirror === UpdateMirror.GITCODE ? UpdateConfigUrl.GITCODE : UpdateConfigUrl.GITHUB + + try { + logger.info(`Fetching update config from ${configUrl} (mirror: ${mirror})`) + const response = await net.fetch(configUrl, { + headers: { + 'User-Agent': generateUserAgent(), + Accept: 'application/json', + 'X-Client-Id': configManager.getClientId(), + // no-cache + 'Cache-Control': 'no-cache' + } + }) + + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`) + } + + const config = (await response.json()) as UpdateConfig + logger.info(`Update config fetched successfully, last updated: ${config.lastUpdated}`) + return config + } catch (error) { + logger.error('Failed to fetch update config:', error as Error) + return null + } + } + + /** + * Find compatible channel configuration based on current version + * @param currentVersion - Current app version + * @param requestedChannel - Requested upgrade channel (latest/rc/beta) + * @param config - Update configuration object + * @returns Object containing ChannelConfig and actual channel if found, null otherwise + */ + private _findCompatibleChannel( + currentVersion: string, + requestedChannel: UpgradeChannel, + config: UpdateConfig + ): { config: ChannelConfig; channel: UpgradeChannel } | null { + // Get all version keys and sort descending (newest first) + const versionKeys = Object.keys(config.versions).sort(semver.rcompare) + + logger.info( + `Finding compatible channel for version ${currentVersion}, requested channel: ${requestedChannel}, available versions: ${versionKeys.join(', ')}` + ) + + for (const versionKey of versionKeys) { + const versionConfig = config.versions[versionKey] + const channelConfig = versionConfig.channels[requestedChannel] + const latestChannelConfig = versionConfig.channels[UpgradeChannel.LATEST] + + // Check version compatibility and channel availability + if (semver.gte(currentVersion, versionConfig.minCompatibleVersion) && channelConfig !== null) { + logger.info( + `Found compatible version: ${versionKey} (minCompatibleVersion: ${versionConfig.minCompatibleVersion}), version: ${channelConfig.version}` + ) + + if ( + requestedChannel !== UpgradeChannel.LATEST && + latestChannelConfig && + semver.gte(latestChannelConfig.version, channelConfig.version) + ) { + logger.info( + `latest channel version is greater than the requested channel version: ${latestChannelConfig.version} > ${channelConfig.version}, using latest instead` + ) + return { config: latestChannelConfig, channel: UpgradeChannel.LATEST } + } + + return { config: channelConfig, channel: requestedChannel } + } + } + + logger.warn(`No compatible channel found for version ${currentVersion} and channel ${requestedChannel}`) + return null + } + private _setChannel(channel: UpgradeChannel, feedUrl: string) { this.autoUpdater.channel = channel this.autoUpdater.setFeedURL(feedUrl) @@ -172,33 +223,42 @@ export default class AppUpdater { } private async _setFeedUrl() { + const currentVersion = app.getVersion() const testPlan = configManager.getTestPlan() - if (testPlan) { - const channel = this._getTestChannel() + const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST - if (channel === UpgradeChannel.LATEST) { - this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST) - return - } - - const releaseUrl = await this._getReleaseVersionFromGithub(channel) - if (releaseUrl) { - logger.info(`release url is ${releaseUrl}, set channel to ${channel}`) - this._setChannel(channel, releaseUrl) - return - } - - // if no prerelease url, use github latest to get release - this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST) - return - } - - this._setChannel(UpgradeChannel.LATEST, FeedUrl.PRODUCTION) + // Determine mirror based on IP country const ipCountry = await getIpCountry() - logger.info(`ipCountry is ${ipCountry}, set channel to ${UpgradeChannel.LATEST}`) - if (ipCountry.toLowerCase() !== 'cn') { - this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST) + const mirror = ipCountry.toLowerCase() === 'cn' ? UpdateMirror.GITCODE : UpdateMirror.GITHUB + + logger.info( + `Setting feed URL for version ${currentVersion}, testPlan: ${testPlan}, requested channel: ${requestedChannel}, mirror: ${mirror} (IP country: ${ipCountry})` + ) + + // Try to fetch update config from remote + const config = await this._fetchUpdateConfig(mirror) + + if (config) { + // Use new config-based system + const result = this._findCompatibleChannel(currentVersion, requestedChannel, config) + + if (result) { + const { config: channelConfig, channel: actualChannel } = result + const feedUrl = channelConfig.feedUrls[mirror] + logger.info( + `Using config-based feed URL: ${feedUrl} for channel ${actualChannel} (requested: ${requestedChannel}, mirror: ${mirror})` + ) + this._setChannel(actualChannel, feedUrl) + return + } } + + logger.info('Failed to fetch update config, falling back to default feed URL') + // Fallback: use default feed URL based on mirror + const defaultFeedUrl = mirror === UpdateMirror.GITCODE ? FeedUrl.PRODUCTION : FeedUrl.GITHUB_LATEST + + logger.info(`Using fallback feed URL: ${defaultFeedUrl}`) + this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl) } public cancelDownload() { @@ -320,8 +380,3 @@ export default class AppUpdater { return processedInfo } } -interface GithubReleaseInfo { - draft: boolean - prerelease: boolean - tag_name: string -} diff --git a/src/main/services/__tests__/AppUpdater.test.ts b/src/main/services/__tests__/AppUpdater.test.ts index 1be0e2f486..f7de00475a 100644 --- a/src/main/services/__tests__/AppUpdater.test.ts +++ b/src/main/services/__tests__/AppUpdater.test.ts @@ -85,6 +85,9 @@ vi.mock('electron-updater', () => ({ })) // Import after mocks +import { UpdateMirror } from '@shared/config/constant' +import { app, net } from 'electron' + import AppUpdater from '../AppUpdater' import { configManager } from '../ConfigManager' @@ -274,4 +277,711 @@ describe('AppUpdater', () => { expect(result.releaseNotes).toBeNull() }) }) + + describe('_fetchUpdateConfig', () => { + const mockConfig = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.6.7': { + minCompatibleVersion: '1.0.0', + description: 'Test version', + channels: { + latest: { + version: '1.6.7', + feedUrls: { + github: 'https://github.com/test/v1.6.7', + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: null, + beta: null + } + } + } + } + + it('should fetch config from GitHub mirror', async () => { + vi.mocked(net.fetch).mockResolvedValue({ + ok: true, + json: async () => mockConfig + } as any) + + const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB) + + expect(result).toEqual(mockConfig) + expect(net.fetch).toHaveBeenCalledWith(expect.stringContaining('github'), expect.any(Object)) + }) + + it('should fetch config from GitCode mirror', async () => { + vi.mocked(net.fetch).mockResolvedValue({ + ok: true, + json: async () => mockConfig + } as any) + + const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITCODE) + + expect(result).toEqual(mockConfig) + // GitCode URL may vary, just check that fetch was called + expect(net.fetch).toHaveBeenCalledWith(expect.any(String), expect.any(Object)) + }) + + it('should return null on HTTP error', async () => { + vi.mocked(net.fetch).mockResolvedValue({ + ok: false, + status: 404 + } as any) + + const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB) + + expect(result).toBeNull() + }) + + it('should return null on network error', async () => { + vi.mocked(net.fetch).mockRejectedValue(new Error('Network error')) + + const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB) + + expect(result).toBeNull() + }) + }) + + describe('_findCompatibleChannel', () => { + const mockConfig = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.6.7': { + minCompatibleVersion: '1.0.0', + description: 'v1.6.7', + channels: { + latest: { + version: '1.6.7', + feedUrls: { + github: 'https://github.com/test/v1.6.7', + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: { + version: '1.7.0-rc.1', + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }, + beta: { + version: '1.7.0-beta.3', + feedUrls: { + github: 'https://github.com/test/v1.7.0-beta.3', + gitcode: 'https://gitcode.com/test/v1.7.0-beta.3' + } + } + } + }, + '2.0.0': { + minCompatibleVersion: '1.7.0', + description: 'v2.0.0', + channels: { + latest: null, + rc: null, + beta: null + } + } + } + } + + it('should find compatible latest channel', () => { + vi.mocked(app.getVersion).mockReturnValue('1.5.0') + + const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'latest', mockConfig) + + expect(result?.config).toEqual({ + version: '1.6.7', + feedUrls: { + github: 'https://github.com/test/v1.6.7', + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }) + expect(result?.channel).toBe('latest') + }) + + it('should find compatible rc channel', () => { + vi.mocked(app.getVersion).mockReturnValue('1.5.0') + + const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'rc', mockConfig) + + expect(result?.config).toEqual({ + version: '1.7.0-rc.1', + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }) + expect(result?.channel).toBe('rc') + }) + + it('should find compatible beta channel', () => { + vi.mocked(app.getVersion).mockReturnValue('1.5.0') + + const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'beta', mockConfig) + + expect(result?.config).toEqual({ + version: '1.7.0-beta.3', + feedUrls: { + github: 'https://github.com/test/v1.7.0-beta.3', + gitcode: 'https://gitcode.com/test/v1.7.0-beta.3' + } + }) + expect(result?.channel).toBe('beta') + }) + + it('should return latest when latest version >= rc version', () => { + const configWithNewerLatest = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.0': { + minCompatibleVersion: '1.0.0', + description: 'v1.7.0', + channels: { + latest: { + version: '1.7.0', + feedUrls: { + github: 'https://github.com/test/v1.7.0', + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }, + rc: { + version: '1.7.0-rc.1', + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }, + beta: null + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'rc', configWithNewerLatest) + + // Should return latest instead of rc because 1.7.0 >= 1.7.0-rc.1 + expect(result?.config).toEqual({ + version: '1.7.0', + feedUrls: { + github: 'https://github.com/test/v1.7.0', + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }) + expect(result?.channel).toBe('latest') // ✅ 返回 latest 频道 + }) + + it('should return latest when latest version >= beta version', () => { + const configWithNewerLatest = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.0': { + minCompatibleVersion: '1.0.0', + description: 'v1.7.0', + channels: { + latest: { + version: '1.7.0', + + feedUrls: { + github: 'https://github.com/test/v1.7.0', + + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }, + rc: null, + beta: { + version: '1.6.8-beta.1', + + feedUrls: { + github: 'https://github.com/test/v1.6.8-beta.1', + + gitcode: 'https://gitcode.com/test/v1.6.8-beta.1' + } + } + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'beta', configWithNewerLatest) + + // Should return latest instead of beta because 1.7.0 >= 1.6.8-beta.1 + expect(result?.config).toEqual({ + version: '1.7.0', + + feedUrls: { + github: 'https://github.com/test/v1.7.0', + + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }) + }) + + it('should not compare latest with itself when requesting latest channel', () => { + const config = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.0': { + minCompatibleVersion: '1.0.0', + description: 'v1.7.0', + channels: { + latest: { + version: '1.7.0', + + feedUrls: { + github: 'https://github.com/test/v1.7.0', + + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }, + rc: { + version: '1.7.0-rc.1', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }, + beta: null + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'latest', config) + + // Should return latest directly without comparing with itself + expect(result?.config).toEqual({ + version: '1.7.0', + + feedUrls: { + github: 'https://github.com/test/v1.7.0', + + gitcode: 'https://gitcode.com/test/v1.7.0' + } + }) + }) + + it('should return rc when rc version > latest version', () => { + const configWithNewerRc = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.0': { + minCompatibleVersion: '1.0.0', + description: 'v1.7.0', + channels: { + latest: { + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: { + version: '1.7.0-rc.1', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }, + beta: null + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'rc', configWithNewerRc) + + // Should return rc because 1.7.0-rc.1 > 1.6.7 + expect(result?.config).toEqual({ + version: '1.7.0-rc.1', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }) + }) + + it('should return beta when beta version > latest version', () => { + const configWithNewerBeta = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.0': { + minCompatibleVersion: '1.0.0', + description: 'v1.7.0', + channels: { + latest: { + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: null, + beta: { + version: '1.7.0-beta.5', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-beta.5', + + gitcode: 'https://gitcode.com/test/v1.7.0-beta.5' + } + } + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'beta', configWithNewerBeta) + + // Should return beta because 1.7.0-beta.5 > 1.6.7 + expect(result?.config).toEqual({ + version: '1.7.0-beta.5', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-beta.5', + + gitcode: 'https://gitcode.com/test/v1.7.0-beta.5' + } + }) + }) + + it('should return lower version when higher version has no compatible channel', () => { + vi.mocked(app.getVersion).mockReturnValue('1.8.0') + + const result = (appUpdater as any)._findCompatibleChannel('1.8.0', 'latest', mockConfig) + + // 1.8.0 >= 1.7.0 but 2.0.0 has no latest channel, so return 1.6.7 + expect(result?.config).toEqual({ + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }) + }) + + it('should return null when current version does not meet minCompatibleVersion', () => { + vi.mocked(app.getVersion).mockReturnValue('0.9.0') + + const result = (appUpdater as any)._findCompatibleChannel('0.9.0', 'latest', mockConfig) + + // 0.9.0 < 1.0.0 (minCompatibleVersion) + expect(result).toBeNull() + }) + + it('should return lower version rc when higher version has no rc channel', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.8.0', 'rc', mockConfig) + + // 1.8.0 >= 1.7.0 but 2.0.0 has no rc channel, so return 1.6.7 rc + expect(result?.config).toEqual({ + version: '1.7.0-rc.1', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }) + }) + + it('should return null when no version has the requested channel', () => { + const configWithoutRc = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.6.7': { + minCompatibleVersion: '1.0.0', + description: 'v1.6.7', + channels: { + latest: { + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: null, + beta: null + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'rc', configWithoutRc) + + expect(result).toBeNull() + }) + }) + + describe('Upgrade Path', () => { + const fullConfig = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.6.7': { + minCompatibleVersion: '1.0.0', + description: 'Last v1.x', + channels: { + latest: { + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }, + rc: { + version: '1.7.0-rc.1', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-rc.1', + + gitcode: 'https://gitcode.com/test/v1.7.0-rc.1' + } + }, + beta: { + version: '1.7.0-beta.3', + + feedUrls: { + github: 'https://github.com/test/v1.7.0-beta.3', + + gitcode: 'https://gitcode.com/test/v1.7.0-beta.3' + } + } + } + }, + '2.0.0': { + minCompatibleVersion: '1.7.0', + description: 'First v2.x', + channels: { + latest: null, + rc: null, + beta: null + } + } + } + } + + it('should upgrade from 1.6.3 to 1.6.7', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullConfig) + + expect(result?.config).toEqual({ + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }) + }) + + it('should block upgrade from 1.6.7 to 2.0.0 (minCompatibleVersion not met)', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.6.7', 'latest', fullConfig) + + // Should return 1.6.7, not 2.0.0, because 1.6.7 < 1.7.0 (minCompatibleVersion of 2.0.0) + expect(result?.config).toEqual({ + version: '1.6.7', + + feedUrls: { + github: 'https://github.com/test/v1.6.7', + + gitcode: 'https://gitcode.com/test/v1.6.7' + } + }) + }) + + it('should allow upgrade from 1.7.0 to 2.0.0', () => { + const configWith2x = { + ...fullConfig, + versions: { + ...fullConfig.versions, + '2.0.0': { + minCompatibleVersion: '1.7.0', + description: 'First v2.x', + channels: { + latest: { + version: '2.0.0', + + feedUrls: { + github: 'https://github.com/test/v2.0.0', + + gitcode: 'https://gitcode.com/test/v2.0.0' + } + }, + rc: null, + beta: null + } + } + } + } + + const result = (appUpdater as any)._findCompatibleChannel('1.7.0', 'latest', configWith2x) + + expect(result?.config).toEqual({ + version: '2.0.0', + + feedUrls: { + github: 'https://github.com/test/v2.0.0', + + gitcode: 'https://gitcode.com/test/v2.0.0' + } + }) + }) + }) + + describe('Complete Multi-Step Upgrade Path', () => { + const fullUpgradeConfig = { + lastUpdated: '2025-01-05T00:00:00Z', + versions: { + '1.7.5': { + minCompatibleVersion: '1.0.0', + description: 'Last v1.x stable', + channels: { + latest: { + version: '1.7.5', + + feedUrls: { + github: 'https://github.com/test/v1.7.5', + + gitcode: 'https://gitcode.com/test/v1.7.5' + } + }, + rc: null, + beta: null + } + }, + '2.0.0': { + minCompatibleVersion: '1.7.0', + description: 'First v2.x - intermediate version', + channels: { + latest: { + version: '2.0.0', + + feedUrls: { + github: 'https://github.com/test/v2.0.0', + + gitcode: 'https://gitcode.com/test/v2.0.0' + } + }, + rc: null, + beta: null + } + }, + '2.1.6': { + minCompatibleVersion: '2.0.0', + description: 'Current v2.x stable', + channels: { + latest: { + version: '2.1.6', + + feedUrls: { + github: 'https://github.com/test/latest', + + gitcode: 'https://gitcode.com/test/latest' + } + }, + rc: null, + beta: null + } + } + } + } + + it('should upgrade from 1.6.3 to 1.7.5 (step 1)', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullUpgradeConfig) + + expect(result?.config).toEqual({ + version: '1.7.5', + + feedUrls: { + github: 'https://github.com/test/v1.7.5', + + gitcode: 'https://gitcode.com/test/v1.7.5' + } + }) + }) + + it('should upgrade from 1.7.5 to 2.0.0 (step 2)', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.7.5', 'latest', fullUpgradeConfig) + + expect(result?.config).toEqual({ + version: '2.0.0', + + feedUrls: { + github: 'https://github.com/test/v2.0.0', + + gitcode: 'https://gitcode.com/test/v2.0.0' + } + }) + }) + + it('should upgrade from 2.0.0 to 2.1.6 (step 3)', () => { + const result = (appUpdater as any)._findCompatibleChannel('2.0.0', 'latest', fullUpgradeConfig) + + expect(result?.config).toEqual({ + version: '2.1.6', + + feedUrls: { + github: 'https://github.com/test/latest', + + gitcode: 'https://gitcode.com/test/latest' + } + }) + }) + + it('should complete full upgrade path: 1.6.3 -> 1.7.5 -> 2.0.0 -> 2.1.6', () => { + // Step 1: 1.6.3 -> 1.7.5 + let currentVersion = '1.6.3' + let result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig) + expect(result?.config.version).toBe('1.7.5') + + // Step 2: 1.7.5 -> 2.0.0 + currentVersion = result?.config.version! + result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig) + expect(result?.config.version).toBe('2.0.0') + + // Step 3: 2.0.0 -> 2.1.6 + currentVersion = result?.config.version! + result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig) + expect(result?.config.version).toBe('2.1.6') + + // Final: 2.1.6 is the latest, no more upgrades + currentVersion = result?.config.version! + result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig) + expect(result?.config.version).toBe('2.1.6') + }) + + it('should block direct upgrade from 1.6.3 to 2.0.0 (skip intermediate)', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullUpgradeConfig) + + // Should return 1.7.5, not 2.0.0, because 1.6.3 < 1.7.0 (minCompatibleVersion of 2.0.0) + expect(result?.config.version).toBe('1.7.5') + expect(result?.config.version).not.toBe('2.0.0') + }) + + it('should block direct upgrade from 1.7.5 to 2.1.6 (skip intermediate)', () => { + const result = (appUpdater as any)._findCompatibleChannel('1.7.5', 'latest', fullUpgradeConfig) + + // Should return 2.0.0, not 2.1.6, because 1.7.5 < 2.0.0 (minCompatibleVersion of 2.1.6) + expect(result?.config.version).toBe('2.0.0') + expect(result?.config.version).not.toBe('2.1.6') + }) + }) }) diff --git a/yarn.lock b/yarn.lock index bb178dcbc2..e76a773b90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2827,26 +2827,6 @@ __metadata: languageName: node linkType: hard -"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2": - version: 10.2.0-electron.1 - resolution: "@electron/node-gyp@https://github.com/electron/node-gyp.git#commit=06b29aafb7708acef8b3669835c8a7857ebc92d2" - dependencies: - env-paths: "npm:^2.2.0" - exponential-backoff: "npm:^3.1.1" - glob: "npm:^8.1.0" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^10.2.1" - nopt: "npm:^6.0.0" - proc-log: "npm:^2.0.1" - semver: "npm:^7.3.5" - tar: "npm:^6.2.1" - which: "npm:^2.0.2" - bin: - node-gyp: ./bin/node-gyp.js - checksum: 10c0/e8c97bb5347bf0871312860010b70379069359bf05a6beb9e4d898d0831f9f8447f35b887a86d5241989e804813cf72054327928da38714a6102f791e802c8d9 - languageName: node - linkType: hard - "@electron/notarize@npm:2.5.0, @electron/notarize@npm:^2.5.0": version: 2.5.0 resolution: "@electron/notarize@npm:2.5.0" @@ -2875,20 +2855,19 @@ __metadata: languageName: node linkType: hard -"@electron/rebuild@npm:3.7.2": - version: 3.7.2 - resolution: "@electron/rebuild@npm:3.7.2" +"@electron/rebuild@npm:4.0.1": + version: 4.0.1 + resolution: "@electron/rebuild@npm:4.0.1" dependencies: - "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" "@malept/cross-spawn-promise": "npm:^2.0.0" chalk: "npm:^4.0.0" debug: "npm:^4.1.1" detect-libc: "npm:^2.0.1" - fs-extra: "npm:^10.0.0" got: "npm:^11.7.0" - node-abi: "npm:^3.45.0" - node-api-version: "npm:^0.2.0" - node-gyp: "npm:latest" + graceful-fs: "npm:^4.2.11" + node-abi: "npm:^4.2.0" + node-api-version: "npm:^0.2.1" + node-gyp: "npm:^11.2.0" ora: "npm:^5.1.0" read-binary-file-arch: "npm:^1.0.6" semver: "npm:^7.3.5" @@ -2896,7 +2875,7 @@ __metadata: yargs: "npm:^17.0.1" bin: electron-rebuild: lib/cli.js - checksum: 10c0/e561819926c30c7ad284f721d1d66453f59f8e5ea54a7cc9148a00e8ab3cedb6aa57fe4789f39a3454a3eb90b41a5f7d7461246ee3a16c63c8d3db23db94a391 + checksum: 10c0/4863d39c34515f3fb521ce5e976e25db20e89920574ca353efd0c3272d5f4d14546ba15ce28cee4299187160b2af02e3e130100ba8dc53f313b6eb685dc54928 languageName: node linkType: hard @@ -3459,13 +3438,6 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff - languageName: node - linkType: hard - "@google/genai@npm:1.0.1": version: 1.0.1 resolution: "@google/genai@npm:1.0.1" @@ -3772,6 +3744,22 @@ __metadata: languageName: node linkType: hard +"@isaacs/balanced-match@npm:^4.0.1": + version: 4.0.1 + resolution: "@isaacs/balanced-match@npm:4.0.1" + checksum: 10c0/7da011805b259ec5c955f01cee903da72ad97c5e6f01ca96197267d3f33103d5b2f8a1af192140f3aa64526c593c8d098ae366c2b11f7f17645d12387c2fd420 + languageName: node + linkType: hard + +"@isaacs/brace-expansion@npm:^5.0.0": + version: 5.0.0 + resolution: "@isaacs/brace-expansion@npm:5.0.0" + dependencies: + "@isaacs/balanced-match": "npm:^4.0.1" + checksum: 10c0/b4d4812f4be53afc2c5b6c545001ff7a4659af68d4484804e9d514e183d20269bb81def8682c01a22b17c4d6aed14292c8494f7d2ac664e547101c1a905aa977 + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -4964,16 +4952,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" - dependencies: - "@gar/promisify": "npm:^1.1.3" - semver: "npm:^7.3.5" - checksum: 10c0/c50d087733d0d8df23be24f700f104b19922a28677aa66fdbe06ff6af6431cc4a5bb1e27683cbc661a5dafa9bafdc603e6a0378121506dfcd394b2b6dd76a187 - languageName: node - linkType: hard - "@npmcli/fs@npm:^4.0.0": version: 4.0.0 resolution: "@npmcli/fs@npm:4.0.0" @@ -4983,16 +4961,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: "npm:^1.0.4" - rimraf: "npm:^3.0.2" - checksum: 10c0/11b2151e6d1de6f6eb23128de5aa8a429fd9097d839a5190cb77aa47a6b627022c42d50fa7c47a00f1c9f8f0c1560092b09b061855d293fa0741a2a94cfb174d - languageName: node - linkType: hard - "@openrouter/ai-sdk-provider@npm:^1.2.0": version: 1.2.0 resolution: "@openrouter/ai-sdk-provider@npm:1.2.0" @@ -8052,13 +8020,6 @@ __metadata: languageName: node linkType: hard -"@tootallnate/once@npm:2": - version: 2.0.0 - resolution: "@tootallnate/once@npm:2.0.0" - checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858 - languageName: node - linkType: hard - "@tootallnate/quickjs-emscripten@npm:^0.23.0": version: 0.23.0 resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0" @@ -10089,11 +10050,11 @@ __metadata: drizzle-kit: "npm:^0.31.4" drizzle-orm: "npm:^0.44.5" electron: "npm:38.7.0" - electron-builder: "npm:26.0.15" + electron-builder: "npm:26.1.0" electron-devtools-installer: "npm:^3.2.0" electron-reload: "npm:^2.0.0-alpha.1" electron-store: "npm:^8.2.0" - electron-updater: "npm:6.6.4" + electron-updater: "patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch" electron-vite: "npm:4.0.1" electron-window-state: "npm:^5.0.3" emittery: "npm:^1.0.3" @@ -10223,13 +10184,6 @@ __metadata: languageName: unknown linkType: soft -"abbrev@npm:^1.0.0": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6 - languageName: node - linkType: hard - "abbrev@npm:^3.0.0": version: 3.0.1 resolution: "abbrev@npm:3.0.1" @@ -10300,15 +10254,6 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": - version: 6.0.2 - resolution: "agent-base@npm:6.0.2" - dependencies: - debug: "npm:4" - checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 - languageName: node - linkType: hard - "agent-base@npm:^7.1.0, agent-base@npm:^7.1.2": version: 7.1.3 resolution: "agent-base@npm:7.1.3" @@ -10325,16 +10270,6 @@ __metadata: languageName: node linkType: hard -"aggregate-error@npm:^3.0.0": - version: 3.1.0 - resolution: "aggregate-error@npm:3.1.0" - dependencies: - clean-stack: "npm:^2.0.0" - indent-string: "npm:^4.0.0" - checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039 - languageName: node - linkType: hard - "ai@npm:^5.0.90": version: 5.0.90 resolution: "ai@npm:5.0.90" @@ -10593,91 +10528,48 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:26.0.15": - version: 26.0.15 - resolution: "app-builder-lib@npm:26.0.15" +"app-builder-lib@npm:26.1.0": + version: 26.1.0 + resolution: "app-builder-lib@npm:26.1.0" dependencies: "@develar/schema-utils": "npm:~2.6.5" "@electron/asar": "npm:3.4.1" "@electron/fuses": "npm:^1.8.0" "@electron/notarize": "npm:2.5.0" "@electron/osx-sign": "npm:1.3.3" - "@electron/rebuild": "npm:3.7.2" + "@electron/rebuild": "npm:4.0.1" "@electron/universal": "npm:2.0.3" "@malept/flatpak-bundler": "npm:^0.4.0" "@types/fs-extra": "npm:9.0.13" async-exit-hook: "npm:^2.0.1" - builder-util: "npm:26.0.13" - builder-util-runtime: "npm:9.3.2" + builder-util: "npm:26.1.0" + builder-util-runtime: "npm:9.5.0" chromium-pickle-js: "npm:^0.2.0" - config-file-ts: "npm:0.2.8-rc1" + ci-info: "npm:^4.2.0" debug: "npm:^4.3.4" dotenv: "npm:^16.4.5" dotenv-expand: "npm:^11.0.6" ejs: "npm:^3.1.8" - electron-publish: "npm:26.0.13" + electron-publish: "npm:26.1.0" fs-extra: "npm:^10.1.0" hosted-git-info: "npm:^4.1.0" - is-ci: "npm:^3.0.0" isbinaryfile: "npm:^5.0.0" + jiti: "npm:^2.4.2" js-yaml: "npm:^4.1.0" json5: "npm:^2.2.3" lazy-val: "npm:^1.0.5" - minimatch: "npm:^10.0.0" + minimatch: "npm:^10.0.3" plist: "npm:3.1.0" resedit: "npm:^1.7.0" - semver: "npm:^7.3.8" + semver: "npm:7.7.2" tar: "npm:^6.1.12" temp-file: "npm:^3.4.0" tiny-async-pool: "npm:1.3.0" + which: "npm:^5.0.0" peerDependencies: - dmg-builder: 26.0.15 - electron-builder-squirrel-windows: 26.0.15 - checksum: 10c0/d617864aca3c61633a9a5fda8d991ea90bcbe502702a4a1d64545ae6cfaa1f4122415db02b11e0dc76a527b169ea6e5619551903456e24a7053b3f4eb04cb79f - languageName: node - linkType: hard - -"app-builder-lib@patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch": - version: 26.0.15 - resolution: "app-builder-lib@patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch::version=26.0.15&hash=1f4887" - dependencies: - "@develar/schema-utils": "npm:~2.6.5" - "@electron/asar": "npm:3.4.1" - "@electron/fuses": "npm:^1.8.0" - "@electron/notarize": "npm:2.5.0" - "@electron/osx-sign": "npm:1.3.3" - "@electron/rebuild": "npm:3.7.2" - "@electron/universal": "npm:2.0.3" - "@malept/flatpak-bundler": "npm:^0.4.0" - "@types/fs-extra": "npm:9.0.13" - async-exit-hook: "npm:^2.0.1" - builder-util: "npm:26.0.13" - builder-util-runtime: "npm:9.3.2" - chromium-pickle-js: "npm:^0.2.0" - config-file-ts: "npm:0.2.8-rc1" - debug: "npm:^4.3.4" - dotenv: "npm:^16.4.5" - dotenv-expand: "npm:^11.0.6" - ejs: "npm:^3.1.8" - electron-publish: "npm:26.0.13" - fs-extra: "npm:^10.1.0" - hosted-git-info: "npm:^4.1.0" - is-ci: "npm:^3.0.0" - isbinaryfile: "npm:^5.0.0" - js-yaml: "npm:^4.1.0" - json5: "npm:^2.2.3" - lazy-val: "npm:^1.0.5" - minimatch: "npm:^10.0.0" - plist: "npm:3.1.0" - resedit: "npm:^1.7.0" - semver: "npm:^7.3.8" - tar: "npm:^6.1.12" - temp-file: "npm:^3.4.0" - tiny-async-pool: "npm:1.3.0" - peerDependencies: - dmg-builder: 26.0.15 - electron-builder-squirrel-windows: 26.0.15 - checksum: 10c0/5de2bd593b21e464585ffa3424e053d41f8569b14ba2a00f29f84cb0b83347a7da3653587f9ef8b5d2f6d1e5bfc4081956b9d72f180d65960db49b5ac84b73d4 + dmg-builder: 26.1.0 + electron-builder-squirrel-windows: 26.1.0 + checksum: 10c0/c8397886e59dc6a8ae4d90bc59fd28631705c5873789463a55b3e029062d6194d38e9feb1e6595ca31a069ed37ae893703fadd09a95ed4d2b1ab92fb92b13d72 languageName: node linkType: hard @@ -11218,38 +11110,38 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.3.2": - version: 9.3.2 - resolution: "builder-util-runtime@npm:9.3.2" +"builder-util-runtime@npm:9.5.0": + version: 9.5.0 + resolution: "builder-util-runtime@npm:9.5.0" dependencies: debug: "npm:^4.3.4" sax: "npm:^1.2.4" - checksum: 10c0/1a103268ef800a504f04021ce14db282ddcfb72dec8238e7c9624a9c651ccd9c15c45ddcdb00e7cf6a5164d9822e30efdeeff470b506ed6aa9ed27c0aaefa695 + checksum: 10c0/797f4f8129557de6f5699991974f1701e464646664a14f841870fca0ddb05cb63cb8f2ca3c082cd6215690048c5e12df8404e7ccec371640eed9edc8cb592ae6 languageName: node linkType: hard -"builder-util@npm:26.0.13": - version: 26.0.13 - resolution: "builder-util@npm:26.0.13" +"builder-util@npm:26.1.0": + version: 26.1.0 + resolution: "builder-util@npm:26.1.0" dependencies: 7zip-bin: "npm:~5.2.0" "@types/debug": "npm:^4.1.6" app-builder-bin: "npm:5.0.0-alpha.12" - builder-util-runtime: "npm:9.3.2" + builder-util-runtime: "npm:9.5.0" chalk: "npm:^4.1.2" + ci-info: "npm:^4.2.0" cross-spawn: "npm:^7.0.6" debug: "npm:^4.3.4" fs-extra: "npm:^10.1.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.0" - is-ci: "npm:^3.0.0" js-yaml: "npm:^4.1.0" sanitize-filename: "npm:^1.6.3" source-map-support: "npm:^0.5.19" stat-mode: "npm:^1.0.0" temp-file: "npm:^3.4.0" tiny-async-pool: "npm:1.3.0" - checksum: 10c0/e8e9d6de04ec5c60f21c8ac8a30f6edd38ae76f0438ba801ec135ddecdce7c4bfadf881bdaaed184b0cab28e04ef21869ecc67a1e44c0e38ec0fd56c90970f03 + checksum: 10c0/0e1bcc04452cda8eaa1d63f338e05c1280f0539ee9dd7a9d4d17f75dff323d0d34de184fc146e3bdb1e1f1578bc0070569b1701312b509e802c97bfe4fed24b1 languageName: node linkType: hard @@ -11274,32 +11166,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" - dependencies: - "@npmcli/fs": "npm:^2.1.0" - "@npmcli/move-file": "npm:^2.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - glob: "npm:^8.0.1" - infer-owner: "npm:^1.0.4" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - mkdirp: "npm:^1.0.4" - p-map: "npm:^4.0.0" - promise-inflight: "npm:^1.0.1" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^2.0.0" - checksum: 10c0/cdf6836e1c457d2a5616abcaf5d8240c0346b1f5bd6fdb8866b9d84b6dff0b54e973226dc11e0d099f35394213d24860d1989c8358d2a41b39eb912b3000e749 - languageName: node - linkType: hard - "cacache@npm:^19.0.1": version: 19.0.1 resolution: "cacache@npm:19.0.1" @@ -11692,10 +11558,10 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.2.0": - version: 3.9.0 - resolution: "ci-info@npm:3.9.0" - checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a +"ci-info@npm:^4.2.0": + version: 4.3.1 + resolution: "ci-info@npm:4.3.1" + checksum: 10c0/7dd82000f514d76ddfe7775e4cb0d66e5c638f5fa0e2a3be29557e898da0d32ac04f231217d414d07fb968b1fbc6d980ee17ddde0d2c516f23da9cfff608f6c1 languageName: node linkType: hard @@ -11720,13 +11586,6 @@ __metadata: languageName: node linkType: hard -"clean-stack@npm:^2.0.0": - version: 2.2.0 - resolution: "clean-stack@npm:2.2.0" - checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1 - languageName: node - linkType: hard - "cli-cursor@npm:^3.1.0": version: 3.1.0 resolution: "cli-cursor@npm:3.1.0" @@ -12165,16 +12024,6 @@ __metadata: languageName: node linkType: hard -"config-file-ts@npm:0.2.8-rc1": - version: 0.2.8-rc1 - resolution: "config-file-ts@npm:0.2.8-rc1" - dependencies: - glob: "npm:^10.3.12" - typescript: "npm:^5.4.3" - checksum: 10c0/9839a8e33111156665c45c4e5dd6bfa81ee80596f9dc0a078465769b951e28c0fa4bd75bb9bc56f747da285b993fb7998c4c07c0f368ab6bdb019d203764cdc8 - languageName: node - linkType: hard - "console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -12893,7 +12742,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:^4.4.0, debug@npm:^4.4.1": +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:^4.4.0, debug@npm:^4.4.1": version: 4.4.1 resolution: "debug@npm:4.4.1" dependencies: @@ -13279,13 +13128,12 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:26.0.15": - version: 26.0.15 - resolution: "dmg-builder@npm:26.0.15" +"dmg-builder@npm:26.1.0": + version: 26.1.0 + resolution: "dmg-builder@npm:26.1.0" dependencies: - app-builder-lib: "npm:26.0.15" - builder-util: "npm:26.0.13" - builder-util-runtime: "npm:9.3.2" + app-builder-lib: "npm:26.1.0" + builder-util: "npm:26.1.0" dmg-license: "npm:^1.0.11" fs-extra: "npm:^10.1.0" iconv-lite: "npm:^0.6.2" @@ -13293,7 +13141,7 @@ __metadata: dependenciesMeta: dmg-license: optional: true - checksum: 10c0/fe9ea305abf05e16d96f7f7435db14f0264f82d4f49a09a64645425a3d2a69ed9cc346f36278b958fb1197fea72f5afc9661a22307d2c0ab5192843dc31f794c + checksum: 10c0/0dc4e993516dfb896b45b7de6ee88bc99a95205e64bbcac4425dba4fc3b608d5117f8ff14c4204ae916cb567b7c1ab5acc91fa223856ed66e9f22446d440c3dc languageName: node linkType: hard @@ -13633,24 +13481,24 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:26.0.15": - version: 26.0.15 - resolution: "electron-builder@npm:26.0.15" +"electron-builder@npm:26.1.0": + version: 26.1.0 + resolution: "electron-builder@npm:26.1.0" dependencies: - app-builder-lib: "npm:26.0.15" - builder-util: "npm:26.0.13" - builder-util-runtime: "npm:9.3.2" + app-builder-lib: "npm:26.1.0" + builder-util: "npm:26.1.0" + builder-util-runtime: "npm:9.5.0" chalk: "npm:^4.1.2" - dmg-builder: "npm:26.0.15" + ci-info: "npm:^4.2.0" + dmg-builder: "npm:26.1.0" fs-extra: "npm:^10.1.0" - is-ci: "npm:^3.0.0" lazy-val: "npm:^1.0.5" simple-update-notifier: "npm:2.0.0" yargs: "npm:^17.6.2" bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 10c0/bb21e4b547c8dfa590017930340ab9b7e2b017c5ba9286e5d0ccbe6481f4b13bbf905429124a1350a2282ee35dd52e9ba9d9d1d730fc1957c9e7789d0eb39374 + checksum: 10c0/9255a77f1124d3bc722ce9670380144eda42508f8a4695cad5346a44a7b547febe09e736b1b0046b7ddf84c4ea07ab385f87e2c8053dfa996a823d79e2bd05c8 languageName: node linkType: hard @@ -13666,19 +13514,19 @@ __metadata: languageName: node linkType: hard -"electron-publish@npm:26.0.13": - version: 26.0.13 - resolution: "electron-publish@npm:26.0.13" +"electron-publish@npm:26.1.0": + version: 26.1.0 + resolution: "electron-publish@npm:26.1.0" dependencies: "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:26.0.13" - builder-util-runtime: "npm:9.3.2" + builder-util: "npm:26.1.0" + builder-util-runtime: "npm:9.5.0" chalk: "npm:^4.1.2" form-data: "npm:^4.0.0" fs-extra: "npm:^10.1.0" lazy-val: "npm:^1.0.5" mime: "npm:^2.5.2" - checksum: 10c0/d00fd7bb904a9cf7731f194eef47147febc9c2b23b1003a00e8d678c04d00029f998cdccd9a9cacacbb46893741961137e92d392e1bb946019c4fc51ceedc922 + checksum: 10c0/f6593e007f47bea311ab9678c31f724a3c0826de4e0f8ea917d4c3d073d3470ede6a093b51408cd53dd790bb1baa4d5b7647a8cd935d0ff3b4d011050e861f0b languageName: node linkType: hard @@ -13708,19 +13556,35 @@ __metadata: languageName: node linkType: hard -"electron-updater@npm:6.6.4": - version: 6.6.4 - resolution: "electron-updater@npm:6.6.4" +"electron-updater@npm:6.7.0": + version: 6.7.0 + resolution: "electron-updater@npm:6.7.0" dependencies: - builder-util-runtime: "npm:9.3.2" + builder-util-runtime: "npm:9.5.0" fs-extra: "npm:^10.1.0" js-yaml: "npm:^4.1.0" lazy-val: "npm:^1.0.5" lodash.escaperegexp: "npm:^4.1.2" lodash.isequal: "npm:^4.5.0" - semver: "npm:^7.6.3" + semver: "npm:7.7.2" tiny-typed-emitter: "npm:^2.1.0" - checksum: 10c0/92ed7b39be1cf9cfe7be56e1054c44a405421ef7faeec365f8c19a6614428ec1e5116ba1f0fb731691d346e00cf16a555804e41feee2b9ac1a10759219de4406 + checksum: 10c0/8310af4a0a795de4bc68a75dc87e4116be1cfc324b60b60492b4afa2a8866ef58a53aa888d8709bed3fba4202deac8a9f02bf7ba03cb1a8fdbbed1a6fb1dad31 + languageName: node + linkType: hard + +"electron-updater@patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch": + version: 6.7.0 + resolution: "electron-updater@patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch::version=6.7.0&hash=5680de" + dependencies: + builder-util-runtime: "npm:9.5.0" + fs-extra: "npm:^10.1.0" + js-yaml: "npm:^4.1.0" + lazy-val: "npm:^1.0.5" + lodash.escaperegexp: "npm:^4.1.2" + lodash.isequal: "npm:^4.5.0" + semver: "npm:7.7.2" + tiny-typed-emitter: "npm:^2.1.0" + checksum: 10c0/8f80f2d76a254404abc43d9c03b68cf5a0d8ff933aa2d43d77f13d24f58e28a903828dac244c05b3391497d53e94d36452066920feb3c1b04ebdcf91faf47293 languageName: node linkType: hard @@ -15331,7 +15195,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -15589,7 +15453,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.12, glob@npm:^10.3.7, glob@npm:^10.4.1": +"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.7, glob@npm:^10.4.1": version: 10.4.5 resolution: "glob@npm:10.4.5" dependencies: @@ -15619,19 +15483,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1, glob@npm:^8.1.0": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f - languageName: node - linkType: hard - "global-agent@npm:^3.0.0": version: 3.0.0 resolution: "global-agent@npm:3.0.0" @@ -16192,7 +16043,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": +"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1": version: 4.2.0 resolution: "http-cache-semantics@npm:4.2.0" checksum: 10c0/45b66a945cf13ec2d1f29432277201313babf4a01d9e52f44b31ca923434083afeca03f18417f599c9ab3d0e7b618ceb21257542338b57c54b710463b4a53e37 @@ -16212,17 +16063,6 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "http-proxy-agent@npm:5.0.0" - dependencies: - "@tootallnate/once": "npm:2" - agent-base: "npm:6" - debug: "npm:4" - checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32 - languageName: node - linkType: hard - "http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.1, http-proxy-agent@npm:^7.0.2": version: 7.0.2 resolution: "http-proxy-agent@npm:7.0.2" @@ -16253,16 +16093,6 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0": - version: 5.0.1 - resolution: "https-proxy-agent@npm:5.0.1" - dependencies: - agent-base: "npm:6" - debug: "npm:4" - checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 - languageName: node - linkType: hard - "https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.6": version: 7.0.6 resolution: "https-proxy-agent@npm:7.0.6" @@ -16394,13 +16224,6 @@ __metadata: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -16534,17 +16357,6 @@ __metadata: languageName: node linkType: hard -"is-ci@npm:^3.0.0": - version: 3.0.1 - resolution: "is-ci@npm:3.0.1" - dependencies: - ci-info: "npm:^3.2.0" - bin: - is-ci: bin.js - checksum: 10c0/0e81caa62f4520d4088a5bef6d6337d773828a88610346c4b1119fb50c842587ed8bef1e5d9a656835a599e7209405b5761ddf2339668f2d0f4e889a92fe6051 - languageName: node - linkType: hard - "is-decimal@npm:^1.0.0": version: 1.0.4 resolution: "is-decimal@npm:1.0.4" @@ -16665,13 +16477,6 @@ __metadata: languageName: node linkType: hard -"is-lambda@npm:^1.0.1": - version: 1.0.1 - resolution: "is-lambda@npm:1.0.1" - checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d - languageName: node - linkType: hard - "is-natural-number@npm:^4.0.1": version: 4.0.1 resolution: "is-natural-number@npm:4.0.1" @@ -17947,7 +17752,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.14.1": version: 7.18.3 resolution: "lru-cache@npm:7.18.3" checksum: 10c0/b3a452b491433db885beed95041eb104c157ef7794b9c9b4d647be503be91769d11206bb573849a16b4cc0d03cbd15ffd22df7960997788b74c1d399ac7a4fed @@ -18033,30 +17838,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.2.1": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" - dependencies: - agentkeepalive: "npm:^4.2.1" - cacache: "npm:^16.1.0" - http-cache-semantics: "npm:^4.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-lambda: "npm:^1.0.1" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-fetch: "npm:^2.0.3" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - promise-retry: "npm:^2.0.1" - socks-proxy-agent: "npm:^7.0.0" - ssri: "npm:^9.0.0" - checksum: 10c0/28ec392f63ab93511f400839dcee83107eeecfaad737d1e8487ea08b4332cd89a8f3319584222edd9f6f1d0833cf516691469496d46491863f9e88c658013949 - languageName: node - linkType: hard - "make-fetch-happen@npm:^14.0.3": version: 14.0.3 resolution: "make-fetch-happen@npm:14.0.3" @@ -19230,12 +19011,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^10.0.0": - version: 10.0.1 - resolution: "minimatch@npm:10.0.1" +"minimatch@npm:^10.0.3": + version: 10.1.1 + resolution: "minimatch@npm:10.1.1" dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10c0/e6c29a81fe83e1877ad51348306be2e8aeca18c88fdee7a99df44322314279e15799e41d7cb274e4e8bb0b451a3bc622d6182e157dfa1717d6cda75e9cd8cd5d + "@isaacs/brace-expansion": "npm:^5.0.0" + checksum: 10c0/c85d44821c71973d636091fddbfbffe62370f5ee3caf0241c5b60c18cd289e916200acb2361b7e987558cd06896d153e25d505db9fc1e43e6b4b6752e2702902 languageName: node linkType: hard @@ -19273,15 +19054,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898 - languageName: node - linkType: hard - "minipass-collect@npm:^2.0.1": version: 2.0.1 resolution: "minipass-collect@npm:2.0.1" @@ -19291,21 +19063,6 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^3.1.6" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10c0/33ab2c5bdb3d91b9cb8bc6ae42d7418f4f00f7f7beae14b3bb21ea18f9224e792f560a6e17b6f1be12bbeb70dbe99a269f4204c60e5d99130a0777b153505c43 - languageName: node - linkType: hard - "minipass-fetch@npm:^4.0.0": version: 4.0.1 resolution: "minipass-fetch@npm:4.0.1" @@ -19348,7 +19105,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -19371,7 +19128,7 @@ __metadata: languageName: node linkType: hard -"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": +"minizlib@npm:^2.1.1": version: 2.1.2 resolution: "minizlib@npm:2.1.2" dependencies: @@ -19415,7 +19172,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": +"mkdirp@npm:^1.0.3": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -19602,13 +19359,6 @@ __metadata: languageName: node linkType: hard -"negotiator@npm:^0.6.3": - version: 0.6.4 - resolution: "negotiator@npm:0.6.4" - checksum: 10c0/3e677139c7fb7628a6f36335bf11a885a62c21d5390204590a1a214a5631fcbe5ea74ef6a610b60afe84b4d975cbe0566a23f20ee17c77c73e74b80032108dea - languageName: node - linkType: hard - "negotiator@npm:^1.0.0": version: 1.0.0 resolution: "negotiator@npm:1.0.0" @@ -19682,7 +19432,7 @@ __metadata: languageName: node linkType: hard -"node-api-version@npm:^0.2.0": +"node-api-version@npm:^0.2.1": version: 0.2.1 resolution: "node-api-version@npm:0.2.1" dependencies: @@ -19741,6 +19491,26 @@ __metadata: languageName: node linkType: hard +"node-gyp@npm:^11.2.0": + version: 11.5.0 + resolution: "node-gyp@npm:11.5.0" + dependencies: + env-paths: "npm:^2.2.0" + exponential-backoff: "npm:^3.1.1" + graceful-fs: "npm:^4.2.6" + make-fetch-happen: "npm:^14.0.3" + nopt: "npm:^8.0.0" + proc-log: "npm:^5.0.0" + semver: "npm:^7.3.5" + tar: "npm:^7.4.3" + tinyglobby: "npm:^0.2.12" + which: "npm:^5.0.0" + bin: + node-gyp: bin/node-gyp.js + checksum: 10c0/31ff49586991b38287bb15c3d529dd689cfc32f992eed9e6997b9d712d5d21fe818a8b1bbfe3b76a7e33765c20210c5713212f4aa329306a615b87d8a786da3a + languageName: node + linkType: hard + "node-gyp@npm:latest": version: 11.2.0 resolution: "node-gyp@npm:11.2.0" @@ -19782,17 +19552,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^6.0.0": - version: 6.0.0 - resolution: "nopt@npm:6.0.0" - dependencies: - abbrev: "npm:^1.0.0" - bin: - nopt: bin/nopt.js - checksum: 10c0/837b52c330df16fcaad816b1f54fec6b2854ab1aa771d935c1603fbcf9b023bb073f1466b1b67f48ea4dce127ae675b85b9d9355700e9b109de39db490919786 - languageName: node - linkType: hard - "nopt@npm:^8.0.0": version: 8.1.0 resolution: "nopt@npm:8.1.0" @@ -20264,15 +20023,6 @@ __metadata: languageName: node linkType: hard -"p-map@npm:^4.0.0": - version: 4.0.0 - resolution: "p-map@npm:4.0.0" - dependencies: - aggregate-error: "npm:^3.0.0" - checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75 - languageName: node - linkType: hard - "p-map@npm:^7.0.2": version: 7.0.3 resolution: "p-map@npm:7.0.3" @@ -20927,13 +20677,6 @@ __metadata: languageName: node linkType: hard -"proc-log@npm:^2.0.1": - version: 2.0.1 - resolution: "proc-log@npm:2.0.1" - checksum: 10c0/701c501429775ce34cec28ef6a1c976537274b42917212fb8a5975ebcecb0a85612907fd7f99ff28ff4c2112bb84a0f4322fc9b9e1e52a8562fcbb1d5b3ce608 - languageName: node - linkType: hard - "proc-log@npm:^5.0.0": version: 5.0.0 resolution: "proc-log@npm:5.0.0" @@ -20962,13 +20705,6 @@ __metadata: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: 10c0/d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc - languageName: node - linkType: hard - "promise-limit@npm:^2.7.0": version: 2.7.0 resolution: "promise-limit@npm:2.7.0" @@ -23171,6 +22907,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:7.7.2, semver@npm:^7.7.2": + version: 7.7.2 + resolution: "semver@npm:7.7.2" + bin: + semver: bin/semver.js + checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea + languageName: node + linkType: hard + "semver@npm:^5.5.0": version: 5.7.2 resolution: "semver@npm:5.7.2" @@ -23189,7 +22934,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.3": +"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.3": version: 7.7.1 resolution: "semver@npm:7.7.1" bin: @@ -23198,15 +22943,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.7.2": - version: 7.7.2 - resolution: "semver@npm:7.7.2" - bin: - semver: bin/semver.js - checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea - languageName: node - linkType: hard - "send@npm:^1.1.0, send@npm:^1.2.0": version: 1.2.0 resolution: "send@npm:1.2.0" @@ -23611,17 +23347,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" - dependencies: - agent-base: "npm:^6.0.2" - debug: "npm:^4.3.3" - socks: "npm:^2.6.2" - checksum: 10c0/b859f7eb8e96ec2c4186beea233ae59c02404094f3eb009946836af27d6e5c1627d1975a69b4d2e20611729ed543b6db3ae8481eb38603433c50d0345c987600 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^8.0.3, socks-proxy-agent@npm:^8.0.5": version: 8.0.5 resolution: "socks-proxy-agent@npm:8.0.5" @@ -23633,7 +23358,7 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2, socks@npm:^2.8.2, socks@npm:^2.8.3": +"socks@npm:^2.8.2, socks@npm:^2.8.3": version: 2.8.6 resolution: "socks@npm:2.8.6" dependencies: @@ -23724,15 +23449,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" - dependencies: - minipass: "npm:^3.1.1" - checksum: 10c0/c5d153ce03b5980d683ecaa4d805f6a03d8dc545736213803e168a1907650c46c08a4e5ce6d670a0205482b35c35713d9d286d9133bdd79853a406e22ad81f04 - languageName: node - linkType: hard - "stack-trace@npm:0.0.x": version: 0.0.10 resolution: "stack-trace@npm:0.0.10" @@ -24261,7 +23977,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.0.5, tar@npm:^6.1.11, tar@npm:^6.1.12, tar@npm:^6.2.1": +"tar@npm:^6.0.5, tar@npm:^6.1.12": version: 6.2.1 resolution: "tar@npm:6.2.1" dependencies: @@ -24938,16 +24654,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.4.3, typescript@npm:~5.8.2": - version: 5.8.3 - resolution: "typescript@npm:5.8.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48 - languageName: node - linkType: hard - "typescript@npm:^5.8.2": version: 5.9.3 resolution: "typescript@npm:5.9.3" @@ -24958,6 +24664,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:~5.8.2": + version: 5.8.3 + resolution: "typescript@npm:5.8.3" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48 + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A^5.0.0#optional!builtin": version: 5.9.2 resolution: "typescript@patch:typescript@npm%3A5.9.2#optional!builtin::version=5.9.2&hash=5786d5" @@ -24968,16 +24684,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.4.3#optional!builtin, typescript@patch:typescript@npm%3A~5.8.2#optional!builtin": - version: 5.8.3 - resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin::version=5.8.3&hash=5786d5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb - languageName: node - linkType: hard - "typescript@patch:typescript@npm%3A^5.8.2#optional!builtin": version: 5.9.3 resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin::version=5.9.3&hash=5786d5" @@ -24988,6 +24694,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A~5.8.2#optional!builtin": + version: 5.8.3 + resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin::version=5.8.3&hash=5786d5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb + languageName: node + linkType: hard + "ua-parser-js@npm:^1.0.35": version: 1.0.40 resolution: "ua-parser-js@npm:1.0.40" @@ -25115,15 +24831,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" - dependencies: - unique-slug: "npm:^3.0.0" - checksum: 10c0/55d95cd670c4a86117ebc34d394936d712d43b56db6bc511f9ca00f666373818bf9f075fb0ab76bcbfaf134592ef26bb75aad20786c1ff1ceba4457eaba90fb8 - languageName: node - linkType: hard - "unique-filename@npm:^4.0.0": version: 4.0.0 resolution: "unique-filename@npm:4.0.0" @@ -25133,15 +24840,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10c0/617240eb921af803b47d322d75a71a363dacf2e56c29ae5d1404fad85f64f4ec81ef10ee4fd79215d0202cbe1e5a653edb0558d59c9c81d3bd538c2d58e4c026 - languageName: node - linkType: hard - "unique-slug@npm:^5.0.0": version: 5.0.0 resolution: "unique-slug@npm:5.0.0" @@ -25900,7 +25598,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^2.0.1, which@npm:^2.0.2": +"which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" dependencies: From fa7646e18f2ecf14fb1388929f5cf01a8058b63a Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 14 Nov 2025 18:29:33 +0800 Subject: [PATCH 13/16] feat: enhance DynamicVirtualList with header and className props - Added `header` prop to display content above the list. - Introduced `className` prop for additional styling on the container. - Updated `Sessions` component to utilize `StyledVirtualList` with new props for improved layout and functionality. --- .../src/components/VirtualList/dynamic.tsx | 15 +++++- .../pages/home/Tabs/components/Sessions.tsx | 52 +++++++++---------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/renderer/src/components/VirtualList/dynamic.tsx b/src/renderer/src/components/VirtualList/dynamic.tsx index 07fe5b1703..e2644fea35 100644 --- a/src/renderer/src/components/VirtualList/dynamic.tsx +++ b/src/renderer/src/components/VirtualList/dynamic.tsx @@ -81,6 +81,16 @@ export interface DynamicVirtualListProps extends InheritedVirtualizerOptions * Hide the scrollbar automatically when scrolling is stopped */ autoHideScrollbar?: boolean + + /** + * Header content to display above the list + */ + header?: React.ReactNode + + /** + * Additional CSS class name for the container + */ + className?: string } function DynamicVirtualList(props: DynamicVirtualListProps) { @@ -95,6 +105,8 @@ function DynamicVirtualList(props: DynamicVirtualListProps) { itemContainerStyle, scrollerStyle, autoHideScrollbar = false, + header, + className, ...restOptions } = props @@ -189,7 +201,7 @@ function DynamicVirtualList(props: DynamicVirtualListProps) { return ( (props: DynamicVirtualListProps) { ...(horizontal ? { width: size ?? '100%' } : { height: size ?? '100%' }), ...scrollerStyle }}> + {header}
= ({ agentId }) => { } return ( - - - {t('agent.session.add.title')} - - {/* h-9 */} - 9 * 4} - scrollerStyle={{ - // FIXME: This component only supports CSSProperties - overflowX: 'hidden' - }} - autoHideScrollbar> - {(session) => ( - handleDeleteSession(session.id)} - onPress={() => setActiveSessionId(agentId, session.id)} - /> - )} - - + 9 * 4} + // FIXME: This component only supports CSSProperties + scrollerStyle={{ overflowX: 'hidden' }} + autoHideScrollbar + header={ + + {t('agent.session.add.title')} + + }> + {(session) => ( + handleDeleteSession(session.id)} + onPress={() => setActiveSessionId(agentId, session.id)} + /> + )} + ) } -const Container = styled(Scrollbar)` +const StyledVirtualList = styled(DynamicVirtualList)` display: flex; flex-direction: column; padding: 12px 10px; - overflow-x: hidden; height: 100%; -` +` as typeof DynamicVirtualList export default memo(Sessions) From 073d43c7cb020a801c495f47de82b3dcb9f949f2 Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Fri, 14 Nov 2025 18:53:11 +0800 Subject: [PATCH 14/16] chore: rename cs-releases to x-files/app-upgrade-config (#11290) rename cs-releases to x-files/app-upgrade-config --- .../workflows/update-app-upgrade-config.yml | 8 ++++---- docs/technical/app-upgrade-config-en.md | 20 +++++++++---------- docs/technical/app-upgrade-config-zh.md | 20 +++++++++---------- packages/shared/config/constant.ts | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/update-app-upgrade-config.yml b/.github/workflows/update-app-upgrade-config.yml index acb8381171..7470bb0b6c 100644 --- a/.github/workflows/update-app-upgrade-config.yml +++ b/.github/workflows/update-app-upgrade-config.yml @@ -141,11 +141,11 @@ jobs: path: main fetch-depth: 0 - - name: Checkout cs-releases branch + - name: Checkout x-files/app-upgrade-config branch if: steps.check.outputs.should_run == 'true' uses: actions/checkout@v5 with: - ref: cs-releases + ref: x-files/app-upgrade-config path: cs fetch-depth: 0 @@ -192,7 +192,7 @@ jobs: uses: peter-evans/create-pull-request@v7 with: path: cs - base: cs-releases + base: x-files/app-upgrade-config branch: chore/update-app-upgrade-config/${{ steps.meta.outputs.safe_tag }} commit-message: "🤖 chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}" title: "chore: update app-upgrade-config for ${{ steps.meta.outputs.tag }}" @@ -209,4 +209,4 @@ jobs: - name: No changes detected if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed != 'true' - run: echo "No updates required for cs-releases/app-upgrade-config.json" + run: echo "No updates required for x-files/app-upgrade-config/app-upgrade-config.json" diff --git a/docs/technical/app-upgrade-config-en.md b/docs/technical/app-upgrade-config-en.md index 993c130d76..0662abf236 100644 --- a/docs/technical/app-upgrade-config-en.md +++ b/docs/technical/app-upgrade-config-en.md @@ -19,7 +19,7 @@ Currently, AppUpdater directly queries the GitHub API to retrieve beta and rc up ## Automation Workflow -The `cs-releases/app-upgrade-config.json` file is synchronized by the [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow. The workflow runs the [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) helper so that every release tag automatically updates the JSON in `cs-releases`. +The `x-files/app-upgrade-config/app-upgrade-config.json` file is synchronized by the [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow. The workflow runs the [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) helper so that every release tag automatically updates the JSON in `x-files/app-upgrade-config`. ### Trigger Conditions @@ -36,29 +36,29 @@ The `cs-releases/app-upgrade-config.json` file is synchronized by the [`Update A ### Workflow Steps 1. **Guard + metadata preparation** – the `Check if should proceed` and `Prepare metadata` steps compute the target tag, prerelease flag, whether the tag is the newest release, and a `safe_tag` slug used for branch names. When any rule fails, the workflow stops without touching the config. -2. **Checkout source branches** – the default branch is checked out into `main/`, while the long-lived `cs-releases` branch lives in `cs/`. All modifications happen in the latter directory. +2. **Checkout source branches** – the default branch is checked out into `main/`, while the long-lived `x-files/app-upgrade-config` branch lives in `cs/`. All modifications happen in the latter directory. 3. **Install toolchain** – Node.js 22, Corepack, and frozen Yarn dependencies are installed inside `main/`. 4. **Run the update script** – `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json --is-prerelease ` updates the JSON in-place. - The script normalizes the tag (e.g., strips `v` prefix), detects the release channel (`latest`, `rc`, `beta`), and loads segment rules from `config/app-upgrade-segments.json`. - It validates that prerelease flags and semantic suffixes agree, enforces locked segments, builds mirror feed URLs, and performs release-availability checks (GitHub HEAD request for every channel; GitCode GET for latest channels, falling back to `https://releases.cherry-ai.com` when gitcode is delayed). - After updating the relevant channel entry, the script rewrites the config with semver-sort order and a new `lastUpdated` timestamp. -5. **Detect changes + create PR** – if `cs/app-upgrade-config.json` changed, the workflow opens a PR `chore/update-app-upgrade-config/` against `cs-releases` with a commit message `🤖 chore: sync app-upgrade-config for `. Otherwise it logs that no update is required. +5. **Detect changes + create PR** – if `cs/app-upgrade-config.json` changed, the workflow opens a PR `chore/update-app-upgrade-config/` against `x-files/app-upgrade-config` with a commit message `🤖 chore: sync app-upgrade-config for `. Otherwise it logs that no update is required. ### Manual Trigger Guide 1. Open the Cherry Studio repository on GitHub → **Actions** tab → select **Update App Upgrade Config**. 2. Click **Run workflow**, choose the default branch (usually `main`), and fill in the `tag` input (e.g., `v2.1.0`). 3. Toggle `is_prerelease` only when the tag carries a prerelease suffix (`-beta`, `-rc`). Leave it unchecked for stable releases. -4. Start the run and wait for it to finish. Check the generated PR in the `cs-releases` branch, verify the diff in `app-upgrade-config.json`, and merge once validated. +4. Start the run and wait for it to finish. Check the generated PR in the `x-files/app-upgrade-config` branch, verify the diff in `app-upgrade-config.json`, and merge once validated. ## JSON Configuration File Format ### File Location -- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json` -- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json` +- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json` +- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json` -**Note**: Both mirrors provide the same configuration file hosted on the `cs-releases` branch. The client automatically selects the optimal mirror based on IP geolocation. +**Note**: Both mirrors provide the same configuration file hosted on the `x-files/app-upgrade-config` branch. The client automatically selects the optimal mirror based on IP geolocation. ### Configuration Structure (Current Implementation) @@ -222,9 +222,9 @@ interface ChannelConfig { Starting from this change, `.github/workflows/update-app-upgrade-config.yml` listens to GitHub release events (published + prerelease). The workflow: -1. Checks out the default branch (for scripts) and the `cs-releases` branch (where the config is hosted). -2. Runs `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json` to regenerate the config directly inside the `cs-releases` working tree. -3. If the file changed, it opens a PR against `cs-releases` via `peter-evans/create-pull-request`, with the generated diff limited to `app-upgrade-config.json`. +1. Checks out the default branch (for scripts) and the `x-files/app-upgrade-config` branch (where the config is hosted). +2. Runs `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json` to regenerate the config directly inside the `x-files/app-upgrade-config` working tree. +3. If the file changed, it opens a PR against `x-files/app-upgrade-config` via `peter-evans/create-pull-request`, with the generated diff limited to `app-upgrade-config.json`. You can run the same script locally via `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json` (add `--dry-run` to preview) to reproduce or debug whatever the workflow does. Passing `--skip-release-checks` along with `--dry-run` lets you bypass the release-page existence check (useful when the GitHub/GitCode pages aren’t published yet). Running without `--config` continues to update the copy in your current working directory (main branch) for documentation purposes. diff --git a/docs/technical/app-upgrade-config-zh.md b/docs/technical/app-upgrade-config-zh.md index d8812d4943..29f9f75d79 100644 --- a/docs/technical/app-upgrade-config-zh.md +++ b/docs/technical/app-upgrade-config-zh.md @@ -19,7 +19,7 @@ ## 自动化工作流 -`cs-releases/app-upgrade-config.json` 由 [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow 自动同步。工作流会调用 [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) 脚本，根据指定 tag 更新 `cs-releases` 分支上的配置文件。 +`x-files/app-upgrade-config/app-upgrade-config.json` 由 [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow 自动同步。工作流会调用 [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) 脚本，根据指定 tag 更新 `x-files/app-upgrade-config` 分支上的配置文件。 ### 触发条件 @@ -36,29 +36,29 @@ ### 工作流步骤 1. **检查与元数据准备**：`Check if should proceed` 和 `Prepare metadata` 步骤会计算 tag、prerelease 标志、是否最新版本以及用于分支名的 `safe_tag`。若任意校验失败，工作流立即退出。 -2. **检出分支**：默认分支被检出到 `main/`，长期维护的 `cs-releases` 分支则在 `cs/` 中，所有改动都发生在 `cs/`。 +2. **检出分支**：默认分支被检出到 `main/`，长期维护的 `x-files/app-upgrade-config` 分支则在 `cs/` 中，所有改动都发生在 `cs/`。 3. **安装工具链**：安装 Node.js 22、启用 Corepack，并在 `main/` 目录执行 `yarn install --immutable`。 4. **运行更新脚本**：执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json --is-prerelease `。 - 脚本会标准化 tag（去掉 `v` 前缀等）、识别渠道、加载 `config/app-upgrade-segments.json` 中的分段规则。 - 校验 prerelease 标志与语义后缀是否匹配、强制锁定的 segment 是否满足、生成镜像的下载地址，并检查 release 是否已经在 GitHub/GitCode 可用（latest 渠道在 GitCode 不可用时会回退到 `https://releases.cherry-ai.com`）。 - 更新对应的渠道配置后，脚本会按 semver 排序写回 JSON，并刷新 `lastUpdated`。 -5. **检测变更并创建 PR**：若 `cs/app-upgrade-config.json` 有变更，则创建 `chore/update-app-upgrade-config/` 分支，提交信息为 `🤖 chore: sync app-upgrade-config for `，并向 `cs-releases` 提 PR；无变更则输出提示。 +5. **检测变更并创建 PR**：若 `cs/app-upgrade-config.json` 有变更，则创建 `chore/update-app-upgrade-config/` 分支，提交信息为 `🤖 chore: sync app-upgrade-config for `，并向 `x-files/app-upgrade-config` 提 PR；无变更则输出提示。 ### 手动触发指南 1. 进入 Cherry Studio 仓库的 GitHub **Actions** 页面，选择 **Update App Upgrade Config** 工作流。 2. 点击 **Run workflow**，保持默认分支（通常为 `main`），填写 `tag`（如 `v2.1.0`）。 3. 只有在 tag 带 `-beta`/`-rc` 后缀时才勾选 `is_prerelease`，稳定版保持默认。 -4. 启动运行并等待完成，随后到 `cs-releases` 分支的 PR 查看 `app-upgrade-config.json` 的变更并在验证后合并。 +4. 启动运行并等待完成，随后到 `x-files/app-upgrade-config` 分支的 PR 查看 `app-upgrade-config.json` 的变更并在验证后合并。 ## JSON 配置文件格式 ### 文件位置 -- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json` -- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json` +- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json` +- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json` -**说明**：两个镜像源提供相同的配置文件，统一托管在 `cs-releases` 分支上。客户端根据 IP 地理位置自动选择最优镜像源。 +**说明**：两个镜像源提供相同的配置文件，统一托管在 `x-files/app-upgrade-config` 分支上。客户端根据 IP 地理位置自动选择最优镜像源。 ### 配置结构（当前实际配置） @@ -222,9 +222,9 @@ interface ChannelConfig { `.github/workflows/update-app-upgrade-config.yml` 会在 GitHub Release（包含正常发布与 Pre Release）触发： -1. 同时 Checkout 仓库默认分支（用于脚本）和 `cs-releases` 分支（真实托管配置的分支）。 -2. 在默认分支目录执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json`，直接重写 `cs-releases` 分支里的配置文件。 -3. 如果 `app-upgrade-config.json` 有变化，则通过 `peter-evans/create-pull-request` 自动创建一个指向 `cs-releases` 的 PR，Diff 仅包含该文件。 +1. 同时 Checkout 仓库默认分支（用于脚本）和 `x-files/app-upgrade-config` 分支（真实托管配置的分支）。 +2. 在默认分支目录执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag --config ../cs/app-upgrade-config.json`，直接重写 `x-files/app-upgrade-config` 分支里的配置文件。 +3. 如果 `app-upgrade-config.json` 有变化，则通过 `peter-evans/create-pull-request` 自动创建一个指向 `x-files/app-upgrade-config` 的 PR，Diff 仅包含该文件。 如需本地调试，可执行 `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json`（加 `--dry-run` 仅打印结果）来复现 CI 行为。若需要暂时跳过 GitHub/GitCode Release 页面是否就绪的校验，可在 `--dry-run` 的同时附加 `--skip-release-checks`。不加 `--config` 时默认更新当前工作目录（通常是 main 分支）下的副本，方便文档/审查。 diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts index e3d7af823d..2eb5942de2 100644 --- a/packages/shared/config/constant.ts +++ b/packages/shared/config/constant.ts @@ -198,8 +198,8 @@ export enum FeedUrl { } export enum UpdateConfigUrl { - GITHUB = 'https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/cs-releases/app-upgrade-config.json', - GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/cs-releases/app-upgrade-config.json' + GITHUB = 'https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json', + GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json' } export enum UpgradeChannel { From e033eb5b5c26abd791b66130809c186e95b2e96e Mon Sep 17 00:00:00 2001 From: fullex <106392080+0xfullex@users.noreply.github.com> Date: Fri, 14 Nov 2025 19:02:03 +0800 Subject: [PATCH 15/16] Add CODEOWNER for app-upgrade-config.json --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4596fc41d6..14eca3205f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,3 +3,4 @@ /src/main/services/ConfigManager.ts @0xfullex /packages/shared/IpcChannel.ts @0xfullex /src/main/ipc.ts @0xfullex +/app-upgrade-config.json @kangfenmao From 9c020f0d5665bcf4547f035ed55b3efd50e7d22c Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 14 Nov 2025 20:04:16 +0800 Subject: [PATCH 16/16] docs: update release notes for v1.7.0-rc.1 Add comprehensive release notes highlighting: - AI Agent system as the major new feature - New AI providers support (Hugging Face, Mistral, Perplexity, SophNet) - Knowledge base enhancements (OpenMinerU, full-text search) - Image & OCR improvements (Intel OVMS, OpenVINO NPU) - MCP management interface redesign with dual-column layout - German language support - Electron 38.7.0 upgrade and system improvements - Important bug fixes --- electron-builder.yml | 76 +++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 802c0d2c64..dfd14c2393 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -134,42 +134,58 @@ artifactBuildCompleted: scripts/artifact-build-completed.js releaseInfo: releaseNotes: | - What's New in v1.7.0-beta.6 + What's New in v1.7.0-rc.1 - New Features: - - Enhanced Input Bar: Completely redesigned input bar with improved responsiveness and functionality - - Better File Handling: Improved drag-and-drop and paste support for images and documents - - Smart Tool Suggestions: Enhanced quick panel with better item selection and keyboard shortcuts + 🎉 MAJOR NEW FEATURE: AI Agents + - Create and manage custom AI agents with specialized tools and permissions + - Dedicated agent sessions with persistent SQLite storage, separate from regular chats + - Real-time tool approval system - review and approve agent actions dynamically + - MCP (Model Context Protocol) integration for connecting external tools + - Slash commands support for quick agent interactions + - OpenAI-compatible REST API for agent access - Improvements: - - Smoother Input Experience: Better auto-resizing and text handling in chat input - - Enhanced AI Performance: Improved connection stability and response speed - - More Reliable File Uploads: Better support for various file types and upload scenarios - - Cleaner Interface: Optimized UI elements for better visual consistency + ✨ New Features: + - AI Providers: Added support for Hugging Face, Mistral, Perplexity, and SophNet + - Knowledge Base: OpenMinerU document preprocessor, full-text search in notes, enhanced tool selection + - Image & OCR: Intel OVMS painting provider and Intel OpenVINO (NPU) OCR support + - MCP Management: Redesigned interface with dual-column layout for easier management + - Languages: Added German language support - Bug Fixes: - - Fixed image selection issue when adding custom AI providers - - Fixed file upload problems with certain API configurations - - Fixed input bar responsiveness issues - - Fixed quick panel not working properly in some situations + ⚡ Improvements: + - Upgraded to Electron 38.7.0 + - Enhanced system shutdown handling and automatic update checks + - Improved proxy bypass rules + + 🐛 Important Bug Fixes: + - Fixed streaming response issues across multiple AI providers + - Fixed session list scrolling problems + - Fixed knowledge base deletion errors - v1.7.0-beta.6 新特性 + v1.7.0-rc.1 新特性 - 新功能: - - 增强输入栏：完全重新设计的输入栏，响应更灵敏，功能更强大 - - 更好的文件处理：改进的拖拽和粘贴功能，支持图片和文档 - - 智能工具建议：增强的快速面板，更好的项目选择和键盘快捷键 + 🎉 重大更新：AI Agent 智能体系统 + - 创建和管理专属 AI Agent，配置专用工具和权限 + - 独立的 Agent 会话，使用 SQLite 持久化存储，与普通聊天分离 + - 实时工具审批系统 - 动态审查和批准 Agent 操作 + - MCP（模型上下文协议）集成，连接外部工具 + - 支持斜杠命令快速交互 + - 兼容 OpenAI 的 REST API 访问 - 改进: - - 更流畅的输入体验：聊天输入框的自动调整和文本处理更佳 - - 增强 AI 性能：改进连接稳定性和响应速度 - - 更可靠的文件上传：更好地支持各种文件类型和上传场景 - - 更简洁的界面：优化 UI 元素，视觉一致性更好 + ✨ 新功能: + - AI 提供商：新增 Hugging Face、Mistral、Perplexity 和 SophNet 支持 + - 知识库：OpenMinerU 文档预处理器、笔记全文搜索、增强的工具选择 + - 图像与 OCR：Intel OVMS 绘图提供商和 Intel OpenVINO (NPU) OCR 支持 + - MCP 管理：重构管理界面，采用双列布局，更加方便管理 + - 语言：新增德语支持 - 问题修复: - - 修复添加自定义 AI 提供商时的图片选择问题 - - 修复某些 API 配置下的文件上传问题 - - 修复输入栏响应性问题 - - 修复快速面板在某些情况下无法正常工作的问题 + ⚡ 改进: + - 升级到 Electron 38.7.0 + - 增强的系统关机处理和自动更新检查 + - 改进的代理绕过规则 + + 🐛 重要修复: + - 修复多个 AI 提供商的流式响应问题 + - 修复会话列表滚动问题 + - 修复知识库删除错误