agent_ui: Fix worktree naming regression when using existing branches#53669
Open
agent_ui: Fix worktree naming regression when using existing branches#53669
Conversation
When creating a new git worktree from an existing branch (e.g. 'main'), the worktree directory was incorrectly named after the branch instead of getting a random adjective-noun name. This was introduced in ccb9e60 which separated branch name from worktree directory name but used the branch name as the fallback when no explicit worktree name was provided. Additionally, if a directory with that name already existed, the rollback logic could destructively delete the pre-existing worktree. Changes: - Generate a random adjective-noun name for worktree directories when no explicit name is provided, instead of falling back to branch name - Collect existing worktree directory names and pass them to the name generator to avoid collisions - Check generated paths against known worktree paths before creating, to prevent attempting creation at an already-occupied path - Reduce random name retry count from 100 to 10 (sufficient given ~59,000 possible combinations) - Add regression test that verifies worktree directories get random names when using an existing branch
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.
When creating a new git worktree from an existing branch (e.g.
main), the worktree directory was incorrectly named after the branch instead of getting a random adjective-noun name. Additionally, if a directory with that name already existed, the rollback logic could destructively delete the pre-existing worktree.Changes:
Release Notes: