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

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, toDisposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -11,16 +11,13 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-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, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { navigationBearingFakeActionId, AcceptAction, RejectAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorActions';
+import { navigationBearingFakeActionId, AcceptAction, RejectAction } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions';
+import { ChatEditingModifiedDocumentEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
 let NotebookChatActionsOverlayController = class NotebookChatActionsOverlayController extends Disposable {
     constructor(notebookEditor, cellDiffInfo, deletedCellDecorator, _chatEditingService, instantiationService) {
@@ -29,9 +26,14 @@ let NotebookChatActionsOverlayController = class NotebookChatActionsOverlayContr
         this._chatEditingService = _chatEditingService;
         const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
         this._register(autorunWithStore((r, store) => {
-            const session = this._chatEditingService.currentEditingSessionObs.read(r);
             const model = notebookModel.read(r);
-            if (!model || !session) {
+            if (!model) {
+                return;
+            }
+            const sessions = this._chatEditingService.editingSessionsObs.read(r);
+            const session = sessions.find(s => s.readEntry(model.uri, r));
+            const entry = session?.readEntry(model.uri, r);
+            if (!session || !entry || !(entry instanceof ChatEditingModifiedDocumentEntry)) {
                 return;
             }
             const entries = session.entries.read(r);
@@ -53,7 +55,6 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
     constructor(notebookEditor, entry, cellDiffInfo, nextEntry, previousEntry, deletedCellDecorator, _editorService, instaService) {
         super();
         this.notebookEditor = notebookEditor;
-        this._editorService = _editorService;
         this.focusedDiff = observableValue('focusedDiff', undefined);
         this.added = false;
         this._register(notebookEditor.onDidBlurWidget(() => {
@@ -88,16 +89,15 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
             },
             menuOptions: { renderShortTitle: true },
             actionViewItemProvider: (action, options) => {
-                const that = this;
                 if (action.id === navigationBearingFakeActionId) {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: false, label: false, keybindingNotRenderedWithLabel: true });
                         }
-                    });
+                    }));
                 }
                 if (action.id === AcceptAction.ID || action.id === RejectAction.ID) {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
                             this._reveal = this._store.add(( new MutableDisposable()));
@@ -115,32 +115,23 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
                                 if (entry === nextEntry) {
                                     return;
                                 }
-                                const change = nextEntry.diffInfo.get().changes.at(0);
-                                return that._editorService.openEditor({
-                                    resource: nextEntry.modifiedURI,
-                                    options: {
-                                        selection: change && Range.fromPositions({ lineNumber: change.original.startLineNumber, column: 1 }),
-                                        revealIfOpened: false,
-                                        revealIfVisible: false,
-                                    }
-                                }, ACTIVE_GROUP);
                             }));
                             this._reveal.value = store;
                         }
                         get actionRunner() {
                             return super.actionRunner;
                         }
-                    });
+                    }));
                 }
                 if (action.id === 'chatEditor.action.navigateNext' || action.id === 'chatEditor.action.navigatePrevious') {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: true, label: false, keybindingNotRenderedWithLabel: true });
                         }
                         set actionRunner(_) {
                             const next = action.id === 'chatEditor.action.navigateNext' ? nextEntry : previousEntry;
                             const direction = action.id === 'chatEditor.action.navigateNext' ? 'next' : 'previous';
-                            super.actionRunner = ( new NextPreviousChangeActionRunner(
+                            super.actionRunner = this._register(( new NextPreviousChangeActionRunner(
                                 notebookEditor,
                                 cellDiffInfo,
                                 entry,
@@ -149,12 +140,12 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
                                 _editorService,
                                 deletedCellDecorator,
                                 focusedDiff
-                            ));
+                            )));
                         }
                         get actionRunner() {
                             return super.actionRunner;
                         }
-                    });
+                    }));
                 }
                 return undefined;
             }
