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

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

@@ -10,24 +10,25 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/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, 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-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookChatController } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
+import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID, getContextFromActiveEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { insertNewCell } from '../insertCellActions.js';
-import { CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { 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-771c2e6d-0284-5ac1-be73-7176085eedc5-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-52bb4d5b-ba1a-57fd-9bee-b28824214eac-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 { AbstractInlineChatAction } from '@codingame/monaco-vscode-9e30237f-37af-5bbd-8bc1-5c4f2c0714b3-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-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(7575, "Make Request")),
+            title: ( localize2(7660, "Make Request")),
             icon: Codicon.send,
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -51,7 +52,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(7576, 'Cursor Up')),
+            title: ( localize(7661, 'Cursor Up')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -86,7 +87,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(7577, 'Cursor Down')),
+            title: ( localize(7662, 'Cursor Down')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -109,7 +110,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localize(7578, 'Focus Chat Widget')),
+            title: ( localize(7663, '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,
@@ -127,7 +128,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(7579, 'Focus Next Cell Chat Widget')),
+            title: ( localize(7664, '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,
@@ -146,7 +147,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2(7580, "Stop Request")),
+            title: ( localize2(7665, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -165,7 +166,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2(7581, "Close Chat")),
+            title: ( localize2(7666, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -183,10 +184,10 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(7582, "Accept Changes")),
-            shortTitle: ( localize(7583, 'Accept')),
+            title: ( localize2(7667, "Accept Changes")),
+            shortTitle: ( localize(7668, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localize(7584, 'Accept Changes')),
+            tooltip: ( localize(7669, 'Accept Changes')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -233,7 +234,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localize(7585, 'Discard')),
+            title: ( localize(7670, '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()))),
@@ -274,12 +275,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(7586, "Generate")),
+                value: '$(sparkle) ' + ( localize(7671, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(7587, "Start Chat to Generate Code")),
+            tooltip: ( localize(7672, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(7587, "Start Chat to Generate Code")),
+                description: ( localize(7672, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -361,10 +362,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(7586, "Generate")),
+                value: '$(sparkle) ' + ( localize(7671, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(7587, "Start Chat to Generate Code")),
+            tooltip: ( localize(7672, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -384,8 +385,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(7588, "Generate")),
-        tooltip: ( localize(7589, "Start Chat to Generate Code"))
+        title: ( localize(7673, "Generate")),
+        tooltip: ( localize(7674, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -395,7 +396,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localize(7590, 'Focus Chat')),
+            title: ( localize(7675, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(
@@ -427,7 +428,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(7591, 'Focus Next Cell')),
+            title: ( localize(7676, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -446,7 +447,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(7592, 'Focus Previous Cell')),
+            title: ( localize(7677, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -465,7 +466,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(7593, "Previous From History")),
+            title: ( localize2(7678, "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)),
@@ -483,7 +484,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(7594, "Next From History")),
+            title: ( localize2(7679, "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)),
@@ -501,7 +502,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2(7595, "Generate")),
+            title: ( localize2(7680, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -528,13 +529,13 @@ registerAction2(class extends NotebookCellAction {
         }
     }
 });
-class AcceptChangesAndRun extends AbstractInlineChatAction {
+class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(7596, "Accept and Run")),
-            shortTitle: ( localize(7597, 'Accept & Run')),
-            tooltip: ( localize(7598, 'Accept the changes and run the cell')),
+            title: ( localize2(7681, "Accept and Run")),
+            shortTitle: ( localize(7682, 'Accept & Run')),
+            tooltip: ( localize(7683, 'Accept the changes and run the cell')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),
@@ -547,9 +548,10 @@ class AcceptChangesAndRun extends AbstractInlineChatAction {
                 }]
         });
     }
-    async runInlineChatCommand(accessor, ctrl, codeEditor, hunk) {
+    runEditorCommand(accessor, codeEditor) {
         const editor = getContextFromActiveEditor(accessor.get(IEditorService));
-        if (!editor) {
+        const ctrl = InlineChatController.get(codeEditor);
+        if (!editor || !ctrl) {
             return;
         }
         const matchedCell = editor.notebookEditor.codeEditors.find(e => e[1] === codeEditor);

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

@@ -5,24 +5,29 @@ import { codiconsLibrary } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
+import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 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 { 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 { ChatInputPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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';
 import { computeCompletionRanges } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatVariableLeader } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/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-52bb4d5b-ba1a-57fd-9bee-b28824214eac-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-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { copyIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { getOutputViewModelFromId } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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 { CTX_NOTEBOOK_CHAT_HAS_AGENT } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 
 const NotebookKernelVariableKey = 'kernelVariable';
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
@@ -66,7 +71,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(7599, "Pick a variable from the kernel")),
+                    detail: ( localize(7684, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -76,6 +81,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 return result;
             }
         }));
+        NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT.bindTo(contextKeyService).set(['image/png']);
     }
     async addKernelVariableCompletion(widget, result, info, token) {
         let pattern;
@@ -189,11 +195,96 @@ class SelectAndInsertKernelVariableAction extends Action2 {
                 name: variableName,
                 value: variableName,
                 icon: codiconsLibrary.variable,
-                isDynamic: true
             });
         }
     }
 }
+registerAction2(class CopyCellOutputAction extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.cellOutput.addToChat',
+            title: ( localize(7685, "Add Cell Output to Chat")),
+            menu: {
+                id: MenuId.NotebookOutputToolbar,
+                when: ( ContextKeyExpr.and(
+                    NOTEBOOK_CELL_HAS_OUTPUTS,
+                    ContextKeyExpr.in(NOTEBOOK_CELL_OUTPUT_MIMETYPE.key, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT.key)
+                )),
+                order: 10
+            },
+            category: NOTEBOOK_ACTIONS_CATEGORY,
+            icon: copyIcon,
+        });
+    }
+    getNoteboookEditor(editorService, outputContext) {
+        if (outputContext && 'notebookEditor' in outputContext) {
+            return outputContext.notebookEditor;
+        }
+        return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    }
+    async run(accessor, outputContext) {
+        const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
+        if (!notebookEditor) {
+            return;
+        }
+        let outputViewModel;
+        if (outputContext && 'outputId' in outputContext && typeof outputContext.outputId === 'string') {
+            outputViewModel = getOutputViewModelFromId(outputContext.outputId, notebookEditor);
+        }
+        else if (outputContext && 'outputViewModel' in outputContext) {
+            outputViewModel = outputContext.outputViewModel;
+        }
+        if (!outputViewModel) {
+            const activeCell = notebookEditor.getActiveCell();
+            if (!activeCell) {
+                return;
+            }
+            if (activeCell.focusedOutputId !== undefined) {
+                outputViewModel = activeCell.outputsViewModels.find(output => {
+                    return output.model.outputId === activeCell.focusedOutputId;
+                });
+            }
+            else {
+                outputViewModel = activeCell.outputsViewModels.find(output => output.pickedMimeType?.isTrusted);
+            }
+        }
+        if (!outputViewModel) {
+            return;
+        }
+        const mimeType = outputViewModel.pickedMimeType?.mimeType;
+        if (mimeType === 'image/png') {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            if (!widget) {
+                return;
+            }
+            const imageOutput = outputViewModel.model.outputs.find(output => output.mime === mimeType);
+            if (!imageOutput) {
+                return;
+            }
+            const attachedVariables = widget.attachmentModel.attachments;
+            const displayName = ( localize(7686, 'Notebook Cell Output Image'));
+            let tempDisplayName = displayName;
+            for (let appendValue = 2; ( attachedVariables.some(attachment => attachment.name === tempDisplayName)); appendValue++) {
+                tempDisplayName = `${displayName} ${appendValue}`;
+            }
+            const imageData = imageOutput.data;
+            const variableEntry = {
+                kind: 'paste',
+                code: '',
+                language: '',
+                pastedLines: '',
+                fileName: 'notebook-cell-output-image-' + outputViewModel.model.outputId,
+                copiedFrom: undefined,
+                id: 'notebook-cell-output-image-' + outputViewModel.model.outputId,
+                name: tempDisplayName,
+                isImage: true,
+                value: imageData.buffer,
+            };
+            widget.attachmentModel.addContext(variableEntry);
+        }
+    }
+});
 registerAction2(SelectAndInsertKernelVariableAction);
 registerWorkbenchContribution2(NotebookChatContribution.ID, NotebookChatContribution, WorkbenchPhase.BlockRestore);
 

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

@@ -1,15 +1,15 @@
 
-import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyMod, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Mimes } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
 import { CommandExecutor } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursor/cursor';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { LineCommentCommand, Type } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/comment/browser/lineCommentCommand';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -21,15 +21,15 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { runDeleteAction, changeCellToKind } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, CELL_TITLE_OUTPUT_GROUP_ID, executeNotebookCondition, NotebookAction, NotebookMultiCellAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { runDeleteAction, changeCellToKind } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, CELL_TITLE_OUTPUT_GROUP_ID, executeNotebookCondition, NotebookAction, NotebookMultiCellAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookIndentUsingTabs, NotebookIndentUsingSpaces, NotebookChangeTabDisplaySize, NotebookIndentationToTabsAction, NotebookIndentationToSpacesAction } from './notebookIndentationActions.js';
-import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookCellExecutionState, NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_OUTPUTS } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -46,7 +46,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: EDIT_CELL_COMMAND_ID,
-            title: ( localize(7611, "Edit Cell")),
+            title: ( localize(7698, "Edit Cell")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -82,7 +82,7 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: QUIT_EDIT_CELL_COMMAND_ID,
-            title: ( localize(7612, "Stop Editing Cell")),
+            title: ( localize(7699, "Stop Editing Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE)),
@@ -123,7 +123,7 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: DELETE_CELL_COMMAND_ID,
-            title: ( localize(7613, "Delete Cell")),
+            title: ( localize(7700, "Delete Cell")),
             keybinding: {
                 primary: KeyCode.Delete,
                 mac: {
@@ -160,13 +160,13 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
         const configService = accessor.get(IConfigurationService);
         if (runState === NotebookCellExecutionState.Executing && configService.getValue(NotebookSetting.confirmDeleteRunningCell)) {
             const dialogService = accessor.get(IDialogService);
-            const primaryButton = ( localize(7614, "Delete"));
+            const primaryButton = ( localize(7701, "Delete"));
             confirmation = await dialogService.confirm({
                 type: 'question',
-                message: ( localize(7615, "This cell is running, are you sure you want to delete it?")),
+                message: ( localize(7702, "This cell is running, are you sure you want to delete it?")),
                 primaryButton: primaryButton,
                 checkbox: {
-                    label: ( localize(7616, "Do not ask me again"))
+                    label: ( localize(7703, "Do not ask me again"))
                 }
             });
         }
@@ -186,7 +186,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
     constructor() {
         super({
             id: CLEAR_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize(7617, 'Clear Cell Outputs')),
+            title: ( localize(7704, 'Clear Cell Outputs')),
             menu: [
                 {
                     id: MenuId.NotebookCellTitle,
@@ -250,7 +250,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
     constructor() {
         super({
             id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-            title: ( localize(7618, 'Clear All Outputs')),
+            title: ( localize(7705, 'Clear All Outputs')),
             precondition: NOTEBOOK_HAS_OUTPUTS,
             menu: [
                 {
@@ -307,9 +307,14 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_LANGUAGE,
-            title: ( localize(7619, 'Change Cell Language')),
+            title: ( localize(7706, 'Change Cell Language')),
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyM),
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))
+            },
             metadata: {
-                description: ( localize(7619, 'Change Cell Language')),
+                description: ( localize(7706, 'Change Cell Language')),
                 args: [
                     {
                         name: 'range',
@@ -382,10 +387,10 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
         providerLanguages.forEach(languageId => {
             let description;
             if (context.cell.cellKind === CellKind.Markup ? (languageId === 'markdown') : (languageId === context.cell.language)) {
-                description = ( localize(7620, "({0}) - Current Language", languageId));
+                description = ( localize(7707, "({0}) - Current Language", languageId));
             }
             else {
-                description = ( localize(7621, "({0})", languageId));
+                description = ( localize(7708, "({0})", languageId));
             }
             const languageName = languageService.getLanguageName(languageId);
             if (!languageName) {
@@ -408,16 +413,16 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             return a.description.localeCompare(b.description);
         });
         const autoDetectMode = {
-            label: ( localize(7622, "Auto Detect"))
+            label: ( localize(7709, "Auto Detect"))
         };
         const picks = [
             autoDetectMode,
-            { type: 'separator', label: ( localize(7623, "languages (identifier)")) },
+            { type: 'separator', label: ( localize(7710, "languages (identifier)")) },
             ...topItems,
             { type: 'separator' },
             ...mainItems
         ];
-        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(7624, "Select Language Mode")) });
+        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(7711, "Select Language Mode")) });
         const languageId = selection === autoDetectMode
             ? await languageDetectionService.detectLanguage(context.cell.uri)
             : selection?.languageId;
@@ -450,7 +455,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: ( localize2(7625, "Accept Detected Language for Cell")),
+            title: ( localize2(7712, "Accept Detected Language for Cell")),
             f1: true,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
             keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
@@ -468,7 +473,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
             setCellToLanguage(detection, context);
         }
         else {
-            notificationService.warn(( localize(7626, "Unable to detect cell language")));
+            notificationService.warn(( localize(7713, "Unable to detect cell language")));
         }
     }
 });
@@ -493,7 +498,7 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
     constructor() {
         super({
             id: SELECT_NOTEBOOK_INDENTATION_ID,
-            title: ( localize2(7627, 'Select Indentation')),
+            title: ( localize2(7714, 'Select Indentation')),
             f1: true,
             precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -511,10 +516,10 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
         const instantiationService = accessor.get(IInstantiationService);
         const activeNotebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!activeNotebook || activeNotebook.isDisposed) {
-            return quickInputService.pick([{ label: ( localize(7628, "No notebook editor active at this time")) }]);
+            return quickInputService.pick([{ label: ( localize(7715, "No notebook editor active at this time")) }]);
         }
         if (activeNotebook.isReadOnly) {
-            return quickInputService.pick([{ label: ( localize(7629, "The active notebook editor is read-only.")) }]);
+            return quickInputService.pick([{ label: ( localize(7716, "The active notebook editor is read-only.")) }]);
         }
         const picks = ( [
             (
@@ -536,9 +541,9 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
                 }
             };
         }));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(7630, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(7631, "change view")) });
-        const action = await quickInputService.pick(picks, { placeHolder: ( localize(7632, "Select Action")), matchOnDetail: true });
+        picks.splice(3, 0, { type: 'separator', label: ( localize(7717, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(7718, "change view")) });
+        const action = await quickInputService.pick(picks, { placeHolder: ( localize(7719, "Select Action")), matchOnDetail: true });
         if (!action) {
             return;
         }
@@ -551,7 +556,7 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: COMMENT_SELECTED_CELLS_ID,
-            title: ( localize(7633, "Comment Selected Cells")),
+            title: ( localize(7720, "Comment Selected Cells")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,