@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.1

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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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 } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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(4423, "Apply to {0}", label);
+                        return localize(4508, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -104,7 +104,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4424, "Copy")),
+                title: ( localize2(4509, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -124,6 +124,8 @@ function registerChatCodeBlockActions() {
             clipboardService.writeText(context.code);
             if (isResponseVM(context.element)) {
                 const chatService = accessor.get(IChatService);
+                const requestId = context.element.requestId;
+                const request = context.element.session.getItems().find(item => item.id === requestId && isRequestVM(item));
                 chatService.notifyUserAction({
                     agentId: context.element.agent?.id,
                     command: context.element.slashCommand?.name,
@@ -137,6 +139,10 @@ function registerChatCodeBlockActions() {
                         copiedCharacters: context.code.length,
                         totalCharacters: context.code.length,
                         copiedText: context.code,
+                        copiedLines: context.code.split('\n').length,
+                        languageId: context.languageId,
+                        totalLines: context.code.split('\n').length,
+                        modelId: request?.modelId ?? ''
                     }
                 });
             }
@@ -162,7 +168,9 @@ function registerChatCodeBlockActions() {
         const totalCharacters = editorModel.getValueLength();
         const chatService = accessor.get(IChatService);
         const element = context.element;
-        if (element) {
+        if (isResponseVM(element)) {
+            const requestId = element.requestId;
+            const request = element.session.getItems().find(item => item.id === requestId && isRequestVM(item));
             chatService.notifyUserAction({
                 agentId: element.agent?.id,
                 command: element.slashCommand?.name,
@@ -176,6 +184,10 @@ function registerChatCodeBlockActions() {
                     copiedText,
                     copiedCharacters: copiedText.length,
                     totalCharacters,
+                    languageId: context.languageId,
+                    totalLines: context.code.split('\n').length,
+                    copiedLines: copiedText.split('\n').length,
+                    modelId: request?.modelId ?? ''
                 }
             });
         }
@@ -189,7 +201,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4425, "Apply in Editor")),
+                title: ( localize2(4510, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -225,7 +237,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4426, "Insert At Cursor")),
+                title: ( localize2(4511, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -259,7 +271,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4427, "Insert into New File")),
+                title: ( localize2(4512, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -280,6 +292,8 @@ function registerChatCodeBlockActions() {
             const chatService = accessor.get(IChatService);
             editorService.openEditor({ contents: context.code, languageId: context.languageId, resource: undefined });
             if (isResponseVM(context.element)) {
+                const requestId = context.element.requestId;
+                const request = context.element.session.getItems().find(item => item.id === requestId && isRequestVM(item));
                 chatService.notifyUserAction({
                     agentId: context.element.agent?.id,
                     command: context.element.slashCommand?.name,
@@ -290,7 +304,10 @@ function registerChatCodeBlockActions() {
                         kind: 'insert',
                         codeBlockIndex: context.codeBlockIndex,
                         totalCharacters: context.code.length,
-                        newFile: true
+                        newFile: true,
+                        totalLines: context.code.split('\n').length,
+                        languageId: context.languageId,
+                        modelId: request?.modelId ?? ''
                     }
                 });
             }
@@ -300,7 +317,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4428, "Insert into Terminal")),
+                title: ( localize2(4513, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -394,7 +411,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4429, "Next Code Block")),
+                title: ( localize2(4514, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -414,7 +431,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4430, "Previous Code Block")),
+                title: ( localize2(4515, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -473,7 +490,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4431, "Apply Edits")),
+                title: ( localize2(4516, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -515,7 +532,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4432, "Discard Edits")),
+                title: ( localize2(4517, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -14,17 +14,17 @@ import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vsco
 import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/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-f5d4b045-44e8-55a8-b683-308656a412fa-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { FileEditorInput } from '@codingame/monaco-vscode-f5d4b045-44e8-55a8-b683-308656a412fa-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-ddbd4d51-94af-51e5-96b5-f2166ed67ad0-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 { 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/chatModel';
+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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import { ChatInstructionsPickerPick } from './promptActions/chatAttachInstructionsAction.js';
-import { imageToHash } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+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 { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 
 let ChatContextContributions = class ChatContextContributions extends Disposable {
     static { this.ID = 'chat.contextContributions'; }
@@ -45,7 +45,7 @@ ChatContextContributions = ( __decorate([
 class ToolsContextPickerPick {
     constructor() {
         this.type = 'pickerPick';
-        this.label = ( localize(4433, 'Tools...'));
+        this.label = ( localize(4518, 'Tools...'));
         this.icon = Codicon.tools;
         this.ordinal = -500;
     }
@@ -89,7 +89,7 @@ class ToolsContextPickerPick {
             picks.push(item);
         }
         return {
-            placeholder: ( localize(4434, 'Select a tool')),
+            placeholder: ( localize(4519, '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(4435, 'Open Editors'));
+        this.label = ( localize(4520, '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(4436, 'Related Files'));
+        this.label = ( localize(4521, 'Related Files'));
         this.icon = Codicon.sparkle;
         this.ordinal = 300;
     }
@@ -195,7 +195,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
             }, []));
         })();
         return {
-            placeholder: ( localize(4437, 'Add related files to your working set')),
+            placeholder: ( localize(4522, '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(4438, 'Image from Clipboard'));
+        this.label = ( localize(4523, '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(4439, 'Pasted Image')),
-            fullName: ( localize(4439, 'Pasted Image')),
+            name: ( localize(4524, 'Pasted Image')),
+            fullName: ( localize(4524, '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(4440, 'Screenshot Window'))
-            : ( localize(4441, 'Screenshot')));
+            ? ( localize(4525, 'Screenshot Window'))
+            : ( localize(4526, 'Screenshot')));
     }
     async isEnabled(widget) {
         return !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;

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

@@ -14,6 +14,7 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-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';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -26,22 +27,22 @@ import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 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-97284942-b044-5fbb-b53b-3f46d2468746-common/vscode/vs/workbench/contrib/files/common/files';
+import { ExplorerFolderContext } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/contrib/files/common/files';
 import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { SearchContext } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/constants';
 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/chatModel';
+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-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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 { 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-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { registerPromptActions } from './promptActions/index.js';
+import { resizeImage } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-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 { 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';
 
@@ -100,9 +101,10 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4442, "Add File to Chat")),
+            title: ( localize2(4527, "Add File to Chat")),
             category: CHAT_CATEGORY,
-            f1: false,
+            precondition: ChatContextKeys.enabled,
+            f1: true,
             menu: [{
                     id: MenuId.SearchContext,
                     group: 'z_chat',
@@ -117,6 +119,11 @@ class AttachFileToChatAction extends AttachResourceAction {
                     group: 'zContext',
                     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',
+                    order: 1,
+                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)))))),
                 }, {
                     id: MenuId.ChatTextEditorMenu,
                     group: 'zContext',
@@ -143,7 +150,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4443, "Add Folder to Chat")),
+            title: ( localize2(4528, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -172,9 +179,10 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4444, "Add Selection to Chat")),
+            title: ( localize2(4529, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
-            f1: false,
+            f1: true,
+            precondition: ChatContextKeys.enabled,
             menu: {
                 id: MenuId.ChatTextEditorMenu,
                 group: 'zContext',
@@ -232,7 +240,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4445, 'Add Search Results to Chat')),
+            title: ( localize2(4530, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -298,7 +306,7 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4446, "Add Context...")),
+            title: ( localize2(4531, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -344,6 +352,7 @@ class AttachContextAction extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const quickChatService = accessor.get(IQuickChatService);
         const instantiationService = accessor.get(IInstantiationService);
+        const commandService = accessor.get(ICommandService);
         const providerOptions = {
             additionPicks,
             handleAccept: async (item, isBackgroundAccept) => {
@@ -353,7 +362,7 @@ class AttachContextAction extends Action2 {
                         this._handleContextPick(item.item, widget);
                     }
                     else if (item.item.type === 'pickerPick') {
-                        isDone = await this._handleContextPickerItem(quickInputService, item.item, widget);
+                        isDone = await this._handleContextPickerItem(quickInputService, commandService, item.item, widget);
                     }
                     if (!isDone) {
                         instantiationService.invokeFunction(this._show.bind(this), widget, additionPicks, placeholder);
@@ -374,7 +383,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4447, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4532, 'Search attachments')),
             providerOptions,
         });
     }
@@ -438,14 +447,23 @@ class AttachContextAction extends Action2 {
             widget.attachmentModel.addContext(value);
         }
     }
-    async _handleContextPickerItem(quickInputService, item, widget) {
+    async _handleContextPickerItem(quickInputService, commandService, item, widget) {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4448, 'Go back ↩')),
+            label: ( localize(4533, 'Go back ↩')),
             alwaysShow: true
         };
-        const extraPicks = [{ type: 'separator' }, goBackItem];
+        const configureItem = pickerConfig.configure ? {
+            label: pickerConfig.configure.label,
+            commandId: pickerConfig.configure.commandId,
+            alwaysShow: true
+        } : undefined;
+        const extraPicks = [{ type: 'separator' }];
+        if (configureItem) {
+            extraPicks.push(configureItem);
+        }
+        extraPicks.push(goBackItem);
         const qp = store.add(quickInputService.createQuickPick({ useSeparators: true }));
         const cts = ( new CancellationTokenSource());
         store.add(qp.onDidHide(() => cts.cancel()));
@@ -492,6 +510,10 @@ class AttachContextAction extends Action2 {
             if (selected === goBackItem) {
                 defer.complete(false);
             }
+            if (selected === configureItem) {
+                defer.complete(true);
+                commandService.executeCommand(configureItem.commandId);
+            }
             if (!e.inBackground) {
                 defer.complete(true);
             }

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

@@ -1,18 +1,19 @@
 
+import { getActiveWindow, isAncestor, getActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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 } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4449, "Copy All")),
+                title: ( localize2(4534, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -42,7 +43,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4450, "Copy")),
+                title: ( localize2(4535, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -52,14 +53,25 @@ function registerChatCopyActions() {
                 }
             });
         }
-        run(accessor, ...args) {
-            const item = args[0];
-            if (!isRequestVM(item) && !isResponseVM(item)) {
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const clipboardService = accessor.get(IClipboardService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            let item = args[0];
+            if (!isChatTreeItem(item)) {
+                item = widget?.getFocus();
+                if (!item) {
+                    return;
+                }
+            }
+            const nativeSelection = getActiveWindow().getSelection();
+            const selectedText = nativeSelection?.toString();
+            if (widget && selectedText && selectedText.length > 0 && isAncestor(getActiveElement(), widget.domNode)) {
+                await clipboardService.writeText(selectedText);
                 return;
             }
-            const clipboardService = accessor.get(IClipboardService);
             const text = stringifyItem(item, false);
-            clipboardService.writeText(text);
+            await clipboardService.writeText(text);
         }
     });
 }

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(4451, "Log Chat Input History")),
+            title: ( localize2(4536, "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(4452, "Log Chat Index")),
+            title: ( localize2(4537, "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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4467, "Next File Tree")),
+                title: ( localize2(4567, "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(4468, "Previous File Tree")),
+                title: ( localize2(4568, "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-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showCopilotView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-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-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isExportableSessionData } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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(4469, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4569, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4470, "Export Chat...")),
+                title: ( localize2(4570, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -55,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4471, "Import Chat...")),
+                title: ( localize2(4571, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,

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

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