@codingame/monaco-vscode-api 2.0.3 → 2.1.0

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js

@@ -16,7 +16,7 @@ import { CellFocusMode } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { setupCustomHover } from '../../../../../../base/browser/ui/iconLabel/iconLabelHover.js';
-import { IHoverService } from '../../../../../services/hover/browser/hover.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 const $ = $$1;
 let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.js

@@ -7,10 +7,9 @@ function registerCellToolbarStickyScroll(notebookEditor, cell, element, opts) {
             element.style.top = '';
         }
         else {
-            const stickyHeight = notebookEditor.getLayoutInfo().stickyHeight;
             const scrollTop = notebookEditor.scrollTop;
             const elementTop = notebookEditor.getAbsoluteTopOfElement(cell);
-            const diff = scrollTop - elementTop + extraOffset + stickyHeight;
+            const diff = scrollTop - elementTop + extraOffset;
             const maxTop = cell.layoutInfo.editorHeight + cell.layoutInfo.statusBarHeight - 45;
             const top = maxTop > 20 ?
                 clamp(min, diff, maxTop) :

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

@@ -1,13 +1,19 @@
 import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { EditorContextKeys } from '../../../../../../../editor/common/editorContextKeys.js';
+import { ILanguageService } from '../../../../../../../editor/common/languages/language.js';
 import { localizeWithPath } from '../../../../../../../nls.js';
-import { registerAction2, MenuId } from '../../../../../../../platform/actions/common/actions.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../../../platform/accessibility/common/accessibility.js';
+import { registerAction2, MenuRegistry, MenuId } from '../../../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../../../platform/contextkey/common/contextkey.js';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_HAS_PROVIDER } from '../../../../../inlineChat/common/inlineChat.js';
-import { NotebookCellAction, NotebookAction } from '../../../controller/coreActions.js';
+import { InputFocusedContextKey } from '../../../../../../../platform/contextkey/common/contextkeys.js';
+import { CTX_INLINE_CHAT_HAS_PROVIDER, 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 } from '../../../../../inlineChat/common/inlineChat.js';
+import { insertCell } from '../../../controller/cellOperations.js';
+import { NotebookCellAction, NotebookAction, getEditorFromArgsOrActivePane } from '../../../controller/coreActions.js';
 import { insertNewCell } from '../../../controller/insertCellActions.js';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, NotebookCellChatController, MENU_CELL_CHAT_WIDGET_TOOLBAR, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from './cellChatController.js';
-import { NotebookSetting, CellKind } from '../../../../common/notebookCommon.js';
-import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from '../../../../common/notebookContextKeys.js';
+import { CellEditState } from '../../../notebookBrowser.js';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, NotebookCellChatController, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from './cellChatController.js';
+import { NotebookSetting, CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from '../../../../common/notebookCommon.js';
+import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED } from '../../../../common/notebookContextKeys.js';
 registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
