chat - tweak indicator for setup to more cohorts (microsoft#250724)

Author: bpasero

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

@@ -477,7 +477,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'chat.setup.continueLaterIndicator': { // TODO@bpasero remove me eventually
 			type: 'boolean',
-			description: nls.localize('chat.continueLaterIndicator', "Enable continue later indicator in the status bar."),
+			description: nls.localize('chat.continueLaterIndicator', "Enable indicator in the status bar to finish chat setup."),
 			default: false,
 			tags: ['onExp', 'experimental'],
 		},

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

@@ -28,7 +28,7 @@ import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../plat
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { createWorkbenchDialogOptions } from '../../../../platform/dialogs/browser/dialog.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -593,7 +593,7 @@ class ChatSetup {
 		let instance = ChatSetup.instance;
 		if (!instance) {
 			instance = ChatSetup.instance = instantiationService.invokeFunction(accessor => {
-				return new ChatSetup(context, controller, instantiationService, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService), accessor.get(ILogService), accessor.get(IConfigurationService), accessor.get(IViewsService), accessor.get(IProductService), accessor.get(IOpenerService), accessor.get(IContextMenuService), accessor.get(IContextKeyService));
+				return new ChatSetup(context, controller, instantiationService, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService) as ChatEntitlementService, accessor.get(ILogService), accessor.get(IConfigurationService), accessor.get(IViewsService), accessor.get(IProductService), accessor.get(IOpenerService), accessor.get(IContextMenuService));
 			});
 		}
 
@@ -611,14 +611,13 @@ class ChatSetup {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@ILayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
 		@ILogService private readonly logService: ILogService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IProductService private readonly productService: IProductService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) { }
 
 	skipDialog(): void {
@@ -640,7 +639,7 @@ class ChatSetup {
 	}
 
 	private async doRun(options?: { disableChatViewReveal?: boolean }): Promise<IChatSetupResult> {
-		ChatContextKeys.Setup.later.bindTo(this.contextKeyService).set(false);
+		this.context.update({ later: false });
 
 		const dialogSkipped = this.skipDialogOnce;
 		this.skipDialogOnce = false;
@@ -678,7 +677,7 @@ class ChatSetup {
 					this.openerService.open(URI.parse(defaultChat.signUpUrl));
 					return this.doRun(options); // open dialog again
 				case ChatSetupStrategy.Canceled:
-					ChatContextKeys.Setup.later.bindTo(this.contextKeyService).set(true);
+					this.context.update({ later: true });
 					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined });
 					break;
 			}

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

