@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

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

@@ -1,5 +1,5 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyCode, KeyMod, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
@@ -8,21 +8,24 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS, CTX_NOTEBOOK_CHAT_HAS_AGENT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID, getContextFromActiveEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { insertNewCell } from '../insertCellActions.js';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { AbstractInlineChatAction } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2(10747, "Make Request")),
+            title: ( localize2(10833, "Make Request")),
             icon: Codicon.send,
             keybinding: {
                 when: ( (ContextKeyExpr.and(
@@ -30,8 +33,8 @@ registerAction2(class extends NotebookAction {
                     CTX_INLINE_CHAT_FOCUSED,
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                 ))),
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyCode.Enter
+                weight: 200 ,
+                primary: 3
             },
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -50,7 +53,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(10748, 'Cursor Up')),
+            title: ( localize(10834, 'Cursor Up')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -59,8 +62,8 @@ registerAction2(class extends NotebookCellAction {
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                      (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 ))),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
+                weight: 0  + 7,
+                primary: 2048  | 16
             },
             f1: false
         });
@@ -85,7 +88,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(10749, 'Cursor Down')),
+            title: ( localize(10835, 'Cursor Down')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -94,8 +97,8 @@ registerAction2(class extends NotebookAction {
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                      (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 ))),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
+                weight: 0  + 7,
+                primary: 2048  | 18
             },
             f1: false
         });
@@ -108,7 +111,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localize(10750, 'Focus Chat Widget')),
+            title: ( localize(10836, 'Focus Chat Widget')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -121,8 +124,8 @@ registerAction2(class extends NotebookCellAction {
                     )),
                      (EditorContextKeys.isEmbeddedDiffEditor.negate())
                 ))),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
+                weight: 0  + 7,
+                primary: 2048  | 16
             },
             f1: false
         });
@@ -136,10 +139,9 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(10751, 'Focus Next Cell Chat Widget')),
+            title: ( localize(10837, 'Focus Next Cell Chat Widget')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_EDITOR_FOCUSED,
                      (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
                      (ContextKeyExpr.and(
                          (ContextKeyExpr.has(InputFocusedContextKey)),
@@ -149,10 +151,17 @@ registerAction2(class extends NotebookCellAction {
                     )),
                      (EditorContextKeys.isEmbeddedDiffEditor.negate())
                 ))),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
+                weight: 0  + 7,
+                primary: 2048  | 18
             },
-            f1: false
+            f1: false,
+            precondition: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
+                 (IS_COMPOSITE_NOTEBOOK.negate()),
+                NOTEBOOK_CELL_EDITOR_FOCUSED
+            )),  (ContextKeyExpr.and(
+                IS_COMPOSITE_NOTEBOOK,
+                 (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+            )))))
         });
     }
     async runWithContext(accessor, context) {
@@ -164,7 +173,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2(10752, "Stop Request")),
+            title: ( localize2(10838, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -183,7 +192,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2(10753, "Close Chat")),
+            title: ( localize2(10839, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -201,10 +210,10 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(10754, "Accept Changes")),
-            shortTitle: ( localize(10755, 'Accept')),
+            title: ( localize2(10840, "Accept Changes")),
+            shortTitle: ( localize(10841, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localize(10756, 'Accept Changes')),
+            tooltip: ( localize(10842, 'Accept Changes')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -212,8 +221,8 @@ registerAction2(class extends NotebookAction {
                         CTX_INLINE_CHAT_FOCUSED,
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                     ))),
-                    weight: KeybindingWeight.EditorContrib + 10,
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    weight: 100  + 10,
+                    primary: 2048  | 3 ,
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -222,8 +231,8 @@ registerAction2(class extends NotebookAction {
                         CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                     ))),
-                    weight: KeybindingWeight.EditorCore + 10,
-                    primary: KeyCode.Escape
+                    weight: 0  + 10,
+                    primary: 9
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -232,8 +241,8 @@ registerAction2(class extends NotebookAction {
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
                     ))),
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 3 ,
+                    weight: 200
                 }
             ],
             menu: [
@@ -241,7 +250,7 @@ registerAction2(class extends NotebookAction {
                     id: MENU_CELL_CHAT_WIDGET_STATUS,
                     group: '0_main',
                     order: 0,
-                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages))),
+                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo("messages" ))),
                 }
             ],
             f1: false
