@codingame/monaco-vscode-chat-service-override 4.5.2 → 5.0.0

package/chat.js

@@ -1,15 +1,12 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
 import { IChatWidgetService, IQuickChatService, IChatAccessibilityService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatAccessibilityService } from './vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.js';
-import { ChatContributionService } from './vscode/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.js';
 import { QuickChatService } from './vscode/src/vs/workbench/contrib/chat/browser/chatQuick.js';
 import { ChatVariablesService } from './vscode/src/vs/workbench/contrib/chat/browser/chatVariables.js';
 import { ChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatCodeBlockContextProviderService } from './vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.js';
 import { ChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatService } from './vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js';
 import { ChatSlashCommandService } from './vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js';
@@ -17,20 +14,22 @@ import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/cha
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ChatWidgetHistoryService } from './vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.js';
 import { IChatWidgetHistoryService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service';
+import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { LanguageModelsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModels.js';
 import { ILanguageModelsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 import { IInlineChatSavingService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.service';
 import { InlineChatSavingServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.js';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatSessionServiceImpl } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat.service';
 import { InlineChatServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl.js';
+import { LanguageModelStatsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js';
+import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
+import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 
 function getServiceOverride() {
     return {
         [( IChatService.toString())]: new SyncDescriptor(ChatService, [], true),
-        [( IChatContributionService.toString())]: new SyncDescriptor(ChatContributionService, [], true),
         [( IChatWidgetService.toString())]: new SyncDescriptor(ChatWidgetService, [], true),
         [( IQuickChatService.toString())]: new SyncDescriptor(QuickChatService, [], true),
         [( IChatAccessibilityService.toString())]: new SyncDescriptor(ChatAccessibilityService, [], true),
@@ -42,7 +41,8 @@ function getServiceOverride() {
         [( IInlineChatService.toString())]: new SyncDescriptor(InlineChatServiceImpl, [], true),
         [( IInlineChatSessionService.toString())]: new SyncDescriptor(InlineChatSessionServiceImpl, [], true),
         [( IInlineChatSavingService.toString())]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true),
-        [( IChatCodeBlockContextProviderService.toString())]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true)
+        [( IChatCodeBlockContextProviderService.toString())]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true),
+        [( ILanguageModelStatsService.toString())]: new SyncDescriptor(LanguageModelStatsService, [], true)
     };
 }
 

package/package.json

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

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

@@ -6,10 +6,10 @@ async function clearChatEditor(accessor) {
     const editorService = accessor.get(IEditorService);
     const editorGroupsService = accessor.get(IEditorGroupsService);
     const chatEditorInput = editorService.activeEditor;
-    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.providerId) {
+    if (chatEditorInput instanceof ChatEditorInput) {
         await editorService.replaceEditors([{
                 editor: chatEditorInput,
-                replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId: chatEditorInput.providerId, pinned: true } } }
+                replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }
             }], editorGroupsService.activeGroup);
     }
 }

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

@@ -1,16 +1,16 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { clearChatEditor } from './chatClear.js';
+import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatClearActions";
 const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
@@ -22,7 +22,7 @@ function registerNewChatActions() {
                 title: ( localize2WithPath(_moduleId, 0, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 menu: [{
                         id: MenuId.EditorTitle,
                         group: 'navigation',
@@ -43,7 +43,7 @@ function registerNewChatActions() {
                 title: ( localize2WithPath(_moduleId, 0, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 keybinding: {
                     weight: 200 ,
@@ -53,53 +53,40 @@ function registerNewChatActions() {
                     },
                     when: CONTEXT_IN_CHAT_SESSION
                 },
-                menu: {
-                    id: MenuId.ChatContext,
-                    group: 'z_clear'
-                }
+                menu: [{
+                        id: MenuId.ChatContext,
+                        group: 'z_clear'
+                    },
+                    {
+                        id: MenuId.ViewTitle,
+                        when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                        group: 'navigation',
+                        order: -1
+                    }]
             });
         }
         run(accessor, ...args) {
-            const widgetService = accessor.get(IChatWidgetService);
-            const widget = widgetService.lastFocusedWidget;
-            if (!widget) {
-                return;
+            const context = args[0];
+            if (isChatViewTitleActionContext(context)) {
+                announceChatCleared(accessor);
+                context.chatView.clear();
+                context.chatView.widget.focusInput();
+            }
+            else {
+                const widgetService = accessor.get(IChatWidgetService);
+                const widget = widgetService.lastFocusedWidget;
+                if (!widget) {
+                    return;
+                }
+                announceChatCleared(accessor);
+                widget.clear();
+                widget.focusInput();
             }
-            announceChatCleared(accessor);
-            widget.clear();
-            widget.focusInput();
         }
     });
 }
-const getNewChatActionDescriptorForViewTitle = (viewId, providerId) => ({
-    viewId,
-    id: `workbench.action.chat.${providerId}.newChat`,
-    title: ( localize2WithPath(_moduleId, 0, "New Chat")),
-    menu: {
-        id: MenuId.ViewTitle,
-        when: ( (ContextKeyExpr.equals('view', viewId))),
-        group: 'navigation',
-        order: -1
-    },
-    precondition: CONTEXT_PROVIDER_EXISTS,
-    category: CHAT_CATEGORY,
-    icon: Codicon.plus,
-    f1: false
-});
-function getNewChatAction(viewId, providerId) {
-    return class NewChatAction extends ViewAction {
-        constructor() {
-            super(getNewChatActionDescriptorForViewTitle(viewId, providerId));
-        }
-        async runInView(accessor, view) {
-            announceChatCleared(accessor);
-            await view.clear();
-            view.widget.focusInput();
-        }
-    };
-}
 function announceChatCleared(accessor) {
     accessor.get(IAccessibilitySignalService).playSignal(AccessibilitySignal.clear);
 }
 
-export { ACTION_ID_NEW_CHAT, getNewChatAction, registerNewChatActions };
+export { ACTION_ID_NEW_CHAT, registerNewChatActions };

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

@@ -12,11 +12,13 @@ import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/terminal';
 import { accessibleViewInCodeBlock } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { DefaultChatTextEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_EDIT_APPLIED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
@@ -30,6 +32,9 @@ const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCodeblockAction
 function isCodeBlockActionContext(thing) {
     return typeof thing === 'object' && thing !== null && 'code' in thing && 'element' in thing;
 }
+function isCodeCompareBlockActionContext(thing) {
+    return typeof thing === 'object' && thing !== null && 'element' in thing;
+}
 function isResponseFiltered(context) {
     return isResponseVM(context.element) && context.element.errorDetails?.responseIsFiltered;
 }
@@ -78,7 +83,6 @@ function registerChatCodeBlockActions() {
             if (isResponseVM(context.element)) {
                 const chatService = accessor.get(IChatService);
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -117,7 +121,6 @@ function registerChatCodeBlockActions() {
         const element = context.element;
         if (element) {
             chatService.notifyUserAction({
-                providerId: element.providerId,
                 agentId: element.agent?.id,
                 sessionId: element.sessionId,
                 requestId: element.requestId,
@@ -143,7 +146,7 @@ function registerChatCodeBlockActions() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
                 title: ( localize2WithPath(_moduleId, 1, "Insert at Cursor")),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -258,7 +261,6 @@ function registerChatCodeBlockActions() {
             if (isResponseVM(context.element)) {
                 const chatService = accessor.get(IChatService);
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -277,7 +279,7 @@ function registerChatCodeBlockActions() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
                 title: ( localize2WithPath(_moduleId, 2, "Insert into New File")),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.newFile,
@@ -297,7 +299,6 @@ function registerChatCodeBlockActions() {
             editorService.openEditor({ contents: context.code, languageId: context.languageId, resource: undefined });
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -326,7 +327,7 @@ function registerChatCodeBlockActions() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
                 title: ( localize2WithPath(_moduleId, 3, "Insert into Terminal")),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.terminal,
@@ -382,7 +383,6 @@ function registerChatCodeBlockActions() {
             terminal.runCommand(context.code, false);
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -432,7 +432,7 @@ function registerChatCodeBlockActions() {
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -452,7 +452,7 @@ function registerChatCodeBlockActions() {
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -487,5 +487,45 @@ function getContextFromEditor(editor, accessor) {
         languageId: editor.getModel().getLanguageId(),
     };
 }
+function registerChatCodeCompareBlockActions() {
+    class ChatCompareCodeBlockAction extends Action2 {
+        run(accessor, ...args) {
+            const context = args[0];
+            if (!isCodeCompareBlockActionContext(context)) {
+                return;
+            }
+            return this.runWithContext(accessor, context);
+        }
+    }
+    registerAction2(class ApplyEditsCompareBlockAction extends ChatCompareCodeBlockAction {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.applyCompareEdits',
+                title: ( localize2WithPath(_moduleId, 6, "Apply Edits")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.check,
+                precondition: ( (ContextKeyExpr.and(
+                    EditorContextKeys.hasChanges,
+                     (CONTEXT_CHAT_EDIT_APPLIED.negate())
+                ))),
+                menu: {
+                    id: MenuId.ChatCompareBlock,
+                    group: 'navigation'
+                }
+            });
+        }
+        async runWithContext(accessor, context) {
+            const editorService = accessor.get(IEditorService);
+            const instaService = accessor.get(IInstantiationService);
+            const editor = instaService.createInstance(DefaultChatTextEditor);
+            await editor.apply(context.element, context.edit);
+            await editorService.openEditor({
+                resource: context.edit.uri,
+                options: { revealIfVisible: true },
+            });
+        }
+    });
+}
 
-export { isCodeBlockActionContext, registerChatCodeBlockActions };
+export { isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };

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

@@ -2,7 +2,7 @@ import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatFileTreeActions";
@@ -17,7 +17,7 @@ function registerChatFileTreeActions() {
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -36,7 +36,7 @@ function registerChatFileTreeActions() {
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });

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

@@ -1,13 +1,13 @@
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isExportableSessionData } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -21,11 +21,8 @@ function registerChatExportActions() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: {
-                    value: ( localizeWithPath(_moduleId, 1, "Export Session")) + '...',
-                    original: 'Export Session...'
-                },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 1, "Export Chat...")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
         }
@@ -58,12 +55,9 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: {
-                    value: ( localizeWithPath(_moduleId, 2, "Import Session")) + '...',
-                    original: 'Import Session...'
-                },
+                title: ( localize2WithPath(_moduleId, 2, "Import Chat...")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
         }

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

@@ -1,18 +1,16 @@
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatMoveActions";
 var MoveToNewLocation;
@@ -20,82 +18,54 @@ var MoveToNewLocation;
     MoveToNewLocation["Editor"] = "Editor";
     MoveToNewLocation["Window"] = "Window";
 })(MoveToNewLocation || (MoveToNewLocation = {}))));
-const getMoveToChatActionDescriptorForViewTitle = (viewId, providerId, moveTo) => ({
-    id: `workbench.action.chat.${providerId}.openIn${moveTo}`,
-    title: {
-        value: moveTo === MoveToNewLocation.Editor ? ( localizeWithPath(_moduleId, 0, "Open Chat in Editor")) : ( localizeWithPath(_moduleId, 1, "Open Chat in New Window")),
-        original: moveTo === MoveToNewLocation.Editor ? 'Open Chat in Editor' : 'Open Chat in New Window',
-    },
-    category: CHAT_CATEGORY,
-    precondition: CONTEXT_PROVIDER_EXISTS,
-    f1: false,
-    viewId,
-    menu: {
-        id: MenuId.ViewTitle,
-        when: ( (ContextKeyExpr.equals('view', viewId))),
-        order: 0
-    },
-});
-function getMoveToEditorAction(viewId, providerId) {
-    return getMoveToAction(viewId, providerId, MoveToNewLocation.Editor);
-}
-function getMoveToNewWindowAction(viewId, providerId) {
-    return getMoveToAction(viewId, providerId, MoveToNewLocation.Window);
-}
-function getMoveToAction(viewId, providerId, moveTo) {
-    return class MoveToAction extends ViewAction {
-        constructor() {
-            super(getMoveToChatActionDescriptorForViewTitle(viewId, providerId, moveTo));
-        }
-        async runInView(accessor, view) {
-            const viewModel = view.widget.viewModel;
-            if (!viewModel) {
-                return;
-            }
-            const editorService = accessor.get(IEditorService);
-            const sessionId = viewModel.sessionId;
-            const viewState = view.widget.getViewState();
-            view.clear();
-            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
-        }
-    };
-}
 function registerMoveActions() {
     registerAction2(class GlobalMoveToEditorAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2WithPath(_moduleId, 2, "Open Chat in Editor")),
+                title: ( localize2WithPath(_moduleId, 0, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
-                f1: true
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                menu: {
+                    id: MenuId.ViewTitle,
+                    when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                    order: 0
+                },
             });
         }
         async run(accessor, ...args) {
-            executeMoveToAction(accessor, MoveToNewLocation.Editor);
+            const context = args[0];
+            executeMoveToAction(accessor, MoveToNewLocation.Editor, isChatViewTitleActionContext(context) ? context.chatView : undefined);
         }
     });
     registerAction2(class GlobalMoveToNewWindowAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2WithPath(_moduleId, 3, "Open Chat in New Window")),
+                title: ( localize2WithPath(_moduleId, 1, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
-                f1: true
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                menu: {
+                    id: MenuId.ViewTitle,
+                    when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                    order: 0
+                },
             });
         }
         async run(accessor, ...args) {
-            executeMoveToAction(accessor, MoveToNewLocation.Window);
+            const context = args[0];
+            executeMoveToAction(accessor, MoveToNewLocation.Window, isChatViewTitleActionContext(context) ? context.chatView : undefined);
         }
     });
     registerAction2(class GlobalMoveToSidebarAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2WithPath(_moduleId, 4, "Open Chat in Side Bar")),
+                title: ( localize2WithPath(_moduleId, 2, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 menu: [{
                         id: MenuId.EditorTitle,
@@ -109,15 +79,13 @@ function registerMoveActions() {
         }
     });
 }
-async function executeMoveToAction(accessor, moveTo) {
+async function executeMoveToAction(accessor, moveTo, chatView) {
     const widgetService = accessor.get(IChatWidgetService);
     const viewService = accessor.get(IViewsService);
-    const chatService = accessor.get(IChatService);
     const editorService = accessor.get(IEditorService);
-    const widget = widgetService.lastFocusedWidget;
+    const widget = chatView?.widget ?? widgetService.lastFocusedWidget;
     if (!widget || !('viewId' in widget.viewContext)) {
-        const providerId = chatService.getProviderInfos()[0].id;
-        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }
     const viewModel = widget.viewModel;
@@ -133,21 +101,16 @@ async function executeMoveToAction(accessor, moveTo) {
 async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);
     const editorService = accessor.get(IEditorService);
-    const chatContribService = accessor.get(IChatContributionService);
     const editorGroupService = accessor.get(IEditorGroupsService);
     const chatEditorInput = editorService.activeEditor;
-    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId && chatEditorInput.providerId) {
+    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
         await editorService.closeEditor({ editor: chatEditorInput, groupId: editorGroupService.activeGroup.id });
-        const viewId = chatContribService.getViewIdForProvider(chatEditorInput.providerId);
-        const view = await viewsService.openView(viewId);
+        const view = await viewsService.openView(CHAT_VIEW_ID);
         view.loadSession(chatEditorInput.sessionId);
     }
     else {
-        const chatService = accessor.get(IChatService);
-        const providerId = chatService.getProviderInfos()[0].id;
-        const viewId = chatContribService.getViewIdForProvider(providerId);
-        await viewsService.openView(viewId);
+        await viewsService.openView(CHAT_VIEW_ID);
     }
 }
 
-export { getMoveToAction, getMoveToEditorAction, getMoveToNewWindowAction, registerMoveActions };
+export { registerMoveActions };