@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js

@@ -1,30 +1,36 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, trackFocus, getTotalHeight, reset, getActiveElement } from '../../../../base/browser/dom.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { isNonEmptyArray, tail } from '../../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { constObservable } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
-import { isNonEmptyArray, tail } from '../../../../base/common/arrays.js';
 import './media/inlineChat.css.js';
 import { AccessibleDiffViewer } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
-import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
-import { MenuItemAction, MenuId } from '../../../../platform/actions/common/actions.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { asCssVariableName, asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -38,20 +44,18 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
-import { ChatModel } from '../../chat/common/chatModel.js';
-import { isWelcomeVM, isResponseVM } from '../../chat/common/chatViewModel.js';
-import { inlineChatForeground, inlineChatBackground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { MarkUnhelpfulActionId } from '../../chat/browser/actions/chatTitleActions.js';
+import { ChatVoteDownButton } from '../../chat/browser/chatListRenderer.js';
 import { ChatWidget } from '../../chat/browser/chatWidget.js';
-import { chatRequestBackground } from '../../chat/common/chatColors.js';
-import { Selection } from '../../../../editor/common/core/selection.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
+import { chatRequestBackground } from '../../chat/common/chatColors.js';
+import { CONTEXT_RESPONSE, CONTEXT_RESPONSE_VOTE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED } from '../../chat/common/chatContextKeys.js';
+import { ChatModel } from '../../chat/common/chatModel.js';
+import { ChatAgentVoteDirection } from '../../chat/common/chatService.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { isWelcomeVM, isResponseVM } from '../../chat/common/chatViewModel.js';
+import { inlineChatForeground, inlineChatBackground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from '../common/inlineChat.js';
 var HunkAccessibleDiffViewer_1;
 let InlineChatWidget = class InlineChatWidget {
     constructor(location, options, _instantiationService, _contextKeyService, _keybindingService, _accessibilityService, _configurationService, _accessibleViewService, _textModelResolverService, _chatService, _hoverService) {
@@ -69,9 +73,9 @@ let InlineChatWidget = class InlineChatWidget {
             h('div.accessibleViewer@accessibleViewer'),
             h('div.status@status', [
                 h('div.label.info.hidden@infoLabel'),
-                h('div.actions.text-style.hidden@toolbar1'),
-                h('div.actions.button-style.hidden@toolbar2'),
+                h('div.actions.hidden@toolbar1'),
                 h('div.label.status.hidden@statusLabel'),
+                h('div.actions.secondary.hidden@toolbar2'),
             ]),
         ]);
         this._store = ( (new DisposableStore()));
@@ -85,13 +89,27 @@ let InlineChatWidget = class InlineChatWidget {
             IContextKeyService,
             this.scopedContextKeyService
         ]))), this._store);
