@codingame/monaco-vscode-api 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.js

@@ -11,6 +11,14 @@ const PROMPT_DEFAULT_SOURCE_FOLDER = '.github/prompts';
 const INSTRUCTIONS_DEFAULT_SOURCE_FOLDER = '.github/instructions';
 const LEGACY_MODE_DEFAULT_SOURCE_FOLDER = '.github/chatmodes';
 const AGENTS_SOURCE_FOLDER = '.github/agents';
+const DEFAULT_AGENT_SKILLS_WORKSPACE_FOLDERS = [
+    { path: '.github/skills', type: 'github-workspace' },
+    { path: '.claude/skills', type: 'claude-workspace' }
+];
+const DEFAULT_AGENT_SKILLS_USER_HOME_FOLDERS = [
+    { path: '.copilot/skills', type: 'copilot-personal' },
+    { path: '.claude/skills', type: 'claude-personal' }
+];
 function isInAgentsFolder(fileUri) {
     const dir = dirname(fileUri.path);
     return dir.endsWith('/' + AGENTS_SOURCE_FOLDER) || dir === AGENTS_SOURCE_FOLDER;
@@ -80,4 +88,4 @@ function getCleanPromptName(fileUri) {
     return basename(fileUri.path);
 }
 
-export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, getCleanPromptName, getPromptFileDefaultLocation, getPromptFileExtension, getPromptFileType, isPromptOrInstructionsFile };
+export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, DEFAULT_AGENT_SKILLS_USER_HOME_FOLDERS, DEFAULT_AGENT_SKILLS_WORKSPACE_FOLDERS, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, getCleanPromptName, getPromptFileDefaultLocation, getPromptFileExtension, getPromptFileType, isPromptOrInstructionsFile };

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

