@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -22,6 +22,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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 { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ActiveEditorContext, TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
@@ -34,25 +35,25 @@ import { VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/servic
 import { UntitledTextEditorInput } from '@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FileEditorInput } from '@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/workbench/contrib/files/common/files';
+import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common/vscode/vs/workbench/contrib/files/common/files';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { 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 '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { showChatView, showEditsView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { imageToHash, isImage } from '../chatPasteProviders.js';
+import { imageToHash, isImage } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatPasteProviders';
 import { isQuickChat } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { createMarkersQuickPick, createFolderQuickPick } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { createMarkersQuickPick, createFolderQuickPick } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
 import { resizeImage } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { COMMAND_ID } from '../promptSyntax/contributions/usePromptCommand.js';
@@ -62,9 +63,12 @@ import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction } from './chatAttachPromptA
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
     registerAction2(AttachFileToChatAction);
+    registerAction2(AttachFolderToChatAction);
     registerAction2(AttachSelectionToChatAction);
     registerAction2(AttachFileToEditingSessionAction);
+    registerAction2(AttachFolderToEditingSessionAction);
     registerAction2(AttachSelectionToEditingSessionAction);
+    registerAction2(AttachSearchResultAction);
 }
 function isIGotoSymbolQuickPickItem(obj) {
     return (typeof obj === 'object'
@@ -113,8 +117,8 @@ function isPromptInstructionsQuickPickItem(obj) {
     return ('kind' in obj && obj.kind === 'reusable-prompt');
 }
 const REUSABLE_PROMPT_PICK_ID = 'reusable-prompt';
-class AttachFileAction extends Action2 {
-    getFiles(accessor, ...args) {
+class AttachResourceAction extends Action2 {
+    getResources(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
         const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
         const files = [];
@@ -139,25 +143,25 @@ class AttachFileAction extends Action2 {
         return files;
     }
 }
-class AttachFileToChatAction extends AttachFileAction {
+class AttachFileToChatAction extends AttachResourceAction {
     static { this.ID = 'workbench.action.chat.attachFile'; }
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4326, "Add File to Chat")),
+            title: ( localize2(4382, "Add File to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
                     id: MenuId.SearchContext,
                     group: 'z_chat',
-                    order: 1
+                    order: 1,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( SearchContext.SearchResultHeaderFocused.negate()))),
                 }]
         });
     }
     async run(accessor, ...args) {
         const variablesService = accessor.get(IChatVariablesService);
-        const files = this.getFiles(accessor, ...args);
+        const files = this.getResources(accessor, ...args);
         if (files.length) {
             (await showChatView(accessor.get(IViewsService)))?.focusInput();
             for (const file of files) {
@@ -166,20 +170,35 @@ class AttachFileToChatAction extends AttachFileAction {
         }
     }
 }
+class AttachFolderToChatAction extends AttachResourceAction {
+    static { this.ID = 'workbench.action.chat.attachFolder'; }
+    constructor() {
+        super({
+            id: AttachFolderToChatAction.ID,
+            title: ( localize2(4383, "Add Folder to Chat")),
+            category: CHAT_CATEGORY,
+            f1: false,
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const folders = this.getResources(accessor, ...args);
+        if (folders.length) {
+            (await showChatView(accessor.get(IViewsService)))?.focusInput();
+            for (const folder of folders) {
+                variablesService.attachContext('folder', folder, ChatAgentLocation.Panel);
+            }
+        }
+    }
+}
 class AttachSelectionToChatAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachSelection'; }
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4327, "Add Selection to Chat")),
+            title: ( localize2(4384, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
-            menu: [{
-                    id: MenuId.SearchContext,
-                    group: 'z_chat',
-                    order: 2
-                }]
         });
     }
     async run(accessor, ...args) {
@@ -223,25 +242,25 @@ class AttachSelectionToChatAction extends Action2 {
         }
     }
 }
