@codingame/monaco-vscode-chat-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/dialogs/askToSelectPrompt/promptFilePickers.js

@@ -2,109 +2,106 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { extUri, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { extUri, dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { UILabelProvider } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingLabels';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { getCleanPromptName } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
-import { PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { NEW_INSTRUCTIONS_COMMAND_ID, NEW_PROMPT_COMMAND_ID } from '../../../../promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
+import { PromptsType, getCleanPromptName } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, MODE_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_MODE_COMMAND_ID } from '../../../../promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { askForPromptFileName } from '../../../../promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.js';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { askForPromptSourceFolder } from '../../../../promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.js';
+import { UILabelProvider } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingLabels';
+import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 const HELP_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4508, "help")),
+    tooltip: ( localize(4542, "Help")),
     iconClass: ThemeIcon.asClassName(Codicon.question),
 }));
 const NEW_PROMPT_FILE_OPTION = ( Object.freeze({
     type: 'item',
-    label: `$(plus) ${( localize(4509, 'New prompt file...'))}`,
+    label: `$(plus) ${( localize(4543, 'New prompt file...'))}`,
     value: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
     pickable: false,
     alwaysShow: true,
     buttons: [HELP_BUTTON],
+    commandId: NEW_PROMPT_COMMAND_ID,
 }));
 const NEW_INSTRUCTIONS_FILE_OPTION = ( Object.freeze({
     type: 'item',
-    label: `$(plus) ${( localize(4510, 'Create new instruction file...'))}`,
+    label: `$(plus) ${( localize(4544, 'Create new instruction file...'))}`,
     value: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
     pickable: false,
     alwaysShow: true,
     buttons: [HELP_BUTTON],
+    commandId: NEW_INSTRUCTIONS_COMMAND_ID,
+}));
+const NEW_MODE_FILE_OPTION = ( Object.freeze({
+    type: 'item',
+    label: `$(plus) ${( localize(4545, 'Create new custom chat mode file...'))}`,
+    value: ( URI.parse(MODE_DOCUMENTATION_URL)),
+    pickable: false,
+    alwaysShow: true,
+    buttons: [HELP_BUTTON],
+    commandId: NEW_MODE_COMMAND_ID,
 }));
 const EDIT_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4511, "edit ({0}-key + enter)", UILabelProvider.modifierLabels[OS].ctrlKey)),
+    tooltip: ( localize(4546, "Open in Editor")),
     iconClass: ThemeIcon.asClassName(Codicon.edit),
 }));
 const DELETE_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4512, "delete")),
+    tooltip: ( localize(4547, "Delete")),
     iconClass: ThemeIcon.asClassName(Codicon.trash),
 }));
