@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js

@@ -1,41 +1,42 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { $ as $$1 } from '../../../../../base/browser/dom.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../../base/common/network.js';
-import { isEqual } from '../../../../../base/common/resources.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
-import { TextEdit } from '../../../../../editor/common/languages.js';
-import { createTextBufferFactoryFromSnapshot } from '../../../../../editor/common/model/textModel.js';
-import { IModelService } from '../../../../../editor/common/services/model.js';
-import { DefaultModelSHA1Computer } from '../../../../../editor/common/services/modelService.js';
-import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import '../../../../../base/common/network.js';
+import '../../../../../base/common/resources.js';
+import { assertType } from '../../../../../base/common/types.js';
+import '../../../../../base/common/charCode.js';
+import '../../../../../base/common/marshallingIds.js';
+import '../../../../../base/common/path.js';
+import '../../../../../base/common/platform.js';
+import '../../../../../editor/common/languages.js';
+import '../../../../../editor/common/model/textModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import '../../../../../editor/common/services/modelService.js';
 import { localize } from '../../../../../nls.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import '../../../../../platform/instantiation/common/extensions.js';
 import { ResourcePool } from './chatCollections.js';
 import { CodeCompareBlockPart } from '../codeBlockPart.js';
-import { IChatService } from '../../common/chatService.service.js';
 import { isResponseVM } from '../../common/chatViewModel.js';
+import { ICodeCompareModelService } from './chatTextEditContentPart.service.js';
 const $ = $$1;
 let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