-class AttachFileToEditingSessionAction extends AttachFileAction {
+class AttachFileToEditingSessionAction extends AttachResourceAction {
     static { this.ID = 'workbench.action.edits.attachFile'; }
     constructor() {
         super({
             id: AttachFileToEditingSessionAction.ID,
-            title: ( localize2(4328, "Add File to {0}", 'Copilot Edits')),
+            title: ( localize2(4385, "Add File to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)))),
             menu: [{
                     id: MenuId.SearchContext,
                     group: 'z_chat',
-                    order: 2
+                    order: 2,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( ChatContextKeyExprs.unifiedChatEnabled.negate()), ( SearchContext.SearchResultHeaderFocused.negate()))),
                 }]
         });
     }
     async run(accessor, ...args) {
         const variablesService = accessor.get(IChatVariablesService);
-        const files = this.getFiles(accessor, ...args);
+        const files = this.getResources(accessor, ...args);
         if (files.length) {
             (await showEditsView(accessor.get(IViewsService)))?.focusInput();
             for (const file of files) {
@@ -250,15 +269,90 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
         }
     }
 }
+class AttachSearchResultAction extends Action2 {
+    static { this.Name = 'searchResults'; }
+    static { this.ID = 'workbench.action.chat.insertSearchResults'; }
+    constructor() {
+        super({
+            id: AttachSearchResultAction.ID,
+            title: ( localize2(4386, 'Add Search Results to Chat')),
+            category: CHAT_CATEGORY,
+            f1: false,
+            menu: [{
+                    id: MenuId.SearchContext,
+                    group: 'z_chat',
+                    order: 3,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, SearchContext.SearchResultHeaderFocused)),
+                }]
+        });
+    }
+    async run(accessor, ...args) {
+        const logService = accessor.get(ILogService);
+        const widget = (await showChatView(accessor.get(IViewsService)));
+        if (!widget) {
+            logService.trace('InsertSearchResultAction: no chat view available');
+            return;
+        }
+        const editor = widget.inputEditor;
+        const originalRange = editor.getSelection() ?? editor.getModel()?.getFullModelRange().collapseToEnd();
+        if (!originalRange) {
+            logService.trace('InsertSearchResultAction: no selection');
+            return;
+        }
+        let insertText = `#${AttachSearchResultAction.Name}`;
+        const varRange = ( new Range(
+            originalRange.startLineNumber,
+            originalRange.startColumn,
+            originalRange.endLineNumber,
+            originalRange.startColumn + insertText.length
+        ));
+        const model = editor.getModel();
+        if (model && model.getValueInRange(( new Range(
+            originalRange.startLineNumber,
+            originalRange.startColumn - 1,
+            originalRange.startLineNumber,
+            originalRange.startColumn
+        ))) !== ' ') {
+            insertText = ' ' + insertText;
+        }
+        const success = editor.executeEdits('chatInsertSearch', [{ range: varRange, text: insertText + ' ' }]);
+        if (!success) {
+            logService.trace(`InsertSearchResultAction: failed to insert "${insertText}"`);
+            return;
+        }
+    }
+}
+class AttachFolderToEditingSessionAction extends AttachResourceAction {
+    static { this.ID = 'workbench.action.edits.attachFolder'; }
+    constructor() {
+        super({
+            id: AttachFolderToEditingSessionAction.ID,
+            title: ( localize2(4387, "Add Folder to {0}", 'Copilot Edits')),
+            category: CHAT_CATEGORY,
+            f1: false,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeyExprs.unifiedChatEnabled.negate()))),
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const folders = this.getResources(accessor, ...args);
+        if (folders.length) {
+            (await showEditsView(accessor.get(IViewsService)))?.focusInput();
+            for (const folder of folders) {
+                variablesService.attachContext('folder', folder, ChatAgentLocation.EditingSession);
+            }
+        }
+    }
+}
 class AttachSelectionToEditingSessionAction extends Action2 {
     static { this.ID = 'workbench.action.edits.attachSelection'; }
     constructor() {
         super({
             id: AttachSelectionToEditingSessionAction.ID,
-            title: ( localize2(4329, "Add Selection to {0}", 'Copilot Edits')),
+            title: ( localize2(4388, "Add Selection to {0}", 'Copilot Edits')),
             category: CHAT_CATEGORY,
             f1: false,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext))))
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), TextCompareEditorActiveContext)), ( ChatContextKeyExprs.unifiedChatEnabled.negate())))
         });
     }
     async run(accessor, ...args) {
@@ -278,31 +372,23 @@ class AttachSelectionToEditingSessionAction extends Action2 {
 }
 class AttachContextAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachContext'; }
-    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(4330, "Attach Context")),
+        title: ( localize2(4389, "Add Context")),
         icon: Codicon.attach,
         category: CHAT_CATEGORY,