@@ -294,12 +285,10 @@ class NextPreviousChangeActionRunner extends ActionRunner {
         if (!this.canGoToNextEntry()) {
             return;
         }
-        const change = this.next.diffInfo.get().changes.at(0);
         this.focusedDiff.set(undefined, undefined);
         await this.editorService.openEditor({
             resource: this.next.modifiedURI,
             options: {
-                selection: change && Range.fromPositions({ lineNumber: change.original.startLineNumber, column: 1 }),
                 revealIfOpened: false,
                 revealIfVisible: false,
             }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class NotebookChatEditorControllerContrib extends Disposable implements INotebookEditorContribution {

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

@@ -1,28 +1,25 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, dispose, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived, derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { observableFromEvent, debouncedObservable2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { WorkingSetEntryState } 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { NotebookDeletedCellDecorator, NotebookInsertedCellDecorator, NotebookCellDiffDecorator } from './notebookCellDecorators.js';
-import './notebookSynchronizer.js';
+import { NotebookCellDiffDecorator } from './notebookCellDecorators.js';
 import { INotebookModelSynchronizerFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.service';
-import './notebookOriginalModelRefFactory.js';
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service';
+import { observableFromEvent, debouncedObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { NotebookChatActionsOverlayController } from './notebookChatActionsOverlay.js';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import './notebookOriginalCellModelFactory.js';
-import { ctxNotebookHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ctxNotebookHasEditorModification } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext';
+import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
+import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
+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, derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let NotebookChatEditorControllerContrib = class NotebookChatEditorControllerContrib extends Disposable {
     static { this.ID = 'workbench.notebook.chatEditorController'; }
@@ -44,13 +41,13 @@ let NotebookChatEditorController = class NotebookChatEditorController extends Di
         this.synchronizerFactory = synchronizerFactory;
         this.instantiationService = instantiationService;
         this._ctxHasEditorModification = ctxNotebookHasEditorModification.bindTo(contextKeyService);
-        this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor));
+        this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor, undefined));
         this.insertedCellDecorator = this._register(instantiationService.createInstance(NotebookInsertedCellDecorator, notebookEditor));
         const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
         const originalModel = observableValue('originalModel', undefined);
         const readyToRenderViewzones = observableValue('viewModelAttached', false);
         this._register(Event.once(this.notebookEditor.onDidAttachViewModel)(() => readyToRenderViewzones.set(true, undefined)));
-        const onDidChangeVisibleRanges = debouncedObservable2(observableFromEvent(this.notebookEditor.onDidChangeVisibleRanges, () => this.notebookEditor.visibleRanges), 50);
+        const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(this.notebookEditor.onDidChangeVisibleRanges, () => this.notebookEditor.visibleRanges), 50);
         const decorators = ( new Map());
         let updatedCellDecoratorsOnceBefore = false;
         let updatedDeletedInsertedDecoratorsOnceBefore = false;
@@ -63,12 +60,13 @@ let NotebookChatEditorController = class NotebookChatEditorController extends Di
         this._register(toDisposable(() => clearDecorators()));
         let notebookSynchronizer;
         const entryObs = derived((r) => {
-            const session = this._chatEditingService.currentEditingSessionObs.read(r);
             const model = notebookModel.read(r);
-            if (!model || !session) {
+            if (!model) {
                 return;
             }
-            return session.readEntry(model.uri, r);
+            const sessions = this._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(autorun(r => {
             const entry = entryObs.read(r);
@@ -177,6 +175,5 @@ NotebookChatEditorController = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IContextKeyService))
 ], NotebookChatEditorController));
-registerNotebookContribution(NotebookChatEditorControllerContrib.ID, NotebookChatEditorControllerContrib);
 
 export { NotebookChatEditorControllerContrib };

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

@@ -3,8 +3,8 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { INotebookOriginalCellModelFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.service";
 export declare class OriginalNotebookCellModelReferenceCollection extends ReferenceCollection<ITextModel> {
     private readonly modelService;

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

@@ -4,8 +4,8 @@ import { ReferenceCollection } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 
 let OriginalNotebookCellModelReferenceCollection = class OriginalNotebookCellModelReferenceCollection extends ReferenceCollection {
     constructor(modelService, _languageService) {

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

@@ -3,11 +3,13 @@ import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { NotebookTextModel } from "../../../common/model/notebookTextModel.js";
 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";
 import { INotebookOriginalModelReferenceFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service";
 export declare class OriginalNotebookModelReferenceCollection extends ReferenceCollection<Promise<NotebookTextModel>> {
     private readonly notebookService;
+    private readonly modelService;
     private readonly modelsToDispose;
-    constructor(notebookService: INotebookService);
+    constructor(notebookService: INotebookService, modelService: ITextModelService);
     protected createReferencedObject(key: string, fileEntry: IModifiedFileEntry, viewType: string): Promise<NotebookTextModel>;
     protected destroyReferencedObject(key: string, modelPromise: Promise<NotebookTextModel>): void;
 }

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>;
 }