@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/chatRunPromptAction.js → promptSyntax/runPromptAction.js}

@@ -1,28 +1,27 @@
 
-import { ChatViewId } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { showChatView, ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { PROMPT_LANGUAGE_ID, PromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { UILabelProvider } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingLabels';
-import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
+import { PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { PromptFilePickers } from './dialogs/askToSelectPrompt/promptFilePickers.js';
+import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { runPromptFile } from './dialogs/askToSelectPrompt/utils/runPrompt.js';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { PromptsType } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { getPromptCommandName } from '../../common/promptSyntax/service/promptsServiceImpl.js';
 
 const EDITOR_ACTIONS_CONDITION = ( ContextKeyExpr.and(( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)), ResourceContextKey.HasResource, ( ResourceContextKey.LangId.isEqualTo(PROMPT_LANGUAGE_ID))));
 const COMMAND_KEY_BINDING = KeyMod.WinCtrl | KeyCode.Slash | KeyMod.Alt;
@@ -59,15 +58,18 @@ class RunPromptBaseAction extends Action2 {
         const commandService = accessor.get(ICommandService);
         resource ||= getActivePromptFileUri(accessor);
         assertDefined(resource, 'Cannot find URI resource for an active text editor.');
-        const { widget } = await runPromptFile(resource, {
-            inNewChat,
-            commandService,
-            viewsService,
-        });
+        if (inNewChat === true) {
+            await commandService.executeCommand(ACTION_ID_NEW_CHAT);
+        }
+        const widget = await showChatView(viewsService);
+        if (widget) {
+            widget.setInput(`/${getPromptCommandName(resource.path)}`);
+            await widget.acceptInput();
+        }
         return widget;
     }
 }
-const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(4535, "Run Prompt in Current Chat"));
+const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(5202, "Run Prompt in Current Chat"));
 const RUN_CURRENT_PROMPT_ACTION_ICON = Codicon.playCircle;
 class RunCurrentPromptAction extends RunPromptBaseAction {
     constructor() {
@@ -86,7 +88,7 @@ class RunSelectedPromptAction extends Action2 {
     constructor() {
         super({
             id: RUN_SELECTED_PROMPT_ACTION_ID,
-            title: ( localize2(4536, "Run Prompt...")),
+            title: ( localize2(5203, "Run Prompt...")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
@@ -104,7 +106,7 @@ class RunSelectedPromptAction extends Action2 {
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            4537,
+            5204,
             'Select the prompt file to run (hold {0}-key to use in new chat)',
             UILabelProvider.modifierLabels[OS].ctrlKey
         ));
@@ -113,29 +115,32 @@ class RunSelectedPromptAction extends Action2 {
             return;
         }
         const { promptFile, keyMods } = result;
-        const runPromptOptions = {
-            inNewChat: keyMods.ctrlCmd,
-            viewsService,
-            commandService,
-        };
-        const { widget } = await runPromptFile(promptFile, runPromptOptions);
-        widget.focusInput();
+        if (keyMods.ctrlCmd === true) {
+            await commandService.executeCommand(ACTION_ID_NEW_CHAT);
+        }
+        const widget = await showChatView(viewsService);
+        if (widget) {
+            widget.setInput(`/${getPromptCommandName(promptFile.path)}`);
+            await widget.acceptInput();
+            widget.focusInput();
+        }
     }
 }
 class ManagePromptFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_PROMPTS_ACTION_ID,
-            title: ( localize2(4538, "Configure Prompt Files")),
+            title: ( localize2(5205, "Configure Prompt Files...")),
+            shortTitle: ( localize2(5206, "Prompt Files")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
             menu: {
-                id: MenuId.ViewTitle,
-                when: ( ContextKeyExpr.equals('view', ChatViewId)),
+                id: CHAT_CONFIG_MENU_ID,
+                when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ( ContextKeyExpr.equals('view', ChatViewId)))),
                 order: 10,
-                group: '2_manage'
+                group: '0_level'
             },
         });
     }
@@ -143,23 +148,23 @@ class ManagePromptFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(4539, 'Select the prompt file to open'));
+        const placeholder = ( localize(5207, 'Select the prompt file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.prompt, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
         }
     }
 }
-const getActivePromptFileUri = (accessor) => {
+function getActivePromptFileUri(accessor) {
     const codeEditorService = accessor.get(ICodeEditorService);
     const model = codeEditorService.getActiveCodeEditor()?.getModel();
     if (model?.getLanguageId() === PROMPT_LANGUAGE_ID) {
         return model.uri;
     }
     return undefined;
-};
+}
 const RUN_CURRENT_PROMPT_IN_NEW_CHAT_ACTION_ID = 'workbench.action.chat.run-in-new-chat.prompt.current';
