@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.1

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

@@ -1,65 +1,49 @@
 
-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 { isThenable, DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationTokenSource } 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 { DisposableStore, toDisposable } 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, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 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';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { 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 { 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 { ResourceContextKey } 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-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 { 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 { 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-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 { ExplorerFolderContext } from '@codingame/monaco-vscode-97284942-b044-5fbb-b53b-3f46d2468746-common/vscode/vs/workbench/contrib/files/common/files';
 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 { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
+import { SearchContext } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/constants';
 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 { 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 { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
+import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
 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 { resizeImage } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { registerPromptActions } from './promptActions/index.js';
-import { runAttachInstructionsAction } from './promptActions/chatAttachInstructionsAction.js';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
@@ -67,43 +51,26 @@ function registerChatContextActions() {
     registerAction2(AttachFolderToChatAction);
     registerAction2(AttachSelectionToChatAction);
     registerAction2(AttachSearchResultAction);
+    registerPromptActions();
 }
-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'
-        && !!obj.uri
-        && !!obj.range);
-}
-function isISymbolQuickPickItem(obj) {
-    return (typeof obj === 'object'
-        && typeof obj.symbol === 'object'
-        && !!obj.symbol);
-}
-function isIQuickPickItemWithResource(obj) {
-    return (typeof obj === 'object'
-        && typeof obj.resource === 'object'
-        && URI.isUri(obj.resource));
+async function withChatView(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const chatWidgetService = accessor.get(IChatWidgetService);
+    if (chatWidgetService.lastFocusedWidget) {
+        return chatWidgetService.lastFocusedWidget;
+    }
+    return showChatView(viewsService);
 }
-const INSTRUCTION_PICK_ID = 'instructions';
 class AttachResourceAction extends Action2 {
-    getResources(accessor, ...args) {
+    async run(accessor, ...args) {
+        const instaService = accessor.get(IInstantiationService);
+        const widget = await instaService.invokeFunction(withChatView);
+        if (!widget) {
+            return;
+        }
+        return instaService.invokeFunction(this.runWithWidget.bind(this), widget, ...args);
+    }
+    _getResources(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
         const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
         const files = [];
@@ -133,24 +100,36 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4399, "Add File to Chat")),
+            title: ( localize2(4442, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
                     id: MenuId.SearchContext,
                     group: 'z_chat',
                     order: 1,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( SearchContext.SearchResultHeaderFocused.negate()))),
+                    when: ( ContextKeyExpr.and(
+                        ChatContextKeys.enabled,
+                        SearchContext.FileMatchOrMatchFocusKey,
+                        ( SearchContext.SearchResultHeaderFocused.negate())
+                    )),
+                }, {
+                    id: MenuId.ChatExplorerMenu,
+                    group: 'zContext',
+                    order: 1,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ExplorerFolderContext.negate()), ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)))))),
+                }, {
+                    id: MenuId.ChatTextEditorMenu,
+                    group: 'zContext',
+                    order: 2,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
                 }]
         });
     }
-    async run(accessor, ...args) {
-        const viewsService = accessor.get(IViewsService);
-        const files = this.getResources(accessor, ...args);
+    async runWithWidget(accessor, widget, ...args) {
+        const files = this._getResources(accessor, ...args);
         if (!files.length) {
             return;
         }
-        const widget = await showChatView(viewsService);
         if (widget) {
             widget.focusInput();
             for (const file of files) {
@@ -164,18 +143,22 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4400, "Add Folder to Chat")),
+            title: ( localize2(4443, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
+            menu: {
+                id: MenuId.ChatExplorerMenu,
+                group: 'zContext',
+                order: 1,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ExplorerFolderContext, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote))))))
+            }
         });
     }
