Skip to content

feat (desktop): persist window size and restore macOS fullscreen exits cleanly#3597

Closed
rushilrai wants to merge 5 commits into
pingdotgg:mainfrom
rushilrai:feat/desktop-window-state
Closed

feat (desktop): persist window size and restore macOS fullscreen exits cleanly#3597
rushilrai wants to merge 5 commits into
pingdotgg:mainfrom
rushilrai:feat/desktop-window-state

Conversation

@rushilrai

@rushilrai rushilrai commented Jun 29, 2026

Copy link
Copy Markdown

What Changed

This PR enables persistence of window states for the desktop app across relaunches

It adds a DesktopWindowState service (apps/desktop/src/window/DesktopWindowState.ts) that persists the main window's bounds and restore mode to window-state.json and restores them on launch.

It restores:

  • normal window size and position
  • maximized state
  • windows closed from macOS true fullscreen back onto the current desktop, without the white startup flash

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:

  • Geometry math are pure, unit-tested helpers; Electron's screen is read at a single spot.
  • Persistence uses the Effect FileSystem layer with atomic temp-file writes, a debounced interruptible-fiber save on resize/move, and an immediate save on maximize / fullscreen toggle / close.
  • Wired into DesktopWindow.createWindow (initial bounds + maximize-on-reveal), DesktopEnvironment (windowStatePath), and the desktop foundation layer in main.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

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Low Risk
Desktop-only window geometry and local JSON persistence; heavily unit-tested with fallbacks for bad or off-screen state.

Overview
Adds DesktopWindowState so the desktop main window reopens at the last saved position, size, and maximized state instead of fixed defaults.

State is written to window-state.json under the app state dir (windowStatePath on DesktopEnvironment). DesktopWindow.createWindow loads resolved bounds on create, calls attach for 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. fullscreenOriginBounds is 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.layer is registered in the desktop foundation layer; DesktopWindow tests 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

  • Adds a new DesktopWindowState service (DesktopWindowState.ts) that loads and saves window geometry to window-state.json in the app state directory.
  • On startup, the saved position/size/restore mode is validated against current displays (20% visibility threshold), clamped to minimums (840×620), and centered on the primary display if invalid.
  • Window resize/move events are debounced to disk; maximize, fullscreen entry, and close are persisted immediately using synchronous I/O to ensure durability on exit.
  • Fullscreen state is snapshotted so the pre-fullscreen bounds are restored on fullscreen exit, fixing the macOS clean-exit behavior.
  • Behavioral Change: window now opens at its last saved position and size instead of the default browser window placement; first-run defaults are 1100×780.

Macroscope summarized 669df61.

@coderabbitai

coderabbitai Bot commented Jun 29, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 9f02c254-089c-4a40-b506-cec42cca0698

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 29, 2026
window.setAutoHideCursor(false);
}

yield* windowState.attach(window);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Medium window/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 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.

🤖 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.

Comment thread apps/desktop/src/window/DesktopWindowState.ts Outdated
Comment thread apps/desktop/src/window/DesktopWindowState.ts Outdated
Comment thread apps/desktop/src/window/DesktopWindowState.ts Outdated
Comment thread apps/desktop/src/window/DesktopWindow.ts
@macroscopeapp

macroscopeapp Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: 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.

@rushilrai
rushilrai force-pushed the feat/desktop-window-state branch from 19a015b to c5a049c Compare July 6, 2026 19:25
Comment thread apps/desktop/src/window/DesktopWindowState.ts
}
cancelDebounce();
runFork(persistEffect);
};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit c5a049c. Configure here.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment thread apps/desktop/src/window/DesktopWindowState.ts
Comment thread apps/desktop/src/window/DesktopWindowState.ts

@cursor cursor Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

Fix All in Cursor

❌ 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.

Comment thread apps/desktop/src/window/DesktopWindowState.ts
Comment thread apps/desktop/src/window/DesktopWindowState.ts
@juliusmarminge

Copy link
Copy Markdown
Member

#3851

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants