@codingame/monaco-vscode-chat-service-override 19.1.3 → 20.0.0

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

@@ -20,16 +20,16 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { TerminalLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { accessibleViewInCodeBlock } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { reviewEdits } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
 const shellLangIds = [
@@ -81,7 +81,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                     const context = this._context;
                     if (isCodeBlockActionContext(context) && context.codemapperUri) {
                         const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
-                        return localize(4508, "Apply to {0}", label);
+                        return localize(4554, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -104,7 +104,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4509, "Copy")),
+                title: ( localize2(4555, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -201,7 +201,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4510, "Apply in Editor")),
+                title: ( localize2(4556, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -237,7 +237,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4511, "Insert At Cursor")),
+                title: ( localize2(4557, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -271,7 +271,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4512, "Insert into New File")),
+                title: ( localize2(4558, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -317,7 +317,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4513, "Insert into Terminal")),
+                title: ( localize2(4559, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -411,7 +411,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4514, "Next Code Block")),
+                title: ( localize2(4560, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -431,7 +431,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4515, "Previous Code Block")),
+                title: ( localize2(4561, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -490,7 +490,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4516, "Apply Edits")),
+                title: ( localize2(4562, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -532,7 +532,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4517, "Discard Edits")),
+                title: ( localize2(4563, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -11,19 +11,19 @@ import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { UntitledTextEditorInput } from '@codingame/monaco-vscode-ddbd4d51-94af-51e5-96b5-f2166ed67ad0-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { FileEditorInput } from '@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-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 { NotebookEditorInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ToolSet, ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { isImage } from '../chatPasteProviders.js';
-import { convertBufferToScreenshotVariable } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import { imageToHash } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { convertBufferToScreenshotVariable } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { imageToHash } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 
 let ChatContextContributions = class ChatContextContributions extends Disposable {
@@ -45,7 +45,7 @@ ChatContextContributions = ( __decorate([
 class ToolsContextPickerPick {
     constructor() {
         this.type = 'pickerPick';
-        this.label = ( localize(4518, 'Tools...'));
+        this.label = ( localize(4564, 'Tools...'));
         this.icon = Codicon.tools;
         this.ordinal = -500;
     }
@@ -89,7 +89,7 @@ class ToolsContextPickerPick {
             picks.push(item);
         }
         return {
-            placeholder: ( localize(4519, 'Select a tool')),
+            placeholder: ( localize(4565, 'Select a tool')),
             picks: Promise.resolve(picks)
         };
     }
@@ -117,7 +117,7 @@ let OpenEditorContextValuePick = class OpenEditorContextValuePick {
         this._editorService = _editorService;
         this._labelService = _labelService;
         this.type = 'valuePick';
-        this.label = ( localize(4520, 'Open Editors'));
+        this.label = ( localize(4566, 'Open Editors'));
         this.icon = Codicon.file;
         this.ordinal = 800;
     }
@@ -153,7 +153,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
         this._chatEditingService = _chatEditingService;
         this._labelService = _labelService;
         this.type = 'pickerPick';
-        this.label = ( localize(4521, 'Related Files'));
+        this.label = ( localize(4567, 'Related Files'));
         this.icon = Codicon.sparkle;
         this.ordinal = 300;
     }
@@ -195,7 +195,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
             }, []));
         })();
         return {
-            placeholder: ( localize(4522, 'Add related files to your working set')),
+            placeholder: ( localize(4568, 'Add related files to your working set')),
             picks,
         };
     }
@@ -208,7 +208,7 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
     constructor(_clipboardService) {
         this._clipboardService = _clipboardService;
         this.type = 'valuePick';
-        this.label = ( localize(4523, 'Image from Clipboard'));
+        this.label = ( localize(4569, 'Image from Clipboard'));
         this.icon = Codicon.fileMedia;
     }
     async isEnabled(widget) {
@@ -222,8 +222,8 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
         const fileBuffer = await this._clipboardService.readImage();
         return {
             id: await imageToHash(fileBuffer),
-            name: ( localize(4524, 'Pasted Image')),
-            fullName: ( localize(4524, 'Pasted Image')),
+            name: ( localize(4570, 'Pasted Image')),
+            fullName: ( localize(4570, 'Pasted Image')),
             value: fileBuffer,
             kind: 'image',
         };
@@ -238,8 +238,8 @@ let ScreenshotContextValuePick = class ScreenshotContextValuePick {
         this.type = 'valuePick';
         this.icon = Codicon.deviceCamera;
         this.label = (isElectron
-            ? ( localize(4525, 'Screenshot Window'))
-            : ( localize(4526, 'Screenshot')));
+            ? ( localize(4571, 'Screenshot Window'))
+            : ( localize(4572, 'Screenshot')));
     }
     async isEnabled(widget) {
         return !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;

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

@@ -11,7 +11,7 @@ import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
+import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -21,10 +21,13 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.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 { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { isEditorCommandsContext, EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ExplorerFolderContext } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/contrib/files/common/files';
@@ -35,14 +38,14 @@ import { SearchContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showChatView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-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 { isChatContextPickerPickItem } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
+import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { isQuickChat } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { resizeImage } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { isQuickChat } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { resizeImage } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -73,7 +76,7 @@ class AttachResourceAction extends Action2 {
     }
     _getResources(accessor, ...args) {
         const editorService = accessor.get(IEditorService);
-        const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
+        const contexts = isEditorCommandsContext(args[1]) ? this._getEditorResources(accessor, args) : Array.isArray(args[1]) ? args[1] : [args[0]];
         const files = [];
         for (const context of contexts) {
             let uri;
@@ -95,13 +98,22 @@ class AttachResourceAction extends Action2 {
         }
         return files;
     }
+    _getEditorResources(accessor, ...args) {
+        const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+        return ( resolvedContext.groupedEditors
+            .flatMap(groupedEditor => groupedEditor.editors)
+            .map(
+            editor => EditorResourceAccessor.getCanonicalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY })
+        ))
+            .filter(uri => uri !== undefined);
+    }
 }
 class AttachFileToChatAction extends AttachResourceAction {
     static { this.ID = 'workbench.action.chat.attachFile'; }
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4527, "Add File to Chat")),
+            title: ( localize2(4573, "Add File to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true,
@@ -115,18 +127,18 @@ class AttachFileToChatAction extends AttachResourceAction {
                         ( SearchContext.SearchResultHeaderFocused.negate())
                     )),
                 }, {
-                    id: MenuId.ChatExplorerMenu,
-                    group: 'zContext',
+                    id: MenuId.ExplorerContext,
+                    group: '5_chat',
                     order: 1,
                     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ExplorerFolderContext.negate()), ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)))))),
                 }, {
                     id: MenuId.EditorTitleContext,
-                    group: 'zContext',
+                    group: '2_chat',
                     order: 1,
                     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)))))),
                 }, {
-                    id: MenuId.ChatTextEditorMenu,
-                    group: 'zContext',
+                    id: MenuId.EditorContext,
+                    group: '1_chat',
                     order: 2,
                     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
                 }]
@@ -150,12 +162,12 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4528, "Add Folder to Chat")),
+            title: ( localize2(4574, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
-                id: MenuId.ChatExplorerMenu,
-                group: 'zContext',
+                id: MenuId.ExplorerContext,
+                group: '5_chat',
                 order: 1,
                 when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ExplorerFolderContext, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote))))))
             }
@@ -179,13 +191,13 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4529, "Add Selection to Chat")),
+            title: ( localize2(4575, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled,
             menu: {
-                id: MenuId.ChatTextEditorMenu,
-                group: 'zContext',
+                id: MenuId.EditorContext,
+                group: '1_chat',
                 order: 1,
                 when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
             }
@@ -240,7 +252,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4530, 'Add Search Results to Chat')),
+            title: ( localize2(4576, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -306,7 +318,7 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4531, "Add Context...")),
+            title: ( localize2(4577, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -315,7 +327,7 @@ class AttachContextAction extends Action2 {
                 weight: KeybindingWeight.EditorContrib
             },
             menu: {
-                when: ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
+                when: ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
                 id: MenuId.ChatInputAttachmentToolbar,
                 group: 'navigation',
                 order: 3
@@ -383,7 +395,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4532, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4578, 'Search attachments')),
             providerOptions,
         });
     }
@@ -451,7 +463,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4533, 'Go back ↩')),
+            label: ( localize(4579, 'Go back ↩')),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {

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

@@ -3,17 +3,17 @@ import { getActiveWindow, isAncestor, getActiveElement } from '@codingame/monaco
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4534, "Copy All")),
+                title: ( localize2(4580, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -43,7 +43,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4535, "Copy")),
+                title: ( localize2(4581, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -16,7 +16,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4536, "Log Chat Input History")),
+            title: ( localize2(4582, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -33,7 +33,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4537, "Log Chat Index")),
+            title: ( localize2(4583, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,

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

@@ -3,17 +3,17 @@ import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4567, "Next File Tree")),
+                title: ( localize2(4616, "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(4568, "Previous File Tree")),
+                title: ( localize2(4617, "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

@@ -9,7 +9,7 @@ import { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { showCopilotView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showCopilotView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 
 var ChatGettingStartedContribution_1;

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

@@ -5,23 +5,23 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isExportableSessionData } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isExportableSessionData } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(4569, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4618, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4570, "Export Chat...")),
+                title: ( localize2(4619, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -55,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4571, "Import Chat...")),
+                title: ( localize2(4620, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,