@codingame/monaco-vscode-notebook-service-override 4.5.1 → 5.0.0

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

@@ -4,28 +4,32 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_HAS_PROVIDER } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
 import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { insertNewCell } from '../insertCellActions.js';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions";
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebook.cell.chat.accept',
-                "Make Request"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Make Request")),
             icon: Codicon.send,
             keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                when: ( (ContextKeyExpr.and(
+                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_FOCUSED,
+                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+                ))),
                 weight: 200 ,
                 primary: 3
             },
@@ -33,8 +37,9 @@ registerAction2(class extends NotebookAction {
                 id: MENU_CELL_CHAT_INPUT,
                 group: 'navigation',
                 order: 1,
-                when: ( CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate())
-            }
+                when: ( (CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate()))
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -45,22 +50,19 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'arrowUp',
-                'Cursor Up'
-            )),
+            title: ( localizeWithPath(_moduleId, 1, 'Cursor Up')),
             keybinding: {
-                when: ( ContextKeyExpr.and(
+                when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
-                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                )),
+                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                ))),
                 weight: 0  + 7,
                 primary: 2048  | 16
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -83,22 +85,19 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'arrowDown',
-                'Cursor Down'
-            )),
+            title: ( localizeWithPath(_moduleId, 2, 'Cursor Down')),
             keybinding: {
-                when: ( ContextKeyExpr.and(
+                when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_LAST,
-                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-                )),
+                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                ))),
                 weight: 0  + 7,
                 primary: 2048  | 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -109,16 +108,23 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'focusChatWidget',
-                'Focus Chat Widget'
-            )),
+            title: ( localizeWithPath(_moduleId, 3, '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()))),
+                when: ( (ContextKeyExpr.and(
+                    NOTEBOOK_EDITOR_FOCUSED,
+                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+                     (ContextKeyExpr.and(
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus,
+                         (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')),
+                         (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none'))
+                    )),
+                     (EditorContextKeys.isEmbeddedDiffEditor.negate())
+                ))),
                 weight: 0  + 7,
                 primary: 2048  | 16
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -130,16 +136,23 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'focusNextChatWidget',
-                'Focus Next Cell Chat Widget'
-            )),
+            title: ( localizeWithPath(_moduleId, 4, 'Focus Next Cell 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('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                when: ( (ContextKeyExpr.and(
+                    NOTEBOOK_EDITOR_FOCUSED,
+                     (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+                     (ContextKeyExpr.and(
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus,
+                         (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')),
+                         (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none'))
+                    )),
+                     (EditorContextKeys.isEmbeddedDiffEditor.negate())
+                ))),
                 weight: 0  + 7,
                 primary: 2048  | 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -151,18 +164,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebook.cell.chat.stop',
-                "Stop Request"
-            )),
+            title: ( localize2WithPath(_moduleId, 5, "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) {
@@ -173,17 +183,14 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebook.cell.chat.close',
-                "Close Chat"
-            )),
+            title: ( localize2WithPath(_moduleId, 6, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
                 group: 'navigation',
                 order: 2
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -194,45 +201,37 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'apply1',
-                "Accept Changes"
-            )),
-            shortTitle: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'apply2',
-                'Accept'
-            )),
+            title: ( localize2WithPath(_moduleId, 7, "Accept Changes")),
+            shortTitle: ( localizeWithPath(_moduleId, 8, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'apply3',
-                'Accept Changes'
-            )),
+            tooltip: ( localizeWithPath(_moduleId, 9, 'Accept Changes')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                    when: ( (ContextKeyExpr.and(
+                        CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
+                        CTX_INLINE_CHAT_FOCUSED,
+                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+                    ))),
                     weight: 100  + 10,
                     primary: 2048  | 3 ,
                 },
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                         CTX_INLINE_CHAT_FOCUSED,
                         CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
-                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
-                    )),
+                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+                    ))),
                     weight: 0  + 10,
                     primary: 9
                 },
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    )),
+                         (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
+                    ))),
                     primary: 2048  | 3 ,
                     weight: 200
                 }
