Rename fix for disposed models

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

@@ -64,6 +64,12 @@ export class LocalAgentsSessionsProvider extends Disposable implements IChatSess
 				this._onDidChangeChatSessionItems.fire();
 			}
 		}));
+
+		this._register(this.chatService.onDidChangeSessionTitle(e => {
+			if (getChatSessionType(e.sessionResource) === this.chatSessionType) {
+				this._onDidChangeChatSessionItems.fire();
+			}
+		}));
 	}
 
 	async provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]> {

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

@@ -1258,6 +1258,8 @@ export interface IChatService {
 
 	readonly onDidDisposeSession: Event<{ readonly sessionResource: URI[]; readonly reason: 'cleared' }>;
 
+	readonly onDidChangeSessionTitle: Event<{ readonly sessionResource: URI; readonly title: string }>;
+
 	transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void>;
 
 	activateDefaultAgent(location: ChatAgentLocation): Promise<void>;

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

@@ -98,6 +98,9 @@ export class ChatService extends Disposable implements IChatService {
 	private readonly _onDidDisposeSession = this._register(new Emitter<{ readonly sessionResource: URI[]; reason: 'cleared' }>());
 	public readonly onDidDisposeSession = this._onDidDisposeSession.event;
 
+	private readonly _onDidChangeSessionTitle = this._register(new Emitter<{ readonly sessionResource: URI; readonly title: string }>());
+	public readonly onDidChangeSessionTitle = this._onDidChangeSessionTitle.event;
+
 	private readonly _sessionFollowupCancelTokens = this._register(new DisposableResourceMap<CancellationTokenSource>());
 	private readonly _chatServiceTelemetry: ChatServiceTelemetry;
 	private readonly _chatSessionStore: ChatSessionStore;
@@ -253,14 +256,17 @@ export class ChatService extends Disposable implements IChatService {
 		const model = this._sessionModels.get(sessionResource);
 		if (model) {
 			model.setCustomTitle(title);
-		}
+		} else {
 
-		// Update the title in the file storage
-		const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (localSessionId) {
-			await this._chatSessionStore.setSessionTitle(localSessionId, title);
-			// Trigger immediate save to ensure consistency
-			this.saveState();
+			// Update the title in the file storage
+			const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+			if (localSessionId) {
+				await this._chatSessionStore.setSessionTitle(localSessionId, title);
+				// Trigger immediate save to ensure consistency
+				this.saveState();
+			}
+
+			this._onDidChangeSessionTitle.fire({ sessionResource, title });
 		}
 	}
 

src/vs/workbench/contrib/chat/common/model/chatModel.ts

@@ -1244,6 +1244,7 @@ export interface IChatModel extends IDisposable {
 	readonly initialLocation: ChatAgentLocation;
 	readonly title: string;
 	readonly hasCustomTitle: boolean;
+	setCustomTitle(title: string): void;
 	readonly responderUsername: string;
 	/** True whenever a request is currently running */
 	readonly requestInProgress: IObservable<boolean>;

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

@@ -54,6 +54,9 @@ class MockChatService implements IChatService {
 	private readonly _onDidDisposeSession = new Emitter<{ sessionResource: URI[]; reason: 'cleared' }>();
 	readonly onDidDisposeSession = this._onDidDisposeSession.event;
 
+	private readonly _onDidChangeSessionTitle = new Emitter<{ sessionResource: URI; title: string }>();
+	readonly onDidChangeSessionTitle = this._onDidChangeSessionTitle.event;
+
 	fireDidDisposeSession(sessionResource: URI[]): void {
 		this._onDidDisposeSession.fire({ sessionResource, reason: 'cleared' });
 	}

src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts

@@ -109,6 +109,8 @@ export class MockChatService implements IChatService {
 	}
 	readonly onDidDisposeSession: Event<{ sessionResource: URI[]; reason: 'cleared' }> = undefined!;
 
+	readonly onDidChangeSessionTitle: Event<{ readonly sessionResource: URI; readonly title: string }> = undefined!;
+
 	async transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void> {
 		throw new Error('Method not implemented.');
 	}

src/vs/workbench/contrib/chat/test/common/model/mockChatModel.ts

@@ -57,6 +57,9 @@ export class MockChatModel extends Disposable implements IChatModel {
 		super.dispose();
 	}
 
+	setCustomTitle(title: string): void {
+		this.customTitle = title;
+	}
 	startEditingSession(isGlobalEditingSession?: boolean, transferFromSession?: IChatEditingSession): void { }
 	getRequests(): IChatRequestModel[] { return []; }
 	setCheckpoint(requestId: string | undefined): void { }