@codingame/monaco-vscode-chat-service-override 16.1.1 → 17.0.0

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

@@ -1,14 +1,16 @@
 
+import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { 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 { basename, dirname, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 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 { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 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';
@@ -23,53 +25,66 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.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-fdf643f9-94dd-5510-b97a-408abf26ad92-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-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-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+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-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-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 { 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-97284942-b044-5fbb-b53b-3f46d2468746-common/vscode/vs/workbench/contrib/files/common/files';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-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-64322fa2-7385-5f46-935b-8f243d98004b-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import { SearchContext } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/constants';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-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 { OmittedState, IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { showChatView, showEditsView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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 '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-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';
+import { imageToHash, isImage } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
+import { isQuickChat } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { createFilesAndFolderQuickPick } 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/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 { INSTRUCTIONS_COMMAND_ID } from '../promptSyntax/contributions/attachInstructionsCommand.js';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { registerPromptActions } from './promptActions/index.js';
+import { runAttachInstructionsAction } from './promptActions/chatAttachInstructionsAction.js';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
     registerAction2(AttachFileToChatAction);
     registerAction2(AttachFolderToChatAction);
     registerAction2(AttachSelectionToChatAction);
-    registerAction2(AttachFileToEditingSessionAction);
-    registerAction2(AttachFolderToEditingSessionAction);
-    registerAction2(AttachSelectionToEditingSessionAction);
     registerAction2(AttachSearchResultAction);
 }
+function isIAttachmentQuickPickItem(obj) {
+    return (typeof obj === 'object'
+        && obj !== null
+        && typeof obj.kind === 'string');
+}
+const attachmentsOrdinals = [
+    'tools',
+    'command',
+    'screenshot',
+    'image',
+    'workspaceSymbol',
+    'diagnostic',
+    'instructions',
+    'related-files',
+    'folder',
+    'open-editors',
+];
 function isIGotoSymbolQuickPickItem(obj) {
     return (typeof obj === 'object'
         && typeof obj.symbolName === 'string'
@@ -81,42 +96,12 @@ 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'
         && URI.isUri(obj.resource));
 }
-function isIOpenEditorsQuickPickItem(obj) {
-    return (typeof obj === 'object'
-        && obj.id === 'open-editors');
-}
-function isISearchResultsQuickPickItem(obj) {
-    return (typeof obj === 'object'
-        && obj.kind === 'search-results');
-}
-function isScreenshotQuickPickItem(obj) {
-    return (typeof obj === 'object'
-        && obj.kind === 'screenshot');
-}
-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 === 'reusable-prompt');
-}
-const REUSABLE_PROMPT_PICK_ID = 'reusable-prompt';
+const INSTRUCTION_PICK_ID = 'instructions';
 class AttachResourceAction extends Action2 {
     getResources(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
@@ -148,7 +133,7 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4382, "Add File to Chat")),
+            title: ( localize2(4399, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -160,12 +145,16 @@ class AttachFileToChatAction extends AttachResourceAction {
         });
     }
     async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
+        const viewsService = accessor.get(IViewsService);
         const files = this.getResources(accessor, ...args);
-        if (files.length) {
-            (await showChatView(accessor.get(IViewsService)))?.focusInput();
+        if (!files.length) {
+            return;
+        }
+        const widget = await showChatView(viewsService);
+        if (widget) {
+            widget.focusInput();
             for (const file of files) {
-                variablesService.attachContext('file', file, ChatAgentLocation.Panel);
+                widget.attachmentModel.addFile(file);
             }
         }
     }
@@ -175,18 +164,22 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4383, "Add Folder to Chat")),
+            title: ( localize2(4400, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
         });
     }
     async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
+        const viewsService = accessor.get(IViewsService);
         const folders = this.getResources(accessor, ...args);
-        if (folders.length) {
-            (await showChatView(accessor.get(IViewsService)))?.focusInput();
+        if (!folders.length) {
+            return;
+        }
+        const widget = await showChatView(viewsService);
+        if (widget) {
+            widget.focusInput();
             for (const folder of folders) {
-                variablesService.attachContext('folder', folder, ChatAgentLocation.Panel);
+                widget.attachmentModel.addFolder(folder);
             }
         }
     }
@@ -196,14 +189,18 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4384, "Add Selection to Chat")),
+            title: ( localize2(4401, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
         });
     }
     async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
         const editorService = accessor.get(IEditorService);
