fix: accurate rebase status detection and continuous status polling#262
Merged
AmethystLiang merged 1 commit intomainfrom Apr 3, 2026
Merged
fix: accurate rebase status detection and continuous status polling#262AmethystLiang merged 1 commit intomainfrom
AmethystLiang merged 1 commit intomainfrom
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.
Problem
During rebasing, the UI sometimes leaves stale 'Rebasing' badges behind because it relies on checking
REBASE_HEADwhich is only present during conflicting steps of a rebase, and can sometimes be left behind even after the rebase finishes. Additionally, when the right sidebar is unmounted, worktree git status stops polling, preventing worktree cards from updating their states correctly.Solution
rebase-merge/orrebase-apply/directories, which exist for the entire duration of a rebase operation.useGitStatusPolling()hook fromRightSidebarup toApp.tsxso it can continue to poll in the background even when the sidebar is closed.