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

package/vscode/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.js

@@ -131,7 +131,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             }
             const readFile = await this.fileService.readFile(resource);
             if (stat.size > 30 * 1024 * 1024) {
-                this.dialogService.error(( localize(4788, 'Image is too large')), ( localize(4789, 'The image {0} is too large to be attached.', fileName)));
+                this.dialogService.error(( localize(4853, 'Image is too large')), ( localize(4854, 'The image {0} is too large to be attached.', fileName)));
                 throw ( new Error('Image is too large'));
             }
             dataBuffer = readFile.value;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.js

@@ -27,17 +27,17 @@ import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vsco
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { InlineDecoration, InlineDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModel/inlineDecorations';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
@@ -507,15 +507,30 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: { selection },
                 label: defaultAgentName
                     ? ( localize(
-                    4920,
+                    5013,
                     '{0} (changes from {1})',
                     basename(this._entry.modifiedURI),
                     defaultAgentName
                 ))
-                    : ( localize(4921, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                    : ( localize(5014, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);
+                const d = autorun(r => {
+                    const state = this._entry.state.read(r);
+                    if (state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected) {
+                        d.dispose();
+                        const editorIdents = [];
+                        for (const candidate of this._editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
+                            if (isDiffEditorInput(candidate.editor)
+                                && isEqual(candidate.editor.original.resource, this._entry.originalURI)
+                                && isEqual(candidate.editor.modified.resource, this._entry.modifiedURI)) {
+                                editorIdents.push(candidate);
+                            }
+                        }
+                        this._editorService.closeEditors(editorIdents);
+                    }
+                });
             }
         }
         else {

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.js

@@ -12,7 +12,7 @@ import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
@@ -54,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(4922, 'Go to Next Chat Edit'))
-                : ( localize2(4923, 'Go to Previous Chat Edit')),
+                ? ( localize2(5015, 'Go to Next Chat Edit'))
+                : ( localize2(5016, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,14 +127,14 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(4924, 'Keep Chat Edits'))
-                : ( localize2(4925, 'Undo Chat Edits')),
+                ? ( localize2(5017, 'Keep Chat Edits'))
+                : ( localize2(5018, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(4926, 'Keep'))
-                : ( localize2(4927, 'Undo')),
+                ? ( localize2(5019, 'Keep'))
+                : ( localize2(5020, 'Undo')),
             tooltip: _keep
-                ? ( localize2(4928, 'Keep Chat Edits in this File'))
-                : ( localize2(4929, 'Undo Chat Edits in this File')),
+                ? ( localize2(5021, 'Keep Chat Edits in this File'))
+                : ( localize2(5022, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _keep
                 ? Codicon.check
@@ -184,7 +184,7 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? 'chatEditor.action.acceptHunk' : 'chatEditor.action.undoHunk',
-            title: _accept ? ( localize2(4930, 'Keep this Change')) : ( localize2(4931, 'Undo this Change')),
+            title: _accept ? ( localize2(5023, 'Keep this Change')) : ( localize2(5024, 'Undo this Change')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: _accept ? Codicon.check : Codicon.discard,
             f1: true,
@@ -219,7 +219,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(4932, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(5025, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -251,7 +251,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(4933, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(5026, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             keybinding: {
@@ -269,7 +269,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(4934, "Review")),
+            title: ( localize2(5027, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -288,8 +288,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(4935, 'Keep All Chat Edits')),
-            tooltip: ( localize2(4936, 'Keep All Chat Edits in this Session')),
+            title: ( localize2(5028, 'Keep All Chat Edits')),
+            tooltip: ( localize2(5029, 'Keep All Chat Edits in this Session')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxHasRequestInProgress.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -308,7 +308,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(4937, 'Keep All Edits')) : ( localize(4938, 'Undo All Edits')),
+            title: accept ? ( localize(5030, 'Keep All Edits')) : ( localize(5031, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -370,7 +370,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(4939, "Navigation Status")),
+            title: ( localize(5032, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.js

@@ -64,10 +64,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(4945, "Working...")) };
-            }
-            if (response.isPaused.read(r)) {
-                return { message: ( localize(4946, "Paused")), paused: true };
+                return { message: ( localize(5038, "Working...")) };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -80,7 +77,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(4945, "Working...")) };
+                return { message: ( localize(5038, "Working...")) };
             }
         });
         const progressNode = createElement('div');
@@ -90,7 +87,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
         this._domNode.appendChild(progressNode);
         this._store.add(autorun(r => {
             const value = requestMessage.read(r);
-            const busy = this._isBusy.read(r) && !value?.paused;
+            const busy = this._isBusy.read(r);
             this._domNode.classList.toggle('busy', busy);
             if (!busy || !value || this._session.read(r)?.isGlobalEditingSession) {
                 textProgress.innerText = '';
@@ -157,10 +154,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 const { changeCount, activeIdx } = that._navigationBearings.read(r);
                                 if (changeCount > 0) {
                                     const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
-                                    this.label.innerText = ( localize(4947, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(5039, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(4948, "—"));
+                                    this.label.innerText = ( localize(5040, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -172,21 +169,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(4949, "1 change in 1 file"));
+                                result = ( localize(5041, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(4950, "1 change in {0} files", entriesCount));
+                                result = ( localize(5042, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(4951, "{0} changes in 1 file", changeCount));
+                                result = ( localize(5043, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(4952, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(5044, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(4953, "{0} - Working...", result);
+                            return localize(5045, "{0} - Working...", result);
                         }
                     });
                 }
@@ -235,7 +232,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(4954, "{0} ({1})", value, kb.getLabel());
+                            return localize(5046, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.d.ts

@@ -15,6 +15,7 @@ import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.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 { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
@@ -28,11 +29,13 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     private readonly modifiedModel;
     private readonly _docFileEditorModel;
     get changesCount(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
+    get linesAdded(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
+    get linesRemoved(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     readonly originalURI: URI;
     private readonly _textModelChangeService;
     constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;
-    }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService);
+    }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js

@@ -19,6 +19,7 @@ import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { stringToSnapshot, isTextFileEditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
 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 { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
@@ -32,8 +33,26 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     get changesCount() {
         return ( this._textModelChangeService.diffInfo.map(diff => diff.changes.length));
     }
-    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService) {
-        super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
+    get linesAdded() {
+        return ( this._textModelChangeService.diffInfo.map(diff => {
+            let added = 0;
+            for (const c of diff.changes) {
+                added += Math.max(0, c.modified.endLineNumberExclusive - c.modified.startLineNumber);
+            }
+            return added;
+        }));
+    }
+    get linesRemoved() {
+        return ( this._textModelChangeService.diffInfo.map(diff => {
+            let removed = 0;
+            for (const c of diff.changes) {
+                removed += Math.max(0, c.original.endLineNumberExclusive - c.original.startLineNumber);
+            }
+            return removed;
+        }));
+    }
+    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService, aiEditTelemetryService) {
+        super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService, aiEditTelemetryService);
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
         this._textFileService = _textFileService;
         this._docFileEditorModel = this._register(resourceRef).object;
@@ -47,7 +66,13 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             this._notifySessionAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
         }));
         this._register(this._textModelChangeService.onDidAcceptOrRejectLines(action => {
-            this._notifyAction({ kind: 'chatEditingHunkAction', uri: this.modifiedURI, outcome: action.state, lineCount: action.lineCount, hasRemainingEdits: action.hasRemainingEdits });
+            this._notifyAction({
+                kind: 'chatEditingHunkAction',
+                uri: this.modifiedURI,
+                outcome: action.state,
+                languageId: this.modifiedModel.getLanguageId(),
+                ...action
+            });
         }));
         (async () => {
             const reference = await textModelService.createModelReference(docSnapshot.uri);
@@ -70,7 +95,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4955, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5047, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -112,7 +137,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4956, "Chat Edit: '{0}'", request.message.text)) : ( localize(4957, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5048, "Chat Edit: '{0}'", request.message.text)) : ( localize(5049, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
@@ -186,7 +211,8 @@ ChatEditingModifiedDocumentEntry = ( __decorate([
     ( __param(12, ITextFileService)),
     ( __param(13, IFileService)),
     ( __param(14, IUndoRedoService)),
-    ( __param(15, IInstantiationService))
+    ( __param(15, IInstantiationService)),
+    ( __param(16, IAiEditTelemetryService))
 ], ChatEditingModifiedDocumentEntry));
 
 export { ChatEditingModifiedDocumentEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.d.ts

@@ -11,6 +11,7 @@ import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
@@ -31,6 +32,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     protected readonly _fileService: IFileService;
     private readonly _undoRedoService;
     protected readonly _instantiationService: IInstantiationService;
+    private readonly _aiEditTelemetryService;
     static readonly scheme = "modified-file-entry";
     private static lastEntryId;
     readonly entryId: string;
@@ -58,7 +60,7 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     private _refCounter;
     readonly abstract originalURI: URI;
     protected readonly _userEditScheduler: RunOnceScheduler;
-    constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService);
+    constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService, _aiEditTelemetryService: IAiEditTelemetryService);
     dispose(): void;
     acquire(): this;
     enableReviewModeUntilSettled(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.js

@@ -24,6 +24,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
+import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
+import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -40,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4958, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5050, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -51,7 +53,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     get lastModifyingRequestId() {
         return this._telemetryInfo.requestId;
     }
-    constructor(modifiedURI, _telemetryInfo, kind, configService, _fileConfigService, _chatService, _fileService, _undoRedoService, _instantiationService) {
+    constructor(modifiedURI, _telemetryInfo, kind, configService, _fileConfigService, _chatService, _fileService, _undoRedoService, _instantiationService, _aiEditTelemetryService) {
         super();
         this.modifiedURI = modifiedURI;
         this._telemetryInfo = _telemetryInfo;
@@ -60,6 +62,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._fileService = _fileService;
         this._undoRedoService = _undoRedoService;
         this._instantiationService = _instantiationService;
+        this._aiEditTelemetryService = _aiEditTelemetryService;
         this.entryId = `${AbstractChatEditingModifiedFileEntry_1.scheme}::${++AbstractChatEditingModifiedFileEntry_1.lastEntryId}`;
         this._onDidDelete = this._register(( new Emitter()));
         this.onDidDelete = this._onDidDelete.event;
@@ -189,9 +192,24 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._notifyAction({ kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome });
     }
     _notifyAction(action) {
+        if (action.kind === 'chatEditingHunkAction') {
+            this._aiEditTelemetryService.handleCodeAccepted({
+                suggestionId: undefined,
+                acceptanceMethod: 'accept',
+                presentation: 'highlightedEdit',
+                modelId: this._telemetryInfo.modelId,
+                modeId: this._telemetryInfo.modeId,
+                applyCodeBlockSuggestionId: this._telemetryInfo.applyCodeBlockSuggestionId,
+                editDeltaInfo: ( new EditDeltaInfo(action.linesAdded, action.linesRemoved, -1, -1)),
+                feature: this._telemetryInfo.feature,
+                languageId: action.languageId,
+            });
+        }
         this._chatService.notifyUserAction({
             action,
             agentId: this._telemetryInfo.agentId,
+            modelId: this._telemetryInfo.modelId,
+            modeId: this._telemetryInfo.modeId,
             command: this._telemetryInfo.command,
             sessionId: this._telemetryInfo.sessionId,
             requestId: this._telemetryInfo.requestId,
@@ -234,7 +252,8 @@ AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 =
     ( __param(5, IChatService)),
     ( __param(6, IFileService)),
     ( __param(7, IUndoRedoService)),
-    ( __param(8, IInstantiationService))
+    ( __param(8, IInstantiationService)),
+    ( __param(9, IAiEditTelemetryService))
 ], AbstractChatEditingModifiedFileEntry));
 
 export { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.d.ts

@@ -24,6 +24,7 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
 import { ICellDiffInfo } from "./notebook/notebookCellChanges.js";
+import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
     private readonly modifiedResourceRef;
     private readonly _multiDiffEntryDelegate;
@@ -73,7 +74,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private readonly initialContentComparer;
     constructor(modifiedResourceRef: IReference<IResolvedNotebookEditorModel>, originalResourceRef: IReference<IResolvedNotebookEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;
-    }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService);
+    }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService, aiEditTelemetryService: IAiEditTelemetryService);
     initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]): void;
     private computeRequestId;
     initializeModelsFromDiff(): Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { streamToBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, thenRegisterOrDispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -25,7 +25,7 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -44,6 +44,7 @@ import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorInte
 import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNotebookFileSystemProvider.js';
 import { isTransientIPyNbExtensionEvent, adjustCellDiffAndOriginalModelBasedOnCellMovements, getCorrespondingOriginalCellIndex, adjustCellDiffAndOriginalModelBasedOnCellAddDelete, calculateNotebookRewriteRatio, adjustCellDiffForRevertingAnInsertedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell } from './notebook/helpers.js';
 import { countChanges, sortCellChanges } from './notebook/notebookCellChanges.js';
+import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
@@ -118,8 +119,8 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         return false;
     }
-    constructor(modifiedResourceRef, originalResourceRef, _multiDiffEntryDelegate, transientOptions, telemetryInfo, kind, initialContent, configurationService, fileConfigService, chatService, fileService, instantiationService, textModelService, modelService, undoRedoService, notebookEditorWorkerService, loggingService, notebookResolver) {
-        super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
+    constructor(modifiedResourceRef, originalResourceRef, _multiDiffEntryDelegate, transientOptions, telemetryInfo, kind, initialContent, configurationService, fileConfigService, chatService, fileService, instantiationService, textModelService, modelService, undoRedoService, notebookEditorWorkerService, loggingService, notebookResolver, aiEditTelemetryService) {
+        super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, undoRedoService, instantiationService, aiEditTelemetryService);
         this.modifiedResourceRef = modifiedResourceRef;
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
         this.transientOptions = transientOptions;
@@ -396,7 +397,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4959, "Chat Edit: '{0}'", request.message.text)) : ( localize(4960, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5051, "Chat Edit: '{0}'", request.message.text)) : ( localize(5052, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -810,15 +811,26 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         if (!cell) {
             throw ( new Error('Cell not found'));
         }
-        const model = this.cellTextModelMap.get(cell.uri) || this._register(await this.textModelService.createModelReference(cell.uri)).object.textEditorModel;
-        this.cellTextModelMap.set(cell.uri, model);
-        return model;
+        const model = this.cellTextModelMap.get(cell.uri);
+        if (model) {
+            this.cellTextModelMap.set(cell.uri, model);
+            return model;
+        }
+        else {
+            const textEditorModel = await thenRegisterOrDispose(this.textModelService.createModelReference(cell.uri), this._store);
+            const model = textEditorModel.object.textEditorModel;
+            this.cellTextModelMap.set(cell.uri, model);
+            return model;
+        }
     }
     getOrCreateModifiedTextFileEntryForCell(cell, modifiedCellModel, originalCellModel) {
         let cellEntry = this.cellEntryMap.get(cell.uri);
         if (cellEntry) {
             return cellEntry;
         }
+        if (this._store.isDisposed) {
+            return;
+        }
         const disposables = ( new DisposableStore());
         cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, disposables));
         this.cellEntryMap.set(cell.uri, cellEntry);
@@ -877,7 +889,8 @@ ChatEditingModifiedNotebookEntry = ChatEditingModifiedNotebookEntry_1 = ( __deco
     ( __param(14, IUndoRedoService)),
     ( __param(15, INotebookEditorWorkerService)),
     ( __param(16, INotebookLoggingService)),
-    ( __param(17, INotebookEditorModelResolverService))
+    ( __param(17, INotebookEditorModelResolverService)),
+    ( __param(18, IAiEditTelemetryService))
 ], ChatEditingModifiedNotebookEntry));
 function generateCellHash(cellUri) {
     const hash = ( new StringSHA1());