Await Workspace Trust transition completion in setUrisTrust() - #328626
Merged
Ladislau Szomoru (lszomoru) merged 5 commits intoAug 19, 2026
Merged
Conversation
Copilot started reviewing on behalf of
Zain Nadeem (zainnadeem786)
August 2, 2026 19:15
View session
Contributor
There was a problem hiding this comment.
🟢 Ready to approve
The minimal fix addresses the premature resolution and is covered by a targeted regression test.
This review doesn't count toward merge requirements. Sign up for the private preview to control whether Copilot approvals count.
Pull request overview
Ensures Workspace Trust APIs resolve only after asynchronous trust transitions and notifications complete.
Changes:
- Awaits
doSetUrisTrust(). - Adds focused regression coverage for participant and event ordering.
File summaries
| File | Description |
|---|---|
workspaceTrust.ts |
Awaits the complete trust transition. |
workspaceTrust.test.ts |
Verifies correct asynchronous completion ordering. |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0
- Review effort level: Balanced
We're testing this review assessment. Please use 👍 or 👎 to tell us if it's correct.
Ladislau Szomoru (lszomoru)
assigned
SteVen Batten (sbatten) and unassigned
Ladislau Szomoru (lszomoru)
…ipant takes some time
SteVen Batten (sbatten)
approved these changes
Aug 18, 2026
roblourens
approved these changes
Aug 19, 2026
Dmitriy Vasyura (dmitrivMS)
approved these changes
Aug 19, 2026
Dmitriy Vasyura (dmitrivMS)
enabled auto-merge (squash)
August 19, 2026 02:51
auto-merge was automatically disabled
August 19, 2026 05:41
Pull request was closed
Dmitriy Vasyura (dmitrivMS)
enabled auto-merge (squash)
August 19, 2026 05:44
auto-merge was automatically disabled
August 19, 2026 06:30
Pull request was closed
Ladislau Szomoru (lszomoru)
enabled auto-merge (squash)
August 19, 2026 07:16
Dileep Yavanmandha (dileepyavan)
pushed a commit
that referenced
this pull request
Aug 19, 2026
* Fix Workspace Trust transition promise ordering * fix: improve focus handling after deleting trusted URI item if participant takes some time --------- Co-authored-by: SteVen Batten <sbatten@microsoft.com> Co-authored-by: Dmitriy Vasyura <dmitriv@microsoft.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.
Fixes #328625
Summary
Ensure
WorkspaceTrustManagementService.setUrisTrust()does not resolve until the underlying Workspace Trust transition has completed.Root Cause
setUrisTrust()invoked the asynchronousdoSetUrisTrust(...)operation without awaiting its returned promise.As a result, callers awaiting
setUrisTrust()orsetWorkspaceTrust()could resume before asynchronous Workspace Trust transition participants completed and beforeonDidChangeTrustwas emitted.Change
Await the existing
doSetUrisTrust(...)promise insidesetUrisTrust().This ensures that the public promise resolves only after the complete Workspace Trust transition has finished.
Regression Test
Added a focused regression test that registers a controlled asynchronous Workspace Trust transition participant and verifies that
setWorkspaceTrust()remains unresolved until:onDidChangeTrustevent fires.The test fails on the previous implementation and passes after the fix.
Validation
npm run compile.\scripts\test.bat --grep "setWorkspaceTrust waits for trust transition participants before resolving"1 passing.\scripts\test.bat --grep "Workspace Trust"10 passinggit diff --check