@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js

@@ -1,39 +1,39 @@
+
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { NotebookCellAction, findTargetCellEditor } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CodeCellViewModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { NotebookCellAction, findTargetCellEditor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CodeCellViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
+const FIX_CELL_ERROR_COMMAND_ID = 'notebook.cell.chat.fixError';
+const EXPLAIN_CELL_ERROR_COMMAND_ID = 'notebook.cell.chat.explainError';
 registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-            title: ( localize2(10988, "Show Cell Failure Actions")),
-            precondition: ( (ContextKeyExpr.and(
-                NOTEBOOK_CELL_FOCUSED,
-                NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
-                 (NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated())
-            ))),
+            title: ( localize2(7299, "Show Cell Failure Actions")),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_CELL_FOCUSED,
-                    NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
-                     (NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated())
-                ))),
-                primary: 2048  | 89 ,
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
+                primary: KeyMod.CtrlCmd | KeyCode.Period,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
     async runWithContext(accessor, context) {
         if (context.cell instanceof CodeCellViewModel) {
-            const error = context.cell.excecutionError.get();
+            const error = context.cell.executionErrorDiagnostic.get();
             if (error?.location) {
                 const location = Range.lift({
                     startLineNumber: error.location.startLineNumber + 1,
@@ -45,11 +45,64 @@ registerAction2(class extends NotebookCellAction {
                 const editor = findTargetCellEditor(context, context.cell);
                 if (editor) {
                     const controller = CodeActionController.get(editor);
-                    controller?.manualTriggerAtCurrentPosition(( localize(10989, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                    controller?.manualTriggerAtCurrentPosition(( localize(7300, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                }
+            }
+        }
+    }
+});
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: FIX_CELL_ERROR_COMMAND_ID,
+            title: ( localize2(7301, "Fix Cell Error")),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
+            f1: true
+        });
+    }
+    async runWithContext(accessor, context) {
+        if (context.cell instanceof CodeCellViewModel) {
+            const error = context.cell.executionErrorDiagnostic.get();
+            if (error?.location) {
+                const location = Range.lift({
+                    startLineNumber: error.location.startLineNumber + 1,
+                    startColumn: error.location.startColumn + 1,
+                    endLineNumber: error.location.endLineNumber + 1,
+                    endColumn: error.location.endColumn + 1
+                });
+                context.notebookEditor.setCellEditorSelection(context.cell, Range.lift(location));
+                const editor = findTargetCellEditor(context, context.cell);
+                if (editor) {
+                    const controller = InlineChatController.get(editor);
+                    const message = error.name ? `${error.name}: ${error.message}` : error.message;
+                    if (controller) {
+                        await controller.run({ message: '/fix ' + message, initialRange: location, autoSend: true });
+                    }
                 }
             }
         }
     }
 });
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: EXPLAIN_CELL_ERROR_COMMAND_ID,
+            title: ( localize2(7302, "Explain Cell Error")),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
+            f1: true
+        });
+    }
+    async runWithContext(accessor, context) {
+        if (context.cell instanceof CodeCellViewModel) {
+            const error = context.cell.executionErrorDiagnostic.get();
+            if (error?.message) {
+                const viewsService = accessor.get(IViewsService);
+                const chatWidget = await showChatView(viewsService);
+                const message = error.name ? `${error.name}: ${error.message}` : error.message;
+                chatWidget?.acceptInput('@workspace /explain ' + message);
+            }
+        }
+    }
+});
 
