@codingame/monaco-vscode-api 31.0.1 → 32.0.1

package/vscode/src/vs/workbench/contrib/chat/common/requestParser/chatParserTypes.d.ts

@@ -139,9 +139,10 @@ export declare class ChatRequestDynamicVariablePart implements IParsedChatReques
     readonly icon?: ThemeIcon | undefined;
     readonly isFile?: boolean | undefined;
     readonly isDirectory?: boolean | undefined;
+    readonly _meta?: Record<string, unknown> | undefined;
     static readonly Kind = "dynamic";
     readonly kind = "dynamic";
-    constructor(range: OffsetRange, editorRange: IRange, text: string, id: string, modelDescription: string | undefined, data: IChatRequestVariableValue, fullName?: string | undefined, icon?: ThemeIcon | undefined, isFile?: boolean | undefined, isDirectory?: boolean | undefined);
+    constructor(range: OffsetRange, editorRange: IRange, text: string, id: string, modelDescription: string | undefined, data: IChatRequestVariableValue, fullName?: string | undefined, icon?: ThemeIcon | undefined, isFile?: boolean | undefined, isDirectory?: boolean | undefined, _meta?: Record<string, unknown> | undefined);
     get referenceText(): string;
     get promptText(): string;
     toVariableEntry(): IChatRequestVariableEntry;

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

@@ -206,7 +206,8 @@ class ChatRequestDynamicVariablePart {
         fullName,
         icon,
         isFile,
-        isDirectory
+        isDirectory,
+        _meta
     ) {
         this.range = range;
         this.editorRange = editorRange;
@@ -218,6 +219,7 @@ class ChatRequestDynamicVariablePart {
         this.icon = icon;
         this.isFile = isFile;
         this.isDirectory = isDirectory;
+        this._meta = _meta;
         this.kind = ChatRequestDynamicVariablePart.Kind;
     }
     get referenceText() {
@@ -237,7 +239,8 @@ class ChatRequestDynamicVariablePart {
             range: this.range,
             value: this.data,
             fullName: this.fullName,
-            icon: this.icon
+            icon: this.icon,
+            _meta: this._meta
         };
     }
 }
@@ -264,7 +267,7 @@ function reviveParsedChatRequest(serialized) {
             } else if (part.kind === ChatRequestSlashPromptPart.Kind) {
                 return ( new ChatRequestSlashPromptPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.name));
             } else if (part.kind === ChatRequestDynamicVariablePart.Kind) {
-                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data), part.fullName, part.icon, part.isFile, part.isDirectory));
+                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data), part.fullName, part.icon, part.isFile, part.isDirectory, part._meta));
             } else {
                 throw ( new Error(`Unknown chat request part: ${part.kind}`));
             }

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