+        const viewsService = accessor.get(IViewsService);
+        const widget = await showChatView(viewsService);
+        if (!widget) {
+            return;
+        }
         const [_, matches] = args;
         if (matches && matches.length > 0) {
             const uris = ( new Map());
@@ -217,65 +214,37 @@ class AttachSelectionToChatAction extends Action2 {
                     if (!range ||
                         range.startLineNumber !== context.range.startLineNumber && range.endLineNumber !== context.range.endLineNumber) {
                         uris.set(context.uri, context.range);
-                        variablesService.attachContext('file', context, ChatAgentLocation.Panel);
+                        widget.attachmentModel.addFile(context.uri, context.range);
                     }
                 }
             }
             for (const uri of uris) {
                 const [resource, range] = uri;
                 if (!range) {
-                    variablesService.attachContext('file', { uri: resource }, ChatAgentLocation.Panel);
+                    widget.attachmentModel.addFile(resource);
                 }
             }
         }
         else {
             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 (activeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+                const selection = activeEditor.getSelection();
                 if (selection) {
-                    (await showChatView(accessor.get(IViewsService)))?.focusInput();
+                    widget.focusInput();
                     const range = selection.isEmpty() ? ( new Range(selection.startLineNumber, 1, selection.startLineNumber + 1, 1)) : selection;
-                    variablesService.attachContext('file', { uri: activeUri, range }, ChatAgentLocation.Panel);
+                    widget.attachmentModel.addFile(activeUri, range);
                 }
             }
         }
     }
 }
