fix(worktree): resolve existing worktrees on Windows#6
Open
logan-jl-cc wants to merge 1 commit into
Open
Conversation
getWorktree() compared the git-reported checked-out path against the pool's realpath with a bare startsWith. On Windows, git emits forward-slash paths (C:/Users/.../wt) while realpath uses native backslashes (C:\Users\...\wt), so the prefix check always failed and getWorktree() returned undefined — Yoda could not detect an already-checked-out worktree and re-provisioned each time. Normalize both sides before the prefix compare and require a directory boundary (pool + sep) so the prefix can't match an unrelated sibling. Return the normalized path so callers get consistent native separators. Co-Authored-By: Claude <noreply@anthropic.com>
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.
Summary
Fixes
getWorktree()returningundefinedon Windows, so Yoda detects an already-checked-out worktree instead of re-provisioning every time.Root cause
getWorktree()compared the git-reported checked-out path against the pool's realpath with a barestartsWith:On Windows,
git worktree list --porcelainemits forward-slash paths (C:/Users/.../wt-pool-xxx/branch) whilefs.realpathreturns native backslashes (C:\Users\...\wt-pool-xxx). The prefix check always failed →getWorktree()returnedundefined.Fix
Normalize both sides before the prefix compare, and require a directory boundary so the pool prefix can't match an unrelated sibling:
Returns the normalized path so callers get consistent native separators. On POSIX,
path.normalizeis effectively a no-op, so behavior is unchanged.Verification
The
worktree-service"falls back to the flattened branch name" test (which exercisesgetWorktreefor an already-checked-out branch) now passes on Windows; all 8worktree-servicetests pass. No regression on POSIX —path.normalizepreserves forward-slash paths.🤖 Generated with Claude Code