Conversation
The review panel caches its vcs.diff query with every refetch hook disabled, so it only refreshes through explicit invalidation. Most terminal git operations still refresh it by accident because they rewrite workspace files, but a git commit/add/amend only rewrites files under .git, which produced no event: - the server's .git subscription watches only HEAD, and a regular commit does not change HEAD's content - the client's session VCS listener dropped every .git path anyway (that check also compared a relative prefix against absolute event paths, so it never actually matched) The panel then kept showing pre-commit changes until an unrelated event happened to refresh it. - watch .git/index alongside HEAD in the core watcher (staging and commits rewrite it; everything else under .git stays ignored) - in the session VCS listener, treat paths under .git whose basename is index or HEAD as VCS state changes and call the existing debounced refreshVcs(); basename matching also covers git worktrees, where the path is .git/worktrees/<name>/index - flip the watcher test to assert .git/index events are published and add coverage that other .git files remain ignored Co-Authored-By: Claude Code <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.
Issue for this PR
Closes #40795
Relates to #11856
Type of change
What does this PR do?
The review panel caches its
vcs.diffquery with every refetch hook disabled (refetchOnWindowFocus/Mount/Reconnect: false), so it only refreshes through explicit invalidation. Most terminal git operations still refresh it by accident —pull/checkout/mergerewrite workspace files and produce non-.gitwatcher events, and switching tabs or the review mode re-triggers the query.But an out-of-band
git commit/git add/git commit --amendrewrites only files under.git, and none of that produced an event, so the panel kept showing the pre-commit changes until some unrelated event happened to refresh it (a file edit, a session finishing, reopening the panel):.gitsubscription watches onlyHEAD, and a regular commit doesn't changeHEAD's content — it's still the same symbolic ref.gitpath anyway (that check also compared a relative.git/...prefix against absolute event paths, so it never actually matched)Fix:
indexfrom the.gitignore list — staging and commits rewrite it; the rest of.gitstays ignored so we don't flood events.gitwhose basename isindexorHEADas VCS state changes and call the existing debouncedrefreshVcs(); basename matching also covers git worktrees (.git/worktrees/<name>/index)ignores .git/index changesto assert the event is published, and add coverage that other.gitfiles (COMMIT_EDITMSG) remain ignoredHow did you verify your code works?
bun test test/filesystem/watcher.test.ts— 7/7 pass, including the newpublishes .git/index eventsandignores other .git changesteststypecheckpasses forpackages/coreandpackages/appgit commit/git addfrom a terminal → panel refreshes within the 100ms debounce; unrelated.gitchurn stays silentScreenshots / recordings
No visual UI change — behavior fix only.
Checklist