@@ -255,7 +264,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localize(10757, 'Discard')),
+            title: ( localize(10843, 'Discard')),
             icon: Codicon.discard,
             keybinding: {
                 when: ( (ContextKeyExpr.and(
@@ -264,8 +273,8 @@ registerAction2(class extends NotebookAction {
                      (CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()),
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                 ))),
-                weight: KeybindingWeight.EditorContrib,
-                primary: KeyCode.Escape
+                weight: 100 ,
+                primary: 9
             },
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_STATUS,
@@ -282,11 +291,7 @@ registerAction2(class extends NotebookAction {
 async function startChat(accessor, context, index, input, autoSend, source) {
     const configurationService = accessor.get(IConfigurationService);
     const commandService = accessor.get(ICommandService);
-    if (configurationService.getValue(NotebookSetting.cellChat)) {
-        context.notebookEditor.focusContainer();
-        NotebookChatController.get(context.notebookEditor)?.run(index, input, autoSend);
-    }
-    else if (configurationService.getValue(NotebookSetting.cellGenerate)) {
+    if (configurationService.getValue(NotebookSetting.cellGenerate) || configurationService.getValue(NotebookSetting.cellChat)) {
         const activeCell = context.notebookEditor.getActiveCell();
         const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below'));
         if (targetCell) {
@@ -305,12 +310,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(10758, "Generate")),
+                value: '$(sparkle) ' + ( localize(10844, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(10759, "Start Chat to Generate Code")),
+            tooltip: ( localize(10845, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(10759, "Start Chat to Generate Code")),
+                description: ( localize(10845, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -344,9 +349,9 @@ registerAction2(class extends NotebookAction {
                          (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
                     ))
                 ))),
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyI,
-                secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
+                weight: 200 ,
+                primary: 2048  | 39 ,
+                secondary: [KeyChord(2048  | 41 , 39 )],
             },
             menu: [
                 {
@@ -408,10 +413,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(10758, "Generate")),
+                value: '$(sparkle) ' + ( localize(10844, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(10759, "Start Chat to Generate Code")),
+            tooltip: ( localize(10845, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -431,15 +436,15 @@ registerAction2(class extends NotebookAction {
         });
     }
     async runWithContext(accessor, context) {
-        await startChat(accessor, context, 0, '', false);
+        await startChat(accessor, context);
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(10760, "Generate")),
-        tooltip: ( localize(10761, "Start Chat to Generate Code"))
+        title: ( localize(10846, "Generate")),
+        tooltip: ( localize(10847, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -458,7 +463,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localize(10762, 'Focus Chat')),
+            title: ( localize(10848, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -466,8 +471,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
                     ))),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 18 ,
+                    weight: 200
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -475,8 +480,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
                     ))),
-                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 16 ,
+                    weight: 200
                 }
             ],
             f1: false
@@ -490,12 +495,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(10763, 'Focus Next Cell')),
+            title: ( localize(10849, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 18 ,
+                    weight: 200
                 }
             ],
             f1: false
@@ -509,12 +514,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(10764, 'Focus Previous Cell')),
+            title: ( localize(10850, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 16 ,
+                    weight: 200
                 }
             ],
             f1: false
@@ -528,12 +533,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(10765, "Previous From History")),
+            title: ( localize2(10851, "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))),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.UpArrow,
+                weight: 0  + 10,
+                primary: 16 ,
             },
             f1: false
         });
@@ -546,12 +551,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(10766, "Next From History")),
+            title: ( localize2(10852, "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))),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.DownArrow
+                weight: 0  + 10,
+                primary: 18
             },
             f1: false
         });
@@ -564,7 +569,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2(10767, "Generate")),
+            title: ( localize2(10853, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -596,3 +601,51 @@ registerAction2(class extends NotebookCellAction {
         }
     }
 });
