@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.1

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

@@ -1,52 +1,60 @@
+
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isElectron } from 'vscode/vscode/vs/base/common/platform';
+import { dirname } from 'vscode/vscode/vs/base/common/resources';
 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';
 import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
-import { AbstractGotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
+import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/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 { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/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 { UntitledTextEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/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 { FileEditorInput } from '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
+import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
+import { SearchContext } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/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_ENABLED, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { WorkingSetEntryState } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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 { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView, showEditsView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { isQuickChat } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
-    registerAction2(AttachFileAction);
-    registerAction2(AttachSelectionAction);
+    registerAction2(AttachFileToChatAction);
+    registerAction2(AttachSelectionToChatAction);
+    registerAction2(AttachFileToEditingSessionAction);
+    registerAction2(AttachSelectionToEditingSessionAction);
 }
 function isIGotoSymbolQuickPickItem(obj) {
     return (typeof obj === 'object'
@@ -76,51 +84,174 @@ function isScreenshotQuickPickItem(obj) {
     return (typeof obj === 'object'
         && obj.kind === 'screenshot');
 }
+function isRelatedFileQuickPickItem(obj) {
+    return (typeof obj === 'object'
+        && obj.kind === 'related-files');
+}
 class AttachFileAction extends Action2 {
+    getFiles(accessor, ...args) {
+        const textEditorService = accessor.get(IEditorService);
+        const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
+        const files = [];
+        for (const context of contexts) {
+            let uri;
+            if (URI.isUri(context)) {
+                uri = context;
+            }
+            else if (isSearchTreeFileMatch(context)) {
+                uri = context.resource;
+            }
+            else if (isSearchTreeMatch(context)) {
+                uri = context.parent().resource;
+            }
+            else if (!context && textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor) {
+                uri = textEditorService.activeEditor?.resource;
+            }
+            if (uri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(uri.scheme)) {
+                files.push(uri);
+            }
+        }
+        return files;
+    }
+}
+class AttachFileToChatAction extends AttachFileAction {
     static { this.ID = 'workbench.action.chat.attachFile'; }
     constructor() {
         super({
-            id: AttachFileAction.ID,
-            title: ( localize2(7560, "Add File to Chat")),
+            id: AttachFileToChatAction.ID,
+            title: ( localize2(4196, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( (ContextKeyExpr.and(
-                CONTEXT_CHAT_ENABLED,
-                 (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))
-            ))),
-            menu: {
-                id: MenuId.ChatCommandCenter,
-                group: 'a_chat',
-                order: 10,
-            }
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                    id: MenuId.ChatCommandCenter,
+                    group: 'b_chat_context',
+                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
+                    order: 10,
+                }, {
+                    id: MenuId.SearchContext,
+                    group: 'z_chat',
+                    order: 1
+                }]
         });
     }
     async run(accessor, ...args) {
         const variablesService = accessor.get(IChatVariablesService);
-        const textEditorService = accessor.get(IEditorService);
-        const activeUri = textEditorService.activeEditor?.resource;
-        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+        const files = this.getFiles(accessor, ...args);
+        if (files.length) {
             (await showChatView(accessor.get(IViewsService)))?.focusInput();
-            variablesService.attachContext('file', activeUri, ChatAgentLocation.Panel);
+            for (const file of files) {
+                variablesService.attachContext('file', file, ChatAgentLocation.Panel);
+            }
         }
     }
 }
-class AttachSelectionAction extends Action2 {
+class AttachSelectionToChatAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachSelection'; }
     constructor() {
         super({
-            id: AttachSelectionAction.ID,
-            title: ( localize2(7561, "Add Selection to Chat")),
+            id: AttachSelectionToChatAction.ID,
+            title: ( localize2(4197, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( (ContextKeyExpr.and(
-                CONTEXT_CHAT_ENABLED,
-                 (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))
-            ))),
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                    id: MenuId.ChatCommandCenter,
+                    group: 'b_chat_context',
+                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
+                    order: 15,
+                }, {
+                    id: MenuId.SearchContext,
+                    group: 'z_chat',
+                    order: 2
+                }]
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const textEditorService = accessor.get(IEditorService);
+        const [_, matches] = args;
+        if (matches && matches.length > 0) {
+            const uris = ( new Map());
+            for (const match of matches) {
+                if (isSearchTreeFileMatch(match)) {
+                    uris.set(match.resource, undefined);
+                }
+                else {
+                    const context = { uri: match._parent.resource, range: match._range };
+                    const range = uris.get(context.uri);
+                    if (!range ||
+                        range.startLineNumber !== context.range.startLineNumber && range.endLineNumber !== context.range.endLineNumber) {
+                        uris.set(context.uri, context.range);
+                        variablesService.attachContext('file', context, ChatAgentLocation.Panel);
+                    }
+                }
+            }
+            for (const uri of uris) {
+                const [resource, range] = uri;
+                if (!range) {
+                    variablesService.attachContext('file', { uri: resource }, ChatAgentLocation.Panel);
+                }
+            }
+        }
+        else {
+            const activeEditor = textEditorService.activeTextEditorControl;
+            const activeUri = textEditorService.activeEditor?.resource;
+            if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+                const selection = activeEditor?.getSelection();
+                if (selection) {
+                    (await showChatView(accessor.get(IViewsService)))?.focusInput();
+                    variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
+                }
+            }
+        }
+    }
+}
+class AttachFileToEditingSessionAction extends AttachFileAction {
+    static { this.ID = 'workbench.action.edits.attachFile'; }
+    constructor() {
+        super({
+            id: AttachFileToEditingSessionAction.ID,
+            title: ( localize2(4198, "Add File to {0}", 'Copilot Edits')),
+            category: CHAT_CATEGORY,
+            f1: false,
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                    id: MenuId.ChatCommandCenter,
+                    group: 'c_edits_context',
+                    when: ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')),
+                    order: 10,
+                }, {
+                    id: MenuId.SearchContext,
+                    group: 'z_chat',
+                    order: 2
+                }]
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const files = this.getFiles(accessor, ...args);
+        if (files.length) {
+            (await showEditsView(accessor.get(IViewsService)))?.focusInput();
+            for (const file of files) {
+                variablesService.attachContext('file', file, ChatAgentLocation.EditingSession);
+            }
+        }
+    }
+}
+class AttachSelectionToEditingSessionAction extends Action2 {
+    static { this.ID = 'workbench.action.edits.attachSelection'; }
+    constructor() {
+        super({
+            id: AttachSelectionToEditingSessionAction.ID,
+            title: ( localize2(4199, "Add Selection to {0}", 'Copilot Edits')),
+            category: CHAT_CATEGORY,
+            f1: false,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor')))),
             menu: {
                 id: MenuId.ChatCommandCenter,
-                group: 'a_chat',
-                order: 11,
+                group: 'c_edits_context',
+                order: 15,
             }
         });
     }
@@ -132,54 +263,35 @@ class AttachSelectionAction extends Action2 {
         if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
             const selection = activeEditor?.getSelection();
             if (selection) {
-                (await showChatView(accessor.get(IViewsService)))?.focusInput();
-                variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
+                (await showEditsView(accessor.get(IViewsService)))?.focusInput();
+                variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.EditingSession);
             }
         }
     }
 }
 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.Notebook))