@@ -27,7 +33,7 @@ registerAction2(class extends NotebookCellAction {
                 primary: 3
             },
             menu: {
-                id: MENU_CELL_CHAT_WIDGET,
+                id: MENU_CELL_CHAT_INPUT,
                 group: 'main',
                 order: 1,
                 when: ( CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate())
@@ -42,6 +48,131 @@ registerAction2(class extends NotebookCellAction {
         ctrl.acceptInput();
     }
 });
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.chat.arrowOutUp',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                'arrowUp',
+                'Cursor Up'
+            )),
+            keybinding: {
+                when: ( ContextKeyExpr.and(
+                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
+                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                )),
+                weight: 0  + 7,
+                primary: 2048  | 16
+            }
+        });
+    }
+    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 NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.chat.arrowOutDown',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                'arrowDown',
+                'Cursor Down'
+            )),
+            keybinding: {
+                when: ( ContextKeyExpr.and(
+                    CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_FOCUSED,
+                    CTX_INLINE_CHAT_INNER_CURSOR_LAST,
+                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
+                )),
+                weight: 0  + 7,
+                primary: 2048  | 18
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        const editor = context.notebookEditor;
+        const activeCell = context.cell;
+        await editor.focusNotebookCell(activeCell, 'editor');
+    }
+});
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.focusChatWidget',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                'focusChatWidget',
+                '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: 0  + 7,
+                primary: 2048  | 16
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        const activeCell = context.cell;
+        const controller = NotebookCellChatController.get(activeCell);
+        if (controller && controller.isWidgetVisible()) {
+            controller.focusWidget();
+            return;
+        }
+    }
+});
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.focusNextChatWidget',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                'focusNextChatWidget',
+                '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()))),
+                weight: 0  + 7,
+                primary: 2048  | 18
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        const editor = context.notebookEditor;
+        const activeCell = context.cell;
+        const idx = editor.getCellIndex(activeCell);
+        if (typeof idx !== 'number') {
+            return;
+        }
+        if (idx >= editor.getLength() - 1) {
+            return;
+        }
+        const targetCell = editor.cellAt(idx + 1);
+        if (targetCell) {
+            const controller = NotebookCellChatController.get(targetCell);
+            if (controller && controller.isWidgetVisible()) {
+                controller.focusWidget();
+                return;
+            }
+        }
+    }
+});
 registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
@@ -56,7 +187,7 @@ registerAction2(class extends NotebookCellAction {
             },
             icon: Codicon.debugStop,
             menu: {
-                id: MENU_CELL_CHAT_WIDGET,
+                id: MENU_CELL_CHAT_INPUT,
                 group: 'main',
                 order: 1,
                 when: CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST
@@ -85,7 +216,7 @@ registerAction2(class extends NotebookCellAction {
             },
             icon: Codicon.close,
             menu: {
-                id: MENU_CELL_CHAT_WIDGET_TOOLBAR,
+                id: MENU_CELL_CHAT_WIDGET,
                 group: 'main',
                 order: 2
             }
@@ -174,6 +305,7 @@ registerAction2(class extends NotebookCellAction {
             return;
         }
         ctrl.dismiss(true);
+        context.notebookEditor.focusNotebookCell(context.cell, 'container');
     }
 });
 registerAction2(class extends NotebookCellAction {
@@ -254,7 +386,7 @@ registerAction2(class extends NotebookCellAction {
         ctrl.feedbackLast(4 );
     }
 });
-registerAction2(class extends NotebookCellAction {
+registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.insertCodeCellWithChat',
@@ -271,13 +403,107 @@ registerAction2(class extends NotebookCellAction {
                 'notebookActions.menu.insertCodeCellWithChat.tooltip',
                 "Generate Code Cell with Chat"
             )),
+            metadata: {
+                description: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                    'notebookActions.menu.insertCodeCellWithChat.tooltip',
+                    "Generate Code Cell with Chat"
+                )),
+                args: [
+                    {
+                        name: 'args',
+                        schema: {
+                            type: 'object',
+                            required: ['index'],
+                            properties: {
+                                'index': {
+                                    type: 'number'
+                                },
+                                'input': {
+                                    type: 'string'
+                                },
+                                'autoSend': {
+                                    type: 'boolean'
+                                }
+                            }
+                        }
+                    }
+                ]
+            },
             menu: [
                 {
                     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))))