+class AcceptChangesAndRun extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'notebook.inlineChat.acceptChangesAndRun',
+            title: ( localize2(10854, "Accept and Run")),
+            shortTitle: ( localize(10855, 'Accept & Run')),
+            tooltip: ( localize(10856, 'Accept the changes and run the cell')),
+            icon: Codicon.check,
+            f1: true,
+            precondition: ( (ContextKeyExpr.and(
+                 (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                CTX_INLINE_CHAT_VISIBLE,
+                 (ContextKeyExpr.or(
+                     (CTX_INLINE_CHAT_DOCUMENT_CHANGED.toNegated()),
+                     (CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("preview" ))
+                ))
+            ))),
+            keybinding: undefined,
+            menu: [{
+                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
+                    group: '0_main',
+                    order: 2,
+                    when: ( (ContextKeyExpr.and(
+                         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                         (CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated()),
+                         (CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()),
+                         (CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo("messagesAndEdits" ))
+                    )))
+                }]
+        });
+    }
+    async runInlineChatCommand(accessor, ctrl, codeEditor, hunk) {
+        const editor = getContextFromActiveEditor(accessor.get(IEditorService));
+        if (!editor) {
+            return;
+        }
+        const matchedCell = editor.notebookEditor.codeEditors.find(e => e[1] === codeEditor);
+        const cell = matchedCell?.[0];
+        if (!cell) {
+            return;
+        }
+        ctrl.acceptSession();
+        return editor.notebookEditor.executeNotebookCells(Iterable.single(cell));
+    }
+}
+registerAction2(AcceptChangesAndRun);
+
+export { AcceptChangesAndRun };

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

