@codingame/monaco-vscode-chat-service-override 10.1.3 → 11.0.0

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

@@ -1,6 +1,7 @@
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isElectron } from 'vscode/vscode/vs/base/common/platform';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -8,44 +9,84 @@ import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { AbstractGotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { IChatWidgetService, IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { isQuickChat } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatContextAttachments } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
+import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { UntitledTextEditorInput } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { FileEditorInput } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
+import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
+import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
-import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { imageToHash, isImage } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatImagePaste';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService, IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { imageToHash, isImage } from '../chatPasteProviders.js';
+import { isQuickChat } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
     registerAction2(AttachFileAction);
     registerAction2(AttachSelectionAction);
 }
+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));
+}
+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');
+}
 class AttachFileAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachFile'; }
     constructor() {
         super({
             id: AttachFileAction.ID,
-            title: ( localize2(7312, "Add File to Chat")),
+            title: ( localize2(7532, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))),
+            precondition: ( (ContextKeyExpr.and(
+                CONTEXT_CHAT_ENABLED,
+                 (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))
+            ))),
             menu: {
                 id: MenuId.ChatCommandCenter,
                 group: 'a_chat',
@@ -68,10 +109,13 @@ class AttachSelectionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionAction.ID,
-            title: ( localize2(7313, "Add Selection to Chat")),
+            title: ( localize2(7533, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))),
+            precondition: ( (ContextKeyExpr.and(
+                CONTEXT_CHAT_ENABLED,
+                 (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))
+            ))),
             menu: {
                 id: MenuId.ChatCommandCenter,
                 group: 'a_chat',
@@ -97,52 +141,51 @@ class AttachContextAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachContext'; }
     static { this._cdt = ( (ContextKeyExpr.or(
          (ContextKeyExpr.and( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)))),
+         (ContextKeyExpr.and( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor)))),
          (ContextKeyExpr.and(
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor)),
-             (ContextKeyExpr.equals('config.chat.experimental.variables.editor', true))
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Notebook))
         )),
          (ContextKeyExpr.and(
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Notebook)),
-             (ContextKeyExpr.equals('config.chat.experimental.variables.notebook', true))
-        )),
-         (ContextKeyExpr.and(
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal)),
-             (ContextKeyExpr.equals('config.chat.experimental.variables.terminal', true))
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal))
         ))
     ))); }
-    constructor() {
-        super({
-            id: AttachContextAction.ID,
-            title: ( localize2(7314, "Attach Context")),
-            icon: Codicon.attach,
-            category: CHAT_CATEGORY,
-            precondition: AttachContextAction._cdt,
-            keybinding: {
-                when: CONTEXT_IN_CHAT_INPUT,
-                primary: 2048  | 90 ,
-                weight: 100
+    constructor(desc = {
+        id: AttachContextAction.ID,
+        title: ( localize2(7534, "Attach Context")),
+        icon: Codicon.attach,
+        category: CHAT_CATEGORY,
+        precondition: ( (ContextKeyExpr.or(AttachContextAction._cdt,  (ContextKeyExpr.and(
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))
+        ))))),
+        keybinding: {
+            when: CONTEXT_IN_CHAT_INPUT,
+            primary: 2048  | 90 ,
+            weight: 100
+        },
+        menu: [
+            {
+                when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
+                     (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))
+                )),  (ContextKeyExpr.and( (ContextKeyExpr.or(
+                     (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+                     (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))
+                )), AttachContextAction._cdt))))),
+                id: MenuId.ChatInput,
+                group: 'navigation',
+                order: 2
             },