-                },
+                }
+            ]
+        });
+    }
+    getEditorContextFromArgsOrActive(accessor, ...args) {
+        const [firstArg] = args;
+        if (!firstArg) {
+            return undefined;
+        }
+        if (typeof firstArg !== 'object' || typeof firstArg.index !== 'number') {
+            return undefined;
+        }
+        const notebookEditor = getEditorFromArgsOrActivePane(accessor);
+        if (!notebookEditor) {
+            return undefined;
+        }
+        const cell = firstArg.index <= 0 ? undefined : notebookEditor.cellAt(firstArg.index - 1);
+        return {
+            cell,
+            notebookEditor,
+            input: firstArg.input,
+            autoSend: firstArg.autoSend
+        };
+    }
+    async runWithContext(accessor, context) {
+        let newCell = null;
+        if (!context.cell) {
+            const languageService = accessor.get(ILanguageService);
+            newCell = insertCell(languageService, context.notebookEditor, 0, CellKind.Code, 'above', undefined, true);
+        }
+        else {
+            newCell = insertNewCell(accessor, context, CellKind.Code, 'below');
+        }
+        if (!newCell) {
+            return;
+        }
+        await context.notebookEditor.focusNotebookCell(newCell, 'container');
+        const ctrl = NotebookCellChatController.get(newCell);
+        if (!ctrl) {
+            return;
+        }
+        context.notebookEditor.getCellsInRange().forEach(cell => {
+            const cellCtrl = NotebookCellChatController.get(cell);
+            if (cellCtrl) {
+                cellCtrl.dismiss(false);
+            }
+        });
+        ctrl.show(context.input, context.autoSend);
+    }
+});
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.insertCodeCellWithChatAtTop',
+            title: {
+                value: '$(sparkle) ' + ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                    'notebookActions.menu.insertCodeCellWithChat',
+                    "Generate"
+                )),
+                original: '$(sparkle) Generate',
+            },
+            tooltip: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+                'notebookActions.menu.insertCodeCellWithChat.tooltip',
+                "Generate Code Cell with Chat"
+            )),
+            menu: [
                 {
                     id: MenuId.NotebookCellListTop,
                     group: 'inline',
@@ -288,7 +514,8 @@ registerAction2(class extends NotebookCellAction {
         });
     }
     async runWithContext(accessor, context) {
-        const newCell = await insertNewCell(accessor, context, CellKind.Code, 'below');
+        const languageService = accessor.get(ILanguageService);
+        const newCell = insertCell(languageService, context.notebookEditor, 0, CellKind.Code, 'above', undefined, true);
         if (!newCell) {
             return;
         }
@@ -297,6 +524,31 @@ registerAction2(class extends NotebookCellAction {
         if (!ctrl) {
             return;
         }
+        context.notebookEditor.getCellsInRange().forEach(cell => {
+            const cellCtrl = NotebookCellChatController.get(cell);
+            if (cellCtrl) {
+                cellCtrl.dismiss(false);
+            }
+        });
         ctrl.show();
     }
 });
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+    command: {
+        id: 'notebook.cell.insertCodeCellWithChat',
+        icon: Codicon.sparkle,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+            'notebookActions.menu.insertCode.ontoolbar',
+            "Generate"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Generate Code Cell with Chat"
+        ))
+    },
+    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))))
+});

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatController.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import { h, Dimension } from '../../../../../../../base/browser/dom.js';
+import { Dimension, WindowIntervalTimer } from '../../../../../../../base/browser/dom.js';
 import { createCancelablePromise, raceCancellationError, Queue } from '../../../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../../../base/common/event.js';
@@ -13,18 +13,20 @@ import { Selection } from '../../../../../../../editor/common/core/selection.js'
 import { TextEdit } from '../../../../../../../editor/common/languages.js';
 import { IEditorWorkerService } from '../../../../../../../editor/common/services/editorWorker.js';
 import { localizeWithPath } from '../../../../../../../nls.js';