@@ -11,7 +11,7 @@ import { localize } from '../../../../nls.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventType } from '../../../../base/browser/dom.js';
-import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService, IQuotaSnapshot } from '../common/chatEntitlementService.js';
+import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService, IQuotaSnapshot, isProUser } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { defaultButtonStyles, defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -172,14 +172,23 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let kind: StatusbarEntryKind | undefined;
 
 		if (isNewUser(this.chatEntitlementService)) {
-
-			// Later
-			if (this.chatEntitlementService.sentiment.later && this.configurationService.getValue('chat.setup.continueLaterIndicator') === true) {
-				const continueSetup = localize('copilotLaterStatus', "Continue Setup");
-
-				text = `$(copilot) ${continueSetup}`;
-				ariaLabel = continueSetup;
-				kind = 'prominent';
+			const entitlement = this.chatEntitlementService.entitlement;
+
+			// Finish Setup
+			if (
+				(
+					this.chatEntitlementService.sentiment.later ||	// user skipped setup
+					entitlement === ChatEntitlement.Available ||	// user is entitled
+					isProUser(entitlement) ||						// user is already pro
+					entitlement === ChatEntitlement.Free			// user is already free
+				) &&
+				this.configurationService.getValue('chat.setup.continueLaterIndicator') === true
+			) {
+				const finishSetup = localize('copilotLaterStatus', "Finish Setup");
+
+				text = `$(copilot) ${finishSetup}`;
+				ariaLabel = finishSetup;
+				kind = this.chatEntitlementService.sentiment.later ? 'prominent' : undefined;
 			}
 		} else {
 			const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;

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

@@ -185,7 +185,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 		);
 
 		if (
-			!productService.defaultChatAgent ||				// needs product config
+			!productService.defaultChatAgent ||	// needs product config
 			(
 				// TODO@bpasero remove this condition and 'serverlessWebEnabled' once Chat web support lands
 				isWeb &&
@@ -895,14 +895,13 @@ export class ChatEntitlementContext extends Disposable {
 	private readonly enterpriseContextKey: IContextKey<boolean>;
 
 	private readonly hiddenContext: IContextKey<boolean>;
+	private readonly laterContext: IContextKey<boolean>;
 	private readonly installedContext: IContextKey<boolean>;
 	private readonly disabledContext: IContextKey<boolean>;
 
 	private _state: IChatEntitlementContextState;
 	private suspendedState: IChatEntitlementContextState | undefined = undefined;
-	get state(): IChatEntitlementContextState {
-		return this.suspendedState ?? this._state;
-	}
+	get state(): IChatEntitlementContextState { return this.suspendedState ?? this._state; }
 
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange = this._onDidChange.event;
@@ -926,6 +925,7 @@ export class ChatEntitlementContext extends Disposable {
 		this.businessContextKey = ChatContextKeys.Entitlement.business.bindTo(contextKeyService);
 		this.enterpriseContextKey = ChatContextKeys.Entitlement.enterprise.bindTo(contextKeyService);
 		this.hiddenContext = ChatContextKeys.Setup.hidden.bindTo(contextKeyService);
+		this.laterContext = ChatContextKeys.Setup.later.bindTo(contextKeyService);
 		this.installedContext = ChatContextKeys.Setup.installed.bindTo(contextKeyService);
 		this.disabledContext = ChatContextKeys.Setup.disabled.bindTo(contextKeyService);
 
@@ -956,8 +956,9 @@ export class ChatEntitlementContext extends Disposable {
 
 	update(context: { installed: boolean; disabled: boolean }): Promise<void>;
 	update(context: { hidden: boolean }): Promise<void>;
+	update(context: { later: boolean }): Promise<void>;
 	update(context: { entitlement: ChatEntitlement }): Promise<void>;
-	update(context: { installed?: boolean; disabled?: boolean; hidden?: boolean; entitlement?: ChatEntitlement }): Promise<void> {
+	update(context: { installed?: boolean; disabled?: boolean; hidden?: boolean; later?: boolean; entitlement?: ChatEntitlement }): Promise<void> {
 		this.logService.trace(`[chat entitlement context] update(): ${JSON.stringify(context)}`);
 
 		if (typeof context.installed === 'boolean' && typeof context.disabled === 'boolean') {
@@ -973,6 +974,10 @@ export class ChatEntitlementContext extends Disposable {
 			this._state.hidden = context.hidden;
 		}
 
+		if (typeof context.later === 'boolean') {
+			this._state.later = context.later;
+		}
+
 		if (typeof context.entitlement === 'number') {
 			this._state.entitlement = context.entitlement;
 
@@ -983,7 +988,10 @@ export class ChatEntitlementContext extends Disposable {
 			}
 		}
 
-		this.storageService.store(ChatEntitlementContext.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY, this._state, StorageScope.PROFILE, StorageTarget.MACHINE);
+		this.storageService.store(ChatEntitlementContext.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY, {
+			...this._state,
+			later: undefined // do not persist this across restarts for now
+		}, StorageScope.PROFILE, StorageTarget.MACHINE);
 
 		return this.updateContext();
 	}
@@ -1005,6 +1013,7 @@ export class ChatEntitlementContext extends Disposable {
 		this.businessContextKey.set(this._state.entitlement === ChatEntitlement.Business);
 		this.enterpriseContextKey.set(this._state.entitlement === ChatEntitlement.Enterprise);
 		this.hiddenContext.set(!!this._state.hidden);
+		this.laterContext.set(!!this._state.later);
 		this.installedContext.set(!!this._state.installed);
 		this.disabledContext.set(!!this._state.disabled);