fix(desktop): 结束页自选启动或关闭;锁定 portable 原地刷新 - #91
Merged
XYAIStudio merged 3 commits intoSep 21, 2026
Merged
Conversation
Windows NSIS 不再显示结束页:文件复制完成后自动启动 FreeOS 并关闭安装窗口(/S 静默安装不拉起)。升级时若 portable 目录无法改名为 portable.previous,先结束残留进程再原地覆盖新运行时。 Co-authored-by: XYAI Labs <haoboy8@gmail.com>
CI lint failed because ruff would reformat a quote in test_nsis_uninstall.py. No product behavior change. Co-authored-by: XYAI Labs <haoboy8@gmail.com>
文件复制后直接进入结束页(不再多点下一步)。用户勾选「运行 FreeOS」或取消后关闭安装程序。去掉 AutoCloseWindow / SetAutoClose / .onInstSuccess 自动启动。锁定 portable 原地刷新保持不变。 Co-authored-by: XYAI Labs <haoboy8@gmail.com>
XYAIStudio
marked this pull request as ready for review
September 21, 2026 00:19
XYAIStudio
deleted the
cursor/installer-autolaunch-portable-inplace-cb5b
branch
September 21, 2026 00:19
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
纠正安装收尾 UX:不是自动启动 FreeOS,也不是自动关掉安装窗口。
文件复制结束后不再多点一次「下一步」,直接落到 结束页。用户自己选:勾选「运行 FreeOS」启动,或取消勾选后关闭安装程序。
升级时
~/.freeos/portable若无法改名为portable.previous(目录被占用),仍先停残留进程再原地覆盖新运行时。该部分未改。Target branch
main(requested)Type of change
What changed
Installer tech: NSIS (
desktop/src/build/windows/nsis/).Finish page (user choice)
MUI_PAGE_FINISH+ 运行 FreeOS / Run FreeOS checkbox (checked by default).MUI_FINISHPAGE_RUN_FUNCTION LaunchFreeOS(unelevated explorer token).AutoCloseWindow/SetAutoClose/.onInstSuccessauto-launch.MUI_FINISHPAGE_NOAUTOCLOSE, so INSTFILES advances to Finish without an extra Next after copy./Sstill skips UI and does not launch.Locked
portablerename fallback (unchanged)portable→portable.previousfails, stop leftover holders, retry, then overlay files in place.Files
desktop/src/build/windows/nsis/project.nsi— finish page restored; no auto-close / auto-launchdesktop/src/download.go,process_windows.go,process_unix.go— in-place overlay fallbackdesktop/src/download_test.go— busy-rename fallback testtests/unit/desktop/test_nsis_uninstall.py— finish-page contract + ruff formatdesktop/README.md,CHANGELOG.md(CN + EN)Test plan
python3 -m pytest --noconftest tests/unit/desktop/test_nsis_uninstall.py tests/unit/desktop/test_nsis_detail_encoding.py -q(24 passed)ruff format --check tests/unit/desktop/test_nsis_uninstall.pyrgonproject.nsi:MUI_PAGE_FINISHpresent;AutoCloseWindow/SetAutoClose/.onInstSuccessabsent.exevia CI FreeOS Desktop Package →windows-amd64How to verify on Windows
.github/workflows/octop-desktop.ymlmatrixwindows-amd64.%USERPROFILE%\.freeos\portable: next launch should overlay in place if rename fails.FreeOS-desktop-windows-amd64-<version>.exe /Scompletes without launching the UI.Residual risks
.exeis not produced in this Linux environment.