@codingame/monaco-vscode-xterm-addons-common 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.js

@@ -13,8 +13,8 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { PromptsType, AGENT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID } from '../newPromptFileActions.js';
+import { PromptsType, SKILL_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_SKILL_COMMAND_ID } from '../newPromptFileActions.js';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { askForPromptFileName } from './askForPromptName.js';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -23,96 +23,126 @@ import { askForPromptSourceFolder } from './askForPromptSourceFolder.js';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { PromptFileRewriter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
+import { isOrganizationPromptFile } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils';
 
 function newHelpButton(type) {
     const iconClass = ThemeIcon.asClassName(Codicon.question);
     switch (type) {
-        case PromptsType.prompt:
-            return {
-                tooltip: ( localize(5496, "Show help on prompt files")),
-                helpURI: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
-                iconClass
-            };
-        case PromptsType.instructions:
-            return {
-                tooltip: ( localize(5497, "Show help on instruction files")),
-                helpURI: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
-                iconClass
-            };
-        case PromptsType.agent:
-            return {
-                tooltip: ( localize(5498, "Show help on custom agent files")),
-                helpURI: ( URI.parse(AGENT_DOCUMENTATION_URL)),
-                iconClass
-            };
+    case PromptsType.prompt:
+        return {
+            tooltip: ( localize(5708, "Show help on prompt files")),
+            helpURI: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
+            iconClass
+        };
+    case PromptsType.instructions:
+        return {
+            tooltip: ( localize(5709, "Show help on instruction files")),
+            helpURI: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
+            iconClass
+        };
+    case PromptsType.agent:
+        return {
+            tooltip: ( localize(5710, "Show help on custom agent files")),
+            helpURI: ( URI.parse(AGENT_DOCUMENTATION_URL)),
+            iconClass
+        };
+    case PromptsType.skill:
+        return {
+            tooltip: ( localize(5711, "Show help on skill files")),
+            helpURI: ( URI.parse(SKILL_DOCUMENTATION_URL)),
+            iconClass
+        };
     }
 }
 function isHelpButton(button) {
     return button.helpURI !== undefined;
 }
 function isPromptFileItem(item) {
-    return item.type === 'item' && !!item.promptFileUri;
+    return item.type === "item" && !!item.promptFileUri;
+}
+function isExtensionPromptPath(prompt) {
+    return prompt.storage === PromptsStorage.extension && !!prompt.extension;
 }
 const NEW_PROMPT_FILE_OPTION = {
-    type: 'item',
-    label: `$(plus) ${( localize(5499, 'New prompt file...'))}`,
+    type: "item",
+    label: `$(plus) ${( localize(5712, "New prompt file..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.prompt)],
-    commandId: NEW_PROMPT_COMMAND_ID,
+    commandId: NEW_PROMPT_COMMAND_ID
 };
 const NEW_INSTRUCTIONS_FILE_OPTION = {
-    type: 'item',
-    label: `$(plus) ${( localize(5500, 'New instruction file...'))}`,
+    type: "item",
+    label: `$(plus) ${( localize(5713, "New instruction file..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
-    commandId: NEW_INSTRUCTIONS_COMMAND_ID,
+    commandId: NEW_INSTRUCTIONS_COMMAND_ID
 };
 const UPDATE_INSTRUCTIONS_OPTION = {
-    type: 'item',
-    label: `$(refresh) ${( localize(5501, 'Generate agent instructions...'))}`,
+    type: "item",
+    label: `$(refresh) ${( localize(5714, "Generate agent instructions..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
-    commandId: 'workbench.action.chat.generateInstructions',
+    commandId: "workbench.action.chat.generateInstructions"
 };
 const NEW_AGENT_FILE_OPTION = {
-    type: 'item',
-    label: `$(plus) ${( localize(5502, 'Create new custom agent...'))}`,
+    type: "item",
+    label: `$(plus) ${( localize(5715, "Create new custom agent..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.agent)],
-    commandId: NEW_AGENT_COMMAND_ID,
+    commandId: NEW_AGENT_COMMAND_ID
+};
+const NEW_SKILL_FILE_OPTION = {
+    type: "item",
+    label: `$(plus) ${( localize(5716, "New skill..."))}`,
+    pickable: false,
+    alwaysShow: true,
+    buttons: [newHelpButton(PromptsType.skill)],
+    commandId: NEW_SKILL_COMMAND_ID
 };
 const EDIT_BUTTON = {
-    tooltip: ( localize(5503, "Open in Editor")),
-    iconClass: ThemeIcon.asClassName(Codicon.fileCode),
+    tooltip: ( localize(5717, "Open in Editor")),
+    iconClass: ThemeIcon.asClassName(Codicon.fileCode)
 };
 const DELETE_BUTTON = {
-    tooltip: ( localize(5504, "Delete")),
-    iconClass: ThemeIcon.asClassName(Codicon.trash),
+    tooltip: ( localize(5718, "Delete")),
+    iconClass: ThemeIcon.asClassName(Codicon.trash)
 };
 const RENAME_BUTTON = {
-    tooltip: ( localize(5505, "Move and/or Rename")),
-    iconClass: ThemeIcon.asClassName(Codicon.replace),
+    tooltip: ( localize(5719, "Move and/or Rename")),
+    iconClass: ThemeIcon.asClassName(Codicon.replace)
 };
 const COPY_BUTTON = {
-    tooltip: ( localize(5506, "Make a Copy")),
-    iconClass: ThemeIcon.asClassName(Codicon.copy),
+    tooltip: ( localize(5720, "Make a Copy")),
+    iconClass: ThemeIcon.asClassName(Codicon.copy)
 };
 const MAKE_VISIBLE_BUTTON = {
-    tooltip: ( localize(5507, "Hidden from chat view agent picker. Click to show.")),
+    tooltip: ( localize(5721, "Hidden from chat view agent picker. Click to show.")),
     iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
-    alwaysVisible: true,
+    alwaysVisible: true
 };
 const MAKE_INVISIBLE_BUTTON = {
-    tooltip: ( localize(5508, "Hide from agent picker")),
-    iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
+    tooltip: ( localize(5722, "Hide from agent picker")),
+    iconClass: ThemeIcon.asClassName(Codicon.eyeClosed)
 };
 let PromptFilePickers = class PromptFilePickers {
-    constructor(_quickInputService, _openerService, _fileService, _dialogService, _commandService, _instaService, _promptsService, _labelService, _configurationService) {
+    constructor(
+        _quickInputService,
+        _openerService,
+        _fileService,
+        _dialogService,
+        _commandService,
+        _instaService,
+        _promptsService,
+        _labelService,
+        _configurationService,
+        _productService
+    ) {
         this._quickInputService = _quickInputService;
         this._openerService = _openerService;
         this._fileService = _fileService;
@@ -122,23 +152,27 @@ let PromptFilePickers = class PromptFilePickers {
         this._promptsService = _promptsService;
         this._labelService = _labelService;
         this._configurationService = _configurationService;
+        this._productService = _productService;
     }
     async selectPromptFile(options) {
         const cts = ( new CancellationTokenSource());
-        const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
+        const quickPick = this._quickInputService.createQuickPick({
+            useSeparators: true
+        });
         quickPick.busy = true;
-        quickPick.placeholder = ( localize(5509, 'Searching file system...'));
+        quickPick.placeholder = ( localize(5723, "Searching file system..."));
         try {
             const fileOptions = await this._createPromptPickItems(options, cts.token);
-            const activeItem = options.resource && fileOptions.find(f => f.type === 'item' && extUri.isEqual(f.promptFileUri, options.resource));
+            const activeItem = options.resource && fileOptions.find(
+                f => f.type === "item" && extUri.isEqual(f.promptFileUri, options.resource)
+            );
             if (activeItem) {
                 quickPick.activeItems = [activeItem];
             }
             quickPick.placeholder = options.placeholder;
             quickPick.matchOnDescription = true;
             quickPick.items = fileOptions;
-        }
-        finally {
+        } finally {
             quickPick.busy = false;
         }
         return ( new Promise(resolve => {
@@ -154,14 +188,22 @@ let PromptFilePickers = class PromptFilePickers {
                 quickPick.activeItems = active;
             };
             disposables.add(quickPick.onDidAccept(async () => {
-                const { selectedItems } = quickPick;
-                const { keyMods } = quickPick;
+                const {
+                    selectedItems
+                } = quickPick;
+                const {
+                    keyMods
+                } = quickPick;
                 const selectedItem = selectedItems[0];
                 if (isPromptFileItem(selectedItem)) {
-                    resolve({ promptFile: selectedItem.promptFileUri, keyMods: { ...keyMods } });
+                    resolve({
+                        promptFile: selectedItem.promptFileUri,
+                        keyMods: {
+                            ...keyMods
+                        }
+                    });
                     isResolved = true;
-                }
-                else {
+                } else {
                     if (selectedItem.commandId) {
                         await this._commandService.executeCommand(selectedItem.commandId);
                         return;
@@ -169,7 +211,7 @@ let PromptFilePickers = class PromptFilePickers {
                 }
                 quickPick.hide();
             }));
-            disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
+            disposables.add(quickPick.onDidTriggerItemButton(async e => {
                 const shouldRefresh = await this._handleButtonClick(quickPick, e, options);
                 if (!isClosed && shouldRefresh) {
                     await refreshItems();
@@ -211,10 +253,14 @@ let PromptFilePickers = class PromptFilePickers {
             const disabled = this._promptsService.getDisabledPromptFiles(options.type);
             getVisibility = p => !( disabled.has(p.uri));
         }
+        const sortByLabel = items => items.sort((a, b) => a.label.localeCompare(b.label));
         const locals = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.local, token);
         if (locals.length) {
-            result.push({ type: 'separator', label: ( localize(5510, "Workspace")) });
-            result.push(...(await Promise.all(( locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token))))));
+            result.push({
+                type: "separator",
+                label: ( localize(5724, "Workspace"))
+            });
+            result.push(...sortByLabel(await Promise.all(( locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token))))));
         }
         let agentInstructionFiles = [];
         if (options.type === PromptsType.instructions) {
@@ -224,8 +270,10 @@ let PromptFilePickers = class PromptFilePickers {
                 ...(await this._promptsService.listAgentMDs(token, !!useNestedAgentMD))
             ];
             agentInstructionFiles = ( agentInstructionUris.map(uri => {
-                const folderName = this._labelService.getUriLabel(dirname(uri), { relative: true });
-                const shouldShowFolderPath = folderName?.toLowerCase() !== '.github';
+                const folderName = this._labelService.getUriLabel(dirname(uri), {
+                    relative: true
+                });
+                const shouldShowFolderPath = folderName?.toLowerCase() !== ".github";
                 return {
                     uri,
                     description: shouldShowFolderPath ? folderName : undefined,
@@ -236,12 +284,14 @@ let PromptFilePickers = class PromptFilePickers {
         }
         if (agentInstructionFiles.length) {
             const agentButtons = buttons.filter(b => b !== RENAME_BUTTON);
-            result.push({ type: 'separator', label: ( localize(5511, "Agent Instructions")) });
-            result.push(...(await Promise.all(( agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token))))));
+            result.push({
+                type: "separator",
+                label: ( localize(5725, "Agent Instructions"))
+            });
+            result.push(...sortByLabel(await Promise.all(( agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token))))));
         }
-        const exts = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token);
+        const exts = (await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token)).filter(isExtensionPromptPath);
         if (exts.length) {
-            result.push({ type: 'separator', label: ( localize(5512, "Extensions")) });
             const extButtons = [];
             if (options.optionEdit !== false) {
                 extButtons.push(EDIT_BUTTON);
@@ -249,25 +299,51 @@ let PromptFilePickers = class PromptFilePickers {
             if (options.optionCopy !== false) {
                 extButtons.push(COPY_BUTTON);
             }
-            result.push(...(await Promise.all(( exts.map(e => this._createPromptPickItem(e, extButtons, getVisibility(e), token))))));
+            const groupedExts = ( new Map());
+            for (const ext of exts) {
+                const groupLabel = this._getExtensionGroupLabel(ext);
+                if (!( groupedExts.has(groupLabel))) {
+                    groupedExts.set(groupLabel, []);
+                }
+                groupedExts.get(groupLabel).push(ext);
+            }
+            const sortedGroupedExts = Array.from(groupedExts.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+            for (const [groupLabel, groupExts] of sortedGroupedExts) {
+                result.push({
+                    type: "separator",
+                    label: groupLabel
+                });
+                result.push(...sortByLabel(await Promise.all(( groupExts.map(e => this._createPromptPickItem(e, extButtons, getVisibility(e), token))))));
+            }
         }
         const users = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.user, token);
         if (users.length) {
-            result.push({ type: 'separator', label: ( localize(5513, "User Data")) });
-            result.push(...(await Promise.all(( users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token))))));
+            result.push({
+                type: "separator",
+                label: ( localize(5726, "User Data"))
+            });
+            result.push(...sortByLabel(await Promise.all(( users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token))))));
         }
         return result;
     }
+    _getExtensionGroupLabel(extPath) {
+        if (isOrganizationPromptFile(extPath.uri, extPath.extension.identifier, this._productService)) {
+            return localize(5727, "Organization");
+        }
+        return localize(5728, "Extensions");
+    }
     _getNewItems(type) {
         switch (type) {
-            case PromptsType.prompt:
-                return [NEW_PROMPT_FILE_OPTION];
-            case PromptsType.instructions:
-                return [NEW_INSTRUCTIONS_FILE_OPTION, UPDATE_INSTRUCTIONS_OPTION];
-            case PromptsType.agent:
-                return [NEW_AGENT_FILE_OPTION];
-            default:
-                throw ( new Error(`Unknown prompt type '${type}'.`));
+        case PromptsType.prompt:
+            return [NEW_PROMPT_FILE_OPTION];
+        case PromptsType.instructions:
+            return [NEW_INSTRUCTIONS_FILE_OPTION, UPDATE_INSTRUCTIONS_OPTION];
+        case PromptsType.agent:
+            return [NEW_AGENT_FILE_OPTION];
+        case PromptsType.skill:
+            return [NEW_SKILL_FILE_OPTION];
+        default:
+            throw ( new Error(`Unknown prompt type '${type}'.`));
         }
     }
     async _createPromptPickItem(promptFile, buttons, visibility, token) {
@@ -276,34 +352,35 @@ let PromptFilePickers = class PromptFilePickers {
         const promptDescription = parsedPromptFile?.header?.description ?? promptFile.description;
         let tooltip;
         switch (promptFile.storage) {
-            case PromptsStorage.extension:
-                tooltip = promptFile.extension.displayName ?? promptFile.extension.id;
-                break;
-            case PromptsStorage.local:
-                tooltip = this._labelService.getUriLabel(dirname(promptFile.uri), { relative: true });
-                break;
-            case PromptsStorage.user:
-                tooltip = undefined;
-                break;
+        case PromptsStorage.extension:
+            tooltip = promptFile.extension.displayName ?? promptFile.extension.id;
+            break;
+        case PromptsStorage.local:
+            tooltip = this._labelService.getUriLabel(dirname(promptFile.uri), {
+                relative: true
+            });
+            break;
+        case PromptsStorage.user:
+            tooltip = undefined;
+            break;
         }
         let iconClass;
         if (visibility === false) {
             buttons = (buttons ?? []).concat(MAKE_VISIBLE_BUTTON);
-            promptName = ( localize(5514, "{0} (hidden)", promptName));
-            tooltip = ( localize(5515, "Hidden from chat view agent picker"));
-        }
-        else if (visibility === true) {
+            promptName = ( localize(5729, "{0} (hidden)", promptName));
+            tooltip = ( localize(5730, "Hidden from chat view agent picker"));
+        } else if (visibility === true) {
             buttons = (buttons ?? []).concat(MAKE_INVISIBLE_BUTTON);
         }
         return {
             id: ( promptFile.uri.toString()),
-            type: 'item',
+            type: "item",
             label: promptName,
             description: promptDescription,
             iconClass,
             tooltip,
             promptFileUri: promptFile.uri,
-            buttons,
+            buttons
         };
     }
     async keepQuickPickOpen(quickPick, work) {
@@ -311,14 +388,16 @@ let PromptFilePickers = class PromptFilePickers {
         quickPick.ignoreFocusOut = true;
         try {
             return await work();
-        }
-        finally {
+        } finally {
             quickPick.ignoreFocusOut = previousIgnoreFocusOut;
             quickPick.show();
         }
     }
     async _handleButtonClick(quickPick, context, options) {
-        const { item, button } = context;
+        const {
+            item,
+            button
+        } = context;
         if (!isPromptFileItem(item)) {
             if (isHelpButton(button)) {
                 await this._openerService.open(button.helpURI);
@@ -346,8 +425,7 @@ let PromptFilePickers = class PromptFilePickers {
                 const newFile = joinPath(newFolder.uri, newName);
                 if (isMove) {
                     await this._fileService.move(value, newFile);
-                }
-                else {
+                } else {
                     await this._fileService.copy(value, newFile);
                 }
                 await this._openerService.open(newFile);
@@ -358,8 +436,12 @@ let PromptFilePickers = class PromptFilePickers {
         if (button === DELETE_BUTTON) {
             return await this.keepQuickPickOpen(quickPick, async () => {
                 const filename = getCleanPromptName(value);
-                const message = ( localize(5516, "Are you sure you want to delete '{0}'?", filename));
-                const { confirmed } = await this._dialogService.confirm({ message });
+                const message = ( localize(5731, "Are you sure you want to delete '{0}'?", filename));
+                const {
+                    confirmed
+                } = await this._dialogService.confirm({
+                    message
+                });
                 if (!confirmed) {
                     return false;
                 }
@@ -371,8 +453,7 @@ let PromptFilePickers = class PromptFilePickers {
             const disabled = this._promptsService.getDisabledPromptFiles(options.type);
             if (button === MAKE_VISIBLE_BUTTON) {
                 disabled.delete(value);
-            }
-            else {
+            } else {
                 disabled.add(value);
             }
             this._promptsService.setDisabledPromptFiles(options.type, disabled);
@@ -382,14 +463,16 @@ let PromptFilePickers = class PromptFilePickers {
     }
     async managePromptFiles(type, placeholder) {
         const cts = ( new CancellationTokenSource());
-        const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
+        const quickPick = this._quickInputService.createQuickPick({
+            useSeparators: true
+        });
         quickPick.placeholder = placeholder;
         quickPick.canSelectMany = true;
         quickPick.matchOnDescription = true;
         quickPick.sortByLabel = false;
         quickPick.busy = true;
         const options = {
-            placeholder: '',
+            placeholder: "",
             type,
             optionNew: true,
             optionEdit: true,
@@ -401,8 +484,7 @@ let PromptFilePickers = class PromptFilePickers {
         try {
             const items = await this._createPromptPickItems(options, cts.token);
             quickPick.items = items;
-        }
-        finally {
+        } finally {
             quickPick.busy = false;
         }
         return ( new Promise(resolve => {
@@ -433,7 +515,7 @@ let PromptFilePickers = class PromptFilePickers {
                 resolve(true);
                 quickPick.hide();
             }));
-            disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
+            disposables.add(quickPick.onDidTriggerItemButton(async e => {
                 const shouldRefresh = await this._handleButtonClick(quickPick, e, options);
                 if (!isClosed && shouldRefresh) {
                     await refreshItems();
@@ -453,16 +535,6 @@ let PromptFilePickers = class PromptFilePickers {
         }));
     }
 };
-PromptFilePickers = ( __decorate([
-    ( __param(0, IQuickInputService)),
-    ( __param(1, IOpenerService)),
-    ( __param(2, IFileService)),
-    ( __param(3, IDialogService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IPromptsService)),
-    ( __param(7, ILabelService)),
-    ( __param(8, IConfigurationService))
-], PromptFilePickers));
+PromptFilePickers = ( __decorate([( __param(0, IQuickInputService)), ( __param(1, IOpenerService)), ( __param(2, IFileService)), ( __param(3, IDialogService)), ( __param(4, ICommandService)), ( __param(5, IInstantiationService)), ( __param(6, IPromptsService)), ( __param(7, ILabelService)), ( __param(8, IConfigurationService)), ( __param(9, IProductService))], PromptFilePickers));
 
 export { PromptFilePickers };