-    async run(accessor, ...args) {
-        const viewsService = accessor.get(IViewsService);
-        const folders = this.getResources(accessor, ...args);
+    async runWithWidget(accessor, widget, ...args) {
+        const folders = this._getResources(accessor, ...args);
         if (!folders.length) {
             return;
         }
-        const widget = await showChatView(viewsService);
         if (widget) {
             widget.focusInput();
             for (const folder of folders) {
@@ -189,15 +172,20 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4401, "Add Selection to Chat")),
+            title: ( localize2(4444, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
+            menu: {
+                id: MenuId.ChatTextEditorMenu,
+                group: 'zContext',
+                order: 1,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
+            }
         });
     }
     async run(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
-        const viewsService = accessor.get(IViewsService);
-        const widget = await showChatView(viewsService);
+        const widget = await accessor.get(IInstantiationService).invokeFunction(withChatView);
         if (!widget) {
             return;
         }
@@ -244,7 +232,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4402, 'Add Search Results to Chat')),
+            title: ( localize2(4445, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -257,7 +245,7 @@ class AttachSearchResultAction extends Action2 {
     }
     async run(accessor) {
         const logService = accessor.get(ILogService);
-        const widget = await showChatView(accessor.get(IViewsService));
+        const widget = await accessor.get(IInstantiationService).invokeFunction(withChatView);
         if (!widget) {
             logService.trace('InsertSearchResultAction: no chat view available');
             return;
@@ -291,11 +279,26 @@ class AttachSearchResultAction extends Action2 {
         }
     }
 }
+function isIContextPickItemItem(obj) {
+    return (isObject(obj)
+        && typeof obj.kind === 'string'
+        && obj.kind === 'contextPick');
+}
+function isIGotoSymbolQuickPickItem(obj) {
+    return (isObject(obj)
+        && typeof obj.symbolName === 'string'
+        && !!obj.uri
+        && !!obj.range);
+}
+function isIQuickPickItemWithResource(obj) {
+    return (isObject(obj)
+        && URI.isUri(obj.resource));
+}
 class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4403, "Add Context...")),
+            title: ( localize2(4446, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -311,542 +314,201 @@ class AttachContextAction extends Action2 {
             },
         });
     }
