@codingame/monaco-vscode-notebook-service-override 22.1.8 → 23.0.0

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

@@ -1,258 +1,25 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { KeyCode, KeyMod, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
+import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 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-e28ac690-06d5-5ee9-92d1-02df70296354-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 { MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, CTX_INLINE_CHAT_VISIBLE } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from './notebookChatContext.js';
+import { NotebookAction, getEditorFromArgsOrActivePane, getContextFromActiveEditor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { insertNewCell } from '../insertCellActions.js';
-import { CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-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 { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-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(8913, "Make Request")),
-            icon: Codicon.send,
-            keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyCode.Enter
-            },
-            menu: {
-                id: MENU_CELL_CHAT_INPUT,
-                group: 'navigation',
-                order: 1,
-                when: ( CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate())
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.acceptInput();
-    }
-});
-registerAction2(class extends NotebookCellAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localize(8914, 'Cursor Up')),
-            keybinding: {
-                when: ( ContextKeyExpr.and(
-                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
-                    CTX_INLINE_CHAT_FOCUSED,
-                    CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
-                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                )),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        const editor = context.notebookEditor;
-        const activeCell = context.cell;
-        const idx = editor.getCellIndex(activeCell);
-        if (typeof idx !== 'number') {
-            return;
-        }
-        if (idx < 1 || editor.getLength() === 0) {
-            return;
-        }
-        const newCell = editor.cellAt(idx - 1);
-        const newFocusMode = newCell.cellKind === CellKind.Markup && newCell.getEditState() === CellEditState.Preview ? 'container' : 'editor';
-        const focusEditorLine = newCell.textBuffer.getLineCount();
-        await editor.focusNotebookCell(newCell, newFocusMode, { focusEditorLine: focusEditorLine });
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localize(8915, 'Cursor Down')),
-            keybinding: {
-                when: ( ContextKeyExpr.and(
-                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
-                    CTX_INLINE_CHAT_FOCUSED,
-                    CTX_INLINE_CHAT_INNER_CURSOR_LAST,
-                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                )),
-                weight: KeybindingWeight.EditorCore + 7,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        await NotebookChatController.get(context.notebookEditor)?.focusNext();
-    }
-});
-registerAction2(class extends NotebookCellAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.focusChatWidget',
-            title: ( localize(8916, '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,
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        const index = context.notebookEditor.getCellIndex(context.cell);
-        await NotebookChatController.get(context.notebookEditor)?.focusNearestWidget(index, 'above');
-    }
-});
-registerAction2(class extends NotebookCellAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.focusNextChatWidget',
-            title: ( localize(8917, '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,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
-            },
-            f1: false,
-            precondition: ( ContextKeyExpr.or(( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), NOTEBOOK_CELL_EDITOR_FOCUSED)), ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate())))))
-        });
-    }
-    async runWithContext(accessor, context) {
-        const index = context.notebookEditor.getCellIndex(context.cell);
-        await NotebookChatController.get(context.notebookEditor)?.focusNearestWidget(index, 'below');
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.stop',
-            title: ( localize2(8918, "Stop Request")),
-            icon: Codicon.debugStop,
-            menu: {
-                id: MENU_CELL_CHAT_INPUT,
-                group: 'navigation',
-                order: 1,
-                when: CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.cancelCurrentRequest(false);
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.close',
-            title: ( localize2(8919, "Close Chat")),
-            icon: Codicon.close,
-            menu: {
-                id: MENU_CELL_CHAT_WIDGET,
-                group: 'navigation',
-                order: 2
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.dismiss(false);
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2(8920, "Accept Changes")),
-            shortTitle: ( localize(8921, 'Accept')),
-            icon: Codicon.check,
-            tooltip: ( localize(8922, 'Accept Changes')),
-            keybinding: [
-                {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
-                    weight: KeybindingWeight.EditorContrib + 10,
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                },
-                {
-                    when: ( ContextKeyExpr.and(
-                        CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
-                        CTX_INLINE_CHAT_FOCUSED,
-                        CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
-                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
-                    )),
-                    weight: KeybindingWeight.EditorCore + 10,
-                    primary: KeyCode.Escape
-                },
-                {
-                    when: ( ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                        ContextKeyExpr.not(InputFocusedContextKey),
-                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    )),
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                    weight: KeybindingWeight.WorkbenchContrib
-                }
-            ],
-            menu: [
-                {
-                    id: MENU_CELL_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 0,
-                    when: ( CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages)),
-                }
-            ],
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.acceptSession();
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.discard',
-            title: ( localize(8923, 'Discard')),
-            icon: Codicon.discard,
-            keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()), ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
-                weight: KeybindingWeight.EditorContrib,
-                primary: KeyCode.Escape
-            },
-            menu: {
-                id: MENU_CELL_CHAT_WIDGET_STATUS,
-                group: '0_main',
-                order: 1
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.discard();
-    }
-});
 async function startChat(accessor, context, index, input, autoSend, source) {
     const configurationService = accessor.get(IConfigurationService);
     const commandService = accessor.get(ICommandService);
@@ -275,12 +42,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localize(8924, "Generate")),
+                value: '$(sparkle) ' + ( localize(9174, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(8925, "Start Chat to Generate Code")),
+            tooltip: ( localize(9175, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(8925, "Start Chat to Generate Code")),
+                description: ( localize(9175, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -362,10 +129,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localize(8924, "Generate")),
+                value: '$(sparkle) ' + ( localize(9174, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localize(8925, "Start Chat to Generate Code")),
+            tooltip: ( localize(9175, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -385,157 +152,20 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localize(8926, "Generate")),
-        tooltip: ( localize(8927, "Start Chat to Generate Code"))
+        title: ( localize(9176, "Generate")),
+        tooltip: ( localize(9177, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
     when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
 });
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.focus',
-            title: ( localize(8928, 'Focus Chat')),
-            keybinding: [
-                {
-                    when: ( ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                        ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
-                    )),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
-                },
-                {
-                    when: ( ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                        ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    )),
-                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
-                }
-            ],
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.focus();
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.focusNextCell',
-            title: ( localize(8929, 'Focus Next Cell')),
-            keybinding: [
-                {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
-                }
-            ],
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.focusNext();
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localize(8930, 'Focus Previous Cell')),
-            keybinding: [
-                {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib
-                }
-            ],
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.focusAbove();
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2(8931, "Previous From History")),
-            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-            keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.UpArrow,
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.populateHistory(true);
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2(8932, "Next From History")),
-            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-            keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.DownArrow
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.populateHistory(false);
-    }
-});
-registerAction2(class extends NotebookCellAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.restore',
-            title: ( localize2(8933, "Generate")),
-            icon: Codicon.sparkle,
-            menu: {
-                id: MenuId.NotebookCellTitle,
-                group: CELL_TITLE_CELL_GROUP_ID,
-                order: 0,
-                when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, NOTEBOOK_CELL_GENERATED_BY_CHAT, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        const cell = context.cell;
-        if (!cell) {
-            return;
-        }
-        const notebookEditor = context.notebookEditor;
-        const controller = NotebookChatController.get(notebookEditor);
-        if (!controller) {
-            return;
-        }
-        const prompt = controller.getPromptFromCache(cell);
-        if (prompt) {
-            controller.restore(cell, prompt);
-        }
-    }
-});
 class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(8934, "Accept and Run")),