-export { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID };
+export { EXPLAIN_CELL_ERROR_COMMAND_ID, FIX_CELL_ERROR_COMMAND_ID, OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.d.ts

@@ -0,0 +1,7 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+export declare class DiagnosticCellStatusBarContrib extends Disposable implements INotebookEditorContribution {
+    static id: string;
+    constructor(notebookEditor: INotebookEditor, instantiationService: IInstantiationService);
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/event';
@@ -10,41 +11,45 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
-import { NotebookStatusBarController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CodeCellViewModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { NotebookStatusBarController } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CodeCellViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 
 let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
     static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
     constructor(notebookEditor, instantiationService) {
         super();
-        this._register(( (new NotebookStatusBarController(notebookEditor, (vm, cell) => cell instanceof CodeCellViewModel ?
+        this._register(( new NotebookStatusBarController(notebookEditor, (vm, cell) => cell instanceof CodeCellViewModel ?
             instantiationService.createInstance(DiagnosticCellStatusBarItem, vm, cell) :
-            Disposable.None))));
+            Disposable.None)));
     }
 };
-DiagnosticCellStatusBarContrib = ( (__decorate([
-    ( (__param(1, IInstantiationService)))
-], DiagnosticCellStatusBarContrib)));
+DiagnosticCellStatusBarContrib = ( __decorate([
+    ( __param(1, IInstantiationService))
+], DiagnosticCellStatusBarContrib));
 registerNotebookContribution(DiagnosticCellStatusBarContrib.id, DiagnosticCellStatusBarContrib);
 let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disposable {
-    constructor(_notebookViewModel, cell, keybindingService) {
+    constructor(_notebookViewModel, cell, keybindingService, chatAgentService) {
         super();
         this._notebookViewModel = _notebookViewModel;
         this.cell = cell;
         this.keybindingService = keybindingService;
+        this.chatAgentService = chatAgentService;
         this._currentItemIds = [];
-        this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.excecutionError))));
+        this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.executionErrorDiagnostic))));
     }
     async updateSparkleItem(error) {
         let item;
-        if (error?.location) {
+        if (error?.location && !Iterable.isEmpty(this.chatAgentService.getAgents())) {
             const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localize(10990, "Quick Actions {0}", `(${keybinding})`));
+            const tooltip = ( localize(7303, "Quick Actions {0}", `(${keybinding})`));
             item = {
                 text: `$(sparkle)`,
                 tooltip,
-                alignment: 1 ,
+                alignment: CellStatusbarAlignment.Left,
                 command: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
                 priority: Number.MAX_SAFE_INTEGER - 1
             };
@@ -57,8 +62,9 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
         this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items: [] }]);
     }
 };
-DiagnosticCellStatusBarItem = ( (__decorate([
-    ( (__param(2, IKeybindingService)))
-], DiagnosticCellStatusBarItem)));
+DiagnosticCellStatusBarItem = ( __decorate([
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IChatAgentService))
+], DiagnosticCellStatusBarItem));
 
 export { DiagnosticCellStatusBarContrib };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.d.ts

@@ -0,0 +1,14 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookCellStatusBarService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service";
+export declare class ContributedStatusBarItemController extends Disposable implements INotebookEditorContribution {
+    private readonly _notebookEditor;
+    private readonly _notebookCellStatusBarService;
+    static id: string;
+    private readonly _visibleCells;
+    private readonly _observer;
+    constructor(_notebookEditor: INotebookEditor, _notebookCellStatusBarService: INotebookCellStatusBarService);
+    private _updateEverything;
+    private _updateVisibleCells;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.js

@@ -1,9 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Throttler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { NotebookVisibleCellObserver } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { NotebookVisibleCellObserver } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookCellStatusBarService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
 
 let ContributedStatusBarItemController = class ContributedStatusBarItemController extends Disposable {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
@@ -8,12 +9,13 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookCellStatusBarService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvider {
     constructor(_notebookService, _languageService) {
@@ -39,7 +41,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
             }
             else {
                 const searchTooltip = ( localize(
-                    8158,
+                    7311,
                     "Unknown cell language. Click to search for '{0}' extensions",
                     cell.language
                 ));
@@ -47,7 +49,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
                     text: `$(dialog-warning)`,
                     command: { id: 'workbench.extensions.search', arguments: [`@tag:${cell.language}`], title: 'Search Extensions' },
                     tooltip: searchTooltip,
-                    alignment: 2 ,
+                    alignment: CellStatusbarAlignment.Right,
                     priority: -Number.MAX_SAFE_INTEGER + 1
                 });
             }
@@ -55,8 +57,8 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         statusBarItems.push({
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
-            tooltip: ( localize(8159, "Select Cell Language Mode")),
-            alignment: 2 ,
+            tooltip: ( localize(7312, "Select Cell Language Mode")),
+            alignment: CellStatusbarAlignment.Right,
             priority: -Number.MAX_SAFE_INTEGER
         });
         return {
@@ -64,10 +66,10 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         };
     }
 };
