@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -2,22 +2,22 @@
 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4407, "Copy All")),
+                title: ( localize2(4427, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( ChatContextKeys.responseIsFiltered.toNegated()),
+                    when: ( ChatContextKeys.responseIsFiltered.negate()),
                     group: 'copy',
                 }
             });
@@ -42,12 +42,12 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4408, "Copy")),
+                title: ( localize2(4428, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( ChatContextKeys.responseIsFiltered.toNegated()),
+                    when: ( ChatContextKeys.responseIsFiltered.negate()),
                     group: 'copy',
                 }
             });

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(4409, "Log Chat Input History")),
+            title: ( localize2(4429, "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(4410, "Log Chat Index")),
+            title: ( localize2(4430, "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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4432, "Next File Tree")),
+                title: ( localize2(4449, "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(4433, "Previous File Tree")),
+                title: ( localize2(4450, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -4,25 +4,19 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { IStatusbarService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
 export declare class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
     private readonly productService;
     private readonly extensionService;
     private readonly viewsService;
     private readonly extensionManagementService;
     private readonly storageService;
-    private readonly viewDescriptorService;
     private readonly layoutService;
-    private readonly configurationService;
-    private readonly statusbarService;
     static readonly ID = "workbench.contrib.chatGettingStarted";
     private recentlyInstalled;
     private static readonly hideWelcomeView;
-    constructor(productService: IProductService, extensionService: IExtensionService, viewsService: IViewsService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, viewDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService, configurationService: IConfigurationService, statusbarService: IStatusbarService);
+    constructor(productService: IProductService, extensionService: IExtensionService, viewsService: IViewsService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, layoutService: IWorkbenchLayoutService);
     private registerListeners;
     private onDidInstallChat;
 }

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

@@ -8,29 +8,23 @@ import { InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 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 { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { showCopilotView, ensureSideBarChatViewSize } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { showCopilotView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 var ChatGettingStartedContribution_1;
 let ChatGettingStartedContribution = class ChatGettingStartedContribution extends Disposable {
     static { ChatGettingStartedContribution_1 = this; }
     static { this.ID = 'workbench.contrib.chatGettingStarted'; }
     static { this.hideWelcomeView = 'workbench.chat.hideWelcomeView'; }
-    constructor(productService, extensionService, viewsService, extensionManagementService, storageService, viewDescriptorService, layoutService, configurationService, statusbarService) {
+    constructor(productService, extensionService, viewsService, extensionManagementService, storageService, layoutService) {
         super();
         this.productService = productService;
         this.extensionService = extensionService;
         this.viewsService = viewsService;
         this.extensionManagementService = extensionManagementService;
         this.storageService = storageService;
-        this.viewDescriptorService = viewDescriptorService;
         this.layoutService = layoutService;
-        this.configurationService = configurationService;
-        this.statusbarService = statusbarService;
         this.recentlyInstalled = false;
         const defaultChatAgent = this.productService.defaultChatAgent;
         const hideWelcomeView = this.storageService.getBoolean(ChatGettingStartedContribution_1.hideWelcomeView, StorageScope.APPLICATION, false);
@@ -62,14 +56,8 @@ let ChatGettingStartedContribution = class ChatGettingStartedContribution extend
     }
     async onDidInstallChat() {
         showCopilotView(this.viewsService, this.layoutService);
-        const setupFromDialog = this.configurationService.getValue('chat.setupFromDialog');
-        if (!setupFromDialog) {
-            ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService, this.viewsService);
-        }
         this.storageService.store(ChatGettingStartedContribution_1.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
         this.recentlyInstalled = false;
-        this.statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
-        this.configurationService.updateValue('chat.commandCenter.enabled', true);
     }
 };
 ChatGettingStartedContribution = ChatGettingStartedContribution_1 = ( __decorate([
@@ -78,10 +66,7 @@ ChatGettingStartedContribution = ChatGettingStartedContribution_1 = ( __decorate
     ( __param(2, IViewsService)),
     ( __param(3, IExtensionManagementService)),
     ( __param(4, IStorageService)),
-    ( __param(5, IViewDescriptorService)),
-    ( __param(6, IWorkbenchLayoutService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IStatusbarService))
+    ( __param(5, IWorkbenchLayoutService))
 ], ChatGettingStartedContribution));
 
 export { ChatGettingStartedContribution };

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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isExportableSessionData } from '@codingame/monaco-vscode-api/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(4434, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4451, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4435, "Export Chat...")),
+                title: ( localize2(4452, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -55,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4436, "Import Chat...")),
+                title: ( localize2(4453, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,

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

@@ -9,14 +9,12 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditor } from '../chatEditor.js';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { waitForChatSessionCleared } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
+import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 var MoveToNewLocation;
 (function (MoveToNewLocation) {
@@ -28,7 +26,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(4437, "Open Chat in Editor")),
+                title: ( localize2(4454, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -49,7 +47,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(4438, "Open Chat in New Window")),
+                title: ( localize2(4455, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -70,7 +68,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(4439, "Open Chat in Side Bar")),
+                title: ( localize2(4456, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -89,18 +87,17 @@ function registerMoveActions() {
 async function executeMoveToAction(accessor, moveTo, _sessionId) {
     const widgetService = accessor.get(IChatWidgetService);
     const editorService = accessor.get(IEditorService);
-    const chatService = accessor.get(IChatService);
     const widget = (_sessionId ? widgetService.getWidgetBySessionId(_sessionId) : undefined)
         ?? widgetService.lastFocusedWidget;
     if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Panel) {
-        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, compact: moveTo === MoveToNewLocation.Window } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }
     const sessionId = widget.viewModel.sessionId;
     const viewState = widget.getViewState();
     widget.clear();
-    await waitForChatSessionCleared(sessionId, chatService);
-    const options = { target: { sessionId }, pinned: true, viewState: viewState };
+    await widget.waitForReady();
+    const options = { target: { sessionId }, pinned: true, viewState, compact: moveTo === MoveToNewLocation.Window };
     await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 async function moveToSidebar(accessor) {

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

@@ -5,7 +5,7 @@ import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/
 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 { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IQuickChatService } 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 { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4440, "Open in Chat View")),
+                title: ( localize2(4457, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.commentDiscussion,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4441, "Close Quick Chat")),
+                title: ( localize2(4458, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,7 +59,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4442, 'Quick Chat')),
+            title: ( localize2(4459, 'Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.commentDiscussion,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4443, 'Toggle the quick chat')),
+                description: ( localize(4460, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4444, "The query to open the quick chat with")),
+                                            description: ( localize(4461, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4445, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4462, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4444, "The query to open the quick chat with"))
+                                    description: ( localize(4461, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4446, "Open Quick Chat")),
+            title: ( localize2(4463, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

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

@@ -7,7 +7,7 @@ let ChatTransferContribution = class ChatTransferContribution extends Disposable
     static { this.ID = 'workbench.contrib.chatTransfer'; }
     constructor(chatTransferService) {
         super();
-        chatTransferService.checkAndSetWorkspaceTrust();
+        chatTransferService.checkAndSetTransferredWorkspaceTrust();
     }
 };
 ChatTransferContribution = ( __decorate([

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

@@ -9,10 +9,11 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ICodeBlockActionContext } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 export declare class InsertCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;
@@ -40,7 +41,8 @@ export declare class ApplyCodeBlockOperation {
     private readonly quickInputService;
     private readonly labelService;
     private readonly instantiationService;
-    constructor(editorService: IEditorService, textFileService: ITextFileService, chatService: IChatService, languageService: ILanguageService, fileService: IFileService, dialogService: IDialogService, logService: ILogService, codeMapperService: ICodeMapperService, progressService: IProgressService, quickInputService: IQuickInputService, labelService: ILabelService, instantiationService: IInstantiationService);
+    private readonly notebookService;
+    constructor(editorService: IEditorService, textFileService: ITextFileService, chatService: IChatService, languageService: ILanguageService, fileService: IFileService, dialogService: IDialogService, logService: ILogService, codeMapperService: ICodeMapperService, progressService: IProgressService, quickInputService: IQuickInputService, labelService: ILabelService, instantiationService: IInstantiationService, notebookService: INotebookService);
     run(context: ICodeBlockActionContext): Promise<void>;
     private evaluateURIToUse;
     private handleNotebookEditor;

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

@@ -22,15 +22,16 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { reviewEdits } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { insertCell } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { reviewEdits } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
 let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService) {
@@ -54,7 +55,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4473,
+                    4486,
                     "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."
                 )));
             }
@@ -67,7 +68,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4474, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4487, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -78,7 +79,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4475, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4488, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -102,7 +103,7 @@ InsertCodeBlockOperation = ( __decorate([
     ( __param(6, IDialogService))
 ], InsertCodeBlockOperation));
 let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
-    constructor(editorService, textFileService, chatService, languageService, fileService, dialogService, logService, codeMapperService, progressService, quickInputService, labelService, instantiationService) {
+    constructor(editorService, textFileService, chatService, languageService, fileService, dialogService, logService, codeMapperService, progressService, quickInputService, labelService, instantiationService, notebookService) {
         this.editorService = editorService;
         this.textFileService = textFileService;
         this.chatService = chatService;
@@ -115,6 +116,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         this.quickInputService = quickInputService;
         this.labelService = labelService;
         this.instantiationService = instantiationService;
+        this.notebookService = notebookService;
     }
     async run(context) {
         let activeEditorControl = getEditableActiveCodeEditor(this.editorService);
@@ -122,7 +124,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         if (!codemapperUri) {
             return;
         }
-        if (codemapperUri && !isEqual(activeEditorControl?.getModel().uri, codemapperUri)) {
+        if (codemapperUri && !isEqual(activeEditorControl?.getModel().uri, codemapperUri) && !this.notebookService.hasSupportedNotebooks(codemapperUri)) {
             try {
                 const editorPane = await this.editorService.openEditor({ resource: codemapperUri });
                 const codeEditor = getCodeEditor(editorPane?.getControl());
@@ -131,7 +133,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4476, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4489, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -141,8 +143,8 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
         }
         let result = undefined;
-        if (activeEditorControl) {
-            result = await this.handleTextEditor(activeEditorControl, context.code);
+        if (activeEditorControl && !this.notebookService.hasSupportedNotebooks(codemapperUri)) {
+            result = await this.handleTextEditor(activeEditorControl, context.chatSessionId, context.code);
         }
         else {
             const activeNotebookEditor = getActiveNotebookEditor(this.editorService);
@@ -150,7 +152,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.code);
             }
             else {
-                this.notify(( localize(4477, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4490, "To apply this code block, open a code or notebook editor.")));
             }
         }
         notifyUserAction(this.chatService, context, {
@@ -166,15 +168,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4478,
+            4491,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4479, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4492, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4480,
+                4493,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -189,7 +191,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4481, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4494, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -198,7 +200,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4482, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4495, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -213,7 +215,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4483, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4496, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const focusRange = notebookEditor.getFocus();
@@ -221,31 +223,31 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         insertCell(this.languageService, notebookEditor, next, CellKind.Code, 'below', code, true);
         return undefined;
     }
-    async handleTextEditor(codeEditor, code) {
+    async handleTextEditor(codeEditor, chatSessionId, code) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4484, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4497, "Cannot apply code block to read-only file.")));
             return undefined;
         }
-        const codeBlock = { code, resource: activeModel.uri, markdownBeforeBlock: undefined };
+        const codeBlock = { code, resource: activeModel.uri, chatSessionId, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4485, "No code mapper available.")));
+            this.notify(( localize(4498, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
         const cancellationTokenSource = ( new CancellationTokenSource());
         try {
             const iterable = await this.progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
-                progress.report({ message: ( localize(4486, "Applying code block using {0}...", codeMapper)) });
-                const editsIterable = this.getEdits(codeBlock, cancellationTokenSource.token);
+                progress.report({ message: ( localize(4499, "Applying code block using {0}...", codeMapper)) });
+                const editsIterable = this.getEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
             editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource);
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4487, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4500, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -256,10 +258,11 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             codeMapper
         };
     }
-    getEdits(codeBlock, token) {
+    getEdits(codeBlock, chatSessionId, token) {
         return ( new AsyncIterableObject(async (executor) => {
             const request = {
-                codeBlocks: [codeBlock]
+                codeBlocks: [codeBlock],
+                chatSessionId
             };
             const response = {
                 textEdit: (target, edit) => {
@@ -321,7 +324,8 @@ ApplyCodeBlockOperation = ( __decorate([
     ( __param(8, IProgressService)),
     ( __param(9, IQuickInputService)),
     ( __param(10, ILabelService)),
-    ( __param(11, IInstantiationService))
+    ( __param(11, IInstantiationService)),
+    ( __param(12, INotebookService))
 ], ApplyCodeBlockOperation));
 function notifyUserAction(chatService, context, action) {
     if (isResponseVM(context.element)) {

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

@@ -0,0 +1,10 @@
+import { IChatWidget } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+export interface IAttachInstructionsActionOptions {
+    readonly widget?: IChatWidget;
+    readonly resource?: URI;
+    readonly skipSelectionDialog?: boolean;
+}
+export declare const runAttachInstructionsAction: (commandService: ICommandService, options: IAttachInstructionsActionOptions) => Promise<void>;
+export declare const registerAttachPromptActions: () => void;