-        )),
-         (ContextKeyExpr.and(
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal))
-        ))
-    ))); }
+    static { this._cdt = ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Editor)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Notebook)))), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Terminal)))))); }
     constructor(desc = {
         id: AttachContextAction.ID,
-        title: ( localize2(7562, "Attach Context")),
+        title: ( localize2(4200, "Attach Context")),
         icon: Codicon.attach,
         category: CHAT_CATEGORY,
-        precondition: ( (ContextKeyExpr.or(AttachContextAction._cdt,  (ContextKeyExpr.and(
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))
-        ))))),
+        precondition: ( ContextKeyExpr.or(AttachContextAction._cdt, ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))))),
         keybinding: {
-            when: CONTEXT_IN_CHAT_INPUT,
-            primary: 2048  | 90 ,
-            weight: 100
+            when: ChatContextKeys.inChatInput,
+            primary: KeyMod.CtrlCmd | KeyCode.Slash,
+            weight: KeybindingWeight.EditorContrib
         },
         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))))),
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))), ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))), AttachContextAction._cdt)))),
                 id: MenuId.ChatInput,
                 group: 'navigation',
                 order: 2
             },
             {
-                when: ( (ContextKeyExpr.and(
-                     (( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))).negate()),
-                    AttachContextAction._cdt
-                ))),
+                when: ( ContextKeyExpr.and(( ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)).negate()), AttachContextAction._cdt)),
                 id: MenuId.ChatExecute,
                 group: 'navigation',
                 order: 1