-const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(4540, "Run Prompt In New Chat"));
+const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(5208, "Run Prompt In New Chat"));
 const RUN_IN_NEW_CHAT_ACTION_ICON = Codicon.play;
 class RunCurrentPromptInNewChatAction extends RunPromptBaseAction {
     constructor() {
@@ -179,11 +184,11 @@ class RunCurrentPromptInNewChatAction extends RunPromptBaseAction {
         return await super.execute(resource, true, accessor);
     }
 }
-const registerRunPromptActions = () => {
+function registerRunPromptActions() {
     registerAction2(RunCurrentPromptInNewChatAction);
     registerAction2(RunCurrentPromptAction);
     registerAction2(RunSelectedPromptAction);
     registerAction2(ManagePromptFilesAction);
-};
+}
 
-export { getActivePromptFileUri, registerRunPromptActions };
+export { registerRunPromptActions };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveToPromptAction.d.ts

@@ -0,0 +1,9 @@
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IChatWidget } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat";
+export declare const SAVE_TO_PROMPT_SLASH_COMMAND_NAME = "save";
+interface ISaveToPromptActionOptions {
+    chat: IChatWidget;
+}
+export declare function runSaveToPromptAction(options: ISaveToPromptActionOptions, commandService: ICommandService): Promise<any>;
+export declare function registerSaveToPromptActions(): void;
+export {};

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/chatSaveToPromptAction.js → promptSyntax/saveToPromptAction.js}

