Repository navigation
feat(settings): keep computer awake while app is running - #1021
Merged
Merged
Conversation
Restore the missing Chinese design-system table and use the matching radius token so the existing documentation and style gates pass.
Persist an independent app-suspension setting and own its Electron blocker through startup, setting changes, and shutdown. Cover the Windows system request and the existing display blocker interaction.
Include the latest upstream model-picker styling without changing the reviewed power behavior.
Include the upstream Windows MCP launch fixes while retaining the reviewed power setting and its test coverage.
Keep the published keep-awake branch current with upstream main while preserving the reviewed power setting and tests.
Owner
|
开发冲突啦,好像我下午提交过这个功能了,你这个是基于那个优化的吗 |
Contributor
Author
|
对,是基于你下午新增的 你那个用的是 我把两种 blocker 做成了独立开关,也复用了现有 settings 流程。 |
vastsa
approved these changes
Sep 24, 2026
vastsa
left a comment
Owner
There was a problem hiding this comment.
Code review passed. The controller lifecycle, shutdown cleanup, conditional IPC application, independent blocker independence, Rust validation, i18n, and E2E coverage are all correct. The CI lint failure is a pre-existing style-token violation in composer-menus.css from #1020/#1022 — this PR does not touch that file.
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
prevent-app-suspensionblocker. Restore it on startup, update it immediately, and release it on shutdown.prevent-display-sleepsetting independent. Validate the new setting in Host and provide translations.Validation
powercfg /requestsobservation.line-heightandbox-shadowvalues in upstreamcomposer-menus.cssfrom PRs style: refine model picker UI #1020 and fix: model picker light-mode visibility #1022; this PR does not change that file. Native macOS/Linux power behavior remains unverified.Specs and compatibility
Updates settings UX and E2E specs. The new setting defaults off; no migration or existing setting behavior changes.
Screenshots
Before (older upstream f91d11e, Windows):


After, off (reviewed 21dcd3d candidate, Windows):
After, on with screen sleep still allowed (reviewed 21dcd3d candidate, Windows):
Closes #1018