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

package/index.js

@@ -28,14 +28,10 @@ import { INotebookSearchService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { NotebookSearchService } from '@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
 import { NotebookDocumentWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService';
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
-import { INotebookSynchronizerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookSynchronizerService.service';
-import { NotebookSynchronizerService } from './vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.js';
-import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.service';
-import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service';
-import { NotebookOriginalModelReferenceFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.js';
-import { INotebookModelSynchronizerFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.service';
-import { NotebookModelSynchronizerFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.js';
-import { OriginalNotebookCellModelFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.js';
+import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.service';
+import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.service';
+import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
+import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
 import './vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js';
 
 function getServiceOverride() {
@@ -54,10 +50,8 @@ function getServiceOverride() {
         [INotebookLoggingService.toString()]: new SyncDescriptor(NotebookLoggingService, [], true),
         [INotebookSearchService.toString()]: new SyncDescriptor(NotebookSearchService, [], true),
         [INotebookDocumentService.toString()]: new SyncDescriptor(NotebookDocumentWorkbenchService, [], true),
-        [INotebookSynchronizerService.toString()]: new SyncDescriptor(NotebookSynchronizerService, [], true),
         [INotebookOriginalCellModelFactory.toString()]: new SyncDescriptor(OriginalNotebookCellModelFactory, [], true),
-        [INotebookOriginalModelReferenceFactory.toString()]: new SyncDescriptor(NotebookOriginalModelReferenceFactory, [], true),
-        [INotebookModelSynchronizerFactory.toString()]: new SyncDescriptor(NotebookModelSynchronizerFactory, [], true)
+        [INotebookOriginalModelReferenceFactory.toString()]: new SyncDescriptor(NotebookOriginalModelReferenceFactory, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - notebook service-override",
   "keywords": [],
@@ -15,31 +15,29 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "15.0.2",
-    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "15.0.2",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.2",
-    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "15.0.2",
-    "@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common": "15.0.2",
-    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "15.0.2",
-    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.2",
-    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "15.0.2",
-    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "15.0.2",
-    "@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common": "15.0.2",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.2",
-    "@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "15.0.2",
-    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "15.0.2",
-    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "15.0.2",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.2",
-    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "15.0.2",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "15.0.2",
-    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "15.0.2",
-    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "15.0.2",
-    "@codingame/monaco-vscode-a3f28a41-ba19-5a7e-8f5a-d6c1403b507d-common": "15.0.2",
-    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "15.0.2",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "15.0.2",
-    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "15.0.2",
+    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "16.0.0",
+    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "16.0.0",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.0",
+    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "16.0.0",
+    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "16.0.0",
+    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "16.0.0",
+    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "16.0.0",
+    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "16.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.0.0",
+    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.0.0",
+    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "16.0.0",
+    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "16.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "16.0.0",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "16.0.0",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "16.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "16.0.0",
+    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.0.0",
+    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.0.0",
+    "@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common": "16.0.0",
+    "@codingame/monaco-vscode-a3f28a41-ba19-5a7e-8f5a-d6c1403b507d-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "16.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",
@@ -49,6 +47,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.css

@@ -0,0 +1,6 @@
+.monaco-editor .contentWidgets .empty-editor-hint {
+	color: var(--vscode-input-placeholderForeground);
+}
+.monaco-editor .contentWidgets .empty-editor-hint a {
+	color: var(--vscode-textLink-foreground)
+}

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import './emptyTextEditorHint.css.js';
+import './emptyTextEditorHint.css';
 import { $ as $$1, getActiveWindow, addDisposableListener, EventType } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ContentWidgetPositionPreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
@@ -28,10 +28,10 @@ import { OUTPUT_MODE_ID, LOG_MODE_ID } from '@codingame/monaco-vscode-api/vscode
 import { SEARCH_RESULT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-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 { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 const $ = $$1;
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
@@ -196,8 +196,8 @@ class EmptyTextEditorHintContentWidget {
             getActions: () => {
                 return [{
                         id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localize(4918, "Disable Empty Editor Hint")),
-                        tooltip: ( localize(4918, "Disable Empty Editor Hint")),
+                        label: ( localize(5052, "Disable Empty Editor Hint")),
+                        tooltip: ( localize(5052, "Disable Empty Editor Hint")),
                         enabled: true,
                         class: undefined,
                         run: () => {
@@ -235,7 +235,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingHintLabel = keybindingHint?.getLabel();
         if (keybindingHint && keybindingHintLabel) {
             const actionPart = ( localize(
-                4919,
+                5053,
                 'Press {0} to ask {1} to do something. ',
                 keybindingHintLabel,
                 providerName
@@ -266,7 +266,7 @@ class EmptyTextEditorHintContentWidget {
                 this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
-            const typeToDismiss = ( localize(4920, 'Start typing to dismiss.'));
+            const typeToDismiss = ( localize(5054, 'Start typing to dismiss.'));
             const textHint2 = $('span', undefined, typeToDismiss);
             textHint2.style.fontStyle = 'italic';
             hintElement.appendChild(textHint2);
@@ -274,7 +274,7 @@ class EmptyTextEditorHintContentWidget {
         }
         else {
             const hintMsg = ( localize(
-                4921,
+                5055,
                 '[[Ask {0} to do something]] or start typing to dismiss.',
                 providerName
             ));
@@ -334,7 +334,7 @@ class EmptyTextEditorHintContentWidget {
             }
         };
         const hintMsg = ( localize(
-            4922,
+            5056,
             '[[Select a language]], or [[fill with template]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.'
         ));
         const hintElement = renderFormattedText(hintMsg, {
@@ -345,7 +345,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingsLookup = [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
         const keybindingLabels = ( keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id));
         const ariaLabel = ( localize(
-            4923,
+            5057,
             'Execute {0} to select a language, execute {1} to fill with template, or execute {2} to open a different editor and get started. Start typing to dismiss.',
             ...keybindingLabels
         ));
@@ -366,7 +366,7 @@ class EmptyTextEditorHintContentWidget {
             const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localize(
-                4924,
+                5058,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));

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

@@ -12,7 +12,7 @@ import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9a6d8b6c-ad4c
 import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { NotebookCellAction, CellOverflowToolbarGroups, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellEditType, CellKind, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
@@ -27,7 +27,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: ( localize2(7540, "Move Cell Up")),
+            title: ( localize2(7817, "Move Cell Up")),
             icon: moveUpIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.UpArrow,
@@ -50,7 +50,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(7541, "Move Cell Down")),
+            title: ( localize2(7818, "Move Cell Down")),
             icon: moveDownIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.DownArrow,
@@ -73,7 +73,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: ( localize2(7542, "Copy Cell Up")),
+            title: ( localize2(7819, "Copy Cell Up")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -89,7 +89,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(7543, "Copy Cell Down")),
+            title: ( localize2(7820, "Copy Cell Down")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -115,7 +115,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: ( localize2(7544, "Split Cell")),
+            title: ( localize2(7821, "Split Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()))),
@@ -182,7 +182,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize2(7545, "Join With Previous Cell")),
+            title: ( localize2(7822, "Join With Previous Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
@@ -205,7 +205,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: ( localize2(7546, "Join With Next Cell")),
+            title: ( localize2(7823, "Join With Next Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
@@ -228,7 +228,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: ( localize2(7547, "Join Selected Cells")),
+            title: ( localize2(7824, "Join Selected Cells")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
@@ -249,7 +249,7 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: ( localize2(7548, "Change Cell to Code")),
+            title: ( localize2(7825, "Change Cell to Code")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -280,7 +280,7 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: ( localize2(7549, "Change Cell to Markdown")),
+            title: ( localize2(7826, "Change Cell to Markdown")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -319,7 +319,7 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(7550, "Collapse Cell Input")),
+            title: ( localize2(7827, "Collapse Cell Input")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()))),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
@@ -343,7 +343,7 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(7551, "Expand Cell Input")),
+            title: ( localize2(7828, "Expand Cell Input")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
@@ -367,7 +367,7 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(7552, "Collapse Cell Output")),
+            title: ( localize2(7829, "Collapse Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
@@ -388,7 +388,7 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(7553, "Expand Cell Output")),
+            title: ( localize2(7830, "Expand Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
@@ -410,9 +410,9 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: ( localize2(7554, "Toggle Outputs")),
+            title: ( localize2(7831, "Toggle Outputs")),
             metadata: {
-                description: ( localize(7554, "Toggle Outputs")),
+                description: ( localize(7831, "Toggle Outputs")),
                 args: cellExecutionArgs
             }
         });
@@ -437,7 +437,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(7555, "Collapse All Cell Inputs")),
+            title: ( localize2(7832, "Collapse All Cell Inputs")),
             f1: true,
         });
     }
@@ -449,7 +449,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(7556, "Expand All Cell Inputs")),
+            title: ( localize2(7833, "Expand All Cell Inputs")),
             f1: true
         });
     }
@@ -461,7 +461,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(7557, "Collapse All Cell Outputs")),
+            title: ( localize2(7834, "Collapse All Cell Outputs")),
             f1: true,
         });
     }
@@ -473,7 +473,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(7558, "Expand All Cell Outputs")),
+            title: ( localize2(7835, "Expand All Cell Outputs")),
             f1: true
         });
     }
@@ -485,7 +485,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: ( localize2(7559, "Toggle Scroll Cell Output")),
+            title: ( localize2(7836, "Toggle Scroll Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyY),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.d.ts

@@ -15,6 +15,7 @@ export declare class CellDiagnostics extends Disposable implements INotebookEdit
     private listening;
     private diagnosticsByHandle;
     constructor(notebookEditor: INotebookEditor, notebookExecutionStateService: INotebookExecutionStateService, markerService: IMarkerService, chatAgentService: IChatAgentService, configurationService: IConfigurationService);
+    private hasNotebookAgent;
     private updateEnabled;
     private handleChangeExecutionState;
     private clearAll;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js

@@ -7,10 +7,10 @@ import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vsc
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { CodeCellViewModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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';
 
 var CellDiagnostics_1;
 let CellDiagnostics = class CellDiagnostics extends Disposable {
@@ -34,13 +34,17 @@ let CellDiagnostics = class CellDiagnostics extends Disposable {
             }
         }));
     }
+    hasNotebookAgent() {
+        const agents = this.chatAgentService.getAgents();
+        return !!agents.find(agent => agent.locations.includes(ChatAgentLocation.Notebook));
+    }
     updateEnabled() {
         const settingEnabled = this.configurationService.getValue(NotebookSetting.cellFailureDiagnostics);
-        if (this.enabled && (!settingEnabled || Iterable.isEmpty(this.chatAgentService.getAgents()))) {
+        if (this.enabled && (!settingEnabled || !this.hasNotebookAgent())) {
             this.enabled = false;
             this.clearAll();
         }
-        else if (!this.enabled && settingEnabled && !Iterable.isEmpty(this.chatAgentService.getAgents())) {
+        else if (!this.enabled && settingEnabled && this.hasNotebookAgent()) {
             this.enabled = true;
             if (!this.listening) {
                 this.listening = true;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js

@@ -9,7 +9,7 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { NotebookCellAction, findTargetCellEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CodeCellViewModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { showChatView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -21,7 +21,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-            title: ( localize2(7560, "Show Cell Failure Actions")),
+            title: ( localize2(7837, "Show Cell Failure Actions")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true,
             keybinding: {
@@ -45,7 +45,7 @@ registerAction2(class extends NotebookCellAction {
                 const editor = findTargetCellEditor(context, context.cell);
                 if (editor) {
                     const controller = CodeActionController.get(editor);
-                    controller?.manualTriggerAtCurrentPosition(( localize(7561, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                    controller?.manualTriggerAtCurrentPosition(( localize(7838, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
                 }
             }
         }
@@ -55,7 +55,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FIX_CELL_ERROR_COMMAND_ID,
-            title: ( localize2(7562, "Fix Cell Error")),
+            title: ( localize2(7839, "Fix Cell Error")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true
         });
@@ -87,7 +87,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: EXPLAIN_CELL_ERROR_COMMAND_ID,
-            title: ( localize2(7563, "Explain Cell Error")),
+            title: ( localize2(7840, "Explain Cell Error")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js

@@ -11,7 +11,7 @@ import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-
 import { CodeCellViewModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellStatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
@@ -37,11 +37,15 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
         this._currentItemIds = [];
         this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.executionErrorDiagnostic))));
     }
+    hasNotebookAgent() {
+        const agents = this.chatAgentService.getAgents();
+        return !!agents.find(agent => agent.locations.includes(ChatAgentLocation.Notebook));
+    }
     async updateSparkleItem(error) {
         let item;
-        if (error?.location && !Iterable.isEmpty(this.chatAgentService.getAgents())) {
+        if (error?.location && this.hasNotebookAgent()) {
             const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localize(7564, "Quick Actions {0}", `(${keybinding})`));
+            const tooltip = ( localize(7841, "Quick Actions {0}", `(${keybinding})`));
             item = {
                 text: `$(sparkle)`,
                 tooltip,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -41,7 +41,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
             }
             else {
                 const searchTooltip = ( localize(
-                    7572,
+                    7849,
                     "Unknown cell language. Click to search for '{0}' extensions",
                     cell.language
                 ));
@@ -57,7 +57,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         statusBarItems.push({
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
-            tooltip: ( localize(7573, "Select Cell Language Mode")),
+            tooltip: ( localize(7850, "Select Cell Language Mode")),
             alignment: CellStatusbarAlignment.Right,
             priority: -Number.MAX_SAFE_INTEGER
         });
@@ -121,7 +121,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         const items = [];
         if (cached.guess && currentLanguageId !== cached.guess) {
             const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-            let tooltip = ( localize(7574, "Accept Detected Language: {0}", detectedName));
+            let tooltip = ( localize(7851, "Accept Detected Language: {0}", detectedName));
             const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
             const label = keybinding?.getLabel();
             if (label) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -4,7 +4,7 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
@@ -350,7 +350,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_COMMAND_ID,
-            title: ( localize(7576, "Copy Cell")),
+            title: ( localize(7852, "Copy Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
@@ -373,7 +373,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: CUT_CELL_COMMAND_ID,
-            title: ( localize(7577, "Cut Cell")),
+            title: ( localize(7853, "Cut Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
@@ -396,7 +396,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: PASTE_CELL_COMMAND_ID,
-            title: ( localize(7578, "Paste Cell")),
+            title: ( localize(7854, "Paste Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
@@ -428,7 +428,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: PASTE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(7579, "Paste Cell Above")),
+            title: ( localize(7855, "Paste Cell Above")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
@@ -472,7 +472,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: ( localize2(7580, 'Toggle Notebook Clipboard Troubleshooting')),
+            title: ( localize2(7856, 'Toggle Notebook Clipboard Troubleshooting')),
             category: Categories.Developer,
             f1: true
         });
@@ -489,7 +489,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.output.selectAll',
-            title: ( localize(7581, "Select All")),
+            title: ( localize(7857, "Select All")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.KeyA,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),