-    constructor(chatTextEdit, context, rendererOptions, diffEditorPool, currentWidth, textModelService, modelService, chatService) {
+    constructor(chatTextEdit, context, rendererOptions, diffEditorPool, currentWidth, codeCompareModelService) {
         super();
-        this.textModelService = textModelService;
-        this.modelService = modelService;
-        this.chatService = chatService;
+        this.codeCompareModelService = codeCompareModelService;
         this._onDidChangeHeight = this._register(( (new Emitter())));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         const element = context.element;
+        assertType(isResponseVM(element));
         if (rendererOptions.renderTextEditsAsSummary?.(chatTextEdit.uri)) {
-            if (isResponseVM(element) && element.response.value.every(item => item.kind === 'textEditGroup')) {
+            if (element.response.value.every(item => item.kind === 'textEditGroup')) {
                 this.domNode = $('.interactive-edits-summary', undefined, !element.isComplete
-                    ? ( localize(10575, "Making changes..."))
+                    ? ''
                     : element.isCanceled
-                        ? ( localize(10576, "Making changes was aborted."))
-                        : ( localize(10577, "Made changes.")));
+                        ? ( localize(10622, "Making changes was aborted."))
+                        : ( localize(10623, "Made changes.")));
             }
             else {
                 this.domNode = $('div');
@@ -47,76 +48,34 @@ let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
             this._register(toDisposable(() => {
                 isDisposed = true;
                 cts.dispose(true);
-                this.ref?.object.clearModel();
             }));
-            this.ref = this._register(diffEditorPool.get());
-            this._register(this.ref.object.onDidChangeContentHeight(() => {
+            this.comparePart = this._register(diffEditorPool.get());
+            this._register(this.comparePart.object.onDidChangeContentHeight(() => {
                 this._onDidChangeHeight.fire();
             }));
             const data = {
                 element,
                 edit: chatTextEdit,
                 diffData: (async () => {
-                    const ref = await this.textModelService.createModelReference(chatTextEdit.uri);
+                    const ref = await this.codeCompareModelService.createModel(element, chatTextEdit);
                     if (isDisposed) {
                         ref.dispose();
                         return;
                     }
                     this._register(ref);
-                    const original = ref.object.textEditorModel;
-                    let originalSha1 = '';
-                    if (chatTextEdit.state) {
-                        originalSha1 = chatTextEdit.state.sha1;
-                    }
-                    else {
-                        const sha1 = ( (new DefaultModelSHA1Computer()));
-                        if (sha1.canComputeSHA1(original)) {
-                            originalSha1 = sha1.computeSHA1(original);
-                            chatTextEdit.state = { sha1: originalSha1, applied: 0 };
-                        }
-                    }
-                    const modified = this.modelService.createModel(createTextBufferFactoryFromSnapshot(original.createSnapshot()), { languageId: original.getLanguageId(), onDidChange: Event.None }, ( (URI.from(
-                        { scheme: Schemas.vscodeChatCodeBlock, path: original.uri.path, query: generateUuid() }
-                    ))), false);
-                    const modRef = await this.textModelService.createModelReference(modified.uri);
-                    this._register(modRef);
-                    const editGroups = [];
-                    if (isResponseVM(element)) {
-                        const chatModel = this.chatService.getSession(element.sessionId);
-                        for (const request of chatModel.getRequests()) {
-                            if (!request.response) {
-                                continue;
-                            }
-                            for (const item of request.response.response.value) {
-                                if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
-                                    continue;
-                                }
-                                for (const group of item.edits) {
-                                    const edits = ( (group.map(TextEdit.asEditOperation)));
-                                    editGroups.push(edits);
-                                }
-                            }
-                            if (request.response === element.model) {
-                                break;
-                            }
-                        }
-                    }
-                    for (const edits of editGroups) {
-                        modified.pushEditOperations(null, edits, () => null);
-                    }
                     return {
-                        modified,
-                        original,
-                        originalSha1
+                        modified: ref.object.modified.textEditorModel,
+                        original: ref.object.original.textEditorModel,
+                        originalSha1: ref.object.originalSha1
                     };
                 })()
             };
-            this.ref.object.render(data, currentWidth, cts.token);
-            this.domNode = this.ref.object.element;
+            this.comparePart.object.render(data, currentWidth, cts.token);
+            this.domNode = this.comparePart.object.element;
         }
     }
     layout(width) {
-        this.ref?.object.layout(width);
+        this.comparePart?.object.layout(width);
     }
     hasSameContent(other) {
         return other.kind === 'textEditGroup';
@@ -126,9 +85,7 @@ let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
     }
 };
 ChatTextEditContentPart = ( (__decorate([
-    ( (__param(5, ITextModelService))),
-    ( (__param(6, IModelService))),
-    ( (__param(7, IChatService)))
+    ( (__param(5, ICodeCompareModelService)))
 ], ChatTextEditContentPart)));
 let DiffEditorPool = class DiffEditorPool extends Disposable {
     inUse() {

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+const ICodeCompareModelService = ( createDecorator('ICodeCompareModelService'));
+export { ICodeCompareModelService };

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js

@@ -79,7 +79,7 @@ let TreePool = class TreePool extends Disposable {
             },
             accessibilityProvider: {
                 getAriaLabel: (element) => element.label,
-                getWidgetAriaLabel: () => ( localize(10578, "File Tree"))
+                getWidgetAriaLabel: () => ( localize(10624, "File Tree"))
             },
             alwaysConsumeMouseWheel: false
         });

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".chat-confirmation-widget{border:1px solid var(--vscode-chat-requestBorder);border-radius:4px;margin-bottom:16px;padding:8px 12px 12px}.chat-confirmation-widget .chat-confirmation-widget-title{font-weight:600}.chat-confirmation-widget .chat-confirmation-widget-title p{margin:0 0 4px}.chat-confirmation-widget .chat-confirmation-widget-message .rendered-markdown p{margin-top:0}.chat-confirmation-widget .chat-confirmation-widget-message .rendered-markdown>:last-child{margin-bottom:0}.chat-confirmation-widget .chat-confirmation-buttons-container{display:flex;gap:8px;margin-top:13px}.chat-confirmation-widget.hideButtons .chat-confirmation-buttons-container{display:none}";
+var css = ".chat-confirmation-widget{border:1px solid var(--vscode-chat-requestBorder);border-radius:4px;padding:8px 12px 12px}.chat-confirmation-widget:not(:last-child){margin-bottom:16px}.chat-confirmation-widget .chat-confirmation-widget-title{font-weight:600}.chat-confirmation-widget .chat-confirmation-widget-title p{margin:0 0 4px}.chat-confirmation-widget .chat-confirmation-widget-message .rendered-markdown p{margin-top:0}.chat-confirmation-widget .chat-confirmation-widget-message .rendered-markdown>:last-child{margin-bottom:0}.chat-confirmation-widget .chat-confirmation-buttons-container{display:flex;gap:8px;margin-top:13px}.chat-confirmation-widget.hideButtons .chat-confirmation-buttons-container{display:none}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js

@@ -12,7 +12,7 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatService } from '../common/chatService.service.js';
 var ChatEditorInput_1;
-const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.commentDiscussion, ( localize(7137, 'Icon of the chat editor label.')));
+const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.commentDiscussion, ( localize(7134, 'Icon of the chat editor label.')));
 let ChatEditorInput = class ChatEditorInput extends EditorInput {
     static { ChatEditorInput_1 = this; }
     static { this.countsInUse = ( (new Set())); }
@@ -58,7 +58,7 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         return ChatEditorInput_1.TypeID;
     }
     getName() {
-        return this.model?.title || ( localize(7138, "Chat")) + (this.inputCount > 0 ? ` ${this.inputCount + 1}` : '');
+        return this.model?.title || ( localize(7135, "Chat")) + (this.inputCount > 0 ? ` ${this.inputCount + 1}` : '');
     }
     getIcon() {
         return ChatEditorIcon;

package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js

@@ -5,7 +5,7 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
-import { chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
+import { formatChatQuestion } from '../common/chatParserTypes.js';
 const $ = $$1;
 let ChatFollowups = class ChatFollowups extends Disposable {
     constructor(container, followups, location, options, clickHandler, chatAgentService) {
@@ -21,16 +21,9 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         if (!this.chatAgentService.getDefaultAgent(this.location)) {
             return;
         }
-        let tooltipPrefix = '';
-        if ('agentId' in followup && followup.agentId && followup.agentId !== this.chatAgentService.getDefaultAgent(this.location)?.id) {
-            const agent = this.chatAgentService.getAgent(followup.agentId);
-            if (!agent) {
-                return;
-            }
-            tooltipPrefix += `${chatAgentLeader}${agent.name} `;
-            if ('subCommand' in followup && followup.subCommand) {
-                tooltipPrefix += `${chatSubcommandLeader}${followup.subCommand} `;
-            }
+        const tooltipPrefix = formatChatQuestion(this.chatAgentService, this.location, '', followup.agentId, followup.subCommand);
+        if (tooltipPrefix === undefined) {
+            return;
         }
         const baseTitle = followup.kind === 'reply' ?
             (followup.title || followup.message)
@@ -45,7 +38,7 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         else if (followup.kind === 'command') {
             button.element.classList.add('interactive-followup-command');
         }
-        button.element.ariaLabel = ( localize(10555, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(10611, "Follow up question: {0}", baseTitle));
         button.label = ( (new MarkdownString(baseTitle)));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js

@@ -16,7 +16,8 @@ import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExten
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController2.js';
+import { MarginHoverController } from '../../../../editor/contrib/hover/browser/marginHoverController.js';
 import { localize } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
@@ -44,7 +45,7 @@ import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_IN_CHAT_INPUT } from '../common/chatContextKeys.js';
 import { IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.service.js';
-import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
 var ChatInputPart_1;
 const $ = $$1;
 const INPUT_EDITOR_MAX_HEIGHT = 250;
@@ -62,10 +63,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return this._inputEditor;
     }
     constructor(
-    location, options, historyService, modelService, instantiationService, contextKeyService, configurationService, keybindingService, accessibilityService, logService) {
+    location, options, getInputState, historyService, modelService, instantiationService, contextKeyService, configurationService, keybindingService, accessibilityService, logService) {
         super();
         this.location = location;
         this.options = options;
+        this.getInputState = getInputState;
         this.historyService = historyService;
         this.modelService = modelService;
         this.instantiationService = instantiationService;
@@ -122,15 +124,15 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (verbose) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel ? ( localize(
-                7014,
+                6989,
                 "Chat Input,  Type to ask questions or type / for topics, press enter to send out the request. Use {0} for Chat Accessibility Help.",
                 kbLabel
             )) : ( localize(
-                7015,
+                6990,
                 "Chat Input,  Type code here and press Enter to run. Use the Chat Accessibility Help command for more information."
             ));
         }
-        return ( localize(7016, "Chat Input"));
+        return ( localize(6991, "Chat Input"));
     }
     updateState(inputState) {
         if (this.inHistoryNavigation) {
@@ -163,28 +165,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return this.container;
     }
     showPreviousValue() {
+        const inputState = this.getInputState();
         if (this.history.isAtEnd()) {
-            this.saveCurrentValue();
+            this.saveCurrentValue(inputState);
         }
         else {
-            if (!( (this.history.has(
-                { text: this._inputEditor.getValue(), state: this.history.current().state }
-            )))) {
-                this.saveCurrentValue();
+            if (!( (this.history.has({ text: this._inputEditor.getValue(), state: inputState })))) {
+                this.saveCurrentValue(inputState);
                 this.history.resetCursor();
             }
         }
         this.navigateHistory(true);
     }
     showNextValue() {
+        const inputState = this.getInputState();
         if (this.history.isAtEnd()) {
             return;
         }
         else {
-            if (!( (this.history.has(
-                { text: this._inputEditor.getValue(), state: this.history.current().state }
-            )))) {
-                this.saveCurrentValue();
+            if (!( (this.history.has({ text: this._inputEditor.getValue(), state: inputState })))) {
+                this.saveCurrentValue(inputState);
                 this.history.resetCursor();
             }
         }
@@ -213,11 +213,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.inputEditor.setValue(value);
         this.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
         if (!transient) {
-            this.saveCurrentValue();
+            this.saveCurrentValue(this.getInputState());
         }
     }
-    saveCurrentValue() {
-        const newEntry = { text: this._inputEditor.getValue(), state: this.history.current().state };
+    saveCurrentValue(inputState) {
+        const newEntry = { text: this._inputEditor.getValue(), state: inputState };
         this.history.replaceLast(newEntry);
     }
     focus() {
@@ -229,10 +229,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     async acceptInput(isUserQuery) {
         if (isUserQuery) {
             const userQuery = this._inputEditor.getValue();
-            const entry = { text: userQuery, state: this.history.current().state };
+            const entry = { text: userQuery, state: this.getInputState() };
             this.history.replaceLast(entry);
             this.history.add({ text: '' });
         }
+        this._attachedContext.clear();
         this._onDidLoadInputState.fire({});
         if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
             this._acceptInputForVoiceover();
@@ -252,13 +253,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._inputEditorElement.appendChild(domNode);
         this._inputEditor.focus();
     }
-    clearContext() {
-        if (this._attachedContext.size > 0) {
-            const removed = Array.from(this._attachedContext);
-            this._attachedContext.clear();
-            this._onDidChangeContext.fire({ removed });
-        }
-    }
     attachContext(overwrite, ...contentReferences) {
         const removed = [];
         if (overwrite) {
@@ -280,11 +274,21 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     render(container, initialValue, widget) {
         this.container = append(container, $('.interactive-input-part'));
         this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
-        this.followupsContainer = append(this.container, $('.interactive-input-followups'));
-        this.attachedContextContainer = append(this.container, $('.chat-attached-context'));
+        let inputContainer;
+        let inputAndSideToolbar;
+        if (this.options.renderStyle === 'compact') {
+            inputAndSideToolbar = append(this.container, $('.interactive-input-and-side-toolbar'));
+            this.followupsContainer = append(this.container, $('.interactive-input-followups'));
+            inputContainer = append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
+            this.attachedContextContainer = append(this.container, $('.chat-attached-context'));
+        }
+        else {
+            this.followupsContainer = append(this.container, $('.interactive-input-followups'));
+            this.attachedContextContainer = append(this.container, $('.chat-attached-context'));
+            inputAndSideToolbar = append(this.container, $('.interactive-input-and-side-toolbar'));
+            inputContainer = append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
+        }
         this.initAttachedContext(this.attachedContextContainer);
-        const inputAndSideToolbar = append(this.container, $('.interactive-input-and-side-toolbar'));
-        const inputContainer = append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
         const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
         CONTEXT_IN_CHAT_INPUT.bindTo(inputScopedContextKeyService).set(true);
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, inputScopedContextKeyService])))));
@@ -311,9 +315,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         };
         options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
         options.stickyScroll = { enabled: false };
-        this._inputEditorElement = append(inputContainer, $('.interactive-input-editor'));
+        this._inputEditorElement = append(inputContainer, $(chatInputEditorContainerSelector));
         const editorOptions = getSimpleCodeEditorWidgetOptions();
-        editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([HoverController.ID]));
+        editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, MarginHoverController.ID]));
         this._inputEditor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions));
         this._register(this._inputEditor.onDidChangeModelContent(() => {
             const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
@@ -335,16 +339,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             inputContainer.classList.toggle('focused', false);
             this._onDidBlur.fire();
         }));