-        precondition: ( ContextKeyExpr.or(AttachContextAction._cdt, ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))))),
         keybinding: {
-            when: ( ContextKeyExpr.and(( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession)), ChatContextKeys.inChatInput)),
+            when: ( ContextKeyExpr.and(( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession)), ChatContextKeys.inChatInput, ChatContextKeyExprs.inNonUnifiedPanel)),
             primary: KeyMod.CtrlCmd | KeyCode.Slash,
             weight: KeybindingWeight.EditorContrib
         },
         menu: [
             {
-                when: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
-                id: MenuId.ChatInput,
+                when: ChatContextKeyExprs.inNonUnifiedPanel,
+                id: MenuId.ChatInputAttachmentToolbar,
                 group: 'navigation',
                 order: 2
-            },
-            {
-                when: ( ContextKeyExpr.and(( ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)).negate()), AttachContextAction._cdt)),
-                id: MenuId.ChatExecute,
-                group: 'navigation',
-                order: 1
-            },
+            }
         ]
     }) {
         super(desc);
@@ -438,9 +524,15 @@ class AttachContextAction extends Action2 {
                     }
                     return acc;
                 }, []));
-                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4331, 'Add related files to your working set')), canPickMany: true });
+                const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: ( localize(4390, 'Add related files to your working set')), canPickMany: true });
                 for (const file of selectedFiles ?? []) {
-                    chatEditingService.getEditingSession(chatSessionId)?.addFileToWorkingSet(file.value);
+                    toAttach.push({
+                        id: this._getFileContextId({ resource: file.value }),
+                        value: file.value,
+                        name: file.label,
+                        isFile: true,
+                        isOmitted: false
+                    });
                 }
             }
             else if (isScreenshotQuickPickItem(pick)) {
@@ -450,7 +542,7 @@ class AttachContextAction extends Action2 {
                 }
             }
             else if (isPromptInstructionsQuickPickItem(pick)) {
-                const options = { widget, viewsService };
+                const options = { widget };
                 await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
             }
             else {
@@ -481,8 +573,8 @@ class AttachContextAction extends Action2 {
                     const fileBuffer = await clipboardService.readImage();
                     toAttach.push({
                         id: await imageToHash(fileBuffer),
-                        name: ( localize(4332, 'Pasted Image')),
-                        fullName: ( localize(4332, 'Pasted Image')),
+                        name: ( localize(4391, 'Pasted Image')),
+                        fullName: ( localize(4391, 'Pasted Image')),
                         value: fileBuffer,
                         isImage: true
                     });
@@ -517,7 +609,7 @@ class AttachContextAction extends Action2 {
         if (!widget) {
             return;
         }
-        const chatEditingService = widget.location === ChatAgentLocation.EditingSession ? accessor.get(IChatEditingService) : undefined;
+        const chatEditingService = widget.location === ChatAgentLocation.EditingSession || widget.isUnifiedPanelWidget ? accessor.get(IChatEditingService) : undefined;
         const quickPickItems = [];
         if (( extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')))) {
             const imageData = await clipboardService.readImage();
@@ -525,7 +617,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.push({
                     kind: 'image',
                     id: await imageToHash(imageData),
-                    label: ( localize(4333, 'Image from Clipboard')),
+                    label: ( localize(4392, 'Image from Clipboard')),
                     iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
                 });
             }
@@ -535,8 +627,8 @@ class AttachContextAction extends Action2 {
                 icon: ThemeIcon.fromId(Codicon.deviceCamera.id),
                 iconClass: ThemeIcon.asClassName(Codicon.deviceCamera),
                 label: (isElectron
-                    ? ( localize(4334, 'Screenshot Window'))
-                    : ( localize(4335, 'Screenshot'))),
+                    ? ( localize(4393, 'Screenshot Window'))
+                    : ( localize(4394, 'Screenshot'))),
             });
         }
         if (widget.viewModel?.sessionId) {
@@ -578,20 +670,20 @@ class AttachContextAction extends Action2 {
         }
         quickPickItems.push({
             kind: 'quickaccess',
-            label: ( localize(4336, 'Symbol...')),
+            label: ( localize(4395, 'Symbol...')),
             iconClass: ThemeIcon.asClassName(Codicon.symbolField),
             prefix: SymbolsQuickAccessProvider.PREFIX,
             id: 'symbol'
         });
         quickPickItems.push({
             kind: 'folder',
-            label: ( localize(4337, 'Folder...')),
+            label: ( localize(4396, 'Folder...')),
             iconClass: ThemeIcon.asClassName(Codicon.folder),
             id: 'folder',
         });
         quickPickItems.push({
             kind: 'diagnostic',
-            label: ( localize(4338, 'Problem...')),
+            label: ( localize(4397, 'Problem...')),
             iconClass: ThemeIcon.asClassName(Codicon.error),
             id: 'diagnostic'
         });
@@ -602,20 +694,20 @@ class AttachContextAction extends Action2 {
                 icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
                 iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
                 value: 'kernelVariable',
-                label: ( localize(4339, 'Kernel Variable...')),
+                label: ( localize(4398, 'Kernel Variable...')),
                 command: {
                     id: 'notebook.chat.selectAndInsertKernelVariable',
-                    title: ( localize(4340, 'Select and Insert Kernel Variable')),
+                    title: ( localize(4399, 'Select and Insert Kernel Variable')),
                     arguments: [{ widget, range: undefined }]
                 }
             });
         }
         if (context?.showFilesOnly) {
-            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || (getEditingSession(chatEditingService, widget)?.workingSet.size))) {
+            if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || widget.attachmentModel.fileAttachments.length > 0)) {
                 quickPickItems.unshift({
                     kind: 'related-files',
                     id: 'related-files',
-                    label: ( localize(4341, 'Related Files')),
+                    label: ( localize(4400, 'Related Files')),
                     iconClass: ThemeIcon.asClassName(Codicon.sparkle),
                 });
             }