@@ -242,9 +241,10 @@ registerAction2(class extends NotebookAction {
                     id: MENU_CELL_CHAT_WIDGET_STATUS,
                     group: 'inline',
                     order: 0,
-                    when: ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )),
+                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" ))),
                 }
-            ]
+            ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -255,14 +255,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'discard',
-                'Discard'
-            )),
+            title: ( localizeWithPath(_moduleId, 10, '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()))),
+                when: ( (ContextKeyExpr.and(
+                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_FOCUSED,
+                     (CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()),
+                     (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
+                ))),
                 weight: 100 ,
                 primary: 9
             },
@@ -270,7 +271,8 @@ registerAction2(class extends NotebookAction {
                 id: MENU_CELL_CHAT_WIDGET_STATUS,
                 group: 'main',
                 order: 1
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -281,18 +283,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.feedbackHelpful',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'feedback.helpful',
-                'Helpful'
-            )),
+            title: ( localizeWithPath(_moduleId, 11, 'Helpful')),
             icon: Codicon.thumbsup,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
                 group: 'inline',
                 order: 1,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)),
-            }
+                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -303,18 +302,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.feedbackUnhelpful',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'feedback.unhelpful',
-                'Unhelpful'
-            )),
+            title: ( localizeWithPath(_moduleId, 12, 'Unhelpful')),
             icon: Codicon.thumbsdown,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
                 group: 'inline',
                 order: 2,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)),
-            }
+                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -325,47 +321,53 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.reportIssueForBug',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'feedback.reportIssueForBug',
-                'Report Issue'
-            )),
+            title: ( localizeWithPath(_moduleId, 13, 'Report Issue')),
             icon: Codicon.report,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
                 group: 'inline',
                 order: 3,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)),
-            }
+                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
         NotebookChatController.get(context.notebookEditor)?.feedbackLast(4 );
     }
 });
+async function startChat(accessor, context, index, input, autoSend, source) {
+    const configurationService = accessor.get(IConfigurationService);
+    const commandService = accessor.get(ICommandService);
+    if (configurationService.getValue(NotebookSetting.cellChat)) {
+        context.notebookEditor.focusContainer();
+        NotebookChatController.get(context.notebookEditor)?.run(index, input, autoSend);
+    }
+    else if (configurationService.getValue(NotebookSetting.cellGenerate)) {
+        const activeCell = context.notebookEditor.getActiveCell();
+        const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below'));
+        if (targetCell) {
+            targetCell.enableAutoLanguageDetection();
+            await context.notebookEditor.revealFirstLineIfOutsideViewport(targetCell);
+            const codeEditor = context.notebookEditor.codeEditors.find(ce => ce[0] === targetCell)?.[1];
+            if (codeEditor) {
+                codeEditor.focus();
+                commandService.executeCommand('inlineChat.start');
+            }
+        }
+    }
+}
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                    'notebookActions.menu.insertCodeCellWithChat',
-                    "Generate"
-                )),
+                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 14, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                "Start Chat to Generate Code"
-            )),
+            tooltip: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                    'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                    "Start Chat to Generate Code"
-                )),
+                description: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -389,7 +391,16 @@ registerAction2(class extends NotebookAction {
             },
             f1: false,
             keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ContextKeyExpr.not(InputFocusedContextKey), CTX_INLINE_CHAT_HAS_PROVIDER, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)))),
+                when: ( (ContextKeyExpr.and(
+                    NOTEBOOK_EDITOR_FOCUSED,
+                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                    ContextKeyExpr.not(InputFocusedContextKey),
+                    CTX_INLINE_CHAT_HAS_PROVIDER,
+                     (ContextKeyExpr.or(
+                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                    ))
+                ))),
                 weight: 200 ,
                 primary: 2048  | 39 ,
                 secondary: [KeyChord(2048  | 41 , 39 )],
@@ -399,7 +410,14 @@ registerAction2(class extends NotebookAction {
                     id: MenuId.NotebookCellBetween,
                     group: 'inline',
                     order: -1,
-                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_HAS_PROVIDER, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
+                    when: ( (ContextKeyExpr.and(
+                         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                        CTX_INLINE_CHAT_HAS_PROVIDER,
+                         (ContextKeyExpr.or(
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                        ))
+                    )))
                 }
             ]
         });
