edit chat view: start editing session when created (#229975)

microsoft · Sep 27, 2024 · 6be9a30 · 6be9a30
1 parent ec1125c
commit 6be9a30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -539,7 +539,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const toolbarsContainer = elements.inputToolbars;
 		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
 		this.initAttachedContext(this.attachedContextContainer);
-		this.renderChatEditingSessionState(null, this.location === ChatAgentLocation.EditingSession);
+		this.renderChatEditingSessionState(null);
 
 		const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
 		CONTEXT_IN_CHAT_INPUT.bindTo(inputScopedContextKeyService).set(true);

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -808,6 +808,14 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			}
 		}));
 
+		if (this._location.location === ChatAgentLocation.EditingSession) {
+			const currentSession = this.chatEditingService.currentEditingSession;
+			if (currentSession && (currentSession.chatSessionId !== model.sessionId)) {
+				currentSession?.stop();
+			}
+			this.chatEditingService.startOrContinueEditingSession(model.sessionId);
+		}
+
 		if (this.tree) {
 			this.onDidChangeItems();
 			revealLastElement(this.tree);