-class AttachFileToEditingSessionAction extends AttachResourceAction {
-    static { this.ID = 'workbench.action.edits.attachFile'; }
-    constructor() {
-        super({
-            id: AttachFileToEditingSessionAction.ID,
-            title: ( localize2(4385, "Add File to {0}", 'Copilot Edits')),
-            category: CHAT_CATEGORY,
-            f1: false,
-            menu: [{
-                    id: MenuId.SearchContext,
-                    group: 'z_chat',
-                    order: 2,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( ChatContextKeyExprs.unifiedChatEnabled.negate()), ( SearchContext.SearchResultHeaderFocused.negate()))),
-                }]
-        });
-    }
-    async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
-        const files = this.getResources(accessor, ...args);
-        if (files.length) {
-            (await showEditsView(accessor.get(IViewsService)))?.focusInput();
-            for (const file of files) {
-                variablesService.attachContext('file', file, ChatAgentLocation.EditingSession);
-            }
-        }
-    }
-}
 class AttachSearchResultAction extends Action2 {
     static { this.Name = 'searchResults'; }
-    static { this.ID = 'workbench.action.chat.insertSearchResults'; }
     constructor() {
         super({
-            id: AttachSearchResultAction.ID,
-            title: ( localize2(4386, 'Add Search Results to Chat')),
+            id: 'workbench.action.chat.insertSearchResults',
+            title: ( localize2(4402, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -286,9 +255,9 @@ class AttachSearchResultAction extends Action2 {
                 }]
         });
     }
-    async run(accessor, ...args) {
+    async run(accessor) {
         const logService = accessor.get(ILogService);
-        const widget = (await showChatView(accessor.get(IViewsService)));
+        const widget = await showChatView(accessor.get(IViewsService));
         if (!widget) {
             logService.trace('InsertSearchResultAction: no chat view available');
             return;
@@ -304,7 +273,7 @@ class AttachSearchResultAction extends Action2 {
             originalRange.startLineNumber,
             originalRange.startColumn,
             originalRange.endLineNumber,
-            originalRange.startColumn + insertText.length
+            originalRange.startLineNumber + insertText.length
         ));
         const model = editor.getModel();
         if (model && model.getValueInRange(( new Range(
@@ -322,76 +291,25 @@ class AttachSearchResultAction extends Action2 {
         }
     }
 }
-class AttachFolderToEditingSessionAction extends AttachResourceAction {
-    static { this.ID = 'workbench.action.edits.attachFolder'; }
-    constructor() {
-        super({
-            id: AttachFolderToEditingSessionAction.ID,
-            title: ( localize2(4387, "Add Folder to {0}", 'Copilot Edits')),
-            category: CHAT_CATEGORY,
-            f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeyExprs.unifiedChatEnabled.negate()))),
-        });
-    }
-    async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
-        const folders = this.getResources(accessor, ...args);
-        if (folders.length) {
-            (await showEditsView(accessor.get(IViewsService)))?.focusInput();
-            for (const folder of folders) {
-                variablesService.attachContext('folder', folder, ChatAgentLocation.EditingSession);
-            }
-        }
-    }
-}
-class AttachSelectionToEditingSessionAction extends Action2 {
-    static { this.ID = 'workbench.action.edits.attachSelection'; }
+class AttachContextAction extends Action2 {
     constructor() {
         super({
-            id: AttachSelectionToEditingSessionAction.ID,
-            title: ( localize2(4388, "Add Selection to {0}", 'Copilot Edits')),
+            id: 'workbench.action.chat.attachContext',
+            title: ( localize2(4403, "Add Context...")),
+            icon: Codicon.attach,
             category: CHAT_CATEGORY,
-            f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( ChatContextKeyExprs.unifiedChatEnabled.negate())))
-        });
-    }
-    async run(accessor, ...args) {
-        const variablesService = accessor.get(IChatVariablesService);
-        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();
-                const range = selection.isEmpty() ? ( new Range(selection.startLineNumber, 1, selection.startLineNumber + 1, 1)) : selection;
-                variablesService.attachContext('file', { uri: activeUri, range }, ChatAgentLocation.EditingSession);
-            }
-        }
-    }
-}
-class AttachContextAction extends Action2 {
-    static { this.ID = 'workbench.action.chat.attachContext'; }
-    constructor(desc = {
-        id: AttachContextAction.ID,
-        title: ( localize2(4389, "Add Context")),
-        icon: Codicon.attach,
-        category: CHAT_CATEGORY,
-        keybinding: {
-            when: ( ContextKeyExpr.and(( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession)), ChatContextKeys.inChatInput, ChatContextKeyExprs.inNonUnifiedPanel)),
-            primary: KeyMod.CtrlCmd | KeyCode.Slash,
-            weight: KeybindingWeight.EditorContrib
-        },
-        menu: [
-            {
-                when: ChatContextKeyExprs.inNonUnifiedPanel,
+            keybinding: {
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)))),
+                primary: KeyMod.CtrlCmd | KeyCode.Slash,
+                weight: KeybindingWeight.EditorContrib
+            },
+            menu: {
+                when: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
                 id: MenuId.ChatInputAttachmentToolbar,
                 group: 'navigation',
-                order: 2
-            }
-        ]
-    }) {
-        super(desc);
+                order: 3
+            },
+        });
     }
     _getFileContextId(item) {
         if ('resource' in item) {
@@ -401,39 +319,148 @@ 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, textModelService, isInBackground, ...picks) {
+    async _attachContext(accessor, widget, isInBackground, ...picks) {
+        const commandService = accessor.get(ICommandService);
+        const clipboardService = accessor.get(IClipboardService);
+        const editorService = accessor.get(IEditorService);
+        const labelService = accessor.get(ILabelService);
+        const viewsService = accessor.get(IViewsService);
+        const chatEditingService = accessor.get(IChatEditingService);
+        const hostService = accessor.get(IHostService);
+        const fileService = accessor.get(IFileService);
+        const textModelService = accessor.get(ITextModelService);
+        const quickInputService = accessor.get(IQuickInputService);
         const toAttach = [];
         for (const pick of picks) {
-            if (isISymbolQuickPickItem(pick) && pick.symbol) {
+            if (isIAttachmentQuickPickItem(pick)) {
+                if (pick.kind === 'folder-search-result') {
+                    toAttach.push({
+                        kind: 'directory',
+                        id: pick.id,
+                        value: pick.resource,
+                        name: basename(pick.resource),
+                    });
+                }
+                else if (pick.kind === 'diagnostic-filter') {
+                    toAttach.push({
+                        id: pick.id,
+                        name: pick.label,
+                        value: pick.filter,
+                        kind: 'diagnostic',
+                        icon: pick.icon,
+                        ...pick.filter,
+                    });
+                }
+                else if (pick.kind === 'open-editors') {
+                    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) {
+                            toAttach.push({
+                                kind: 'file',
+                                id: this._getFileContextId({ resource: uri }),
+                                value: uri,
+                                name: labelService.getUriBasenameLabel(uri),
+                            });
+                        }
+                    }
+                }
+                else if (pick.kind === 'search-results') {
+                    const searchView = viewsService.getViewWithId(VIEW_ID);
+                    for (const result of searchView.model.searchResult.matches()) {
+                        toAttach.push({
+                            kind: 'file',
+                            id: this._getFileContextId({ resource: result.resource }),
+                            value: result.resource,
+                            name: labelService.getUriBasenameLabel(result.resource),
+                        });
+                    }
+                }
+                else if (pick.kind === 'related-files') {
+                    const chatSessionId = widget.viewModel?.sessionId;
+                    if (!chatSessionId || !chatEditingService) {
+                        continue;
+                    }
+                    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(), widget.attachmentModel.fileAttachments, CancellationToken.None)
+                        .then((files) => (files ?? []).reduce((acc, cur) => {
+                        acc.push({ type: 'separator', label: cur.group });
+                        for (const file of cur.files) {
+                            acc.push({
+                                type: 'item',
+                                label: labelService.getUriBasenameLabel(file.uri),
+                                description: labelService.getUriLabel(dirname(file.uri), { relative: true }),
+                                value: file.uri,
+                                disabled: ( attachments.has(this._getFileContextId({ resource: file.uri }))),
+                                picked: true
+                            });
+                        }
+                        return acc;
+                    }, []));
+                    const selectedFile = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4404, 'Add related files to your working set')) });
+                    if (selectedFile) {
+                        toAttach.push({
+                            kind: 'file',
+                            id: this._getFileContextId({ resource: selectedFile.value }),
+                            value: selectedFile.value,
+                            name: selectedFile.label,
+                            omittedState: OmittedState.NotOmitted
+                        });
+                    }
+                }
+                else if (pick.kind === 'screenshot') {
+                    const blob = await hostService.getScreenshot();
+                    if (blob) {
+                        toAttach.push(convertBufferToScreenshotVariable(blob));
+                    }
+                }
+                else if (pick.kind === 'command') {
+                    const selection = await commandService.executeCommand(pick.command.id, ...(pick.command.arguments ?? []));
+                    if (!selection) {
+                        continue;
+                    }
+                    toAttach.push({
+                        ...pick,
+                        value: pick.value,
+                        name: `${typeof pick.value === 'string' && pick.value.startsWith('#') ? pick.value.slice(1) : ''}${selection}`,
+                        fullName: selection
+                    });
+                }
+                else if (pick.kind === 'tool') {
+                    toAttach.push({
+                        id: pick.id,
+                        name: pick.tool.displayName,
+                        fullName: pick.tool.displayName,
+                        value: undefined,
+                        icon: pick.icon,
+                        kind: 'tool'
+                    });
+                }
+                else if (pick.kind === 'image') {
+                    const fileBuffer = await clipboardService.readImage();
+                    toAttach.push({
+                        id: await imageToHash(fileBuffer),
+                        name: ( localize(4405, 'Pasted Image')),
+                        fullName: ( localize(4405, 'Pasted Image')),
+                        value: fileBuffer,
+                        kind: 'image',
+                    });
+                }
+            }
+            else if (isISymbolQuickPickItem(pick) && pick.symbol) {
                 toAttach.push({
                     kind: 'symbol',
                     id: this._getFileContextId(pick.symbol.location),
                     value: pick.symbol.location,
                     symbolKind: pick.symbol.kind,
+                    icon: SymbolKinds.toIcon(pick.symbol.kind),
                     fullName: pick.label,
                     name: pick.symbol.name,
                 });
             }
-            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) {
                 if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
                     if (URI.isUri(pick.resource)) {
@@ -444,142 +471,38 @@ class AttachContextAction extends Action2 {
                             name: pick.label,
                             fullName: pick.label,
                             value: resizedImage,
-                            isImage: true
+                            kind: 'image',
+                            references: [{ reference: pick.resource, kind: 'reference' }]
                         });
                     }
                 }
                 else {
-                    let isOmitted = false;
+                    let omittedState = OmittedState.NotOmitted;
                     try {
                         const createdModel = await textModelService.createModelReference(pick.resource);
                         createdModel.dispose();
                     }
                     catch {
-                        isOmitted = true;
+                        omittedState = OmittedState.Full;
                     }
                     toAttach.push({
+                        kind: 'file',
                         id: this._getFileContextId({ resource: pick.resource }),
                         value: pick.resource,
                         name: pick.label,
-                        isFile: true,
-                        isOmitted
+                        omittedState
                     });
                 }
             }
             else if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
                 toAttach.push({
-                    range: undefined,
+                    kind: 'generic',
                     id: this._getFileContextId({ uri: pick.uri, range: pick.range.decoration }),
                     value: { uri: pick.uri, range: pick.range.decoration },
                     fullName: pick.label,
                     name: pick.symbolName,
                 });
             }
