Uh oh!
There was an error while loading. Please reload this page.
feat (desktop): persist window size and restore macOS fullscreen exits cleanly - #3597
feat (desktop): persist window size and restore macOS fullscreen exits cleanly#3597rushilrai wants to merge 5 commits into
Conversation
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
| @@ -275,6 +289,7 @@ export const make = Effect.gen(function* () { | |||
| window.setAutoHideCursor(false); | |||
| } | |||
| yield* windowState.attach(window); | |||
There was a problem hiding this comment.
🟡 Mediumwindow/DesktopWindow.ts:292
windowState.attach(window) is called immediately after window creation, before the reveal callback runs window.maximize(). If the window is closed before ready-to-show/did-finish-load fires (e.g. slow or failed renderer startup), the close handler persists window.isMaximized() as false, overwriting the saved maximized state. The next launch then restores a normal-sized window instead of the user's maximized state. Consider calling window.maximize() right after windowState.attach, or deferring windowState.attach until after the maximize is applied.
Also found in 1 other location(s)
apps/desktop/src/window/DesktopWindowState.ts:251
When
resolveDocumentseeswindow.isFullScreen(), it unconditionally writesrestoreMode: "fullscreen-origin"and drops whether the pre-fullscreen window was maximized. If the user enters macOS fullscreen from a maximized window and quits there, the next launch restores a large normal window instead of re-maximizing, so the previous maximize state is silently lost.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/desktop/src/window/DesktopWindow.ts around line 292:
`windowState.attach(window)` is called immediately after window creation, before the reveal callback runs `window.maximize()`. If the window is closed before `ready-to-show`/`did-finish-load` fires (e.g. slow or failed renderer startup), the close handler persists `window.isMaximized()` as `false`, overwriting the saved `maximized` state. The next launch then restores a normal-sized window instead of the user's maximized state. Consider calling `window.maximize()` right after `windowState.attach`, or deferring `windowState.attach` until after the maximize is applied.
Also found in 1 other location(s):
- apps/desktop/src/window/DesktopWindowState.ts:251 -- When `resolveDocument` sees `window.isFullScreen()`, it unconditionally writes `restoreMode: "fullscreen-origin"` and drops whether the pre-fullscreen window was maximized. If the user enters macOS fullscreen from a maximized window and quits there, the next launch restores a large normal window instead of re-maximizing, so the previous maximize state is silently lost.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
ApprovabilityVerdict: Needs human review 1 blocking correctness issue found. New feature adding window state persistence with complex event handling for fullscreen/maximize transitions. Two unresolved review comments identify potential bugs in state management edge cases. The substantial new capability and open issues warrant human review. You can customize Macroscope's approvability policy. Learn more. |
19a015b to
c5a049cCompareUh oh!
There was an error while loading. Please reload this page.
| } | ||
| cancelDebounce(); | ||
| runFork(persistEffect); | ||
| }; |
There was a problem hiding this comment.
Close ignores post-exit moves
Medium Severity
When a window leaves fullscreen, the fullscreenExitPending flag is set. If the window is then moved or resized and closed before the debounce timer clears this flag, the persistOnClose action saves the outdated pre-fullscreen bounds as fullscreenOriginBounds, ignoring recent changes.
Reviewed by Cursor Bugbot for commit c5a049c. Configure here.
There was a problem hiding this comment.
It's a deliberate trade-off.
During quit-from-fullscreen, macOS emits the same move/resize events while animating the window out, treating them as user input at close-time is exactly the bug the fullscreenExitPending flag fixes.
There's no local signal to distinguish "user moved the window" from "teardown animation", so we hold the snapshot for the 250ms debounce.
Worst case: a position held for <250ms before close restores at the pre-fullscreen frame instead.
The precise alternative would be consulting the app's quitting state (DesktopState.quitting), which couples the service to app lifecycle. Would only do this if the maintainer prefers.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.
There are 2 total unresolved issues (including 1 from previous review).
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 1ec93f5. Configure here.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
What Changed
This PR enables persistence of window states for the desktop app across relaunches
It adds a
DesktopWindowStateservice (apps/desktop/src/window/DesktopWindowState.ts) that persists the main window's bounds and restore mode towindow-state.jsonand restores them on launch.It restores:
Keeps normal restore bounds separate from the fullscreen-origin visible frame, so standard maximize behaviour stays intact. Missing, corrupt, or off-screen state safely falls back to the centered default.
Implementation notes:
screenis read at a single spot.FileSystemlayer with atomic temp-file writes, a debounced interruptible-fiber save on resize/move, and an immediate save on maximize / fullscreen toggle / close.DesktopWindow.createWindow(initial bounds + maximize-on-reveal),DesktopEnvironment(windowStatePath), and the desktop foundation layer inmain.ts.Why
Right now the desktop app always comes back at the default size, which is frustrating if you keep it in a specific layout.
This change makes relaunch behavior feel much closer to what users expect from native desktop apps.
UI Changes
Desktop window restore behaviour only.
Checklist
Note
Low Risk
Desktop-only window geometry and local JSON persistence; heavily unit-tested with fallbacks for bad or off-screen state.
Overview
Adds
DesktopWindowStateso the desktop main window reopens at the last saved position, size, and maximized state instead of fixed defaults.State is written to
window-state.jsonunder the app state dir (windowStatePathonDesktopEnvironment).DesktopWindow.createWindowloads resolved bounds on create, callsattachfor ongoing persistence, and maximizes before first reveal when the saved restore mode is maximized.Persistence uses debounced resize/move saves, immediate saves on maximize/fullscreen/close, and sync atomic temp-file writes so quit-from-fullscreen (especially macOS) does not store mid-transition geometry.
fullscreenOriginBoundsis kept separate from normal/maximized restore so quitting from true fullscreen can reopen on the prior desktop frame without breaking unmaximize behavior. Invalid, off-screen, or missing JSON falls back to centered defaults on the primary display.DesktopWindowState.layeris registered in the desktop foundation layer;DesktopWindowtests stub the service to stay filesystem-free.Reviewed by Cursor Bugbot for commit 669df61. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Persist desktop window size/position and restore macOS fullscreen exits cleanly
DesktopWindowStateservice (DesktopWindowState.ts) that loads and saves window geometry towindow-state.jsonin the app state directory.Macroscope summarized 669df61.