@@ -623,7 +715,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.unshift({
                     kind: 'open-editors',
                     id: 'open-editors',
-                    label: ( localize(4342, 'Open Editors')),
+                    label: ( localize(4401, 'Open Editors')),
                     iconClass: ThemeIcon.asClassName(Codicon.files),
                 });
             }
@@ -631,7 +723,7 @@ class AttachContextAction extends Action2 {
                 quickPickItems.unshift({
                     kind: 'search-results',
                     id: 'search-results',
-                    label: ( localize(4343, 'Search Results')),
+                    label: ( localize(4402, 'Search Results')),
                     iconClass: ThemeIcon.asClassName(Codicon.search),
                 });
             }
@@ -641,7 +733,7 @@ class AttachContextAction extends Action2 {
             quickPickItems.push({
                 id: REUSABLE_PROMPT_PICK_ID,
                 kind: REUSABLE_PROMPT_PICK_ID,
-                label: ( localize(4344, 'Prompt...')),
+                label: ( localize(4403, 'Prompt...')),
                 iconClass: ThemeIcon.asClassName(Codicon.bookmark),
                 keybinding,
             });
@@ -742,7 +834,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4345, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4404, 'Search attachments')),
             providerOptions,
         });
     }
@@ -762,16 +854,21 @@ class AttachContextAction extends Action2 {
 registerAction2(class AttachFilesAction extends AttachContextAction {
     constructor() {
         super({
-            id: 'workbench.action.chat.editing.attachFiles',
-            title: ( localize2(4346, "Add Files to Copilot Edits")),
-            shortTitle: ( localize2(4347, "Add Files...")),
+            id: 'workbench.action.chat.editing.attachContext',
+            title: ( localize2(4405, "Add Context to Copilot Edits")),
+            shortTitle: ( localize2(4406, "Add Context...")),
             f1: false,
             category: CHAT_CATEGORY,
-            menu: { id: MenuId.ChatInputAttachmentToolbar, group: 'navigation' },
+            menu: {
+                when: ChatContextKeyExprs.inEditsOrUnified,
+                id: MenuId.ChatInputAttachmentToolbar,
+                group: 'navigation',
+                order: 3
+            },
             icon: Codicon.attach,
-            precondition: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+            precondition: ChatContextKeyExprs.inEditsOrUnified,
             keybinding: {
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeyExprs.inEditsOrUnified)),
                 primary: KeyMod.CtrlCmd | KeyCode.Slash,
                 weight: KeybindingWeight.EditorContrib
             }
@@ -783,12 +880,6 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
         return super.run(accessor, attachFilesContext);
     }
 });
-function getEditingSession(chatEditingService, chatWidget) {
-    if (!chatWidget.viewModel?.sessionId) {
-        return;
-    }
-    return chatEditingService.getEditingSession(chatWidget.viewModel.sessionId);
-}
 registerAction2(AttachPromptAction);
 
-export { AttachContextAction, registerChatContextActions };
+export { AttachContextAction, AttachSearchResultAction, registerChatContextActions };

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

@@ -12,7 +12,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4348, "Copy All")),
+                title: ( localize2(4407, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -42,7 +42,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4349, "Copy")),
+                title: ( localize2(4408, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -3,20 +3,24 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 function registerChatDeveloperActions() {
     registerAction2(LogChatInputHistoryAction);
+    registerAction2(LogChatIndexAction);
 }
 class LogChatInputHistoryAction extends Action2 {
     static { this.ID = 'workbench.action.chat.logInputHistory'; }
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4350, "Log Chat Input History")),
+            title: ( localize2(4409, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
-            f1: true
+            f1: true,
+            precondition: ChatContextKeys.enabled
         });
     }
     async run(accessor, ...args) {
@@ -24,5 +28,21 @@ class LogChatInputHistoryAction extends Action2 {
         chatWidgetService.lastFocusedWidget?.logInputHistory();
     }
 }