@@ -18,6 +18,7 @@ export interface IChatParserContext {
     /** Parse as this agent, even when it does not appear in the query text */
     forcedAgent?: IChatAgentData;
     attachmentCapabilities?: IChatAgentAttachmentCapabilities;
+    sessionType?: string;
 }
 export declare class ChatRequestParser {
     private readonly agentService;

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

@@ -5,8 +5,10 @@ import { Range } from '../../../../../editor/common/core/range.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
 import { IChatVariablesService } from '../attachments/chatVariables.service.js';
 import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { getChatSessionType } from '../model/chatUri.js';
 import { IChatAgentService } from '../participants/chatAgents.service.js';
 import { IChatSlashCommandService } from '../participants/chatSlashCommands.service.js';
+import { matchesSessionType } from '../promptSyntax/service/promptsService.js';
 import { IPromptsService } from '../promptSyntax/service/promptsService.service.js';
 import { isToolSet } from '../tools/languageModelToolsService.js';
 import { chatVariableLeader, chatAgentLeader, chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestDynamicVariablePart } from './chatParserTypes.js';
@@ -21,9 +23,15 @@ let ChatRequestParser = class ChatRequestParser {
         this.slashCommandService = slashCommandService;
         this.promptsService = promptsService;
     }
-    parseChatRequest(sessionResource, message, location = ChatAgentLocation.Chat, context) {
+    parseChatRequest(sessionResource, message, location = ChatAgentLocation.Chat, context = {}) {
         const references = this.variableService.getDynamicVariables(sessionResource);
         const selectedToolAndToolSets = this.variableService.getSelectedToolAndToolSets(sessionResource);
+        if (!context.sessionType) {
+            context = {
+                ...context,
+                sessionType: getChatSessionType(sessionResource)
+            };
+        }
         return this.parseChatRequestWithReferences(references, selectedToolAndToolSets, message, location, context);
     }
     parseChatRequestWithReferences(
@@ -214,7 +222,9 @@ let ChatRequestParser = class ChatRequestParser {
         }
         const capabilities = context?.attachmentCapabilities ?? usedAgent?.capabilities;
         const slashCommands = this.slashCommandService.getCommands(location, context?.mode ?? ChatModeKind.Ask);
-        const slashCommand = slashCommands.find(c => c.command === command);
+        const slashCommand = slashCommands.find(
+            c => c.command === command && matchesSessionType(c.sessionTypes, context?.sessionType)
+        );
         if (!usedAgent || slashCommand?.silent || capabilities?.supportsPromptAttachments) {
             if (slashCommand) {
                 return ( new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand));
@@ -250,7 +260,8 @@ let ChatRequestParser = class ChatRequestParser {
                 refAtThisPosition.fullName,
                 refAtThisPosition.icon,
                 refAtThisPosition.isFile,
-                refAtThisPosition.isDirectory
+                refAtThisPosition.isDirectory,
+                refAtThisPosition._meta
             ));
         }
         return;

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

@@ -51,8 +51,10 @@ export declare class AskQuestionsTool extends Disposable implements IToolImpl {
      * Prefer structured metadata and fall back to legacy message parsing for
      * old sessions that may not carry the metadata yet.
      * As a final fallback, search completed runInTerminal tool invocations in
-     * the response for the terminal ID (foreground/timeout path where the
-     * model calls ask_questions from the same turn as runInTerminal).
+     * the response for the terminal ID, but only when the tool output indicates
+     * the terminal is still running and waiting for input (foreground/timeout
+     * path where the model calls ask_questions from the same turn as
+     * runInTerminal).
      */
     private extractTerminalId;
     private toQuestionCarousel;

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

@@ -27,8 +27,7 @@ const SoftLimits = {
     question: 200
 };
 const HardLimits = {
-    header: 75,
-    question: 300
+    header: 75
 };
 function truncateToLimit(value, limit) {
     if (value === undefined) {
@@ -45,12 +44,12 @@ function createAskQuestionsToolData() {
         properties: {
             header: {
                 type: "string",
-                description: "Short identifier for the question. Must be unique so answers can be mapped back to the question.",
+                description: `Short identifier for the question. Must be unique so answers can be mapped back to the question. Maximum ${SoftLimits.header} characters.`,
                 maxLength: SoftLimits.header
             },
             question: {
                 type: "string",
-                description: "The question text to display to the user. Keep it concise, ideally one sentence.",
+                description: `The question text to display to the user. Keep it concise, ideally one sentence. Maximum ${SoftLimits.question} characters.`,
                 maxLength: SoftLimits.question
             },
             multiSelect: {
@@ -108,9 +107,9 @@ function createAskQuestionsToolData() {
         legacyToolReferenceFullNames: [AskQuestionsToolId, "vscode/askQuestions"],
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.question.id),
-        displayName: ( localize(7750, "Ask Clarifying Questions")),
+        displayName: ( localize(8089, "Ask Clarifying Questions")),
         userDescription: ( localize(
-            7751,
+            8090,
             "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. Users can always provide a freeform text answer alongside options unless you set allowFreeformInput to false.",
@@ -136,7 +135,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(
-                7752,
+                8091,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
@@ -152,13 +151,14 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             );
             return this.createSkippedResult(questions);
         }
+        const resolveId = invocation.chatStreamToolCallId ?? invocation.callId;
         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
-            } = this.toQuestionCarousel(questions);
+            } = this.toQuestionCarousel(questions, resolveId);
             carousel.terminalId = this.extractTerminalId(request);
             carousel.data = this.buildAutopilotCarouselAnswers(questions, carousel, idToHeaderMap);
             carousel.isUsed = true;
@@ -168,13 +168,33 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         const {
             carousel,
             idToHeaderMap
-        } = this.toQuestionCarousel(questions);
+        } = this.toQuestionCarousel(questions, resolveId);
         carousel.terminalId = this.extractTerminalId(request);
         this.logService.trace(
             `[AskQuestionsTool] request=${request.id} terminalExecutionId=${request.terminalExecutionId ?? "undefined"} carousel.terminalId=${carousel.terminalId ?? "undefined"}`
         );
         this.chatService.appendProgress(request, carousel);
-        const answerResult = await raceCancellation(carousel.completion.p, token);
+        const externalAnswerListener = this.chatService.onDidReceiveQuestionCarouselAnswer(event => {
+            if (event.resolveId !== carousel.resolveId || carousel.isUsed) {
+                return;
+            }
+            carousel.dismiss(event.answers);
+        });
+        let answerResult;
+        try {
+            answerResult = await raceCancellation(carousel.completion.p, token);
+        } catch (error) {
+            if (error instanceof CancellationError) {
+                carousel.dismiss(undefined);
+            }
+            throw error;
+        } finally {
+            externalAnswerListener.dispose();
+        }
+        if (!answerResult) {
+            carousel.dismiss(undefined);
+            throw ( new CancellationError());
+        }
         if (token.isCancellationRequested) {
             throw ( new CancellationError());
         }
@@ -190,7 +210,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             };
         }
         progress.report({
-            message: ( localize(7753, "Analyzing your answers..."))
+            message: ( localize(8092, "Analyzing your answers..."))
         });
         const converted = this.convertCarouselAnswers(questions, answerResult?.answers, idToHeaderMap);
         const {
@@ -228,24 +248,23 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         } = parameters;
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                7752,
+                8091,
                 "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(
-                    7754,
+                    8093,
                     "Question \"{0}\" must have at least two options, or none for free text input.",
                     question.header
                 ))));
             }
