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

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

@@ -0,0 +1,68 @@
+
+import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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 { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { PromptFilePickers } from './pickers/promptFilePickers.js';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+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-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+
+class ConfigModeActionImpl extends Action2 {
+    async run(accessor) {
+        const openerService = accessor.get(IOpenerService);
+        const instaService = accessor.get(IInstantiationService);
+        const pickers = instaService.createInstance(PromptFilePickers);
+        const placeholder = ( localize(5140, '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);
+        }
+    }
+}
+const PICKER_CONFIGURE_MODES_ACTION_ID = 'workbench.action.chat.picker.configmode';
+class PickerConfigModeAction extends ConfigModeActionImpl {
+    constructor() {
+        super({
+            id: PICKER_CONFIGURE_MODES_ACTION_ID,
+            title: ( localize2(5141, "Configure Modes...")),
+            category: CHAT_CATEGORY,
+            f1: false,
+            menu: {
+                id: MenuId.ChatModePicker,
+            }
+        });
+    }
+}
+const CONFIGURE_MODES_ACTION_ID = 'workbench.action.chat.manage.mode';
+class ManageModeAction extends ConfigModeActionImpl {
+    constructor() {
+        super({
+            id: CONFIGURE_MODES_ACTION_ID,
+            title: ( localize2(5142, "Configure Chat Modes...")),
+            shortTitle: ( localize(5143, "Modes")),
+            icon: Codicon.bookmark,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
+            category: CHAT_CATEGORY,
+            menu: [
+                {
+                    id: CHAT_CONFIG_MENU_ID,
+                    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ( ContextKeyExpr.equals('view', ChatViewId)))),
+                    order: 12,
+                    group: '0_level'
+                }
+            ]
+        });
+    }
+}
+function registerChatModeActions() {
+    registerAction2(ManageModeAction);
+    registerAction2(PickerConfigModeAction);
+}
+
+export { registerChatModeActions };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/{contributions/createPromptCommand/createPromptCommand.d.ts → newPromptFileActions.d.ts}

@@ -1,3 +1,4 @@
 export declare const NEW_PROMPT_COMMAND_ID = "workbench.command.new.prompt";
 export declare const NEW_INSTRUCTIONS_COMMAND_ID = "workbench.command.new.instructions";
 export declare const NEW_MODE_COMMAND_ID = "workbench.command.new.mode";
