Merge branch 'main' into eli/empty-add

Author: eli-w-king

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

@@ -640,16 +640,25 @@ configurationRegistry.registerConfiguration({
 				mode: 'auto'
 			}
 		},
-		'chat.todoListWidget.position': {
-			type: 'string',
-			default: 'default',
-			enum: ['default', 'off', 'chat-input'],
-			enumDescriptions: [
-				nls.localize('chat.todoListWidget.position.default', "Show todo list widget in the default position at the top of the chat panel."),
-				nls.localize('chat.todoListWidget.position.off', "Hide the todo list widget."),
-				nls.localize('chat.todoListWidget.position.chatInput', "Show todo list widget near the chat input.")
-			],
-			description: nls.localize('chat.todoListWidget.position', "Controls the position of the todo list widget in chat."),
+		[ChatConfiguration.TodoList]: {
+			type: 'object',
+			description: nls.localize('chat.agent.todoList', "Configures the todo list widget in chat."),
+			properties: {
+				position: {
+					type: 'string',
+					default: 'default',
+					enum: ['default', 'off', 'chat-input'],
+					enumDescriptions: [
+						nls.localize('chat.agent.todoList.position.default', "Show todo list in the top of the chat panel."),
+						nls.localize('chat.agent.todoList.position.off', "Hide the todo list (still shows the tool calls for tracking todo progress)."),
+						nls.localize('chat.agent.todoList.position.chatInput', "Show todo list above the chat input.")
+					],
+					description: nls.localize('chat.agent.todoList.position', "Controls the position of the todo list in the chat view, which opens when the agent has created todo items and updates as it makes progress.")
+				}
+			},
+			default: {
+				position: 'default'
+			},
 			tags: ['experimental'],
 			experiment: {
 				mode: 'auto'

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

@@ -72,7 +72,7 @@ import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariable
 import { ChatViewModel, IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { IChatInputState } from '../common/chatWidgetHistoryService.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, TodoListWidgetPositionSettingId } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../common/constants.js';
 import { ILanguageModelToolsService, IToolData, ToolSet } from '../common/languageModelToolsService.js';
 import { ComputeAutomaticInstructions } from '../common/promptSyntax/computeAutomaticInstructions.js';
 import { PromptsConfig } from '../common/promptSyntax/config/config.js';
@@ -1248,7 +1248,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			return;
 		}
 
-		const todoListWidgetPosition = this.configurationService.getValue<string>(TodoListWidgetPositionSettingId) || 'default';
+		const todoListConfig = this.configurationService.getValue<{ position?: string }>(ChatConfiguration.TodoList);
+		const todoListWidgetPosition = todoListConfig?.position || 'default';
 
 		// Handle 'off' - hide the widget and return
 		if (todoListWidgetPosition === 'off') {

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

@@ -16,6 +16,7 @@ export enum ChatConfiguration {
 	CheckpointsEnabled = 'chat.checkpoints.enabled',
 	AgentSessionsViewLocation = 'chat.agentSessionsViewLocation',
 	ThinkingStyle = 'chat.agent.thinkingStyle',
+	TodoList = 'chat.agent.todoList',
 	UseCloudButtonV2 = 'chat.useCloudButtonV2',
 	ShowAgentSessionsViewDescription = 'chat.showAgentSessionsViewDescription',
 	EmptyStateHistoryEnabled = 'chat.emptyState.history.enabled',
@@ -85,6 +86,4 @@ export namespace ChatAgentLocation {
 
 export const ChatUnsupportedFileSchemes = new Set([Schemas.vscodeChatEditor, Schemas.walkThrough, Schemas.vscodeChatSession, 'ccreq']);
 
-export const TodoListWidgetPositionSettingId = 'chat.todoListWidget.position';
-
 export const VIEWLET_ID = 'workbench.view.chat.sessions';