@codingame/monaco-vscode-chat-service-override 13.1.7 → 14.0.0

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

@@ -4,11 +4,11 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isElectron } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { dirname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { EditorType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -16,11 +16,14 @@ import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 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 { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { ActiveEditorContext, TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/diffEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -29,7 +32,8 @@ import { VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/servic
 import { UntitledTextEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FileEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common/vscode/vs/workbench/contrib/files/common/files';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
@@ -39,15 +43,18 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { showChatView, showEditsView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { PromptFilesConfig } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config';
+import { PROMPT_SNIPPET_FILE_EXTENSION } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase';
+import { showChatView, showEditsView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { imageToHash, isImage } from '../chatPasteProviders.js';
 import { isQuickChat } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { resizeImage } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
@@ -88,9 +95,15 @@ function isRelatedFileQuickPickItem(obj) {
     return (typeof obj === 'object'
         && obj.kind === 'related-files');
 }
+function isPromptInstructionsQuickPickItem(obj) {
+    if (!obj || typeof obj !== 'object') {
+        return false;
+    }
+    return ('kind' in obj && obj.kind === 'prompt-instructions');
+}
 class AttachFileAction extends Action2 {
     getFiles(accessor, ...args) {
-        const textEditorService = accessor.get(IEditorService);
+        const editorService = accessor.get(IEditorService);
         const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
         const files = [];
         for (const context of contexts) {
@@ -104,8 +117,8 @@ class AttachFileAction extends Action2 {
             else if (isSearchTreeMatch(context)) {
                 uri = context.parent().resource;
             }
-            else if (!context && textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor) {
-                uri = textEditorService.activeEditor?.resource;
+            else if (!context && editorService.activeTextEditorControl) {
+                uri = EditorResourceAccessor.getCanonicalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
             }
             if (uri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(uri.scheme)) {
                 files.push(uri);
@@ -119,15 +132,14 @@ class AttachFileToChatAction extends AttachFileAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4214, "Add File to Chat")),
+            title: ( localize2(4280, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ChatContextKeys.enabled,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
                     id: MenuId.ChatCommandCenter,
                     group: 'b_chat_context',
-                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
-                    order: 10,
+                    order: 15,
                 }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
@@ -151,15 +163,14 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4215, "Add Selection to Chat")),
+            title: ( localize2(4281, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ChatContextKeys.enabled,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
                     id: MenuId.ChatCommandCenter,
                     group: 'b_chat_context',
-                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
-                    order: 15,
+                    order: 10,
                 }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
@@ -169,7 +180,7 @@ class AttachSelectionToChatAction extends Action2 {
     }
     async run(accessor, ...args) {
         const variablesService = accessor.get(IChatVariablesService);
-        const textEditorService = accessor.get(IEditorService);
+        const editorService = accessor.get(IEditorService);
         const [_, matches] = args;
         if (matches && matches.length > 0) {
             const uris = ( new Map());
@@ -195,13 +206,14 @@ class AttachSelectionToChatAction extends Action2 {
             }
         }
         else {
-            const activeEditor = textEditorService.activeTextEditorControl;
-            const activeUri = textEditorService.activeEditor?.resource;
-            if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+            const activeEditor = editorService.activeTextEditorControl;
+            const activeUri = EditorResourceAccessor.getCanonicalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
+            if (editorService.activeTextEditorControl && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
                 const selection = activeEditor?.getSelection();
                 if (selection) {
                     (await showChatView(accessor.get(IViewsService)))?.focusInput();
-                    variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
+                    const range = selection.isEmpty() ? ( new Range(selection.startLineNumber, 1, selection.startLineNumber + 1, 1)) : selection;
+                    variablesService.attachContext('file', { uri: activeUri, range }, ChatAgentLocation.Panel);
                 }
             }
         }
@@ -212,15 +224,14 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
     constructor() {
         super({
             id: AttachFileToEditingSessionAction.ID,
-            title: ( localize2(4216, "Add File to {0}", 'Copilot Edits')),
+            title: ( localize2(4282, "Add File to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ChatContextKeys.enabled,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
                     id: MenuId.ChatCommandCenter,
                     group: 'c_edits_context',
-                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
-                    order: 10,
+                    order: 15,
                 }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
@@ -244,27 +255,28 @@ class AttachSelectionToEditingSessionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToEditingSessionAction.ID,
-            title: ( localize2(4217, "Add Selection to {0}", 'Copilot Edits')),
+            title: ( localize2(4283, "Add Selection to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')))),
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: {
                 id: MenuId.ChatCommandCenter,
                 group: 'c_edits_context',
-                order: 15,
+                order: 10,
             }
         });
     }
     async run(accessor, ...args) {
         const variablesService = accessor.get(IChatVariablesService);
-        const textEditorService = accessor.get(IEditorService);
-        const activeEditor = textEditorService.activeTextEditorControl;
-        const activeUri = textEditorService.activeEditor?.resource;
-        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+        const editorService = accessor.get(IEditorService);
+        const activeEditor = editorService.activeTextEditorControl;
+        const activeUri = EditorResourceAccessor.getCanonicalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
+        if (editorService.activeTextEditorControl && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
             const selection = activeEditor?.getSelection();
             if (selection) {
                 (await showEditsView(accessor.get(IViewsService)))?.focusInput();
-                variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.EditingSession);
+                const range = selection.isEmpty() ? ( new Range(selection.startLineNumber, 1, selection.startLineNumber + 1, 1)) : selection;
+                variablesService.attachContext('file', { uri: activeUri, range }, ChatAgentLocation.EditingSession);
             }
         }
     }
@@ -274,7 +286,7 @@ class AttachContextAction extends Action2 {
     static { this._cdt = ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Editor)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Notebook)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Terminal)))))); }
     constructor(desc = {
         id: AttachContextAction.ID,
-        title: ( localize2(4218, "Attach Context")),
+        title: ( localize2(4284, "Attach Context")),
         icon: Codicon.attach,
         category: CHAT_CATEGORY,
         precondition: ( ContextKeyExpr.or(AttachContextAction._cdt, ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))))),
@@ -308,7 +320,7 @@ class AttachContextAction extends Action2 {
             `:${item.range.startLineNumber}-${item.range.endLineNumber}` :
             `:${item.range.startLineNumber}`);
     }
-    async _attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isInBackground, ...picks) {
+    async _attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, isInBackground, ...picks) {
         const toAttach = [];
         for (const pick of picks) {
             if (isISymbolQuickPickItem(pick) && pick.symbol) {
@@ -324,14 +336,18 @@ class AttachContextAction extends Action2 {
             }
             else if (isIQuickPickItemWithResource(pick) && pick.resource) {
                 if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
-                    toAttach.push({
-                        id: ( pick.resource.toString()),
-                        name: pick.label,
-                        fullName: pick.label,
-                        value: pick.resource,
-                        isDynamic: true,
-                        isImage: true
-                    });
+                    if (URI.isUri(pick.resource)) {
+                        const readFile = await fileService.readFile(pick.resource);
+                        const resizedImage = await resizeImage(readFile.value.buffer);
+                        toAttach.push({
+                            id: ( pick.resource.toString()),
+                            name: pick.label,
+                            fullName: pick.label,
+                            value: resizedImage,
+                            isDynamic: true,
+                            isImage: true
+                        });
+                    }
                 }
                 else {
                     if (chatEditingService) {
@@ -419,7 +435,7 @@ class AttachContextAction extends Action2 {
                     }
                     return acc;
                 }, []));
-                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4219, 'Add related files to your working set')), canPickMany: true });
+                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4285, 'Add related files to your working set')), canPickMany: true });
                 for (const file of selectedFiles ?? []) {
                     chatEditingService?.currentEditingSessionObs.get()?.addFileToWorkingSet(file.value);
                 }