-        this._chatWidget = scopedInstaService.createInstance(ChatWidget, location, { resource: true }, {
+        this._chatWidget = scopedInstaService.createInstance(ChatWidget, location, undefined, {
             defaultElementHeight: 32,
             renderStyle: 'minimal',
             renderInputOnTop: false,
             renderFollowups: true,
             supportsFileReferences: _configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
-            filter: item => !isWelcomeVM(item),
+            filter: item => {
+                if (isWelcomeVM(item)) {
+                    return false;
+                }
+                if (isResponseVM(item) && item.isComplete && !item.errorDetails) {
+                    if (item.response.value.length > 0 && item.response.value.every(item => item.kind === 'textEditGroup' && options.chatWidgetViewOptions?.rendererOptions?.renderTextEditsAsSummary?.(item.uri))) {
+                        return false;
+                    }
+                    if (item.response.value.length === 0) {
+                        return false;
+                    }
+                    return true;
+                }
+                return true;
+            },
             ...options.chatWidgetViewOptions
         }, {
             listForeground: inlineChatForeground,
@@ -103,13 +121,36 @@ let InlineChatWidget = class InlineChatWidget {
         this._elements.chatWidget.style.setProperty(asCssVariableName(chatRequestBackground), asCssVariable(inlineChatBackground));
         this._chatWidget.setVisible(true);
         this._store.add(this._chatWidget);
+        const ctxResponse = CONTEXT_RESPONSE.bindTo(this.scopedContextKeyService);
+        const ctxResponseVote = CONTEXT_RESPONSE_VOTE.bindTo(this.scopedContextKeyService);
+        const ctxResponseSupportIssues = CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING.bindTo(this.scopedContextKeyService);
+        const ctxResponseError = CONTEXT_RESPONSE_ERROR.bindTo(this.scopedContextKeyService);
+        const ctxResponseErrorFiltered = CONTEXT_RESPONSE_FILTERED.bindTo(this.scopedContextKeyService);
         const viewModelStore = this._store.add(( (new DisposableStore())));
         this._store.add(this._chatWidget.onDidChangeViewModel(() => {
             viewModelStore.clear();
             const viewModel = this._chatWidget.viewModel;
-            if (viewModel) {
-                viewModelStore.add(viewModel.onDidChange(() => this._onDidChangeHeight.fire()));
+            if (!viewModel) {
+                return;
             }
+            viewModelStore.add(toDisposable(() => {
+                toolbar2.context = undefined;
+                ctxResponse.reset();
+                ctxResponseVote.reset();
+                ctxResponseError.reset();
+                ctxResponseErrorFiltered.reset();
+                ctxResponseSupportIssues.reset();
+            }));
+            viewModelStore.add(viewModel.onDidChange(() => {
+                const last = viewModel.getItems().at(-1);
+                toolbar2.context = last;
+                ctxResponse.set(isResponseVM(last));
+                ctxResponseVote.set(isResponseVM(last) ? last.vote === ChatAgentVoteDirection.Down ? 'down' : last.vote === ChatAgentVoteDirection.Up ? 'up' : '' : '');
+                ctxResponseError.set(isResponseVM(last) && last.errorDetails !== undefined);
+                ctxResponseErrorFiltered.set((!!(isResponseVM(last) && last.errorDetails?.responseIsFiltered)));
+                ctxResponseSupportIssues.set(isResponseVM(last) && (last.agent?.metadata.supportIssueReporting ?? false));
+                this._onDidChangeHeight.fire();
+            }));
             this._onDidChangeHeight.fire();
         }));
         this._store.add(this.chatWidget.onDidChangeContentHeight(() => {
@@ -123,19 +164,8 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(this._chatWidget.inputEditor.onDidFocusEditorWidget(() => this._ctxInputEditorFocused.set(true)));
         this._store.add(this._chatWidget.inputEditor.onDidBlurEditorWidget(() => this._ctxInputEditorFocused.set(false)));
         const statusMenuId = options.statusMenuId instanceof MenuId ? options.statusMenuId : options.statusMenuId.menu;
-        const statusToolbarMenu = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar1, statusMenuId, {
-            hiddenItemStrategy: HiddenItemStrategy.NoHide,
-            telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
-            actionViewItemProvider: action => action instanceof MenuItemAction ? this._instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { conversational: true }) : undefined,
-            toolbarOptions: { primaryGroup: '0_main' },
-            menuOptions: { renderShortTitle: true },
-            label: true,
-            icon: false
-        });
-        this._store.add(statusToolbarMenu.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
-        this._store.add(statusToolbarMenu);
         const statusMenuOptions = options.statusMenuId instanceof MenuId ? undefined : options.statusMenuId.options;
-        const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar2, statusMenuId, {
+        const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar1, statusMenuId, {
             toolbarOptions: { primaryGroup: '0_main' },
             telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
             menuOptions: { renderShortTitle: true },
@@ -143,9 +173,18 @@ let InlineChatWidget = class InlineChatWidget {
         });
         this._store.add(statusButtonBar.onDidChange(() => this._onDidChangeHeight.fire()));
         this._store.add(statusButtonBar);
-        const toggleToolbar = () => this._elements.status.classList.toggle('text', this._configurationService.getValue(InlineChatConfigKeys.ExpTextButtons));
-        this._store.add(this._configurationService.onDidChangeConfiguration(e => e.affectsConfiguration(InlineChatConfigKeys.ExpTextButtons) && toggleToolbar()));
-        toggleToolbar();
+        const toolbar2 = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar2, options.secondaryMenuId ?? MenuId.for(''), {
+            telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+            menuOptions: { renderShortTitle: true, shouldForwardArgs: true },
+            actionViewItemProvider: (action, options) => {
+                if (action instanceof MenuItemAction && action.item.id === MarkUnhelpfulActionId) {
+                    return scopedInstaService.createInstance(ChatVoteDownButton, action, options);
+                }
+                return createActionViewItem(scopedInstaService, action, options);
+            }
+        });
+        this._store.add(toolbar2.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
+        this._store.add(toolbar2);
         this._store.add(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
                 this._updateAriaLabel();
@@ -175,12 +214,12 @@ let InlineChatWidget = class InlineChatWidget {
                 const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
                 label = kbLabel
                     ? ( localize(
-                    11375,
+                    11456,
                     "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.",
                     kbLabel
                 ))
                     : ( localize(
-                    11376,
+                    11457,
                     "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information."
                 ));
             }
@@ -238,7 +277,7 @@ let InlineChatWidget = class InlineChatWidget {
         return value;
     }
     _getExtraHeight() {
-        return 4  + 2  + 4 ;
+        return 2  + 4 ;
     }
     get value() {
         return this._chatWidget.getInput();
@@ -259,6 +298,13 @@ let InlineChatWidget = class InlineChatWidget {
     set placeholder(value) {
         this._chatWidget.setInputPlaceholder(value);
     }
+    toggleStatus(show) {
+        this._elements.toolbar1.classList.toggle('hidden', !show);
+        this._elements.toolbar2.classList.toggle('hidden', !show);
+        this._elements.status.classList.toggle('hidden', !show);
+        this._elements.infoLabel.classList.toggle('hidden', !show);
+        this._onDidChangeHeight.fire();
+    }
     updateToolbar(show) {
         this._elements.root.classList.toggle('toolbar', show);
         this._elements.toolbar1.classList.toggle('hidden', !show);
@@ -292,11 +338,6 @@ let InlineChatWidget = class InlineChatWidget {
     setChatModel(chatModel) {
         this._chatWidget.setModel(chatModel, { inputValue: undefined });
     }
-    addToHistory(input) {
-        if (this._chatWidget.viewModel?.model === this._defaultChatModel) {
-            this._chatWidget.input.acceptInput(true);
-        }
-    }
     updateChatMessage(message, isIncomplete, isCodeBlockEditable) {
         if (!this._chatWidget.viewModel || this._chatWidget.viewModel.model !== this._defaultChatModel) {
             return;
@@ -393,7 +434,7 @@ InlineChatWidget = ( (__decorate([
     ( (__param(9, IChatService))),
     ( (__param(10, IHoverService)))
 ], InlineChatWidget)));
-const defaultAriaLabel = ( localize(11377, "Inline Chat Input"));
+const defaultAriaLabel = ( localize(11458, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     constructor(location, _parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService) {
         super(location, { ...options, chatWidgetViewOptions: { ...options.chatWidgetViewOptions, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() } }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js

@@ -1,25 +1,28 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, Dimension } from '../../../../base/browser/dom.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
-import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_ACCEPT_CHANGES, MENU_INLINE_CHAT_EXECUTE, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_SECONDARY, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { isResponseVM } from '../../chat/common/chatViewModel.js';
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     constructor(location, editor, _instaService, _logService, contextKeyService, configurationService) {
-        super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
+        super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 50000 });
         this._instaService = _instaService;
         this._logService = _logService;
+        this._scrollUp = this._disposables.add(( (new ScrollUpState(this.editor))));
         this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
         this._disposables.add(toDisposable(() => {
             this._ctxCursorPosition.reset();
@@ -28,22 +31,21 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             statusMenuId: {
                 menu: MENU_INLINE_CHAT_WIDGET_STATUS,
                 options: {
-                    buttonConfigProvider: action => {
-                        if (( (( (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF]))).has(action.id)))) {
-                            return { isSecondary: true, showIcon: true, showLabel: false };
-                        }
-                        else if (action.id === ACTION_ACCEPT_CHANGES) {
-                            return { isSecondary: false };
+                    buttonConfigProvider: (action, index) => {
+                        const isSecondary = index > 0;
+                        if (( (( (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE]))).has(action.id)))) {
+                            return { isSecondary, showIcon: true, showLabel: false };
                         }
                         else {
-                            return { isSecondary: true };
+                            return { isSecondary };
                         }
                     }
                 }
             },
+            secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
             chatWidgetViewOptions: {
                 menus: {
-                    executeToolbar: MENU_INLINE_CHAT_EXECUTE,
+                    executeToolbar: MenuId.ChatExecute,
                     telemetrySource: 'interactiveEditorWidget-toolbar',
                 },
                 rendererOptions: {
@@ -55,20 +57,19 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             }
         });
         this._disposables.add(this.widget);
-        let scrollState;
+        let revealFn;
         this._disposables.add(this.widget.chatWidget.onWillMaybeChangeHeight(() => {
             if (this.position) {
-                scrollState = StableEditorBottomScrollState.capture(this.editor);
+                revealFn = this._createZoneAndScrollRestoreFn(this.position);
             }
         }));
         this._disposables.add(this.widget.onDidChangeHeight(() => {
             if (this.position) {
-                scrollState ??= StableEditorBottomScrollState.capture(this.editor);
+                revealFn ??= this._createZoneAndScrollRestoreFn(this.position);
                 const height = this._computeHeight();
                 this._relayout(height.linesValue);
-                scrollState.restore(this.editor);
-                scrollState = undefined;
-                this._revealTopOfZoneWidget(this.position, height);
+                revealFn();
+                revealFn = undefined;
             }
         }));
         this.create();
@@ -119,41 +120,53 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     }
     show(position) {
         assertType(this.container);
-        const scrollState = StableEditorBottomScrollState.capture(this.editor);
         const info = this.editor.getLayoutInfo();
         const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
         this.container.style.marginLeft = `${marginWithoutIndentation}px`;
-        const height = this._computeHeight();
-        super.show(position, height.linesValue);
+        const revealZone = this._createZoneAndScrollRestoreFn(position);
+        super.show(position, this._computeHeight().linesValue);
         this.widget.chatWidget.setVisible(true);
         this.widget.focus();
-        scrollState.restore(this.editor);
-        this._revealTopOfZoneWidget(position, height);
+        revealZone();
+        this._scrollUp.enable();
     }
     updatePositionAndHeight(position) {
-        const scrollState = StableEditorBottomScrollState.capture(this.editor);
-        const height = this._computeHeight();
-        super.updatePositionAndHeight(position, height.linesValue);
-        scrollState.restore(this.editor);
-        this._revealTopOfZoneWidget(position, height);
+        const revealZone = this._createZoneAndScrollRestoreFn(position);
+        super.updatePositionAndHeight(position, this._computeHeight().linesValue);
+        revealZone();
     }
-    _revealTopOfZoneWidget(position, height) {
+    _createZoneAndScrollRestoreFn(position) {
+        const scrollState = StableEditorBottomScrollState.capture(this.editor);
         const lineNumber = position.lineNumber <= 1 ? 1 : 1 + position.lineNumber;
         const scrollTop = this.editor.getScrollTop();
         const lineTop = this.editor.getTopForLineNumber(lineNumber);
-        const zoneTop = lineTop - height.pixelsValue;
-        const editorHeight = this.editor.getLayoutInfo().height;
-        const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
-        let newScrollTop = zoneTop;
-        let forceScrollTop = false;
-        if (lineBottom >= (scrollTop + editorHeight)) {
-            newScrollTop = lineBottom - editorHeight;
-            forceScrollTop = true;
-        }
-        if (newScrollTop < scrollTop || forceScrollTop) {
-            this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
-            this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
+        const zoneTop = lineTop - this._computeHeight().pixelsValue;
+        const hasResponse = this.widget.chatWidget.viewModel?.getItems().find(candidate => {
+            return isResponseVM(candidate) && candidate.response.value.length > 0;
+        });
+        if (hasResponse && zoneTop < scrollTop || this._scrollUp.didScrollUpOrDown) {
+            return this._scrollUp.runIgnored(() => {
+                scrollState.restore(this.editor);
+            });
         }
+        return this._scrollUp.runIgnored(() => {
+            scrollState.restore(this.editor);
+            const scrollTop = this.editor.getScrollTop();
+            const lineTop = this.editor.getTopForLineNumber(lineNumber);
+            const zoneTop = lineTop - this._computeHeight().pixelsValue;
+            const editorHeight = this.editor.getLayoutInfo().height;
+            const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
+            let newScrollTop = zoneTop;
+            let forceScrollTop = false;
+            if (lineBottom >= (scrollTop + editorHeight)) {
+                newScrollTop = lineBottom - editorHeight;
+                forceScrollTop = true;
+            }
+            if (newScrollTop < scrollTop || forceScrollTop) {
+                this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
+                this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
+            }
+        });
     }
     revealRange(range, isLastLine) {
     }
@@ -162,11 +175,12 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     }
     hide() {
         const scrollState = StableEditorBottomScrollState.capture(this.editor);
+        this._scrollUp.disable();
         this._ctxCursorPosition.reset();
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10599, 'Closed inline chat widget')));
+        status(( localize(10639, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };
@@ -176,4 +190,42 @@ InlineChatZoneWidget = ( (__decorate([
     ( (__param(4, IContextKeyService))),
     ( (__param(5, IConfigurationService)))
 ], InlineChatZoneWidget)));
+class ScrollUpState {
+    constructor(_editor) {
+        this._editor = _editor;
+        this._ignoreEvents = false;
+        this._listener = ( (new MutableDisposable()));
+    }
+    dispose() {
+        this._listener.dispose();
+    }
+    enable() {
+        this._didScrollUpOrDown = undefined;
+        this._listener.value = this._editor.onDidScrollChange(e => {
+            if (!e.scrollTopChanged || this._ignoreEvents) {
+                return;
+            }
+            this._listener.clear();
+            this._didScrollUpOrDown = true;
+        });
+    }
+    disable() {
+        this._listener.clear();
+        this._didScrollUpOrDown = undefined;
+    }
+    runIgnored(callback) {
+        return () => {
+            this._ignoreEvents = true;
+            try {
+                return callback();
+            }
+            finally {
+                this._ignoreEvents = false;
+            }
+        };
+    }
+    get didScrollUpOrDown() {
+        return this._didScrollUpOrDown;
+    }
+}
 export { InlineChatZoneWidget };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:4px 6px 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding-left:6px;padding-right:20px;padding-top:2px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{right:10px;top:5px}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding:4px 6px 0}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto}.monaco-workbench .inline-chat .status .label.hidden{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 3px}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget .toolbar{display:flex;height:18px;.actions-container{gap:3px}.action-item.text-only .action-label{border-radius:2px;font-size:12px;line-height:16px;padding:0 4px}.monaco-action-bar .action-item.menu-entry.text-only+.action-item:not(.text-only)>.monaco-dropdown .action-label{font-size:12px;height:unset;line-height:16px;width:unset}}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget.contents .toolbar{.monaco-action-bar .action-item.menu-entry.text-only:first-of-type .action-label{background-color:var(--vscode-button-background);color:var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status{.actions.text-style{display:none}.actions.button-style{display:inherit}}.monaco-workbench .inline-chat .status.text{.actions.text-style{display:inherit}.actions.button-style{display:none}}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:4px}.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .inline-chat .status .actions .monaco-text-button{padding:0 2px;white-space:nowrap}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .diff-review{background-color:unset;padding:4px 6px}.monaco-workbench .inline-chat .diff-review.hidden{display:none}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:2px 6px 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups{margin:2px 0 0 4px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding-left:6px;padding-right:20px;padding-top:2px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{display:none;right:10px;top:5px}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding-left:6px;padding-right:6px;padding-top:6px}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto;padding-left:6px;padding-right:6px}.monaco-workbench .inline-chat .status .label.hidden,.monaco-workbench .inline-chat .status .label:empty{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 3px}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget .toolbar,.monaco-workbench .inline-chat-diff-overlay{display:flex;height:18px;.actions-container{gap:3px}.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-button.codicon{display:flex}.monaco-button.codicon:before{align-self:center;color:var(--vscode-button-foreground)}.monaco-button.secondary.codicon:before{align-self:center;color:var(--vscode-button-secondaryForeground)}.monaco-text-button{padding:0 2px;white-space:nowrap}}.monaco-workbench .inline-chat .status .actions{gap:4px}.monaco-workbench .inline-chat .status .actions.secondary{display:none}.monaco-workbench .inline-chat .status:focus-within .actions.secondary,.monaco-workbench .inline-chat .status:hover .actions.secondary,.monaco-workbench .inline-chat:focus .status .actions.secondary{display:inherit}.monaco-workbench .inline-chat-diff-overlay{.monaco-button{border-radius:0}.monaco-button.secondary.checked{background-color:var(--vscode-button-secondaryHoverBackground)}.monaco-button:first-child{border-bottom-left-radius:2px;border-top-left-radius:2px}.monaco-button:last-child{border-bottom-right-radius:2px;border-top-right-radius:2px}.monaco-button:not(:last-child){border-right:1px solid var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .diff-review{background-color:unset;padding:4px 6px}.monaco-workbench .inline-chat .diff-review.hidden{display:none}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .inline-chat-content-widget{background-color:var(--vscode-inlineChat-background);border-radius:4px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);padding:6px;z-index:50}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session{max-width:unset}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact{padding:0}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-list{display:none}.monaco-workbench .inline-chat-content-widget.interactive-session .toolbar{display:none;padding-top:4px}";
+var css = ".monaco-workbench .inline-chat-content-widget{background-color:var(--vscode-inlineChat-background);border-radius:4px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);z-index:50}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session{max-width:unset}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact{padding:6px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-list{display:none}.monaco-workbench .inline-chat-content-widget.interactive-session .toolbar{display:none;padding-top:4px}";
 n(css,{});
 export { css, css as default };