@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

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

@@ -4,11 +4,12 @@ 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, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { basename, dirname } 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 { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 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';
@@ -17,23 +18,24 @@ import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.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, 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 { DiffEditorInput } from '@codingame/monaco-vscode-09d6ed79-77bb-525d-bd17-ed2bf3adbb38-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';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
-import { UntitledTextEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-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 { 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 { FileEditorInput } from '@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
+import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/workbench/contrib/files/common/files';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/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';
@@ -41,20 +43,21 @@ import { SearchContext } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 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-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/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 { 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 { showChatView, showEditsView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/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-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';
+import { isQuickChat } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { createMarkersQuickPick, createFolderQuickPick } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { resizeImage } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { COMMAND_ID } from '../promptSyntax/contributions/usePromptCommand.js';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction } from './chatAttachPromptAction/chatAttachPromptAction.js';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
@@ -74,6 +77,14 @@ function isISymbolQuickPickItem(obj) {
         && typeof obj.symbol === 'object'
         && !!obj.symbol);
 }
+function isIFolderSearchResultQuickPickItem(obj) {
+    return (typeof obj === 'object'
+        && obj.kind === 'folder-search-result');
+}
+function isIDiagnosticsQuickPickItemWithFilter(obj) {
+    return (typeof obj === 'object'
+        && obj.kind === 'diagnostic-filter');
+}
 function isIQuickPickItemWithResource(obj) {
     return (typeof obj === 'object'
         && typeof obj.resource === 'object'
@@ -99,8 +110,9 @@ function isPromptInstructionsQuickPickItem(obj) {
     if (!obj || typeof obj !== 'object') {
         return false;
     }
-    return ('kind' in obj && obj.kind === 'prompt-instructions');
+    return ('kind' in obj && obj.kind === 'reusable-prompt');
 }
+const REUSABLE_PROMPT_PICK_ID = 'reusable-prompt';
 class AttachFileAction extends Action2 {
     getFiles(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
@@ -132,15 +144,11 @@ class AttachFileToChatAction extends AttachFileAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4281, "Add File to Chat")),
+            title: ( localize2(4312, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
-                    id: MenuId.ChatCommandCenter,
-                    group: 'b_chat_context',
-                    order: 15,
-                }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
                     order: 1
@@ -163,15 +171,11 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4282, "Add Selection to Chat")),
+            title: ( localize2(4313, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
-                    id: MenuId.ChatCommandCenter,
-                    group: 'b_chat_context',
-                    order: 10,
-                }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
                     order: 2
@@ -224,15 +228,11 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
     constructor() {
         super({
             id: AttachFileToEditingSessionAction.ID,
-            title: ( localize2(4283, "Add File to {0}", 'Copilot Edits')),
+            title: ( localize2(4314, "Add File to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
-                    id: MenuId.ChatCommandCenter,
-                    group: 'c_edits_context',
-                    order: 15,
-                }, {
                     id: MenuId.SearchContext,
                     group: 'z_chat',
                     order: 2
@@ -255,15 +255,10 @@ class AttachSelectionToEditingSessionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToEditingSessionAction.ID,
-            title: ( localize2(4284, "Add Selection to {0}", 'Copilot Edits')),
+            title: ( localize2(4315, "Add Selection to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
-            menu: {
-                id: MenuId.ChatCommandCenter,
-                group: 'c_edits_context',
-                order: 10,
-            }
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext))))
         });
     }
     async run(accessor, ...args) {
@@ -286,18 +281,18 @@ 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(4285, "Attach Context")),
+        title: ( localize2(4316, "Attach Context")),
         icon: Codicon.attach,
         category: CHAT_CATEGORY,
         precondition: ( ContextKeyExpr.or(AttachContextAction._cdt, ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))))),
         keybinding: {
-            when: ChatContextKeys.inChatInput,
+            when: ( ContextKeyExpr.and(( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession)), ChatContextKeys.inChatInput)),
             primary: KeyMod.CtrlCmd | KeyCode.Slash,
             weight: KeybindingWeight.EditorContrib
         },
         menu: [
             {
-                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))), ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))), AttachContextAction._cdt)))),
+                when: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
                 id: MenuId.ChatInput,
                 group: 'navigation',
                 order: 2
@@ -320,7 +315,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, fileService, openerService, isInBackground, ...picks) {
+    async _attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, isInBackground, ...picks) {
         const toAttach = [];
         for (const pick of picks) {
             if (isISymbolQuickPickItem(pick) && pick.symbol) {
@@ -331,7 +326,26 @@ class AttachContextAction extends Action2 {
                     symbolKind: pick.symbol.kind,
                     fullName: pick.label,
                     name: pick.symbol.name,
-                    isDynamic: true
+                });
+            }
+            else if (isIFolderSearchResultQuickPickItem(pick)) {
+                const folder = pick.resource;
+                toAttach.push({
+                    id: pick.id,
+                    value: folder,
+                    name: basename(folder),
+                    isFile: false,
+                    isDirectory: true,
+                });
+            }
+            else if (isIDiagnosticsQuickPickItemWithFilter(pick)) {
+                toAttach.push({
+                    id: pick.id,
+                    name: pick.label,
+                    value: pick.filter,
+                    kind: 'diagnostic',
+                    icon: pick.icon,
+                    ...pick.filter,
                 });
             }
             else if (isIQuickPickItemWithResource(pick) && pick.resource) {
@@ -344,24 +358,26 @@ class AttachContextAction extends Action2 {
                             name: pick.label,
                             fullName: pick.label,
                             value: resizedImage,
-                            isDynamic: true,
                             isImage: true
                         });
                     }
                 }
                 else {
-                    if (chatEditingService) {
-                        chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(pick.resource);
+                    let isOmitted = false;
+                    try {
+                        const createdModel = await textModelService.createModelReference(pick.resource);
+                        createdModel.dispose();
                     }
-                    else {
-                        toAttach.push({
-                            id: this._getFileContextId({ resource: pick.resource }),
-                            value: pick.resource,
-                            name: pick.label,
-                            isFile: true,
-                            isDynamic: true,
-                        });
+                    catch {
+                        isOmitted = true;
                     }
+                    toAttach.push({
+                        id: this._getFileContextId({ resource: pick.resource }),
+                        value: pick.resource,
+                        name: pick.label,
+                        isFile: true,
+                        isOmitted
+                    });
                 }
             }
             else if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
@@ -371,43 +387,30 @@ class AttachContextAction extends Action2 {
                     value: { uri: pick.uri, range: pick.range.decoration },
                     fullName: pick.label,
                     name: pick.symbolName,
-                    isDynamic: true
                 });
             }
             else if (isIOpenEditorsQuickPickItem(pick)) {
                 for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput || e instanceof NotebookEditorInput)) {
                     const uri = editor instanceof DiffEditorInput ? editor.modified.resource : editor.resource;
                     if (uri) {
-                        if (chatEditingService) {
-                            chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(uri);
-                        }
-                        else {
-                            toAttach.push({
-                                id: this._getFileContextId({ resource: uri }),
-                                value: uri,
-                                name: labelService.getUriBasenameLabel(uri),
-                                isFile: true,
-                                isDynamic: true
-                            });
-                        }
+                        toAttach.push({
+                            id: this._getFileContextId({ resource: uri }),
+                            value: uri,
+                            name: labelService.getUriBasenameLabel(uri),
+                            isFile: true,
+                        });
                     }
                 }
             }
             else if (isISearchResultsQuickPickItem(pick)) {
                 const searchView = viewsService.getViewWithId(VIEW_ID);
                 for (const result of searchView.model.searchResult.matches()) {
-                    if (chatEditingService) {
-                        chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(result.resource);
-                    }
-                    else {
-                        toAttach.push({
-                            id: this._getFileContextId({ resource: result.resource }),
-                            value: result.resource,
-                            name: labelService.getUriBasenameLabel(result.resource),
-                            isFile: true,
-                            isDynamic: true
-                        });
-                    }
+                    toAttach.push({
+                        id: this._getFileContextId({ resource: result.resource }),
+                        value: result.resource,
+                        name: labelService.getUriBasenameLabel(result.resource),
+                        isFile: true,
+                    });
                 }
             }
             else if (isRelatedFileQuickPickItem(pick)) {
@@ -415,12 +418,12 @@ class AttachContextAction extends Action2 {
                 if (!chatSessionId || !chatEditingService) {
                     continue;
                 }
-                const relatedFiles = await chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), CancellationToken.None);
+                const relatedFiles = await chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None);
                 if (!relatedFiles) {
                     continue;
                 }
                 const attachments = widget.attachmentModel.getAttachmentIDs();
