@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -1,8 +1,7 @@
 import { IChatWidget } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-import { IChatContextPickerItem, IChatContextPicker } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
-import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IChatContextPickerItem, IChatContextPicker } from "@codingame/monaco-vscode-51e7513d-a395-525d-b226-639aa8c6cc2d-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 /**
  * Options for the {@link AttachInstructionsAction} action.
@@ -34,13 +33,12 @@ export interface IAttachInstructionsActionOptions {
 export declare function registerAttachPromptActions(): void;
 export declare class ChatInstructionsPickerPick implements IChatContextPickerItem {
     private readonly promptsService;
-    private readonly labelService;
     private readonly configurationService;
     readonly type = "pickerPick";
     readonly label: string;
     readonly icon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
     readonly commandId = "workbench.action.chat.attach.instructions";
-    constructor(promptsService: IPromptsService, labelService: ILabelService, configurationService: IConfigurationService);
+    constructor(promptsService: IPromptsService, configurationService: IConfigurationService);
     isEnabled(widget: IChatWidget): Promise<boolean> | boolean;
     asPicker(): IChatContextPicker;
 }

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

@@ -16,8 +16,6 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { getCleanPromptName } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -32,7 +30,7 @@ class AttachInstructionsAction extends Action2 {
     constructor() {
         super({
             id: ATTACH_INSTRUCTIONS_ACTION_ID,
-            title: ( localize2(5367, "Attach Instructions...")),
+            title: ( localize2(5427, "Attach Instructions...")),
             f1: false,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
@@ -66,7 +64,7 @@ class AttachInstructionsAction extends Action2 {
             widget.focusInput();
             return;
         }
-        const placeholder = ( localize(5368, 'Select instructions files to attach'));
+        const placeholder = ( localize(5428, 'Select instructions files to attach'));
         const result = await pickers.selectPromptFile({ resource, placeholder, type: PromptsType.instructions });
         if (result !== undefined) {
             widget.attachmentModel.addContext(toPromptFileVariableEntry(result.promptFile, PromptFileVariableKind.Instruction));
@@ -78,8 +76,8 @@ class ManageInstructionsFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_INSTRUCTIONS_ACTION_ID,
-            title: ( localize2(5369, "Configure Instructions...")),
-            shortTitle: ( localize2(5370, "Instructions")),
+            title: ( localize2(5429, "Configure Instructions...")),
+            shortTitle: ( localize2(5430, "Instructions")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
@@ -96,7 +94,7 @@ class ManageInstructionsFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(5371, 'Select the instructions file to open'));
+        const placeholder = ( localize(5431, 'Select the instructions file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.instructions, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -127,12 +125,11 @@ function registerAttachPromptActions() {
     registerAction2(ManageInstructionsFilesAction);
 }
 let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
-    constructor(promptsService, labelService, configurationService) {
+    constructor(promptsService, configurationService) {
         this.promptsService = promptsService;
-        this.labelService = labelService;
         this.configurationService = configurationService;
         this.type = 'pickerPick';
-        this.label = ( localize(5372, 'Instructions...'));
+        this.label = ( localize(5432, 'Instructions...'));
         this.icon = Codicon.bookmark;
         this.commandId = ATTACH_INSTRUCTIONS_ACTION_ID;
     }
@@ -144,30 +141,28 @@ let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
             const result = [];
             value = value.slice(0).sort((a, b) => compare(a.storage, b.storage));
             let storageType;
-            for (const { uri, storage } of value) {
-                if (storageType !== storage) {
-                    storageType = storage;
+            for (const promptsPath of value) {
+                if (storageType !== promptsPath.storage) {
+                    storageType = promptsPath.storage;
                     result.push({
                         type: 'separator',
-                        label: storage === 'user'
-                            ? ( localize(5373, 'User data folder'))
-                            : this.labelService.getUriLabel(dirname(uri), { relative: true })
+                        label: this.promptsService.getPromptLocationLabel(promptsPath)
                     });
                 }
                 result.push({
-                    label: getCleanPromptName(uri),
+                    label: promptsPath.name ?? getCleanPromptName(promptsPath.uri),
                     asAttachment: () => {
-                        return toPromptFileVariableEntry(uri, PromptFileVariableKind.Instruction);
+                        return toPromptFileVariableEntry(promptsPath.uri, PromptFileVariableKind.Instruction);
                     }
                 });
             }
             return result;
         });
         return {
-            placeholder: ( localize(5374, 'Select instructions files to attach')),
+            placeholder: ( localize(5433, 'Select instructions files to attach')),
             picks,
             configure: {
-                label: ( localize(5375, 'Configure Instructions...')),
+                label: ( localize(5434, 'Configure Instructions...')),
                 commandId: CONFIGURE_INSTRUCTIONS_ACTION_ID
             }
         };
@@ -175,8 +170,7 @@ let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
 };
 ChatInstructionsPickerPick = ( __decorate([
     ( __param(0, IPromptsService)),
-    ( __param(1, ILabelService)),
-    ( __param(2, IConfigurationService))
+    ( __param(1, IConfigurationService))
 ], ChatInstructionsPickerPick));
 
 export { ChatInstructionsPickerPick, registerAttachPromptActions };

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

@@ -17,7 +17,7 @@ class ConfigModeActionImpl extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(5376, 'Select the chat mode file to open'));
+        const placeholder = ( localize(5435, 'Select the chat mode file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.mode, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -29,7 +29,7 @@ class PickerConfigModeAction extends ConfigModeActionImpl {
     constructor() {
         super({
             id: PICKER_CONFIGURE_MODES_ACTION_ID,
-            title: ( localize2(5377, "Configure Modes...")),
+            title: ( localize2(5436, "Configure Modes...")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -43,8 +43,8 @@ class ManageModeAction extends ConfigModeActionImpl {
     constructor() {
         super({
             id: CONFIGURE_MODES_ACTION_ID,
-            title: ( localize2(5378, "Configure Chat Modes...")),
-            shortTitle: ( localize(5379, "Modes")),
+            title: ( localize2(5437, "Configure Chat Modes...")),
+            shortTitle: ( localize(5438, "Modes")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),

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

@@ -85,11 +85,11 @@ class AbstractNewPromptFileAction extends Action2 {
             return;
         }
         notificationService.prompt(Severity.Info, ( localize(
-            5380,
+            5439,
             "Do you want to backup and sync your user prompt, instruction and mode files with Setting Sync?'"
         )), [
             {
-                label: ( localize(5381, "Enable")),
+                label: ( localize(5440, "Enable")),
                 run: () => {
                     commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)
                         .catch((error) => {
@@ -98,7 +98,7 @@ class AbstractNewPromptFileAction extends Action2 {
                 },
             },
             {
-                label: ( localize(5382, "Learn More")),
+                label: ( localize(5441, "Learn More")),
                 run: () => {
                     openerService.open(( URI.parse('https://aka.ms/vscode-settings-sync-help')));
                 },
@@ -146,24 +146,24 @@ const NEW_INSTRUCTIONS_COMMAND_ID = 'workbench.command.new.instructions';
 const NEW_MODE_COMMAND_ID = 'workbench.command.new.mode';
 class NewPromptFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_PROMPT_COMMAND_ID, ( localize(5383, "New Prompt File...")), PromptsType.prompt);
+        super(NEW_PROMPT_COMMAND_ID, ( localize(5442, "New Prompt File...")), PromptsType.prompt);
     }
 }
 class NewInstructionsFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5384, "New Instructions File...")), PromptsType.instructions);
+        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5443, "New Instructions File...")), PromptsType.instructions);
     }
 }
 class NewModeFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_MODE_COMMAND_ID, ( localize(5385, "New Mode File...")), PromptsType.mode);
+        super(NEW_MODE_COMMAND_ID, ( localize(5444, "New Mode File...")), PromptsType.mode);
     }
 }
 class NewUntitledPromptFileAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.command.new.untitled.prompt',
-            title: ( localize2(5386, "New Untitled Prompt File")),
+            title: ( localize2(5445, "New Untitled Prompt File")),
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,

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

@@ -25,20 +25,20 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
         const fileName = sanitizeInput(value);
         if (!fileName) {
             return {
-                content: ( localize(5387, "Please enter a name.")),
+                content: ( localize(5446, "Please enter a name.")),
                 severity: Severity.Warning
             };
         }
         if (!isValidBasename(fileName)) {
             return {
-                content: ( localize(5388, "The name contains invalid characters.")),
+                content: ( localize(5447, "The name contains invalid characters.")),
                 severity: Severity.Error
             };
         }
         const fileUri = URI.joinPath(selectedFolder, fileName);
         if (await fileService.exists(fileUri)) {
             return {
-                content: ( localize(5389, "A file for the given name already exists.")),
+                content: ( localize(5448, "A file for the given name already exists.")),
                 severity: Severity.Error
             };
         }
@@ -54,11 +54,11 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
 function getPlaceholderStringForNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5390, "Enter the name of the instructions file");
+            return localize(5449, "Enter the name of the instructions file");
         case PromptsType.prompt:
-            return localize(5391, "Enter the name of the prompt file");
+            return localize(5450, "Enter the name of the prompt file");
         case PromptsType.mode:
-            return localize(5392, "Enter the name of the custom chat mode file");
+            return localize(5451, "Enter the name of the custom chat mode file");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -66,11 +66,11 @@ function getPlaceholderStringForNew(type) {
 function getPlaceholderStringForRename(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5393, "Enter a new name of the instructions file");
+            return localize(5452, "Enter a new name of the instructions file");
         case PromptsType.prompt:
-            return localize(5394, "Enter a new name of the prompt file");
+            return localize(5453, "Enter a new name of the prompt file");
         case PromptsType.mode:
-            return localize(5395, "Enter a new name of the custom chat mode file");
+            return localize(5454, "Enter a new name of the custom chat mode file");
         default:
             throw ( new Error('Unknown prompt type'));
     }

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

@@ -1,7 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { PromptsType } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { IPromptPath } from "../../../common/promptSyntax/service/promptsService.js";
 /**
  * Asks the user for a specific prompt folder, if multiple folders provided.
  */

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

@@ -7,6 +7,7 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { PromptsType, PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 
 async function askForPromptSourceFolder(accessor, type, existingFolder, isMove = false) {
@@ -26,11 +27,11 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
     };
     const foldersList = ( folders.map(folder => {
         const uri = folder.uri;
-        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5396, "Current Location")) : undefined;
-        if (folder.storage === 'user') {
+        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5455, "Current Location")) : undefined;
+        if (folder.storage !== PromptsStorage.local) {
             return {
                 type: 'item',
-                label: ( localize(5397, "User Data Folder")),
+                label: promptsService.getPromptLocationLabel(folder),
                 detail,
                 tooltip: labelService.getUriLabel(uri),
                 folder
@@ -50,7 +51,7 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
         }
         return {
             type: 'item',
-            label: ( localize(5398, "Current Workspace")),
+            label: ( localize(5456, "Current Workspace")),
             detail,
             tooltip: labelService.getUriLabel(uri),
             folder,
@@ -65,11 +66,11 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
 function getPlaceholderStringforNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5399, "Select a location to create the instructions file in...");
+            return localize(5457, "Select a location to create the instructions file in...");
         case PromptsType.prompt:
-            return localize(5400, "Select a location to create the prompt file in...");
+            return localize(5458, "Select a location to create the prompt file in...");
         case PromptsType.mode:
-            return localize(5401, "Select a location to create the mode file in...");
+            return localize(5459, "Select a location to create the mode file in...");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -78,22 +79,22 @@ function getPlaceholderStringforMove(type, isMove) {
     if (isMove) {
         switch (type) {
             case PromptsType.instructions:
-                return localize(5402, "Select a location to move the instructions file to...");
+                return localize(5460, "Select a location to move the instructions file to...");
             case PromptsType.prompt:
-                return localize(5403, "Select a location to move the prompt file to...");
+                return localize(5461, "Select a location to move the prompt file to...");
             case PromptsType.mode:
-                return localize(5404, "Select a location to move the mode file to...");
+                return localize(5462, "Select a location to move the mode file to...");
             default:
                 throw ( new Error('Unknown prompt type'));
         }
     }
     switch (type) {
         case PromptsType.instructions:
-            return localize(5405, "Select a location to copy the instructions file to...");
+            return localize(5463, "Select a location to copy the instructions file to...");
         case PromptsType.prompt:
-            return localize(5406, "Select a location to copy the prompt file to...");
+            return localize(5464, "Select a location to copy the prompt file to...");
         case PromptsType.mode:
-            return localize(5407, "Select a location to copy the mode file to...");
+            return localize(5465, "Select a location to copy the mode file to...");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -119,11 +120,11 @@ async function showNoFoldersDialog(accessor, type) {
 function getLearnLabel(type) {
     switch (type) {
         case PromptsType.prompt:
-            return localize(5408, 'Learn how to configure reusable prompts');
+            return localize(5466, 'Learn how to configure reusable prompts');
         case PromptsType.instructions:
-            return localize(5409, 'Learn how to configure reusable instructions');
+            return localize(5467, 'Learn how to configure reusable instructions');
         case PromptsType.mode:
-            return localize(5410, 'Learn how to configure custom chat modes');
+            return localize(5468, 'Learn how to configure custom chat modes');
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -131,11 +132,11 @@ function getLearnLabel(type) {
 function getMissingSourceFolderString(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5411, 'No instruction source folders found.');
+            return localize(5469, 'No instruction source folders found.');
         case PromptsType.prompt:
-            return localize(5412, 'No prompt source folders found.');
+            return localize(5470, 'No prompt source folders found.');
         case PromptsType.mode:
-            return localize(5413, 'No custom chat mode source folders found.');
+            return localize(5471, 'No custom chat mode source folders found.');
         default:
             throw ( new Error('Unknown prompt type'));
     }

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

@@ -1,7 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 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 { 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";
@@ -9,6 +8,7 @@ import { PromptsType } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02
 import { IKeyMods } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 /**
  * Options for the {@link askToSelectInstructions} function.
  */
@@ -41,7 +41,6 @@ export interface ISelectPromptResult {
     readonly keyMods: IKeyMods;
 }
 export declare class PromptFilePickers {
-    private readonly _labelService;
     private readonly _quickInputService;
     private readonly _openerService;
     private readonly _fileService;
@@ -49,7 +48,8 @@ export declare class PromptFilePickers {
     private readonly _commandService;
     private readonly _instaService;
     private readonly _promptsService;
-    constructor(_labelService: ILabelService, _quickInputService: IQuickInputService, _openerService: IOpenerService, _fileService: IFileService, _dialogService: IDialogService, _commandService: ICommandService, _instaService: IInstantiationService, _promptsService: IPromptsService);
+    private readonly _labelService;
+    constructor(_quickInputService: IQuickInputService, _openerService: IOpenerService, _fileService: IFileService, _dialogService: IDialogService, _commandService: ICommandService, _instaService: IInstantiationService, _promptsService: IPromptsService, _labelService: ILabelService);
     /**
      * Shows the prompt file selection dialog to the user that allows to run a prompt file(s).
      *