chat - tweaks to welcome (microsoft#234556)

* chat - tweaks to welcome

* .

* .

* .

* .

* .

* .

* .

* .

Author: bpasero

src/vs/base/common/product.ts

@@ -312,7 +312,6 @@ export interface IDefaultChatAgent {
 	readonly chatWelcomeTitle: string;
 	readonly documentationUrl: string;
 	readonly privacyStatementUrl: string;
-	readonly collectionDocumentationUrl: string;
 	readonly skusDocumentationUrl: string;
 	readonly providerId: string;
 	readonly providerName: string;

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

@@ -470,11 +470,20 @@ export function registerChatActions() {
 				id: LearnMoreChatAction.ID,
 				title: LearnMoreChatAction.TITLE,
 				category: CHAT_CATEGORY,
-				menu: {
-					id: MenuId.ChatCommandCenter,
-					group: 'z_learn',
-					order: 1
-				}
+				menu: [
+					{
+						id: MenuId.ChatCommandCenter,
+						group: 'z_learn',
+						order: 1,
+						when: ChatContextKeys.Setup.installed
+					},
+					{
+						id: MenuId.ChatCommandCenter,
+						group: 'a_first',
+						order: 2,
+						when: ChatContextKeys.Setup.installed.toNegated()
+					}
+				]
 			});
 		}
 

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

@@ -79,6 +79,7 @@ import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js'
 import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
 import { ChatEditorOverlayController } from './chatEditorOverlay.js';
 import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
+import product from '../../../../platform/product/common/product.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -116,7 +117,7 @@ configurationRegistry.registerConfiguration({
 		'chat.commandCenter.enabled': {
 			type: 'boolean',
 			tags: ['preview'],
-			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for chat actions (requires {0}).", '`#window.commandCenter#`'),
+			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for chat actions to control {0} (requires {1}).", product.defaultChatAgent?.chatName, '`#window.commandCenter#`'),
 			default: true
 		},
 		'chat.experimental.offerSetup': {

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

@@ -46,12 +46,12 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
+	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
 	name: product.defaultChatAgent?.name ?? '',
 	icon: Codicon[product.defaultChatAgent?.icon as keyof typeof Codicon ?? 'commentDiscussion'],
 	chatWelcomeTitle: product.defaultChatAgent?.chatWelcomeTitle ?? '',
 	documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
-	collectionDocumentationUrl: product.defaultChatAgent?.collectionDocumentationUrl ?? '',
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
@@ -468,7 +468,7 @@ class ChatSetupController extends Disposable {
 
 			installResult = 'installed';
 		} catch (error) {
-			this.logService.trace(`[chat setup] install: error ${error}`);
+			this.logService.error(`[chat setup] install: error ${error}`);
 
 			installResult = isCancellationError(error) ? 'cancelled' : 'failedInstall';
 		}
@@ -519,7 +519,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		const limitedSkuHeaderElement = this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true }))).element);
 
 		const telemetryLabel = localize('telemetryLabel', "Allow {0} to use my data, including Prompts, Suggestions, and Code Snippets, for product improvements", defaultChat.providerName);
-		const { container: telemetryContainer, checkbox: telemetryCheckbox } = this.createCheckBox(telemetryLabel, this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? false : false);
+		const { container: telemetryContainer, checkbox: telemetryCheckbox } = this.createCheckBox(telemetryLabel, this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? false : true);
 
 		const detectionLabel = localize('detectionLabel', "Allow suggestions matching public code");
 		const { container: detectionContainer, checkbox: detectionCheckbox } = this.createCheckBox(detectionLabel, true);
@@ -530,23 +530,24 @@ class ChatSetupWelcomeContent extends Disposable {
 		this._register(button.onDidClick(() => this.controller.setup(telemetryCheckbox.checked, detectionCheckbox.checked)));
 
 		// Footer
-		const footer = localize({ key: 'privacyFooter', comment: ['{Locked="]({0})"}'] }, "By proceeding you agree to our [privacy statement]({0}). You can [learn more]({1}) about {2}.", defaultChat.privacyStatementUrl, defaultChat.documentationUrl, defaultChat.name);
+		const footer = localize({ key: 'privacyFooter', comment: ['{Locked="]({0})"}'] }, "By proceeding you agree to our [privacy statement]({0}). Click [here]({1}) to learn more about {2}.", defaultChat.privacyStatementUrl, defaultChat.documentationUrl, defaultChat.name);
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(footer, { isTrusted: true }))).element);
 
 		// Update based on model state
 		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update([limitedSkuHeaderElement, telemetryContainer, detectionContainer], [telemetryCheckbox, detectionCheckbox], button)));
 	}
 
 	private createCheckBox(label: string, checked: boolean): { container: HTMLElement; checkbox: Checkbox } {
-		const container = this.element.appendChild($('p'));
+		const container = this.element.appendChild($('p.checkbox-container'));
 		const checkbox = this._register(new Checkbox(label, checked, defaultCheckboxStyles));
 		container.appendChild(checkbox.domNode);
 
-		const checkboxLabel = container.appendChild($('div'));
+		const checkboxLabel = container.appendChild($('div.checkbox-label'));
 		checkboxLabel.textContent = label;
 		this._register(addDisposableListener(checkboxLabel, EventType.CLICK, () => {
 			if (checkbox?.enabled) {
 				checkbox.checked = !checkbox.checked;
+				checkbox.focus();
 			}
 		}));
 
@@ -717,17 +718,20 @@ class ChatSetupTriggerAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const viewsService = accessor.get(IViewsService);
 		const instantiationService = accessor.get(IInstantiationService);
+		const configurationService = accessor.get(IConfigurationService);
 
 		instantiationService.createInstance(ChatSetupContextKeys).update({ triggered: true });
 
 		showChatView(viewsService);
+
+		configurationService.updateValue('chat.commandCenter.enabled', true);
 	}
 }
 
 class ChatSetupHideAction extends Action2 {
 
 	static readonly ID = 'workbench.action.chat.hideSetup';
-	static readonly TITLE = localize2('hideChatSetup', "Hide {0}", defaultChat.name);
+	static readonly TITLE = localize2('hideChatSetup', "Hide {0}...", defaultChat.name);
 
 	constructor() {
 		super({
@@ -737,8 +741,8 @@ class ChatSetupHideAction extends Action2 {
 			precondition: ChatContextKeys.Setup.installed.negate(),
 			menu: {
 				id: MenuId.ChatCommandCenter,
-				group: 'a_first',
-				order: 2,
+				group: 'z_hide',
+				order: 1,
 				when: ChatContextKeys.Setup.installed.negate()
 			}
 		});
@@ -753,8 +757,8 @@ class ChatSetupHideAction extends Action2 {
 
 		const { confirmed } = await dialogService.confirm({
 			message: localize('hideChatSetupConfirm', "Are you sure you want to hide {0}?", defaultChat.name),
-			detail: localize('hideChatSetupDetail', "You can restore chat controls from the 'chat.commandCenter.enabled' setting."),
-			primaryButton: localize('hideChatSetup', "Hide {0}", defaultChat.name)
+			detail: localize('hideChatSetupDetail', "You can restore it by running the '{0}' command.", ChatSetupTriggerAction.TITLE.value),
+			primaryButton: localize('hideChatSetupButton', "Hide {0}", defaultChat.name)
 		});
 
 		if (!confirmed) {

src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css

@@ -22,4 +22,13 @@
 		width: 100%;
 		padding: 4px 7px;
 	}
+
+	p.checkbox-container {
+		display: flex;
+	}
+
+	div.checkbox-label {
+		flex-basis: fit-content;
+		cursor: pointer;
+	}
 }