Repository navigation
Improve workspace picker preselection - #328995
Merged
Benjamin Christopher Simmonds (benibenj) merged 1 commit intoAug 4, 2026
Merged
Benjamin Christopher Simmonds (benibenj) merged 1 commit into
Benjamin Christopher Simmonds (benibenj) merged 1 commit into
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Benjamin Christopher Simmonds (benibenj)
enabled auto-merge (squash)
August 4, 2026 16:16
Copilot started reviewing on behalf of
Benjamin Christopher Simmonds (benibenj)
August 4, 2026 16:16
View session
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: Sandeep Somavarapu (@sandy081)Matched files:
Ladislau Szomoru (@lszomoru)Matched files:
|
Contributor
There was a problem hiding this comment.
🟡 Not ready to approve
Web restoration can select a recent workspace belonging to a provider other than the currently scoped host.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
This review doesn't count toward merge requirements. Sign up for the private preview to control whether Copilot approvals count.
Pull request overview
Improves Agents workspace restoration while preventing generated worktrees from being automatically selected.
Changes:
- Falls back to VS Code’s recent workspaces.
- Preserves manual worktree history while excluding it from preselection.
- Adds targeted restoration and filtering tests.
File summaries
| File | Description |
|---|---|
src/vs/sessions/SESSIONS.md |
Documents workspace restoration rules. |
src/vs/sessions/services/sessions/browser/sessionsRecentWorkspacesService.ts |
Filters generated worktree paths. |
src/vs/sessions/contrib/chat/test/browser/sessionWorkspacePicker.test.ts |
Tests fallback, filtering, and asynchronous restoration. |
src/vs/sessions/contrib/chat/browser/webWorkspacePicker.ts |
Excludes worktrees during host-scoped restoration. |
src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.ts |
Implements merged-history restoration and preselection filtering. |
Review details
- Files reviewed: 5/5 changed files
- Comments generated: 1
- Review effort level: Balanced
We're testing this review assessment. Please use 👍 or 👎 to tell us if it's correct.
Comment on lines
+1009
to
+1011
| for (const recent of this.recentWorkspacesService.getRecentWorkspaces()) { | ||
| const folderUri = recent.workspace.folders[0]?.root; | ||
| if (!folderUri || isWorktreeWorkspaceUri(folderUri) || this._isProviderUnavailable(recent.providerId)) { |
Vritant Bhardwaj (vritant24)
approved these changes
Aug 4, 2026
Benjamin Christopher Simmonds (benibenj)
merged commit Aug 4, 2026
70b3c04
into
main
46 of 48 checks passed
Benjamin Christopher Simmonds (benibenj)
deleted the
benibenj/agents/workspace-picker-preselection-rules
branch
August 4, 2026 18:29
Don Jayamanne (DonJayamanne)
added a commit
that referenced
this pull request
Aug 4, 2026
* origin/main: (31 commits) Improve workspace picker preselection (#328995) agentHost: support Codex custom agents and runtime enablement (#328956) Finalizes customEditorPriority proposal. Closes #292379 (#329002) Add Agents window startup A/A experiment trigger (#328454) sessions: show created session pill in response summary (#328984) Fix onboarding microphone picker visibility (#329011) Explains how to develop the markdown editor (#329009) Conditional agent-window auth for signed-out users (#328990) Fix BYOK enterprise policy handling in agent host Agent Host changes for fix/agent-host-byok-enterprise-policy agentHost: drive tool execution from the session input queue (#328989) Make Integrated Browser smoke tests deterministic across build qualities (#328983) Accept box sizing screenshot changes Avoid large Component Fixtures step outputs Remove component fixture box sizing reset fix: guard stale line numbers in test decorations (fixes #328988) sessions: fix maximized side pane toggle (#328974) Add component fixture rendering controls Reduce floating panel margins for layout consistency (#328963) agentHost: support file completions across workspace roots (#328944) ... # Conflicts: # src/vs/sessions/SESSIONS.md # src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Testing