@codingame/monaco-vscode-chat-service-override 13.1.7 → 14.0.0

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

@@ -2,32 +2,33 @@
 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 { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
-import { CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 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 { ensureSideBarChatViewSize } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showCopilotView, ensureSideBarChatViewSize } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+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';
 
 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, commandService, extensionManagementService, storageService, viewDescriptorService, layoutService) {
+    constructor(productService, extensionService, viewsService, extensionManagementService, storageService, viewDescriptorService, layoutService, configurationService) {
         super();
         this.productService = productService;
         this.extensionService = extensionService;
-        this.commandService = commandService;
+        this.viewsService = viewsService;
         this.extensionManagementService = extensionManagementService;
         this.storageService = storageService;
         this.viewDescriptorService = viewDescriptorService;
         this.layoutService = layoutService;
+        this.configurationService = configurationService;
         this.recentlyInstalled = false;
         const defaultChatAgent = this.productService.defaultChatAgent;
         const hideWelcomeView = this.storageService.getBoolean(ChatGettingStartedContribution_1.hideWelcomeView, StorageScope.APPLICATION, false);
@@ -50,25 +51,30 @@ let ChatGettingStartedContribution = class ChatGettingStartedContribution extend
                 if (ExtensionIdentifier.equals(defaultChatAgent.extensionId, ext.value)) {
                     const extensionStatus = this.extensionService.getExtensionsStatus();
                     if (extensionStatus[ext.value].activationTimes && this.recentlyInstalled) {
-                        await this.commandService.executeCommand(CHAT_OPEN_ACTION_ID);
-                        ensureSideBarChatViewSize(400, this.viewDescriptorService, this.layoutService);
-                        this.storageService.store(ChatGettingStartedContribution_1.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
-                        this.recentlyInstalled = false;
+                        this.onDidInstallChat();
                         return;
                     }
                 }
             }
         }));
     }
+    async onDidInstallChat() {
+        this.configurationService.updateValue('chat.commandCenter.enabled', true);
+        showCopilotView(this.viewsService, this.layoutService);
+        ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService, this.viewsService);
+        this.storageService.store(ChatGettingStartedContribution_1.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
+        this.recentlyInstalled = false;
+    }
 };
 ChatGettingStartedContribution = ChatGettingStartedContribution_1 = ( __decorate([
     ( __param(0, IProductService)),
     ( __param(1, IExtensionService)),
-    ( __param(2, ICommandService)),
+    ( __param(2, IViewsService)),
     ( __param(3, IExtensionManagementService)),
     ( __param(4, IStorageService)),
     ( __param(5, IViewDescriptorService)),
-    ( __param(6, IWorkbenchLayoutService))
+    ( __param(6, IWorkbenchLayoutService)),
+    ( __param(7, IConfigurationService))
 ], 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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(4250, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4329, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4251, "Export Chat...")),
+                title: ( localize2(4330, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -55,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4252, "Import Chat...")),
+                title: ( localize2(4331, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,

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

@@ -3,17 +3,18 @@ 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ChatViewId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatViewId } from '@codingame/monaco-vscode-api/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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/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';
 
 var MoveToNewLocation;
 (function (MoveToNewLocation) {
@@ -25,7 +26,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(4253, "Open Chat in Editor")),
+                title: ( localize2(4332, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -46,7 +47,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(4254, "Open Chat in New Window")),
+                title: ( localize2(4333, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -67,7 +68,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(4255, "Open Chat in Side Bar")),
+                title: ( localize2(4334, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -88,7 +89,7 @@ async function executeMoveToAction(accessor, moveTo, _sessionId) {
     const editorService = accessor.get(IEditorService);
     const widget = (_sessionId ? widgetService.getWidgetBySessionId(_sessionId) : undefined)
         ?? widgetService.lastFocusedWidget;
-    if (!widget || !('viewId' in widget.viewContext)) {
+    if (!widget || widget.location !== ChatAgentLocation.Panel) {
         await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }

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

@@ -6,7 +6,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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/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 { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
@@ -20,7 +20,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4256, "Open in Chat View")),
+                title: ( localize2(4335, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.commentDiscussion,
@@ -40,7 +40,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4257, "Close Quick Chat")),
+                title: ( localize2(4336, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -60,7 +60,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.launchInlineChat',
-                title: ( localize2(4258, "Launch Inline Chat")),
+                title: ( localize2(4337, "Launch Inline Chat")),
                 f1: false,
                 category: CHAT_CATEGORY
             });
@@ -88,7 +88,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4259, 'Quick Chat')),
+            title: ( localize2(4338, 'Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.commentDiscussion,
             f1: false,
@@ -103,7 +103,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 5
             },
             metadata: {
-                description: ( localize(4260, 'Toggle the quick chat')),
+                description: ( localize(4339, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -113,18 +113,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4261, "The query to open the quick chat with")),
+                                            description: ( localize(4340, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4262, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4341, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4261, "The query to open the quick chat with"))
+                                    description: ( localize(4340, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -154,7 +154,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4263, "Open Quick Chat")),
+            title: ( localize2(4342, "Open Quick Chat")),
             f1: true
         });
     }

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

@@ -1,15 +1,17 @@
 import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures";
 import { IDialogService } 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 { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 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 { 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-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";
 export declare class InsertCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;
@@ -27,21 +29,22 @@ export declare class InsertCodeBlockOperation {
 export declare class ApplyCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;
-    private readonly bulkEditService;
-    private readonly codeEditorService;
     private readonly chatService;
-    private readonly languageFeaturesService;
-    private readonly progressService;
     private readonly languageService;
     private readonly fileService;
     private readonly dialogService;
     private readonly logService;
-    private inlineChatPreview;
-    constructor(editorService: IEditorService, textFileService: ITextFileService, bulkEditService: IBulkEditService, codeEditorService: ICodeEditorService, chatService: IChatService, languageFeaturesService: ILanguageFeaturesService, progressService: IProgressService, languageService: ILanguageService, fileService: IFileService, dialogService: IDialogService, logService: ILogService);
+    private readonly codeMapperService;
+    private readonly progressService;
+    private readonly quickInputService;
+    private readonly labelService;
+    constructor(editorService: IEditorService, textFileService: ITextFileService, chatService: IChatService, languageService: ILanguageService, fileService: IFileService, dialogService: IDialogService, logService: ILogService, codeMapperService: ICodeMapperService, progressService: IProgressService, quickInputService: IQuickInputService, labelService: ILabelService);
     run(context: ICodeBlockActionContext): Promise<void>;
+    private evaluateURIToUse;
     private handleNotebookEditor;
     private handleTextEditor;
-    private computeEdits;
+    private getEdits;
+    private waitForFirstElement;
     private applyWithInlinePreview;
     private tryToRevealCodeBlock;
     private notify;