+class LogChatIndexAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.logChatIndex'; }
+    constructor() {
+        super({
+            id: LogChatIndexAction.ID,
+            title: ( localize2(4410, "Log Chat Index")),
+            icon: Codicon.attach,
+            category: Categories.Developer,
+            f1: true
+        });
+    }
+    async run(accessor, ...args) {
+        const chatService = accessor.get(IChatService);
+        chatService.logChatIndex();
+    }
+}
 
 export { registerChatDeveloperActions };

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

@@ -13,7 +13,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4372, "Next File Tree")),
+                title: ( localize2(4432, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(4373, "Previous File Tree")),
+                title: ( localize2(4433, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -62,7 +62,10 @@ let ChatGettingStartedContribution = class ChatGettingStartedContribution extend
     }
     async onDidInstallChat() {
         showCopilotView(this.viewsService, this.layoutService);
-        ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService, this.viewsService);
+        const setupFromDialog = this.configurationService.getValue('chat.setupFromDialog');
+        if (!setupFromDialog) {
+            ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService, this.viewsService);
+        }
         this.storageService.store(ChatGettingStartedContribution_1.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
         this.recentlyInstalled = false;
         this.statusbarService.updateEntryVisibility('chat.statusBarEntry', true);

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

@@ -14,14 +14,14 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(4374, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4434, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4375, "Export Chat...")),
+                title: ( localize2(4435, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -55,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4376, "Import Chat...")),
+                title: ( localize2(4436, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,