feat: add stable file locking using std::fs APIs #2894
Merged
Conversation
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
- Use Rust 1.89+ stabilized std::fs::File locking APIs - Platform-specific implementation: Unix uses try_lock_shared(), Windows uses try_lock() - Maintains retry logic and advisory file locking behavior - No external dependencies required for file locking
Remove comment that talks about deleted code (was probably written by Codex?).
Fix another comment and also remove a cfg(windows) gate that was inside a function that was cfg(unix) (so it was effectively unreachable code).
bolinfest
approved these changes
Sep 3, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 PR implements advisory file locking for the message history using Rust 1.89+ stabilized std::fs::File locking APIs, eliminating the need for external dependencies.
Key Changes
Technical Details
The implementation provides advisory file locking to prevent corruption when multiple Codex processes attempt to write to the message history file simultaneously. The locking is platform-aware to handle differences in Windows vs Unix file locking behavior.
Testing
Related to discussion in #2773 about using stabilized Rust APIs instead of external dependencies.