@codingame/monaco-vscode-api 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js

@@ -57,7 +57,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             filePattern: undefined,
             source: PromptFileSource.UserData,
             storage: PromptsStorage.user,
-            displayPath: ( localize(8943, "User Data")),
+            displayPath: ( localize(10662, "User Data")),
             isDefault: true
         };
     }
@@ -76,8 +76,10 @@ let PromptFilesLocator = class PromptFilesLocator {
     getDefaultSourceFolders(type) {
         return getPromptFileDefaultLocations(type);
     }
-    async getWorkspaceFolderRoots(includeParents, logger) {
-        const workspaceFolders = this.getWorkspaceFolders();
+    async getWorkspaceFolderRoots(includeParents, logger, root) {
+        const workspaceFolders = root ? root.scheme === AGENT_HOST_SCHEME ? [] : [{
+            uri: root
+        }] : this.getWorkspaceFolders();
         if (includeParents) {
             const roots = ( new ResourceSet());
             const userHome = await this.pathService.userHome();
@@ -97,7 +99,8 @@ let PromptFilesLocator = class PromptFilesLocator {
         let current = folderUri;
         while (true) {
             try {
-                const isRepoRoot = await this.fileService.exists(joinPath(current, ".git"));
+                const gitStat = await this.fileService.stat(joinPath(current, ".git")).then(stat => stat, () => undefined);
+                const isRepoRoot = gitStat?.isDirectory === true;
                 if (isRepoRoot) {
                     if ((await this.workspaceTrustManagementService.getUriTrustInfo(current)).trusted) {
                         candidates.push(current);
@@ -121,32 +124,70 @@ let PromptFilesLocator = class PromptFilesLocator {
         logger?.logInfo(`No repository root found for folder ${( folderUri.toString())}.`);
         return [];
     }
-    async listFiles(type, storage, token) {
+    async listFiles(type, storage, token, root) {
+        const files = await this.listFilesWithSource(type, storage, token, root);
+        return ( files.map(file => file.uri));
+    }
+    async listFilesWithSource(type, storage, token, root) {
         if (storage !== PromptsStorage.user && storage !== PromptsStorage.local) {
             throw ( new Error(`Unsupported prompt file storage: ${storage}`));
         }
         const configuredLocations = this.getPromptSourceFolders(type);
-        const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations.filter(loc => loc.storage === storage));
-        if (storage === PromptsStorage.user && (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt)) {
+        const localRoot = storage === PromptsStorage.local ? root : undefined;
+        const absoluteLocations = await this.toAbsoluteLocations(
+            type,
+            configuredLocations.filter(location => location.storage === storage),
+            undefined,
+            localRoot
+        );
+        if (storage === PromptsStorage.user && this.isUserDataPromptType(type)) {
+            const localLocations = await this.toAbsoluteLocations(
+                type,
+                configuredLocations.filter(location => location.storage === PromptsStorage.local)
+            );
+            absoluteLocations.push(
+                ...localLocations.filter(location => this.sourceFolderOverlapsUserData(type, location.searchRoot))
+            );
             absoluteLocations.push(this.userDataFolder);
         }
         const paths = ( new ResourceSet());
+        const result = [];
         for (const {
             searchRoot,
-            filePattern
+            filePattern,
+            source,
+            storage: sourceStorage
         } of absoluteLocations) {
             const files = (filePattern === undefined) ?
-            await this.resolveFilesAtLocation(searchRoot, type, token) : await this.searchFilesInLocation(searchRoot, filePattern, token);
+            await this.resolveFilesAtLocation(searchRoot, type, token, 0, localRoot) : await this.searchFilesInLocation(searchRoot, filePattern, token);
             for (const file of files) {
-                if (getPromptFileType(file) === type) {
-                    paths.add(file);
+                if (getPromptFileType(file) !== type || ( paths.has(file))) {
+                    continue;
                 }
+                const isUserDataFile = this.isUserDataPromptFile(type, file);
+                if ((isUserDataFile && storage !== PromptsStorage.user) || (!isUserDataFile && sourceStorage !== storage)) {
+                    continue;
+                }
+                paths.add(file);
+                result.push({
+                    uri: file,
+                    source: isUserDataFile ? PromptFileSource.UserData : source
+                });
             }
             if (token.isCancellationRequested) {
                 return [];
             }
         }
-        return [...paths];
+        return result;
+    }
+    isUserDataPromptType(type) {
+        return type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt;
+    }
+    isUserDataPromptFile(type, resource) {
+        return this.isUserDataPromptType(type) && isEqualOrParent(resource, this.userDataFolder.uri);
+    }
+    sourceFolderOverlapsUserData(type, searchRoot) {
+        return this.isUserDataPromptType(type) && (isEqualOrParent(searchRoot, this.userDataFolder.uri) || isEqualOrParent(this.userDataFolder.uri, searchRoot));
     }
     createFilesUpdatedEvent(type) {
         const disposables = ( new DisposableStore());
@@ -365,7 +406,8 @@ let PromptFilesLocator = class PromptFilesLocator {
     async getLocalStorageFolders(type) {
         const configuredLocations = this.getPromptSourceFolders(type);
         const defaultFolders = this.getDefaultSourceFolders(type);
-        const allFolders = [...defaultFolders, ...configuredLocations.filter(loc => !( defaultFolders.some(df => df.path === loc.path)))];
+        const isConfigured = PromptsConfig.getLocationsValue(this.configService, type) !== undefined;
+        const allFolders = isConfigured ? configuredLocations : defaultFolders;
         const absoluteLocations = await this.toAbsoluteLocations(type, allFolders, defaultFolders);
         if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
             absoluteLocations.push(this.userDataFolder);
@@ -383,12 +425,14 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return result;
     }
-    async toAbsoluteLocations(type, configuredLocations, defaultLocations) {
+    async toAbsoluteLocations(type, configuredLocations, defaultLocations, root) {
         const result = [];
         const seen = ( new ResourceSet());
         const userHome = await this.pathService.userHome();
         const rootFolders = await this.getWorkspaceFolderRoots(
-            this.configService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true
+            this.configService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true,
+            undefined,
+            root
         );
         const defaultPaths = ( new Set(defaultLocations?.map(loc => loc.path)));
         const validLocations = configuredLocations.filter(sourceFolder => {
@@ -492,11 +536,11 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return result;
     }
-    async resolveFilesAtLocation(location, type, token, depth = 0) {
+    async resolveFilesAtLocation(location, type, token, depth = 0, root) {
         if (type === PromptsType.skill) {
             return this.findAgentSkillsInFolder(location, token);
         }
-        const isWorkspaceRoot = depth === 0 && ( this.getWorkspaceFolders().some(f => isEqual(f.uri, location)));
+        const isWorkspaceRoot = depth === 0 && (root ? isEqual(root, location) : ( this.getWorkspaceFolders().some(f => isEqual(f.uri, location))));
         const recursive = type === PromptsType.instructions && !isWorkspaceRoot && !hasGlobPattern(location.path) && depth < MAX_INSTRUCTIONS_RECURSION_DEPTH;
         try {
             const info = await this.fileService.resolve(location);
@@ -511,7 +555,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                     if (child.isFile) {
                         result.push(child.resource);
                     } else if (recursive && child.isDirectory) {
-                        const subFiles = await this.resolveFilesAtLocation(child.resource, type, token, depth + 1);
+                        const subFiles = await this.resolveFilesAtLocation(child.resource, type, token, depth + 1, root);
                         result.push(...subFiles);
                     }
                 }

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

@@ -141,9 +141,10 @@ export declare class ChatRequestDynamicVariablePart implements IParsedChatReques
     readonly isFile?: boolean | undefined;
     readonly isDirectory?: boolean | undefined;
     readonly _meta?: Record<string, unknown> | undefined;
+    readonly isAttachmentReference?: boolean | 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, _meta?: Record<string, unknown> | 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, isAttachmentReference?: boolean | undefined);
     get referenceText(): string;
     get promptText(): string;
     toVariableEntry(): IChatRequestVariableEntry;

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

@@ -4,7 +4,7 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { reviveSerializedAgent } from '../participants/chatAgents.js';
-import { IDiagnosticVariableEntryFilterData } from '../attachments/chatVariableEntries.js';
+import { IDiagnosticVariableEntryFilterData, isChatReferenceDynamicVariableValue, chatReferenceVariableEntryFromDynamicValue } from '../attachments/chatVariableEntries.js';
 import { arrayEquals } from '../../../../../base/common/equals.js';
 
 var IParsedChatRequest;
@@ -210,7 +210,8 @@ class ChatRequestDynamicVariablePart {
         icon,
         isFile,
         isDirectory,
-        _meta
+        _meta,
+        isAttachmentReference
     ) {
         this.range = range;
         this.editorRange = editorRange;
@@ -223,6 +224,7 @@ class ChatRequestDynamicVariablePart {
         this.isFile = isFile;
         this.isDirectory = isDirectory;
         this._meta = _meta;
+        this.isAttachmentReference = isAttachmentReference;
         this.kind = ChatRequestDynamicVariablePart.Kind;
     }
     get referenceText() {
@@ -235,6 +237,18 @@ class ChatRequestDynamicVariablePart {
         if (this.id === "vscode.problems") {
             return IDiagnosticVariableEntryFilterData.toEntry(this.data.filter);
         }
+        if (isChatReferenceDynamicVariableValue(this.data)) {
+            const entry = chatReferenceVariableEntryFromDynamicValue(
+                this.data,
+                this.id,
+                this.fullName ?? this.referenceText,
+                this.range,
+                this._meta
+            );
+            if (entry) {
+                return entry;
+            }
+        }
         return {
             kind: this.isDirectory ? "directory" : this.isFile ? "file" : "generic",
             id: this.id,
@@ -270,7 +284,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, part.displayText));
             } 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, part._meta));
+                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, part.isAttachmentReference));
             } else {
                 throw ( new Error(`Unknown chat request part: ${part.kind}`));
             }

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

@@ -277,7 +277,8 @@ let ChatRequestParser = class ChatRequestParser {
                 refAtThisPosition.icon,
                 refAtThisPosition.isFile,
                 refAtThisPosition.isDirectory,
-                refAtThisPosition._meta
+                refAtThisPosition._meta,
+                refAtThisPosition.isAttachmentReference
             ));
         }
         return;

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

@@ -0,0 +1,16 @@
+import { IObservable, IReader } from "../../../../base/common/observable.js";
+import { ChatPullRequestState } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/common/chatPullRequest";
+import { SessionChatPillKind } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/sessionChatPills";
+export declare const ISessionChatPillVisibilityService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ISessionChatPillVisibilityService>;
+export interface ISessionChatPillVisibilityService {
+    readonly _serviceBrand: undefined;
+    readonly pullRequests: {
+        readonly showAll: IObservable<boolean>;
+        isVisible(state: ChatPullRequestState | undefined, reader: IReader | undefined): boolean;
+        setShowAll(showAll: boolean): void;
+    };
+    readHiddenKinds(reader: IReader | undefined): ReadonlySet<SessionChatPillKind>;
+    isVisible(kind: SessionChatPillKind, reader: IReader | undefined): boolean;
+    hide(kind: SessionChatPillKind): void;
+    toggle(kind: SessionChatPillKind): void;
+}

package/vscode/src/vs/workbench/contrib/chat/common/sessionChatPills.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const ISessionChatPillVisibilityService = ( createDecorator("sessionChatPillVisibilityService"));
+
+export { ISessionChatPillVisibilityService };

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

@@ -107,9 +107,9 @@ function createAskQuestionsToolData() {
         legacyToolReferenceFullNames: [AskQuestionsToolId, "vscode/askQuestions"],
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.question.id),
-        displayName: ( localize(8944, "Ask Clarifying Questions")),
+        displayName: ( localize(10672, "Ask Clarifying Questions")),
         userDescription: ( localize(
-            8945,
+            10673,
             "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.",
@@ -135,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(
-                8946,
+                10674,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
@@ -210,7 +210,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             };
         }
         progress.report({
-            message: ( localize(8947, "Analyzing your answers..."))
+            message: ( localize(10675, "Analyzing your answers..."))
         });
         const converted = this.convertCarouselAnswers(questions, answerResult?.answers, idToHeaderMap);
         const {
@@ -248,14 +248,14 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         } = parameters;
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                8946,
+                10674,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
         for (const question of questions) {
             if (question.options && question.options.length === 1 && !question.allowFreeformInput) {
                 throw ( new Error(( localize(
-                    8948,
+                    10676,
                     "Question \"{0}\" must have at least two options, or set allowFreeformInput when providing a single option, or omit options for free text input.",
                     question.header
                 ))));
@@ -263,8 +263,8 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         }
         const questionCount = questions.length;
         const headers = ( questions.map(q => q.header)).join(", ");
-        const message = questionCount === 1 ? ( localize(8949, "Asking a question ({0})", headers)) : ( localize(8950, "Asking {0} questions ({1})", questionCount, headers));
-        const pastMessage = questionCount === 1 ? ( localize(8951, "Asked a question ({0})", headers)) : ( localize(8952, "Asked {0} questions ({1})", questionCount, headers));
+        const message = questionCount === 1 ? ( localize(10677, "Asking a question ({0})", headers)) : ( localize(10678, "Asking {0} questions ({1})", questionCount, headers));
+        const pastMessage = questionCount === 1 ? ( localize(10679, "Asked a question ({0})", headers)) : ( localize(10680, "Asked {0} questions ({1})", questionCount, headers));
         return {
             invocationMessage: ( new MarkdownString(message)),
             pastTenseMessage: ( new MarkdownString(pastMessage))

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

@@ -7,6 +7,8 @@ import { ConfirmationOptionKind } from '../../../../../../platform/agentHost/com
 import '../../../../../../platform/agentHost/common/state/protocol/channels-terminal/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-changeset/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-resource-watch/state.js';
+import '../../../../../../platform/agentHost/common/state/protocol/channels-automation/state.js';
+import '../../../../../../platform/agentHost/common/state/protocol/channels-automation-run/state.js';
 import { ToolDataSource, ToolInvocationPresentation } from '../languageModelToolsService.js';
 
 const ConfirmationToolId = "vscode_get_confirmation";

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(8953, "Manage and track todo items for task planning")),
-        userDescription: ( localize(8954, "Manage and track todo items for task planning")),
+        displayName: ( localize(10681, "Manage and track todo items for task planning")),
+        userDescription: ( localize(10682, "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(8955, "Read todo list"));
+            message = ( localize(10683, "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(8956, "Updating todo list"));
+        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(10684, "Updating todo list"));
         const invocationMessage = ( new MarkdownString(invocationLabel));
         return {
             invocationMessage,
             presentation: items.length ? undefined : ToolInvocationPresentation.Hidden,
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(8957, "Updated todo list")))),
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(10685, "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 && newTodos.length > 0) {
-            return newTodos.length === 1 ? ( localize(8958, "Created 1 todo")) : ( localize(8959, "Created {0} todos", newTodos.length));
+            return newTodos.length === 1 ? ( localize(10686, "Created 1 todo")) : ( localize(10687, "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(
-                8960,
+                10688,
                 "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(
-                8961,
+                10689,
                 "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(8962, "Added 1 todo")) : ( localize(8963, "Added {0} todos", addedTodos.length));
+            return addedTodos.length === 1 ? ( localize(10690, "Added 1 todo")) : ( localize(10691, "Added {0} todos", addedTodos.length));
         }
-        return localize(8964, "Updated todo list");
+        return localize(10692, "Updated todo list");
     }
     handleRead(todoItems, sessionResource) {
         if (todoItems.length === 0) {

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

@@ -44,7 +44,7 @@ function createReviewPlanToolData() {
         properties: {
             title: {
                 type: "string",
-                description: "Title displayed in the widget header. Defaults to \"Review plan\" if omitted."
+                description: "Title displayed in the widget header. Defaults to \"Plan summary\" if omitted."
             },
             plan: {
                 type: "string",
@@ -72,8 +72,8 @@ function createReviewPlanToolData() {
         toolReferenceName: "reviewPlan",
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(8965, "Review Plan")),
-        userDescription: ( localize(8966, "Ask the user to review and approve a plan before proceeding.")),
+        displayName: ( localize(10693, "Review Plan")),
+        userDescription: ( localize(10694, "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(8967, "At least one approval action must be provided."))));
+            throw ( new Error(( localize(10695, "At least one approval action must be provided."))));
         }
         const {
             request
@@ -119,10 +119,11 @@ let ReviewPlanTool = class ReviewPlanTool extends Disposable {
                 }
             }
         }
-        const reviewData = ( new ChatPlanReviewData(title ?? ( localize(8968, "Review plan")), content, actions, canProvideFeedback, planUri?.toJSON(), generateUuid()));
+        const reviewData = ( new ChatPlanReviewData(title ?? ( localize(10696, "Plan summary")), content, actions, canProvideFeedback, planUri?.toJSON(), generateUuid()));
         this.chatService.appendProgress(request, reviewData);
         const result = await raceCancellation(reviewData.completion.p, token);
         if (token.isCancellationRequested) {
+            reviewData.dismiss();
             throw ( new CancellationError());
         }
         return this.toResult(result ?? {
@@ -132,11 +133,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(8967, "At least one approval action must be provided."))));
+            throw ( new Error(( localize(10695, "At least one approval action must be provided."))));
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(8969, "Asking you to review the plan")))),
-            pastTenseMessage: ( new MarkdownString(( localize(8970, "Asked you to review the plan"))))
+            invocationMessage: ( new MarkdownString(( localize(10697, "Asking you to review the plan")))),
+            pastTenseMessage: ( new MarkdownString(( localize(10698, "Asked you to review the plan"))))
         };
     }
     toResult(result) {

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

@@ -1,10 +1,11 @@
 import { CancellationToken } from "../../../../../../base/common/cancellation.js";
-import { Event } from "../../../../../../base/common/event.js";
+import { type Event } from "../../../../../../base/common/event.js";
 import { Disposable } from "../../../../../../base/common/lifecycle.js";
 import { IConfigurationService } from "../../../../../../platform/configuration/common/configuration.service.js";
 import { IInstantiationService } from "../../../../../../platform/instantiation/common/instantiation.js";
 import { ILogService } from "../../../../../../platform/log/common/log.service.js";
 import { IProductService } from "../../../../../../platform/product/common/productService.service.js";
+import { ITelemetryService } from "../../../../../../platform/telemetry/common/telemetry.service.js";
 import { IChatService } from "../../chatService/chatService.service.js";
 import { ILanguageModelsService } from "../../languageModels.service.js";
 import { IChatAgentService } from "../../participants/chatAgents.service.js";
@@ -28,6 +29,7 @@ export declare class RunSubagentTool extends Disposable implements IToolImpl {
     private readonly promptsService;
     private readonly instantiationService;
     private readonly productService;
+    private readonly telemetryService;
     static readonly Id = "runSubagent";
     private readonly _onDidUpdateToolData;
     readonly onDidUpdateToolData: Event<void>;
@@ -35,7 +37,8 @@ export declare class RunSubagentTool extends Disposable implements IToolImpl {
     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, configurationService: IConfigurationService, promptsService: IPromptsService, instantiationService: IInstantiationService, productService: IProductService);
+    private _autoModelResolution;
+    constructor(chatAgentService: IChatAgentService, chatService: IChatService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService, logService: ILogService, configurationService: IConfigurationService, promptsService: IPromptsService, instantiationService: IInstantiationService, productService: IProductService, telemetryService: ITelemetryService);
     getToolData(): IToolData;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private getSubAgentByName;
@@ -53,8 +56,18 @@ export declare class RunSubagentTool extends Disposable implements IToolImpl {
      * Resolves the model to be used by a subagent.
      * @param explicitModelQualifiedName Optional explicit model specified by the caller.
      *        If provided and not found or not allowed, throws an error with available models.
+     * @param currentModeInstructions The current agent inherited when no subagent is requested.
+     *        Its configured model keeps precedence over the Auto default.
      * @throws Error if the requested model is not found or exceeds the main model's cost tier.
      */
     private resolveSubagentModel;
+    private inheritedAgentHasModel;
+    private isSelectableForAgentMode;
+    private findEligibleAutoModelId;
+    private resolveAutoModelId;
+    private activateAutoModel;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+    private normalizeRequestedAgentName;
+    private getCurrentModeInstructions;
+    private validateSubagentAllowed;
 }