Remove chatSessionTracker #279690

osortega · 2025-11-27T00:33:28Z

No description provided.

vs-code-engineering · 2025-11-27T00:33:54Z

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@bpasero

Matched files:

src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts
src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts
src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts
src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts
src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts

Copilot

Pull request overview

This PR removes the ChatSessionTracker class and refactors session change tracking to be centralized in ChatSessionsService. The tracker previously monitored editor groups and local chat sessions, emitting change events. This functionality is now handled by registering model progress listeners directly in the ChatSessionsService constructor via an autorun that watches chat models.

Key changes:

Centralized model progress listener registration in ChatSessionsService using autorun
Removed ChatSessionTracker class and its usage throughout the codebase
Simplified LocalAgentsSessionsProvider by removing local event listening logic
Updated SessionsDataSource to no longer integrate hybrid sessions

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts	Deleted the entire ChatSessionTracker class
src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts	Added autorun to register model progress listeners; refactored registerModelProgressListener to accept models iterable instead of individual model
src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts	Removed ChatSessionTracker instantiation and usage
src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts	Removed ChatSessionTracker parameter and LocalAgentsSessionsProvider-specific event listener
src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts	Removed ChatSessionTracker parameter and hybrid session integration logic
src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts	Removed local model listener registration logic
src/vs/workbench/contrib/chat/common/chatSessionsService.ts	Updated interface signature for registerModelProgressListener
src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts	Updated mock implementation signature
src/vs/workbench/contrib/chat/test/browser/localAgentSessionsProvider.test.ts	Removed tests for the deleted event handling functionality

src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts

src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts

src/vs/workbench/contrib/chat/common/chatSessionsService.ts

dmitrivMS · 2025-11-27T00:57:06Z

Copilot seems to have good points, and CI is red...

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

…ega/remove-chat-session-tracker

roblourens

Should there also be a change in LocalAgentsSessionsProvider for it to just watch local models?

src/vs/workbench/contrib/chat/common/chatServiceImpl.ts

src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts

src/vs/workbench/api/browser/mainThreadChatSessions.ts

…ega/remove-chat-session-tracker

meganrogge · 2025-12-02T21:49:31Z

@osortega CI failing

missed the changes requested from rob

roblourens · 2025-12-02T22:40:30Z

src/vs/workbench/api/browser/mainThreadChatSessions.ts

