@codingame/monaco-vscode-api 28.4.1 → 29.1.0

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

@@ -8,7 +8,7 @@ import { IExtensionDescription } from "../../../../../../platform/extensions/com
 import { IResolvedPromptSourceFolder } from "../config/promptFileLocations.js";
 import { ParsedPromptFile } from "../promptFileParser.js";
 import { PromptsType } from "../promptTypes.js";
-import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomAgent, IResolvedAgentFile, Logger, IPromptFileContext, IPromptFileResource, IAgentSkill, IPromptDiscoveryInfo, IConfiguredHooksInfo, IPromptDiscoveryLogEntry } from "./promptsService.js";
+import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomAgent, IResolvedAgentFile, Logger, IPromptFileContext, IPromptFileResource, IAgentSkill, IConfiguredHooksInfo, IPromptDiscoveryLogEntry } from "./promptsService.js";
 /**
 * Provides prompt services.
 */
@@ -130,13 +130,6 @@ export interface IPromptsService extends IDisposable {
     */
     readonly onDidChangeSkills: Event<void>;
     /**
-    * Gets detailed discovery information for a prompt type.
-    * This includes all files found and their load/skip status with reasons.
-    * Used for diagnostics and config-info displays.
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
-    */
-    getPromptDiscoveryInfo(type: PromptsType, token: CancellationToken, sessionResource?: URI): Promise<IPromptDiscoveryInfo>;
-    /**
     * Gets all hooks collected from hooks.json files.
     * The result is cached and invalidated when hook files change.
     * @param sessionResource Optional session resource to scope debug logging to a specific session.

package/vscode/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.js

@@ -212,10 +212,10 @@ let ChatRequestParser = class ChatRequestParser {
                 return ( new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand));
             }
         }
-        const capabilities = context?.attachmentCapabilities ?? usedAgent?.capabilities ?? context?.attachmentCapabilities;
-        if (!usedAgent || capabilities?.supportsPromptAttachments) {
-            const slashCommands = this.slashCommandService.getCommands(location, context?.mode ?? ChatModeKind.Ask);
-            const slashCommand = slashCommands.find(c => c.command === command);
+        const capabilities = context?.attachmentCapabilities ?? usedAgent?.capabilities;
+        const slashCommands = this.slashCommandService.getCommands(location, context?.mode ?? ChatModeKind.Ask);
+        const slashCommand = slashCommands.find(c => c.command === command);
+        if (!usedAgent || slashCommand?.silent || capabilities?.supportsPromptAttachments) {
             if (slashCommand) {
                 return ( new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand));
             } else {

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

@@ -1,6 +1,8 @@
 import { CancellationToken } from "../../../../../../base/common/cancellation.js";
 import { Disposable } from "../../../../../../base/common/lifecycle.js";
+import { IChatQuestionAnswers } from "../../chatService/chatService.js";
 import { IChatService } from "../../chatService/chatService.service.js";
+import { IConfigurationService } from "../../../../../../platform/configuration/common/configuration.service.js";
 import { ILogService } from "../../../../../../platform/log/common/log.service.js";
 import { ITelemetryService } from "../../../../../../platform/telemetry/common/telemetry.service.js";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "../languageModelToolsService.js";
@@ -38,13 +40,14 @@ export declare class AskQuestionsTool extends Disposable implements IToolImpl {
     private readonly chatService;
     private readonly telemetryService;
     private readonly logService;
-    constructor(chatService: IChatService, telemetryService: ITelemetryService, logService: ILogService);
+    private readonly configService;
+    constructor(chatService: IChatService, telemetryService: ITelemetryService, logService: ILogService, configService: IConfigurationService);
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     private getRequest;
     private toQuestionCarousel;
     private toChatQuestion;
-    protected convertCarouselAnswers(questions: IQuestion[], carouselAnswers: Record<string, unknown> | undefined, idToHeaderMap: Map<string, string>): IAnswerResult;
+    protected convertCarouselAnswers(questions: IQuestion[], carouselAnswers: IChatQuestionAnswers | undefined, idToHeaderMap: Map<string, string>): IAnswerResult;
     private collectMetrics;
     private createSkippedResult;
     private createAutopilotResult;

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

@@ -3,11 +3,13 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { hasKey } from '../../../../../../base/common/types.js';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { localize } from '../../../../../../nls.js';
 import { IChatService } from '../../chatService/chatService.service.js';
 import { ChatQuestionCarouselData } from '../../model/chatProgressTypes/chatQuestionCarouselData.js';
-import { ChatPermissionLevel } from '../../constants.js';
+import { ChatPermissionLevel, ChatConfiguration } from '../../constants.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { StopWatch } from '../../../../../../base/common/stopwatch.js';
 import { ILogService } from '../../../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.service.js';
@@ -55,7 +57,7 @@ function createAskQuestionsToolData() {
             },
             allowFreeformInput: {
                 type: "boolean",
-                description: "Allow freeform text answers in addition to option selection."
+                description: "Allow freeform text answers in addition to option selection. Defaults to true; set to false to restrict to predefined options only."
             },
             options: {
                 type: "array",
@@ -100,23 +102,24 @@ function createAskQuestionsToolData() {
         legacyToolReferenceFullNames: [AskQuestionsToolId, "vscode/askQuestions"],
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.question.id),
-        displayName: ( localize(7346, "Ask Clarifying Questions")),
+        displayName: ( localize(7575, "Ask Clarifying Questions")),
         userDescription: ( localize(
-            7347,
+            7576,
             "Ask structured clarifying questions using single select, multi-select, or freeform inputs to collect task requirements before proceeding."
         )),
-        modelDescription: "Use this tool to ask the user a small number of clarifying questions before proceeding. Provide the questions array with concise headers and prompts. Use options for fixed choices, set multiSelect when multiple selections are allowed, and set allowFreeformInput to let users supply their own answer.",
+        modelDescription: "Use this tool to ask the user a small number of clarifying questions before proceeding. Provide the questions array with concise headers and prompts. Use options for fixed choices, set multiSelect when multiple selections are allowed. Users can always provide a freeform text answer alongside options unless you set allowFreeformInput to false.",
         source: ToolDataSource.Internal,
         inputSchema
     };
 }
 const AskQuestionsToolData = createAskQuestionsToolData();
 let AskQuestionsTool = class AskQuestionsTool extends Disposable {
-    constructor(chatService, telemetryService, logService) {
+    constructor(chatService, telemetryService, logService, configService) {
         super();
         this.chatService = chatService;
         this.telemetryService = telemetryService;
         this.logService = logService;
+        this.configService = configService;
     }
     async invoke(invocation, _countTokens, progress, token) {
         const stopWatch = StopWatch.create(true);
@@ -127,7 +130,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         this.logService.trace(`[AskQuestionsTool] Invoking with ${questions?.length ?? 0} question(s)`);
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                7348,
+                7577,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
@@ -143,8 +146,9 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             );
             return this.createSkippedResult(questions);
         }
-        if (request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot) {
-            this.logService.info("[AskQuestionsTool] Autopilot mode: auto-responding to questions");
+        if (request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot || this.configService.getValue(ChatConfiguration.AutoReply)) {
+            const reason = request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot ? "Autopilot mode" : "Auto-reply enabled";
+            this.logService.info(`[AskQuestionsTool] ${reason}: auto-responding to questions`);
             const {
                 carousel,
                 idToHeaderMap
@@ -164,7 +168,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(7349, "Analyzing your answers..."))
+            message: ( localize(7578, "Analyzing your answers..."))
         });
         const converted = this.convertCarouselAnswers(questions, answerResult?.answers, idToHeaderMap);
         const {
@@ -202,14 +206,14 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         } = parameters;
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                7348,
+                7577,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
         for (const question of questions) {
             if (question.options && question.options.length === 1) {
                 throw ( new Error(( localize(
-                    7350,
+                    7579,
                     "Question \"{0}\" must have at least two options, or none for free text input.",
                     question.header
                 ))));
@@ -218,8 +222,8 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         }
         const questionCount = questions.length;
         const headers = ( questions.map(q => q.header)).join(", ");
-        const message = questionCount === 1 ? ( localize(7351, "Asking a question ({0})", headers)) : ( localize(7352, "Asking {0} questions ({1})", questionCount, headers));
-        const pastMessage = questionCount === 1 ? ( localize(7353, "Asked a question ({0})", headers)) : ( localize(7354, "Asked {0} questions ({1})", questionCount, headers));
+        const message = questionCount === 1 ? ( localize(7580, "Asking a question ({0})", headers)) : ( localize(7581, "Asking {0} questions ({1})", questionCount, headers));
+        const pastMessage = questionCount === 1 ? ( localize(7582, "Asked a question ({0})", headers)) : ( localize(7583, "Asked {0} questions ({1})", questionCount, headers));
         return {
             invocationMessage: ( new MarkdownString(message)),
             pastTenseMessage: ( new MarkdownString(pastMessage))
@@ -291,7 +295,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                 value: opt.label
             })),
             defaultValue,
-            allowFreeformInput: question.allowFreeformInput ?? false
+            allowFreeformInput: question.allowFreeformInput ?? true
         };
     }
     convertCarouselAnswers(questions, carouselAnswers, idToHeaderMap) {
@@ -346,68 +350,48 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                     freeText: null,
                     skipped: false
                 };
-            } else if (typeof answer === "object" && answer !== null) {
-                const answerObj = answer;
-                const freeformValue = typeof answerObj.freeformValue === "string" && answerObj.freeformValue ? answerObj.freeformValue : null;
-                const selectedValues = Array.isArray(answerObj.selectedValues) ? ( answerObj.selectedValues.map(v => String(v))) : undefined;
-                const selectedValue = answerObj.selectedValue;
-                const label = typeof answerObj.label === "string" ? answerObj.label : undefined;
-                if (selectedValues) {
+            } else if (typeof answer === "object" && hasKey(answer, {
+                selectedValues: true
+            })) {
+                const {
+                    selectedValues,
+                    freeformValue
+                } = answer;
+                result.answers[question.header] = {
+                    selected: selectedValues,
+                    freeText: freeformValue ?? null,
+                    skipped: false
+                };
+            } else if (typeof answer === "object" && (hasKey(answer, {
+                selectedValue: true
+            }) || hasKey(answer, {
+                freeformValue: true
+            }))) {
+                const {
+                    selectedValue,
+                    freeformValue
+                } = answer;
+                if (freeformValue) {
                     result.answers[question.header] = {
-                        selected: selectedValues,
+                        selected: [],
                         freeText: freeformValue,
                         skipped: false
                     };
-                } else if (typeof selectedValue === "string") {
+                } else if (selectedValue !== undefined) {
                     if (question.options?.some(opt => opt.label === selectedValue)) {
                         result.answers[question.header] = {
                             selected: [selectedValue],
-                            freeText: freeformValue,
+                            freeText: null,
                             skipped: false
                         };
                     } else {
                         result.answers[question.header] = {
                             selected: [],
-                            freeText: freeformValue ?? selectedValue,
-                            skipped: false
-                        };
-                    }
-                } else if (Array.isArray(selectedValue)) {
-                    result.answers[question.header] = {
-                        selected: ( selectedValue.map(v => String(v))),
-                        freeText: freeformValue,
-                        skipped: false
-                    };
-                } else if (selectedValue === undefined || selectedValue === null) {
-                    if (freeformValue) {
-                        result.answers[question.header] = {
-                            selected: [],
-                            freeText: freeformValue,
+                            freeText: selectedValue,
                             skipped: false
                         };
-                    } else {
-                        result.answers[question.header] = {
-                            selected: [],
-                            freeText: null,
-                            skipped: true
-                        };
                     }
-                } else if (freeformValue) {
-                    result.answers[question.header] = {
-                        selected: [],
-                        freeText: freeformValue,
-                        skipped: false
-                    };
-                } else if (label) {
-                    result.answers[question.header] = {
-                        selected: [label],
-                        freeText: null,
-                        skipped: false
-                    };
                 } else {
-                    this.logService.warn(
-                        `[AskQuestionsTool] Unknown answer object format for "${question.header}": ${JSON.stringify(answer)}`
-                    );
                     result.answers[question.header] = {
                         selected: [],
                         freeText: null,
@@ -416,7 +400,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                 }
             } else {
                 this.logService.warn(
-                    `[AskQuestionsTool] Unknown answer format for "${question.header}": ${typeof answer}`
+                    `[AskQuestionsTool] Unknown answer format for "${question.header}": ${JSON.stringify(answer)}`
                 );
                 result.answers[question.header] = {
                     selected: [],
@@ -539,6 +523,6 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         });
     }
 };
-AskQuestionsTool = ( __decorate([( __param(0, IChatService)), ( __param(1, ITelemetryService)), ( __param(2, ILogService))], AskQuestionsTool));
+AskQuestionsTool = ( __decorate([( __param(0, IChatService)), ( __param(1, ITelemetryService)), ( __param(2, ILogService)), ( __param(3, IConfigurationService))], AskQuestionsTool));
 
 export { AUTOPILOT_ASK_USER_RESPONSE, AskQuestionsTool, AskQuestionsToolData, AskQuestionsToolId, createAskQuestionsToolData };

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

@@ -2,8 +2,10 @@ import { CancellationToken } from "../../../../../../base/common/cancellation.js
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "../languageModelToolsService.js";
 export declare const ConfirmationToolId = "vscode_get_confirmation";
 export declare const ConfirmationToolWithOptionsId = "vscode_get_confirmation_with_options";
+export declare const ModifiedFilesConfirmationToolId = "vscode_get_modified_files_confirmation";
 export declare const ConfirmationToolData: IToolData;
 export declare const ConfirmationToolWithOptionsData: IToolData;
+export declare const ModifiedFilesConfirmationToolData: IToolData;
 export interface IConfirmationToolParams {
     title: string;
     message: string;
@@ -11,7 +13,24 @@ export interface IConfirmationToolParams {
     terminalCommand?: string;
     buttons?: string[];
 }
+export interface IModifiedFilesConfirmationToolParams {
+    title: string;
+    message: string;
+    options: string[];
+    modifiedFiles: {
+        uri: string;
+        originalUri?: string;
+        insertions?: number;
+        deletions?: number;
+        title?: string;
+        description?: string;
+    }[];
+}
 export declare class ConfirmationTool implements IToolImpl {
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
 }
+export declare class ModifiedFilesConfirmationTool implements IToolImpl {
+    prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+}

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

@@ -1,9 +1,11 @@
 
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import { ToolDataSource, ToolInvocationPresentation } from '../languageModelToolsService.js';
 
 const ConfirmationToolId = "vscode_get_confirmation";
 const ConfirmationToolWithOptionsId = "vscode_get_confirmation_with_options";
+const ModifiedFilesConfirmationToolId = "vscode_get_modified_files_confirmation";
 const ConfirmationToolData = {
     id: ConfirmationToolId,
     displayName: "Confirmation Tool",
@@ -62,6 +64,70 @@ const ConfirmationToolWithOptionsData = {
         additionalProperties: false
     }
 };
+const ModifiedFilesConfirmationToolData = {
+    id: ModifiedFilesConfirmationToolId,
+    displayName: "Modified Files Confirmation Tool",
+    modelDescription: "A tool that shows a modified-files confirmation UI with a split primary button and a hardcoded cancel action.",
+    source: ToolDataSource.Internal,
+    inputSchema: {
+        type: "object",
+        properties: {
+            title: {
+                type: "string",
+                description: "Title for the confirmation dialog"
+            },
+            message: {
+                type: "string",
+                description: "Message to show in the confirmation dialog"
+            },
+            options: {
+                type: "array",
+                items: {
+                    type: "string"
+                },
+                minItems: 1,
+                description: "Selectable option labels. The first option is used for the primary split button and the remaining options are placed in the dropdown menu."
+            },
+            modifiedFiles: {
+                type: "array",
+                items: {
+                    type: "object",
+                    properties: {
+                        uri: {
+                            type: "string",
+                            description: "URI of the modified file."
+                        },
+                        originalUri: {
+                            type: "string",
+                            description: "Optional original URI used when opening a diff."
+                        },
+                        insertions: {
+                            type: "number",
+                            description: "Optional number of lines added."
+                        },
+                        deletions: {
+                            type: "number",
+                            description: "Optional number of lines removed."
+                        },
+                        title: {
+                            type: "string",
+                            description: "Optional title shown in the file tooltip."
+                        },
+                        description: {
+                            type: "string",
+                            description: "Optional secondary label shown for the file entry."
+                        }
+                    },
+                    required: ["uri"],
+                    additionalProperties: false
+                },
+                description: "Modified files to show in the confirmation UI."
+            }
+        },
+        required: ["title", "message", "options", "modifiedFiles"],
+        additionalProperties: false
+    }
+};
 class ConfirmationTool {
     async prepareToolInvocation(context, token) {
         const parameters = context.parameters;
@@ -109,5 +175,53 @@ class ConfirmationTool {
         };
     }
 }
+class ModifiedFilesConfirmationTool {
+    async prepareToolInvocation(context, token) {
+        const parameters = context.parameters;
+        if (!parameters.title || !parameters.message) {
+            throw ( new Error("Missing required parameters for ModifiedFilesConfirmationTool"));
+        }
+        if (!parameters.options?.length) {
+            throw ( new Error("ModifiedFilesConfirmationTool requires at least one option"));
+        }
+        const toolSpecificData = {
+            kind: "modifiedFilesConfirmation",
+            options: parameters.options,
+            modifiedFiles: ( parameters.modifiedFiles.map(file => ({
+                uri: ( URI.parse(file.uri)).toJSON(),
+                originalUri: file.originalUri ? ( URI.parse(file.originalUri)).toJSON() : undefined,
+                insertions: file.insertions,
+                deletions: file.deletions,
+                title: file.title,
+                description: file.description
+            })))
+        };
+        return {
+            confirmationMessages: {
+                title: parameters.title,
+                message: ( new MarkdownString(parameters.message)),
+                allowAutoConfirm: false
+            },
+            toolSpecificData,
+            presentation: ToolInvocationPresentation.HiddenAfterComplete
+        };
+    }
+    async invoke(invocation, countTokens, progress, token) {
+        if (invocation.selectedCustomButton) {
+            return {
+                content: [{
+                    kind: "text",
+                    value: invocation.selectedCustomButton
+                }]
+            };
+        }
+        return {
+            content: [{
+                kind: "text",
+                value: "yes"
+            }]
+        };
+    }
+}
 
-export { ConfirmationTool, ConfirmationToolData, ConfirmationToolId, ConfirmationToolWithOptionsData, ConfirmationToolWithOptionsId };
+export { ConfirmationTool, ConfirmationToolData, ConfirmationToolId, ConfirmationToolWithOptionsData, ConfirmationToolWithOptionsId, ModifiedFilesConfirmationTool, ModifiedFilesConfirmationToolData, ModifiedFilesConfirmationToolId };

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import '../../../../../../base/common/observableInternal/index.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { CellUri } from '../../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../../notebook/common/notebookService.service.js';
@@ -112,7 +113,7 @@ let EditTool = class EditTool {
             let wasFileBeingModified = false;
             dispose = autorun(r => {
                 const entries = editSession.entries.read(r);
-                const currentFile = entries?.find(e => ( e.modifiedURI.toString()) === ( uri.toString()));
+                const currentFile = entries?.find(e => isEqual(e.modifiedURI, uri));
                 if (currentFile) {
                     if (currentFile.isCurrentlyBeingModifiedBy.read(r)) {
                         wasFileBeingModified = true;

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

@@ -48,8 +48,8 @@ function createManageTodoListToolData() {
         legacyToolReferenceFullNames: ["todos"],
         canBeReferencedInPrompt: true,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(7355, "Manage and track todo items for task planning")),
-        userDescription: ( localize(7356, "Manage and track todo items for task planning")),
+        displayName: ( localize(7584, "Manage and track todo items for task planning")),
+        userDescription: ( localize(7585, "Manage and track 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: inputSchema
@@ -107,7 +107,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const currentTodoItems = this.chatTodoListService.getTodos(chatSessionResource);
         let message;
         if (args.operation === "read") {
-            message = ( localize(7357, "Read todo list"));
+            message = ( localize(7586, "Read todo list"));
         } else if (args.todoList) {
             message = this.generatePastTenseMessage(currentTodoItems, args.todoList);
         }
@@ -117,8 +117,11 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             title: todo.title,
             status: todo.status
         })));
+        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(7587, "Updating todo list"));
+        const invocationMessage = ( new MarkdownString(invocationLabel));
         return {
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(7358, "Updated todo list")))),
+            invocationMessage,
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(7588, "Updated todo list")))),
             toolSpecificData: {
                 kind: "todoList",
                 todoList: todoList
@@ -127,7 +130,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     }
     generatePastTenseMessage(currentTodos, newTodos) {
         if (currentTodos.length === 0) {
-            return newTodos.length === 1 ? ( localize(7359, "Created 1 todo")) : ( localize(7360, "Created {0} todos", newTodos.length));
+            return newTodos.length === 1 ? ( localize(7589, "Created 1 todo")) : ( localize(7590, "Created {0} todos", newTodos.length));
         }
         const currentTodoMap = ( new Map(( currentTodos.map(todo => [todo.id, todo]))));
         const startedTodos = newTodos.filter(newTodo => {
@@ -139,7 +142,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === startedTodo.id) + 1;
             return localize(
-                7361,
+                7591,
                 "Starting: *{0}* ({1}/{2})",
                 startedTodo.title,
                 currentPosition,
@@ -155,7 +158,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === completedTodo.id) + 1;
             return localize(
-                7362,
+                7592,
                 "Completed: *{0}* ({1}/{2})",
                 completedTodo.title,
                 currentPosition,
@@ -164,9 +167,9 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         }
         const addedTodos = newTodos.filter(newTodo => !( currentTodoMap.has(newTodo.id)));
         if (addedTodos.length > 0) {
-            return addedTodos.length === 1 ? ( localize(7363, "Added 1 todo")) : ( localize(7364, "Added {0} todos", addedTodos.length));
+            return addedTodos.length === 1 ? ( localize(7593, "Added 1 todo")) : ( localize(7594, "Added {0} todos", addedTodos.length));
         }
-        return localize(7365, "Updated todo list");
+        return localize(7595, "Updated todo list");
     }
     handleRead(todoItems, sessionResource) {
         if (todoItems.length === 0) {

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

@@ -17,6 +17,7 @@ export interface IRunSubagentToolInputParams {
     description: string;
     agentName?: string;
 }
+export declare const RUN_SUBAGENT_MAX_NESTING_DEPTH = 5;
 export declare class RunSubagentTool extends Disposable implements IToolImpl {
     private readonly chatAgentService;
     private readonly chatService;
@@ -32,6 +33,8 @@ export declare class RunSubagentTool extends Disposable implements IToolImpl {
     readonly onDidUpdateToolData: Event<IConfigurationChangeEvent>;
     /** Hack to port data between prepare/invoke */
     private readonly _resolvedModels;
+    /** Tracks the current subagent nesting depth per session to detect and limit recursion. */
+    private readonly _sessionDepth;
     constructor(chatAgentService: IChatAgentService, chatService: IChatService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService, logService: ILogService, toolsService: ILanguageModelToolsService, configurationService: IConfigurationService, promptsService: IPromptsService, instantiationService: IInstantiationService, productService: IProductService);
     getToolData(): IToolData;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;