-    _getFileContextId(item) {
-        if ('resource' in item) {
-            return ( item.resource.toString());
-        }
-        return ( item.uri.toString()) + (item.range.startLineNumber !== item.range.endLineNumber ?
-            `:${item.range.startLineNumber}-${item.range.endLineNumber}` :
-            `:${item.range.startLineNumber}`);
-    }
-    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 (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 (isIQuickPickItemWithResource(pick) && pick.resource) {
-                if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
-                    if (URI.isUri(pick.resource)) {
-                        const readFile = await fileService.readFile(pick.resource);
-                        const resizedImage = await resizeImage(readFile.value.buffer);
-                        toAttach.push({
-                            id: ( pick.resource.toString()),
-                            name: pick.label,
-                            fullName: pick.label,
-                            value: resizedImage,
-                            kind: 'image',
-                            references: [{ reference: pick.resource, kind: 'reference' }]
-                        });
-                    }
-                }
-                else {
-                    let omittedState = OmittedState.NotOmitted;
-                    try {
-                        const createdModel = await textModelService.createModelReference(pick.resource);
-                        createdModel.dispose();
-                    }
-                    catch {
-                        omittedState = OmittedState.Full;
-                    }
-                    toAttach.push({
-                        kind: 'file',
-                        id: this._getFileContextId({ resource: pick.resource }),
-                        value: pick.resource,
-                        name: pick.label,
-                        omittedState
-                    });
-                }
-            }
-            else if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
-                toAttach.push({
-                    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,
-                });
-            }
-        }
-        widget.attachmentModel.addContext(...toAttach);
-        if (!isInBackground) {
-            widget.focusInput();
-        }
-    }
     async run(accessor, ...args) {
-        const chatAgentService = accessor.get(IChatAgentService);
+        const instantiationService = accessor.get(IInstantiationService);
         const widgetService = accessor.get(IChatWidgetService);
-        const clipboardService = accessor.get(IClipboardService);
-        const editorService = accessor.get(IEditorService);
         const contextKeyService = accessor.get(IContextKeyService);
-        const instantiationService = accessor.get(IInstantiationService);
         const keybindingService = accessor.get(IKeybindingService);
-        const chatEditingService = accessor.get(IChatEditingService);
+        const contextPickService = accessor.get(IChatContextPickService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
             return;
         }
         const quickPickItems = [];
-        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(4406, 'Image from Clipboard')),
-                    iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
-                });
-            }
-            quickPickItems.push({
-                kind: 'screenshot',
-                id: ScreenshotVariableId,
-                icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
-                iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
-                label: (isElectron
-                    ? ( localize(4407, 'Screenshot Window'))
-                    : ( localize(4408, '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 item of contextPickService.items) {
+            if (item.isEnabled && !(await item.isEnabled(widget))) {
+                continue;
             }
-        }
-        quickPickItems.push({
-            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),
-            id: 'symbol'
-        });
-        quickPickItems.push({
-            kind: 'folder',
-            label: ( localize(4411, 'Files & Folders...')),
-            iconClass: ThemeIcon.asClassName(Codicon.folder),
-            id: 'folder',
-        });
-        quickPickItems.push({
-            kind: 'diagnostic',
-            label: ( localize(4412, 'Problems...')),
-            iconClass: ThemeIcon.asClassName(Codicon.error),
-            id: 'diagnostic'
-        });
-        if (widget.location === ChatAgentLocation.Notebook) {
-            quickPickItems.push({
-                kind: 'command',
-                id: 'chatContext.notebook.kernelVariable',
-                icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
-                iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
-                value: 'kernelVariable',
-                label: ( localize(4413, 'Kernel Variable...')),
-                command: {
-                    id: 'notebook.chat.selectAndInsertKernelVariable',
-                    title: ( localize(4414, 'Select and Insert Kernel Variable')),
-                    arguments: [{ widget, range: undefined }]
-                }
-            });
-        }
-        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),
+                kind: 'contextPick',
+                item,
+                label: item.label,
+                iconClass: ThemeIcon.asClassName(item.icon),
+                keybinding: item.commandId ? keybindingService.lookupKeybinding(item.commandId, contextKeyService) : undefined,
             });
         }