-            question.question = truncateToLimit(question.question, HardLimits.question) ?? question.question;
         }
         const questionCount = questions.length;
         const headers = ( questions.map(q => q.header)).join(", ");
-        const message = questionCount === 1 ? ( localize(7755, "Asking a question ({0})", headers)) : ( localize(7756, "Asking {0} questions ({1})", questionCount, headers));
-        const pastMessage = questionCount === 1 ? ( localize(7757, "Asked a question ({0})", headers)) : ( localize(7758, "Asked {0} questions ({1})", questionCount, headers));
+        const message = questionCount === 1 ? ( localize(8094, "Asking a question ({0})", headers)) : ( localize(8095, "Asking {0} questions ({1})", questionCount, headers));
+        const pastMessage = questionCount === 1 ? ( localize(8096, "Asked a question ({0})", headers)) : ( localize(8097, "Asked {0} questions ({1})", questionCount, headers));
         return {
             invocationMessage: ( new MarkdownString(message)),
             pastTenseMessage: ( new MarkdownString(pastMessage))
@@ -297,7 +316,9 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                     if (state.type === IChatToolInvocation.StateKind.Completed && state.contentForModel) {
                         for (const item of state.contentForModel) {
                             if (item.kind === "text") {
-                                const idMatch = item.value.match(/terminal ID ([0-9a-fA-F-]+)/);
+                                const idMatch = item.value.match(
+                                    /(?:running in terminal ID|may still be running in terminal ID) ([0-9a-fA-F-]+)/
+                                );
                                 if (idMatch) {
                                     return idMatch[1];
                                 }
@@ -309,15 +330,18 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         }
         return undefined;
     }
-    toQuestionCarousel(questions) {
+    toQuestionCarousel(questions, resolveId) {
         const idToHeaderMap = ( new Map());
-        const mappedQuestions = ( questions.map(question => this.toChatQuestion(question, idToHeaderMap)));
+        const carouselResolveId = resolveId ?? generateUuid();
+        const mappedQuestions = ( questions.map(
+            (question, index) => this.toChatQuestion(question, idToHeaderMap, carouselResolveId, index)
+        ));
         return {
-            carousel: ( new ChatQuestionCarouselData(mappedQuestions, true, generateUuid())),
+            carousel: ( new ChatQuestionCarouselData(mappedQuestions, true, carouselResolveId)),
             idToHeaderMap
         };
     }
-    toChatQuestion(question, idToHeaderMap) {
+    toChatQuestion(question, idToHeaderMap, resolveId, index) {
         let type;
         if (!question.options || question.options.length === 0) {
             type = "text";
@@ -333,7 +357,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                 defaultValue = question.multiSelect ? ( recommendedOptions.map(opt => opt.label)) : recommendedOptions[0].label;
             }
         }
-        const internalId = generateUuid();
+        const internalId = `${resolveId}:${index}`;
         idToHeaderMap.set(internalId, question.header);
         const displayTitle = truncateToLimit(question.header, HardLimits.header) ?? question.header;
         return {
@@ -504,12 +528,9 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
     createAutopilotResult(questions) {
         const answers = {};
         for (const question of questions) {
-            const recommended = question.options?.find(opt => opt.recommended);
-            const firstOption = question.options?.[0];
-            const selected = recommended?.label ?? firstOption?.label;
             answers[question.header] = {
-                selected: selected ? [selected] : [],
-                freeText: selected ? null : AUTOPILOT_ASK_USER_RESPONSE,
+                selected: [],
+                freeText: AUTOPILOT_ASK_USER_RESPONSE,
                 skipped: false
             };
         }
@@ -537,19 +558,17 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             if (!chatQuestion) {
                 continue;
             }
-            const recommended = question.options?.find(opt => opt.recommended);
-            const firstOption = question.options?.[0];
-            const selectedLabel = recommended?.label ?? firstOption?.label;
-            if (chatQuestion.type === "text" || !selectedLabel) {
-                data[internalId] = AUTOPILOT_ASK_USER_RESPONSE;
-            } else if (chatQuestion.type === "multiSelect") {
+            if (chatQuestion.type === "multiSelect") {
                 data[internalId] = {
-                    selectedValues: [selectedLabel]
+                    selectedValues: [],
+                    freeformValue: AUTOPILOT_ASK_USER_RESPONSE
                 };
-            } else {
+            } else if (chatQuestion.type === "singleSelect") {
                 data[internalId] = {
-                    selectedValue: selectedLabel
+                    freeformValue: AUTOPILOT_ASK_USER_RESPONSE
                 };
+            } else {
+                data[internalId] = AUTOPILOT_ASK_USER_RESPONSE;
             }
         }
         return data;

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

@@ -1,6 +1,7 @@
 
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { URI } from '../../../../../../base/common/uri.js';
+import { ConfirmationOptionKind } from '../../../../../../platform/agentHost/common/state/protocol/state.js';
 import { ToolDataSource, ToolInvocationPresentation } from '../languageModelToolsService.js';
 
 const ConfirmationToolId = "vscode_get_confirmation";
@@ -152,7 +153,11 @@ class ConfirmationTool {
                 title: parameters.title,
                 message: ( new MarkdownString(parameters.message)),
                 allowAutoConfirm: (parameters.buttons || []).length ? false : true,
-                customButtons: parameters.buttons
+                customOptions: parameters.buttons?.map((label, index) => ({
+                    id: label,
+                    label,
+                    kind: index === 0 ? ConfirmationOptionKind.Approve : ConfirmationOptionKind.Deny
+                }))
             },
             toolSpecificData,
             presentation: ToolInvocationPresentation.HiddenAfterComplete

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(7759, "Manage and track todo items for task planning")),
-        userDescription: ( localize(7760, "Manage and track todo items for task planning")),
+        displayName: ( localize(8098, "Manage and track todo items for task planning")),
+        userDescription: ( localize(8099, "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(7761, "Read todo list"));
+            message = ( localize(8100, "Read todo list"));
         } else if (args.todoList) {
             message = this.generatePastTenseMessage(currentTodoItems, args.todoList);
         }
@@ -117,12 +117,12 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             title: todo.title,
             status: todo.status
         })));
-        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(7762, "Updating todo list"));
+        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(8101, "Updating todo list"));
         const invocationMessage = ( new MarkdownString(invocationLabel));
         return {
             invocationMessage,
             presentation: items.length ? undefined : ToolInvocationPresentation.Hidden,
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(7763, "Updated todo list")))),
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(8102, "Updated todo list")))),
             toolSpecificData: {
                 kind: "todoList",
                 todoList: todoList
@@ -131,7 +131,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     }
     generatePastTenseMessage(currentTodos, newTodos) {
         if (currentTodos.length === 0) {
-            return newTodos.length === 1 ? ( localize(7764, "Created 1 todo")) : ( localize(7765, "Created {0} todos", newTodos.length));
+            return newTodos.length === 1 ? ( localize(8103, "Created 1 todo")) : ( localize(8104, "Created {0} todos", newTodos.length));
         }
         const currentTodoMap = ( new Map(( currentTodos.map(todo => [todo.id, todo]))));
         const startedTodos = newTodos.filter(newTodo => {
@@ -143,7 +143,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === startedTodo.id) + 1;
             return localize(
-                7766,
+                8105,
                 "Starting: *{0}* ({1}/{2})",
                 startedTodo.title,
                 currentPosition,
@@ -159,7 +159,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === completedTodo.id) + 1;
             return localize(
-                7767,
+                8106,
                 "Completed: *{0}* ({1}/{2})",
                 completedTodo.title,
                 currentPosition,
@@ -168,9 +168,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(7768, "Added 1 todo")) : ( localize(7769, "Added {0} todos", addedTodos.length));
+            return addedTodos.length === 1 ? ( localize(8107, "Added 1 todo")) : ( localize(8108, "Added {0} todos", addedTodos.length));
         }
-        return localize(7770, "Updated todo list");
+        return localize(8109, "Updated todo list");
     }
     handleRead(todoItems, sessionResource) {
         if (todoItems.length === 0) {

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

@@ -72,8 +72,8 @@ function createReviewPlanToolData() {
         toolReferenceName: "reviewPlan",
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(7771, "Review Plan")),
-        userDescription: ( localize(7772, "Ask the user to review and approve a plan before proceeding.")),
+        displayName: ( localize(8110, "Review Plan")),
+        userDescription: ( localize(8111, "Ask the user to review and approve a plan before proceeding.")),
         modelDescription: "Use this tool to present a plan to the user for review. Provide the plan content as markdown, a list of approval actions (with optional default), and whether the user can provide freeform feedback. Optionally provide a URI to the backing plan file so the user can edit it. The tool returns the chosen action, whether the plan was rejected, and any feedback.",
         source: ToolDataSource.Internal,
         inputSchema
@@ -96,7 +96,7 @@ let ReviewPlanTool = class ReviewPlanTool extends Disposable {
             canProvideFeedback
         } = parameters;
         if (!actions || actions.length === 0) {
-            throw ( new Error(( localize(7773, "At least one approval action must be provided."))));
+            throw ( new Error(( localize(8112, "At least one approval action must be provided."))));
         }
         const {
             request
@@ -119,7 +119,7 @@ let ReviewPlanTool = class ReviewPlanTool extends Disposable {
                 }
             }
         }
-        const reviewData = ( new ChatPlanReviewData(title ?? ( localize(7774, "Review plan")), content, actions, canProvideFeedback, planUri?.toJSON(), generateUuid()));
+        const reviewData = ( new ChatPlanReviewData(title ?? ( localize(8113, "Review plan")), content, actions, canProvideFeedback, planUri?.toJSON(), generateUuid()));
         this.chatService.appendProgress(request, reviewData);
         const result = await raceCancellation(reviewData.completion.p, token);
         if (token.isCancellationRequested) {
@@ -132,11 +132,11 @@ let ReviewPlanTool = class ReviewPlanTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const parameters = context.parameters;
         if (!parameters.actions || parameters.actions.length === 0) {
-            throw ( new Error(( localize(7773, "At least one approval action must be provided."))));
+            throw ( new Error(( localize(8112, "At least one approval action must be provided."))));
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(7775, "Asking you to review the plan")))),
-            pastTenseMessage: ( new MarkdownString(( localize(7776, "Asked you to review the plan"))))
+            invocationMessage: ( new MarkdownString(( localize(8114, "Asking you to review the plan")))),
+            pastTenseMessage: ( new MarkdownString(( localize(8115, "Asked you to review the plan"))))
         };
     }
     toResult(result) {

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

@@ -110,9 +110,9 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
             id: RunSubagentTool_1.Id,
             toolReferenceName: VSCodeToolReference.runSubagent,
             icon: ThemeIcon.fromId(Codicon.organization.id),
-            displayName: ( localize(7777, "Run Subagent")),
+            displayName: ( localize(8116, "Run Subagent")),
             userDescription: ( localize(
-                7778,
+                8117,
                 "Run a task within an isolated subagent context to enable efficient organization of tasks and context window management."
             )),
             modelDescription: modelDescription,
@@ -348,7 +348,7 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
     }
     async getSubAgentByName(name) {
         const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
-        return agents.find(agent => agent.name === name);
+        return agents.find(agent => agent.name === name && agent.enabled);
     }
     checkMultiplierConstraint(modelId, mainModelId) {
         if (!mainModelId || modelId === mainModelId) {

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

@@ -44,7 +44,7 @@ const SetArtifactRulesToolData = {
     id: SetArtifactRulesToolId,
     toolReferenceName: "artifactRules",
     legacyToolReferenceFullNames: [],
-    displayName: ( localize(7779, "Set Artifact Rules")),
+    displayName: ( localize(8118, "Set Artifact Rules")),
     modelDescription: "Override the artifact extraction rules for this session. Rules control which tool results, files, and memory writes are automatically surfaced as artifacts.\n\nProvide rules as MIME type patterns, file path globs, or memory file path globs, each mapped to a group configuration with a groupName and optional onlyShowGroup flag.\n\nExamples:\n- byMimeType: { \"image/*\": { \"groupName\": \"Screenshots\", \"onlyShowGroup\": true } }\n- byFilePath: { \"**/*plan*.md\": { \"groupName\": \"Plans\" } }\n- byMemoryFilePath: { \"**/*plan*.md\": { \"groupName\": \"Plans\" } }\n\nThis fully replaces any settings-based rules for the duration of this session.",
     canBeReferencedInPrompt: true,
     source: ToolDataSource.Internal,
@@ -56,7 +56,7 @@ let SetArtifactRulesTool = class SetArtifactRulesTool {
     }
     async prepareToolInvocation(_context, _token) {
         return {
-            pastTenseMessage: ( new MarkdownString(( localize(7780, "Updated artifact rules")))),
+            pastTenseMessage: ( new MarkdownString(( localize(8119, "Updated artifact rules")))),
             presentation: ToolInvocationPresentation.Hidden
         };
     }
@@ -80,7 +80,7 @@ let SetArtifactRulesTool = class SetArtifactRulesTool {
         return {
             content: [{
                 kind: "text",
-                value: ( localize(7781, "Updated artifact rules"))
+                value: ( localize(8120, "Updated artifact rules"))
             }]
         };
     }

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

@@ -42,7 +42,7 @@ const SetArtifactsToolData = {
     id: SetArtifactsToolId,
     toolReferenceName: "artifacts",
     legacyToolReferenceFullNames: ["Set Session Artifacts"],
-    displayName: ( localize(7782, "Set Session Artifacts")),
+    displayName: ( localize(8121, "Set Session Artifacts")),
     modelDescription: "Set the list of artifacts for the current session. Each artifact has a label and either a uri or a toolCallId+dataPartIndex reference, plus an optional type (devServer, screenshot, plan). This overwrites the entire artifact list. URIs must be fully qualified with a scheme (e.g. https://localhost:3000, file:///tmp/plan.md). To reference a screenshot or image from a previous tool result, use toolCallId and dataPartIndex instead of uri.\n\nWhen to use this tool:\n- When creating or updating a plan saved to session memory — set a plan artifact so the user can view it in the artifact panel\n- When taking screenshots or producing visual output — set a screenshot artifact to surface the image\n- When starting a dev server — set a devServer artifact with the URL so the user can access it\n- When producing important documents, drafts, or temporary markdown files — set an artifact to make them easily accessible\n- After verification steps that produce visual results — update artifacts with screenshots showing the outcome\n\nWorkflow:\n- Prefer artifacts over printing long content inline in chat. Save content to a file or memory, then set an artifact pointing to it.\n- When updating plans or documents, update both the underlying file AND the artifact list.\n- Keep artifact labels concise and descriptive.",
     canBeReferencedInPrompt: true,
     source: ToolDataSource.Internal,
@@ -56,7 +56,7 @@ let SetArtifactsTool = class SetArtifactsTool {
     }
     async prepareToolInvocation(_context, _token) {
         return {
-            pastTenseMessage: ( new MarkdownString(( localize(7783, "Updated session artifacts")))),
+            pastTenseMessage: ( new MarkdownString(( localize(8122, "Updated session artifacts")))),
             presentation: ToolInvocationPresentation.Hidden
         };
     }
@@ -81,7 +81,7 @@ let SetArtifactsTool = class SetArtifactsTool {
                 const parsed = ( URI.parse(uri));
                 if (parsed.scheme !== "http" && parsed.scheme !== "https") {
                     if (!(await this._fileService.exists(parsed))) {
-                        throw ( new Error(( localize(7784, "Artifact URI does not exist: {0}", uri))));
+                        throw ( new Error(( localize(8123, "Artifact URI does not exist: {0}", uri))));
                     }
                 }
             }
@@ -102,7 +102,7 @@ let SetArtifactsTool = class SetArtifactsTool {
         return {
             content: [{
                 kind: "text",
-                value: ( localize(7785, "Set {0} artifact(s)", artifacts.length))
+                value: ( localize(8124, "Set {0} artifact(s)", artifacts.length))
             }]
         };
     }

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

@@ -25,6 +25,12 @@ export interface ILanguageModelToolConfirmationRef {
     source: ToolDataSource;
     parameters: unknown;
     chatSessionResource?: URI;
+    /**
+     * The working directory URI for the session, if set.
+     * Used by confirmation contributions to check if a path is within
+     * the session's working directory (agents window).
+     */
+    workingDirectory?: URI;
     /** When set, the confirmation service will offer combination-level approval actions */
     combination?: {
         /** Human-readable label for the approval option */