Sessions - expose session base branch information#300415
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR extends the Git repository state plumbing (git extension API → ext host → main thread → sessions UI) to surface “base branch” information (merge-base branch name + protection status) for agent sessions.
Changes:
- Adds
basemetadata toGitBranch/GitBranchDtoand introducesGitBaseRef/GitBaseRefDto. - Updates the ext host Git bridge to resolve the current branch’s merge-base branch and compute whether it’s protected.
- Updates the Sessions Changes view to use sessions-scoped context keys and to derive a new “merge base branch protected” context value.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/contrib/git/common/gitService.ts | Extends GitBranch with optional base metadata (GitBaseRef). |
| src/vs/workbench/api/common/extHostGitExtensionService.ts | Resolves merge-base branch + protection and includes it in the repo state DTO. |
| src/vs/workbench/api/common/extHost.protocol.ts | Extends the RPC DTOs to carry GitBranchDto.base and defines GitBaseRefDto. |
| src/vs/sessions/contrib/changes/browser/changesView.ts | Renames context keys to sessions.* and binds a new merge-base protection context key. |
| extensions/git/src/api/git.d.ts | Exposes isBranchProtected on the git extension API Repository. |
| extensions/git/src/api/api1.ts | Wires isBranchProtected through the API wrapper implementation. |
alexr00
approved these changes
Mar 10, 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
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.