+export declare function registerNewPromptFileActions(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/{contributions/createPromptCommand/createPromptCommand.js → newPromptFileActions.js}

@@ -3,7 +3,7 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { SnippetController2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetController2';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 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';
@@ -14,22 +14,20 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { NeverShowAgainScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
-import { PromptsType } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { PromptsType, getLanguageIdForPromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { SyncResource } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { CONFIGURE_SYNC_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataSync/common/userDataSync';
 import { ISnippetsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/snippets/browser/snippets.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { getLanguageIdForPromptsType } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { askForPromptFileName } from './dialogs/askForPromptName.js';
-import { askForPromptSourceFolder } from './dialogs/askForPromptSourceFolder.js';
-import { createPromptFile } from './utils/createPromptFile.js';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { askForPromptFileName } from './pickers/askForPromptName.js';
+import { askForPromptSourceFolder } from './pickers/askForPromptSourceFolder.js';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-class AbstractNewPromptOrInstructionsFileAction extends Action2 {
+class AbstractNewPromptFileAction extends Action2 {
     constructor(id, title, type) {
         super({
             id,
@@ -53,7 +51,6 @@ class AbstractNewPromptOrInstructionsFileAction extends Action2 {
         const commandService = accessor.get(ICommandService);
         const notificationService = accessor.get(INotificationService);
         const userDataSyncEnablementService = accessor.get(IUserDataSyncEnablementService);
-        const snippetService = accessor.get(ISnippetsService);
         const editorService = accessor.get(IEditorService);
         const fileService = accessor.get(IFileService);
         const instaService = accessor.get(IInstantiationService);
@@ -65,22 +62,16 @@ class AbstractNewPromptOrInstructionsFileAction extends Action2 {
         if (!fileName) {
             return;
         }
-        const promptUri = await createPromptFile(fileService, {
-            fileName,
-            folder: selectedFolder.uri,
-            content: ''
-        });
+        await fileService.createFolder(selectedFolder.uri);
+        const promptUri = URI.joinPath(selectedFolder.uri, fileName);
+        await fileService.createFile(promptUri);
         await openerService.open(promptUri);
         const editor = getCodeEditor(editorService.activeTextEditorControl);
         if (editor && editor.hasModel() && isEqual(editor.getModel().uri, promptUri)) {
-            const languageId = getLanguageIdForPromptsType(this.type);
-            const snippets = await snippetService.getSnippets(languageId, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
-            if (snippets.length > 0) {
-                SnippetController2.get(editor)?.apply([{
-                        range: editor.getModel().getFullModelRange(),
-                        template: snippets[0].body
-                    }]);
-            }
+            SnippetController2.get(editor)?.apply([{
+                    range: editor.getModel().getFullModelRange(),
+                    template: getDefaultContentSnippet(this.type),
+                }]);
         }
         if (selectedFolder.storage !== 'user') {
             return;
@@ -92,11 +83,11 @@ class AbstractNewPromptOrInstructionsFileAction extends Action2 {
             return;
         }
         notificationService.prompt(Severity.Info, ( localize(
-            5042,
+            5144,
             "Do you want to backup and sync your user prompt, instruction and mode files with Setting Sync?'"
         )), [
             {
-                label: ( localize(5043, "Enable")),
+                label: ( localize(5145, "Enable")),
                 run: () => {
                     commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)
                         .catch((error) => {
@@ -105,7 +96,7 @@ class AbstractNewPromptOrInstructionsFileAction extends Action2 {
                 },
             },
             {
-                label: ( localize(5044, "Learn More")),
+                label: ( localize(5146, "Learn More")),
                 run: () => {
                     openerService.open(( URI.parse('https://aka.ms/vscode-settings-sync-help')));
                 },
@@ -118,26 +109,94 @@ class AbstractNewPromptOrInstructionsFileAction extends Action2 {
         });
     }
 }
+function getDefaultContentSnippet(promptType) {
+    switch (promptType) {
+        case PromptsType.prompt:
+            return [
+                `---`,
+                `mode: \${1|ask,edit,agent|}`,
+                `---`,
+                `\${2:Define the task to achieve, including specific requirements, constraints, and success criteria.}`,
+            ].join('\n');
+        case PromptsType.instructions:
+            return [
+                `---`,
+                `applyTo: '\${1|**,**/*.ts|}'`,
+                `---`,
+                `\${2:Provide project context and coding guidelines that AI should follow when generating code, answering questions, or reviewing changes.}`,
+            ].join('\n');
+        case PromptsType.mode:
+            return [
+                `---`,
+                `description: '\${1:Description of the custom chat mode.}'`,
+                `tools: []`,
+                `---`,
+                `\${2:Define the purpose of this chat mode and how AI should behave: response style, available tools, focus areas, and any mode-specific instructions or constraints.}`,
+            ].join('\n');
+        default:
+            throw ( new Error(`Unknown prompt type: ${promptType}`));
+    }
+}
 const NEW_PROMPT_COMMAND_ID = 'workbench.command.new.prompt';
 const NEW_INSTRUCTIONS_COMMAND_ID = 'workbench.command.new.instructions';
 const NEW_MODE_COMMAND_ID = 'workbench.command.new.mode';
-class NewPromptFileAction extends AbstractNewPromptOrInstructionsFileAction {
+class NewPromptFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_PROMPT_COMMAND_ID, ( localize(5045, "New Prompt File...")), PromptsType.prompt);
+        super(NEW_PROMPT_COMMAND_ID, ( localize(5147, "New Prompt File...")), PromptsType.prompt);
     }
 }
-class NewInstructionsFileAction extends AbstractNewPromptOrInstructionsFileAction {
+class NewInstructionsFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5046, "New Instructions File...")), PromptsType.instructions);
+        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5148, "New Instructions File...")), PromptsType.instructions);
     }
 }
-class NewModeFileAction extends AbstractNewPromptOrInstructionsFileAction {
+class NewModeFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_MODE_COMMAND_ID, ( localize(5047, "New Mode File...")), PromptsType.mode);
+        super(NEW_MODE_COMMAND_ID, ( localize(5149, "New Mode File...")), PromptsType.mode);
     }
 }
-registerAction2(NewPromptFileAction);
-registerAction2(NewInstructionsFileAction);
-registerAction2(NewModeFileAction);
+class NewUntitledPromptFileAction extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.command.new.untitled.prompt',
+            title: ( localize2(5150, "New Untitled Prompt File")),
+            f1: true,
+            precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
+            category: CHAT_CATEGORY,
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib
+            },
+        });
+    }
+    async run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const snippetService = accessor.get(ISnippetsService);
+        const languageId = getLanguageIdForPromptsType(PromptsType.prompt);
+        const input = await editorService.openEditor({
+            resource: undefined,
+            languageId,
+            options: {
+                pinned: true
+            }
+        });
+        const editor = getCodeEditor(editorService.activeTextEditorControl);
+        if (editor && editor.hasModel()) {
+            const snippets = await snippetService.getSnippets(languageId, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
+            if (snippets.length > 0) {
+                SnippetController2.get(editor)?.apply([{
+                        range: editor.getModel().getFullModelRange(),
+                        template: snippets[0].body
+                    }]);
+            }
+        }
+        return input;
+    }
+}
+function registerNewPromptFileActions() {
+    registerAction2(NewPromptFileAction);
+    registerAction2(NewInstructionsFileAction);
+    registerAction2(NewModeFileAction);
+    registerAction2(NewUntitledPromptFileAction);
+}
 
-export { NEW_INSTRUCTIONS_COMMAND_ID, NEW_MODE_COMMAND_ID, NEW_PROMPT_COMMAND_ID };
+export { NEW_INSTRUCTIONS_COMMAND_ID, NEW_MODE_COMMAND_ID, NEW_PROMPT_COMMAND_ID, registerNewPromptFileActions };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/{contributions/createPromptCommand/dialogs → pickers}/askForPromptName.d.ts

@@ -1,4 +1,4 @@
-import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
+import { PromptsType } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 export declare function askForPromptFileName(accessor: ServicesAccessor, type: PromptsType, selectedFolder: URI, existingFileName?: string): Promise<string | undefined>;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/{contributions/createPromptCommand/dialogs → pickers}/askForPromptName.js

@@ -1,6 +1,7 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { getPromptFileExtension, PromptsType } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { getPromptFileExtension } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -24,20 +25,20 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
         const fileName = sanitizeInput(value);
         if (!fileName) {
             return {
-                content: ( localize(5048, "Please enter a name.")),
+                content: ( localize(5151, "Please enter a name.")),
                 severity: Severity.Warning
             };
         }
         if (!isValidBasename(fileName)) {
             return {
-                content: ( localize(5049, "The name contains invalid characters.")),
+                content: ( localize(5152, "The name contains invalid characters.")),
                 severity: Severity.Error
             };
         }
         const fileUri = URI.joinPath(selectedFolder, fileName);
         if (await fileService.exists(fileUri)) {
             return {
-                content: ( localize(5050, "A file for the given name already exists.")),
+                content: ( localize(5153, "A file for the given name already exists.")),
                 severity: Severity.Error
             };
         }
@@ -53,11 +54,11 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
 function getPlaceholderStringForNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5051, "Enter the name of the instructions file");