+		disposables.add(autorun(reader => {
+			const models = this._chatService.chatModels.read(reader);
+			const onProgress = this._chatSessionsService.registerModelProgressListener(Array.from(models), chatSessionType);
+			disposables.add(onProgress(() => {


You are re-adding a new event listener every time the autorun runs - I don't think that what you want, the listeners will accumulate over time

Good catch, fixed it

I think this is still an issue? It's adding a new disposable on every autorun iteration and they accumulate over time

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

roblourens

Does this fix a bug or is it just code cleanup?

src/vs/workbench/api/browser/mainThreadChatSessions.ts

roblourens · 2025-12-03T01:45:50Z

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

-		}
-		this._registeredModels.add(model);
+	public registerModelProgressListener(models: IChatModel[], type: string): Event<void> {
+		const changeEmitter = this._register(new Emitter<void>());


This is still very funky overall to me. Someone can call the service and create disposables that stick around forever and have no way to be disposed. They should be owned by the calling method. We can merge it as long as it's not leaking but we just still need to revisit this for next month.

@roblourens we can collect all disposables and return it to the caller but does that mean that the caller needs to listen to onDispose for each model and know when to dispose the model specific disposables?

I think I understand what you meant, pushed a fix so that the caller has access to the disposables.
The function also adds disposables that listens to the disposae event of each model

roblourens · 2025-12-03T01:47:11Z

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

+		for (const model of models) {
+			if (model.sessionResource.scheme === type && !this._registeredModels.has(model)) {
+				this._registeredModels.add(model);
+				const modelDisposables = this._register(new DisposableStore());


We can't register modelDisposables on the class if it has an independent lifecycle (which it does because it tracks the model and you clear it below). Doing this creates a memory leak because the reference to the DisposableStore and everything it touches will be retained by the ChatSessionsService forever.

Changed it so that it returns the disposable store to the caller

connor4312

some code-level things you probably want to fix

src/vs/workbench/api/browser/mainThreadChatSessions.ts

src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

connor4312 · 2025-12-04T00:38:49Z

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

-					// Use autorun to listen for state changes
-					this._register(autorunSelfDisposable(reader => {
-						const state = toolInvocation.state.read(reader);
+		const listeners = new ResourceMap<IDisposable>();


I think we actually want to return a DisposableStore containing both the autorunIterableDelta and something like

store.add(toDisposable(() => { for (const listener of listeners) { listener.dispose(); } }));

otherwise they might get orphaned

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

…ega/remove-chat-session-tracker

Comments addressed and already approved

…ega/remove-chat-session-tracker

Remove chatSessionTracker

1b1806c

Copilot AI review requested due to automatic review settings November 27, 2025 00:33

osortega self-assigned this Nov 27, 2025

Copilot started reviewing on behalf of osortega November 27, 2025 00:34 View session

vs-code-engineering bot added this to the November 2025 milestone Nov 27, 2025

Copilot finished reviewing on behalf of osortega November 27, 2025 00:37

Copilot AI reviewed Nov 27, 2025

View reviewed changes

roblourens reviewed Nov 27, 2025

View reviewed changes

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

roblourens requested changes Nov 27, 2025

View reviewed changes

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

osortega and others added 3 commits November 26, 2025 18:40

Dispose fix

0451d1f

Type fix

a33e3fc

Apply suggestion from @Copilot

631470d

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

roblourens reviewed Nov 27, 2025

View reviewed changes

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

DonJayamanne previously approved these changes Dec 1, 2025

View reviewed changes

Using lastRequest observable

505cbef

osortega dismissed DonJayamanne’s stale review via 505cbef December 2, 2025 04:12

osortega added 4 commits December 1, 2025 20:16

Reverts

42aee2b

Merge branch 'main' of https://github.com/microsoft/vscode into osort…

1929bd4

…ega/remove-chat-session-tracker

Test update

802fd0b

Test

0a855d8

DonJayamanne previously approved these changes Dec 2, 2025

View reviewed changes

roblourens reviewed Dec 2, 2025

View reviewed changes

osortega added 2 commits December 2, 2025 11:11

Merge branch 'main' of https://github.com/microsoft/vscode into osort…

e88616b

…ega/remove-chat-session-tracker

Refactor

2cfdb55

osortega dismissed DonJayamanne’s stale review via 2cfdb55 December 2, 2025 21:46

meganrogge previously approved these changes Dec 2, 2025

View reviewed changes

Test updates

5d31132

Yoyokrazy previously approved these changes Dec 2, 2025

View reviewed changes

roblourens previously requested changes Dec 2, 2025

View reviewed changes

roblourens mentioned this pull request Dec 2, 2025

"submitting review failed" but it did not microsoft/vscode-pull-request-github#8193

Open

roblourens reviewed Dec 2, 2025

View reviewed changes

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

Review comments

006fc65

osortega requested a review from roblourens December 3, 2025 00:32

osortega enabled auto-merge (squash) December 3, 2025 00:45

roblourens reviewed Dec 3, 2025

View reviewed changes

osortega added 2 commits December 2, 2025 19:44

Review comment

fd3228a

Returning disposables

3289771

osortega requested a review from roblourens December 3, 2025 03:56

connor4312 requested changes Dec 3, 2025

View reviewed changes

osortega and others added 2 commits December 3, 2025 16:18

Managing disposables better

20e2bc7

Merge branch 'main' into osortega/remove-chat-session-tracker

b495780

connor4312 reviewed Dec 4, 2025

View reviewed changes

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts Outdated Show resolved Hide resolved

osortega and others added 2 commits December 3, 2025 16:59

Merge branch 'main' into osortega/remove-chat-session-tracker

009e20e

Review comments

d57e188

connor4312 previously approved these changes Dec 4, 2025

View reviewed changes

Merge branch 'main' of https://github.com/microsoft/vscode into osort…

79c825c

…ega/remove-chat-session-tracker

osortega dismissed connor4312’s stale review via 79c825c December 4, 2025 01:02

rebornix previously approved these changes Dec 4, 2025

View reviewed changes

Merge branch 'main' of https://github.com/microsoft/vscode into osort…

2d78e7b

…ega/remove-chat-session-tracker

osortega dismissed rebornix’s stale review via 2d78e7b December 4, 2025 01:40

joshspicer approved these changes Dec 4, 2025

View reviewed changes

osortega merged commit de38b37 into main Dec 4, 2025
28 checks passed

osortega deleted the osortega/remove-chat-session-tracker branch December 4, 2025 01:59

vs-code-engineering bot locked and limited conversation to collaborators Jan 20, 2026

Remove chatSessionTracker #279690

Remove chatSessionTracker #279690

Uh oh!

Conversation

osortega commented Nov 27, 2025

Uh oh!

vs-code-engineering bot commented Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📬 CODENOTIFY

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dmitrivMS commented Nov 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

roblourens left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

meganrogge commented Dec 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

roblourens Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

roblourens left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

connor4312 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

vs-code-engineering bot commented Nov 27, 2025 •

edited

Loading

roblourens Dec 3, 2025 •

edited

Loading