-import { MenuWorkbenchToolBar } from '../../../../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../../../platform/commands/common/commands.js';
 import { RawContextKey, IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { AsyncProgress } from '../../../../../../../platform/progress/common/progress.js';
 import { countWords } from '../../../../../chat/common/chatWordCounter.js';
 import { InlineChatController } from '../../../../../inlineChat/browser/inlineChatController.js';
-import { SessionPrompt, ReplyResponse, SessionExchange, EmptyResponse, ErrorResponse, IInlineChatSessionService } from '../../../../../inlineChat/browser/inlineChatSession.js';
-import { performAsyncTextEdit, asProgressiveEdit } from '../../../../../inlineChat/browser/inlineChatStrategies.js';
+import { SessionPrompt, ReplyResponse, SessionExchange, EmptyResponse, ErrorResponse } from '../../../../../inlineChat/browser/inlineChatSession.js';
+import { IInlineChatSessionService } from '../../../../../inlineChat/browser/inlineChatSessionService.js';
+import { performAsyncTextEdit, asProgressiveEdit } from '../../../../../inlineChat/browser/utils.js';
 import { InlineChatWidget } from '../../../../../inlineChat/browser/inlineChatWidget.js';
 import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE } from '../../../../../inlineChat/common/inlineChat.js';
 import { NotebookExecutionType, INotebookExecutionStateService } from '../../../../common/notebookExecutionStateService.js';
+import { IInlineChatSavingService } from '../../../../../inlineChat/browser/inlineChatSavingService.js';
 var NotebookCellChatController_1;
 const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( new RawContextKey('notebookCellChatFocused', false, ( localizeWithPath(
     'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatController',
@@ -36,17 +38,18 @@ const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( new RawContextKey('notebookChatHa
     'notebookChatHasActiveRequest',
     "Whether the cell chat editor has an active request"
 ))));
+const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
 const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 const MENU_CELL_CHAT_WIDGET_FEEDBACK = MenuId.for('cellChatWidget.feedback');
-const MENU_CELL_CHAT_WIDGET_TOOLBAR = MenuId.for('cellChatWidget.toolbar');
+MenuId.for('cellChatWidget.toolbar');
 let NotebookCellChatController = class NotebookCellChatController extends Disposable {
     static { NotebookCellChatController_1 = this; }
     static { this._cellChatControllers = ( new WeakMap()); }
     static get(cell) {
         return NotebookCellChatController_1._cellChatControllers.get(cell);
     }
-    constructor(_notebookEditor, _chatPart, _cell, _partContainer, _contextKeyService, _inlineChatSessionService, _editorWorkerService, _instantiationService, _notebookExecutionStateService) {
+    constructor(_notebookEditor, _chatPart, _cell, _partContainer, _contextKeyService, _inlineChatSessionService, _editorWorkerService, _instantiationService, _notebookExecutionStateService, _commandService, _inlineChatSavingService) {
         super();
         this._notebookEditor = _notebookEditor;
         this._chatPart = _chatPart;
@@ -57,8 +60,9 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
         this._editorWorkerService = _editorWorkerService;
         this._instantiationService = _instantiationService;
         this._notebookExecutionStateService = _notebookExecutionStateService;
+        this._commandService = _commandService;
+        this._inlineChatSavingService = _inlineChatSavingService;
         this._isVisible = false;
-        this._toolbarDOM = h('div.toolbar@editorToolbar');
         this._widgetDisposableStore = this._register(( new DisposableStore()));
         NotebookCellChatController_1._cellChatControllers.set(this._cell, this);
         this._ctxHasActiveRequest = CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.bindTo(this._contextKeyService);
@@ -84,7 +88,8 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
     }
     _initialize(editor) {
         this._widget = this._instantiationService.createInstance(InlineChatWidget, editor, {
-            menuId: MENU_CELL_CHAT_WIDGET,
+            menuId: MENU_CELL_CHAT_INPUT,
+            widgetMenuId: MENU_CELL_CHAT_WIDGET,
             statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
             feedbackMenuId: MENU_CELL_CHAT_WIDGET_FEEDBACK
         });
@@ -103,11 +108,6 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
             }
         }));
         this._partContainer.appendChild(this._widget.domNode);
-        this._partContainer.appendChild(this._toolbarDOM.editorToolbar);
-        this._toolbar = this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._toolbarDOM.editorToolbar, MENU_CELL_CHAT_WIDGET_TOOLBAR, {
-            telemetrySource: 'interactiveEditorWidget-toolbar',
-            toolbarOptions: { primaryGroup: 'main' }
-        }));
     }
     dispose() {
         if (this._isVisible) {
@@ -118,11 +118,11 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
         try {
             if (this._widget) {
                 this._partContainer.removeChild(this._widget.domNode);
-                this._partContainer.removeChild(this._toolbarDOM.editorToolbar);
             }
         }
         catch (_ex) {
         }
+        this.dismiss(false);
         this._widget?.dispose();
         this._inlineChatListener?.dispose();
         this._toolbar?.dispose();
@@ -132,25 +132,28 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
         NotebookCellChatController_1._cellChatControllers.delete(this._cell);
         super.dispose();
     }
+    isWidgetVisible() {
+        return this._isVisible;
+    }
     layout() {
         if (this._isVisible && this._widget) {
-            const innerEditorWidth = this._cell.layoutInfo.editorWidth;
+            const width = this._notebookEditor.getLayoutInfo().width - ( (16 + 6)) - ( (6 * 2));
             const height = this._widget.getHeight();
-            this._widget.layout(( new Dimension(innerEditorWidth, height)));
+            this._widget.layout(( new Dimension(width, height)));
         }
     }
     _updateHeight() {
-        const margin = 6;
-        const heightWithMargin = this._isVisible && this._widget
-            ? ((this._widget.getHeight() - 8  - 18  + margin) )
+        const surrounding = 6 * 2  + 6  + 2 ;
+        const heightWithPadding = this._isVisible && this._widget
+            ? (this._widget.getHeight() - 8  - 18  - 6  + surrounding)
             : 0;
-        if (this._cell.chatHeight === heightWithMargin) {
+        if (this._cell.chatHeight === heightWithPadding) {
             return;
         }
-        this._cell.chatHeight = heightWithMargin;
-        this._partContainer.style.height = `${heightWithMargin - margin}px`;
+        this._cell.chatHeight = heightWithPadding;
+        this._partContainer.style.height = `${heightWithPadding - surrounding}px`;
     }
-    async show() {
+    async show(input, autoSend) {
         this._isVisible = true;
         if (!this._widget) {
             const editor = this._getCellEditor();
@@ -198,8 +201,17 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
                 )));
                 this._widget.focus();
             }
+            if (this._widget && input) {
+                this._widget.value = input;
+                if (autoSend) {
+                    this.acceptInput();
+                }
+            }
         });
     }
