@codingame/monaco-vscode-notebook-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js

@@ -3,11 +3,13 @@ import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-a
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/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 { CellStatusbarAlignment } 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';
+import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { n } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domImpl/n';
 
 class TroubleshootController extends Disposable {
     static { this.id = 'workbench.notebook.troubleshoot'; }
@@ -18,6 +20,7 @@ class TroubleshootController extends Disposable {
         this._cellStateListeners = [];
         this._enabled = false;
         this._cellStatusItems = [];
+        this._cellOverlayIds = [];
         this._register(this._notebookEditor.onDidChangeModel(() => {
             this._update();
         }));
@@ -30,10 +33,16 @@ class TroubleshootController extends Disposable {
     _update() {
         this._localStore.clear();
         this._cellStateListeners.forEach(listener => listener.dispose());
+        this._removeCellOverlays();
+        this._removeNotebookOverlay();
         if (!this._notebookEditor.hasModel()) {
             return;
         }
         this._updateListener();
+        if (this._enabled) {
+            this._createNotebookOverlay();
+            this._createCellOverlays();
+        }
     }
     _log(cell, e) {
         if (this._enabled) {
@@ -41,6 +50,163 @@ class TroubleshootController extends Disposable {
             console.log(`cell#${cell.handle}`, e, `${oldHeight} -> ${cell.layoutInfo.totalHeight}`);
         }
     }
+    _createCellOverlays() {
+        if (!this._notebookEditor.hasModel()) {
+            return;
+        }
+        for (let i = 0; i < this._notebookEditor.getLength(); i++) {
+            const cell = this._notebookEditor.cellAt(i);
+            this._createCellOverlay(cell, i);
+        }
+        this._localStore.add(this._notebookEditor.onDidChangeViewCells(e => {
+            const addedCells = e.splices.reduce((acc, [, , newCells]) => [...acc, ...newCells], []);
+            for (let i = 0; i < addedCells.length; i++) {
+                const cellIndex = this._notebookEditor.getCellIndex(addedCells[i]);
+                if (cellIndex !== undefined) {
+                    this._createCellOverlay(addedCells[i], cellIndex);
+                }
+            }
+        }));
+    }
+    _createNotebookOverlay() {
+        if (!this._notebookEditor.hasModel()) {
+            return;
+        }
+        const listViewTop = this._notebookEditor.getLayoutInfo().listViewOffsetTop;
+        const scrollTop = this._notebookEditor.scrollTop;
+        const overlay = n.div({
+            style: {
+                position: 'absolute',
+                top: '0',
+                left: '0',
+                width: '100%',
+                height: '100%',
+                pointerEvents: 'none',
+                zIndex: '1000'
+            }
+        }, [
+            n.div({
+                style: {
+                    position: 'absolute',
+                    top: `${listViewTop}px`,
+                    left: '0',
+                    width: '100%',
+                    height: '2px',
+                    backgroundColor: 'rgba(0, 0, 255, 0.7)'
+                }
+            }),
+            n.div({
+                style: {
+                    position: 'absolute',
+                    top: `${listViewTop}px`,
+                    left: '10px',
+                    backgroundColor: 'rgba(0, 0, 255, 0.7)',
+                    color: 'white',
+                    fontSize: '11px',
+                    fontWeight: 'bold',
+                    padding: '2px 6px',
+                    borderRadius: '3px',
+                    whiteSpace: 'nowrap',
+                    pointerEvents: 'none',
+                    zIndex: '1001'
+                }
+            }, [`ScrollTop: ${scrollTop}px`])
+        ]).keepUpdated(this._store);
+        this._notebookOverlayDomNode = overlay.element;
+        if (this._notebookOverlayDomNode) {
+            this._notebookEditor.getDomNode().appendChild(this._notebookOverlayDomNode);
+        }
+        this._localStore.add(this._notebookEditor.onDidScroll(() => {
+            const scrollTop = this._notebookEditor.scrollTop;
+            const listViewTop = this._notebookEditor.getLayoutInfo().listViewOffsetTop;
+            if (this._notebookOverlayDomNode) {
+                const labelElement = this._notebookOverlayDomNode.querySelector('div:nth-child(2)');
+                if (labelElement) {
+                    labelElement.textContent = `ScrollTop: ${scrollTop}px`;
+                    labelElement.style.top = `${listViewTop}px`;
+                }
+                const topLineElement = this._notebookOverlayDomNode.querySelector('div:first-child');
+                if (topLineElement) {
+                    topLineElement.style.top = `${listViewTop}px`;
+                }
+            }
+        }));
+    }
+    _createCellOverlay(cell, index) {
+        const overlayContainer = document.createElement('div');
+        overlayContainer.style.position = 'absolute';
+        overlayContainer.style.top = '0';
+        overlayContainer.style.left = '0';
+        overlayContainer.style.width = '100%';
+        overlayContainer.style.height = '100%';
+        overlayContainer.style.pointerEvents = 'none';
+        overlayContainer.style.zIndex = '1000';
+        const topLine = document.createElement('div');
+        topLine.style.position = 'absolute';
+        topLine.style.top = '0';
+        topLine.style.left = '0';
+        topLine.style.width = '100%';
+        topLine.style.height = '2px';
+        topLine.style.backgroundColor = 'rgba(255, 0, 0, 0.7)';
+        overlayContainer.appendChild(topLine);
+        const cellTop = this._notebookEditor.getAbsoluteTopOfElement(cell);
+        const label = document.createElement('div');
+        label.textContent = `cell #${index} (handle: ${cell.handle}) | AbsoluteTopOfElement: ${cellTop}px`;
+        label.style.position = 'absolute';
+        label.style.top = '0px';
+        label.style.right = '10px';
+        label.style.backgroundColor = 'rgba(255, 0, 0, 0.5)';
+        label.style.color = 'white';
+        label.style.fontSize = '11px';
+        label.style.fontWeight = 'bold';
+        label.style.padding = '2px 6px';
+        label.style.borderRadius = '3px';
+        label.style.whiteSpace = 'nowrap';
+        label.style.pointerEvents = 'none';
+        label.style.zIndex = '1001';
+        overlayContainer.appendChild(label);
+        let overlayId = undefined;
+        this._notebookEditor.changeCellOverlays((accessor) => {
+            overlayId = accessor.addOverlay({
+                cell,
+                domNode: overlayContainer
+            });
+        });
+        if (overlayId) {
+            this._cellOverlayIds.push(overlayId);
+            const updateLayout = () => {
+                const scrollTop = this._notebookEditor.getAbsoluteTopOfElement(cell);
+                label.textContent = `cell #${index} (handle: ${cell.handle}) | AbsoluteTopOfElement: ${scrollTop}px`;
+                if (overlayId) {
+                    this._notebookEditor.changeCellOverlays((accessor) => {
+                        accessor.layoutOverlay(overlayId);
+                    });
+                }
+            };
+            this._localStore.add(cell.onDidChangeLayout((e) => {
+                updateLayout();
+            }));
+            this._localStore.add(this._notebookEditor.onDidChangeLayout(() => {
+                updateLayout();
+            }));
+        }
+    }
+    _removeCellOverlays() {
+        if (this._cellOverlayIds.length > 0) {
+            this._notebookEditor.changeCellOverlays((accessor) => {
+                for (const id of this._cellOverlayIds) {
+                    accessor.removeOverlay(id);
+                }
+            });
+            this._cellOverlayIds = [];
+        }
+    }
+    _removeNotebookOverlay() {
+        if (this._notebookOverlayDomNode) {
+            this._notebookOverlayDomNode.remove();
+            this._notebookOverlayDomNode = undefined;
+        }
+    }
     _updateListener() {
         if (!this._notebookEditor.hasModel()) {
             return;
@@ -87,6 +253,9 @@ class TroubleshootController extends Disposable {
     }
     dispose() {
         dispose(this._cellStateListeners);
+        this._removeCellOverlays();
+        this._removeNotebookOverlay();
+        this._localStore.clear();
         super.dispose();
     }
 }
@@ -95,7 +264,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(8037, "Toggle Layout Troubleshoot")),
+            title: ( localize2(8265, "Toggle Notebook Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -114,7 +283,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(8038, "Inspect Notebook Layout")),
+            title: ( localize2(8266, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -135,7 +304,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(8039, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(8267, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js

@@ -4,7 +4,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { UndoCommand, RedoCommand } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 
 let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Disposable {

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

@@ -3,11 +3,11 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/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 { outputDisplayLimit } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
+import { cellRangesToIndexes } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
 let NotebookViewportContribution = class NotebookViewportContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js

@@ -13,22 +13,22 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_VISIBLE } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_HAS_AGENT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookChatController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID, getContextFromActiveEditor } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID, getContextFromActiveEditor } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { insertNewCell } from '../insertCellActions.js';
-import { CellEditState } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2(8046, "Make Request")),
+            title: ( localize2(8274, "Make Request")),
             icon: Codicon.send,
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -52,7 +52,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(8047, 'Cursor Up')),
+            title: ( localize(8275, 'Cursor Up')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -87,7 +87,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(8048, 'Cursor Down')),
+            title: ( localize(8276, 'Cursor Down')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -110,7 +110,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localize(8049, 'Focus Chat Widget')),
+            title: ( localize(8277, 'Focus Chat Widget')),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
                 weight: KeybindingWeight.EditorCore + 7,
@@ -128,7 +128,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(8050, 'Focus Next Cell Chat Widget')),
+            title: ( localize(8278, 'Focus Next Cell Chat Widget')),
             keybinding: {
                 when: ( ContextKeyExpr.and(( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
                 weight: KeybindingWeight.EditorCore + 7,
@@ -147,7 +147,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2(8051, "Stop Request")),
+            title: ( localize2(8279, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -166,7 +166,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2(8052, "Close Chat")),
+            title: ( localize2(8280, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -184,10 +184,10 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(8053, "Accept Changes")),
-            shortTitle: ( localize(8054, 'Accept')),
+            title: ( localize2(8281, "Accept Changes")),
+            shortTitle: ( localize(8282, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localize(8055, 'Accept Changes')),
+            tooltip: ( localize(8283, 'Accept Changes')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -234,7 +234,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localize(8056, 'Discard')),
+            title: ( localize(8284, 'Discard')),
             icon: Codicon.discard,
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()), ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -275,12 +275,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(8057, "Generate")),
+                value: '$(sparkle) ' + ( localize(8285, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(8058, "Start Chat to Generate Code")),
+            tooltip: ( localize(8286, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(8058, "Start Chat to Generate Code")),
+                description: ( localize(8286, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -362,10 +362,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(8057, "Generate")),
+                value: '$(sparkle) ' + ( localize(8285, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(8058, "Start Chat to Generate Code")),
+            tooltip: ( localize(8286, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -385,8 +385,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(8059, "Generate")),
-        tooltip: ( localize(8060, "Start Chat to Generate Code"))
+        title: ( localize(8287, "Generate")),
+        tooltip: ( localize(8288, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -396,7 +396,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localize(8061, 'Focus Chat')),
+            title: ( localize(8289, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(
@@ -428,7 +428,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(8062, 'Focus Next Cell')),
+            title: ( localize(8290, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -447,7 +447,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(8063, 'Focus Previous Cell')),
+            title: ( localize(8291, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -466,7 +466,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(8064, "Previous From History")),
+            title: ( localize2(8292, "Previous From History")),
             precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -484,7 +484,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(8065, "Next From History")),
+            title: ( localize2(8293, "Next From History")),
             precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -502,7 +502,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2(8066, "Generate")),
+            title: ( localize2(8294, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -533,9 +533,9 @@ class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(8067, "Accept and Run")),
-            shortTitle: ( localize(8068, 'Accept & Run')),
-            tooltip: ( localize(8069, 'Accept the changes and run the cell')),
+            title: ( localize2(8295, "Accept and Run")),
+            shortTitle: ( localize(8296, 'Accept & Run')),
+            tooltip: ( localize(8297, 'Accept the changes and run the cell')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js

@@ -13,7 +13,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 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 { showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
@@ -22,26 +22,29 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { copyIcon } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { getOutputViewModelFromId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
-import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { copyIcon } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { getOutputViewModelFromId } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './cellChatActions.js';
 import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
+import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 
 const NotebookKernelVariableKey = 'kernelVariable';
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
     static { this.ID = 'workbench.contrib.notebookChatContribution'; }
-    constructor(contextKeyService, chatAgentService, editorService, chatWidgetService, notebookKernelService, languageFeaturesService) {
+    constructor(contextKeyService, chatAgentService, editorService, chatWidgetService, notebookKernelService, languageFeaturesService, chatContextPickService) {
         super();
         this.editorService = editorService;
         this.chatWidgetService = chatWidgetService;
         this.notebookKernelService = notebookKernelService;
         this.languageFeaturesService = languageFeaturesService;
+        this._register(chatContextPickService.registerChatContextItem(( new KernelVariableContextPicker(this.editorService, this.notebookKernelService))));
         this._ctxHasProvider = CTX_NOTEBOOK_CHAT_HAS_AGENT.bindTo(contextKeyService);
         const updateNotebookAgentStatus = () => {
             const hasNotebookAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Notebook));
@@ -75,7 +78,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(8070, "Pick a variable from the kernel")),
+                    detail: ( localize(8298, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -126,7 +129,8 @@ NotebookChatContribution = ( __decorate([
     ( __param(2, IEditorService)),
     ( __param(3, IChatWidgetService)),
     ( __param(4, INotebookKernelService)),
-    ( __param(5, ILanguageFeaturesService))
+    ( __param(5, ILanguageFeaturesService)),
+    ( __param(6, IChatContextPickService))
 ], NotebookChatContribution));
 class SelectAndInsertKernelVariableAction extends Action2 {
     constructor() {
@@ -169,7 +173,7 @@ class SelectAndInsertKernelVariableAction extends Action2 {
                 detail: variable.type,
             });
         }
-        const pickedVariable = await quickInputService.pick(quickPickItems, { placeHolder: 'Select a kernel variable' });
+        const pickedVariable = await quickInputService.pick(quickPickItems, { placeHolder: ( localize(8299, "Select a kernel variable")) });
         if (!pickedVariable) {
             return;
         }
@@ -204,11 +208,62 @@ class SelectAndInsertKernelVariableAction extends Action2 {
         }
     }
 }
+let KernelVariableContextPicker = class KernelVariableContextPicker {
+    constructor(editorService, notebookKernelService) {
+        this.editorService = editorService;
+        this.notebookKernelService = notebookKernelService;
+        this.type = 'pickerPick';
+        this.label = ( localize(8300, 'Kernel Variable...'));
+        this.icon = Codicon.serverEnvironment;
+    }
+    isEnabled(widget) {
+        return widget.location === ChatAgentLocation.Notebook && Boolean(getNotebookEditorFromEditorPane(this.editorService.activeEditorPane)?.getViewModel()?.notebookDocument);
+    }
+    asPicker() {
+        const picks = (async () => {
+            const notebook = getNotebookEditorFromEditorPane(this.editorService.activeEditorPane)?.getViewModel()?.notebookDocument;
+            if (!notebook) {
+                return [];
+            }
+            const selectedKernel = this.notebookKernelService.getMatchingKernel(notebook).selected;
+            const hasVariableProvider = selectedKernel?.hasVariableProvider;
+            if (!hasVariableProvider) {
+                return [];
+            }
+            const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+            const result = [];
+            for await (const variable of variables) {
+                result.push({
+                    label: variable.name,
+                    description: variable.value,
+                    asAttachment: () => {
+                        return {
+                            kind: 'generic',
+                            id: 'vscode.notebook.variable',
+                            name: variable.name,
+                            value: variable.value,
+                            icon: codiconsLibrary.variable,
+                        };
+                    },
+                });
+            }
+            return result;
+        })();
+        return {
+            placeholder: ( localize(8301, 'Select a kernel variable')),
+            picks
+        };
+    }
+};
+KernelVariableContextPicker = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, INotebookKernelService))
+], KernelVariableContextPicker));
 registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOutput.addToChat',
-            title: ( localize(8071, "Add Cell Output to Chat")),
+            title: ( localize(8302, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(