-            menu: [
-                {
-                    when: ( (ContextKeyExpr.and(
-                         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
-                        AttachContextAction._cdt
-                    ))),
-                    id: MenuId.ChatInput,
-                    group: 'navigation',
-                    order: 2
-                },
-                {
-                    when: ( (ContextKeyExpr.and(
-                         (( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))).negate()),
-                        AttachContextAction._cdt
-                    ))),
-                    id: MenuId.ChatExecute,
-                    group: 'navigation',
-                    order: 1
-                },
-            ]
-        });
+            {
+                when: ( (ContextKeyExpr.and(
+                     (( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))).negate()),
+                    AttachContextAction._cdt
+                ))),
+                id: MenuId.ChatExecute,
+                group: 'navigation',
+                order: 1
+            },
+        ]
+    }) {
+        super(desc);
     }
     _getFileContextId(item) {
         if ('resource' in item) {
@@ -154,25 +197,11 @@ class AttachContextAction extends Action2 {
             `:${item.range.startLineNumber}-${item.range.endLineNumber}` :
             `:${item.range.startLineNumber}`);
     }
-    async _attachContext(widget, commandService, clipboardService, ...picks) {
+    async _attachContext(widget, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isInBackground, ...picks) {
         const toAttach = [];
         for (const pick of picks) {
-            if (pick && typeof pick === 'object' && 'command' in pick && pick.command) {
-                const selection = await commandService.executeCommand(pick.command.id, ...(pick.command.arguments ?? []));
-                if (!selection) {
-                    continue;
-                }
+            if (isISymbolQuickPickItem(pick) && pick.symbol) {
                 toAttach.push({
-                    ...pick,
-                    isDynamic: pick.isDynamic,
-                    value: pick.value,
-                    name: `${typeof pick.value === 'string' && pick.value.startsWith('#') ? pick.value.slice(1) : ''}${selection}`,
-                    fullName: selection
-                });
-            }
-            else if ('symbol' in pick && pick.symbol) {
-                toAttach.push({
-                    ...pick,
                     id: this._getFileContextId(pick.symbol.location),
                     value: pick.symbol.location,
                     fullName: pick.label,
@@ -180,7 +209,7 @@ class AttachContextAction extends Action2 {
                     isDynamic: true
                 });
             }
-            else if (pick && typeof pick === 'object' && 'resource' in pick && pick.resource) {
+            else if (isIQuickPickItemWithResource(pick) && pick.resource) {
                 if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
                     toAttach.push({
                         id: ( (pick.resource.toString())),
@@ -192,19 +221,22 @@ class AttachContextAction extends Action2 {
                     });
                 }
                 else {
-                    toAttach.push({
-                        ...pick,
-                        id: this._getFileContextId({ resource: pick.resource }),
-                        value: pick.resource,
-                        name: pick.label,
-                        isFile: true,
-                        isDynamic: true
-                    });
+                    if (chatEditingService) {
+                        chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(pick.resource);
+                    }
+                    else {
+                        toAttach.push({
+                            id: this._getFileContextId({ resource: pick.resource }),
+                            value: pick.resource,
+                            name: pick.label,
+                            isFile: true,
+                            isDynamic: true,
+                        });
+                    }
                 }
             }
-            else if ('symbolName' in pick && pick.uri && pick.range) {
+            else if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
                 toAttach.push({
-                    ...pick,
                     range: undefined,
                     id: this._getFileContextId({ uri: pick.uri, range: pick.range.decoration }),
                     value: { uri: pick.uri, range: pick.range.decoration },
@@ -213,40 +245,100 @@ class AttachContextAction extends Action2 {
                     isDynamic: true
                 });
             }
-            else if ('kind' in pick && pick.kind === 'tool') {
-                toAttach.push({
-                    id: pick.id,
-                    name: pick.label,
-                    fullName: pick.label,
-                    value: undefined,
-                    icon: pick.icon,
-                    isTool: true
-                });
+            else if (isIOpenEditorsQuickPickItem(pick)) {
+                for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput)) {
+                    const uri = editor instanceof DiffEditorInput ? editor.modified.resource : editor.resource;
+                    if (uri) {
+                        if (chatEditingService) {
+                            chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(uri);
+                        }
+                        else {
+                            toAttach.push({
+                                id: this._getFileContextId({ resource: uri }),
+                                value: uri,
+                                name: labelService.getUriBasenameLabel(uri),
+                                isFile: true,
+                                isDynamic: true
+                            });
+                        }
+                    }
+                }
             }
-            else if ('kind' in pick && pick.kind === 'image') {
-                const fileBuffer = await clipboardService.readImage();
-                toAttach.push({
-                    id: await imageToHash(fileBuffer),
-                    name: ( localize(7315, 'Pasted Image')),
-                    fullName: ( localize(7315, 'Pasted Image')),
-                    value: fileBuffer,
-                    isDynamic: true,
-                    isImage: true
-                });
+            else if (isISearchResultsQuickPickItem(pick)) {
+                const searchView = viewsService.getViewWithId(VIEW_ID);
+                for (const result of searchView.model.searchResult.matches()) {
+                    if (chatEditingService) {
+                        chatEditingService.currentEditingSessionObs.get()?.addFileToWorkingSet(result.resource);
+                    }
+                    else {
+                        toAttach.push({
+                            id: this._getFileContextId({ resource: result.resource }),
+                            value: result.resource,
+                            name: labelService.getUriBasenameLabel(result.resource),
+                            isFile: true,
+                            isDynamic: true
+                        });
+                    }
+                }
+            }
+            else if (isScreenshotQuickPickItem(pick)) {
+                const blob = await hostService.getScreenshot();
+                if (blob) {
+                    toAttach.push(convertBufferToScreenshotVariable(blob));
+                }
             }
             else {
-                toAttach.push({
-                    ...pick,
-                    range: undefined,
-                    id: pick.id ?? '',
-                    value: 'value' in pick ? pick.value : undefined,
-                    fullName: pick.label,
-                    name: 'name' in pick && typeof pick.name === 'string' ? pick.name : pick.label,
-                    icon: 'icon' in pick && ThemeIcon.isThemeIcon(pick.icon) ? pick.icon : undefined
-                });
+                const attachmentPick = pick;
+                if (attachmentPick.kind === 'command') {
+                    const selection = await commandService.executeCommand(attachmentPick.command.id, ...(attachmentPick.command.arguments ?? []));
+                    if (!selection) {
+                        continue;
+                    }
+                    toAttach.push({
+                        ...attachmentPick,
+                        isDynamic: attachmentPick.isDynamic,
+                        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(7535, 'Pasted Image')),
+                        fullName: ( localize(7535, 'Pasted Image')),
+                        value: fileBuffer,
+                        isDynamic: true,
+                        isImage: true
+                    });
+                }
+                else if (attachmentPick.kind === 'variable') {
+                    toAttach.push({
+                        range: undefined,
+                        id: pick.id ?? '',
+                        value: undefined,
+                        fullName: pick.label,
+                        name: attachmentPick.variable.name,
+                        icon: attachmentPick.variable.icon
+                    });
+                }
             }
         }
-        widget.getContrib(ChatContextAttachments.ID)?.setContext(false, ...toAttach);
+        widget.attachmentModel.addContext(...toAttach);
+        if (!isInBackground) {
+            widget.focusInput();
+        }
     }
     async run(accessor, ...args) {
         const quickInputService = accessor.get(IQuickInputService);
@@ -257,63 +349,79 @@ class AttachContextAction extends Action2 {
         const languageModelToolsService = accessor.get(ILanguageModelToolsService);
         const quickChatService = accessor.get(IQuickChatService);
         const clipboardService = accessor.get(IClipboardService);
-        const configurationService = accessor.get(IConfigurationService);
+        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 context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
             return;
         }
+        const chatEditingService = widget.location === ChatAgentLocation.EditingSession ? accessor.get(IChatEditingService) : undefined;
         const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
         const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
         const quickPickItems = [];
-        for (const variable of chatVariablesService.getVariables(widget.location)) {
-            if (variable.fullName && (!variable.isSlow || slowSupported)) {
-                quickPickItems.push({
-                    label: variable.fullName,
-                    name: variable.name,
-                    id: variable.id,
-                    iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
-                    icon: variable.icon
-                });
+        if (!context || !context.showFilesOnly) {
+            for (const variable of chatVariablesService.getVariables(widget.location)) {
+                if (variable.fullName && (!variable.isSlow || slowSupported)) {
+                    quickPickItems.push({
+                        kind: 'variable',
+                        variable,
+                        label: variable.fullName,
+                        id: variable.id,
+                        iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
+                    });
+                }
             }
-        }
-        if (configurationService.getValue('chat.experimental.imageAttachments')) {
-            const imageData = await clipboardService.readImage();
-            if (isImage(imageData)) {
+            if (( (extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))))) {
+                const imageData = await clipboardService.readImage();
+                if (isImage(imageData)) {
+                    quickPickItems.push({
+                        kind: 'image',
+                        id: await imageToHash(imageData),
+                        label: ( localize(7536, 'Image from Clipboard')),
+                        iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
+                    });
+                }
                 quickPickItems.push({
-                    id: await imageToHash(imageData),
-                    kind: 'image',
-                    label: ( localize(7316, 'Image from Clipboard')),
-                    iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
+                    kind: 'screenshot',
+                    id: ScreenshotVariableId,
+                    icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
+                    iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
+                    label: (isElectron
+                        ? ( localize(7537, 'Screenshot Window'))
+                        : ( localize(7538, '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) {
-                        quickPickItems.push({
-                            label: variable.fullName,
-                            id: variable.id,
-                            command: variable.command,
-                            icon: variable.icon,
-                            iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
-                            value: variable.value,
-                            isDynamic: true,
-                            name: variable.name
-                        });
+            if (widget.viewModel?.sessionId) {
+                const agentPart = widget.parsedInput.parts.find((part) => part instanceof ChatRequestAgentPart);
+                if (agentPart) {
+                    const completions = await chatAgentService.getAgentCompletionItems(agentPart.agent.id, '', CancellationToken.None);
+                    for (const variable of completions) {
+                        if (variable.fullName && variable.command) {
+                            quickPickItems.push({
+                                kind: 'command',
+                                label: variable.fullName,
+                                id: variable.id,
+                                command: variable.command,
+                                icon: variable.icon,
+                                iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
+                                value: variable.value,
+                                isDynamic: true,
+                                name: variable.name
+                            });
+                        }
                     }
                 }
             }
-        }
-        if (!usedAgent || usedAgent.agent.supportsToolReferences) {
             for (const tool of languageModelToolsService.getTools()) {
-                if (tool.canBeInvokedManually) {
+                if (tool.canBeReferencedInPrompt) {
                     const item = {
                         kind: 'tool',
-                        label: tool.displayName ?? tool.name ?? '',
+                        label: tool.displayName ?? '',
                         id: tool.id,
                         icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined
                     };
@@ -326,28 +434,47 @@ class AttachContextAction extends Action2 {
                     quickPickItems.push(item);
                 }
             }
-        }
-        quickPickItems.push({
-            label: ( localize(7317, 'Symbol...')),
-            icon: ThemeIcon.fromId(Codicon.symbolField.id),
-            iconClass: ThemeIcon.asClassName(Codicon.symbolField),
-            prefix: SymbolsQuickAccessProvider.PREFIX
-        });
-        if (widget.location === ChatAgentLocation.Notebook) {
             quickPickItems.push({
-                kind: 'dynamic',
-                id: 'chatContext.notebook.kernelVariable',
-                isDynamic: true,
-                icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
-                iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
-                value: 'kernelVariable',
-                label: ( localize(7318, 'Kernel Variable...')),
-                command: {
-                    id: 'notebook.chat.selectAndInsertKernelVariable',
-                    title: ( localize(7319, 'Select and Insert Kernel Variable')),
-                    arguments: [{ widget, range: undefined }]
-                }
+                kind: 'quickaccess',
+                label: ( localize(7539, 'Symbol...')),
+                iconClass: ThemeIcon.asClassName(Codicon.symbolField),
+                prefix: SymbolsQuickAccessProvider.PREFIX,
+                id: 'symbol'
             });
+            if (widget.location === ChatAgentLocation.Notebook) {
+                quickPickItems.push({
+                    kind: 'command',
+                    id: 'chatContext.notebook.kernelVariable',
+                    isDynamic: true,
+                    icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
+                    iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
+                    value: 'kernelVariable',
+                    label: ( localize(7540, 'Kernel Variable...')),
+                    command: {
+                        id: 'notebook.chat.selectAndInsertKernelVariable',
+                        title: ( localize(7541, 'Select and Insert Kernel Variable')),
+                        arguments: [{ widget, range: undefined }]
+                    }
+                });
+            }
+        }
+        else if (context.showFilesOnly) {
+            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(7542, 'Open Editors')),
+                    iconClass: ThemeIcon.asClassName(Codicon.files),
+                });
+            }
+            if (SearchContext.HasSearchResults.getValue(contextKeyService)) {
+                quickPickItems.push({
+                    kind: 'search-results',
+                    id: 'search-results',
+                    label: ( localize(7543, 'Search Results')),
+                    iconClass: ThemeIcon.asClassName(Codicon.search),
+                });
+            }
         }
         function extractTextFromIconLabel(label) {
             if (!label) {
@@ -360,55 +487,85 @@ class AttachContextAction extends Action2 {
             const first = extractTextFromIconLabel(a.label).toUpperCase();
             const second = extractTextFromIconLabel(b.label).toUpperCase();
             return compare(first, second);
-        }), clipboardService, '');
+        }), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, '', context?.placeholder);
     }
-    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, query = '') {
-        quickInputService.quickAccess.show(query, {
-            enabledProviderPrefixes: [
-                AnythingQuickAccessProvider.PREFIX,
-                SymbolsQuickAccessProvider.PREFIX,
-                AbstractGotoSymbolQuickAccessProvider.PREFIX
-            ],
-            placeholder: ( localize(7320, 'Search attachments')),
-            providerOptions: {
-                handleAccept: (item) => {
-                    if ('prefix' in item) {
-                        this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, item.prefix);
-                    }
-                    else {
-                        if (!clipboardService) {
-                            return;
-                        }
-                        this._attachContext(widget, commandService, clipboardService, item);
-                        if (isQuickChat(widget)) {
-                            quickChatService.open();
-                        }
-                    }
-                },
-                additionPicks: quickPickItems,
-                filter: (item) => {
-                    const attachedContext = widget.getContrib(ChatContextAttachments.ID)?.getContext() ?? ( (new Set()));
-                    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))));
+    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, query = '', placeholder) {
+        const providerOptions = {
+            handleAccept: (item, isBackgroundAccept) => {
+                if ('prefix' in item) {
+                    this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, item.prefix, placeholder);
+                }
+                else {
+                    if (!clipboardService) {
+                        return;
                     }
-                    if (item && typeof item === 'object' && 'resource' in item && URI.isUri(item.resource)) {
-                        return [Schemas.file, Schemas.vscodeRemote].includes(item.resource.scheme)
-                            && !( (attachedContext.has(this._getFileContextId({ resource: item.resource }))));
+                    this._attachContext(widget, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isBackgroundAccept, item);
+                    if (isQuickChat(widget)) {
+                        quickChatService.open();
                     }
-                    if (item && typeof item === 'object' && 'uri' in item && item.uri && item.range) {
-                        return !( (attachedContext.has(this._getFileContextId({ uri: item.uri, range: item.range.decoration }))));
+                }
+            },
+            additionPicks: quickPickItems,
+            filter: (item) => {
+                const attachedContext = widget.attachmentModel.getAttachmentIDs();
+                if (chatEditingService) {
+                    for (const file of chatEditingService.currentEditingSessionObs.get()?.workingSet.keys() ?? []) {
+                        attachedContext.add(this._getFileContextId({ resource: file }));
                     }
-                    if (!('command' in item) && item.id) {
-                        return !( (attachedContext.has(item.id)));
+                }
+                if (isIOpenEditorsQuickPickItem(item)) {
+                    for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput)) {
+                        if (editor.resource && !( (attachedContext.has(this._getFileContextId({ resource: editor.resource }))))) {
+                            return true;
+                        }
                     }
-                    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].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, {
+            enabledProviderPrefixes: [
+                AnythingQuickAccessProvider.PREFIX,
+                SymbolsQuickAccessProvider.PREFIX,
+                AbstractGotoSymbolQuickAccessProvider.PREFIX
+            ],
+            placeholder: placeholder ?? ( localize(7544, 'Search attachments')),
+            providerOptions,
         });
     }
 }
+registerAction2(class AttachFilesAction extends AttachContextAction {
+    constructor() {
+        super({
+            id: 'workbench.action.chat.editing.attachFiles',
+            title: ( localize2(7545, "Add Files to Working Set")),
+            f1: false,
+            category: CHAT_CATEGORY,
+            precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession)))
+        });
+    }
+    async run(accessor, ...args) {
+        const context = args[0];
+        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(7546, 'Search for files to add to your working set')) };
+        return super.run(accessor, attachFilesContext);
+    }
+});
 
-export { registerChatContextActions };
+export { AttachContextAction, registerChatContextActions };