@@ -439,8 +457,7 @@ registerAction2(class extends NotebookAction {
     }
     async runWithContext(accessor, context) {
         const index = Math.max(0, context.cell ? context.notebookEditor.getCellIndex(context.cell) + 1 : 0);
-        context.notebookEditor.focusContainer();
-        NotebookChatController.get(context.notebookEditor)?.run(index, context.input, context.autoSend);
+        await startChat(accessor, context, index, context.input, context.autoSend, context.source);
     }
 });
 registerAction2(class extends NotebookAction {
@@ -448,82 +465,78 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                    'notebookActions.menu.insertCodeCellWithChat',
-                    "Generate"
-                )),
+                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 14, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                "Start Chat to Generate Code"
-            )),
+            tooltip: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
                     id: MenuId.NotebookCellListTop,
                     group: 'inline',
                     order: -1,
-                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_HAS_PROVIDER, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
+                    when: ( (ContextKeyExpr.and(
+                         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                        CTX_INLINE_CHAT_HAS_PROVIDER,
+                         (ContextKeyExpr.or(
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                        ))
+                    )))
                 },
             ]
         });
     }
     async runWithContext(accessor, context) {
-        context.notebookEditor.focusContainer();
-        NotebookChatController.get(context.notebookEditor)?.run(0, '', false);
+        await startChat(accessor, context, 0, '', false);
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-            'notebookActions.menu.insertCode.ontoolbar',
-            "Generate"
-        )),
-        tooltip: ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-            'notebookActions.menu.insertCode.tooltip',
-            "Start Chat to Generate Code"
-        ))
+        title: ( localizeWithPath(_moduleId, 16, "Generate")),
+        tooltip: ( localizeWithPath(_moduleId, 17, "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_INLINE_CHAT_HAS_PROVIDER, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
+    when: ( (ContextKeyExpr.and(
+         (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+         (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')),
+         (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')),
+        CTX_INLINE_CHAT_HAS_PROVIDER,
+         (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: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'focusNotebookChat',
-                'Focus Chat'
-            )),
+            title: ( localizeWithPath(_moduleId, 18, 'Focus Chat')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
-                    )),
+                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
+                    ))),
                     primary: 2048  | 18 ,
                     weight: 200
                 },
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
-                    )),
+                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
+                    ))),
                     primary: 2048  | 16 ,
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -534,18 +547,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'focusNextCell',
-                'Focus Next Cell'
-            )),
+            title: ( localizeWithPath(_moduleId, 19, 'Focus Next Cell')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                    when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                     primary: 2048  | 18 ,
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -556,18 +566,15 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'focusPreviousCell',
-                'Focus Previous Cell'
-            )),
+            title: ( localizeWithPath(_moduleId, 20, 'Focus Previous Cell')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                    when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                     primary: 2048  | 16 ,
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -578,17 +585,14 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebook.cell.chat.previousFromHistory',
-                "Previous From History"
-            )),
-            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+            title: ( localize2WithPath(_moduleId, 21, "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)),
+                when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                 weight: 0  + 10,
                 primary: 16 ,
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -599,17 +603,14 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebook.cell.chat.nextFromHistory',
-                "Next From History"
-            )),
-            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+            title: ( localize2WithPath(_moduleId, 22, "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)),
+                when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                 weight: 0  + 10,
                 primary: 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -620,18 +621,20 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
-                'notebookActions.restoreCellprompt',
-                "Generate"
-            )),
+            title: ( localize2WithPath(_moduleId, 23, "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_INLINE_CHAT_HAS_PROVIDER, NOTEBOOK_CELL_GENERATED_BY_CHAT, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
-            }
+                when: ( (ContextKeyExpr.and(
+                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
+                    CTX_INLINE_CHAT_HAS_PROVIDER,
+                    NOTEBOOK_CELL_GENERATED_BY_CHAT,
+                     (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
+                )))
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {