@codingame/monaco-vscode-notebook-service-override 15.0.2 → 16.0.0

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

@@ -26,7 +26,7 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
@@ -65,7 +65,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localize(7656, "Formatting")) });
+        progress.report({ message: ( localize(7932, "Formatting")) });
         const notebook = workingCopy.model.notebookModel;
         const formatApplied = await this.instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, progress, token);
         const disposable = ( new DisposableStore());
@@ -83,7 +83,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
                     }
                     return [];
                 })));
-                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7657, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7933, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -152,7 +152,7 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends Notebook
                 return ( ops.map(op => ( new ResourceTextEdit(model.uri, { ...op, text: op.text || '' }, model.getVersionId()))));
             })));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7658, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7934, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -229,7 +229,7 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
                 ));
             })));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7659, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7935, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -283,7 +283,7 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
                 )), text: cell.textBuffer.getEOL() }, cell.textModel?.getVersionId()));
             })));
             const filteredEdits = allCellEdits.filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7660, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7936, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
             if (activeCellEditor && selections) {
                 activeCellEditor.setSelections(selections);
             }
@@ -339,7 +339,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const notebookCodeActionsOnSave = includedActions.filter(x => CodeActionKind.Notebook.contains(x));
         if (notebookCodeActionsOnSave.length) {
             const nbDisposable = ( new DisposableStore());
-            progress.report({ message: ( localize(7661, "Running 'Notebook' code actions")) });
+            progress.report({ message: ( localize(7937, "Running 'Notebook' code actions")) });
             try {
                 const cell = notebookModel.cells[0];
                 const ref = await this.textModelService.createModelReference(cell.uri);
@@ -371,7 +371,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
                 });
             }
             const cellDisposable = ( new DisposableStore());
-            progress.report({ message: ( localize(7662, "Running 'Cell' code actions")) });
+            progress.report({ message: ( localize(7938, "Running 'Cell' code actions")) });
             try {
                 await Promise.all(( notebookModel.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
@@ -411,7 +411,7 @@ class CodeActionParticipantUtils {
         const configurationService = accessor.get(IConfigurationService);
         const formatDisposable = ( new DisposableStore());
         let formatResult = false;
-        progress.report({ message: ( localize(7663, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(7939, "Running 'Format' code actions")) });
         try {
             const cell = notebookModel.cells[0];
             const ref = await textModelService.createModelReference(cell.uri);
@@ -440,7 +440,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        7664,
+                        7940,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.codeActionsOnSave%22%5D'
@@ -480,7 +480,7 @@ class CodeActionParticipantUtils {
                         logService.warn('Failed to apply code action on save, applied to multiple resources.');
                         continue;
                     }
-                    progress.report({ message: ( localize(7665, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(7941, "Applying code action '{0}'.", action.action.title)) });
                     await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -505,7 +505,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        7664,
+                        7940,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.defaultFormatter%22%5D'
@@ -532,7 +532,7 @@ class CodeActionParticipantUtils {
             if (!action) {
                 return false;
             }
-            progress.report({ message: ( localize(7665, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(7941, "Applying code action '{0}'.", action.action.title)) });
             await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
             if (token.isCancellationRequested) {
                 return false;

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

@@ -95,7 +95,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(7666, "Toggle Layout Troubleshoot")),
+            title: ( localize2(7942, "Toggle Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -114,7 +114,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(7667, "Inspect Notebook Layout")),
+            title: ( localize2(7943, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -135,7 +135,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(7668, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(7944, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -17,7 +17,7 @@ import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL
 import { insertNewCell } from '../insertCellActions.js';
 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-52bb4d5b-ba1a-57fd-9bee-b28824214eac-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-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-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';
@@ -28,7 +28,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2(7674, "Make Request")),
+            title: ( localize2(7950, "Make Request")),
             icon: Codicon.send,
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -52,7 +52,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(7675, 'Cursor Up')),
+            title: ( localize(7951, 'Cursor Up')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -87,7 +87,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(7676, 'Cursor Down')),
+            title: ( localize(7952, 'Cursor Down')),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -110,7 +110,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localize(7677, 'Focus Chat Widget')),
+            title: ( localize(7953, 'Focus Chat Widget')),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
                 weight: KeybindingWeight.EditorCore + 7,
@@ -128,7 +128,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(7678, 'Focus Next Cell Chat Widget')),
+            title: ( localize(7954, 'Focus Next Cell Chat Widget')),
             keybinding: {
                 when: ( ContextKeyExpr.and(( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
                 weight: KeybindingWeight.EditorCore + 7,
@@ -147,7 +147,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2(7679, "Stop Request")),
+            title: ( localize2(7955, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -166,7 +166,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2(7680, "Close Chat")),
+            title: ( localize2(7956, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -184,10 +184,10 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(7681, "Accept Changes")),
-            shortTitle: ( localize(7682, 'Accept')),
+            title: ( localize2(7957, "Accept Changes")),
+            shortTitle: ( localize(7958, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localize(7683, 'Accept Changes')),
+            tooltip: ( localize(7959, 'Accept Changes')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -234,7 +234,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localize(7684, 'Discard')),
+            title: ( localize(7960, 'Discard')),
             icon: Codicon.discard,
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()), ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
@@ -275,12 +275,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(7685, "Generate")),
+                value: '$(sparkle) ' + ( localize(7961, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(7686, "Start Chat to Generate Code")),
+            tooltip: ( localize(7962, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(7686, "Start Chat to Generate Code")),
+                description: ( localize(7962, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -362,10 +362,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(7685, "Generate")),
+                value: '$(sparkle) ' + ( localize(7961, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(7686, "Start Chat to Generate Code")),
+            tooltip: ( localize(7962, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -385,8 +385,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(7687, "Generate")),
-        tooltip: ( localize(7688, "Start Chat to Generate Code"))
+        title: ( localize(7963, "Generate")),
+        tooltip: ( localize(7964, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -396,7 +396,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localize(7689, 'Focus Chat')),
+            title: ( localize(7965, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(
@@ -428,7 +428,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(7690, 'Focus Next Cell')),
+            title: ( localize(7966, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -447,7 +447,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(7691, 'Focus Previous Cell')),
+            title: ( localize(7967, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -466,7 +466,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(7692, "Previous From History")),
+            title: ( localize2(7968, "Previous From History")),
             precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -484,7 +484,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(7693, "Next From History")),
+            title: ( localize2(7969, "Next From History")),
             precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
@@ -502,7 +502,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2(7694, "Generate")),
+            title: ( localize2(7970, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -533,9 +533,9 @@ class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(7695, "Accept and Run")),
-            shortTitle: ( localize(7696, 'Accept & Run')),
-            tooltip: ( localize(7697, 'Accept the changes and run the cell')),
+            title: ( localize2(7971, "Accept and Run")),
+            shortTitle: ( localize(7972, 'Accept & Run')),
+            tooltip: ( localize(7973, 'Accept the changes and run the cell')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),

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

@@ -15,21 +15,34 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 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-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 { ChatDynamicVariableModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { computeCompletionRanges } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { chatVariableLeader } from '@codingame/monaco-vscode-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 { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-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-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 { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import './cellChatActions.js';
 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';
+const NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST = ['text/plain', 'text/html',
+    'application/vnd.code.notebook.error',
+    'application/vnd.code.notebook.stdout',
+    'application/x.notebook.stdout',
+    'application/x.notebook.stream',
+    'application/vnd.code.notebook.stderr',
+    'application/x.notebook.stderr',
+    'image/png',
+    'image/jpeg',
+    'image/svg',
+];
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
     static { this.ID = 'workbench.contrib.notebookChatContribution'; }
     constructor(contextKeyService, chatAgentService, editorService, chatWidgetService, notebookKernelService, languageFeaturesService) {
@@ -71,7 +84,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(7698, "Pick a variable from the kernel")),
+                    detail: ( localize(7974, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -81,7 +94,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 return result;
             }
         }));
-        NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT.bindTo(contextKeyService).set(['image/png']);
+        NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT.bindTo(contextKeyService).set(NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST);
     }
     async addKernelVariableCompletion(widget, result, info, token) {
         let pattern;
@@ -203,7 +216,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOutput.addToChat',
-            title: ( localize(7699, "Add Cell Output to Chat")),
+            title: ( localize(7975, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(
@@ -214,6 +227,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             },
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon,
+            precondition: ChatContextKeys.enabled
         });
     }
     getNoteboookEditor(editorService, outputContext) {
@@ -252,36 +266,45 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             return;
         }
         const mimeType = outputViewModel.pickedMimeType?.mimeType;
-        if (mimeType === 'image/png') {
-            const chatWidgetService = accessor.get(IChatWidgetService);
-            const widget = chatWidgetService.lastFocusedWidget;
-            if (!widget) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        let widget = chatWidgetService.lastFocusedWidget;
+        if (!widget) {
+            const widgets = chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel);
+            if (widgets.length === 0) {
                 return;
             }
-            const imageOutput = outputViewModel.model.outputs.find(output => output.mime === mimeType);
-            if (!imageOutput) {
+            widget = widgets[0];
+        }
+        if (mimeType && NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST.includes(mimeType)) {
+            const cellFromViewModelHandle = outputViewModel.cellViewModel.handle;
+            const cell = notebookEditor.getCellByHandle(cellFromViewModelHandle);
+            if (!cell) {
                 return;
             }
-            const attachedVariables = widget.attachmentModel.attachments;
-            const displayName = ( localize(7700, 'Notebook Cell Output Image'));
-            let tempDisplayName = displayName;
-            for (let appendValue = 2; ( attachedVariables.some(attachment => attachment.name === tempDisplayName)); appendValue++) {
-                tempDisplayName = `${displayName} ${appendValue}`;
+            const cellUri = cell.uri;
+            const outputId = outputViewModel?.model.outputId;
+            let outputIndex = 0;
+            if (outputId !== undefined) {
+                outputIndex = cell.outputsViewModels.findIndex(output => {
+                    return output.model.outputId === outputId;
+                });
+            }
+            let notebookUri = notebookEditor.textModel?.uri;
+            if (!notebookUri) {
+                const parsedCellUri = CellUri.parse(cellUri);
+                notebookUri = parsedCellUri?.notebook;
+                if (!notebookUri) {
+                    return;
+                }
             }
-            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,
+            const outputCellUri = CellUri.generateCellOutputUriWithIndex(notebookUri, cellUri, outputIndex);
+            const l = {
+                value: outputCellUri,
+                id: ( outputCellUri.toString()),
+                name: ( outputCellUri.toString()),
+                isFile: true,
             };
-            widget.attachmentModel.addContext(variableEntry);
+            widget.attachmentModel.addContext(l);
         }
     }
 });