Repository navigation
fix(server): Codex rewriting a linked shadow-home file no longer disables the provider #34900
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
juliusmarminge
wants to merge
5
commits into
main
Choose a base branch
from
factory/issue-26811
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+126
−9
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5c31458
test(server): Codex rewriting a linked shadow-home file keeps the pro…
juliusmarminge 5e6e902
fix(server): Codex rewriting a linked shadow-home file no longer disa…
juliusmarminge 97442e8
fix(server): shadow homes keep the Codex files Codex replaces by rename
juliusmarminge f9b7698
fix(server): a real config.toml in a Codex shadow home no longer disa…
juliusmarminge 4407878
Merge branch 'main' into factory/issue-26811
shivamhwp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Protect account-local
config.tomlcontent from a concurrent Codex rewrite.The
config.tomlbranch compares the shadow and shared files at line 301. It then removes the shadow path at line 341. A live Codex writer can rename a newconfig.tomlinto the shadow path between those two steps. Theremovethen deletes that new content, and the shadow path links to the shared file. The PR's stated objective is to preserve differing account-local config, so this path violates that objective.The fix must prevent the removal from deleting content that was not compared. A re-read before
removedoes not close the window, because the rename can still occur after that read. Choose a mechanism that excludes the concurrent writer or makes the replacement conditional on the compared content.