Temporary Mac Beta for Combined PR Validation / 临时 Mac 内测包合并验证#2348
Open
SivanCola wants to merge 12 commits into
Open
Temporary Mac Beta for Combined PR Validation / 临时 Mac 内测包合并验证#2348SivanCola wants to merge 12 commits into
SivanCola wants to merge 12 commits into
Conversation
…ac-beta # Conflicts: # package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR temporarily combines four open fixes into one macOS beta validation branch so testers can use a single build while the individual PRs continue through normal review:
This is intended as a temporary problem-solving branch for internal testing. For macOS testers who are currently blocked, using this beta package is recommended over mixing local patches manually.
Root Cause
The fixes testers need are currently split across several PRs, and the macOS package built from only one PR can miss the other required desktop, CLI, cache, and long-session fixes. The first Apple Silicon-only beta package also cannot run on Intel Macs, which explains failures on some macOS 13.7.8 machines.
Technical Approach
This branch starts from the latest upstream
mainand merge-commits the four PR heads. The only textual conflict was inpackage.jsonscripts, where both the cache guard script and the desktop lint/build verification gates are preserved.The macOS beta packages are attached to the fork release:
Reasonix_0.52.0_pr2334-2306-2299-2284_aarch64.dmgReasonix_0.52.0_pr2334-2306-2299-2284_x64.dmgRelease: https://github.com/SivanCola/DeepSeek-Reasonix/releases/tag/desktop-pr-combo-20260530-arm64
These packages are ad-hoc signed for temporary internal testing. They are not Apple Developer ID notarized builds, so Gatekeeper may require right-click Open or:
Focused Optimization Points
Verification
npm run verifypassed during branch push.npm run cache:guardpassed.tests/loop-user-persist.test.ts,tests/cache-guard.test.ts,tests/copy-history.test.ts,tests/slash.test.ts,tests/desktop-sidebar-new-chat-layout.test.ts,desktop/src/App.test.ts,desktop/src/ui/jump-bar.test.tsx.hdiutil verifypassed for generated macOS DMGs.codesign --verify --deep --strictpassed for the app bundles after local ad-hoc signing.SHA256:
中文说明
这个 PR 临时把四个待合并修复集中到一个 macOS 内测验证分支,方便测试用户先使用一个完整内测包,而不是手动混合多个分支。
这个分支是临时解决问题、用于内测验证的方案。对于当前被 macOS 安装包阻塞的测试用户,建议优先使用这里提供的内测包。
问题原因
测试用户需要的修复分散在多个 PR 中,只使用其中一个 PR 构建 macOS 包会缺少其他桌面端、CLI、cache、长会话相关修复。最初的 Apple Silicon 单架构包也无法在 Intel Mac 上运行,这会导致部分 macOS 13.7.8 用户无法使用。
技术方案
基于最新 upstream
main,以 merge commit 方式合入四个 PR head。唯一文本冲突在根目录package.jsonscripts 区域,已同时保留 cache guard 和 desktop lint/build 验证入口。macOS 内测包已放在 fork release 中,包含 Apple Silicon 和 Intel 两个版本:
Reasonix_0.52.0_pr2334-2306-2299-2284_aarch64.dmgReasonix_0.52.0_pr2334-2306-2299-2284_x64.dmgRelease: https://github.com/SivanCola/DeepSeek-Reasonix/releases/tag/desktop-pr-combo-20260530-arm64
这些包是临时内测用的 ad-hoc 签名包,不是 Apple Developer ID 公证包。如遇 Gatekeeper 提示,可右键打开,或执行:
本次集中优化点
验证
npm run verify已在 push 分支时通过。npm run cache:guard已通过。hdiutil verify。codesign --verify --deep --strict。