Add session restore coalescing and error handling in AgentService#322022
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves Agent Host session restoration performance and reliability by preventing duplicate concurrent restore work (especially expensive session catalog refreshes) and by hardening restore error handling. It directly targets the “Switching sessions is too slow” scenario by ensuring repeated restores/subscribes for the same session (including subagent sessions) share the same in-flight restore work.
Changes:
- Coalesce concurrent
restoreSession()calls for the same session URI so only one backend restore is performed at a time. - Coalesce concurrent restores for the same subagent session URI during subscribe/restore flows.
- Add unit tests covering coalescing behavior and ensuring failed restores don’t permanently block retry.
Show a summary per file
| File | Description |
|---|---|
src/vs/platform/agentHost/node/agentService.ts |
Adds in-flight restore tracking for sessions and subagent sessions to avoid duplicated restore work and to ensure in-flight entries are cleared after completion/failure. |
src/vs/platform/agentHost/test/node/agentService.test.ts |
Adds restore concurrency and retry tests for both normal and subagent session restore paths. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 0
Contributor
Author
|
@roblourens /cc |
justschen
approved these changes
Jun 19, 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.
For #320303