@@ -76,9 +76,9 @@ export interface IPromptPathBase {
 export interface IExtensionPromptPath extends IPromptPathBase {
     readonly storage: PromptsStorage.extension;
     readonly extension: IExtensionDescription;
-    readonly name: string;
-    readonly description: string;
     readonly source: ExtensionAgentSourceType;
+    readonly name?: string;
+    readonly description?: string;
 }
 export interface ILocalPromptPath extends IPromptPathBase {
     readonly storage: PromptsStorage.local;
@@ -151,7 +151,7 @@ export interface IChatPromptSlashCommand {
     readonly promptPath: IPromptPath;
     readonly parsedPromptFile: ParsedPromptFile;
 }
-export interface IClaudeSkill {
+export interface IAgentSkill {
     readonly uri: URI;
     readonly type: "personal" | "project";
     readonly name: string;

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

@@ -7,7 +7,7 @@ import { ITextModel } from "../../../../../../editor/common/model.js";
 import { IExtensionDescription } from "../../../../../../platform/extensions/common/extensions.js";
 import { ParsedPromptFile } from "../promptFileParser.js";
 import { PromptsType } from "../promptTypes.js";
-import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomAgent, ICustomAgentQueryOptions, IExternalCustomAgent, IClaudeSkill } from "./promptsService.js";
+import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomAgent, ICustomAgentQueryOptions, IExternalCustomAgent, IAgentSkill } from "./promptsService.js";
 /**
 * Provides prompt services.
 */
@@ -72,7 +72,7 @@ export interface IPromptsService extends IDisposable {
     * Internal: register a contributed file. Returns a disposable that removes the contribution.
     * Not intended for extension authors; used by contribution point handler.
     */
-    registerContributedFile(type: PromptsType, name: string, description: string, uri: URI, extension: IExtensionDescription): IDisposable;
+    registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name: string | undefined, description: string | undefined): IDisposable;
     getPromptLocationLabel(promptPath: IPromptPath): string;
     /**
     * Gets list of all AGENTS.md files in the workspace.
@@ -112,7 +112,7 @@ export interface IPromptsService extends IDisposable {
         provideCustomAgents: (options: ICustomAgentQueryOptions, token: CancellationToken) => Promise<IExternalCustomAgent[] | undefined>;
     }): IDisposable;
     /**
-    * Gets list of claude skills files.
+    * Gets list of agent skills files.
     */
-    findClaudeSkills(token: CancellationToken): Promise<IClaudeSkill[] | undefined>;
+    findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined>;
 }

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

@@ -1,13 +1,13 @@
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { IOffsetRange, OffsetRange } from "../../../../editor/common/core/ranges/offsetRange.js";
-import { IRange } from "../../../../editor/common/core/range.js";
-import { IChatAgentCommand, IChatAgentData } from "./chatAgents.js";
-import { IChatAgentService } from "./chatAgents.service.js";
-import { IChatSlashData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatSlashCommands";
-import { IChatRequestVariableValue } from "./chatVariables.js";
-import { ChatAgentLocation } from "./constants.js";
-import { IToolData } from "./languageModelToolsService.js";
-import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry } from "./chatVariableEntries.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { IOffsetRange, OffsetRange } from "../../../../../editor/common/core/ranges/offsetRange.js";
+import { IRange } from "../../../../../editor/common/core/range.js";
+import { IChatAgentCommand, IChatAgentData } from "../participants/chatAgents.js";
+import { IChatAgentService } from "../participants/chatAgents.service.js";
+import { IChatSlashData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands";
+import { IChatRequestVariableValue } from "../attachments/chatVariables.js";
+import { ChatAgentLocation } from "../constants.js";
+import { IToolData } from "../tools/languageModelToolsService.js";
+import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
 export interface IParsedChatRequest {
     readonly parts: ReadonlyArray<IParsedChatRequestPart>;
     readonly text: string;

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

@@ -1,9 +1,9 @@
 
-import { revive } from '../../../../base/common/marshalling.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { reviveSerializedAgent } from './chatAgents.js';
-import { IDiagnosticVariableEntryFilterData } from './chatVariableEntries.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { reviveSerializedAgent } from '../participants/chatAgents.js';
+import { IDiagnosticVariableEntryFilterData } from '../attachments/chatVariableEntries.js';
 
 function getPromptText(request) {
     const message = ( request.parts.map(r => r.promptText)).join('').trimStart();

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

@@ -1,11 +1,11 @@
-import { URI } from "../../../../base/common/uri.js";
-import { IChatAgentData } from "./chatAgents.js";
-import { IChatAgentService } from "./chatAgents.service.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IChatAgentData } from "../participants/chatAgents.js";
+import { IChatAgentService } from "../participants/chatAgents.service.js";
 import { IParsedChatRequest } from "./chatParserTypes.js";
-import { IChatSlashCommandService } from "./chatSlashCommands.service.js";
-import { IChatVariablesService } from "./chatVariables.service.js";
-import { ChatAgentLocation, ChatModeKind } from "./constants.js";
-import { IPromptsService } from "./promptSyntax/service/promptsService.service.js";
+import { IChatSlashCommandService } from "../participants/chatSlashCommands.service.js";
+import { IChatVariablesService } from "../attachments/chatVariables.service.js";
+import { ChatAgentLocation, ChatModeKind } from "../constants.js";
+import { IPromptsService } from "../promptSyntax/service/promptsService.service.js";
 export interface IChatParserContext {
     /** Used only as a disambiguator, when the query references an agent that has a duplicate with the same name. */
     selectedAgent?: IChatAgentData;

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

@@ -1,15 +1,15 @@
 
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Position } from '../../../../editor/common/core/position.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { IChatAgentService } from './chatAgents.service.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { IChatAgentService } from '../participants/chatAgents.service.js';
 import { chatVariableLeader, chatAgentLeader, chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestDynamicVariablePart } from './chatParserTypes.js';
-import { IChatSlashCommandService } from './chatSlashCommands.service.js';
-import { IChatVariablesService } from './chatVariables.service.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-import { ToolSet } from './languageModelToolsService.js';
-import { IPromptsService } from './promptSyntax/service/promptsService.service.js';
+import { IChatSlashCommandService } from '../participants/chatSlashCommands.service.js';
+import { IChatVariablesService } from '../attachments/chatVariables.service.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { ToolSet } from '../tools/languageModelToolsService.js';
+import { IPromptsService } from '../promptSyntax/service/promptsService.service.js';
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i;
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i;

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

@@ -1,4 +1,4 @@
-import { CancellationToken } from "../../../../../base/common/cancellation.js";
+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 ConfirmationToolData: IToolData;

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

@@ -1,5 +1,5 @@
 
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { ToolDataSource, ToolInvocationPresentation } from '../languageModelToolsService.js';
 
 const ConfirmationToolId = 'vscode_get_confirmation';

package/vscode/src/vs/workbench/contrib/chat/common/tools/{editFileTool.d.ts → builtinTools/editFileTool.d.ts}

@@ -1,8 +1,8 @@
-import { CancellationToken } from "../../../../../base/common/cancellation.js";
-import { UriComponents } from "../../../../../base/common/uri.js";
-import { INotebookService } from "../../../notebook/common/notebookService.service.js";
-import { ICodeMapperService } from "../chatCodeMapperService.service.js";
-import { IChatService } from "../chatService.service.js";
+import { CancellationToken } from "../../../../../../base/common/cancellation.js";
+import { UriComponents } from "../../../../../../base/common/uri.js";
+import { INotebookService } from "../../../../notebook/common/notebookService.service.js";
+import { ICodeMapperService } from "../../editing/chatCodeMapperService.service.js";
+import { IChatService } from "../../chatService/chatService.service.js";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "../languageModelToolsService.js";
 export declare const ExtensionEditToolId = "vscode_editFile";
 export declare const InternalEditToolId = "vscode_editFile_internal";

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

@@ -1,15 +1,15 @@
 
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import '../../../../../base/common/observableInternal/index.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { CellUri } from '../../../notebook/common/notebookCommon.js';
-import { INotebookService } from '../../../notebook/common/notebookService.service.js';
-import { ICodeMapperService } from '../chatCodeMapperService.service.js';
-import { IChatService } from '../chatService.service.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import '../../../../../../base/common/observableInternal/index.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { CellUri } from '../../../../notebook/common/notebookCommon.js';
+import { INotebookService } from '../../../../notebook/common/notebookService.service.js';
+import { ICodeMapperService } from '../../editing/chatCodeMapperService.service.js';
+import { IChatService } from '../../chatService/chatService.service.js';
 import { ToolDataSource, ToolInvocationPresentation } from '../languageModelToolsService.js';
-import { LocalChatSessionUri } from '../chatUri.js';
-import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { LocalChatSessionUri } from '../../model/chatUri.js';
+import { autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 const ExtensionEditToolId = 'vscode_editFile';
 const InternalEditToolId = 'vscode_editFile_internal';

package/vscode/src/vs/workbench/contrib/chat/common/tools/{manageTodoListTool.d.ts → builtinTools/manageTodoListTool.d.ts}

@@ -1,8 +1,8 @@
-import { CancellationToken } from "../../../../../base/common/cancellation.js";
-import { Disposable } from "../../../../../base/common/lifecycle.js";
+import { CancellationToken } from "../../../../../../base/common/cancellation.js";
+import { Disposable } from "../../../../../../base/common/lifecycle.js";
 import { IToolData, IToolImpl, IToolInvocation, IToolResult, IToolInvocationPreparationContext, IPreparedToolInvocation } from "../languageModelToolsService.js";
-import { ILogService } from "../../../../../platform/log/common/log.service.js";
-import { ITelemetryService } from "../../../../../platform/telemetry/common/telemetry.service.js";
+import { ILogService } from "../../../../../../platform/log/common/log.service.js";
+import { ITelemetryService } from "../../../../../../platform/telemetry/common/telemetry.service.js";
 import { IChatTodoListService } from "../chatTodoListService.service.js";
 export declare const TodoListToolWriteOnlySettingId = "chat.todoListTool.writeOnly";
 export declare const TodoListToolDescriptionFieldSettingId = "chat.todoListTool.descriptionField";

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

@@ -1,15 +1,15 @@
 
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { ToolDataSource } from '../languageModelToolsService.js';
-import { ILogService } from '../../../../../platform/log/common/log.service.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
+import { ILogService } from '../../../../../../platform/log/common/log.service.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.service.js';
 import { IChatTodoListService } from '../chatTodoListService.service.js';
-import { localize } from '../../../../../nls.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { LocalChatSessionUri, chatSessionResourceToId } from '../chatUri.js';
+import { localize } from '../../../../../../nls.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { LocalChatSessionUri, chatSessionResourceToId } from '../../model/chatUri.js';
 
 const TodoListToolWriteOnlySettingId = 'chat.todoListTool.writeOnly';
 const TodoListToolDescriptionFieldSettingId = 'chat.todoListTool.descriptionField';
@@ -63,8 +63,8 @@ function createManageTodoListToolData(writeOnly, includeDescription = true) {
         legacyToolReferenceFullNames: ['todos'],
         canBeReferencedInPrompt: true,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(6095, 'Manage and track todo items for task planning')),
-        userDescription: ( localize(6096, 'Manage and track todo items for task planning')),
+        displayName: ( localize(6070, 'Manage and track todo items for task planning')),
+        userDescription: ( localize(6071, '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: {
@@ -139,7 +139,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
                 break;
             }
             case 'read': {
-                message = ( localize(6097, "Read todo list"));
+                message = ( localize(6072, "Read todo list"));
                 break;
             }
         }
@@ -151,7 +151,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             status: todo.status
         })));
         return {
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(6098, "Updated todo list")))),
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(6073, "Updated todo list")))),
             toolSpecificData: {
                 kind: 'todoList',
                 sessionId: chatSessionId,
@@ -162,8 +162,8 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     generatePastTenseMessage(currentTodos, newTodos) {
         if (currentTodos.length === 0) {
             return newTodos.length === 1
-                ? ( localize(6099, "Created 1 todo"))
-                : ( localize(6100, "Created {0} todos", newTodos.length));
+                ? ( localize(6074, "Created 1 todo"))
+                : ( localize(6075, "Created {0} todos", newTodos.length));
         }
         const currentTodoMap = ( new Map(( currentTodos.map(todo => [todo.id, todo]))));
         const startedTodos = newTodos.filter(newTodo => {
@@ -175,7 +175,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === startedTodo.id) + 1;
             return localize(
-                6101,
+                6076,
                 "Starting: *{0}* ({1}/{2})",
                 startedTodo.title,
                 currentPosition,
@@ -191,7 +191,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === completedTodo.id) + 1;
             return localize(
-                6102,
+                6077,
                 "Completed: *{0}* ({1}/{2})",
                 completedTodo.title,
                 currentPosition,
@@ -201,10 +201,10 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const addedTodos = newTodos.filter(newTodo => !( currentTodoMap.has(newTodo.id)));
         if (addedTodos.length > 0) {
             return addedTodos.length === 1
-                ? ( localize(6103, "Added 1 todo"))
-                : ( localize(6104, "Added {0} todos", addedTodos.length));
+                ? ( localize(6078, "Added 1 todo"))
+                : ( localize(6079, "Added {0} todos", addedTodos.length));
         }
-        return localize(6105, "Updated todo list");
+        return localize(6080, "Updated todo list");
     }
     handleRead(todoItems, sessionResource) {
         if (todoItems.length === 0) {

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

@@ -1,13 +1,14 @@
-import { CancellationToken } from "../../../../../base/common/cancellation.js";
-import { Event } from "../../../../../base/common/event.js";
-import { Disposable } from "../../../../../base/common/lifecycle.js";
-import { IConfigurationChangeEvent } from "../../../../../platform/configuration/common/configuration.js";
-import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
-import { ILogService } from "../../../../../platform/log/common/log.service.js";
-import { IChatAgentService } from "../chatAgents.service.js";
-import { IChatModeService } from "../chatModes.service.js";
-import { IChatService } from "../chatService.service.js";
-import { ILanguageModelsService } from "../languageModels.service.js";
+import { CancellationToken } from "../../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../../base/common/event.js";
+import { Disposable } from "../../../../../../base/common/lifecycle.js";
+import { IConfigurationChangeEvent } from "../../../../../../platform/configuration/common/configuration.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 { IChatAgentService } from "../../participants/chatAgents.service.js";
+import { IChatModeService } from "../../chatModes.service.js";
+import { IChatService } from "../../chatService/chatService.service.js";
+import { ILanguageModelsService } from "../../languageModels.service.js";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "../languageModelToolsService.js";
 import { ILanguageModelToolsService } from "../languageModelToolsService.service.js";
 export declare const RunSubagentToolId = "runSubagent";
@@ -20,9 +21,11 @@ export declare class RunSubagentTool extends Disposable implements IToolImpl {
     private readonly logService;
     private readonly toolsService;
     private readonly configurationService;
+    private readonly instantiationService;
     readonly onDidUpdateToolData: Event<IConfigurationChangeEvent>;
-    constructor(chatAgentService: IChatAgentService, chatService: IChatService, chatModeService: IChatModeService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService, logService: ILogService, toolsService: ILanguageModelToolsService, configurationService: IConfigurationService);
+    constructor(chatAgentService: IChatAgentService, chatService: IChatService, chatModeService: IChatModeService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService, logService: ILogService, toolsService: ILanguageModelToolsService, configurationService: IConfigurationService, instantiationService: IInstantiationService);
     getToolData(): IToolData;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+    private collectVariables;
 }

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

@@ -1,21 +1,24 @@
 
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Event } from '../../../../../base/common/event.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { ILogService } from '../../../../../platform/log/common/log.service.js';
-import { IChatAgentService } from '../chatAgents.service.js';
-import { IChatModeService } from '../chatModes.service.js';
-import { IChatService } from '../chatService.service.js';
-import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '../constants.js';
-import { ILanguageModelChatMetadata } from '../languageModels.js';
-import { ILanguageModelsService } from '../languageModels.service.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.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 { IChatAgentService } from '../../participants/chatAgents.service.js';
+import { IChatModeService } from '../../chatModes.service.js';
+import { IChatService } from '../../chatService/chatService.service.js';
+import { ChatRequestVariableSet } from '../../attachments/chatVariableEntries.js';
+import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '../../constants.js';
+import { ILanguageModelChatMetadata } from '../../languageModels.js';
+import { ILanguageModelsService } from '../../languageModels.service.js';
 import { ToolDataSource, VSCodeToolReference, ToolSet } from '../languageModelToolsService.js';
 import { ILanguageModelToolsService } from '../languageModelToolsService.service.js';
+import { ComputeAutomaticInstructions } from '../../promptSyntax/computeAutomaticInstructions.js';
 import { ManageTodoListToolToolId } from './manageTodoListTool.js';
 import { createToolSimpleTextResult } from './toolHelpers.js';
 
@@ -28,7 +31,7 @@ const BaseModelDescription = `Launch a new agent to handle complex, multi-step t
 - The agent's outputs should generally be trusted
 - Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user\'s intent`;
 let RunSubagentTool = class RunSubagentTool extends Disposable {
-    constructor(chatAgentService, chatService, chatModeService, languageModelToolsService, languageModelsService, logService, toolsService, configurationService) {
+    constructor(chatAgentService, chatService, chatModeService, languageModelToolsService, languageModelsService, logService, toolsService, configurationService, instantiationService) {
         super();
         this.chatAgentService = chatAgentService;
         this.chatService = chatService;
@@ -38,6 +41,7 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
         this.logService = logService;
         this.toolsService = toolsService;
         this.configurationService = configurationService;
+        this.instantiationService = instantiationService;
         this.onDidUpdateToolData = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.SubagentToolCustomAgents));
     }
     getToolData() {
@@ -67,9 +71,9 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
             id: RunSubagentToolId,
             toolReferenceName: VSCodeToolReference.runSubagent,
             icon: ThemeIcon.fromId(Codicon.organization.id),
-            displayName: ( localize(6106, 'Run Subagent')),
+            displayName: ( localize(6081, 'Run Subagent')),
             userDescription: ( localize(
-                6107,
+                6082,
                 'Run a task within an isolated subagent context to enable efficient organization of tasks and context window management.'
             )),
             modelDescription: modelDescription,
@@ -160,12 +164,13 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
                 modeTools[RunSubagentToolId] = false;
                 modeTools[ManageTodoListToolToolId] = false;
             }
+            const variableSet = await this.collectVariables(modeTools, token);
             const agentRequest = {
                 sessionResource: invocation.context.sessionResource,
                 requestId: invocation.callId ?? `subagent-${Date.now()}`,
                 agentId: defaultAgent.id,
                 message: args.prompt,
-                variables: { variables: [] },
+                variables: { variables: variableSet.asArray() },
                 location: ChatAgentLocation.Chat,
                 isSubagent: true,
                 userSelectedModelId: modeModelId,
@@ -190,6 +195,21 @@ let RunSubagentTool = class RunSubagentTool extends Disposable {
             invocationMessage: args.description,
         };
     }
+    async collectVariables(modeTools, token) {
+        let enabledTools;
+        if (modeTools) {
+            const enabledToolIds = ( Object.entries(modeTools).filter(([, enabled]) => enabled).map(([id]) => id));
+            const tools = ( enabledToolIds.map(id => this.languageModelToolsService.getTool(id))).filter(tool => !!tool);
+            const fullReferenceNames = ( tools.map(tool => this.languageModelToolsService.getFullReferenceName(tool)));
+            if (fullReferenceNames.length > 0) {
+                enabledTools = this.languageModelToolsService.toToolAndToolSetEnablementMap(fullReferenceNames, undefined);
+            }
+        }
+        const variableSet = ( new ChatRequestVariableSet());
+        const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, enabledTools);
+        await computer.collect(variableSet, token);
+        return variableSet;
+    }
 };
 RunSubagentTool = ( __decorate([
     ( __param(0, IChatAgentService)),
@@ -199,7 +219,8 @@ RunSubagentTool = ( __decorate([
     ( __param(4, ILanguageModelsService)),
     ( __param(5, ILogService)),
     ( __param(6, ILanguageModelToolsService)),
-    ( __param(7, IConfigurationService))
+    ( __param(7, IConfigurationService)),
+    ( __param(8, IInstantiationService))
 ], RunSubagentTool));
 
 export { RunSubagentTool, RunSubagentToolId };

package/vscode/src/vs/workbench/contrib/chat/common/tools/{tools.d.ts → builtinTools/tools.d.ts}

@@ -1,7 +1,7 @@
-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 { IWorkbenchContribution } from "../../../../common/contributions.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 { IWorkbenchContribution } from "../../../../../common/contributions.js";
 import { ILanguageModelToolsService } from "../languageModelToolsService.service.js";
 export declare class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
     private readonly configurationService;

package/vscode/src/vs/workbench/contrib/chat/common/tools/{tools.js → builtinTools/tools.js}

@@ -1,11 +1,11 @@
 
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ToolDataSource, SpecedToolAliases } from '../languageModelToolsService.js';
 import { ILanguageModelToolsService } from '../languageModelToolsService.service.js';
 import { ConfirmationTool, ConfirmationToolData } from './confirmationTool.js';
@@ -30,7 +30,7 @@ let BuiltinToolsContribution = class BuiltinToolsContribution extends Disposable
         const runSubagentTool = this._register(instantiationService.createInstance(RunSubagentTool));
         const customAgentToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'custom-agent', SpecedToolAliases.agent, {
             icon: ThemeIcon.fromId(Codicon.agent.id),
-            description: ( localize(6108, 'Delegate tasks to other agents')),
+            description: ( localize(6083, 'Delegate tasks to other agents')),
         }));
         let runSubagentRegistration;
         let toolSetRegistration;

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

@@ -0,0 +1,10 @@
+import { Event } from "../../../../../base/common/event.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IChatTodo } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService";
+export declare const IChatTodoListService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatTodoListService>;
+export interface IChatTodoListService {
+    readonly _serviceBrand: undefined;
+    readonly onDidUpdateTodos: Event<URI>;
+    getTodos(sessionResource: URI): IChatTodo[];
+    setTodos(sessionResource: URI, todos: IChatTodo[]): void;
+}

package/vscode/src/vs/workbench/contrib/chat/common/{chatTodoListService.service.js → tools/chatTodoListService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatTodoListService = ( createDecorator('chatTodoListService'));
 

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

@@ -1,5 +1,5 @@
-import { IQuickInputButton, IQuickTreeItem } from "../../../../platform/quickinput/common/quickInput.js";
-import { ConfirmedReason } from "./chatService.js";
+import { IQuickInputButton, IQuickTreeItem } from "../../../../../platform/quickinput/common/quickInput.js";
+import { ConfirmedReason } from "../chatService/chatService.js";
 import { ToolDataSource } from "./languageModelToolsService.js";
 export interface ILanguageModelToolConfirmationActions {
     /** Label for the action */

package/vscode/src/vs/workbench/contrib/chat/common/{languageModelToolsConfirmationService.service.d.ts → tools/languageModelToolsConfirmationService.service.d.ts}

@@ -1,4 +1,4 @@
-import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ILanguageModelToolConfirmationActionProducer, ILanguageModelToolConfirmationContribution } from "./languageModelToolsConfirmationService.js";
 import { IToolData } from "./languageModelToolsService.js";
 /**
@@ -28,4 +28,4 @@ export interface ILanguageModelToolsConfirmationService extends ILanguageModelTo
     /** Resets all tool and server confirmation preferences */
     resetToolAutoConfirmation(): void;
 }
-export declare const ILanguageModelToolsConfirmationService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILanguageModelToolsConfirmationService>;
+export declare const ILanguageModelToolsConfirmationService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILanguageModelToolsConfirmationService>;

package/vscode/src/vs/workbench/contrib/chat/common/{languageModelToolsConfirmationService.service.js → tools/languageModelToolsConfirmationService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const ILanguageModelToolsConfirmationService = ( createDecorator('ILanguageModelToolsConfirmationService'));