+const RENAME_BUTTON = ( Object.freeze({
+    tooltip: ( localize(4548, "Rename")),
+    iconClass: ThemeIcon.asClassName(Codicon.replace),
+}));
+const COPY_BUTTON = ( Object.freeze({
+    tooltip: ( localize(
+        4549,
+        "Copy or Move (press {0})",
+        UILabelProvider.modifierLabels[OS].ctrlKey
+    )),
+    iconClass: ThemeIcon.asClassName(Codicon.copy),
+}));
 let PromptFilePickers = class PromptFilePickers {
-    constructor(_labelService, _quickInputService, _openerService, _fileService, _dialogService, _commandService) {
+    constructor(_labelService, _quickInputService, _openerService, _fileService, _dialogService, _commandService, _instaService, _promptsService) {
         this._labelService = _labelService;
         this._quickInputService = _quickInputService;
         this._openerService = _openerService;
         this._fileService = _fileService;
         this._dialogService = _dialogService;
         this._commandService = _commandService;
-    }
-    async selectInstructionsFiles(options) {
-        const fileOptions = this._createPromptPickItems(options);
-        fileOptions.splice(0, 0, NEW_INSTRUCTIONS_FILE_OPTION);
-        const activeItem = options.resource && fileOptions.find(f => extUri.isEqual(f.value, options.resource));
-        const quickPick = this._quickInputService.createQuickPick();
-        quickPick.activeItems = [activeItem ?? NEW_INSTRUCTIONS_FILE_OPTION];
-        quickPick.placeholder = options.placeholder;
-        quickPick.canAcceptInBackground = true;
-        quickPick.matchOnDescription = true;
-        quickPick.items = fileOptions;
-        return ( new Promise(resolve => {
-            const disposables = ( new DisposableStore());
-            let isResolved = false;
-            disposables.add({
-                dispose() {
-                    quickPick.dispose();
-                    if (!isResolved) {
-                        resolve(undefined);
-                        isResolved = true;
-                    }
-                },
-            });
-            disposables.add(quickPick.onDidAccept(async (event) => {
-                const { selectedItems } = quickPick;
-                if (selectedItems[0] === NEW_INSTRUCTIONS_FILE_OPTION) {
-                    await this._commandService.executeCommand(NEW_INSTRUCTIONS_COMMAND_ID);
-                    return;
-                }
-                resolve(( selectedItems.map(item => item.value)));
-                isResolved = true;
-                if (!event.inBackground) {
-                    disposables.dispose();
-                }
-            }));
-            disposables.add(quickPick.onDidTriggerItemButton(e => this._handleButtonClick(quickPick, e)));
-            disposables.add(quickPick.onDidHide(disposables.dispose.bind(disposables)));
-            quickPick.show();
-        }));
+        this._instaService = _instaService;
+        this._promptsService = _promptsService;
     }
     async selectPromptFile(options) {
-        const fileOptions = this._createPromptPickItems(options);
-        fileOptions.splice(0, 0, NEW_PROMPT_FILE_OPTION);
-        const activeItem = options.resource && fileOptions.find(f => extUri.isEqual(f.value, options.resource));
         const quickPick = this._quickInputService.createQuickPick();
-        quickPick.activeItems = [activeItem ?? NEW_PROMPT_FILE_OPTION];
-        quickPick.placeholder = options.placeholder;
-        quickPick.canAcceptInBackground = true;
-        quickPick.matchOnDescription = true;
-        quickPick.items = fileOptions;
+        quickPick.busy = true;
+        quickPick.placeholder = ( localize(4550, 'Searching file system...'));
+        try {
+            const fileOptions = await this._createPromptPickItems(options);
+            const activeItem = options.resource && fileOptions.find(f => extUri.isEqual(f.value, options.resource));
+            quickPick.activeItems = [activeItem ?? fileOptions[0]];
+            quickPick.placeholder = options.placeholder;
+            quickPick.canAcceptInBackground = true;
+            quickPick.matchOnDescription = true;
+            quickPick.items = fileOptions;
+        }
+        finally {
+            quickPick.busy = false;
+        }
         return ( new Promise(resolve => {
             const disposables = ( new DisposableStore());
             let isResolved = false;
@@ -121,8 +118,8 @@ let PromptFilePickers = class PromptFilePickers {
                 const { selectedItems } = quickPick;
                 const { keyMods } = quickPick;
                 const selectedItem = selectedItems[0];
-                if (selectedItem === NEW_PROMPT_FILE_OPTION) {
-                    await this._commandService.executeCommand(NEW_PROMPT_COMMAND_ID);
+                if (selectedItem.commandId) {
+                    await this._commandService.executeCommand(selectedItem.commandId);
                     return;
                 }
                 if (selectedItem) {
@@ -133,27 +130,41 @@ let PromptFilePickers = class PromptFilePickers {
                     disposables.dispose();
                 }
             }));
-            disposables.add(quickPick.onDidTriggerItemButton(e => this._handleButtonClick(quickPick, e)));
+            disposables.add(quickPick.onDidTriggerItemButton(e => this._handleButtonClick(quickPick, e, options)));
             disposables.add(quickPick.onDidHide(disposables.dispose.bind(disposables)));
             quickPick.show();
         }));
     }
-    _createPromptPickItems(options) {
-        const { promptFiles, resource } = options;
+    async _createPromptPickItems(options) {
+        const { resource } = options;
+        const buttons = [];
+        if (options.optionEdit !== false) {
+            buttons.push(EDIT_BUTTON);
+        }
+        if (options.optionCopy !== false) {
+            buttons.push(COPY_BUTTON);
+        }
+        if (options.optionRename !== false) {
+            buttons.push(RENAME_BUTTON);
+        }
+        if (options.optionDelete !== false) {
+            buttons.push(DELETE_BUTTON);
+        }
+        const promptFiles = await this._promptsService.listPromptFiles(options.type, CancellationToken.None);
         const fileOptions = ( promptFiles.map((promptFile) => {
-            return this._createPromptPickItem(promptFile);
+            return this._createPromptPickItem(promptFile, buttons);
         }));
         let activeItem;
-        if (resource) {
+        if (options.resource) {
             activeItem = fileOptions.find((file) => {
-                return extUri.isEqual(file.value, resource);
+                return extUri.isEqual(file.value, options.resource);
             });
             if (!activeItem) {
                 activeItem = this._createPromptPickItem({
-                    uri: resource,
+                    uri: options.resource,
                     storage: 'local',
-                    type: 'instructions',
-                });
+                    type: options.type,
+                }, buttons);
                 fileOptions.push(activeItem);
             }
             fileOptions.sort((file1, file2) => {
@@ -166,13 +177,29 @@ let PromptFilePickers = class PromptFilePickers {
                 return 0;
             });
         }
+        const newItem = options.optionNew !== false ? this._getNewItem(options.type) : undefined;
+        if (newItem) {
+            fileOptions.splice(0, 0, newItem);
+        }
         return fileOptions;
     }
-    _createPromptPickItem(promptFile) {
+    _getNewItem(type) {
+        switch (type) {
+            case PromptsType.prompt:
+                return NEW_PROMPT_FILE_OPTION;
+            case PromptsType.instructions:
+                return NEW_INSTRUCTIONS_FILE_OPTION;
+            case PromptsType.mode:
+                return NEW_MODE_FILE_OPTION;
+            default:
+                throw ( new Error(`Unknown prompt type '${type}'.`));
+        }
+    }
+    _createPromptPickItem(promptFile, buttons) {
         const { uri, storage } = promptFile;
         const fileWithoutExtension = getCleanPromptName(uri);
         const description = (storage === 'user')
-            ? ( localize(4513, 'User data folder'))
+            ? ( localize(4551, 'User data folder'))
             : this._labelService.getUriLabel(dirname(uri), { relative: true });
         const tooltip = (storage === 'user')
             ? description
@@ -184,45 +211,86 @@ let PromptFilePickers = class PromptFilePickers {
             description,
             tooltip,
             value: uri,
-            buttons: [EDIT_BUTTON, DELETE_BUTTON],
+            buttons
         };
     }
-    async _handleButtonClick(quickPick, context) {
+    async keepQuickPickOpen(quickPick, work) {
+        const previousIgnoreFocusOut = quickPick.ignoreFocusOut;
+        quickPick.ignoreFocusOut = true;
+        try {
+            await work();
+        }
+        finally {
+            quickPick.ignoreFocusOut = previousIgnoreFocusOut;
+        }
+    }
+    async _handleButtonClick(quickPick, context, options) {
         const { item, button } = context;
-        const { value } = item;
+        const { value, } = item;
         if (button === EDIT_BUTTON) {
-            return await this._openerService.open(value);
+            await this._openerService.open(value);
+            return;
+        }
+        if (button === COPY_BUTTON) {
+            const currentFolder = dirname(value);
+            const isMove = quickPick.keyMods.ctrlCmd;
+            const newFolder = await this._instaService.invokeFunction(askForPromptSourceFolder, options.type, currentFolder, isMove);
+            if (!newFolder) {
+                return;
+            }
+            const newName = await this._instaService.invokeFunction(askForPromptFileName, options.type, newFolder.uri, item.label);
+            if (!newName) {
+                return;
+            }
+            const newFile = joinPath(newFolder.uri, newName);
+            if (isMove) {
+                await this._fileService.move(value, newFile);
+            }
+            else {
+                await this._fileService.copy(value, newFile);
+            }
+            await this._openerService.open(newFile);
+            return;
+        }
+        if (button === RENAME_BUTTON) {
+            const currentFolder = dirname(value);
+            const newName = await this._instaService.invokeFunction(askForPromptFileName, options.type, currentFolder, item.label);
+            if (newName) {
+                const newFile = joinPath(currentFolder, newName);
+                await this._fileService.move(value, newFile);
+                await this._openerService.open(newFile);
+            }
+            return;
         }
         if (button === DELETE_BUTTON) {
             assert((quickPick.activeItems.length < 2), `Expected maximum one active item, got '${quickPick.activeItems.length}'.`);
             const activeItem = quickPick.activeItems[0];
             const info = await this._fileService.stat(value);
             assert(info.isDirectory === false, `'${value.fsPath}' points to a folder.`);
-            const previousIgnoreFocusOut = quickPick.ignoreFocusOut;
-            quickPick.ignoreFocusOut = true;
-            const filename = getCleanPromptName(value);
-            const { confirmed } = await this._dialogService.confirm({
-                message: ( localize(4514, "Are you sure you want to delete '{0}'?", filename)),
-            });
-            quickPick.ignoreFocusOut = previousIgnoreFocusOut;
-            if (!confirmed) {
-                return;
-            }
-            await this._fileService.del(value);
-            let removedIndex = -1;
-            quickPick.items = quickPick.items.filter((option, index) => {
-                if (option === item) {
-                    removedIndex = index;
-                    return false;
+            await this.keepQuickPickOpen(quickPick, async () => {
+                const filename = getCleanPromptName(value);
+                const { confirmed } = await this._dialogService.confirm({
+                    message: ( localize(4552, "Are you sure you want to delete '{0}'?", filename)),
+                });
+                if (!confirmed) {
+                    return;
+                }
+                await this._fileService.del(value);
+                let removedIndex = -1;
+                quickPick.items = quickPick.items.filter((option, index) => {
+                    if (option === item) {
+                        removedIndex = index;
+                        return false;
+                    }
+                    return true;
+                });
+                if (activeItem && (activeItem === item)) {
+                    assert(removedIndex >= 0, 'Removed item index must be a valid index.');
+                    const newActiveItemIndex = Math.max(removedIndex - 1, 0);
+                    const newActiveItem = quickPick.items[newActiveItemIndex];
+                    quickPick.activeItems = newActiveItem ? [newActiveItem] : [];
                 }
-                return true;
             });
-            if (activeItem && (activeItem === item)) {
-                assert(removedIndex >= 0, 'Removed item index must be a valid index.');
-                const newActiveItemIndex = Math.max(removedIndex - 1, 0);
-                const newActiveItem = quickPick.items[newActiveItemIndex];
-                quickPick.activeItems = newActiveItem ? [newActiveItem] : [];
-            }
             return;
         }
         if (button === HELP_BUTTON) {
@@ -238,7 +306,9 @@ PromptFilePickers = ( __decorate([
     ( __param(2, IOpenerService)),
     ( __param(3, IFileService)),
     ( __param(4, IDialogService)),
-    ( __param(5, ICommandService))
+    ( __param(5, ICommandService)),
+    ( __param(6, IInstantiationService)),
+    ( __param(7, IPromptsService))
 ], PromptFilePickers));
 
 export { PromptFilePickers };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/dialogs/askToSelectPrompt/utils/attachInstructions.d.ts

@@ -1,7 +1,7 @@
-import { IChatWidget } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IChatWidget } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
 export interface IAttachOptions {
     readonly widget?: IChatWidget;
     readonly inNewChat?: boolean;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/dialogs/askToSelectPrompt/utils/attachInstructions.js

@@ -1,7 +1,7 @@
 
-import { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { showChatView } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 const attachInstructionsFiles = async (files, options) => {
     const widget = await getChatWidgetObject(options);

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/dialogs/askToSelectPrompt/utils/runPrompt.d.ts

@@ -1,4 +1,4 @@
-import { IChatWidget } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatWidget } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/index.d.ts

@@ -1,2 +1 @@
-export { runAttachInstructionsAction } from "./chatAttachInstructionsAction.js";
 export declare const registerPromptActions: () => void;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/promptActions/index.js

@@ -2,12 +2,13 @@
 import { registerRunPromptActions } from './chatRunPromptAction.js';
 import { registerSaveToPromptActions } from './chatSaveToPromptAction.js';
 import { registerAttachPromptActions } from './chatAttachInstructionsAction.js';
-export { runAttachInstructionsAction } from './chatAttachInstructionsAction.js';
+import { registerChatModeActions } from './chatModeActions.js';
 
 const registerPromptActions = () => {
     registerRunPromptActions();
     registerAttachPromptActions();
     registerSaveToPromptActions();
+    registerChatModeActions();
 };
 
 export { registerPromptActions };