+    async focusWidget() {
+        this._widget?.focus();
+    }
     _getCellEditor() {
         const editors = this._notebookEditor.codeEditors.find(editor => editor[0] === this._chatPart.activeCell);
         if (!editors || !editors[1].hasModel()) {
@@ -238,7 +250,8 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
             attempt: 0,
             selection: { selectionStartLineNumber: 1, selectionStartColumn: 1, positionLineNumber: 1, positionColumn: 1 },
             wholeRange: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
-            live: true
+            live: true,
+            withIntentDetection: true,
         };
         const requestCts = ( new CancellationTokenSource());
         const progressEdits = [];
@@ -294,6 +307,23 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
                 for (let i = progressEdits.length; i < replyResponse.allLocalEdits.length; i++) {
                     await this._makeChanges(editor, replyResponse.allLocalEdits[i], undefined);
                 }
+                if (this._activeSession?.provider.provideFollowups) {
+                    const followupCts = ( new CancellationTokenSource());
+                    const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, replyResponse.raw, followupCts.token);
+                    if (followups && this._widget) {
+                        const widget = this._widget;
+                        widget.updateFollowUps(followups, async (followup) => {
+                            if (followup.kind === 'reply') {
+                                widget.value = followup.message;
+                                this.acceptInput();
+                            }
+                            else {
+                                await this.acceptSession();
+                                this._commandService.executeCommand(followup.commandId, ...(followup.args ?? []));
+                            }
+                        });
+                    }
+                }
             }
         }
         catch (e) {
@@ -358,6 +388,7 @@ let NotebookCellChatController = class NotebookCellChatController extends Dispos
         }
         const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
         const editOperations = ( actualEdits.map(TextEdit.asEditOperation));
