fix: stop synthesizing omitted sync conflicts - #1158
Merged
Conversation
Fail safely when Frontier diagnostics and its conflict list disagree instead of materializing guessed files. Complete divergent histories even when Frontier resolves every path without client-side file resolutions.
Forward Frontier's analyzed Git heads through merge completion so history changes are rejected before stale resolutions can be committed.
Filter already-correct LFS pointer stubs with a batched native filesystem scan before post-sync replacement. Preserve cleanup for project swaps, older Frontier responses, and explicitly uploaded media. Add regression coverage for empty, omitted, and populated upload reports.
…arker Add a new MERGE_STATE_CHANGED marker to identify cross-repo sync issues when local or remote branches change during conflict resolution. Update the isRetriableSyncError function to classify this error as retriable. Include tests to ensure correct behavior and compliance with frontier-authentication. This improves the robustness of the sync process by allowing retries in specific transient error scenarios.
LeviXIII
approved these changes
Sep 9, 2026
LeviXIII
left a comment
Contributor
There was a problem hiding this comment.
Syncing at same time works as well.
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.
fix: stop synthesizing omitted sync conflicts
Summary
Prevent Codex from turning diagnostic paths omitted from Frontier’s conflict list into fabricated conflicts. This previously caused remote files to be materialized, processed, and potentially committed as local work.
This PR works with the corresponding Frontier changes, which provide authoritative conflict information and the Git snapshot used during analysis.
Changes
remoteChangedFilePathsas the authoritative conflict-list diagnostic.allChangedFilePaths, which also contains local-only changes.Test Checklist
npm run compilenpm run lint