-        this._register(this._inputEditor.onDidChangeCursorPosition(e => {
-            const model = this._inputEditor.getModel();
-            if (!model) {
-                return;
-            }
-            const atTop = e.position.column === 1 && e.position.lineNumber === 1;
-            this.chatCursorAtTop.set(atTop);
-            this.historyNavigationBackwardsEnablement.set(atTop);
-            this.historyNavigationForewardsEnablement.set(e.position.equals(getLastPosition(model)));
-        }));
         this.toolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, inputContainer, this.options.menus.executeToolbar, {
             telemetrySource: this.options.menus.telemetrySource,
             menuOptions: {
@@ -354,7 +348,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             actionViewItemProvider: (action, options) => {
                 if (this.location === ChatAgentLocation.Panel) {
                     if ((action.id === SubmitAction.ID || action.id === CancelAction.ID) && action instanceof MenuItemAction) {
-                        const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: ( localize(7017, "More...")), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
+                        const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: ( localize(6992, "More...")), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
                         return this.instantiationService.createInstance(ChatSubmitDropdownActionItem, action, dropdownAction);
                     }
                 }
@@ -392,8 +386,24 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             const lineNumber = this.inputModel.getLineCount();
             this._inputEditor.setPosition({ lineNumber, column: this.inputModel.getLineMaxColumn(lineNumber) });
         }
+        const onDidChangeCursorPosition = () => {
+            const model = this._inputEditor.getModel();
+            if (!model) {
+                return;
+            }
+            const position = this._inputEditor.getPosition();
+            if (!position) {
+                return;
+            }
+            const atTop = position.column === 1 && position.lineNumber === 1;
+            this.chatCursorAtTop.set(atTop);
+            this.historyNavigationBackwardsEnablement.set(atTop);
+            this.historyNavigationForewardsEnablement.set(position.equals(getLastPosition(model)));
+        };
+        this._register(this._inputEditor.onDidChangeCursorPosition(e => onDidChangeCursorPosition()));
+        onDidChangeCursorPosition();
     }
-    initAttachedContext(container) {
+    initAttachedContext(container, isLayout = false) {
         const oldHeight = container.offsetHeight;
         clearNode(container);
         this.attachedContextDisposables.clear();
@@ -411,12 +421,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 const fileDirname = dirname(file.path);
                 const friendlyName = `${fileBasename} ${fileDirname}`;
                 const ariaLabel = range ? ( localize(
-                    7018,
+                    6993,
                     "Attached file, {0}, line {1} to line {2}",
                     friendlyName,
                     range.startLineNumber,
                     range.endLineNumber
-                )) : ( localize(7019, "Attached file, {0}", friendlyName));
+                )) : ( localize(6994, "Attached file, {0}", friendlyName));
                 label.setFile(file, {
                     fileKind: FileKind.FILE,
                     hidePath: true,
@@ -429,7 +439,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 const attachmentLabel = attachment.fullName ?? attachment.name;
                 const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
                 label.setLabel(withIcon, undefined);
-                widget.ariaLabel = ( localize(7020, "Attached context, {0}", attachment.name));
+                widget.ariaLabel = ( localize(6995, "Attached context, {0}", attachment.name));
                 widget.tabIndex = 0;
             }
             const clearButton = ( (new Button(widget, { supportIcons: true })));
@@ -452,7 +462,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             });
             this.attachedContextDisposables.add(disp);
         });
