refactor(cli): scope watcher state per instance - #13243
Merged
Merged
Conversation
marius-kilocode
force-pushed
the
refactor-watcher-service
branch
from
August 19, 2026 14:21
51fca83 to
b8984e4
Compare
johnnyeric
approved these changes
Aug 20, 2026
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
2 participants
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.
The CLI/TUI watcher keeps the branch label synchronized after an external
git switchby warming the location service for Git instances. Its state was still cached throughInstanceState.make, which made the watcher lifetime and cleanup harder to reason about and left an architecture ratchet exception in place.This change keeps the live
vcs.branch.updatedbehavior and client gating, but tracks each warmed location in the watcher service with an instance-owned child scope. Repeated initialization is deduplicated, instance disposal closes the child scope before invalidating the shared location map entry, and service shutdown closes any remaining scopes. The watcher integration tests cover branch updates and per-instance lifecycle isolation.The shared filesystem watcher, VCS event pipeline, TUI consumer, and
/vcsendpoint are unchanged.