-            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) {
-                        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()) {
-                    toAttach.push({
-                        id: this._getFileContextId({ resource: result.resource }),
-                        value: result.resource,
-                        name: labelService.getUriBasenameLabel(result.resource),
-                        isFile: true,
-                    });
-                }
-            }
-            else if (isRelatedFileQuickPickItem(pick)) {
-                const chatSessionId = widget.viewModel?.sessionId;
-                if (!chatSessionId || !chatEditingService) {
-                    continue;
-                }
-                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(), widget.attachmentModel.fileAttachments, CancellationToken.None)
-                    .then((files) => (files ?? []).reduce((acc, cur) => {
-                    acc.push({ type: 'separator', label: cur.group });
-                    for (const file of cur.files) {
-                        acc.push({
-                            type: 'item',
-                            label: labelService.getUriBasenameLabel(file.uri),
-                            description: labelService.getUriLabel(dirname(file.uri), { relative: true }),
-                            value: file.uri,
-                            disabled: ( attachments.has(this._getFileContextId({ resource: file.uri }))),
-                            picked: true
-                        });
-                    }
-                    return acc;
-                }, []));
-                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4390, 'Add related files to your working set')), canPickMany: true });
-                for (const file of selectedFiles ?? []) {
-                    toAttach.push({
-                        id: this._getFileContextId({ resource: file.value }),
-                        value: file.value,
-                        name: file.label,
-                        isFile: true,
-                        isOmitted: false
-                    });
-                }
-            }
-            else if (isScreenshotQuickPickItem(pick)) {
-                const blob = await hostService.getScreenshot();
-                if (blob) {
-                    toAttach.push(convertBufferToScreenshotVariable(blob));
-                }
-            }
-            else if (isPromptInstructionsQuickPickItem(pick)) {
-                const options = { widget };
-                await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
-            }
-            else {
-                const attachmentPick = pick;
-                if (attachmentPick.kind === 'command') {
-                    const selection = await commandService.executeCommand(attachmentPick.command.id, ...(attachmentPick.command.arguments ?? []));
-                    if (!selection) {
-                        continue;
-                    }
-                    toAttach.push({
-                        ...attachmentPick,
-                        value: attachmentPick.value,
-                        name: `${typeof attachmentPick.value === 'string' && attachmentPick.value.startsWith('#') ? attachmentPick.value.slice(1) : ''}${selection}`,
-                        fullName: selection
-                    });
-                }
-                else if (attachmentPick.kind === 'tool') {
-                    toAttach.push({
-                        id: attachmentPick.id,
-                        name: attachmentPick.label,
-                        fullName: attachmentPick.label,
-                        value: undefined,
-                        icon: attachmentPick.icon,
-                        isTool: true
-                    });
-                }
-                else if (attachmentPick.kind === 'image') {
-                    const fileBuffer = await clipboardService.readImage();
-                    toAttach.push({
-                        id: await imageToHash(fileBuffer),
-                        name: ( localize(4391, 'Pasted Image')),
-                        fullName: ( localize(4391, 'Pasted Image')),
-                        value: fileBuffer,
-                        isImage: true
-                    });
-                }
-            }
         }
         widget.attachmentModel.addContext(...toAttach);
         if (!isInBackground) {
@@ -587,37 +510,27 @@ class AttachContextAction extends Action2 {
         }
     }
     async run(accessor, ...args) {
-        const quickInputService = accessor.get(IQuickInputService);
         const chatAgentService = accessor.get(IChatAgentService);
-        const commandService = accessor.get(ICommandService);
         const widgetService = accessor.get(IChatWidgetService);
-        const languageModelToolsService = accessor.get(ILanguageModelToolsService);
-        const quickChatService = accessor.get(IQuickChatService);
         const clipboardService = accessor.get(IClipboardService);
         const editorService = accessor.get(IEditorService);
-        const labelService = accessor.get(ILabelService);
         const contextKeyService = accessor.get(IContextKeyService);
-        const viewsService = accessor.get(IViewsService);
-        const hostService = accessor.get(IHostService);
-        const extensionService = accessor.get(IExtensionService);
-        const fileService = accessor.get(IFileService);
-        const textModelService = accessor.get(ITextModelService);
         const instantiationService = accessor.get(IInstantiationService);
         const keybindingService = accessor.get(IKeybindingService);
+        const chatEditingService = accessor.get(IChatEditingService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
             return;
         }
-        const chatEditingService = widget.location === ChatAgentLocation.EditingSession || widget.isUnifiedPanelWidget ? accessor.get(IChatEditingService) : undefined;
         const quickPickItems = [];
-        if (( extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')))) {
+        if (widget.input.selectedLanguageModel?.metadata.capabilities?.vision) {
             const imageData = await clipboardService.readImage();
             if (isImage(imageData)) {
                 quickPickItems.push({
                     kind: 'image',
                     id: await imageToHash(imageData),
-                    label: ( localize(4392, 'Image from Clipboard')),
+                    label: ( localize(4406, 'Image from Clipboard')),
                     iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
                 });
             }
@@ -627,8 +540,8 @@ class AttachContextAction extends Action2 {
                 icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
                 iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
                 label: (isElectron
-                    ? ( localize(4393, 'Screenshot Window'))
-                    : ( localize(4394, 'Screenshot'))),
+                    ? ( localize(4407, 'Screenshot Window'))
+                    : ( localize(4408, 'Screenshot'))),
             });
         }
         if (widget.viewModel?.sessionId) {
@@ -651,39 +564,27 @@ class AttachContextAction extends Action2 {
                 }
             }
         }
