sessions - fix wrong use of ahead/behind in sync action#298254
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes the ahead/behind values used to label the Git sync action in the Agent Sessions window, and hardens repository-observer lifecycle to avoid attaching observers for stale repositories.
Changes:
- Ensure
registerSyncActionreceives(behind, ahead)rather than(ahead, behind). - Introduce a per-repository
DisposableStoreto prevent lateopenRepositoryresolutions from wiring observers after the session/worktree has changed.
Comments suppressed due to low confidence (1)
src/vs/sessions/contrib/gitSync/browser/gitSync.contribution.ts:55
- When switching active sessions,
_gitRepoDisposables.clear()disposes the previous repo autorun, but_syncActionDisposableandcontextKeycan remain in their previous state until the newopenRepositoryresolves and the new autorun runs. This can leave a stale sync action/counts visible briefly (or longer ifopenRepositorynever resolves for the new worktree). Consider clearing_syncActionDisposableand settingcontextKeytofalsebefore kicking offopenRepository(or whenrepoDisposables.isDisposedis detected) so the UI doesn’t show outdated ahead/behind info.
const repoDisposables = this._gitRepoDisposables.add(new DisposableStore());
this.gitService.openRepository(worktreeUri).then(repository => {
if (repoDisposables.isDisposed) {
return;
}
joaomoreno
approved these changes
Feb 27, 2026
DonJayamanne
pushed a commit
that referenced
this pull request
Mar 2, 2026
fix - update sync action registration logic
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.
No description provided.