chat - some setup and quotas tweaks (microsoft#235484)

chat - some setup and quotas tweaks (microsoft#235477)

Author: bpasero

src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

@@ -207,10 +207,6 @@
 	border-color: var(--vscode-commandCenter-inactiveBorder) !important;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .codicon-copilot {
-	font-size: 14px;
-}
-
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:HOVER {
 	color: var(--vscode-commandCenter-activeForeground);
 	background-color: var(--vscode-commandCenter-activeBackground);

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -20,7 +20,7 @@ import { ILocalizedString, localize, localize2 } from '../../../../../nls.js';
 import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -571,9 +571,12 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 		@IChatAgentService agentService: IChatAgentService,
 		@IChatQuotasService chatQuotasService: IChatQuotasService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
 		super();
 
+		const contextKeySet = new Set([ChatContextKeys.Setup.signedOut.key]);
+
 		actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
 			if (!(action instanceof SubmenuItemAction)) {
 				return undefined;
@@ -587,29 +590,39 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 
 			const chatExtensionInstalled = agentService.getAgents().some(agent => agent.isDefault);
 			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
-
-			let primaryAction: MenuItemAction;
-			if (chatExtensionInstalled && !chatQuotaExceeded && !completionsQuotaExceeded) {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: CHAT_OPEN_ACTION_ID,
-					title: OpenChatGlobalAction.TITLE,
-					icon: Codicon.copilot,
-				}, undefined, undefined, undefined, undefined);
-			} else if (!chatExtensionInstalled) {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: 'workbench.action.chat.triggerSetup',
-					title: localize2('triggerChatSetup', "Use AI Features with Copilot for Free..."),
-					icon: Codicon.copilot,
-				}, undefined, undefined, undefined, undefined);
+			const signedOut = contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) ?? false;
+
+			let primaryActionId: string;
+			let primaryActionTitle: string;
+			let primaryActionIcon: ThemeIcon;
+			if (!chatExtensionInstalled) {
+				primaryActionId = 'workbench.action.chat.triggerSetup';
+				primaryActionTitle = localize('triggerChatSetup', "Use AI Features with Copilot for Free...");
+				primaryActionIcon = Codicon.copilot;
 			} else {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-					title: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }),
-					icon: Codicon.copilotWarning,
-				}, undefined, undefined, undefined, undefined);
+				if (signedOut) {
+					primaryActionId = CHAT_OPEN_ACTION_ID;
+					primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
+					primaryActionIcon = Codicon.copilotWarning;
+				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
+					primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+					primaryActionTitle = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+					primaryActionIcon = Codicon.copilotWarning;
+				} else {
+					primaryActionId = CHAT_OPEN_ACTION_ID;
+					primaryActionTitle = OpenChatGlobalAction.TITLE.value;
+					primaryActionIcon = Codicon.copilot;
+				}
 			}
-
-			return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, primaryAction, dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
-		}, Event.any(agentService.onDidChangeAgents, chatQuotasService.onDidChangeQuotas));
+			return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, instantiationService.createInstance(MenuItemAction, {
+				id: primaryActionId,
+				title: primaryActionTitle,
+				icon: primaryActionIcon,
+			}, undefined, undefined, undefined, undefined), dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
+		}, Event.any(
+			agentService.onDidChangeAgents,
+			chatQuotasService.onDidChangeQuotas,
+			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
+		));
 	}
 }

src/vs/workbench/contrib/chat/browser/chatQuotasService.ts

@@ -173,7 +173,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 					],
 					custom: {
 						closeOnLinkClick: true,
-						icon: Codicon.copilotWarning,
+						icon: Codicon.copilotWarningLarge,
 						markdownDetails: [
 							{ markdown: new MarkdownString(message, true) },
 							{ markdown: new MarkdownString(upgradeToPro, true) }

src/vs/workbench/contrib/chat/browser/chatSetup.ts

@@ -180,7 +180,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 				await that.context.update({ triggered: true });
 
-				showCopilotView(viewsService);
+				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(400, viewDescriptorService, layoutService);
 
 				if (startSetup === true && !ASK_FOR_PUBLIC_CODE_MATCHES) {
@@ -616,7 +616,8 @@ class ChatSetupController extends Disposable {
 		@IProgressService private readonly progressService: IProgressService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IActivityService private readonly activityService: IActivityService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
 	) {
 		super();
 
@@ -692,7 +693,7 @@ class ChatSetupController extends Disposable {
 		let session: AuthenticationSession | undefined;
 		let entitlement: ChatEntitlement | undefined;
 		try {
-			showCopilotView(this.viewsService);
+			showCopilotView(this.viewsService, this.layoutService);
 			session = await this.authenticationService.createSession(defaultChat.providerId, defaultChat.providerScopes[0]);
 			entitlement = await this.requests.forceResolveEntitlement(session);
 		} catch (error) {
@@ -714,7 +715,7 @@ class ChatSetupController extends Disposable {
 		const wasInstalled = this.context.state.installed;
 		let didSignUp = false;
 		try {
-			showCopilotView(this.viewsService);
+			showCopilotView(this.viewsService, this.layoutService);
 
 			if (entitlement !== ChatEntitlement.Limited && entitlement !== ChatEntitlement.Pro && entitlement !== ChatEntitlement.Unavailable) {
 				didSignUp = await this.requests.signUpLimited(session, options);
@@ -749,7 +750,7 @@ class ChatSetupController extends Disposable {
 
 		const currentActiveElement = getActiveElement();
 		if (activeElement === currentActiveElement || currentActiveElement === mainWindow.document.body) {
-			(await showCopilotView(this.viewsService))?.focusInput();
+			(await showCopilotView(this.viewsService, this.layoutService))?.focusInput();
 		}
 	}
 }
@@ -953,7 +954,7 @@ class ChatSetupContext extends Disposable {
 		super();
 
 		this.checkExtensionInstallation();
-		this.updateContext();
+		this.updateContextSync();
 	}
 
 	private async checkExtensionInstallation(): Promise<void> {
@@ -1014,6 +1015,10 @@ class ChatSetupContext extends Disposable {
 	private async updateContext(): Promise<void> {
 		await this.updateBarrier?.wait();
 
+		this.updateContextSync();
+	}
+
+	private updateContextSync(): void {
 		this.logService.trace(`[chat setup] updateContext(): ${JSON.stringify(this._state)}`);
 
 		if (this._state.triggered && !this._state.installed) {
@@ -1060,7 +1065,14 @@ function isCopilotEditsViewActive(viewsService: IViewsService): boolean {
 	return viewsService.getFocusedView()?.id === EditsViewId;
 }
 
-function showCopilotView(viewsService: IViewsService): Promise<IChatWidget | undefined> {
+function showCopilotView(viewsService: IViewsService, layoutService: IWorkbenchLayoutService): Promise<IChatWidget | undefined> {
+
+	// Ensure main window is in front
+	if (layoutService.activeContainer !== layoutService.mainContainer) {
+		layoutService.mainContainer.focus();
+	}
+
+	// Bring up the correct view
 	if (isCopilotEditsViewActive(viewsService)) {
 		return showEditsView(viewsService);
 	} else {