-        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(4395, 'Symbol...')),
+            kind: 'tools',
+            label: ( localize(4409, 'Tools...')),
+            iconClass: ThemeIcon.asClassName(Codicon.tools),
+            id: 'tools',
+        });
+        quickPickItems.push({
+            kind: 'workspaceSymbol',
+            label: ( localize(4410, 'Symbols...')),
             iconClass: ThemeIcon.asClassName(Codicon.symbolField),
-            prefix: SymbolsQuickAccessProvider.PREFIX,
             id: 'symbol'
         });
         quickPickItems.push({
             kind: 'folder',
-            label: ( localize(4396, 'Folder...')),
+            label: ( localize(4411, 'Files & Folders...')),
             iconClass: ThemeIcon.asClassName(Codicon.folder),
             id: 'folder',
         });
         quickPickItems.push({
             kind: 'diagnostic',
-            label: ( localize(4397, 'Problem...')),
+            label: ( localize(4412, 'Problems...')),
             iconClass: ThemeIcon.asClassName(Codicon.error),
             id: 'diagnostic'
         });
@@ -694,68 +595,56 @@ class AttachContextAction extends Action2 {
                 icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
                 iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
                 value: 'kernelVariable',
-                label: ( localize(4398, 'Kernel Variable...')),
+                label: ( localize(4413, 'Kernel Variable...')),
                 command: {
                     id: 'notebook.chat.selectAndInsertKernelVariable',
-                    title: ( localize(4399, 'Select and Insert Kernel Variable')),
+                    title: ( localize(4414, 'Select and Insert Kernel Variable')),
                     arguments: [{ widget, range: undefined }]
                 }
             });
         }
