@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

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

@@ -22,12 +22,12 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-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';
@@ -55,20 +55,27 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4510,
+                    4624,
                     "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."
                 )));
             }
         }
-        notifyUserAction(this.chatService, context, {
-            kind: 'insert',
-            codeBlockIndex: context.codeBlockIndex,
-            totalCharacters: context.code.length
-        });
+        if (isResponseVM(context.element)) {
+            const requestId = context.element.requestId;
+            const request = context.element.session.getItems().find(item => item.id === requestId && isRequestVM(item));
+            notifyUserAction(this.chatService, context, {
+                kind: 'insert',
+                codeBlockIndex: context.codeBlockIndex,
+                totalCharacters: context.code.length,
+                totalLines: context.code.split('\n').length,
+                languageId: context.languageId,
+                modelId: request?.modelId ?? '',
+            });
+        }
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4511, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4625, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -79,7 +86,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4512, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4626, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -132,7 +139,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4513, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4627, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -151,31 +158,38 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionId, context.code);
             }
             else {
-                this.notify(( localize(4514, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4628, "To apply this code block, open a code or notebook editor.")));
             }
         }
-        notifyUserAction(this.chatService, context, {
-            kind: 'apply',
-            codeBlockIndex: context.codeBlockIndex,
-            totalCharacters: context.code.length,
-            codeMapper: result?.codeMapper,
-            editsProposed: !!result?.editsProposed
-        });
+        if (isResponseVM(context.element)) {
+            const requestId = context.element.requestId;
+            const request = context.element.session.getItems().find(item => item.id === requestId && isRequestVM(item));
+            notifyUserAction(this.chatService, context, {
+                kind: 'apply',
+                codeBlockIndex: context.codeBlockIndex,
+                totalCharacters: context.code.length,
+                codeMapper: result?.codeMapper,
+                editsProposed: !!result?.editsProposed,
+                totalLines: context.code.split('\n').length,
+                modelId: request?.modelId ?? '',
+                languageId: context.languageId,
+            });
+        }
     }
     async evaluateURIToUse(resource, activeEditorControl) {
         if (resource && (await this.fileService.exists(resource))) {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4515,
+            4629,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4516, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4630, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4517,
+                4631,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -190,7 +204,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4518, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4632, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -199,7 +213,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4519, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4633, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -214,21 +228,21 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionId, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4520, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4634, "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(4521, "No code mapper available.")));
+            this.notify(( localize(4635, "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(4522, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4636, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -236,7 +250,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4523, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4637, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -250,20 +264,20 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, chatSessionId, code) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4524, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4638, "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(4521, "No code mapper available.")));
+            this.notify(( localize(4635, "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(4522, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4636, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -271,7 +285,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4523, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4637, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {