chat: fix crash on disposed widget in scopedTools derived (#309547)#309588
Merged
roblourens merged 1 commit intomainfrom Apr 13, 2026
Merged
chat: fix crash on disposed widget in scopedTools derived (#309547)#309588roblourens merged 1 commit intomainfrom
roblourens merged 1 commit intomainfrom
Conversation
The derived observable created in getModeRequestOptions() outlives the ChatWidget. When MCP tool changes trigger a recompute after the widget is disposed, this.input is undefined (MutableDisposable cleared), crashing on .currentModeObs. Add a disposal guard to return the last snapshot instead. (Written by Copilot) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Screenshot ChangesBase: Changed (1)
|
| Before | After |
|---|---|
 |
 |
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a crash in ChatWidget.getModeRequestOptions() where a derived observable (scopedTools) can outlive the widget and later recompute after disposal (e.g. when MCP tool deletion updates the underlying observable set), previously causing this.input access to throw.
Changes:
- Add a disposal guard (
this._store.isDisposed) inside thederivedcompute function. - When disposed, return the last known tools snapshot instead of reading from the disposed input part.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts | Prevents scopedTools derived recomputation from accessing disposed widget state by returning the last tools snapshot after disposal. |
Copilot's findings
- Files reviewed: 1/1 changed files
- Comments generated: 0
zhichli
approved these changes
Apr 13, 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.
Fix #309547
The
derivedobservable created ingetModeRequestOptions()outlives theChatWidget— it's returned in request options and kept alive by the session. When an MCP server uninstall triggers tool deletion from an observable set, the derived recomputes. By then, the widget is disposed, sothis.inputisundefined(the backingMutableDisposablewas cleared), and accessing.currentModeObscrashes with:Fix: Add a
this._store.isDisposedguard at the top of the derived callback. When the widget is disposed, it returns the last known tools snapshot instead of trying to read from the destroyed input part.(Written by Copilot)