@@ -430,6 +446,14 @@ class AttachContextAction extends Action2 {
                     toAttach.push(convertBufferToScreenshotVariable(blob));
                 }
             }
+            else if (isPromptInstructionsQuickPickItem(pick)) {
+                await selectPromptAttachment({
+                    widget,
+                    quickInputService,
+                    labelService,
+                    openerService,
+                });
+            }
             else {
                 const attachmentPick = pick;
                 if (attachmentPick.kind === 'command') {
@@ -459,8 +483,8 @@ class AttachContextAction extends Action2 {
                     const fileBuffer = await clipboardService.readImage();
                     toAttach.push({
                         id: await imageToHash(fileBuffer),
-                        name: ( localize(4220, 'Pasted Image')),
-                        fullName: ( localize(4220, 'Pasted Image')),
+                        name: ( localize(4286, 'Pasted Image')),
+                        fullName: ( localize(4286, 'Pasted Image')),
                         value: fileBuffer,
                         isDynamic: true,
                         isImage: true
@@ -498,6 +522,8 @@ class AttachContextAction extends Action2 {
         const viewsService = accessor.get(IViewsService);
         const hostService = accessor.get(IHostService);
         const extensionService = accessor.get(IExtensionService);
+        const fileService = accessor.get(IFileService);
+        const openerService = accessor.get(IOpenerService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
@@ -525,7 +551,7 @@ class AttachContextAction extends Action2 {
                     quickPickItems.push({
                         kind: 'image',
                         id: await imageToHash(imageData),
-                        label: ( localize(4221, 'Image from Clipboard')),
+                        label: ( localize(4287, 'Image from Clipboard')),
                         iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
                     });
                 }
@@ -535,8 +561,8 @@ class AttachContextAction extends Action2 {
                     icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
                     iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
                     label: (isElectron
-                        ? ( localize(4222, 'Screenshot Window'))
-                        : ( localize(4223, 'Screenshot'))),
+                        ? ( localize(4288, 'Screenshot Window'))
+                        : ( localize(4289, 'Screenshot'))),
                 });
             }
             if (widget.viewModel?.sessionId) {
@@ -579,7 +605,7 @@ class AttachContextAction extends Action2 {
             }
             quickPickItems.push({
                 kind: 'quickaccess',
-                label: ( localize(4224, 'Symbol...')),
+                label: ( localize(4290, 'Symbol...')),
                 iconClass: ThemeIcon.asClassName(Codicon.symbolField),
                 prefix: SymbolsQuickAccessProvider.PREFIX,
                 id: 'symbol'
@@ -592,10 +618,10 @@ class AttachContextAction extends Action2 {
                     icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
                     iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
                     value: 'kernelVariable',
-                    label: ( localize(4225, 'Kernel Variable...')),
+                    label: ( localize(4291, 'Kernel Variable...')),
                     command: {
                         id: 'notebook.chat.selectAndInsertKernelVariable',
-                        title: ( localize(4226, 'Select and Insert Kernel Variable')),
+                        title: ( localize(4292, 'Select and Insert Kernel Variable')),
                         arguments: [{ widget, range: undefined }]
                     }
                 });
@@ -606,7 +632,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.push({
                     kind: 'related-files',
                     id: 'related-files',
-                    label: ( localize(4227, 'Related Files')),
+                    label: ( localize(4293, 'Related Files')),
                     iconClass: ThemeIcon.asClassName(Codicon.sparkle),
                 });
             }
@@ -614,7 +640,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.push({
                     kind: 'open-editors',
                     id: 'open-editors',
-                    label: ( localize(4228, 'Open Editors')),
+                    label: ( localize(4294, 'Open Editors')),
                     iconClass: ThemeIcon.asClassName(Codicon.files),
                 });
             }
@@ -622,11 +648,19 @@ class AttachContextAction extends Action2 {
                 quickPickItems.push({
                     kind: 'search-results',
                     id: 'search-results',
-                    label: ( localize(4229, 'Search Results')),
+                    label: ( localize(4295, 'Search Results')),
                     iconClass: ThemeIcon.asClassName(Codicon.search),
                 });
             }
         }
+        if (widget.attachmentModel.promptInstructions.featureEnabled) {
+            quickPickItems.push({
+                kind: 'prompt-instructions',
+                id: 'prompt-instructions',
+                label: ( localize(4296, 'Prompt...')),
+                iconClass: ThemeIcon.asClassName(Codicon.bookmark),
+            });
+        }
         function extractTextFromIconLabel(label) {
             if (!label) {
                 return '';
@@ -638,19 +672,19 @@ class AttachContextAction extends Action2 {
             const first = extractTextFromIconLabel(a.label).toUpperCase();
             const second = extractTextFromIconLabel(b.label).toUpperCase();
             return compare(first, second);
-        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, '', context?.placeholder);
+        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, '', context?.placeholder);
     }
-    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, query = '', placeholder) {
+    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, query = '', placeholder) {
         const providerOptions = {
             handleAccept: (item, isBackgroundAccept) => {
                 if ('prefix' in item) {
-                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, item.prefix, placeholder);
+                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, item.prefix, placeholder);
                 }
                 else {
                     if (!clipboardService) {
                         return;
                     }
-                    this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isBackgroundAccept, item);
+                    this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, isBackgroundAccept, item);
                     if (isQuickChat(widget)) {
                         quickChatService.open();
                     }
@@ -699,7 +733,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4230, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4297, 'Search attachments')),
             providerOptions,
         });
     }
