chat - ensure chat view opens when using context actions (microsoft#261632) (microsoft#261637)

bpasero · web-flow · commit 7d0d7ffd9b7a · 2025-08-14T08:28:22.000-07:00
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -63,10 +63,11 @@ async function withChatView(accessor: ServicesAccessor): Promise<IChatWidget | u
 	const viewsService = accessor.get(IViewsService);
 	const chatWidgetService = accessor.get(IChatWidgetService);
 
-	if (chatWidgetService.lastFocusedWidget) {
-		return chatWidgetService.lastFocusedWidget;
+	const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
+	if (!lastFocusedWidget || lastFocusedWidget.location === ChatAgentLocation.Panel) {
+		return showChatView(viewsService); // only show chat view if we either have no chat view or its located in view container
 	}
-	return showChatView(viewsService);
+	return lastFocusedWidget;
 }
 
 abstract class AttachResourceAction extends Action2 {

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,11 @@ async function withChatView(accessor: ServicesAccessor): Promise<IChatWidget \| u`
`63`	`63`	`const viewsService = accessor.get(IViewsService);`
`64`	`64`	`const chatWidgetService = accessor.get(IChatWidgetService);`
`65`	`65`
`66`		`- if (chatWidgetService.lastFocusedWidget) {`
`67`		`- return chatWidgetService.lastFocusedWidget;`
	`66`	`+ const lastFocusedWidget = chatWidgetService.lastFocusedWidget;`
	`67`	`+ if (!lastFocusedWidget \|\| lastFocusedWidget.location === ChatAgentLocation.Panel) {`
	`68`	`+ return showChatView(viewsService); // only show chat view if we either have no chat view or its located in view container`
`68`	`69`	`}`
`69`		`- return showChatView(viewsService);`
	`70`	`+ return lastFocusedWidget;`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`abstract class AttachResourceAction extends Action2 {`