-        if (context?.showFilesOnly) {
-            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || widget.attachmentModel.fileAttachments.length > 0)) {
-                quickPickItems.unshift({
-                    kind: 'related-files',
-                    id: 'related-files',
-                    label: ( localize(4400, 'Related Files')),
-                    iconClass: ThemeIcon.asClassName(Codicon.sparkle),
-                });
-            }
-            if (editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput).length > 0) {
-                quickPickItems.unshift({
-                    kind: 'open-editors',
-                    id: 'open-editors',
-                    label: ( localize(4401, 'Open Editors')),
-                    iconClass: ThemeIcon.asClassName(Codicon.files),
-                });
-            }
-            if (SearchContext.HasSearchResults.getValue(contextKeyService)) {
-                quickPickItems.unshift({
-                    kind: 'search-results',
-                    id: 'search-results',
-                    label: ( localize(4402, 'Search Results')),
-                    iconClass: ThemeIcon.asClassName(Codicon.search),
-                });
-            }
+        if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || widget.attachmentModel.fileAttachments.length > 0)) {
+            quickPickItems.push({
+                kind: 'related-files',
+                id: 'related-files',
+                label: ( localize(4415, '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({
+                kind: 'open-editors',
+                id: 'open-editors',
+                label: ( localize(4416, 'Open Editors')),
+                iconClass: ThemeIcon.asClassName(Codicon.files),
+            });
+        }
+        if (SearchContext.HasSearchResults.getValue(contextKeyService)) {
+            quickPickItems.push({
+                kind: 'search-results',
+                id: 'search-results',
+                label: ( localize(4417, 'Search Results')),
+                iconClass: ThemeIcon.asClassName(Codicon.search),
+            });
         }
         if (widget.attachmentModel.promptInstructions.featureEnabled) {
-            const keybinding = keybindingService.lookupKeybinding(COMMAND_ID, contextKeyService);
+            const keybinding = keybindingService.lookupKeybinding(INSTRUCTIONS_COMMAND_ID, contextKeyService);
             quickPickItems.push({
-                id: REUSABLE_PROMPT_PICK_ID,
-                kind: REUSABLE_PROMPT_PICK_ID,
-                label: ( localize(4403, 'Prompt...')),
+                id: INSTRUCTION_PICK_ID,
+                kind: INSTRUCTION_PICK_ID,
+                label: ( localize(4418, 'Instructions...')),
                 iconClass: ThemeIcon.asClassName(Codicon.bookmark),
                 keybinding,
             });
         }
-        function extractTextFromIconLabel(label) {
-            if (!label) {
-                return '';
-            }
-            const match = label.match(/\$\([^\)]+\)\s*(.+)/);
-            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;
+        quickPickItems.sort((a, b) => {
+            let result = attachmentsOrdinals.indexOf(b.kind) - attachmentsOrdinals.indexOf(a.kind);
+            if (result === 0) {
+                result = a.label.localeCompare(b.label);
             }
-            const first = extractTextFromIconLabel(a.label).toUpperCase();
-            const second = extractTextFromIconLabel(b.label).toUpperCase();
-            return compare(first, second);
-        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', context?.placeholder);
+            return result;
+        });
+        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, '', context?.placeholder);
     }
     async _showDiagnosticsPick(instantiationService, onBackgroundAccept) {
         const convert = (item) => ({
@@ -765,43 +654,53 @@ class AttachContextAction extends Action2 {
             icon: IDiagnosticVariableEntryFilterData.icon,
             filter: item,
         });
-        const filter = await instantiationService.invokeFunction(accessor => createMarkersQuickPick(accessor, 'problem', items => onBackgroundAccept(( items.map(convert)))));
+        const filter = await instantiationService.invokeFunction(createMarkersQuickPick, items => onBackgroundAccept(( items.map(convert))));
         return filter && convert(filter);
     }
-    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, query = '', placeholder) {
+    _show(accessor, widget, quickPickItems, query = '', placeholder) {
+        const quickInputService = accessor.get(IQuickInputService);
+        const quickChatService = accessor.get(IQuickChatService);
+        const editorService = accessor.get(IEditorService);
+        const commandService = accessor.get(ICommandService);
+        const instantiationService = accessor.get(IInstantiationService);
         const attach = (isBackgroundAccept, ...items) => {
-            this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, isBackgroundAccept, ...items);
+            instantiationService.invokeFunction(this._attachContext.bind(this), widget, isBackgroundAccept, ...items);
         };
         const providerOptions = {
+            additionPicks: quickPickItems,
             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, textModelService, instantiationService, item.prefix, placeholder);
-                }
-                else {
-                    if (!clipboardService) {
+                if (isIAttachmentQuickPickItem(item)) {
+                    if (item.kind === 'workspaceSymbol') {
+                        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, SymbolsQuickAccessProvider.PREFIX, placeholder);
                         return;
                     }
-                    attach(isBackgroundAccept, item);
-                    if (isQuickChat(widget)) {
-                        quickChatService.open();
+                    else if (item.kind === 'instructions') {
+                        runAttachInstructionsAction(commandService, { widget });
+                        return;
+                    }
+                    if (item.kind === 'folder') {
+                        item = await this._showFolders(instantiationService);
+                    }
+                    else if (item.kind === 'diagnostic') {
+                        item = await this._showDiagnosticsPick(instantiationService, i => attach(true, ...i));
+                    }
+                    else if (item.kind === 'tools') {
+                        item = await instantiationService.invokeFunction(showToolsPick, widget);
+                    }
+                    if (!item) {
+                        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, '', placeholder);
+                        return;
                     }
                 }
+                attach(isBackgroundAccept, item);
+                if (isQuickChat(widget)) {
+                    quickChatService.open();
+                }
             },
-            additionPicks: quickPickItems,
             filter: (item) => {
                 const attachedContext = widget.attachmentModel.getAttachmentIDs();
-                if (isIOpenEditorsQuickPickItem(item)) {
+                if (isIAttachmentQuickPickItem(item) && item.kind === 'open-editors') {
                     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 })))) {
                             return true;
@@ -834,12 +733,12 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4404, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4419, 'Search attachments')),
             providerOptions,
         });
     }
     async _showFolders(instantiationService) {
-        const folder = await instantiationService.invokeFunction(accessor => createFolderQuickPick(accessor));
+        const folder = await instantiationService.invokeFunction(createFilesAndFolderQuickPick);
         if (!folder) {
             return undefined;
         }
@@ -851,35 +750,103 @@ class AttachContextAction extends Action2 {
         };
     }
 }
