sessions: disable branch picker in folder mode#307692
Merged
hawkticehurst merged 2 commits intomainfrom Apr 3, 2026
Merged
Conversation
Keep the new chat branch picker visible when isolation switches to Folder, but disable it until Worktree is selected again. Also add regression coverage for the folder/worktree toggle and keep the disabled picker cursor consistent on hover. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the sessions Copilot Chat branch picker so that when isolation mode switches from Worktree to Folder it remains visible but disabled (instead of being hidden), and becomes interactive again when switching back to Worktree. It also tweaks the disabled hover cursor styling and adds regression tests to cover the folder/worktree toggle behavior.
Changes:
- Update
BranchPickervisibility/disabled logic to keep the UI visible in folder mode while preventing interaction. - Add browser tests validating disabled/enabled behavior across isolation mode toggles.
- Adjust CSS so the disabled picker cursor remains
defaulton hover.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts | Keeps the picker visible when isolation mode is workspace, but disables interaction and focus appropriately. |
| src/vs/sessions/contrib/copilotChatSessions/test/browser/branchPicker.test.ts | Adds regression coverage for disabled state in folder mode and re-enable behavior when switching back to worktree mode. |
| src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.css | Ensures disabled picker hover keeps a consistent cursor: default. |
Keep the branch picker behavior change, but drop the extra disabled hover cursor styling so the PR only contains the intended picker visibility/disabled-state update. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
joshspicer
approved these changes
Apr 3, 2026
sandy081
added a commit
that referenced
this pull request
Apr 7, 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.
Summary
Validation
npm run compile-check-ts-nativenpm run valid-layers-checknode --experimental-strip-types build/hygiene.ts src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts src/vs/sessions/contrib/copilotChatSessions/test/browser/branchPicker.test.ts src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.cssNotes