Fix: Prevent duplicate worktree path crash#553
Open
sentry[bot] wants to merge 1 commit into
Open
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
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.
This PR addresses REPOPROMPT-54 by preventing a fatal crash when
GitService.makeWorktreeDescriptorsencounters duplicate standardized worktree paths.Previously,
Dictionary(uniqueKeysWithValues:)was used to constructlayoutsByPath. This initializer traps with a fatal error if multiple entries resolve to the same key (standardized file path), which can occur in certain git/codex worktree configurations.The fix replaces
Dictionary(uniqueKeysWithValues:)withDictionary(_:uniquingKeysWith: { first, _ in first }). This change ensures that if duplicate standardized paths are encountered, the first value is retained, and the application continues to function without crashing. This turns a crash into a deterministic deduplication, as identified in the root cause analysis.Fixes REPOPROMPT-54