-        if (oldHeight !== container.offsetHeight) {
+        if (oldHeight !== container.offsetHeight && !isLayout) {
             this._onDidChangeHeight.fire();
         }
     }
@@ -476,7 +486,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return this._layout(height, width);
     }
     _layout(height, width, allowRecurse = true) {
-        this.initAttachedContext(this.attachedContextContainer);
+        this.initAttachedContext(this.attachedContextContainer, true);
         const data = this.getLayoutData();
         const inputEditorHeight = Math.min(data.inputPartEditorHeight, height - data.followupsHeight - data.inputPartVerticalPadding);
         const followupsWidth = width - data.inputPartHorizontalPadding;
@@ -498,30 +508,31 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             inputEditorBorder: 2,
             followupsHeight: this.followupsContainer.offsetHeight,
             inputPartEditorHeight: Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight),
-            inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 8 : 40,
+            inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 12 : 40,
             inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 24,
             implicitContextHeight: this.attachedContextContainer.offsetHeight,
             editorBorder: 2,
             editorPadding: 12,
-            toolbarPadding: 4,
+            toolbarPadding: (this.toolbar.getItemsLength() - 1) * 4,
             executeToolbarWidth: this.cachedToolbarWidth = this.toolbar.getItemsWidth(),
             sideToolbarWidth: this.inputSideToolbarContainer ? getTotalWidth(this.inputSideToolbarContainer) + 4  : 0,
         };
     }
     saveState() {
+        this.saveCurrentValue(this.getInputState());
         const inputHistory = [...this.history];
         this.historyService.saveHistory(this.location, inputHistory);
     }
 };
 ChatInputPart = ChatInputPart_1 = ( (__decorate([
-    ( (__param(2, IChatWidgetHistoryService))),
-    ( (__param(3, IModelService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IContextKeyService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IKeybindingService))),
-    ( (__param(8, IAccessibilityService))),
-    ( (__param(9, ILogService)))
+    ( (__param(3, IChatWidgetHistoryService))),
+    ( (__param(4, IModelService))),
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IContextKeyService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IKeybindingService))),
+    ( (__param(9, IAccessibilityService))),
+    ( (__param(10, ILogService)))
 ], ChatInputPart)));
 const historyKeyFn = (entry) => JSON.stringify(entry);
 function getLastPosition(model) {
@@ -540,7 +551,7 @@ let ChatSubmitDropdownActionItem = class ChatSubmitDropdownActionItem extends Dr
             if (secondaryAgent) {
                 secondary.forEach(a => {
                     if (a.id === ChatSubmitSecondaryAgentAction.ID) {
-                        a.label = ( localize(7021, "Send to @{0}", secondaryAgent.name));
+                        a.label = ( localize(6996, "Send to @{0}", secondaryAgent.name));
                     }
                     return a;
                 });
@@ -561,4 +572,6 @@ ChatSubmitDropdownActionItem = ( (__decorate([
     ( (__param(8, IThemeService))),
     ( (__param(9, IAccessibilityService)))
 ], ChatSubmitDropdownActionItem)));
+const chatInputEditorContainerSelector = '.interactive-input-editor';
+setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
 export { ChatInputPart };