-            shortTitle: ( localize(8935, 'Accept & Run')),
-            tooltip: ( localize(8936, 'Accept the changes and run the cell')),
+            title: ( localize2(9178, "Accept and Run")),
+            shortTitle: ( localize(9179, 'Accept & Run')),
+            tooltip: ( localize(9180, '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.d.ts

@@ -3,6 +3,6 @@ import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 export declare class SelectAndInsertKernelVariableAction extends Action2 {
     constructor();
     static readonly ID = "notebook.chat.selectAndInsertKernelVariable";
-    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
     private addVariableReference;
 }

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

@@ -15,25 +15,26 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 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 { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { chatVariableLeader } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatVariableLeader } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { copyIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { getOutputViewModelFromId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
 import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-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 './notebookChatContext.js';
 
 const NotebookKernelVariableKey = 'kernelVariable';
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
@@ -78,7 +79,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(8937, "Pick a variable from the kernel")),
+                    detail: ( localize(9181, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -104,7 +105,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
         if (!hasVariableProvider) {
             return;
         }
-        const variables = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+        const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
         for await (const variable of variables) {
             if (pattern && !variable.name.toLowerCase().includes(pattern)) {
                 continue;
@@ -164,7 +165,7 @@ class SelectAndInsertKernelVariableAction extends Action2 {
         if (!hasVariableProvider) {
             return;
         }
-        const variables = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+        const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
         const quickPickItems = [];
         for await (const variable of variables) {
             quickPickItems.push({
@@ -174,8 +175,8 @@ class SelectAndInsertKernelVariableAction extends Action2 {
             });
         }
         const placeHolder = quickPickItems.length > 0
-            ? ( localize(8938, "Select a kernel variable"))
-            : ( localize(8939, "No kernel variables found"));
+            ? ( localize(9182, "Select a kernel variable"))
+            : ( localize(9183, "No kernel variables found"));
         const pickedVariable = await quickInputService.pick(quickPickItems, { placeHolder });
         if (!pickedVariable) {
             return;
@@ -216,7 +217,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.type = 'pickerPick';
-        this.label = ( localize(8940, 'Kernel Variable...'));
+        this.label = ( localize(9184, 'Kernel Variable...'));
         this.icon = Codicon.serverEnvironment;
     }
     isEnabled(widget) {
@@ -253,7 +254,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
             return result;
         })();
         return {
-            placeholder: ( localize(8941, 'Select a kernel variable')),
+            placeholder: ( localize(9185, 'Select a kernel variable')),
             picks
         };
     }
@@ -266,7 +267,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOutput.addToChat',
-            title: ( localize(8942, "Add Cell Output to Chat")),
+            title: ( localize(9186, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(
@@ -290,6 +291,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     async run(accessor, outputContext) {
         const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
         const viewService = accessor.get(IViewsService);
+        const layoutService = accessor.get(IWorkbenchLayoutService);
         if (!notebookEditor) {
             return;
         }
@@ -333,7 +335,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
                 return;
             }
             widget.attachmentModel.addContext(entry);
-            (await showChatView(viewService))?.focusInput();
+            (await showChatView(viewService, layoutService))?.focusInput();
         }
     }
 });

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

@@ -0,0 +1,2 @@
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+export declare const CTX_NOTEBOOK_CHAT_HAS_AGENT: RawContextKey<boolean>;

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

@@ -0,0 +1,7 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey('notebookChatAgentRegistered', false, ( localize(9187, "Whether a chat agent for notebook is registered"))));
+
+export { CTX_NOTEBOOK_CHAT_HAS_AGENT };