fix(staged): fix "Looking for changes" stuck after adding project from PR#654
Merged
fix(staged): fix "Looking for changes" stuck after adding project from PR#654
Conversation
…m PR handleRepoSelected was racing with the project-setup-progress event handler: it overwrote worktreePath back to null (no merge logic) and never called invalidateProjectBranchTimelines, so BranchCard's effect guard prevented re-triggering loadTimeline. Add the same merge logic used in the project-setup-progress handler to preserve worktreePath when the backend hasn't returned it yet, and dispatch timeline invalidation so BranchCard re-fetches. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Deduplicate the branch merge logic that was copied verbatim in both handleRepoSelected and the project-setup-progress event handler. The new helper keeps the two call sites in sync and reduces the chance of them diverging. Also fix the project-setup-progress handler to pass mergedBranches (instead of the raw unmerged branches) to enqueueInitialSetup, matching what handleRepoSelected already did. This avoids attempting to enqueue setup for branches whose worktreePath is already set.
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
1 participant
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
mergeBranchesPreservingWorktreehelper to prevent stale async responses from overwriting populatedworktreePathvalues with nullenqueueInitialSetupso workspace lifecycle correctly detects existing worktreesTest plan
🤖 Generated with Claude Code