-                const itemsPromise = chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), CancellationToken.None)
+                const itemsPromise = chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None)
                     .then((files) => (files ?? []).reduce((acc, cur) => {
                     acc.push({ type: 'separator', label: cur.group });
                     for (const file of cur.files) {
@@ -435,9 +438,9 @@ class AttachContextAction extends Action2 {
                     }
                     return acc;
                 }, []));
-                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4286, 'Add related files to your working set')), canPickMany: true });
+                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4317, 'Add related files to your working set')), canPickMany: true });
                 for (const file of selectedFiles ?? []) {
-                    chatEditingService?.currentEditingSessionObs.get()?.addFileToWorkingSet(file.value);
+                    chatEditingService.getEditingSession(chatSessionId)?.addFileToWorkingSet(file.value);
                 }
             }
             else if (isScreenshotQuickPickItem(pick)) {
@@ -447,12 +450,8 @@ class AttachContextAction extends Action2 {
                 }
             }
             else if (isPromptInstructionsQuickPickItem(pick)) {
-                await selectPromptAttachment({
-                    widget,
-                    quickInputService,
-                    labelService,
-                    openerService,
-                });
+                const options = { widget, viewsService };
+                await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
             }
             else {
                 const attachmentPick = pick;
@@ -463,7 +462,6 @@ class AttachContextAction extends Action2 {
                     }
                     toAttach.push({
                         ...attachmentPick,
-                        isDynamic: attachmentPick.isDynamic,
                         value: attachmentPick.value,
                         name: `${typeof attachmentPick.value === 'string' && attachmentPick.value.startsWith('#') ? attachmentPick.value.slice(1) : ''}${selection}`,
                         fullName: selection
@@ -483,23 +481,12 @@ class AttachContextAction extends Action2 {
                     const fileBuffer = await clipboardService.readImage();
                     toAttach.push({
                         id: await imageToHash(fileBuffer),
-                        name: ( localize(4287, 'Pasted Image')),
-                        fullName: ( localize(4287, 'Pasted Image')),
+                        name: ( localize(4318, 'Pasted Image')),
+                        fullName: ( localize(4318, 'Pasted Image')),
                         value: fileBuffer,
-                        isDynamic: true,
                         isImage: true
                     });
                 }
-                else if (attachmentPick.kind === 'variable') {
-                    toAttach.push({
-                        range: undefined,
-                        id: pick.id ?? '',
-                        value: undefined,
-                        fullName: pick.label,
-                        name: attachmentPick.variable.name,
-                        icon: attachmentPick.variable.icon
-                    });
-                }
             }
         }
         widget.attachmentModel.addContext(...toAttach);
@@ -510,7 +497,6 @@ class AttachContextAction extends Action2 {
     async run(accessor, ...args) {
         const quickInputService = accessor.get(IQuickInputService);
         const chatAgentService = accessor.get(IChatAgentService);
-        const chatVariablesService = accessor.get(IChatVariablesService);
         const commandService = accessor.get(ICommandService);
         const widgetService = accessor.get(IChatWidgetService);
         const languageModelToolsService = accessor.get(ILanguageModelToolsService);
@@ -523,142 +509,141 @@ class AttachContextAction extends Action2 {
         const hostService = accessor.get(IHostService);
         const extensionService = accessor.get(IExtensionService);
         const fileService = accessor.get(IFileService);
-        const openerService = accessor.get(IOpenerService);
+        const textModelService = accessor.get(ITextModelService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const keybindingService = accessor.get(IKeybindingService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
             return;
         }
         const chatEditingService = widget.location === ChatAgentLocation.EditingSession ? accessor.get(IChatEditingService) : undefined;
-        const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
-        const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
         const quickPickItems = [];
-        if (!context || !context.showFilesOnly) {
-            for (const variable of chatVariablesService.getVariables(widget.location)) {
-                if (variable.fullName && (!variable.isSlow || slowSupported)) {
-                    quickPickItems.push({
-                        kind: 'variable',
-                        variable,
-                        label: variable.fullName,
-                        id: variable.id,
-                        iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
-                    });
-                }
-            }
-            if (( extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')))) {
-                const imageData = await clipboardService.readImage();
-                if (isImage(imageData)) {
-                    quickPickItems.push({
-                        kind: 'image',
-                        id: await imageToHash(imageData),
-                        label: ( localize(4288, 'Image from Clipboard')),
-                        iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
-                    });
-                }
+        if (( extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')))) {
+            const imageData = await clipboardService.readImage();
+            if (isImage(imageData)) {
                 quickPickItems.push({
-                    kind: 'screenshot',
-                    id: ScreenshotVariableId,
-                    icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
-                    iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
-                    label: (isElectron
-                        ? ( localize(4289, 'Screenshot Window'))
-                        : ( localize(4290, 'Screenshot'))),
+                    kind: 'image',
+                    id: await imageToHash(imageData),
+                    label: ( localize(4319, 'Image from Clipboard')),
+                    iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
                 });
             }
-            if (widget.viewModel?.sessionId) {
-                const agentPart = widget.parsedInput.parts.find((part) => part instanceof ChatRequestAgentPart);
-                if (agentPart) {
-                    const completions = await chatAgentService.getAgentCompletionItems(agentPart.agent.id, '', CancellationToken.None);
-                    for (const variable of completions) {
-                        if (variable.fullName && variable.command) {
-                            quickPickItems.push({
-                                kind: 'command',
-                                label: variable.fullName,
-                                id: variable.id,
-                                command: variable.command,
-                                icon: variable.icon,
-                                iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
-                                value: variable.value,
-                                isDynamic: true,
-                                name: variable.name
-                            });
-                        }
+            quickPickItems.push({
+                kind: 'screenshot',
+                id: ScreenshotVariableId,
+                icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
+                iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
+                label: (isElectron
+                    ? ( localize(4320, 'Screenshot Window'))
+                    : ( localize(4321, 'Screenshot'))),
+            });
+        }
+        if (widget.viewModel?.sessionId) {
+            const agentPart = widget.parsedInput.parts.find((part) => part instanceof ChatRequestAgentPart);
+            if (agentPart) {
+                const completions = await chatAgentService.getAgentCompletionItems(agentPart.agent.id, '', CancellationToken.None);
+                for (const variable of completions) {
+                    if (variable.fullName && variable.command) {
+                        quickPickItems.push({
+                            kind: 'command',
+                            label: variable.fullName,
+                            id: variable.id,
+                            command: variable.command,
+                            icon: variable.icon,
+                            iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
+                            value: variable.value,
+                            name: variable.name
+                        });
                     }
                 }
             }
-            for (const tool of languageModelToolsService.getTools()) {
-                if (tool.canBeReferencedInPrompt) {
-                    const item = {
-                        kind: 'tool',
-                        label: tool.displayName ?? '',
-                        id: tool.id,
-                        icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined
-                    };
-                    if (ThemeIcon.isThemeIcon(tool.icon)) {
-                        item.iconClass = ThemeIcon.asClassName(tool.icon);
-                    }
-                    else if (tool.icon) {
-                        item.iconPath = tool.icon;
-                    }
-                    quickPickItems.push(item);
+        }
+        for (const tool of languageModelToolsService.getTools()) {
+            if (tool.canBeReferencedInPrompt) {
+                const item = {
+                    kind: 'tool',
+                    label: tool.displayName ?? '',
+                    id: tool.id,
+                    icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined
+                };
+                if (ThemeIcon.isThemeIcon(tool.icon)) {
+                    item.iconClass = ThemeIcon.asClassName(tool.icon);
+                }
+                else if (tool.icon) {
+                    item.iconPath = tool.icon;
                 }
+                quickPickItems.push(item);
             }
+        }
+        quickPickItems.push({
+            kind: 'quickaccess',
+            label: ( localize(4322, 'Symbol...')),
+            iconClass: ThemeIcon.asClassName(Codicon.symbolField),
+            prefix: SymbolsQuickAccessProvider.PREFIX,
+            id: 'symbol'
+        });
+        quickPickItems.push({
+            kind: 'folder',
+            label: ( localize(4323, 'Folder...')),
+            iconClass: ThemeIcon.asClassName(Codicon.folder),
+            id: 'folder',
+        });
+        quickPickItems.push({
+            kind: 'diagnostic',
+            label: ( localize(4324, 'Problem...')),
+            iconClass: ThemeIcon.asClassName(Codicon.error),
+            id: 'diagnostic'
+        });
+        if (widget.location === ChatAgentLocation.Notebook) {
             quickPickItems.push({
-                kind: 'quickaccess',
-                label: ( localize(4291, 'Symbol...')),
-                iconClass: ThemeIcon.asClassName(Codicon.symbolField),
-                prefix: SymbolsQuickAccessProvider.PREFIX,
-                id: 'symbol'
+                kind: 'command',
+                id: 'chatContext.notebook.kernelVariable',
+                icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
+                iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
+                value: 'kernelVariable',
+                label: ( localize(4325, 'Kernel Variable...')),
+                command: {
+                    id: 'notebook.chat.selectAndInsertKernelVariable',
+                    title: ( localize(4326, 'Select and Insert Kernel Variable')),
+                    arguments: [{ widget, range: undefined }]
+                }
             });
-            if (widget.location === ChatAgentLocation.Notebook) {
-                quickPickItems.push({
-                    kind: 'command',
-                    id: 'chatContext.notebook.kernelVariable',
-                    isDynamic: true,
-                    icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
-                    iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
-                    value: 'kernelVariable',
-                    label: ( localize(4292, 'Kernel Variable...')),
-                    command: {
-                        id: 'notebook.chat.selectAndInsertKernelVariable',
-                        title: ( localize(4293, 'Select and Insert Kernel Variable')),
-                        arguments: [{ widget, range: undefined }]
-                    }
-                });
-            }
         }
-        else if (context.showFilesOnly) {
-            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || chatEditingService.currentEditingSessionObs.get()?.workingSet.size)) {
-                quickPickItems.push({
+        if (context?.showFilesOnly) {
+            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || (getEditingSession(chatEditingService, widget)?.workingSet.size))) {
+                quickPickItems.unshift({
                     kind: 'related-files',
                     id: 'related-files',
-                    label: ( localize(4294, 'Related Files')),
+                    label: ( localize(4327, 'Related Files')),
                     iconClass: ThemeIcon.asClassName(Codicon.sparkle),
                 });
             }
             if (editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput).length > 0) {
-                quickPickItems.push({
+                quickPickItems.unshift({
                     kind: 'open-editors',
                     id: 'open-editors',
-                    label: ( localize(4295, 'Open Editors')),
+                    label: ( localize(4328, 'Open Editors')),
                     iconClass: ThemeIcon.asClassName(Codicon.files),
                 });
             }
             if (SearchContext.HasSearchResults.getValue(contextKeyService)) {
-                quickPickItems.push({
+                quickPickItems.unshift({
                     kind: 'search-results',
                     id: 'search-results',
-                    label: ( localize(4296, 'Search Results')),
+                    label: ( localize(4329, 'Search Results')),
                     iconClass: ThemeIcon.asClassName(Codicon.search),
                 });
             }
         }
         if (widget.attachmentModel.promptInstructions.featureEnabled) {
+            const keybinding = keybindingService.lookupKeybinding(COMMAND_ID, contextKeyService);
             quickPickItems.push({
-                kind: 'prompt-instructions',
-                id: 'prompt-instructions',
-                label: ( localize(4297, 'Prompt...')),
+                id: REUSABLE_PROMPT_PICK_ID,
+                kind: REUSABLE_PROMPT_PICK_ID,
+                label: ( localize(4330, 'Prompt...')),
                 iconClass: ThemeIcon.asClassName(Codicon.bookmark),
+                keybinding,
             });
         }
         function extractTextFromIconLabel(label) {
@@ -669,22 +654,53 @@ class AttachContextAction extends Action2 {
             return match ? match[1] : label;
         }
         this._show(quickInputService, commandService, widget, quickChatService, quickPickItems.sort(function (a, b) {
+            if (a.kind === 'open-editors') {
+                return -1;
+            }
+            if (b.kind === 'open-editors') {
+                return 1;
+            }
             const first = extractTextFromIconLabel(a.label).toUpperCase();
             const second = extractTextFromIconLabel(b.label).toUpperCase();
             return compare(first, second);
-        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, '', context?.placeholder);
+        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', context?.placeholder);
+    }
+    async _showDiagnosticsPick(instantiationService, onBackgroundAccept) {
+        const convert = (item) => ({
+            kind: 'diagnostic-filter',
+            id: IDiagnosticVariableEntryFilterData.id(item),
+            label: IDiagnosticVariableEntryFilterData.label(item),
+            icon: IDiagnosticVariableEntryFilterData.icon,
+            filter: item,
+        });
+        const filter = await instantiationService.invokeFunction(accessor => createMarkersQuickPick(accessor, 'problem', items => onBackgroundAccept(( items.map(convert)))));
+        return filter && convert(filter);
     }
-    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, query = '', placeholder) {
+    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, query = '', placeholder) {
+        const attach = (isBackgroundAccept, ...items) => {
+            this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, isBackgroundAccept, ...items);
+        };
         const providerOptions = {
-            handleAccept: (item, isBackgroundAccept) => {
+            handleAccept: async (inputItem, isBackgroundAccept) => {
+                let item = inputItem;
+                if ('kind' in item && item.kind === 'folder') {
+                    item = await this._showFolders(instantiationService);
+                }
+                else if ('kind' in item && item.kind === 'diagnostic') {
+                    item = await this._showDiagnosticsPick(instantiationService, i => attach(true, ...i));
+                }
+                if (!item) {
+                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', placeholder);
+                    return;
+                }
                 if ('prefix' in item) {
-                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, item.prefix, placeholder);
+                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, item.prefix, placeholder);
                 }
                 else {
                     if (!clipboardService) {
                         return;
                     }
-                    this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, openerService, isBackgroundAccept, item);
+                    attach(isBackgroundAccept, item);
                     if (isQuickChat(widget)) {
                         quickChatService.open();
                     }
@@ -693,13 +709,6 @@ class AttachContextAction extends Action2 {
             additionPicks: quickPickItems,
             filter: (item) => {
                 const attachedContext = widget.attachmentModel.getAttachmentIDs();
-                if (chatEditingService) {
-                    for (const [file, state] of chatEditingService.currentEditingSessionObs.get()?.workingSet.entries() ?? []) {
-                        if (state.state !== WorkingSetEntryState.Suggested) {
-                            attachedContext.add(this._getFileContextId({ resource: file }));
-                        }
-                    }
-                }
                 if (isIOpenEditorsQuickPickItem(item)) {
                     for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput)) {
                         if (editor.resource && !( attachedContext.has(this._getFileContextId({ resource: editor.resource })))) {
@@ -733,70 +742,53 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4298, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4331, 'Search attachments')),
             providerOptions,
         });
     }
+    async _showFolders(instantiationService) {
+        const folder = await instantiationService.invokeFunction(accessor => createFolderQuickPick(accessor));
+        if (!folder) {
+            return undefined;
+        }
+        return {
+            kind: 'folder-search-result',
+            id: ( folder.toString()),
+            label: basename(folder),
+            resource: folder,
+        };
+    }
 }
 registerAction2(class AttachFilesAction extends AttachContextAction {
     constructor() {
         super({
             id: 'workbench.action.chat.editing.attachFiles',
-            title: ( localize2(4299, "Add Files to Working Set")),
+            title: ( localize2(4332, "Add Files to Copilot Edits")),
+            shortTitle: ( localize2(4333, "Add Files...")),
             f1: false,
             category: CHAT_CATEGORY,
-            precondition: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))
+            menu: { id: MenuId.ChatInputAttachmentToolbar, group: 'navigation' },
+            icon: Codicon.attach,
+            precondition: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+            keybinding: {
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))),
+                primary: KeyMod.CtrlCmd | KeyCode.Slash,
+                weight: KeybindingWeight.EditorContrib
+            }
         });
     }
     async run(accessor, ...args) {
         const context = args[0];
-        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(4300, 'Search for files to add to your working set')) };
+        const attachFilesContext = { ...context, showFilesOnly: true };
         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(4301, '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(4302, 'No prompt files found.')),
-            canPickMany: false,
-        });
-        if (!result) {
-            return;
-        }
-        await openerService.open(result.value);
+function getEditingSession(chatEditingService, chatWidget) {
+    if (!chatWidget.viewModel?.sessionId) {
         return;
     }
-    const selectedFile = await quickInputService.pick(files, {
-        placeHolder: ( localize(4303, 'Select a prompt file')),
-        canPickMany: false,
-    });
-    if (selectedFile) {
-        promptInstructions.add(selectedFile.value);
-    }
-};
+    return chatEditingService.getEditingSession(chatWidget.viewModel.sessionId);
+}
+registerAction2(AttachPromptAction);
 
 export { AttachContextAction, registerChatContextActions };