Skip to content

Fix duplicate event handler registration in TerminalChatService #281452

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

Draft
Copilot wants to merge 2 commits into
base: osortega/fix-delete-session-refresh
Choose a base branch
from
+24 −20
Draft

Fix duplicate event handler registration in TerminalChatService #281452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a795cc
Initial plan
Copilot Dec 5, 2025
cd474c4
Move event handlers from registerTerminalInstanceWithToolSession to c…
Copilot Dec 5, 2025
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
44 changes: 24 additions & 20 deletions src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,30 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);

this._restoreFromStorage();

// Register session disposal listener once in constructor to avoid duplicate listeners
this._register(this._chatService.onDidDisposeSession(e => {
for (const resource of e.sessionResource) {
const sessionId = LocalChatSessionUri.parseLocalSessionId(resource);
if (sessionId) {
// Clean up session auto approval state
this._sessionAutoApprovalEnabled.delete(sessionId);

// Clean up terminal instance mappings if the session ID matches a tool session
const instance = this._terminalInstancesByToolSessionId.get(sessionId);
if (instance) {
this._terminalInstancesByToolSessionId.delete(sessionId);
this._toolSessionIdByTerminalInstance.delete(instance);
this._terminalInstanceListenersByToolSessionId.deleteAndDispose(sessionId);
this._persistToStorage();
this._updateHasToolTerminalContextKeys();
}
}
}
}));

// Update context keys when terminal instances change (registered once)
this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));
}

registerTerminalInstanceWithToolSession(terminalToolSessionId: string | undefined, instance: ITerminalInstance): void {
Expand All @@ -84,26 +108,6 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
this._updateHasToolTerminalContextKeys();
}));

this._register(this._chatService.onDidDisposeSession(e => {
for (const resource of e.sessionResource) {
if (LocalChatSessionUri.parseLocalSessionId(resource) === terminalToolSessionId) {
this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
this._toolSessionIdByTerminalInstance.delete(instance);
this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
// Clean up session auto approval state
const sessionId = LocalChatSessionUri.parseLocalSessionId(resource);
if (sessionId) {
this._sessionAutoApprovalEnabled.delete(sessionId);
}
this._persistToStorage();
this._updateHasToolTerminalContextKeys();
}
}
}));

// Update context keys when terminal instances change (including when terminals are created, disposed, revealed, or hidden)
this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));

if (isNumber(instance.shellLaunchConfig?.attachPersistentProcess?.id) || isNumber(instance.persistentProcessId)) {
this._persistToStorage();
}
Expand Down