@@ -190,21 +302,21 @@ class AttachContextAction extends Action2 {
     }
     _getFileContextId(item) {
         if ('resource' in item) {
-            return (
-                 (item.resource.toString())
-            );
+            return ( item.resource.toString());
         }
-        return ( (item.uri.toString())) + (item.range.startLineNumber !== item.range.endLineNumber ?
+        return ( item.uri.toString()) + (item.range.startLineNumber !== item.range.endLineNumber ?
             `:${item.range.startLineNumber}-${item.range.endLineNumber}` :
             `:${item.range.startLineNumber}`);
     }
-    async _attachContext(widget, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isInBackground, ...picks) {
+    async _attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isInBackground, ...picks) {
         const toAttach = [];
         for (const pick of picks) {
             if (isISymbolQuickPickItem(pick) && pick.symbol) {
                 toAttach.push({
+                    kind: 'symbol',
                     id: this._getFileContextId(pick.symbol.location),
                     value: pick.symbol.location,
+                    symbolKind: pick.symbol.kind,
                     fullName: pick.label,
                     name: pick.symbol.name,
                     isDynamic: true
@@ -213,7 +325,7 @@ class AttachContextAction extends Action2 {
             else if (isIQuickPickItemWithResource(pick) && pick.resource) {
                 if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
                     toAttach.push({
-                        id: ( (pick.resource.toString())),
+                        id: ( pick.resource.toString()),
                         name: pick.label,
                         fullName: pick.label,
                         value: pick.resource,
@@ -247,7 +359,7 @@ class AttachContextAction extends Action2 {
                 });
             }
             else if (isIOpenEditorsQuickPickItem(pick)) {
-                for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput)) {
+                for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput || e instanceof NotebookEditorInput)) {
                     const uri = editor instanceof DiffEditorInput ? editor.modified.resource : editor.resource;
                     if (uri) {
                         if (chatEditingService) {
@@ -282,6 +394,36 @@ class AttachContextAction extends Action2 {
                     }
                 }
             }
+            else if (isRelatedFileQuickPickItem(pick)) {
+                const chatSessionId = widget.viewModel?.sessionId;
+                if (!chatSessionId || !chatEditingService) {
+                    continue;
+                }
+                const relatedFiles = await chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), CancellationToken.None);
+                if (!relatedFiles) {
+                    continue;
+                }
+                const attachments = widget.attachmentModel.getAttachmentIDs();
+                const itemsPromise = chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), 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(4201, 'Add related files to your working set')), canPickMany: true });
+                for (const file of selectedFiles ?? []) {
+                    chatEditingService?.currentEditingSessionObs.get()?.addFileToWorkingSet(file.value);
+                }
+            }
             else if (isScreenshotQuickPickItem(pick)) {
                 const blob = await hostService.getScreenshot();
                 if (blob) {
@@ -317,8 +459,8 @@ class AttachContextAction extends Action2 {
                     const fileBuffer = await clipboardService.readImage();
                     toAttach.push({
                         id: await imageToHash(fileBuffer),
-                        name: ( localize(7563, 'Pasted Image')),
-                        fullName: ( localize(7563, 'Pasted Image')),
+                        name: ( localize(4202, 'Pasted Image')),
+                        fullName: ( localize(4202, 'Pasted Image')),
                         value: fileBuffer,
                         isDynamic: true,
                         isImage: true
@@ -377,13 +519,13 @@ class AttachContextAction extends Action2 {
                     });
                 }
             }
-            if (( (extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))))) {
+            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(7564, 'Image from Clipboard')),
+                        label: ( localize(4203, 'Image from Clipboard')),
                         iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
                     });
                 }