@@ -708,7 +742,7 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
     constructor() {
         super({
             id: 'workbench.action.chat.editing.attachFiles',
-            title: ( localize2(4231, "Add Files to Working Set")),
+            title: ( localize2(4298, "Add Files to Working Set")),
             f1: false,
             category: CHAT_CATEGORY,
             precondition: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))
@@ -716,9 +750,53 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
     }
     async run(accessor, ...args) {
         const context = args[0];
-        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(4232, 'Search for files to add to your working set')) };
+        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(4299, 'Search for files to add to your working set')) };
         return super.run(accessor, attachFilesContext);
     }
 });
+const selectPromptAttachment = async (options) => {
+    const { widget, quickInputService, labelService, openerService } = options;
+    const { promptInstructions } = widget.attachmentModel;
+    const files = await promptInstructions.listNonAttachedFiles()
+        .then((files) => {
+        return ( files.map((file) => {
+            const fileBasename = basename(file);
+            const fileWithoutExtension = fileBasename.replace(PROMPT_SNIPPET_FILE_EXTENSION, '');
+            const result = {
+                type: 'item',
+                label: fileWithoutExtension,
+                description: labelService.getUriLabel(dirname(file), { relative: true }),
+                tooltip: file.fsPath,
+                value: file,
+            };
+            return result;
+        }));
+    });
+    if (files.length === 0) {
+        const docsQuickPick = {
+            type: 'item',
+            label: ( localize(4300, 'Learn how create reusable prompts')),
+            description: PromptFilesConfig.DOCUMENTATION_URL,
+            tooltip: PromptFilesConfig.DOCUMENTATION_URL,
+            value: ( URI.parse(PromptFilesConfig.DOCUMENTATION_URL)),
+        };
+        const result = await quickInputService.pick([docsQuickPick], {
+            placeHolder: ( localize(4301, 'No prompt files found.')),
+            canPickMany: false,
+        });
+        if (!result) {
+            return;
+        }
+        await openerService.open(result.value);
+        return;
+    }
+    const selectedFile = await quickInputService.pick(files, {
+        placeHolder: ( localize(4302, 'Select a prompt file')),
+        canPickMany: false,
+    });
+    if (selectedFile) {
+        promptInstructions.add(selectedFile.value);
+    }
+};
 
 export { AttachContextAction, registerChatContextActions };

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

@@ -2,17 +2,17 @@
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4233, "Copy All")),
+                title: ( localize2(4303, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -42,7 +42,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4234, "Copy")),
+                title: ( localize2(4304, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -13,7 +13,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4235, "Log Chat Input History")),
+            title: ( localize2(4305, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true

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

@@ -3,17 +3,17 @@ import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4248, "Next File Tree")),
+                title: ( localize2(4327, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(4249, "Previous File Tree")),
+                title: ( localize2(4328, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -1,23 +1,26 @@
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 export declare class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
     private readonly productService;
     private readonly extensionService;
-    private readonly commandService;
+    private readonly viewsService;
     private readonly extensionManagementService;
     private readonly storageService;
     private readonly viewDescriptorService;
     private readonly layoutService;
+    private readonly configurationService;
     static readonly ID = "workbench.contrib.chatGettingStarted";
     private recentlyInstalled;
     private static readonly hideWelcomeView;
-    constructor(productService: IProductService, extensionService: IExtensionService, commandService: ICommandService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, viewDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService);
+    constructor(productService: IProductService, extensionService: IExtensionService, viewsService: IViewsService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, viewDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService, configurationService: IConfigurationService);
     private registerListeners;
+    private onDidInstallChat;
 }