-        if (widget.attachmentModel.promptInstructions.featureEnabled) {
-            const keybinding = keybindingService.lookupKeybinding(INSTRUCTIONS_COMMAND_ID, contextKeyService);
-            quickPickItems.push({
-                id: INSTRUCTION_PICK_ID,
-                kind: INSTRUCTION_PICK_ID,
-                label: ( localize(4418, 'Instructions...')),
-                iconClass: ThemeIcon.asClassName(Codicon.bookmark),
-                keybinding,
-            });
-        }
-        quickPickItems.sort((a, b) => {
-            let result = attachmentsOrdinals.indexOf(b.kind) - attachmentsOrdinals.indexOf(a.kind);
-            if (result === 0) {
-                result = a.label.localeCompare(b.label);
-            }
-            return result;
-        });
-        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, '', context?.placeholder);
+        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, 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(createMarkersQuickPick, items => onBackgroundAccept(( items.map(convert))));
-        return filter && convert(filter);
-    }
-    _show(accessor, widget, quickPickItems, query = '', placeholder) {
+    _show(accessor, widget, additionPicks, 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) => {
-            instantiationService.invokeFunction(this._attachContext.bind(this), widget, isBackgroundAccept, ...items);
-        };
         const providerOptions = {
-            additionPicks: quickPickItems,
-            handleAccept: async (inputItem, isBackgroundAccept) => {
-                let item = inputItem;
-                if (isIAttachmentQuickPickItem(item)) {
-                    if (item.kind === 'workspaceSymbol') {
-                        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, SymbolsQuickAccessProvider.PREFIX, placeholder);
-                        return;
+            additionPicks,
+            handleAccept: async (item, isBackgroundAccept) => {
+                if (isIContextPickItemItem(item)) {
+                    let isDone = true;
+                    if (item.item.type === 'valuePick') {
+                        this._handleContextPick(item.item, widget);
                     }
-                    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.item.type === 'pickerPick') {
+                        isDone = await this._handleContextPickerItem(quickInputService, item.item, widget);
                     }
-                    else if (item.kind === 'tools') {
-                        item = await instantiationService.invokeFunction(showToolsPick, widget);
-                    }
-                    if (!item) {
-                        instantiationService.invokeFunction(this._show.bind(this), widget, quickPickItems, '', placeholder);
+                    if (!isDone) {
+                        instantiationService.invokeFunction(this._show.bind(this), widget, additionPicks, placeholder);
                         return;
                     }
                 }
-                attach(isBackgroundAccept, item);
+                else {
+                    instantiationService.invokeFunction(this._handleQPPick.bind(this), widget, isBackgroundAccept, item);
+                }
                 if (isQuickChat(widget)) {
                     quickChatService.open();
                 }
-            },
-            filter: (item) => {
-                const attachedContext = widget.attachmentModel.getAttachmentIDs();
-                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;
-                        }
-                    }
-                    return false;
-                }
-                if ('kind' in item && item.kind === 'image') {
-                    return !( attachedContext.has(item.id));
-                }
-                if ('symbol' in item && item.symbol) {
-                    return !( attachedContext.has(this._getFileContextId(item.symbol.location)));
-                }
-                if (item && typeof item === 'object' && 'resource' in item && URI.isUri(item.resource)) {
-                    return [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(item.resource.scheme)
-                        && !( attachedContext.has(this._getFileContextId({ resource: item.resource })));
-                }
-                if (item && typeof item === 'object' && 'uri' in item && item.uri && item.range) {
-                    return !( attachedContext.has(this._getFileContextId({ uri: item.uri, range: item.range.decoration })));
-                }
-                if (!('command' in item) && item.id) {
-                    return !( attachedContext.has(item.id));
-                }
-                return true;
             }
         };
-        quickInputService.quickAccess.show(query, {
+        quickInputService.quickAccess.show('', {
             enabledProviderPrefixes: [
                 AnythingQuickAccessProvider.PREFIX,
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4419, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4447, 'Search attachments')),
             providerOptions,
         });
     }
-    async _showFolders(instantiationService) {
-        const folder = await instantiationService.invokeFunction(createFilesAndFolderQuickPick);
-        if (!folder) {
-            return undefined;
-        }
-        return {
-            kind: 'folder-search-result',
-            id: ( folder.toString()),
-            label: basename(folder),
-            resource: folder,
-        };
-    }
-}
-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)));
+    async _handleQPPick(accessor, widget, isInBackground, pick) {
+        const fileService = accessor.get(IFileService);
+        const textModelService = accessor.get(ITextModelService);
+        const toAttach = [];
+        if (isIQuickPickItemWithResource(pick) && pick.resource) {
+            if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
+                if (URI.isUri(pick.resource)) {
+                    const readFile = await fileService.readFile(pick.resource);
+                    const resizedImage = await resizeImage(readFile.value.buffer);
+                    toAttach.push({
+                        id: ( pick.resource.toString()),
+                        name: pick.label,
+                        fullName: pick.label,
+                        value: resizedImage,
+                        kind: 'image',
+                        references: [{ reference: pick.resource, kind: 'reference' }]
+                    });
+                }
             }
             else {
-                resolve(quickPick.selectedItems[0]?.entry);
-                quickPick.dispose();
+                let omittedState = OmittedState.NotOmitted;
+                try {
+                    const createdModel = await textModelService.createModelReference(pick.resource);
+                    createdModel.dispose();
+                }
+                catch {
+                    omittedState = OmittedState.Full;
+                }
+                toAttach.push({
+                    kind: 'file',
+                    id: ( pick.resource.toString()),
+                    value: pick.resource,
+                    name: pick.label,
+                    omittedState
+                });
             }
-        }));
-        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 if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
+            toAttach.push({
+                kind: 'generic',
+                id: JSON.stringify({ uri: pick.uri, range: pick.range.decoration }),
+                value: { uri: pick.uri, range: pick.range.decoration },
+                fullName: pick.label,
+                name: pick.symbolName,
+            });
         }
