Fill in mode description, align with chatSetup

Author: roblourens

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

@@ -74,7 +74,7 @@ import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
 import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatRequestVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry } from '../common/chatModel.js';
-import { IChatMode, ChatMode2, BuiltinChatMode } from '../common/chatModes.js';
+import { ChatMode2, IChatMode, validateChatMode2 } from '../common/chatModes.js';
 import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
@@ -561,14 +561,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			return;
 		}
 
-		mode = validateChatMode(mode) ?? ChatMode.Ask;
-		this._currentMode = new BuiltinChatMode(mode);
-		this.chatMode.set(mode);
-		this._onDidChangeCurrentChatMode.fire();
-
-		if (storeSelection) {
-			this.storageService.store(GlobalLastChatModeKey, mode, StorageScope.APPLICATION, StorageTarget.USER);
-		}
+		const mode2 = validateChatMode2(mode) ?? ChatMode2.Ask;
+		this.setChatMode2(mode2, storeSelection);
 	}
 
 	setChatMode2(mode: IChatMode, storeSelection = true): void {

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

@@ -70,6 +70,7 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IButton } from '../../../../base/browser/ui/button/button.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ChatMode2 } from '../common/chatModes.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -109,17 +110,17 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
 			const chatAgentService = accessor.get(IChatAgentService);
 
 			let id: string;
-			let description = localize('chatDescription', "Ask Copilot");
+			let description = ChatMode2.Ask.description;
 			switch (location) {
 				case ChatAgentLocation.Panel:
 					if (mode === ChatMode.Ask) {
 						id = 'setup.chat';
 					} else if (mode === ChatMode.Edit) {
 						id = 'setup.edits';
-						description = localize('editsDescription', "Edit files in your workspace");
+						description = ChatMode2.Edit.description;
 					} else {
 						id = 'setup.agent';
-						description = localize('agentDescription', "Edit files in your workspace in agent mode");
+						description = ChatMode2.Agent.description;
 					}
 					break;
 				case ChatAgentLocation.Terminal:

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

@@ -115,7 +115,7 @@ class InputEditorDecorations extends Disposable {
 		}
 
 		if (!inputValue) {
-			const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location, this.widget.input.currentMode);
+			const description = this.widget.input.currentMode2.description;
 			const decoration: IDecorationOptions[] = [
 				{
 					range: {
@@ -126,7 +126,7 @@ class InputEditorDecorations extends Disposable {
 					},
 					renderOptions: {
 						after: {
-							contentText: viewModel.inputPlaceholder || (defaultAgent?.description ?? ''),
+							contentText: viewModel.inputPlaceholder || (description ?? ''),
 							color: this.getPlaceholderColor()
 						}
 					}

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

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from '../../../../nls.js';
 import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -105,7 +106,8 @@ export class CustomChatMode implements IChatMode {
 
 export class BuiltinChatMode implements IChatMode {
 	constructor(
-		public readonly kind: ChatMode
+		public readonly kind: ChatMode,
+		public readonly description: string
 	) { }
 
 	get id(): string {
@@ -119,17 +121,19 @@ export class BuiltinChatMode implements IChatMode {
 }
 
 export namespace ChatMode2 {
-	export const Ask = new BuiltinChatMode(ChatMode.Ask);
-	export const Edit = new BuiltinChatMode(ChatMode.Edit);
-	export const Agent = new BuiltinChatMode(ChatMode.Agent);
+	export const Ask = new BuiltinChatMode(ChatMode.Ask, localize('chatDescription', "Ask Copilot"));
+	export const Edit = new BuiltinChatMode(ChatMode.Edit, localize('editsDescription', "Edit files in your workspace"));
+	export const Agent = new BuiltinChatMode(ChatMode.Agent, localize('agentDescription', "Edit files in your workspace in agent mode"));
 }
 
 export function validateChatMode2(mode: unknown): IChatMode | undefined {
 	switch (mode) {
 		case ChatMode.Ask:
+			return ChatMode2.Ask;
 		case ChatMode.Edit:
+			return ChatMode2.Edit;
 		case ChatMode.Agent:
-			return new BuiltinChatMode(mode);
+			return ChatMode2.Agent;
 		default:
 			if (isIChatMode(mode)) {
 				return mode;