@@ -393,8 +535,8 @@ class AttachContextAction extends Action2 {
                     icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
                     iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
                     label: (isElectron
-                        ? ( localize(7565, 'Screenshot Window'))
-                        : ( localize(7566, 'Screenshot'))),
+                        ? ( localize(4204, 'Screenshot Window'))
+                        : ( localize(4205, 'Screenshot'))),
                 });
             }
             if (widget.viewModel?.sessionId) {
@@ -437,7 +579,7 @@ class AttachContextAction extends Action2 {
             }
             quickPickItems.push({
                 kind: 'quickaccess',
-                label: ( localize(7567, 'Symbol...')),
+                label: ( localize(4206, 'Symbol...')),
                 iconClass: ThemeIcon.asClassName(Codicon.symbolField),
                 prefix: SymbolsQuickAccessProvider.PREFIX,
                 id: 'symbol'
@@ -450,21 +592,29 @@ class AttachContextAction extends Action2 {
                     icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
                     iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
                     value: 'kernelVariable',
-                    label: ( localize(7568, 'Kernel Variable...')),
+                    label: ( localize(4207, 'Kernel Variable...')),
                     command: {
                         id: 'notebook.chat.selectAndInsertKernelVariable',
-                        title: ( localize(7569, 'Select and Insert Kernel Variable')),
+                        title: ( localize(4208, 'Select and Insert Kernel Variable')),
                         arguments: [{ widget, range: undefined }]
                     }
                 });
             }
         }
         else if (context.showFilesOnly) {
+            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || chatEditingService.currentEditingSessionObs.get()?.workingSet.size)) {
+                quickPickItems.push({
+                    kind: 'related-files',
+                    id: 'related-files',
+                    label: ( localize(4209, '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(7570, 'Open Editors')),
+                    label: ( localize(4210, 'Open Editors')),
                     iconClass: ThemeIcon.asClassName(Codicon.files),
                 });
             }
@@ -472,7 +622,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.push({
                     kind: 'search-results',
                     id: 'search-results',
-                    label: ( localize(7571, 'Search Results')),
+                    label: ( localize(4211, 'Search Results')),
                     iconClass: ThemeIcon.asClassName(Codicon.search),
                 });
             }
@@ -500,7 +650,7 @@ class AttachContextAction extends Action2 {
                     if (!clipboardService) {
                         return;
                     }
-                    this._attachContext(widget, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isBackgroundAccept, item);
+                    this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, isBackgroundAccept, item);
                     if (isQuickChat(widget)) {
                         quickChatService.open();
                     }
@@ -510,33 +660,35 @@ class AttachContextAction extends Action2 {
             filter: (item) => {
                 const attachedContext = widget.attachmentModel.getAttachmentIDs();
                 if (chatEditingService) {
-                    for (const file of chatEditingService.currentEditingSessionObs.get()?.workingSet.keys() ?? []) {
-                        attachedContext.add(this._getFileContextId({ resource: file }));
+                    for (const [file, state] of chatEditingService.currentEditingSessionObs.get()?.workingSet.entries() ?? []) {
+                        if (state.state !== WorkingSetEntryState.Suggested) {
+                            attachedContext.add(this._getFileContextId({ resource: file }));
+                        }
                     }
                 }
                 if (isIOpenEditorsQuickPickItem(item)) {
                     for (const editor of editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput)) {
-                        if (editor.resource && !( (attachedContext.has(this._getFileContextId({ resource: editor.resource }))))) {
+                        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)));
+                    return !( attachedContext.has(item.id));
                 }
                 if ('symbol' in item && item.symbol) {
-                    return !( (attachedContext.has(this._getFileContextId(item.symbol.location))));
+                    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 }))));
+                    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 }))));
+                    return !( attachedContext.has(this._getFileContextId({ uri: item.uri, range: item.range.decoration })));
                 }
                 if (!('command' in item) && item.id) {
-                    return !( (attachedContext.has(item.id)));
+                    return !( attachedContext.has(item.id));
                 }
                 return true;
             }
@@ -547,7 +699,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(7572, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4212, 'Search attachments')),
             providerOptions,
         });
     }
@@ -556,15 +708,15 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
     constructor() {
         super({
             id: 'workbench.action.chat.editing.attachFiles',
-            title: ( localize2(7573, "Add Files to Working Set")),
+            title: ( localize2(4213, "Add Files to Working Set")),
             f1: false,
             category: CHAT_CATEGORY,
-            precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession)))
+            precondition: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))
         });
     }
     async run(accessor, ...args) {
         const context = args[0];
-        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(7574, 'Search for files to add to your working set')) };
+        const attachFilesContext = { ...context, showFilesOnly: true, placeholder: ( localize(4214, 'Search for files to add to your working set')) };
         return super.run(accessor, attachFilesContext);
     }
 });

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

@@ -0,0 +1 @@
+export declare function registerChatCopyActions(): void;

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

@@ -1,23 +1,23 @@
+
 import { localize2 } 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 { stringifyItem } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_RESPONSE_FILTERED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(7575, "Copy All")),
+                title: ( localize2(4215, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( (CONTEXT_RESPONSE_FILTERED.toNegated())),
+                    when: ( ChatContextKeys.responseIsFiltered.toNegated()),
                     group: 'copy',
                 }
             });
@@ -42,12 +42,12 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(7576, "Copy")),
+                title: ( localize2(4216, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( (CONTEXT_RESPONSE_FILTERED.toNegated())),
+                    when: ( ChatContextKeys.responseIsFiltered.toNegated()),
                     group: 'copy',
                 }
             });