-        else {
-            return { ordinal: 3, groupLabel: ( localize(4425, 'Extensions')) };
+        widget.attachmentModel.addContext(...toAttach);
+        if (!isInBackground) {
+            widget.focusInput();
         }
     }
-    const items = [];
-    for (const tool of widget.input.selectedToolsModel.tools.get()) {
-        if (!tool.canBeReferencedInPrompt) {
-            continue;
+    async _handleContextPick(item, widget) {
+        const value = await item.asAttachment(widget);
+        if (Array.isArray(value)) {
+            widget.attachmentModel.addContext(...value);
+        }
+        else if (value) {
+            widget.attachmentModel.addContext(value);
         }
-        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);
     }
-    items.sort((a, b) => {
-        let res = a.ordinal - b.ordinal;
-        if (res === 0) {
-            res = a.label.localeCompare(b.label);
+    async _handleContextPickerItem(quickInputService, item, widget) {
+        const pickerConfig = item.asPicker(widget);
+        const store = ( new DisposableStore());
+        const goBackItem = {
+            label: ( localize(4448, 'Go back ↩')),
+            alwaysShow: true
+        };
+        const extraPicks = [{ type: 'separator' }, goBackItem];
+        const qp = store.add(quickInputService.createQuickPick({ useSeparators: true }));
+        const cts = ( new CancellationTokenSource());
+        store.add(qp.onDidHide(() => cts.cancel()));
+        store.add(toDisposable(() => cts.dispose(true)));
+        qp.placeholder = pickerConfig.placeholder;
+        qp.matchOnDescription = true;
+        qp.matchOnDetail = true;
+        qp.canAcceptInBackground = true;
+        qp.busy = true;
+        qp.show();
+        if (isThenable(pickerConfig.picks)) {
+            const items = await (pickerConfig.picks.then(value => {
+                return [].concat(value, extraPicks);
+            }));
+            qp.items = items;
+            qp.busy = false;
+        }
+        else {
+            const query = observableValue('attachContext.query', qp.value);
+            store.add(qp.onDidChangeValue(() => query.set(qp.value, undefined)));
+            const picksObservable = pickerConfig.picks(query, cts.token);
+            store.add(autorun(reader => {
+                const { busy, picks } = picksObservable.read(reader);
+                qp.items = [].concat(picks, extraPicks);
+                qp.busy = busy;
+            }));
+        }
+        if (cts.token.isCancellationRequested) {
+            return true;
+        }
+        const defer = ( new DeferredPromise());
+        const addPromises = [];
+        store.add(qp.onDidAccept(e => {
+            const [selected] = qp.selectedItems;
+            if (isChatContextPickerPickItem(selected)) {
+                const attachment = selected.asAttachment();
+                if (isThenable(attachment)) {
+                    addPromises.push(attachment.then(v => widget.attachmentModel.addContext(v)));
+                }
+                else {
+                    widget.attachmentModel.addContext(attachment);
+                }
+            }
+            if (selected === goBackItem) {
+                defer.complete(false);
+            }
+            if (!e.inBackground) {
+                defer.complete(true);
+            }
+        }));
+        store.add(qp.onDidHide(() => {
+            defer.complete(true);
+        }));
+        try {
+            const result = await defer.p;
+            qp.busy = true;
+            await Promise.all(addPromises);
+            return result;
         }
-        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;
+        finally {
+            store.dispose();
         }
-        picks.push(item);
     }
-    const result = await quickPickService.pick(picks, {
-        placeHolder: ( localize(4426, 'Select a tool')),
-        canPickMany: false
-    });
-    return result;
 }
-registerPromptActions();
 
 export { AttachContextAction, AttachSearchResultAction, registerChatContextActions };