+            return localize(5154, "Enter the name of the instructions file");
         case PromptsType.prompt:
-            return localize(5052, "Enter the name of the prompt file");
+            return localize(5155, "Enter the name of the prompt file");
         case PromptsType.mode:
-            return localize(5053, "Enter the name of the custom chat mode file");
+            return localize(5156, "Enter the name of the custom chat mode file");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -65,11 +66,11 @@ function getPlaceholderStringForNew(type) {
 function getPlaceholderStringForRename(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5054, "Enter a new name of the instructions file");
+            return localize(5157, "Enter a new name of the instructions file");
         case PromptsType.prompt:
-            return localize(5055, "Enter a new name of the prompt file");
+            return localize(5158, "Enter a new name of the prompt file");
         case PromptsType.mode:
-            return localize(5056, "Enter a new name of the custom chat mode file");
+            return localize(5159, "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/{contributions/createPromptCommand/dialogs → pickers}/askForPromptSourceFolder.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
-import { ServicesAccessor } 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 { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { PromptsType } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-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";
 export declare function askForPromptSourceFolder(accessor: ServicesAccessor, type: PromptsType, existingFolder?: URI | undefined, isMove?: boolean): Promise<IPromptPath | undefined>;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/{contributions/createPromptCommand/dialogs → pickers}/askForPromptSourceFolder.js

@@ -1,14 +1,13 @@
 
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { isEqual, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { isEqual, extUri, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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 { PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { PromptsType, PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { PromptsType } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+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) {
     const quickInputService = accessor.get(IQuickInputService);
@@ -20,9 +19,6 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
         await showNoFoldersDialog(accessor, type);
         return;
     }
-    if (!existingFolder && folders.length === 1) {
-        return folders[0];
-    }
     const pickOptions = {
         placeHolder: existingFolder ? getPlaceholderStringforMove(type, isMove) : getPlaceholderStringforNew(type),
         canPickMany: false,
@@ -30,14 +26,13 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
     };
     const foldersList = ( folders.map(folder => {
         const uri = folder.uri;
-        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5057, "Current Location")) : undefined;
+        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5160, "Current Location")) : undefined;
         if (folder.storage === 'user') {
             return {
                 type: 'item',
-                label: ( localize(5058, "User Data Folder")),
+                label: ( localize(5161, "User Data Folder")),
                 detail,
-                description: labelService.getUriLabel(uri),
-                tooltip: uri.fsPath,
+                tooltip: labelService.getUriLabel(uri),
                 folder
             };
         }
@@ -47,19 +42,17 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
         if (isMultirootWorkspace || !firstFolder || !extUri.isEqual(firstFolder.uri, uri)) {
             return {
                 type: 'item',
-                label: basename(uri),
+                label: labelService.getUriLabel(uri, { relative: true }),
                 detail,
-                description: labelService.getUriLabel(uri, { relative: true }),
-                tooltip: uri.fsPath,
+                tooltip: labelService.getUriLabel(uri),
                 folder,
             };
         }
         return {
             type: 'item',
-            label: ( localize(5059, "Current Workspace")),
+            label: ( localize(5162, "Current Workspace")),
             detail,
-            description: labelService.getUriLabel(uri, { relative: false }),
-            tooltip: uri.fsPath,
+            tooltip: labelService.getUriLabel(uri),
             folder,
         };
     }));
@@ -72,11 +65,11 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
 function getPlaceholderStringforNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5060, "Select a location to create the instructions file in...");
+            return localize(5163, "Select a location to create the instructions file in...");
         case PromptsType.prompt:
-            return localize(5061, "Select a location to create the prompt file in...");
+            return localize(5164, "Select a location to create the prompt file in...");
         case PromptsType.mode:
-            return localize(5062, "Select a location to create the mode file in...");
+            return localize(5165, "Select a location to create the mode file in...");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -85,22 +78,22 @@ function getPlaceholderStringforMove(type, isMove) {
     if (isMove) {
         switch (type) {
             case PromptsType.instructions:
-                return localize(5063, "Select a location to move the instructions file to...");
+                return localize(5166, "Select a location to move the instructions file to...");
             case PromptsType.prompt:
-                return localize(5064, "Select a location to move the prompt file to...");
+                return localize(5167, "Select a location to move the prompt file to...");
             case PromptsType.mode:
-                return localize(5065, "Select a location to move the mode file to...");
+                return localize(5168, "Select a location to move the mode file to...");
             default:
                 throw ( new Error('Unknown prompt type'));
         }
     }
     switch (type) {
         case PromptsType.instructions:
-            return localize(5066, "Select a location to copy the instructions file to...");
+            return localize(5169, "Select a location to copy the instructions file to...");
         case PromptsType.prompt:
-            return localize(5067, "Select a location to copy the prompt file to...");
+            return localize(5170, "Select a location to copy the prompt file to...");
         case PromptsType.mode:
-            return localize(5068, "Select a location to copy the mode file to...");
+            return localize(5171, "Select a location to copy the mode file to...");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -126,11 +119,11 @@ async function showNoFoldersDialog(accessor, type) {
 function getLearnLabel(type) {
     switch (type) {
         case PromptsType.prompt:
-            return localize(5069, 'Learn how to configure reusable prompts');
+            return localize(5172, 'Learn how to configure reusable prompts');
         case PromptsType.instructions:
-            return localize(5070, 'Learn how to configure reusable instructions');
+            return localize(5173, 'Learn how to configure reusable instructions');
         case PromptsType.mode:
-            return localize(5071, 'Learn how to configure custom chat modes');
+            return localize(5174, 'Learn how to configure custom chat modes');
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -138,11 +131,11 @@ function getLearnLabel(type) {
 function getMissingSourceFolderString(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5072, 'No instruction source folders found.');
+            return localize(5175, 'No instruction source folders found.');
         case PromptsType.prompt:
-            return localize(5073, 'No prompt source folders found.');
+            return localize(5176, 'No prompt source folders found.');
         case PromptsType.mode:
-            return localize(5074, 'No custom chat mode source folders found.');
+            return localize(5177, 'No custom chat mode source folders found.');
         default:
             throw ( new Error('Unknown prompt type'));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/dialogs/askToSelectPrompt → promptSyntax/pickers}/promptFilePickers.d.ts

@@ -1,11 +1,11 @@
 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/types.service";
+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";
-import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
+import { PromptsType } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 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";
@@ -35,7 +35,7 @@ export declare class PromptFilePickers {
     constructor(_labelService: ILabelService, _quickInputService: IQuickInputService, _openerService: IOpenerService, _fileService: IFileService, _dialogService: IDialogService, _commandService: ICommandService, _instaService: IInstantiationService, _promptsService: IPromptsService);
     selectPromptFile(options: ISelectOptions): Promise<ISelectPromptResult | undefined>;
     private _createPromptPickItems;
-    private _getNewItem;
+    private _getNewItems;
     private _createPromptPickItem;
     private keepQuickPickOpen;
     private _handleButtonClick;