🐛 fix stale desktop lock recovery#33
Merged
Reverier-Xu merged 2 commits intomasterfrom Apr 2, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves the desktop “stale lock” recovery path so that a leftover .rx.is.alive no longer blocks startup when the prior instance is gone, and adds a best-effort cleanup path when the UI event loop returns.
Changes:
- Refactors lock-file handling to validate the stored port and only exit when a
/popuprequest returns2xx; otherwise the lock is treated as stale and removed. - Adds runtime cleanup helpers and wires cleanup to run after
ui.run()returns. - Centralizes shutdown cleanup to reuse the same cleanup logic.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
crates/desktop/src/launcher.rs |
Adds lock validation + “focus existing instance” logic; introduces cleanup helpers used by shutdown and post-ui.run() cleanup. |
crates/desktop/src/main.rs |
Calls new cleanup path after ui.run() returns, using a weak handle to the UI. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Reverier-Xu
approved these changes
Apr 2, 2026
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Member
|
Closes #32 . |
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 fixes the desktop stale lock recovery path described in #32.
Changes:
.rx.is.aliveinstead of exiting only because the file exists2xxresponse fromPOST /popupas a live existing instance2xxresponses as stale stateui.run()returnsFiles changed
crates/desktop/src/launcher.rscrates/desktop/src/main.rsValidation
cargo check --workspace