@@ -1,16 +1,16 @@
 
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
+import { PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { chatSubcommandLeader } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 const SAVE_TO_PROMPT_ACTION_ID = 'workbench.action.chat.save-to-prompt';
 const SAVE_TO_PROMPT_SLASH_COMMAND_NAME = 'save';
@@ -18,7 +18,7 @@ class SaveToPromptAction extends Action2 {
     constructor() {
         super({
             id: SAVE_TO_PROMPT_ACTION_ID,
-            title: ( localize2(4541, "Save chat session to a prompt file")),
+            title: ( localize2(5209, "Save chat session to a prompt file")),
             f1: false,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
@@ -72,7 +72,7 @@ class SaveToPromptAction extends Action2 {
         return editor;
     }
 }
-const isSaveToPromptSlashCommand = (message) => {
+function isSaveToPromptSlashCommand(message) {
     const { parts } = message;
     if (parts.length < 1) {
         return false;
@@ -85,19 +85,19 @@ const isSaveToPromptSlashCommand = (message) => {
         return false;
     }
     return true;
-};
-const renderResponse = (response) => {
+}
+function renderResponse(response) {
     const delimiter = (response.startsWith('```'))
         ? '\n>'
         : ' ';
     const quotedResponse = response.replaceAll('\n', '\n> ');
     return `> Copilot:${delimiter}${quotedResponse}`;
-};
-const renderTurn = (turn) => {
+}
+function renderTurn(turn) {
     const { request, response } = turn;
     return `\n${request}\n\n${renderResponse(response)}`;
-};
-const renderPrompt = (turns) => {
+}
+function renderPrompt(turns) {
     const content = [];
     const allTools = ( new Set());
     for (const turn of turns) {
@@ -113,14 +113,14 @@ const renderPrompt = (turns) => {
     result.push(content.join('\n'));
     result.push('');
     return result.join('\n');
-};
-const renderTools = (tools) => {
+}
+function renderTools(tools) {
     const toolStrings = ( [...tools].map((tool) => {
         return `'${tool}'`;
     }));
     return `tools: [${toolStrings.join(', ')}]`;
-};
-const renderHeader = (tools) => {
+}
+function renderHeader(tools) {
     if (tools.size === 0) {
         return '';
     }
@@ -129,12 +129,12 @@ const renderHeader = (tools) => {
         renderTools(tools),
         '---',
     ].join('\n');
-};
-const runSaveToPromptAction = async (options, commandService) => {
-    return await commandService.executeCommand(SAVE_TO_PROMPT_ACTION_ID, options);
-};
-const registerSaveToPromptActions = () => {
+}
+function runSaveToPromptAction(options, commandService) {
+    return commandService.executeCommand(SAVE_TO_PROMPT_ACTION_ID, options);
+}
+function registerSaveToPromptActions() {
     registerAction2(SaveToPromptAction);
-};
+}
 
 export { SAVE_TO_PROMPT_SLASH_COMMAND_NAME, registerSaveToPromptActions, runSaveToPromptAction };

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.js

@@ -10,7 +10,7 @@ import { isFalsyOrWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isObject, assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -18,18 +18,18 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { getAllCodicons, Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { isValidBasename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { parse } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/base/common/jsonc';
+import { parse } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/base/common/jsonc';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { ChatViewId } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5079, "Empty tool set")),
+            label: ( localize(5210, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5080, 'User tool sets configuration')),
+    description: ( localize(5211, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5081,
+                    5212,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: 'array',
@@ -69,7 +69,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    5082,
+                    5213,
                     "Icon to use for this tool set in the UI. Uses the `\\$(name)`-syntax, like `\\$(zap)`"
                 )),
                 type: 'string',
@@ -77,7 +77,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`),
             },
             description: {
-                description: ( localize(5083, "A short description of this tool set.")),
+                description: ( localize(5214, "A short description of this tool set.")),
                 type: 'string'
             },
         },
@@ -164,7 +164,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(5084, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5215, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -192,7 +192,6 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             store.add(toDisposable(() => cts.dispose(true)));
             const entries = await getFilesInFolder(uri);
             if (cts.token.isCancellationRequested) {
-                store.clear();
                 return;
             }
             for (const entry of entries) {
@@ -211,8 +210,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
                     continue;
                 }
                 if (cts.token.isCancellationRequested) {
-                    store.dispose();
-                    break;
+                    return;
                 }
                 for (const [name, value] of data.entries) {
                     const tools = [];
@@ -259,15 +257,16 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(5085, 'Configure Tool Sets')),
+            title: ( localize2(5216, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5217, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
             menu: {
-                id: MenuId.ViewTitle,
+                id: CHAT_CONFIG_MENU_ID,
                 when: ( ContextKeyExpr.equals('view', ChatViewId)),
                 order: 11,
-                group: '2_manage'
+                group: '0_level'
             },
         });
     }
@@ -280,7 +279,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(5086, 'Create new tool sets file...')),
+            label: ( localize(5218, 'Create new tool sets file...')),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -297,7 +296,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(5087, 'Select a tool set to configure')),
+            placeHolder: ( localize(5219, 'Select a tool set to configure')),
         });
         if (!pick) {
             return;
@@ -305,13 +304,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(5088, "Type tool sets file name")),
+                placeHolder: ( localize(5220, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5089, "Invalid file name");
+                        return localize(5221, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5090, "'{0}' is not a valid file name", input);
+                        return localize(5222, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -13,7 +13,7 @@ import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-c465110a-57
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5092, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5224, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -21,22 +21,22 @@ const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint
             properties: {
                 icon: {
                     type: 'string',
-                    description: ( localize(5093, 'The icon for the welcome message.')),
+                    description: ( localize(5225, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(5094, 'The title of the welcome message.')),
+                    description: ( localize(5226, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        5095,
+                        5227,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(5096, 'Condition when the welcome message is shown.')),
+                    description: ( localize(5228, 'Condition when the welcome message is shown.')),
                 }
             }
         },

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.js

@@ -27,7 +27,7 @@ class ChatToolInvocation {
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
         this.progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5161, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5297, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;

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

@@ -6,7 +6,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatResponseResource } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 

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

@@ -11,8 +11,8 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";

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

@@ -25,14 +25,15 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, isImageVariableEntry, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { ChatSessionStore } from './chatSessionStore.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
-import { ChatConfiguration, ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
@@ -280,7 +281,7 @@ let ChatService = class ChatService extends Disposable {
             const liveSessionItems = ( Array.from(( this._sessionModels.values()))
                 .filter(session => !session.isImported)
                 .map(session => {
-                const title = session.title || ( localize(5162, "New Chat"));
+                const title = session.title || ( localize(5298, "New Chat"));
                 return {
                     sessionId: session.sessionId,
                     title,
@@ -314,7 +315,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(5162, "New Chat"));
+            const title = session.title || ( localize(5298, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -459,7 +460,7 @@ let ChatService = class ChatService extends Disposable {
                     request.response?.finalizeUndoState();
                 }
                 else {
-                    this.removeRequest(sessionId, request.id);
+                    await this.removeRequest(sessionId, request.id);
                 }
             }
         }
@@ -595,11 +596,10 @@ let ChatService = class ChatService extends Disposable {
                             userSelectedModelId: options?.userSelectedModelId,
                             userSelectedTools: options?.userSelectedTools,
                             modeInstructions: options?.modeInstructions,
-                            toolSelectionIsExclusive: options?.toolSelectionIsExclusive,
                             editedFileEvents: request.editedFileEvents
                         };
                     };
-                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && options?.mode !== ChatMode.Agent && options?.mode !== ChatMode.Edit) {
+                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && options?.mode !== ChatModeKind.Agent && options?.mode !== ChatModeKind.Edit) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
                         const chatAgentRequest = prepareChatAgentRequest(defaultAgent, undefined, enableCommandDetection, undefined, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
@@ -654,7 +654,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(5163, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5299, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -696,6 +696,7 @@ let ChatService = class ChatService extends Disposable {
                 }
             }
             catch (err) {
+                this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 const result = 'error';
                 this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
                     timeToFirstProgress: undefined,
@@ -711,10 +712,9 @@ let ChatService = class ChatService extends Disposable {
                     numCodeBlocks: 0,
                     enableCommandDetection,
                     isParticipantDetected: !!detectedAgent,
-                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
+                    attachmentKinds: request ? this.attachmentKindsForTelemetry(request.variableData) : [],
                     model: this.resolveModelId(options?.userSelectedModelId)
                 });
-                this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 if (request) {
                     const rawResult = { errorDetails: { message: err.message } };
                     model.setResponse(request, rawResult);
@@ -757,7 +757,7 @@ let ChatService = class ChatService extends Disposable {
         return attachedContextVariables;
     }
     async checkAgentAllowed(agent) {
-        if (agent.modes.includes(ChatMode.Agent)) {
+        if (agent.modes.includes(ChatModeKind.Agent)) {
             const enabled = await this.experimentService.getTreatment('chatAgentEnabled');
             if (enabled === false) {
                 throw ( new Error('Agent is currently disabled'));