-CellStatusBarLanguagePickerProvider = ( (__decorate([
-    ( (__param(0, INotebookService))),
-    ( (__param(1, ILanguageService)))
-], CellStatusBarLanguagePickerProvider)));
+CellStatusBarLanguagePickerProvider = ( __decorate([
+    ( __param(0, INotebookService)),
+    ( __param(1, ILanguageService))
+], CellStatusBarLanguagePickerProvider));
 let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectionProvider {
     constructor(_notebookService, _notebookKernelService, _languageService, _configurationService, _languageDetectionService, _keybindingService) {
         this._notebookService = _notebookService;
@@ -77,7 +79,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         this._languageDetectionService = _languageDetectionService;
         this._keybindingService = _keybindingService;
         this.viewType = '*';
-        this.cache = ( (new ResourceMap()));
+        this.cache = ( new ResourceMap());
     }
     async provideCellStatusBarItems(uri, index, token) {
         const doc = this._notebookService.getNotebookTextModel(uri);
@@ -98,7 +100,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         const currentLanguageId = cell.cellKind === CellKind.Markup ?
             'markdown' :
             (this._languageService.getLanguageIdByLanguageName(cell.language) || cell.language);
-        if (!( (this.cache.has(cellUri)))) {
+        if (!( this.cache.has(cellUri))) {
             this.cache.set(cellUri, {
                 cellLanguage: currentLanguageId,
                 updateTimestamp: 0,
@@ -119,7 +121,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         const items = [];
         if (cached.guess && currentLanguageId !== cached.guess) {
             const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-            let tooltip = ( localize(8160, "Accept Detected Language: {0}", detectedName));
+            let tooltip = ( localize(7313, "Accept Detected Language: {0}", detectedName));
             const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
             const label = keybinding?.getLabel();
             if (label) {
@@ -129,21 +131,21 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
                 text: '$(lightbulb-autofix)',
                 command: DETECT_CELL_LANGUAGE,
                 tooltip,
-                alignment: 2 ,
+                alignment: CellStatusbarAlignment.Right,
                 priority: -Number.MAX_SAFE_INTEGER + 1
             });
         }
         return { items };
     }
 };
-CellStatusBarLanguageDetectionProvider = ( (__decorate([
-    ( (__param(0, INotebookService))),
-    ( (__param(1, INotebookKernelService))),
-    ( (__param(2, ILanguageService))),
-    ( (__param(3, IConfigurationService))),
-    ( (__param(4, ILanguageDetectionService))),
-    ( (__param(5, IKeybindingService)))
-], CellStatusBarLanguageDetectionProvider)));
+CellStatusBarLanguageDetectionProvider = ( __decorate([
+    ( __param(0, INotebookService)),
+    ( __param(1, INotebookKernelService)),
+    ( __param(2, ILanguageService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, ILanguageDetectionService)),
+    ( __param(5, IKeybindingService))
+], CellStatusBarLanguageDetectionProvider));
 let BuiltinCellStatusBarProviders = class BuiltinCellStatusBarProviders extends Disposable {
     constructor(instantiationService, notebookCellStatusBarService) {
         super();
@@ -156,8 +158,8 @@ let BuiltinCellStatusBarProviders = class BuiltinCellStatusBarProviders extends
         });
     }
 };
-BuiltinCellStatusBarProviders = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, INotebookCellStatusBarService)))
-], BuiltinCellStatusBarProviders)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinCellStatusBarProviders, 3 );
+BuiltinCellStatusBarProviders = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, INotebookCellStatusBarService))
+], BuiltinCellStatusBarProviders));
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BuiltinCellStatusBarProviders, LifecyclePhase.Restored);

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