@@ -1,16 +1,37 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { codiconsLibrary } from 'vscode/vscode/vs/base/common/codiconsLibrary';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
+import { localize } from 'vscode/vscode/vs/nls';
+import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatContextAttachments } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
+import { ChatDynamicVariableModel } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { computeCompletionRanges } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { chatVariableLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
+import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import './cellChatActions.js';
 import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 
+const NotebookKernelVariableKey = 'kernelVariable';
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
     static { this.ID = 'workbench.contrib.notebookChatContribution'; }
-    constructor(contextKeyService, chatAgentService) {
+    constructor(contextKeyService, chatAgentService, editorService, chatWidgetService, notebookKernelService, languageFeaturesService) {
         super();
+        this.editorService = editorService;
+        this.chatWidgetService = chatWidgetService;
+        this.notebookKernelService = notebookKernelService;
+        this.languageFeaturesService = languageFeaturesService;
         this._ctxHasProvider = CTX_NOTEBOOK_CHAT_HAS_AGENT.bindTo(contextKeyService);
         const updateNotebookAgentStatus = () => {
             const hasNotebookAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Notebook));
@@ -18,10 +39,161 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
         };
         updateNotebookAgentStatus();
         this._register(chatAgentService.onDidChangeAgents(updateNotebookAgentStatus));
+        this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
+            _debugDisplayName: 'chatKernelDynamicCompletions',
+            triggerCharacters: [chatVariableLeader],
+            provideCompletionItems: async (model, position, _context, token) => {
+                const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
+                if (!widget || !widget.supportsFileReferences) {
+                    return null;
+                }
+                if (widget.location !== ChatAgentLocation.Notebook) {
+                    return null;
+                }
+                const variableNameDef = ( (new RegExp(`${chatVariableLeader}\\w*`, 'g')));
+                const range = computeCompletionRanges(model, position, variableNameDef, true);
+                if (!range) {
+                    return null;
+                }
+                const result = { suggestions: [] };
+                const afterRange = ( (new Range(
+                    position.lineNumber,
+                    range.replace.startColumn,
+                    position.lineNumber,
+                    range.replace.startColumn + `${chatVariableLeader}${NotebookKernelVariableKey}:`.length
+                )));
+                result.suggestions.push({
+                    label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
+                    insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
+                    detail: ( localize(8020, "Pick a variable from the kernel")),
+                    range,
+                    kind: 18 ,
+                    command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
+                    sortText: 'z'
+                });
+                await this.addKernelVariableCompletion(widget, result, range, token);
+                return result;
+            }
+        }));
+    }
+    async addKernelVariableCompletion(widget, result, info, token) {
+        let pattern;
+        if (info.varWord?.word && info.varWord.word.startsWith(chatVariableLeader)) {
+            pattern = info.varWord.word.toLowerCase().slice(1);
+        }
+        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 = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+        for await (const variable of variables) {
+            if (pattern && !variable.name.toLowerCase().includes(pattern)) {
+                continue;
+            }
+            result.suggestions.push({
+                label: { label: variable.name, description: variable.type },
+                insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:${variable.name} `,
+                filterText: `${chatVariableLeader}${variable.name}`,
+                range: info,
+                kind: 4 ,
+                sortText: 'z',
+                command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: info.insert, variable: variable.name }] },
+                detail: variable.type,
+                documentation: variable.value,
+            });
+        }
     }
 };
-NotebookChatContribution = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IChatAgentService))
-], NotebookChatContribution));
-registerWorkbenchContribution2(NotebookChatContribution.ID, NotebookChatContribution, WorkbenchPhase.BlockRestore);
+NotebookChatContribution = ( (__decorate([
+    ( (__param(0, IContextKeyService))),
+    ( (__param(1, IChatAgentService))),
+    ( (__param(2, IEditorService))),
+    ( (__param(3, IChatWidgetService))),
+    ( (__param(4, INotebookKernelService))),
+    ( (__param(5, ILanguageFeaturesService)))
+], NotebookChatContribution)));
+class SelectAndInsertKernelVariableAction extends Action2 {
+    constructor() {
+        super({
+            id: SelectAndInsertKernelVariableAction.ID,
+            title: ''
+        });
+    }
+    static { this.ID = 'notebook.chat.selectAndInsertKernelVariable'; }
+    async run(accessor, ...args) {
+        const editorService = accessor.get(IEditorService);
+        const notebookKernelService = accessor.get(INotebookKernelService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const notebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane)?.getViewModel()?.notebookDocument;
+        if (!notebook) {
+            return;
+        }
+        const context = args[0];
+        if (!context || !('widget' in context) || !('range' in context)) {
+            return;
+        }
+        const widget = context.widget;
+        const range = context.range;
+        const variable = context.variable;
+        if (variable !== undefined) {
+            this.addVariableReference(widget, variable, range, false);
+            return;
+        }
+        const selectedKernel = notebookKernelService.getMatchingKernel(notebook).selected;
+        const hasVariableProvider = selectedKernel?.hasVariableProvider;
+        if (!hasVariableProvider) {
+            return;
+        }
+        const variables = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+        const quickPickItems = [];
+        for await (const variable of variables) {
+            quickPickItems.push({
+                label: variable.name,
+                description: variable.value,
+                detail: variable.type,
+            });
+        }
+        const pickedVariable = await quickInputService.pick(quickPickItems, { placeHolder: 'Select a kernel variable' });
+        if (!pickedVariable) {
+            return;
+        }
+        this.addVariableReference(widget, pickedVariable.label, range, true);
+    }
+    addVariableReference(widget, variableName, range, updateText) {
+        if (range) {
+            const text = `#kernelVariable:${variableName}`;
+            if (updateText) {
+                const editor = widget.inputEditor;
+                const success = editor.executeEdits('chatInsertFile', [{ range, text: text + ' ' }]);
+                if (!success) {
+                    return;
+                }
+            }
+            widget.getContrib(ChatDynamicVariableModel.ID)?.addReference({
+                id: 'vscode.notebook.variable',
+                range: { startLineNumber: range.startLineNumber, startColumn: range.startColumn, endLineNumber: range.endLineNumber, endColumn: range.startColumn + text.length },
+                data: variableName,
+                fullName: variableName,
+                icon: codiconsLibrary.variable,
+            });
+        }
+        else {
+            widget.getContrib(ChatContextAttachments.ID)?.setContext(false, ...[{
+                    id: 'vscode.notebook.variable',
+                    name: variableName,
+                    value: variableName,
+                    icon: codiconsLibrary.variable,
+                    isDynamic: true
+                }]);
+        }
+    }
+}
+registerAction2(SelectAndInsertKernelVariableAction);
+registerWorkbenchContribution2(NotebookChatContribution.ID, NotebookChatContribution, 2 );
+
+export { SelectAndInsertKernelVariableAction };