Skip to content

chat - ensure all panel agents dispose on error during setup #246374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bpasero merged 1 commit into from
Apr 12, 2025
Merged

chat - ensure all panel agents dispose on error during setup #246374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions src/vs/workbench/contrib/chat/browser/chatSetup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { isCancellationError } from '../../../../base/common/errors.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { MarkdownString } from '../../../../base/common/htmlContent.js';
import { Lazy } from '../../../../base/common/lazy.js';
import { combinedDisposable, Disposable, DisposableStore, IDisposable, markAsSingleton, MutableDisposable } from '../../../../base/common/lifecycle.js';
import { Disposable, DisposableStore, IDisposable, markAsSingleton, MutableDisposable } from '../../../../base/common/lifecycle.js';
import Severity from '../../../../base/common/severity.js';
import { StopWatch } from '../../../../base/common/stopwatch.js';
import { equalsIgnoreCase } from '../../../../base/common/strings.js';
Expand Down Expand Up @@ -266,8 +266,8 @@ class SetupChatAgentImplementation extends Disposable implements IChatAgentImple
progress({
kind: 'warning',
content: new MarkdownString(ready === 'timedout' ?
localize('copilotTookLongWarning', "Copilot took too long to get ready. Please try again.") :
localize('copilotFailedWarning', "Copilot failed to get ready. Please try again.")
localize('copilotTookLongWarning', "Copilot took too long to get ready. Please review the guidance in the Chat view.") :
localize('copilotFailedWarning', "Copilot failed to get ready. Please review the guidance in the Chat view.")
)
});

Expand Down Expand Up @@ -557,24 +557,27 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
const updateRegistration = () => {
const disabled = context.state.hidden;
if (!disabled && !registration.value) {
const { agent: panelAgent, disposable: panelDisposable } = SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, ChatMode.Ask, context, controller);
registration.value = combinedDisposable(
panelDisposable,
SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Terminal, undefined, context, controller).disposable,
SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Notebook, undefined, context, controller).disposable,
SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Editor, undefined, context, controller).disposable,
SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, ChatMode.Edit, context, controller).disposable,
SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, ChatMode.Agent, context, controller).disposable,
panelAgent.onUnresolvableError(() => {
const disposables = registration.value = new DisposableStore();

// Panel Agents
for (const mode of [ChatMode.Ask, ChatMode.Edit, ChatMode.Agent]) {
const { agent, disposable } = SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, mode, context, controller);
disposables.add(disposable);
disposables.add(agent.onUnresolvableError(() => {
// An unresolvable error from our agent registrations means that
// Copilot is unhealthy for some reason. We clear our panel
// registration to give Copilot a chance to show a custom message
// to the user from the views and stop pretending as if there was
// a functional agent.
this.logService.error('[chat setup] Unresolvable error from Copilot agent registration, clearing registration.');
panelDisposable.dispose();
})
);
disposable.dispose();
}));
}

// Inline Agents
disposables.add(SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Terminal, undefined, context, controller).disposable);
disposables.add(SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Notebook, undefined, context, controller).disposable);
disposables.add(SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Editor, undefined, context, controller).disposable);
} else if (disabled && registration.value) {
registration.clear();
}
Expand Down
Loading