+        this._inlineChatSavingService.markChanged(this._activeSession);
         try {
             this._activeSession.wholeRange.trackEdits(editOperations);
             if (opts) {
@@ -376,7 +407,9 @@ NotebookCellChatController = NotebookCellChatController_1 = ( __decorate([
     ( __param(5, IInlineChatSessionService)),
     ( __param(6, IEditorWorkerService)),
     ( __param(7, IInstantiationService)),
-    ( __param(8, INotebookExecutionStateService))
+    ( __param(8, INotebookExecutionStateService)),
+    ( __param(9, ICommandService)),
+    ( __param(10, IInlineChatSavingService))
 ], NotebookCellChatController));
 class EditStrategy {
     constructor(_session) {
@@ -391,7 +424,7 @@ class EditStrategy {
         for (const edit of edits) {
             const wordCount = countWords(edit.text ?? '');
             const speed = wordCount / durationInSec;
-            await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(edit, speed, opts.token));
+            await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(( new WindowIntervalTimer()), edit, speed, opts.token));
         }
     }
     async makeChanges(editor, edits) {
@@ -435,4 +468,4 @@ class EditStrategy {
         }
     }
 }
-export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_FEEDBACK, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_TOOLBAR, NotebookCellChatController };
+export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_FEEDBACK, MENU_CELL_CHAT_WIDGET_STATUS, NotebookCellChatController };

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { getWindow, append, $, modify, setVisibility, safeInnerHtml, hide, show } from '../../../../../../base/browser/dom.js';
+import { getWindow, append, $, modify, setVisibility, safeInnerHtml, runAtThisOrScheduleAtNextAnimationFrame, hide, show } from '../../../../../../base/browser/dom.js';
 import { raceCancellation } from '../../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
@@ -70,7 +70,7 @@ let CodeCell = class CodeCell extends Disposable {
                 }
             }
             if (e.focusModeChanged) {
-                this.updateEditorForFocusModeChange();
+                this.updateEditorForFocusModeChange(true);
             }
         }));
         this.cellParts.scheduleRenderCell(this.viewCell);
@@ -78,7 +78,7 @@ let CodeCell = class CodeCell extends Disposable {
             this.cellParts.unrenderCell(this.viewCell);
         }));
         this.updateEditorOptions();
-        this.updateEditorForFocusModeChange();
+        this.updateEditorForFocusModeChange(false);
         this.updateForOutputHover();
         this.updateForOutputFocus();
         this.viewCell.editorHeight = editorHeight;
@@ -260,9 +260,16 @@ let CodeCell = class CodeCell extends Disposable {
             && this.viewCell.focusMode === CellFocusMode.Editor
             && (this.notebookEditor.hasEditorFocus() || this.notebookEditor.getDomNode().ownerDocument.activeElement === this.notebookEditor.getDomNode().ownerDocument.body);
     }
-    updateEditorForFocusModeChange() {
+    updateEditorForFocusModeChange(sync) {
         if (this.shouldUpdateDOMFocus()) {
-            this.templateData.editor?.focus();
+            if (sync) {
+                this.templateData.editor?.focus();
+            }
+            else {
+                this._register(runAtThisOrScheduleAtNextAnimationFrame(getWindow(this.templateData.container), () => {
+                    this.templateData.editor?.focus();
+                }));
+            }
         }
         this.templateData.container.classList.toggle('cell-editor-focus', this.viewCell.focusMode === CellFocusMode.Editor);
         this.templateData.container.classList.toggle('cell-output-focus', this.viewCell.focusMode === CellFocusMode.Output);

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js

@@ -60,8 +60,8 @@ let CollapsedCodeCellExecutionIcon = class CollapsedCodeCellExecutionIcon extend
                 text: `$(${errorStateIcon.id})`,
                 tooltip: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon',
-                    'notebook.cell.status.failed',
-                    "Failed"
+                    'notebook.cell.status.failure',
+                    "Failure"
                 )),
             };
         }