@@ -0,0 +1,18 @@
+import { IFileService } from "vscode/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 { IUntitledFileWorkingCopy } from "../../../../../services/workingCopy/common/untitledFileWorkingCopy.js";
+import { IWorkingCopyFileService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
+import { IChatEditingService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { NotebookFileWorkingCopyModel } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel";
+import { INotebookSynchronizerService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookSynchronizerService.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class NotebookSynchronizerService extends Disposable implements INotebookSynchronizerService {
+    private readonly _chatEditingService;
+    protected readonly _fileService: IFileService;
+    private readonly _instantiationService;
+    private readonly _workingCopyFileService;
+    _serviceBrand: undefined;
+    constructor(_chatEditingService: IChatEditingService, _fileService: IFileService, _instantiationService: IInstantiationService, _workingCopyFileService: IWorkingCopyFileService);
+    revert(workingCopy: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>): Promise<void>;
+}

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

@@ -0,0 +1,76 @@
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { IFileService } from 'vscode/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 { IWorkingCopyFileService } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { NotebookSaveParticipant } from '../saveParticipants/saveParticipants.js';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+
+let NotebookSynchronizerSaveParticipant = class NotebookSynchronizerSaveParticipant extends NotebookSaveParticipant {
+    constructor(editorService, _chatEditingService, _fileService) {
+        super(editorService);
+        this._chatEditingService = _chatEditingService;
+        this._fileService = _fileService;
+    }
+    async participate(workingCopy, context, progress, token) {
+        console.log('notebook synchronizer participate');
+        const session = this._chatEditingService.currentEditingSessionObs.get();
+        if (!session) {
+            return;
+        }
+        const entry = session.getEntry(workingCopy.resource);
+        if (entry && entry instanceof ChatEditingModifiedNotebookEntry) {
+            await entry.saveMirrorDocument();
+        }
+        const inWorkingSet = ( session.workingSet.has(workingCopy.resource));
+        if (!(entry && entry instanceof ChatEditingModifiedNotebookEntry) && !inWorkingSet) {
+            return;
+        }
+        if (workingCopy instanceof StoredFileWorkingCopy) {
+            const metadata = await this._fileService.stat(workingCopy.resource);
+            if (workingCopy.lastResolvedFileStat) {
+                workingCopy.lastResolvedFileStat = {
+                    ...workingCopy.lastResolvedFileStat,
+                    ...metadata
+                };
+            }
+        }
+    }
+};
+NotebookSynchronizerSaveParticipant = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IChatEditingService)),
+    ( __param(2, IFileService))
+], NotebookSynchronizerSaveParticipant));
+let NotebookSynchronizerService = class NotebookSynchronizerService extends Disposable {
+    constructor(_chatEditingService, _fileService, _instantiationService, _workingCopyFileService) {
+        super();
+        this._chatEditingService = _chatEditingService;
+        this._fileService = _fileService;
+        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();
+            }
+        }
+    }
+};
+NotebookSynchronizerService = ( __decorate([
+    ( __param(0, IChatEditingService)),
+    ( __param(1, IFileService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IWorkingCopyFileService))
+], NotebookSynchronizerService));
+
+export { NotebookSynchronizerService };

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

@@ -0,0 +1,21 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare function runPasteCells(editor: INotebookEditor, activeCell: ICellViewModel | undefined, pasteCells: {
+    items: NotebookCellTextModel[];
+    isCopy: boolean;
+}): boolean;
+export declare function runCopyCells(accessor: ServicesAccessor, editor: INotebookEditor, targetCell: ICellViewModel | undefined): boolean;
+export declare function runCutCells(accessor: ServicesAccessor, editor: INotebookEditor, targetCell: ICellViewModel | undefined): boolean;
+export declare class NotebookClipboardContribution extends Disposable {
+    private readonly _editorService;
+    static readonly ID = "workbench.contrib.notebookClipboard";
+    constructor(_editorService: IEditorService);
+    private _getContext;
+    private _focusInsideEmebedMonaco;
+    runCopyAction(accessor: ServicesAccessor): boolean;
+    runPasteAction(accessor: ServicesAccessor): boolean;
+    runCutAction(accessor: ServicesAccessor): boolean;
+}