@codingame/monaco-vscode-api 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { SequencerByKey } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
@@ -10,6 +11,8 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { ChatEntitlement } from '../../../services/chat/common/chatEntitlementService.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.service.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 import { ChatContextKeys } from './chatContextKeys.js';
@@ -63,16 +66,16 @@ const languageModelChatProviderType = {
     properties: {
         vendor: {
             type: 'string',
-            description: ( localize(5556, "A globally unique vendor of language model chat provider."))
+            description: ( localize(5612, "A globally unique vendor of language model chat provider."))
         },
         displayName: {
             type: 'string',
-            description: ( localize(5557, "The display name of the language model chat provider."))
+            description: ( localize(5613, "The display name of the language model chat provider."))
         },
         managementCommand: {
             type: 'string',
             description: ( localize(
-                5558,
+                5614,
                 "A command to manage the language model chat provider, e.g. 'Manage Copilot models'. This is used in the chat model picker. If not provided, a gear icon is not rendered during vendor selection."
             ))
         }
@@ -81,7 +84,7 @@ const languageModelChatProviderType = {
 const languageModelChatProviderExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModelChatProviders',
     jsonSchema: {
-        description: ( localize(5559, "Contribute language model chat providers of a specific vendor.")),
+        description: ( localize(5615, "Contribute language model chat providers of a specific vendor.")),
         oneOf: [
             languageModelChatProviderType,
             {
@@ -90,26 +93,39 @@ const languageModelChatProviderExtensionPoint = ExtensionsRegistry.registerExten
             }
         ]
     },
-    activationEventsGenerator: (contribs, result) => {
+    activationEventsGenerator: function* (contribs) {
         for (const contrib of contribs) {
-            result.push(`onLanguageModelChatProvider:${contrib.vendor}`);
+            yield `onLanguageModelChatProvider:${contrib.vendor}`;
         }
     }
 });
 let LanguageModelsService = class LanguageModelsService {
-    constructor(_extensionService, _logService, _storageService, _contextKeyService) {
+    constructor(_extensionService, _logService, _storageService, _contextKeyService, _chatEntitlementService) {
         this._extensionService = _extensionService;
         this._logService = _logService;
         this._storageService = _storageService;
+        this._chatEntitlementService = _chatEntitlementService;
         this._store = ( new DisposableStore());
         this._providers = ( new Map());
         this._modelCache = ( new Map());
         this._vendors = ( new Map());
+        this._resolveLMSequencer = ( new SequencerByKey());
         this._modelPickerUserPreferences = {};
         this._onLanguageModelChange = this._store.add(( new Emitter()));
         this.onDidChangeLanguageModels = this._onLanguageModelChange.event;
         this._hasUserSelectableModels = ChatContextKeys.languageModelsAreUserSelectable.bindTo(_contextKeyService);
         this._modelPickerUserPreferences = this._storageService.getObject('chatModelPickerPreferences', StorageScope.PROFILE, this._modelPickerUserPreferences);
+        const entitlementChangeHandler = () => {
+            if ((this._chatEntitlementService.entitlement === ChatEntitlement.Business || this._chatEntitlementService.entitlement === ChatEntitlement.Enterprise) && !this._chatEntitlementService.isInternal) {
+                this._modelPickerUserPreferences = {};
+                this._storageService.store('chatModelPickerPreferences', this._modelPickerUserPreferences, StorageScope.PROFILE, StorageTarget.USER);
+            }
+            else if (this._chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+                this._modelPickerUserPreferences = {};
+            }
+        };
+        entitlementChangeHandler();
+        this._store.add(this._chatEntitlementService.onDidChangeEntitlement(entitlementChangeHandler));
         this._store.add(this.onDidChangeLanguageModels(() => {
             this._hasUserSelectableModels.set(this._modelCache.size > 0 && ( Array.from(( this._modelCache.values())).some(model => model.isUserSelectable)));
         }));
@@ -119,22 +135,22 @@ let LanguageModelsService = class LanguageModelsService {
                 for (const item of Iterable.wrap(extension.value)) {
                     if (( this._vendors.has(item.vendor))) {
                         extension.collector.error(( localize(
-                            5560,
+                            5616,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localize(5561, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(5617, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localize(5562, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(5618, "The vendor field cannot start or end with whitespace.")));
                         continue;
                     }
                     this._vendors.set(item.vendor, item);
-                    if (this._hasStoredModelForvendor(item.vendor)) {
+                    if (this._hasStoredModelForVendor(item.vendor)) {
                         this._extensionService.activateByEvent(`onLanguageModelChatProvider:${item.vendor}`);
                     }
                 }
@@ -146,7 +162,7 @@ let LanguageModelsService = class LanguageModelsService {
             }
         }));
     }
-    _hasStoredModelForvendor(vendor) {
+    _hasStoredModelForVendor(vendor) {
         return ( ( Object.keys(this._modelPickerUserPreferences)).some(modelId => {
             return modelId.startsWith(vendor);
         }));
@@ -185,38 +201,27 @@ let LanguageModelsService = class LanguageModelsService {
         }
         return model;
     }
-    _clearModelCache(vendors) {
-        if (typeof vendors === 'string') {
-            vendors = [vendors];
-        }
-        for (const vendor of vendors) {
-            for (const [id, model] of this._modelCache.entries()) {
-                if (model.vendor === vendor) {
-                    this._modelCache.delete(id);
-                }
+    _clearModelCache(vendor) {
+        for (const [id, model] of this._modelCache.entries()) {
+            if (model.vendor === vendor) {
+                this._modelCache.delete(id);
             }
         }
     }
-    async resolveLanguageModels(vendors, silent) {
-        if (typeof vendors === 'string') {
-            vendors = [vendors];
+    async _resolveLanguageModels(vendor, silent) {
+        await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendor}`);
+        const provider = this._providers.get(vendor);
+        if (!provider) {
+            this._logService.warn(`[LM] No provider registered for vendor ${vendor}`);
+            return;
         }
-        const all = ( vendors.map(
-            vendor => this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendor}`)
-        ));
-        await Promise.all(all);
-        this._clearModelCache(vendors);
-        for (const vendor of vendors) {
-            const provider = this._providers.get(vendor);
-            if (!provider) {
-                this._logService.warn(`[LM] No provider registered for vendor ${vendor}`);
-                continue;
-            }
+        return this._resolveLMSequencer.queue(vendor, async () => {
             try {
                 let modelsAndIdentifiers = await provider.provideLanguageModelChatInfo({ silent }, CancellationToken.None);
                 if (!silent && ( modelsAndIdentifiers.some(m => m.metadata.isUserSelectable))) {
                     modelsAndIdentifiers = modelsAndIdentifiers.filter(m => m.metadata.isUserSelectable || this._modelPickerUserPreferences[m.identifier] === true);
                 }
+                this._clearModelCache(vendor);
                 for (const modelAndIdentifier of modelsAndIdentifiers) {
                     if (( this._modelCache.has(modelAndIdentifier.identifier))) {
                         this._logService.warn(`[LM] Model ${modelAndIdentifier.identifier} is already registered. Skipping.`);
@@ -229,16 +234,16 @@ let LanguageModelsService = class LanguageModelsService {
             catch (error) {
                 this._logService.error(`[LM] Error resolving language models for vendor ${vendor}:`, error);
             }
-        }
-        this._onLanguageModelChange.fire();
+            this._onLanguageModelChange.fire();
+        });
     }
     async selectLanguageModels(selector, allowPromptingUser) {
         if (selector.vendor) {
-            await this.resolveLanguageModels([selector.vendor], !allowPromptingUser);
+            await this._resolveLanguageModels(selector.vendor, !allowPromptingUser);
         }
         else {
             const allVendors = Array.from(( this._vendors.keys()));
-            await this.resolveLanguageModels(allVendors, !allowPromptingUser);
+            await Promise.all(( allVendors.map(vendor => this._resolveLanguageModels(vendor, !allowPromptingUser))));
         }
         const result = [];
         for (const [internalModelIdentifier, model] of this._modelCache) {
@@ -261,13 +266,15 @@ let LanguageModelsService = class LanguageModelsService {
             throw ( new Error(`Chat model provider for vendor ${vendor} is already registered.`));
         }
         this._providers.set(vendor, provider);
-        this.resolveLanguageModels(vendor, true).then(() => {
-            this._onLanguageModelChange.fire();
+        this._resolveLanguageModels(vendor, true);
+        const modelChangeListener = provider.onDidChange(async () => {
+            await this._resolveLanguageModels(vendor, true);
         });
         return toDisposable(() => {
             this._logService.trace('[LM] UNregistered language model provider', vendor);
             this._clearModelCache(vendor);
             this._providers.delete(vendor);
+            modelChangeListener.dispose();
         });
     }
     async sendChatRequest(modelId, from, messages, options, token) {
@@ -293,7 +300,8 @@ LanguageModelsService = ( __decorate([
     ( __param(0, IExtensionService)),
     ( __param(1, ILogService)),
     ( __param(2, IStorageService)),
-    ( __param(3, IContextKeyService))
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IChatEntitlementService))
 ], LanguageModelsService));
 
 export { ChatImageMimeType, ChatMessageRole, ILanguageModelChatMetadata, ImageDetailLevel, LanguageModelPartAudience, LanguageModelsService, languageModelChatProviderExtensionPoint };

package/vscode/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.js

@@ -1,6 +1,6 @@
 
 import { localize } from '../../../../../nls.js';
 
-const DEFAULT_MODEL_PICKER_CATEGORY = { label: ( localize(5563, "Other Models")), order: Number.MAX_SAFE_INTEGER };
+const DEFAULT_MODEL_PICKER_CATEGORY = { label: ( localize(5619, "Other Models")), order: Number.MAX_SAFE_INTEGER };
 
 export { DEFAULT_MODEL_PICKER_CATEGORY };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service.d.ts

@@ -3,8 +3,10 @@ import { Event } from "../../../../../../base/common/event.js";
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
 import { URI } from "../../../../../../base/common/uri.js";
 import { ITextModel } from "../../../../../../editor/common/model.js";
+import { IExtensionDescription } from "../../../../../../platform/extensions/common/extensions.js";
 import { PromptsType } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { TSharedPrompt, IPromptPath, IChatPromptSlashCommand, IPromptParserResult, ICustomChatMode } from "./promptsService.js";
+import { ParsedPromptFile } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/newPromptsParser";
+import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomChatMode } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 /**
 * Provides prompt services.
 */
@@ -15,17 +17,19 @@ export declare const IPromptsService: import("../../../../../../platform/instant
 export interface IPromptsService extends IDisposable {
     readonly _serviceBrand: undefined;
     /**
-    * Get a prompt syntax parser for the provided text model.
-    * See {@link TextModelPromptParser} for more info on the parser API.
+    * The parsed prompt file for the provided text model.
+    * @param textModel Returns the parsed prompt file.
     */
-    getSyntaxParserFor(model: ITextModel): TSharedPrompt & {
-        isDisposed: false;
-    };
+    getParsedPromptFile(textModel: ITextModel): ParsedPromptFile;
     /**
     * List all available prompt files.
     */
     listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]>;
     /**
+    * List all available prompt files.
+    */
+    listPromptFilesForStorage(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly IPromptPath[]>;
+    /**
     * Get a list of prompt source folders based on the provided prompt type.
     */
     getSourceFolders(type: PromptsType): readonly IPromptPath[];
@@ -37,12 +41,16 @@ export interface IPromptsService extends IDisposable {
     /**
     * Gets the prompt file for a slash command.
     */
-    resolvePromptSlashCommand(data: IChatPromptSlashCommand, _token: CancellationToken): Promise<IPromptParserResult | undefined>;
+    resolvePromptSlashCommand(data: IChatPromptSlashCommand, _token: CancellationToken): Promise<ParsedPromptFile | undefined>;
     /**
     * Returns a prompt command if the command name is valid.
     */
     findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]>;
     /**
+    * Returns the prompt command name for the given URI.
+    */
+    getPromptCommandName(uri: URI): Promise<string>;
+    /**
     * Event that is triggered when the list of custom chat modes changes.
     */
     readonly onDidChangeCustomChatModes: Event<void>;
@@ -54,10 +62,17 @@ export interface IPromptsService extends IDisposable {
     * Parses the provided URI
     * @param uris
     */
-    parse(uri: URI, type: PromptsType, token: CancellationToken): Promise<IPromptParserResult>;
+    parseNew(uri: URI, token: CancellationToken): Promise<ParsedPromptFile>;
     /**
     * Returns the prompt file type for the given URI.
     * @param resource the URI of the resource
     */
     getPromptFileType(resource: URI): PromptsType | undefined;
+    /**
+    * Internal: register a contributed file. Returns a disposable that removes the contribution.
+    * Not intended for extension authors; used by contribution point handler.
+    */
+    registerContributedFile(type: PromptsType, name: string, description: string, uri: URI, extension: IExtensionDescription): IDisposable;
+    getPromptLocationLabel(promptPath: IPromptPath): string;
+    findAgentMDsInWorkspace(token: CancellationToken): Promise<URI[]>;
 }

package/vscode/src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.d.ts

@@ -4,17 +4,18 @@ import { IToolData, IToolImpl, IToolInvocation, IToolResult, IToolInvocationPrep
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
 import { ITelemetryService } from "../../../../../platform/telemetry/common/telemetry.service.js";
 import { IChatTodoListService } from "../chatTodoListService.service.js";
-export declare const TodoListToolSettingId = "chat.todoListTool.enabled";
 export declare const TodoListToolWriteOnlySettingId = "chat.todoListTool.writeOnly";
+export declare const TodoListToolDescriptionFieldSettingId = "chat.todoListTool.descriptionField";
 export declare const ManageTodoListToolToolId = "manage_todo_list";
-export declare function createManageTodoListToolData(writeOnly: boolean): IToolData;
+export declare function createManageTodoListToolData(writeOnly: boolean, includeDescription?: boolean): IToolData;
 export declare const ManageTodoListToolData: IToolData;
 export declare class ManageTodoListTool extends Disposable implements IToolImpl {
     private readonly writeOnly;
+    private readonly includeDescription;
     private readonly chatTodoListService;
     private readonly logService;
     private readonly telemetryService;
-    constructor(writeOnly: boolean, chatTodoListService: IChatTodoListService, logService: ILogService, telemetryService: ITelemetryService);
+    constructor(writeOnly: boolean, includeDescription: boolean, chatTodoListService: IChatTodoListService, logService: ILogService, telemetryService: ITelemetryService);
     invoke(invocation: IToolInvocation, _countTokens: any, _progress: any, _token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     private generatePastTenseMessage;

package/vscode/src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.js

@@ -7,15 +7,13 @@ import { ToolDataSource } from '../languageModelToolsService.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { IChatTodoListService } from '../chatTodoListService.service.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IsSimulationContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { localize } from '../../../../../nls.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 
-const TodoListToolSettingId = 'chat.todoListTool.enabled';
 const TodoListToolWriteOnlySettingId = 'chat.todoListTool.writeOnly';
+const TodoListToolDescriptionFieldSettingId = 'chat.todoListTool.descriptionField';
 const ManageTodoListToolToolId = 'manage_todo_list';
-function createManageTodoListToolData(writeOnly) {
+function createManageTodoListToolData(writeOnly, includeDescription = true) {
     const baseProperties = {
         todoList: {
             type: 'array',
@@ -33,17 +31,19 @@ function createManageTodoListToolData(writeOnly) {
                         type: 'string',
                         description: 'Concise action-oriented todo label (3-7 words). Displayed in UI.'
                     },
-                    description: {
-                        type: 'string',
-                        description: 'Detailed context, requirements, or implementation notes. Include file paths, specific methods, or acceptance criteria.'
-                    },
+                    ...(includeDescription && {
+                        description: {
+                            type: 'string',
+                            description: 'Detailed context, requirements, or implementation notes. Include file paths, specific methods, or acceptance criteria.'
+                        }
+                    }),
                     status: {
                         type: 'string',
                         enum: ['not-started', 'in-progress', 'completed'],
                         description: 'not-started: Not begun | in-progress: Currently working (max 1) | completed: Fully finished with no blockers'
                     },
                 },
-                required: ['id', 'title', 'description', 'status']
+                required: includeDescription ? ['id', 'title', 'description', 'status'] : ['id', 'title', 'status']
             }
         }
     };
@@ -59,11 +59,10 @@ function createManageTodoListToolData(writeOnly) {
     return {
         id: ManageTodoListToolToolId,
         toolReferenceName: 'todos',
-        when: ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${TodoListToolSettingId}`, true)), IsSimulationContext)),
         canBeReferencedInPrompt: true,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(5642, 'Manage and track todo items for task planning')),
-        userDescription: ( localize(5643, 'Tool for managing and tracking todo items for task planning')),
+        displayName: ( localize(5711, 'Manage and track todo items for task planning')),
+        userDescription: ( localize(5712, 'Tool for managing and tracking todo items for task planning')),
         modelDescription: 'Manage a structured todo list to track progress and plan tasks throughout your coding session. Use this tool VERY frequently to ensure task visibility and proper planning.\n\nWhen to use this tool:\n- Complex multi-step work requiring planning and tracking\n- When user provides multiple tasks or requests (numbered/comma-separated)\n- After receiving new instructions that require multiple steps\n- BEFORE starting work on any todo (mark as in-progress)\n- IMMEDIATELY after completing each todo (mark completed individually)\n- When breaking down larger tasks into smaller actionable steps\n- To give users visibility into your progress and planning\n\nWhen NOT to use:\n- Single, trivial tasks that can be completed in one step\n- Purely conversational/informational requests\n- When just reading files or performing simple searches\n\nCRITICAL workflow:\n1. Plan tasks by writing todo list with specific, actionable items\n2. Mark ONE todo as in-progress before starting work\n3. Complete the work for that specific todo\n4. Mark that todo as completed IMMEDIATELY\n5. Move to next todo and repeat\n\nTodo states:\n- not-started: Todo not yet begun\n- in-progress: Currently working (limit ONE at a time)\n- completed: Finished successfully\n\nIMPORTANT: Mark todos completed as soon as they are done. Do not batch completions.',
         source: ToolDataSource.Internal,
         inputSchema: {
@@ -75,9 +74,10 @@ function createManageTodoListToolData(writeOnly) {
 }
 createManageTodoListToolData(false);
 let ManageTodoListTool = class ManageTodoListTool extends Disposable {
-    constructor(writeOnly, chatTodoListService, logService, telemetryService) {
+    constructor(writeOnly, includeDescription, chatTodoListService, logService, telemetryService) {
         super();
         this.writeOnly = writeOnly;
+        this.includeDescription = includeDescription;
         this.chatTodoListService = chatTodoListService;
         this.logService = logService;
         this.telemetryService = telemetryService;
@@ -137,7 +137,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
                 break;
             }
             case 'read': {
-                message = ( localize(5644, "Read todo list"));
+                message = ( localize(5713, "Read todo list"));
                 break;
             }
         }
@@ -145,11 +145,11 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const todoList = ( items.map(todo => ({
             id: ( todo.id.toString()),
             title: todo.title,
-            description: todo.description,
+            description: todo.description || '',
             status: todo.status
         })));
         return {
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(5645, "Updated todo list")))),
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(5714, "Updated todo list")))),
             toolSpecificData: {
                 kind: 'todoList',
                 sessionId: chatSessionId,
@@ -160,8 +160,8 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     generatePastTenseMessage(currentTodos, newTodos) {
         if (currentTodos.length === 0) {
             return newTodos.length === 1
-                ? ( localize(5646, "Created 1 todo"))
-                : ( localize(5647, "Created {0} todos", newTodos.length));
+                ? ( localize(5715, "Created 1 todo"))
+                : ( localize(5716, "Created {0} todos", newTodos.length));
         }
         const currentTodoMap = ( new Map(( currentTodos.map(todo => [todo.id, todo]))));
         const startedTodos = newTodos.filter(newTodo => {
@@ -173,7 +173,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === startedTodo.id) + 1;
             return localize(
-                5648,
+                5717,
                 "Starting ({0}/{1}) *{2}*",
                 currentPosition,
                 totalTodos,
@@ -189,7 +189,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === completedTodo.id) + 1;
             return localize(
-                5649,
+                5718,
                 "Completed ({0}/{1}) *{2}*",
                 currentPosition,
                 totalTodos,
@@ -199,10 +199,10 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const addedTodos = newTodos.filter(newTodo => !( currentTodoMap.has(newTodo.id)));
         if (addedTodos.length > 0) {
             return addedTodos.length === 1
-                ? ( localize(5650, "Added 1 todo"))
-                : ( localize(5651, "Added {0} todos", addedTodos.length));
+                ? ( localize(5719, "Added 1 todo"))
+                : ( localize(5720, "Added {0} todos", addedTodos.length));
         }
-        return localize(5652, "Updated todo list");
+        return localize(5721, "Updated todo list");
     }
     handleRead(todoItems, sessionId) {
         if (todoItems.length === 0) {
@@ -241,7 +241,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const todoList = ( args.todoList.map((parsedTodo) => ({
             id: parsedTodo.id,
             title: parsedTodo.title,
-            description: parsedTodo.description,
+            description: parsedTodo.description || '',
             status: parsedTodo.status
         })));
         const existingTodos = this.chatTodoListService.getTodos(chatSessionId);
@@ -297,7 +297,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
                     break;
             }
             const lines = [`- ${checkbox} ${todo.title}`];
-            if (todo.description && todo.description.trim()) {
+            if (this.includeDescription && todo.description && todo.description.trim()) {
                 lines.push(`  - ${todo.description.trim()}`);
             }
             return lines.join('\n');
@@ -320,9 +320,9 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     }
 };
 ManageTodoListTool = ( __decorate([
-    ( __param(1, IChatTodoListService)),
-    ( __param(2, ILogService)),
-    ( __param(3, ITelemetryService))
+    ( __param(2, IChatTodoListService)),
+    ( __param(3, ILogService)),
+    ( __param(4, ITelemetryService))
 ], ManageTodoListTool));
 
-export { ManageTodoListTool, ManageTodoListToolToolId, TodoListToolSettingId, TodoListToolWriteOnlySettingId, createManageTodoListToolData };
+export { ManageTodoListTool, ManageTodoListToolToolId, TodoListToolDescriptionFieldSettingId, TodoListToolWriteOnlySettingId, createManageTodoListToolData };

package/vscode/src/vs/workbench/contrib/chat/common/tools/tools.js

@@ -6,7 +6,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { ILanguageModelToolsService } from '../languageModelToolsService.service.js';
 import { ConfirmationTool, ConfirmationToolData } from './confirmationTool.js';
 import { EditTool, EditToolData } from './editFileTool.js';
-import { TodoListToolWriteOnlySettingId, createManageTodoListToolData, ManageTodoListTool } from './manageTodoListTool.js';
+import { TodoListToolWriteOnlySettingId, TodoListToolDescriptionFieldSettingId, createManageTodoListToolData, ManageTodoListTool } from './manageTodoListTool.js';
 
 let BuiltinToolsContribution = class BuiltinToolsContribution extends Disposable {
     static { this.ID = 'chat.builtinTools'; }
@@ -16,8 +16,9 @@ let BuiltinToolsContribution = class BuiltinToolsContribution extends Disposable
         const editTool = instantiationService.createInstance(EditTool);
         this._register(toolsService.registerTool(EditToolData, editTool));
         const writeOnlyMode = this.configurationService.getValue(TodoListToolWriteOnlySettingId) === true;
-        const todoToolData = createManageTodoListToolData(writeOnlyMode);
-        const manageTodoListTool = instantiationService.createInstance(ManageTodoListTool, writeOnlyMode);
+        const includeDescription = this.configurationService.getValue(TodoListToolDescriptionFieldSettingId) !== false;
+        const todoToolData = createManageTodoListToolData(writeOnlyMode, includeDescription);
+        const manageTodoListTool = this._register(instantiationService.createInstance(ManageTodoListTool, writeOnlyMode, includeDescription));
         this._register(toolsService.registerTool(todoToolData, manageTodoListTool));
         const confirmationTool = instantiationService.createInstance(ConfirmationTool);
         this._register(toolsService.registerTool(ConfirmationToolData, confirmationTool));

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -18,17 +18,17 @@ const createCodeActionsAutoSave = (description) => {
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
             ( localize(
-            5654,
+            5723,
             'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
         )),
-            ( localize(5655, 'Triggers Code Actions only when explicitly saved')),
-            ( localize(5656, 'Never triggers Code Actions on save')),
+            ( localize(5724, 'Triggers Code Actions only when explicitly saved')),
+            ( localize(5725, 'Never triggers Code Actions on save')),
             ( localize(
-            5657,
+            5726,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5658,
+            5727,
             'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -41,14 +41,14 @@ const createNotebookCodeActionsAutoSave = (description) => {
         type: ['string', 'boolean'],
         enum: ['explicit', 'never', true, false],
         enumDescriptions: [
-            ( localize(5659, 'Triggers Code Actions only when explicitly saved.')),
-            ( localize(5660, 'Never triggers Code Actions on save.')),
+            ( localize(5728, 'Triggers Code Actions only when explicitly saved.')),
+            ( localize(5729, 'Never triggers Code Actions on save.')),
             ( localize(
-            5661,
+            5730,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5662,
+            5731,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -70,7 +70,7 @@ const codeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5663,
+        5732,
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"source.organizeImports": "explicit" `',
         '`#files.autoSave#`'
     )),
@@ -102,7 +102,7 @@ const notebookCodeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5664,
+        5733,
         'Run a series of Code Actions for a notebook on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"notebook.source.organizeImports": "explicit"`',
         '`#files.autoSave#`'
     )),
@@ -150,12 +150,12 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         for (const codeActionKind of allProvidedKinds) {
             if (CodeActionKind.Source.contains(codeActionKind) && !properties[codeActionKind.value]) {
                 properties[codeActionKind.value] = createCodeActionsAutoSave(( localize(
-                    5665,
+                    5734,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));
                 notebookProperties[codeActionKind.value] = createNotebookCodeActionsAutoSave(( localize(
-                    5665,
+                    5734,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -32,12 +32,12 @@ import { isWindows } from '../../../../../base/common/platform.js';
 var EditorDictation_1;
 registerCss(editorDictation);
 const EDITOR_DICTATION_IN_PROGRESS = ( new RawContextKey('editorDictation.inProgress', false));
-const VOICE_CATEGORY = ( localize2(5668, "Voice"));
+const VOICE_CATEGORY = ( localize2(5737, "Voice"));
 class EditorDictationStartAction extends EditorAction2 {
     constructor() {
         super({
             id: 'workbench.action.editorDictation.start',
-            title: ( localize2(5669, "Start Dictation in Editor")),
+            title: ( localize2(5738, "Start Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: ( ContextKeyExpr.and(HasSpeechProvider, ( SpeechToTextInProgress.toNegated()), (
             EditorContextKeys.readOnly.toNegated()))),
@@ -74,7 +74,7 @@ class EditorDictationStopAction extends EditorAction2 {
     constructor() {
         super({
             id: EditorDictationStopAction.ID,
-            title: ( localize2(5670, "Stop Dictation in Editor")),
+            title: ( localize2(5739, "Stop Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: EDITOR_DICTATION_IN_PROGRESS,
             f1: true,
@@ -99,7 +99,7 @@ class DictationWidget extends Disposable {
         const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
         actionBar.push(toAction({
             id: EditorDictationStopAction.ID,
-            label: stopActionKeybinding ? ( localize(5671, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5672, "Stop Dictation")),
+            label: stopActionKeybinding ? ( localize(5740, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5741, "Stop Dictation")),
             class: ThemeIcon.asClassName(Codicon.micFilled),
             run: () => EditorDictation.get(editor)?.stop()
         }), { icon: true, label: false, keybinding: stopActionKeybinding });