@codingame/monaco-vscode-chat-service-override 8.0.4 → 9.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "8.0.4",
+  "version": "9.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@8.0.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
   }
 }

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

@@ -28,93 +28,93 @@ function getAccessibilityHelpText(type) {
     const content = [];
     if (type === 'panelChat') {
         content.push(( localize(
-            7087,
+            7078,
             'The chat view is comprised of an input box and a request/response list. The input box is used to make requests and the list is used to display responses.'
         )));
         content.push(( localize(
-            7088,
+            7079,
             'In the input box, use up and down arrows to navigate your request history. Edit input and use enter or the submit button to run a new request.'
         )));
         content.push(( localize(
-            7089,
+            7080,
             'In the input box, inspect the last response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            7090,
+            7081,
             'In the input box, navigate to the suggested follow up question (Shift+Tab) and press Enter to run it.'
         )));
         content.push(( localize(
-            7091,
+            7082,
             'Chat responses will be announced as they come in. A response will indicate the number of code blocks, if any, and then the rest of the response.'
         )));
         content.push(( localize(
-            7092,
+            7083,
             'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command{0}.',
             '<keybinding:chat.action.focus>'
         )));
         content.push(( localize(
-            7093,
+            7084,
             'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.',
             '<keybinding:workbench.action.chat.focusInput>'
         )));
         content.push(( localize(
-            7094,
+            7085,
             'To focus the next code block within a response, invoke the Chat: Next Code Block command{0}.',
             '<keybinding:workbench.action.chat.nextCodeBlock>'
         )));
         content.push(( localize(
-            7095,
+            7086,
             'To focus the next file tree within a response, invoke the Chat: Next File Tree command{0}.',
             '<keybinding:workbench.action.chat.nextFileTree>'
         )));
         content.push(( localize(
-            7096,
-            'To clear the request/response list, invoke the Chat Clear command{0}.',
-            '<keybinding:workbench.action.chat.clear>'
+            7087,
+            'To create a new chat session, invoke the New Chat command{0}.',
+            '<keybinding:workbench.action.chat.new>'
         )));
     }
     else {
         content.push(( localize(
-            7097,
+            7088,
             "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."
         )));
         content.push(( localize(
-            7098,
+            7089,
             "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.",
             '<keybinding:inlineChat.start>'
         )));
         content.push(( localize(
-            7099,
-            'In the input box, use{0} and{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.',
-            '<keybinding:inlineChat.previousFromHistory>',
-            '<keybinding:inlineChat.nextFromHistory>'
+            7090,
+            'In the input box, use Show Previous{0} and Show Next{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.',
+            '<keybinding:history.showPrevious>',
+            '<keybinding:history.showNext>'
         )));
         content.push(( localize(
-            7100,
+            7091,
             'In the input box, inspect the response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            7101,
+            7092,
             "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."
         )));
         content.push(( localize(
-            7102,
+            7093,
             "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."
         )));
         content.push(( localize(
-            7103,
+            7094,
             "Once in the diff editor, enter review mode with{0}. Use up and down arrows to navigate lines with the proposed changes.",
             AccessibleDiffViewerNext.id
         )));
         content.push(( localize(
-            7104,
+            7095,
             "Use tab to reach conditional parts like commands, status, message responses and more."
         )));
     }
     content.push(( localize(
-        7105,
+        7096,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join('\n');

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

@@ -21,7 +21,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(7106, "New Chat")),
+                title: ( localize2(7097, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -42,7 +42,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(7106, "New Chat")),
+                title: ( localize2(7097, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: CONTEXT_CHAT_ENABLED,

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

@@ -1,6 +1,7 @@
 import { CancellationTokenSource } 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 { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
@@ -35,6 +36,9 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { splitLines } from 'vscode/vscode/vs/base/common/strings';
 import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
+import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { AsyncIterableObject } from 'vscode/vscode/vs/base/common/async';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 function isCodeBlockActionContext(thing) {
@@ -107,29 +111,70 @@ class InsertCodeBlockAction extends ChatCodeBlockAction {
             }
         }
         const languageService = accessor.get(ILanguageService);
+        const chatService = accessor.get(IChatService);
         const focusRange = notebookEditor.getFocus();
         const next = Math.max(focusRange.end - 1, 0);
         insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
-        this.notifyUserAction(accessor, context);
+        this.notifyUserAction(chatService, context);
     }
     async computeEdits(accessor, codeEditor, codeBlockActionContext) {
         const activeModel = codeEditor.getModel();
         const range = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
         const text = reindent(codeBlockActionContext.code, activeModel, range.startLineNumber);
-        return [( (new ResourceTextEdit(activeModel.uri, { range, text })))];
+        return { edits: [( (new ResourceTextEdit(activeModel.uri, { range, text })))] };
+    }
+    get showPreview() {
+        return false;
     }
     async handleTextEditor(accessor, codeEditor, codeBlockActionContext) {
         const bulkEditService = accessor.get(IBulkEditService);
         const codeEditorService = accessor.get(ICodeEditorService);
-        this.notifyUserAction(accessor, codeBlockActionContext);
-        const activeModel = codeEditor.getModel();
-        const mappedEdits = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
-        await bulkEditService.apply(mappedEdits);
-        codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+        const chatService = accessor.get(IChatService);
+        const result = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
+        this.notifyUserAction(chatService, codeBlockActionContext, result);
+        if (this.showPreview) {
+            const showWithPreview = await this.applyWithInlinePreview(codeEditorService, result.edits, codeEditor);
+            if (!showWithPreview) {
+                await bulkEditService.apply(result.edits, { showPreview: true });
+                const activeModel = codeEditor.getModel();
+                codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+            }
+        }
+        else {
+            await bulkEditService.apply(result.edits);
+            const activeModel = codeEditor.getModel();
+            codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+        }
     }
-    notifyUserAction(accessor, context) {
+    async applyWithInlinePreview(codeEditorService, edits, codeEditor) {
+        const firstEdit = edits[0];
+        if (!ResourceTextEdit.is(firstEdit)) {
+            return false;
+        }
+        const resource = firstEdit.resource;
+        const textEdits = coalesce(( (edits.map(
+            edit => ResourceTextEdit.is(edit) && isEqual(resource, edit.resource) ? edit.textEdit : undefined
+        ))));
+        if (textEdits.length !== edits.length) {
+            return false;
+        }
+        const editorToApply = await codeEditorService.openCodeEditor({ resource }, codeEditor);
+        if (editorToApply) {
+            const inlineChatController = InlineChatController.get(editorToApply);
+            if (inlineChatController) {
+                const cancellationTokenSource = ( (new CancellationTokenSource()));
+                try {
+                    return await inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray(textEdits), cancellationTokenSource.token);
+                }
+                finally {
+                    cancellationTokenSource.dispose();
+                }
+            }
+        }
+        return false;
+    }
+    notifyUserAction(chatService, context, result) {
         if (isResponseVM(context.element)) {
-            const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
                 agentId: context.element.agent?.id,
                 command: context.element.slashCommand?.name,
@@ -140,6 +185,8 @@ class InsertCodeBlockAction extends ChatCodeBlockAction {
                     kind: 'insert',
                     codeBlockIndex: context.codeBlockIndex,
                     totalCharacters: context.code.length,
+                    userAction: this.desc.id,
+                    codeMapper: result?.codeMapper,
                 }
             });
         }
@@ -204,7 +251,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(7109, "Copy")),
+                title: ( localize2(7098, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -289,7 +336,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyInEditor',
-                title: ( localize2(7110, "Apply in Editor")),
+                title: ( localize2(7099, "Apply in Editor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -338,10 +385,10 @@ function registerChatCodeBlockActions() {
                 try {
                     const edits = await progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
                         for (const provider of mappedEditsProviders) {
-                            progress.report({ message: ( localize(7111, "Applying code block using {0}...", provider.displayName)) });
+                            progress.report({ message: ( localize(7100, "Applying code block using {0}...", provider.displayName)) });
                             const mappedEdits = await provider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
                             if (mappedEdits) {
-                                return mappedEdits;
+                                return { edits: mappedEdits.edits, codeMapper: provider.displayName };
                             }
                         }
                         return undefined;
@@ -351,7 +398,7 @@ function registerChatCodeBlockActions() {
                     }
                 }
                 catch (e) {
-                    notificationService.notify({ severity: Severity$1.Error, message: ( localize(7112, "Failed to apply code block: {0}", e.message)) });
+                    notificationService.notify({ severity: Severity$1.Error, message: ( localize(7101, "Failed to apply code block: {0}", e.message)) });
                 }
                 finally {
                     cancellationTokenSource.dispose();
@@ -359,12 +406,15 @@ function registerChatCodeBlockActions() {
             }
             return super.computeEdits(accessor, codeEditor, codeBlockActionContext);
         }
+        get showPreview() {
+            return true;
+        }
     });
     registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(7113, "Insert At Cursor")),
+                title: ( localize2(7102, "Insert At Cursor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -391,7 +441,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(7114, "Insert into New File")),
+                title: ( localize2(7103, "Insert into New File")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -422,7 +472,8 @@ function registerChatCodeBlockActions() {
                         kind: 'insert',
                         codeBlockIndex: context.codeBlockIndex,
                         totalCharacters: context.code.length,
-                        newFile: true
+                        newFile: true,
+                        userAction: this.desc.id,
                     }
                 });
             }
@@ -441,7 +492,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(7115, "Insert into Terminal")),
+                title: ( localize2(7104, "Insert into Terminal")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -541,7 +592,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(7116, "Next Code Block")),
+                title: ( localize2(7105, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -561,7 +612,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(7117, "Previous Code Block")),
+                title: ( localize2(7106, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -617,7 +668,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(7118, "Apply Edits")),
+                title: ( localize2(7107, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.check,
@@ -647,7 +698,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(7119, "Discard Edits")),
+                title: ( localize2(7108, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -14,11 +14,12 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+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 '../contrib/chatContextAttachments.js';
 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_QUICK_CHAT, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+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 { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
@@ -36,7 +37,7 @@ class AttachFileAction extends Action2 {
     constructor() {
         super({
             id: AttachFileAction.ID,
-            title: ( localize2(7162, "Attach File")),
+            title: ( localize2(7109, "Attach File")),
             category: CHAT_CATEGORY,
             f1: false
         });
@@ -55,7 +56,7 @@ class AttachSelectionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionAction.ID,
-            title: ( localize2(7163, "Add Selection to Chat")),
+            title: ( localize2(7110, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false
         });
@@ -75,23 +76,25 @@ class AttachSelectionAction extends Action2 {
 }
 class AttachContextAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachContext'; }
-    static { this._cdt = ( (ContextKeyExpr.or( (ContextKeyExpr.and(
-         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
-         (CONTEXT_IN_QUICK_CHAT.isEqualTo(false))
-    )),  (ContextKeyExpr.and(
-         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor)),
-         (ContextKeyExpr.equals('config.chat.experimental.variables.editor', true))
-    )),  (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))
-    ))))); }
+    static { this._cdt = ( (ContextKeyExpr.or(
+         (ContextKeyExpr.and( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)))),
+         (ContextKeyExpr.and(
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor)),
+             (ContextKeyExpr.equals('config.chat.experimental.variables.editor', true))
+        )),
+         (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))
+        ))
+    ))); }
     constructor() {
         super({
             id: AttachContextAction.ID,
-            title: ( localize2(7164, "Attach Context")),
+            title: ( localize2(7111, "Attach Context")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             precondition: AttachContextAction._cdt,
@@ -172,6 +175,7 @@ class AttachContextAction extends Action2 {
                     name: pick.label,
                     fullName: pick.label,
                     value: undefined,
+                    icon: pick.icon,
                     isTool: true
                 });
             }
@@ -196,6 +200,7 @@ class AttachContextAction extends Action2 {
         const commandService = accessor.get(ICommandService);
         const widgetService = accessor.get(IChatWidgetService);
         const languageModelToolsService = accessor.get(ILanguageModelToolsService);
+        const quickChatService = accessor.get(IQuickChatService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
@@ -235,24 +240,27 @@ class AttachContextAction extends Action2 {
                 }
             }
         }
-        for (const tool of languageModelToolsService.getTools()) {
-            if (tool.canBeInvokedManually) {
-                const item = {
-                    kind: 'tool',
-                    label: tool.displayName ?? tool.name,
-                    id: tool.name,
-                };
-                if (ThemeIcon.isThemeIcon(tool.icon)) {
-                    item.iconClass = ThemeIcon.asClassName(tool.icon);
-                }
-                else if (tool.icon) {
-                    item.iconPath = tool.icon;
+        if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+            for (const tool of languageModelToolsService.getTools()) {
+                if (tool.canBeInvokedManually) {
+                    const item = {
+                        kind: 'tool',
+                        label: tool.displayName ?? tool.name ?? '',
+                        id: tool.id,
+                        icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined
+                    };
+                    if (ThemeIcon.isThemeIcon(tool.icon)) {
+                        item.iconClass = ThemeIcon.asClassName(tool.icon);
+                    }
+                    else if (tool.icon) {
+                        item.iconPath = tool.icon;
+                    }
+                    quickPickItems.push(item);
                 }
-                quickPickItems.push(item);
             }
         }
         quickPickItems.push({
-            label: ( localize(7165, 'Symbol...')),
+            label: ( localize(7112, 'Symbol...')),
             icon: ThemeIcon.fromId(Codicon.symbolField.id),
             iconClass: ThemeIcon.asClassName(Codicon.symbolField),
             prefix: SymbolsQuickAccessProvider.PREFIX
@@ -264,27 +272,30 @@ class AttachContextAction extends Action2 {
             const match = label.match(/\$\([^\)]+\)\s*(.+)/);
             return match ? match[1] : label;
         }
-        this._show(quickInputService, commandService, widget, quickPickItems.sort(function (a, b) {
+        this._show(quickInputService, commandService, widget, quickChatService, quickPickItems.sort(function (a, b) {
             const first = extractTextFromIconLabel(a.label).toUpperCase();
             const second = extractTextFromIconLabel(b.label).toUpperCase();
             return compare(first, second);
         }));
     }
-    _show(quickInputService, commandService, widget, quickPickItems, query = '') {
+    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, query = '') {
         quickInputService.quickAccess.show(query, {
             enabledProviderPrefixes: [
                 AnythingQuickAccessProvider.PREFIX,
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: ( localize(7166, 'Search attachments')),
+            placeholder: ( localize(7113, 'Search attachments')),
             providerOptions: {
                 handleAccept: (item) => {
                     if ('prefix' in item) {
-                        this._show(quickInputService, commandService, widget, quickPickItems, item.prefix);
+                        this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, item.prefix);
                     }
                     else {
                         this._attachContext(widget, commandService, item);
+                        if (isQuickChat(widget)) {
+                            quickChatService.open();
+                        }
                     }
                 },
                 additionPicks: quickPickItems,

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

@@ -11,7 +11,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(7107, "Copy All")),
+                title: ( localize2(7114, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -41,7 +41,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(7108, "Copy")),
+                title: ( localize2(7115, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -12,7 +12,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(7167, "Log Chat Input History")),
+            title: ( localize2(7116, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true

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

@@ -12,7 +12,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(7124, "Next File Tree")),
+                title: ( localize2(7121, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -31,7 +31,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(7125, "Previous File Tree")),
+                title: ( localize2(7122, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -13,14 +13,14 @@ import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/cha
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(7126, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(7123, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(7127, "Export Chat...")),
+                title: ( localize2(7124, "Export Chat...")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
@@ -54,7 +54,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(7128, "Import Chat...")),
+                title: ( localize2(7125, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -79,7 +79,8 @@ function registerChatExportActions() {
                 if (!isExportableSessionData(data)) {
                     throw ( (new Error('Invalid chat session data')));
                 }
-                await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { data }, pinned: true } });
+                const options = { target: { data }, pinned: true };
+                await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options });
             }
             catch (err) {
                 throw err;