@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -3,17 +3,18 @@ import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/edito
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.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 { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.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 { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
+import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.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-e28ac690-06d5-5ee9-92d1-02df70296354-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;
@@ -22,7 +23,8 @@ export declare class InsertCodeBlockOperation {
     private readonly chatService;
     private readonly languageService;
     private readonly dialogService;
-    constructor(editorService: IEditorService, textFileService: ITextFileService, bulkEditService: IBulkEditService, codeEditorService: ICodeEditorService, chatService: IChatService, languageService: ILanguageService, dialogService: IDialogService);
+    private readonly aiEditTelemetryService;
+    constructor(editorService: IEditorService, textFileService: ITextFileService, bulkEditService: IBulkEditService, codeEditorService: ICodeEditorService, chatService: IChatService, languageService: ILanguageService, dialogService: IDialogService, aiEditTelemetryService: IAiEditTelemetryService);
     run(context: ICodeBlockActionContext): Promise<void>;
     private handleNotebookEditor;
     private handleTextEditor;

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

@@ -14,27 +14,29 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.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 { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-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 { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.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 { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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) {
+    constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService, aiEditTelemetryService) {
         this.editorService = editorService;
         this.textFileService = textFileService;
         this.bulkEditService = bulkEditService;
@@ -42,6 +44,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
         this.chatService = chatService;
         this.languageService = languageService;
         this.dialogService = dialogService;
+        this.aiEditTelemetryService = aiEditTelemetryService;
     }
     async run(context) {
         const activeEditorControl = getEditableActiveCodeEditor(this.editorService);
@@ -55,7 +58,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4679,
+                    4728,
                     "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."
                 )));
             }
@@ -71,11 +74,23 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
                 languageId: context.languageId,
                 modelId: request?.modelId ?? '',
             });
+            const codeBlockInfo = context.element.model.codeBlockInfos?.at(context.codeBlockIndex);
+            this.aiEditTelemetryService.handleCodeAccepted({
+                acceptanceMethod: 'insertAtCursor',
+                suggestionId: codeBlockInfo?.suggestionId,
+                editDeltaInfo: EditDeltaInfo.fromText(context.code),
+                feature: 'sideBarChat',
+                languageId: context.languageId,
+                modeId: context.element.model.request?.modeInfo?.modeId,
+                modelId: request?.modelId,
+                presentation: 'codeBlock',
+                applyCodeBlockSuggestionId: undefined,
+            });
         }
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4680, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4729, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -86,7 +101,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4681, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4730, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -107,7 +122,8 @@ InsertCodeBlockOperation = ( __decorate([
     ( __param(3, ICodeEditorService)),
     ( __param(4, IChatService)),
     ( __param(5, ILanguageService)),
-    ( __param(6, IDialogService))
+    ( __param(6, IDialogService)),
+    ( __param(7, IAiEditTelemetryService))
 ], InsertCodeBlockOperation));
 let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     constructor(editorService, textFileService, chatService, fileService, dialogService, logService, codeMapperService, progressService, quickInputService, labelService, instantiationService, notebookService) {
@@ -139,7 +155,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4682, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4731, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -148,9 +164,16 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 return;
             }
         }
+        let codeBlockSuggestionId = undefined;
+        if (isResponseVM(context.element)) {
+            const codeBlockInfo = context.element.model.codeBlockInfos?.at(context.codeBlockIndex);
+            if (codeBlockInfo) {
+                codeBlockSuggestionId = codeBlockInfo.suggestionId;
+            }
+        }
         let result = undefined;
         if (activeEditorControl && !this.notebookService.hasSupportedNotebooks(codemapperUri)) {
-            result = await this.handleTextEditor(activeEditorControl, context.chatSessionId, context.code);
+            result = await this.handleTextEditor(activeEditorControl, context.chatSessionId, context.code, codeBlockSuggestionId);
         }
         else {
             const activeNotebookEditor = getActiveNotebookEditor(this.editorService);
@@ -158,7 +181,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionId, context.code);
             }
             else {
-                this.notify(( localize(4683, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4732, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -181,15 +204,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4684,
+            4733,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4685, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4734, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4686,
+                4735,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -204,7 +227,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4687, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4736, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -213,7 +236,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4688, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4737, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -228,21 +251,21 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionId, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4689, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4738, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const uri = notebookEditor.textModel.uri;
         const codeBlock = { code, resource: uri, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4690, "No code mapper available.")));
+            this.notify(( localize(4739, "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(4691, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4740, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -250,7 +273,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4692, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4741, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -261,31 +284,31 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             codeMapper
         };
     }
-    async handleTextEditor(codeEditor, chatSessionId, code) {
+    async handleTextEditor(codeEditor, chatSessionId, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4693, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4742, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = { code, resource: activeModel.uri, chatSessionId, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4690, "No code mapper available.")));
+            this.notify(( localize(4739, "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(4691, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4740, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
-            editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource);
+            editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource, applyCodeBlockSuggestionId);
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4692, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4741, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -355,8 +378,8 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
         };
     }
-    async applyWithInlinePreview(edits, codeEditor, tokenSource) {
-        return this.instantiationService.invokeFunction(reviewEdits, codeEditor, edits, tokenSource.token);
+    async applyWithInlinePreview(edits, codeEditor, tokenSource, applyCodeBlockSuggestionId) {
+        return this.instantiationService.invokeFunction(reviewEdits, codeEditor, edits, tokenSource.token, applyCodeBlockSuggestionId);
     }
     async applyNotebookEditsWithInlinePreview(edits, uri, tokenSource) {
         return this.instantiationService.invokeFunction(reviewNotebookEdits, uri, edits, tokenSource.token);