@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.js

@@ -4,11 +4,13 @@ import { ReferenceCollection, AsyncReferenceCollection } from '@codingame/monaco
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { VSBuffer, bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 
 let OriginalNotebookModelReferenceCollection = class OriginalNotebookModelReferenceCollection extends ReferenceCollection {
-    constructor(notebookService) {
+    constructor(notebookService, modelService) {
         super();
         this.notebookService = notebookService;
+        this.modelService = modelService;
         this.modelsToDispose = ( new Set());
     }
     async createReferencedObject(key, fileEntry, viewType) {
@@ -18,8 +20,10 @@ let OriginalNotebookModelReferenceCollection = class OriginalNotebookModelRefere
         if (model) {
             return model;
         }
-        const bytes = VSBuffer.fromString(fileEntry.originalModel.getValue());
+        const modelRef = await this.modelService.createModelReference(uri);
+        const bytes = VSBuffer.fromString(modelRef.object.textEditorModel.getValue());
         const stream = bufferToStream(bytes);
+        modelRef.dispose();
         return this.notebookService.createNotebookTextModel(viewType, uri, stream);
     }
     destroyReferencedObject(key, modelPromise) {
@@ -41,7 +45,8 @@ let OriginalNotebookModelReferenceCollection = class OriginalNotebookModelRefere
     }
 };
 OriginalNotebookModelReferenceCollection = ( __decorate([
-    ( __param(0, INotebookService))
+    ( __param(0, INotebookService)),
+    ( __param(1, ITextModelService))
 ], OriginalNotebookModelReferenceCollection));
 let NotebookOriginalModelReferenceFactory = class NotebookOriginalModelReferenceFactory {
     get resourceModelCollection() {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.d.ts

@@ -2,7 +2,7 @@ import { Disposable, IReference } from "@codingame/monaco-vscode-api/vscode/vs/b
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { NotebookTextModel } from "../../../common/model/notebookTextModel.js";
-import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -12,8 +12,9 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotebookOriginalModelReferenceFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { INotebookModelSynchronizerFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.service";
 export declare class NotebookModelSynchronizerFactory implements INotebookModelSynchronizerFactory {
     readonly _serviceBrand: undefined;
@@ -25,6 +26,7 @@ export declare class NotebookModelSynchronizer extends Disposable {
     private readonly model;
     private readonly notebookService;
     private readonly notebookEditorService;
+    private readonly modelService;
     private readonly textModelService;
     private readonly logService;
     private readonly configurationService;
@@ -42,14 +44,14 @@ export declare class NotebookModelSynchronizer extends Disposable {
     private isTextEditFromUs;
     private isReverting;
     private throttledTextModelUpdate;
-    constructor(model: NotebookTextModel, _chatEditingService: IChatEditingService, notebookService: INotebookService, notebookEditorService: INotebookEditorService, chatService: IChatService, textModelService: ITextModelService, logService: INotebookLoggingService, configurationService: IConfigurationService, notebookEditorWorkerService: INotebookEditorWorkerService, notebookModelResolverService: INotebookEditorModelResolverService, originalModelRefFactory: INotebookOriginalModelReferenceFactory);
+    constructor(model: NotebookTextModel, _chatEditingService: IChatEditingService, notebookService: INotebookService, notebookEditorService: INotebookEditorService, chatService: IChatService, modelService: IModelService, textModelService: ITextModelService, logService: INotebookLoggingService, configurationService: IConfigurationService, notebookEditorWorkerService: INotebookEditorWorkerService, notebookModelResolverService: INotebookEditorModelResolverService, originalModelRefFactory: INotebookOriginalModelReferenceFactory);
     private createSnapshot;
     revert(): Promise<void>;
     private revertImpl;
     private updateNotebook;
     private accept;
     private updateTextDocumentModel;
-    getNotebookSerializer(): Promise<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService").INotebookSerializer>;
+    getNotebookSerializer(): Promise<import("@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookService").INotebookSerializer>;
     private _originalModel?;
     private getOriginalModel;
     private updateNotebookModel;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.js

@@ -6,7 +6,7 @@ import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { VSBuffer, streamToBuffer, bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { ThrottledDelayer, raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { prettyChanges, computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
+import { prettyChanges, computeDiff } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
 import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { INotebookEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service';
 import { NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -18,17 +18,17 @@ import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-ap
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
-import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ChatEditingModifiedDocumentEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let NotebookModelSynchronizerReferenceCollection = class NotebookModelSynchronizerReferenceCollection extends ReferenceCollection {
     constructor(instantiationService) {
@@ -60,11 +60,12 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
     get diffInfo() {
         return this._diffInfo;
     }
-    constructor(model, _chatEditingService, notebookService, notebookEditorService, chatService, textModelService, logService, configurationService, notebookEditorWorkerService, notebookModelResolverService, originalModelRefFactory) {
+    constructor(model, _chatEditingService, notebookService, notebookEditorService, chatService, modelService, textModelService, logService, configurationService, notebookEditorWorkerService, notebookModelResolverService, originalModelRefFactory) {
         super();
         this.model = model;
         this.notebookService = notebookService;
         this.notebookEditorService = notebookEditorService;
+        this.modelService = modelService;
         this.textModelService = textModelService;
         this.logService = logService;
         this.configurationService = configurationService;
@@ -78,11 +79,9 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         this.isReverting = false;
         this.throttledTextModelUpdate = ( new ThrottledDelayer(100));
         const entryObs = derived((r) => {
-            const session = _chatEditingService.currentEditingSessionObs.read(r);
-            if (!session) {
-                return;
-            }
-            return session.readEntry(model.uri, r);
+            const sessions = _chatEditingService.editingSessionsObs.read(r);
+            const entry = ( sessions.map(s => s.readEntry(model.uri, r))).find(r => !!r);
+            return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
         }).recomputeInitiallyAndOnChange(this._store);
         this._register(chatService.onDidPerformUserAction(async (e) => {
             const entry = entryObs.read(undefined);
@@ -113,10 +112,14 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
                 this.createSnapshot();
                 snapshotCreated = true;
             }
-            const modifiedModel = entry.modifiedModel;
+            const modifiedModel = this.modelService.getModel(entry.modifiedURI);
+            if (!modifiedModel) {
+                return;
+            }
             let cancellationToken = store.add(( new CancellationTokenSource()));
             store.add(modifiedModel.onDidChangeContent(async () => {
-                if (!this.isTextEditFromUs && !modifiedModel.isDisposed() && !entry.originalModel.isDisposed() && modifiedModel.getValue() !== entry.originalModel.getValue()) {
+                const originalModel = this.modelService.getModel(entry.originalURI);
+                if (originalModel && !this.isTextEditFromUs && !modifiedModel.isDisposed() && !originalModel.isDisposed() && modifiedModel.getValue() !== originalModel.getValue()) {
                     cancellationToken = store.add(( new CancellationTokenSource()));
                     updateNotebookModel(entry, cancellationToken.token);
                 }
@@ -213,7 +216,10 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         }
     }
     async accept(entry) {
-        const modifiedModel = entry.modifiedModel;
+        const modifiedModel = this.modelService.getModel(entry.modifiedURI);
+        if (!modifiedModel) {
+            return;
+        }
         const content = modifiedModel.getValue();
         await this.updateNotebook(VSBuffer.fromString(content), false);
         this._diffInfo.set(undefined, undefined);
@@ -222,7 +228,10 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         await this.notebookService.restoreNotebookTextModelFromSnapshot(originalModel.uri, originalModel.viewType, stream);
     }
     async updateTextDocumentModel(entry) {
-        const modifiedModel = entry.modifiedModel;
+        const modifiedModel = this.modelService.getModel(entry.modifiedURI);
+        if (!modifiedModel) {
+            return;
+        }
         const stream = await this.notebookService.createNotebookTextDocumentSnapshot(this.model.uri, SnapshotContext.Save, CancellationToken.None);
         const buffer = await streamToBuffer(stream);
         const text = ( new TextDecoder()).decode(buffer.buffer);
@@ -249,7 +258,11 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         return this._originalModel;
     }
     async updateNotebookModel(entry, token) {
-        const modifiedModelVersion = entry.modifiedModel.getVersionId();
+        const modifiedModel = this.modelService.getModel(entry.modifiedURI);
+        if (!modifiedModel) {
+            return;
+        }
+        const modifiedModelVersion = modifiedModel.getVersionId();
         const currentModel = this.model;
         const modelVersion = currentModel?.versionId ?? 0;
         const modelWithChatEdits = await this.getModifiedModelForDiff(entry, token);
@@ -259,7 +272,7 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         const originalModel = await this.getOriginalModel(entry);
         const cellDiffInfo = (await this.computeDiff(originalModel, modelWithChatEdits, token))?.cellDiffInfo;
         const cellDiffInfoToApplyEdits = (await this.computeDiff(currentModel, modelWithChatEdits, token))?.cellDiffInfo;
-        const currentVersion = entry.modifiedModel.getVersionId();
+        const currentVersion = modifiedModel.getVersionId();
         if (!cellDiffInfo || !cellDiffInfoToApplyEdits || token.isCancellationRequested || currentVersion !== modifiedModelVersion || modelVersion !== currentModel.versionId) {
             return;
         }
@@ -377,7 +390,11 @@ let NotebookModelSynchronizer = class NotebookModelSynchronizer extends Disposab
         }
     }
     async getModifiedModelForDiff(entry, token) {
-        const text = entry.modifiedModel.getValue();
+        const modifiedModel = this.modelService.getModel(entry.modifiedURI);
+        if (!modifiedModel) {
+            return;
+        }
+        const text = modifiedModel.getValue();
         const bytes = VSBuffer.fromString(text);
         const uri = entry.modifiedURI.with({ scheme: `NotebookChatEditorController.modifiedScheme${( Date.now().toString())}` });
         const stream = bufferToStream(bytes);
@@ -414,12 +431,13 @@ NotebookModelSynchronizer = ( __decorate([
     ( __param(2, INotebookService)),
     ( __param(3, INotebookEditorService)),
     ( __param(4, IChatService)),
-    ( __param(5, ITextModelService)),
-    ( __param(6, INotebookLoggingService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, INotebookEditorWorkerService)),
-    ( __param(9, INotebookEditorModelResolverService)),
-    ( __param(10, INotebookOriginalModelReferenceFactory))
+    ( __param(5, IModelService)),
+    ( __param(6, ITextModelService)),
+    ( __param(7, INotebookLoggingService)),
+    ( __param(8, IConfigurationService)),
+    ( __param(9, INotebookEditorWorkerService)),
+    ( __param(10, INotebookEditorModelResolverService)),
+    ( __param(11, INotebookOriginalModelReferenceFactory))
 ], NotebookModelSynchronizer));
 
 export { NotebookModelSynchronizer, NotebookModelSynchronizerFactory };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.d.ts

@@ -1,18 +1,20 @@
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { IStoredFileWorkingCopy } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IUntitledFileWorkingCopy } from "../../../../../services/workingCopy/common/untitledFileWorkingCopy.js";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { NotebookFileWorkingCopyModel } from "@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel";
+import { NotebookFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel";
 import { INotebookSynchronizerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookSynchronizerService.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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 NotebookSynchronizerService extends Disposable implements INotebookSynchronizerService {
     private readonly _chatEditingService;
     protected readonly _fileService: IFileService;
+    private readonly _notebookService;
     private readonly _instantiationService;
     private readonly _workingCopyFileService;
     _serviceBrand: undefined;
-    constructor(_chatEditingService: IChatEditingService, _fileService: IFileService, _instantiationService: IInstantiationService, _workingCopyFileService: IWorkingCopyFileService);
+    constructor(_chatEditingService: IChatEditingService, _fileService: IFileService, _notebookService: INotebookService, _instantiationService: IInstantiationService, _workingCopyFileService: IWorkingCopyFileService);
     revert(workingCopy: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>): Promise<void>;
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.js

@@ -1,32 +1,39 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { StoredFileWorkingCopy } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopy } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { ChatEditingModifiedNotebookEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { NotebookSaveParticipant } from '../saveParticipants/saveParticipants.js';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { ChatEditingModifiedDocumentEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry';
+import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 
 let NotebookSynchronizerSaveParticipant = class NotebookSynchronizerSaveParticipant extends NotebookSaveParticipant {
-    constructor(editorService, _chatEditingService, _fileService) {
+    constructor(editorService, _chatEditingService, _fileService, _notebookService) {
         super(editorService);
         this._chatEditingService = _chatEditingService;
         this._fileService = _fileService;
+        this._notebookService = _notebookService;
     }
     async participate(workingCopy, context, progress, token) {
-        const session = this._chatEditingService.currentEditingSessionObs.get();
+        const sessions = this._chatEditingService.editingSessionsObs.get();
+        const session = sessions.find(s => s.getEntry(workingCopy.resource));
         if (!session) {
             return;
         }
+        if (!this._notebookService.hasSupportedNotebooks(workingCopy.resource)) {
+            return;
+        }
         const entry = session.getEntry(workingCopy.resource);
-        if (entry && entry instanceof ChatEditingModifiedNotebookEntry) {
-            await entry.saveMirrorDocument();
+        if (entry && entry instanceof ChatEditingModifiedDocumentEntry) {
+            await entry.docFileEditorModel.save({ reason: SaveReason.EXPLICIT, ignoreModifiedSince: true });
         }
         const inWorkingSet = ( session.workingSet.has(workingCopy.resource));
-        if (!(entry && entry instanceof ChatEditingModifiedNotebookEntry) && !inWorkingSet) {
+        if (!(entry && entry instanceof ChatEditingModifiedDocumentEntry) && !inWorkingSet) {
             return;
         }
         if (workingCopy instanceof StoredFileWorkingCopy) {
@@ -43,33 +50,37 @@ let NotebookSynchronizerSaveParticipant = class NotebookSynchronizerSaveParticip
 NotebookSynchronizerSaveParticipant = ( __decorate([
     ( __param(0, IEditorService)),
     ( __param(1, IChatEditingService)),
-    ( __param(2, IFileService))
+    ( __param(2, IFileService)),
+    ( __param(3, INotebookService))
 ], NotebookSynchronizerSaveParticipant));
 let NotebookSynchronizerService = class NotebookSynchronizerService extends Disposable {
-    constructor(_chatEditingService, _fileService, _instantiationService, _workingCopyFileService) {
+    constructor(_chatEditingService, _fileService, _notebookService, _instantiationService, _workingCopyFileService) {
         super();
         this._chatEditingService = _chatEditingService;
         this._fileService = _fileService;
+        this._notebookService = _notebookService;
         this._instantiationService = _instantiationService;
         this._workingCopyFileService = _workingCopyFileService;
         this._register(this._workingCopyFileService.addSaveParticipant(this._instantiationService.createInstance(NotebookSynchronizerSaveParticipant)));
     }
     async revert(workingCopy) {
         const resource = workingCopy.resource;
-        const session = this._chatEditingService.currentEditingSessionObs.get();
-        if (session) {
-            const entry = session.getEntry(resource);
-            if (entry instanceof ChatEditingModifiedNotebookEntry) {
-                await entry.revertMirrorDocument();
-            }
+        if (!this._notebookService.hasSupportedNotebooks(workingCopy.resource)) {
+            return;
+        }
+        const sessions = this._chatEditingService.editingSessionsObs.get();
+        const entry = ( sessions.map(s => s.getEntry(resource))).find(r => !!r);
+        if (entry instanceof ChatEditingModifiedDocumentEntry) {
+            await entry.docFileEditorModel.revert({ soft: true });
         }
     }
 };
 NotebookSynchronizerService = ( __decorate([
     ( __param(0, IChatEditingService)),
     ( __param(1, IFileService)),
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IWorkingCopyFileService))
+    ( __param(2, INotebookService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IWorkingCopyFileService))
 ], NotebookSynchronizerService));
 
 export { NotebookSynchronizerService };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare function runPasteCells(editor: INotebookEditor, activeCell: ICellViewModel | undefined, pasteCells: {
     items: NotebookCellTextModel[];

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -4,16 +4,16 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { cloneNotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { cloneNotebookCellTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { SelectionStateType, CellEditType } 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 { isNative } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { registerAction2, MenuId, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { NotebookCellAction, CellOverflowToolbarGroups, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, CellOverflowToolbarGroups, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
@@ -350,7 +350,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_COMMAND_ID,
-            title: ( localize(7477, "Copy Cell")),
+            title: ( localize(7576, "Copy Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
@@ -373,7 +373,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: CUT_CELL_COMMAND_ID,
-            title: ( localize(7478, "Cut Cell")),
+            title: ( localize(7577, "Cut Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
@@ -396,7 +396,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: PASTE_CELL_COMMAND_ID,
-            title: ( localize(7479, "Paste Cell")),
+            title: ( localize(7578, "Paste Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
@@ -428,7 +428,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: PASTE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(7480, "Paste Cell Above")),
+            title: ( localize(7579, "Paste Cell Above")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
@@ -472,7 +472,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: ( localize2(7481, 'Toggle Notebook Clipboard Troubleshooting')),
+            title: ( localize2(7580, 'Toggle Notebook Clipboard Troubleshooting')),
             category: Categories.Developer,
             f1: true
         });
@@ -489,7 +489,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.output.selectAll',
-            title: ( localize(7482, "Select All")),
+            title: ( localize(7581, "Select All")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.KeyA,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js

@@ -7,7 +7,7 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType, CellUri } 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 { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 export declare class PausedCellDecorationContribution extends Disposable implements INotebookEditorContribution {
     private readonly _notebookEditor;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js

@@ -7,11 +7,11 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { debugIconBreakpointForeground } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
 import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { runningCellRulerDecorationColor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { runningCellRulerDecorationColor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { CellUri, NotebookCellExecutionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 
 let PausedCellDecorationContribution = class PausedCellDecorationContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js

@@ -12,7 +12,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js

@@ -3,15 +3,15 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { DisposableStore, Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
+import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
-import { SELECT_KERNEL_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { SELECT_KERNEL_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { SELECT_NOTEBOOK_INDENTATION_ID } from '../../controller/editActions.js';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -112,19 +112,19 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(7483, "Notebook Kernel Info")),
+                name: ( localize(7582, "Notebook Kernel Info")),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( localize(7484, "{0} (suggestion)", tooltip)) : tooltip,
+                tooltip: isSuggested ? ( localize(7583, "{0} (suggestion)", tooltip)) : tooltip,
                 command: SELECT_KERNEL_ID,
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
             this._kernelInfoElement.add(kernel.onDidChange(() => this._showKernelStatus(notebook)));
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(7485, "Notebook Kernel Selection")),
-                text: ( localize(7486, "Select Kernel")),
-                ariaLabel: ( localize(7486, "Select Kernel")),
+                name: ( localize(7584, "Notebook Kernel Selection")),
+                text: ( localize(7585, "Select Kernel")),
+                ariaLabel: ( localize(7585, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
@@ -170,7 +170,7 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( localize(7487, "Notebook Editor Selections")),
+            name: ( localize(7586, "Notebook Editor Selections")),
             text: newText,
             ariaLabel: newText,
             command: CENTER_ACTIVE_CELL
@@ -194,8 +194,8 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
         const numSelected = editor.getSelections().reduce((prev, range) => prev + (range.end - range.start), 0);
         const totalCells = editor.getLength();
         return numSelected > 1 ?
-            ( localize(7488, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
-            ( localize(7489, "Cell {0} of {1}", idxFocused, totalCells));
+            ( localize(7587, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
+            ( localize(7588, "Cell {0} of {1}", idxFocused, totalCells));
     }
 };
 ActiveCellStatus = ( __decorate([
@@ -255,10 +255,10 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const entry = {
-            name: ( localize(7490, "Notebook Indentation")),
+            name: ( localize(7589, "Notebook Indentation")),
             text: newText,
             ariaLabel: newText,
-            tooltip: ( localize(7491, "Select Indentation")),
+            tooltip: ( localize(7590, "Select Indentation")),
             command: SELECT_NOTEBOOK_INDENTATION_ID
         };
         if (!this._accessor.value) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { IUserActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
 export declare class ExecutionEditorProgressController extends Disposable implements INotebookEditorContribution {