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

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

@@ -3,18 +3,20 @@ 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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ChatViewId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 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 { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
+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 { 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';
 
 var MoveToNewLocation;
 (function (MoveToNewLocation) {
@@ -26,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(4377, "Open Chat in Editor")),
+                title: ( localize2(4437, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -47,7 +49,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(4378, "Open Chat in New Window")),
+                title: ( localize2(4438, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -68,7 +70,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(4379, "Open Chat in Side Bar")),
+                title: ( localize2(4439, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -87,19 +89,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.location !== ChatAgentLocation.Panel) {
+    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);
         return;
     }
-    const viewModel = widget.viewModel;
-    if (!viewModel) {
-        return;
-    }
-    const sessionId = viewModel.sessionId;
+    const sessionId = widget.viewModel.sessionId;
     const viewState = widget.getViewState();
     widget.clear();
+    await waitForChatSessionCleared(sessionId, chatService);
     const options = { target: { sessionId }, pinned: true, viewState: viewState };
     await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
@@ -113,7 +113,7 @@ async function moveToSidebar(accessor) {
     if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
         await editorService.closeEditor({ editor: chatEditor.input, groupId: editorGroupService.activeGroup.id });
         view = await viewsService.openView(ChatViewId);
-        view.loadSession(chatEditorInput.sessionId, chatEditor.getViewState());
+        await view.loadSession(chatEditorInput.sessionId, chatEditor.getViewState());
     }
     else {
         view = await viewsService.openView(ChatViewId);

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

@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4380, "Open in Chat View")),
+                title: ( localize2(4440, "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(4381, "Close Quick Chat")),
+                title: ( localize2(4441, "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(4382, 'Quick Chat')),
+            title: ( localize2(4442, 'Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.commentDiscussion,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4383, 'Toggle the quick chat')),
+                description: ( localize(4443, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4384, "The query to open the quick chat with")),
+                                            description: ( localize(4444, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4385, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4445, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4384, "The query to open the quick chat with"))
+                                    description: ( localize(4444, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,8 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4386, "Open Quick Chat")),
+            title: ( localize2(4446, "Open Quick Chat")),
+            precondition: ChatContextKeys.enabled,
             f1: true
         });
     }

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

@@ -0,0 +1,7 @@
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
+export declare class ChatTransferContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.chatTransfer";
+    constructor(chatTransferService: IChatTransferService);
+}

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

@@ -0,0 +1,17 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
+
+let ChatTransferContribution = class ChatTransferContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.chatTransfer'; }
+    constructor(chatTransferService) {
+        super();
+        chatTransferService.checkAndSetWorkspaceTrust();
+    }
+};
+ChatTransferContribution = ( __decorate([
+    ( __param(0, IChatTransferService))
+], ChatTransferContribution));
+
+export { ChatTransferContribution };

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

@@ -54,7 +54,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4404,
+                    4473,
                     "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 +67,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4405, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4474, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -78,7 +78,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4406, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4475, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -131,7 +131,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4407, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4476, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -150,7 +150,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.code);
             }
             else {
-                this.notify(( localize(4408, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4477, "To apply this code block, open a code or notebook editor.")));
             }
         }
         notifyUserAction(this.chatService, context, {
@@ -166,15 +166,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4409,
+            4478,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4410, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4479, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4411,
+                4480,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -189,7 +189,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4412, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4481, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -198,7 +198,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4413, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4482, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -213,7 +213,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4414, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4483, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const focusRange = notebookEditor.getFocus();
@@ -224,20 +224,20 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, code) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4415, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4484, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = { code, resource: activeModel.uri, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4416, "No code mapper available.")));
+            this.notify(( localize(4485, "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(4417, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4486, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getEdits(codeBlock, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -245,7 +245,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4418, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4487, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {