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

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

@@ -1,12 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
-import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { outputDisplayLimit } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-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 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
+import { cellRangesToIndexes } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
 let NotebookViewportContribution = class NotebookViewportContribution extends Disposable {
@@ -82,7 +83,7 @@ let NotebookViewportContribution = class NotebookViewportContribution extends Di
             if (!renderer) {
                 return;
             }
-            const result = { type: 1 , renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
+            const result = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
             this._notebookEditor.createOutput(viewCell, result, 0, true);
         }
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/apiActions.d.ts

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

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

@@ -1,3 +1,4 @@
+
 import { isRelativePattern } from 'vscode/vscode/vs/base/common/glob';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';

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

@@ -0,0 +1,9 @@
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { AbstractInlineChatAction } from "@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions";
+import { InlineChatController } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController";
+import { HunkInformation } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
+export declare class AcceptChangesAndRun extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, codeEditor: ICodeEditor, hunk?: HunkInformation | any): Promise<void>;
+}

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

@@ -1,5 +1,6 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyMod, 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,39 +9,36 @@ 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 { 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 '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/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 '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID, getContextFromActiveEditor } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+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, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, EditMode, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/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 '@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-e28ac690-06d5-5ee9-92d1-02df70296354-common/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 { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/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, IS_COMPOSITE_NOTEBOOK, 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 '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/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 '@codingame/monaco-vscode-chat-notebook-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { AbstractInlineChatAction } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2(10957, "Make Request")),
+            title: ( localize2(7412, "Make Request")),
             icon: Codicon.send,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
-                    CTX_INLINE_CHAT_FOCUSED,
-                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
-                ))),
-                weight: 200 ,
-                primary: 3
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Enter
             },
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
                 group: 'navigation',
                 order: 1,
-                when: ( (CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate()))
+                when: ( CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate())
             },
             f1: false
         });
@@ -53,17 +51,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(10958, 'Cursor Up')),
+            title: ( localize(7413, 'Cursor Up')),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
-                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                ))),
-                weight: 0  + 7,
-                primary: 2048  | 16
+                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                )),
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
             },
             f1: false
         });
@@ -88,17 +86,17 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(10959, 'Cursor Down')),
+            title: ( localize(7414, 'Cursor Down')),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_LAST,
-                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                ))),
-                weight: 0  + 7,
-                primary: 2048  | 18
+                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                )),
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
             },
             f1: false
         });
@@ -111,21 +109,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localize(10960, 'Focus Chat Widget')),
+            title: ( localize(7415, '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: 0  + 7,
-                primary: 2048  | 16
+                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,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
             },
             f1: false
         });
@@ -139,29 +127,14 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(10961, 'Focus Next Cell Chat Widget')),
+            title: ( localize(7416, '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: 0  + 7,
-                primary: 2048  | 18
+                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,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
             },
             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())
-            )))))
+            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) {
@@ -173,7 +146,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2(10962, "Stop Request")),
+            title: ( localize2(7417, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -192,7 +165,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2(10963, "Close Chat")),
+            title: ( localize2(7418, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -210,39 +183,35 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(10964, "Accept Changes")),
-            shortTitle: ( localize(10965, 'Accept')),
+            title: ( localize2(7419, "Accept Changes")),
+            shortTitle: ( localize(7420, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localize(10966, 'Accept Changes')),
+            tooltip: ( localize(7421, 'Accept Changes')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
-                        CTX_INLINE_CHAT_FOCUSED,
-                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
-                    ))),
-                    weight: 100  + 10,
-                    primary: 2048  | 3 ,
+                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                    weight: KeybindingWeight.EditorContrib + 10,
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                         CTX_INLINE_CHAT_FOCUSED,
                         CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
-                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
-                    ))),
-                    weight: 0  + 10,
-                    primary: 9
+                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+                    )),
+                    weight: KeybindingWeight.EditorCore + 10,
+                    primary: KeyCode.Escape
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    ))),
-                    primary: 2048  | 3 ,
-                    weight: 200
+                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
+                    )),
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             menu: [
@@ -250,7 +219,7 @@ registerAction2(class extends NotebookAction {
                     id: MENU_CELL_CHAT_WIDGET_STATUS,
                     group: '0_main',
                     order: 0,
-                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo("messages" ))),
+                    when: ( CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages)),
                 }
             ],
             f1: false
@@ -264,17 +233,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localize(10967, 'Discard')),
+            title: ( localize(7422, '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())
-                ))),
-                weight: 100 ,
-                primary: 9
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()), ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape
             },
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_STATUS,
@@ -310,12 +274,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(10968, "Generate")),
+                value: '$(sparkle) ' + ( localize(7423, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(10969, "Start Chat to Generate Code")),
+            tooltip: ( localize(7424, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(10969, "Start Chat to Generate Code")),
+                description: ( localize(7424, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -339,33 +303,17 @@ registerAction2(class extends NotebookAction {
             },
             f1: false,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_EDITOR_FOCUSED,
-                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                    ContextKeyExpr.not(InputFocusedContextKey),
-                    CTX_NOTEBOOK_CHAT_HAS_AGENT,
-                     (ContextKeyExpr.or(
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
-                    ))
-                ))),
-                weight: 200 ,
-                primary: 2048  | 39 ,
-                secondary: [KeyChord(2048  | 41 , 39 )],
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ContextKeyExpr.not(InputFocusedContextKey), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)))))),
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyI,
+                secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
             },
             menu: [
                 {
                     id: MenuId.NotebookCellBetween,
                     group: 'inline',
                     order: -1,
-                    when: ( (ContextKeyExpr.and(
-                         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                        CTX_NOTEBOOK_CHAT_HAS_AGENT,
-                         (ContextKeyExpr.or(
-                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
-                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
-                        ))
-                    )))
+                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
                 }
             ]
         });
@@ -413,24 +361,17 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(10968, "Generate")),
+                value: '$(sparkle) ' + ( localize(7423, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(10969, "Start Chat to Generate Code")),
+            tooltip: ( localize(7424, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
                     id: MenuId.NotebookCellListTop,
                     group: 'inline',
                     order: -1,
-                    when: ( (ContextKeyExpr.and(
-                         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                        CTX_NOTEBOOK_CHAT_HAS_AGENT,
-                         (ContextKeyExpr.or(
-                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
-                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
-                        ))
-                    )))
+                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
                 },
             ]
         });
@@ -443,45 +384,36 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(10970, "Generate")),
-        tooltip: ( localize(10971, "Start Chat to Generate Code"))
+        title: ( localize(7425, "Generate")),
+        tooltip: ( localize(7426, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
-    when: ( (ContextKeyExpr.and(
-         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-         (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')),
-         (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')),
-        CTX_NOTEBOOK_CHAT_HAS_AGENT,
-         (ContextKeyExpr.or(
-             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
-             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
-        ))
-    )))
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
 });
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localize(10972, 'Focus Chat')),
+            title: ( localize(7427, 'Focus Chat')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
-                    ))),
-                    primary: 2048  | 18 ,
-                    weight: 200
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
+                    )),
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    ))),
-                    primary: 2048  | 16 ,
-                    weight: 200
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
+                    )),
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -495,12 +427,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(10973, 'Focus Next Cell')),
+            title: ( localize(7428, 'Focus Next Cell')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: 2048  | 18 ,
-                    weight: 200
+                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -514,12 +446,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(10974, 'Focus Previous Cell')),
+            title: ( localize(7429, 'Focus Previous Cell')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: 2048  | 16 ,
-                    weight: 200
+                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -533,12 +465,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(10975, "Previous From History")),
-            precondition: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
+            title: ( localize2(7430, "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: 0  + 10,
-                primary: 16 ,
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.UpArrow,
             },
             f1: false
         });
@@ -551,12 +483,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(10976, "Next From History")),
-            precondition: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
+            title: ( localize2(7431, "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: 0  + 10,
-                primary: 18
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.DownArrow
             },
             f1: false
         });
@@ -569,18 +501,13 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2(10977, "Generate")),
+            title: ( localize2(7432, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
                 group: CELL_TITLE_CELL_GROUP_ID,
                 order: 0,
-                when: ( (ContextKeyExpr.and(
-                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                    CTX_NOTEBOOK_CHAT_HAS_AGENT,
-                    NOTEBOOK_CELL_GENERATED_BY_CHAT,
-                     (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
-                )))
+                when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, NOTEBOOK_CELL_GENERATED_BY_CHAT, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
             },
             f1: false
         });
@@ -605,30 +532,18 @@ class AcceptChangesAndRun extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(10978, "Accept and Run")),
-            shortTitle: ( localize(10979, 'Accept & Run')),
-            tooltip: ( localize(10980, 'Accept the changes and run the cell')),
+            title: ( localize2(7433, "Accept and Run")),
+            shortTitle: ( localize(7434, 'Accept & Run')),
+            tooltip: ( localize(7435, '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" ))
-                ))
-            ))),
+            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(EditMode.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" ))
-                    )))
+                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ChatContextKeys.inputHasText.toNegated()), ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits))))
                 }]
         });
     }

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

@@ -0,0 +1,8 @@
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class SelectAndInsertKernelVariableAction extends Action2 {
+    constructor();
+    static readonly ID = "notebook.chat.selectAndInsertKernelVariable";
+    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+    private addVariableReference;
+}