-registerAction2(class AttachFilesAction extends AttachContextAction {
-    constructor() {
-        super({
-            id: 'workbench.action.chat.editing.attachContext',
-            title: ( localize2(4405, "Add Context to Copilot Edits")),
-            shortTitle: ( localize2(4406, "Add Context...")),
-            f1: false,
-            category: CHAT_CATEGORY,
-            menu: {
-                when: ChatContextKeyExprs.inEditsOrUnified,
-                id: MenuId.ChatInputAttachmentToolbar,
-                group: 'navigation',
-                order: 3
-            },
-            icon: Codicon.attach,
-            precondition: ChatContextKeyExprs.inEditsOrUnified,
-            keybinding: {
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeyExprs.inEditsOrUnified)),
-                primary: KeyMod.CtrlCmd | KeyCode.Slash,
-                weight: KeybindingWeight.EditorContrib
+async function createMarkersQuickPick(accessor, onBackgroundAccept) {
+    const quickInputService = accessor.get(IQuickInputService);
+    const markerService = accessor.get(IMarkerService);
+    const labelService = accessor.get(ILabelService);
+    const markers = markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
+    const grouped = groupBy(markers, (a, b) => extUri.compare(a.resource, b.resource));
+    const severities = ( new Set());
+    const items = [];
+    for (const group of grouped) {
+        const resource = group[0].resource;
+        items.push({ type: 'separator', label: labelService.getUriLabel(resource, { relative: true }) });
+        for (const marker of group) {
+            severities.add(marker.severity);
+            items.push({
+                type: 'item',
+                resource: marker.resource,
+                label: marker.message,
+                description: ( localize(
+                    4420,
+                    "[Ln {0}, Col {1}]",
+                    '' + marker.startLineNumber,
+                    '' + marker.startColumn
+                )),
+                entry: IDiagnosticVariableEntryFilterData.fromMarker(marker),
+            });
+        }
+    }
+    items.unshift({ type: 'item', label: ( localize(4421, 'All Problems')), entry: { filterSeverity: MarkerSeverity.Info } });
+    const store = ( new DisposableStore());
+    const quickPick = store.add(quickInputService.createQuickPick({ useSeparators: true }));
+    quickPick.canAcceptInBackground = !onBackgroundAccept;
+    quickPick.placeholder = ( localize(4422, 'Select a problem to attach'));
+    quickPick.items = items;
+    return ( new Promise(resolve => {
+        store.add(quickPick.onDidHide(() => resolve(undefined)));
+        store.add(quickPick.onDidAccept(ev => {
+            if (ev.inBackground) {
+                onBackgroundAccept?.(( quickPick.selectedItems.map(i => i.entry)));
             }
-        });
+            else {
+                resolve(quickPick.selectedItems[0]?.entry);
+                quickPick.dispose();
+            }
+        }));
+        quickPick.show();
+    })).finally(() => store.dispose());
+}
+async function showToolsPick(accessor, widget) {
+    const quickPickService = accessor.get(IQuickInputService);
+    function classify(tool) {
+        if (tool.source.type === 'internal' || tool.source.type === 'extension' && !tool.source.isExternalTool) {
+            return { ordinal: 1, groupLabel: ( localize(4423, 'Built-In')) };
+        }
+        else if (tool.source.type === 'mcp') {
+            return { ordinal: 2, groupLabel: ( localize(4424, 'MCP Servers')) };
+        }
+        else {
+            return { ordinal: 3, groupLabel: ( localize(4425, 'Extensions')) };
+        }
     }
-    async run(accessor, ...args) {
-        const context = args[0];
-        const attachFilesContext = { ...context, showFilesOnly: true };
-        return super.run(accessor, attachFilesContext);
+    const items = [];
+    for (const tool of widget.input.selectedToolsModel.tools.get()) {
+        if (!tool.canBeReferencedInPrompt) {
+            continue;
+        }
+        const item = {
+            tool,
+            ...classify(tool),
+            kind: 'tool',
+            label: tool.toolReferenceName ?? tool.id,
+            description: (tool.toolReferenceName ?? tool.id) !== tool.displayName ? tool.displayName : undefined,
+            id: tool.id,
+        };
+        items.push(item);
     }
-});
-registerAction2(AttachPromptAction);
+    items.sort((a, b) => {
+        let res = a.ordinal - b.ordinal;
+        if (res === 0) {
+            res = a.label.localeCompare(b.label);
+        }
+        return res;
+    });
+    let lastGroupLabel;
+    const picks = [];
+    for (const item of items) {
+        if (lastGroupLabel !== item.groupLabel) {
+            picks.push({ type: 'separator', label: item.groupLabel });
+            lastGroupLabel = item.groupLabel;
+        }
+        picks.push(item);
+    }
+    const result = await quickPickService.pick(picks, {
+        placeHolder: ( localize(4426, 'Select a tool')),
+        canPickMany: false
+    });
+    return result;
+}
+registerPromptActions();
 
 export { AttachContextAction, AttachSearchResultAction, registerChatContextActions };