@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -1,15 +1,17 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { findParentWithClass, getTopLeftOffset, append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
+import { findParentWithClass, getTopLeftOffset, append, setVisibility, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { timeout, disposableTimeout } from '../../../../base/common/async.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, MutableDisposable, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { extUri, isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
-import './media/chat.css.js';
-import './media/chatAgentHover.css.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -17,21 +19,29 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import { IChatWidgetService, IChatAccessibilityService } from './chat.service.js';
-import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
-import { ChatInputPart } from './chatInputPart.js';
-import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
-import { ChatEditorOptions } from './chatOptions.js';
+import { TerminalChatController } from '../../terminalContrib/chat/browser/terminalChatController.js';
+import '../../terminalContrib/chat/browser/terminalChat.js';
+import { isChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_LOCATION, CONTEXT_IN_QUICK_CHAT, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
-import { ChatModelInitState } from '../common/chatModel.js';
-import { ChatRequestAgentPart, formatChatQuestion, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_LOCATION, CONTEXT_IN_QUICK_CHAT, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_LAST_ITEM_ID, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
+import { IChatEditingService } from '../common/chatEditingService.service.js';
+import { formatChatQuestion, ChatRequestAgentPart, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
 import { IChatService } from '../common/chatService.service.js';
 import { IChatSlashCommandService } from '../common/chatSlashCommands.service.js';
-import { isResponseVM, isRequestVM, isWelcomeVM, ChatViewModel } from '../common/chatViewModel.js';
+import { isResponseVM, isRequestVM, ChatViewModel } from '../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { IChatWidgetService, IChatAccessibilityService } from './chat.service.js';
+import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
+import { ChatDragAndDrop } from './chatDragAndDrop.js';
+import { ChatImageDropAndPaste } from './chatImagePaste.js';
+import { ChatInputPart } from './chatInputPart.js';
+import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
+import './media/chat.css.js';
+import './media/chatAgentHover.css.js';
 var ChatWidget_1;
 const $ = $$1;
 function revealLastElement(list) {
@@ -40,6 +50,7 @@ function revealLastElement(list) {
 function isQuickChat(widget) {
     return 'viewContext' in widget && 'isQuickChat' in widget.viewContext && Boolean(widget.viewContext.isQuickChat);
 }
+const PersistWelcomeMessageContentKey = 'chat.welcomeMessageContent';
 let ChatWidget = class ChatWidget extends Disposable {
     static { ChatWidget_1 = this; }
     static { this.CONTRIBS = []; }
@@ -62,8 +73,10 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     get parsedInput() {
         if (this.parsedChatRequest === undefined) {
+            if (!this.viewModel) {
+                return { text: '', parts: [] };
+            }
             this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
-            this.agentInInput.set((!!this.parsedChatRequest.parts.find(part => part instanceof ChatRequestAgentPart)));
         }
         return this.parsedChatRequest;
     }
@@ -73,7 +86,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     get location() {
         return this._location.location;
     }
-    constructor(location, _viewContext, viewOptions, styles, codeEditorService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService) {
+    constructor(location, _viewContext, viewOptions, styles, codeEditorService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService, chatEditingService, storageService) {
         super();
         this.viewOptions = viewOptions;
         this.styles = styles;
@@ -86,37 +99,39 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.logService = logService;
         this.themeService = themeService;
         this.chatSlashCommandService = chatSlashCommandService;
-        this._onDidSubmitAgent = this._register(( new Emitter()));
+        this.chatEditingService = chatEditingService;
+        this.storageService = storageService;
+        this._onDidSubmitAgent = this._register(( (new Emitter())));
         this.onDidSubmitAgent = this._onDidSubmitAgent.event;
-        this._onDidChangeAgent = this._register(( new Emitter()));
+        this._onDidChangeAgent = this._register(( (new Emitter())));
         this.onDidChangeAgent = this._onDidChangeAgent.event;
-        this._onDidFocus = this._register(( new Emitter()));
+        this._onDidFocus = this._register(( (new Emitter())));
         this.onDidFocus = this._onDidFocus.event;
-        this._onDidChangeViewModel = this._register(( new Emitter()));
+        this._onDidChangeViewModel = this._register(( (new Emitter())));
         this.onDidChangeViewModel = this._onDidChangeViewModel.event;
-        this._onDidScroll = this._register(( new Emitter()));
+        this._onDidScroll = this._register(( (new Emitter())));
         this.onDidScroll = this._onDidScroll.event;
-        this._onDidClear = this._register(( new Emitter()));
+        this._onDidClear = this._register(( (new Emitter())));
         this.onDidClear = this._onDidClear.event;
-        this._onDidAcceptInput = this._register(( new Emitter()));
+        this._onDidAcceptInput = this._register(( (new Emitter())));
         this.onDidAcceptInput = this._onDidAcceptInput.event;
-        this._onDidChangeContext = this._register(( new Emitter()));
+        this._onDidChangeContext = this._register(( (new Emitter())));
         this.onDidChangeContext = this._onDidChangeContext.event;
-        this._onDidHide = this._register(( new Emitter()));
+        this._onDidHide = this._register(( (new Emitter())));
         this.onDidHide = this._onDidHide.event;
-        this._onDidChangeParsedInput = this._register(( new Emitter()));
+        this._onDidChangeParsedInput = this._register(( (new Emitter())));
         this.onDidChangeParsedInput = this._onDidChangeParsedInput.event;
-        this._onWillMaybeChangeHeight = ( new Emitter());
+        this._onWillMaybeChangeHeight = ( (new Emitter()));
         this.onWillMaybeChangeHeight = this._onWillMaybeChangeHeight.event;
-        this._onDidChangeHeight = this._register(( new Emitter()));
+        this._onDidChangeHeight = this._register(( (new Emitter())));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
-        this._onDidChangeContentHeight = ( new Emitter());
+        this._onDidChangeContentHeight = ( (new Emitter()));
         this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
         this.contribs = [];
         this.visibleChangeCount = 0;
         this._visible = false;
         this.previousTreeScrollHeight = 0;
-        this.viewModelDisposables = this._register(( new DisposableStore()));
+        this.viewModelDisposables = this._register(( (new DisposableStore())));
         this.viewContext = _viewContext ?? {};
         if (typeof location === 'object') {
             this._location = location;
@@ -128,9 +143,26 @@ let ChatWidget = class ChatWidget extends Disposable {
         CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(this._location.location);
         CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set(isQuickChat(this));
         this.agentInInput = CONTEXT_CHAT_INPUT_HAS_AGENT.bindTo(contextKeyService);
+        this.agentSupportsModelPicker = CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER.bindTo(contextKeyService);
         this.requestInProgress = CONTEXT_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
         this._register(chatWidgetService.register(this));
         this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
+        const chatEditingSessionDisposables = this._register(( (new DisposableStore())));
+        this._register(this.chatEditingService.onDidCreateEditingSession((session) => {
+            if (session.chatSessionId !== this.viewModel?.sessionId) {
+                return;
+            }
+            chatEditingSessionDisposables.clear();
+            this.renderChatEditingSessionState(null);
+            chatEditingSessionDisposables.add(session.onDidChange(() => {
+                this.renderChatEditingSessionState(session);
+            }));
+            chatEditingSessionDisposables.add(session.onDidDispose(() => {
+                chatEditingSessionDisposables.clear();
+                this.renderChatEditingSessionState(null);
+            }));
+            this.renderChatEditingSessionState(session);
+        }));
         this._register(codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
             const resource = input.resource;
             if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
@@ -174,6 +206,11 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             return null;
         }));
+        const loadedWelcomeContent = storageService.getObject(PersistWelcomeMessageContentKey, -1 );
+        if (isChatWelcomeMessageContent(loadedWelcomeContent)) {
+            this.persistedWelcomeMessage = loadedWelcomeContent;
+        }
+        this._register(this.onDidChangeParsedInput(() => this.updateChatInputContext()));
     }
     set lastSelectedAgent(agent) {
         this.parsedChatRequest = undefined;
@@ -205,6 +242,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
         const renderStyle = this.viewOptions.renderStyle;
         this.container = append(parent, $('.interactive-session'));
+        this.welcomeMessageContainer = append(this.container, $('.chat-welcome-view', { style: 'display: none' }));
+        this.renderWelcomeViewContentIfNeeded();
         if (renderInputOnTop) {
             this.createInput(this.container, { renderFollowups, renderStyle });
             this.listContainer = append(this.container, $(`.interactive-list`));
@@ -220,7 +259,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.onDidChangeItems();
             revealLastElement(this.tree);
         }
-        this.contribs = ( ChatWidget_1.CONTRIBS.map(contrib => {
+        this.contribs = ( (ChatWidget_1.CONTRIBS.map(contrib => {
             try {
                 return this._register(this.instantiationService.createInstance(contrib, this));
             }
@@ -228,7 +267,9 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.logService.error('Failed to instantiate chat widget contrib', toErrorMessage(err));
                 return undefined;
             }
-        })).filter(isDefined);
+        }))).filter(isDefined);
+        this._register(this.instantiationService.createInstance(ChatDragAndDrop, this.container, this.inputPart, this.styles));
+        this._register(this.instantiationService.createInstance(ChatImageDropAndPaste, this.inputPart));
     }
     getContrib(id) {
         return this.contribs.find(c => c.id === id);
@@ -266,21 +307,21 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     onDidChangeItems(skipDynamicLayout) {
         if (this.tree && this._visible) {
-            const treeItems = ( (this.viewModel?.getItems() ?? [])
+            const treeItems = ( ((this.viewModel?.getItems() ?? [])
                 .map((item) => {
                 return {
                     element: item,
                     collapsed: false,
                     collapsible: false
                 };
-            }));
+            })));
+            this.renderWelcomeViewContentIfNeeded();
             this._onWillMaybeChangeHeight.fire();
             this.tree.setChildren(null, treeItems, {
                 diffIdentityProvider: {
                     getId: (element) => {
-                        return ((isResponseVM(element) || isRequestVM(element)) ? element.dataId : element.id) +
-                            ((isWelcomeVM(element) && this.viewModel) ? `_${ChatModelInitState[this.viewModel.initState]}` : '') +
-                            `${(isRequestVM(element) || isWelcomeVM(element)) }` +
+                        return element.dataId +
+                            `${(isRequestVM(element)) }` +
                             `${isResponseVM(element) && element.renderData ? `_${this.visibleChangeCount}` : ''}` +
                             (isResponseVM(element) ? `_${element.contentReferences.length}` : '') +
                             (isRequestVM(element) && element.contentReferences ? `_${element.contentReferences?.length}` : '');
@@ -291,17 +332,53 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.layoutDynamicChatTreeItemMode();
             }
             const lastItem = treeItems[treeItems.length - 1]?.element;
+            if (lastItem) {
+                CONTEXT_LAST_ITEM_ID.bindTo(this.contextKeyService).set([lastItem.id]);
+            }
             if (lastItem && isResponseVM(lastItem) && lastItem.isComplete) {
                 this.renderFollowups(lastItem.replyFollowups, lastItem);
             }
-            else if (lastItem && isWelcomeVM(lastItem)) {
-                this.renderFollowups(lastItem.sampleQuestions);
+            else if (!treeItems.length && this.viewModel) {
+                this.renderFollowups(this.viewModel.model.sampleQuestions);
             }
             else {
                 this.renderFollowups(undefined);
             }
         }
     }
+    renderWelcomeViewContentIfNeeded() {
+        const welcomeContent = this.viewModel?.model.welcomeMessage ?? this.persistedWelcomeMessage;
+        if (welcomeContent && this.welcomeMessageContainer.children.length === 0 && !this.viewOptions.renderStyle) {
+            const icon = append(this.welcomeMessageContainer, $('.chat-welcome-view-icon'));
+            const title = append(this.welcomeMessageContainer, $('.chat-welcome-view-title'));
+            const message = append(this.welcomeMessageContainer, $('.chat-welcome-view-message'));
+            const tips = append(this.welcomeMessageContainer, $('.chat-welcome-view-tips'));
+            icon.appendChild(renderIcon(welcomeContent.icon));
+            title.textContent = welcomeContent.title;
+            const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+            const messageResult = this._register(renderer.render(welcomeContent.message));
+            append(message, messageResult.element);
+            const tipsString = ( (new MarkdownString(( localize(
+                3153,
+                "{0} to attach context\n\n{1} to chat with extensions",
+                '$(attach)',
+                '$(mention)'
+            )), { supportThemeIcons: true })));
+            const tipsResult = this._register(renderer.render(tipsString));
+            tips.appendChild(tipsResult.element);
+        }
+        if (!this.viewOptions.renderStyle && this.viewModel) {
+            const treeItems = this.viewModel.getItems();
+            setVisibility(treeItems.length === 0, this.welcomeMessageContainer);
+            setVisibility(treeItems.length !== 0, this.listContainer);
+        }
+    }
+    async renderChatEditingSessionState(session) {
+        this.inputPart.renderChatEditingSessionState(session);
+        if (this.bodyDimension) {
+            this.layout(this.bodyDimension.height, this.bodyDimension.width);
+        }
+    }
     async renderFollowups(items, response) {
         this.inputPart.renderFollowups(items, response);
         if (this.bodyDimension) {
@@ -326,7 +403,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
     }
     createList(listContainer, options) {
-        const scopedInstantiationService = this._register(this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.contextKeyService])))));
+        const scopedInstantiationService = this._register(this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService]))))));
         const delegate = scopedInstantiationService.createInstance(ChatListDelegate, this.viewOptions.defaultElementHeight ?? 200);
         const rendererDelegate = {
             getListLength: () => this.tree.getNode(null).visibleChildrenCount,
@@ -335,7 +412,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const overflowWidgetsContainer = document.createElement('div');
         overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
         listContainer.append(overflowWidgetsContainer);
-        this.renderer = this._register(scopedInstantiationService.createInstance(ChatListItemRenderer, this.editorOptions, this.location, options, rendererDelegate, this._codeBlockModelCollection, overflowWidgetsContainer));
+        this.renderer = this._register(scopedInstantiationService.createInstance(ChatListItemRenderer, this.editorOptions, options, rendererDelegate, this._codeBlockModelCollection, overflowWidgetsContainer));
         this._register(this.renderer.onDidClickFollowup(item => {
             this.acceptInput(item.message);
         }));
@@ -345,7 +422,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
             }
         }));
-        this.tree = scopedInstantiationService.createInstance(WorkbenchObjectTree, 'Chat', listContainer, delegate, [this.renderer], {
+        this.tree = this._register(scopedInstantiationService.createInstance(WorkbenchObjectTree, 'Chat', listContainer, delegate, [this.renderer], {
             identityProvider: { getId: (e) => e.id },
             horizontalScrolling: false,
             alwaysConsumeMouseWheel: false,
@@ -369,8 +446,10 @@ let ChatWidget = class ChatWidget extends Disposable {
                 listInactiveSelectionForeground: this.styles.listForeground,
                 listActiveSelectionForeground: this.styles.listForeground,
                 listFocusAndSelectionForeground: this.styles.listForeground,
+                listActiveSelectionIconForeground: undefined,
+                listInactiveSelectionIconForeground: undefined,
             }
-        });
+        }));
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
         this._register(this.tree.onDidChangeContentHeight(() => {
             this.onDidChangeTreeContentHeight();
@@ -472,7 +551,10 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this._onDidChangeContentHeight.fire();
         }));
-        this._register(this.inputEditor.onDidChangeModelContent(() => this.parsedChatRequest = undefined));
+        this._register(this.inputEditor.onDidChangeModelContent(() => {
+            this.parsedChatRequest = undefined;
+            this.updateChatInputContext();
+        }));
         this._register(this.chatAgentService.onDidChangeAgents(() => this.parsedChatRequest = undefined));
     }
     onDidStyleChange() {
@@ -482,7 +564,10 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     setModel(model, viewState) {
         if (!this.container) {
-            throw ( new Error('Call render() before setModel()'));
+            throw ( (new Error('Call render() before setModel()')));
+        }
+        if (model.sessionId === this.viewModel?.sessionId) {
+            return;
         }
         this._codeBlockModelCollection.clear();
         this.container.setAttribute('data-session-id', model.sessionId);
@@ -493,7 +578,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.requestInProgress.set(this.viewModel.requestInProgress);
             this.onDidChangeItems();
-            if (( events.some(e => e?.kind === 'addRequest')) && this.visible) {
+            if (( (events.some(e => e?.kind === 'addRequest'))) && this.visible) {
                 revealLastElement(this.tree);
                 this.focusInput();
             }
@@ -503,7 +588,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.viewModel = undefined;
             this.onDidChangeItems();
         }));
-        this.inputPart.initForNewChatModel(viewState.inputValue, viewState.inputState ?? this.collectInputState());
+        this.inputPart.initForNewChatModel(viewState);
         this.contribs.forEach(c => {
             if (c.setInputState && viewState.inputState?.[c.id]) {
                 c.setInputState(viewState.inputState?.[c.id]);
@@ -518,6 +603,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.onDidChangeItems();
             revealLastElement(this.tree);
         }
+        this.updateChatInputContext();
     }
     getFocus() {
         return this.tree.getFocus()[0] ?? undefined;
@@ -552,8 +638,8 @@ let ChatWidget = class ChatWidget extends Disposable {
     logInputHistory() {
         this.inputPart.logInputHistory();
     }
-    async acceptInput(query) {
-        return this._acceptInput(query ? { query } : undefined);
+    async acceptInput(query, isVoiceInput) {
+        return this._acceptInput(query ? { query } : undefined, isVoiceInput);
     }
     async acceptInputWithPrefix(prefix) {
         this._acceptInput({ prefix });
@@ -567,7 +653,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         });
         return inputState;
     }
-    async _acceptInput(opts) {
+    async _acceptInput(opts, isVoiceInput) {
         if (this.viewModel) {
             this._onDidAcceptInput.fire();
             const editorValue = this.getInput();
@@ -577,10 +663,11 @@ let ChatWidget = class ChatWidget extends Disposable {
                     `${opts.prefix} ${editorValue}`;
             const isUserQuery = !opts || 'prefix' in opts;
             const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, {
+                userSelectedModelId: this.inputPart.currentLanguageModel,
                 location: this.location,
                 locationData: this._location.resolveData?.(),
                 parserContext: { selectedAgent: this._lastSelectedAgent },
-                attachedContext: [...( this.inputPart.attachedContext.values())]
+                attachedContext: [...( (this.inputPart.attachedContext.values()))]
             });
             if (result) {
                 this.inputPart.acceptInput(isUserQuery);
@@ -588,7 +675,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 result.responseCompletePromise.then(() => {
                     const responses = this.viewModel?.getItems().filter(isResponseVM);
                     const lastResponse = responses?.[responses.length - 1];
-                    this.chatAccessibilityService.acceptResponse(lastResponse, requestId);
+                    this.chatAccessibilityService.acceptResponse(lastResponse, requestId, isVoiceInput);
                     if (lastResponse?.result?.nextQuestion) {
                         const { prompt, participant, command } = lastResponse.result.nextQuestion;
                         const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);
@@ -632,12 +719,16 @@ let ChatWidget = class ChatWidget extends Disposable {
     layout(height, width) {
         width = Math.min(width, 850);
         this.bodyDimension = new Dimension(width, height);
-        this.inputPart.layout(height, width);
+        const inputPartMaxHeight = this._dynamicMessageLayoutData?.enabled ? this._dynamicMessageLayoutData.maxHeight : height;
+        this.inputPart.layout(inputPartMaxHeight, width);
         const inputPartHeight = this.inputPart.inputPartHeight;
         const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight;
         const listHeight = height - inputPartHeight;
         this.tree.layout(listHeight, width);
         this.tree.getHTMLElement().style.height = `${listHeight}px`;
+        const followupsOffset = Math.max(100 - this.inputPart.followupsHeight, 0);
+        this.welcomeMessageContainer.style.height = `${listHeight - followupsOffset}px`;
+        this.welcomeMessageContainer.style.paddingBottom = `${followupsOffset}px`;
         this.renderer.layout(width);
         if (lastElementVisible) {
             revealLastElement(this.tree);
@@ -648,7 +739,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     setDynamicChatTreeItemLayout(numOfChatTreeItems, maxHeight) {
         this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
         this._register(this.renderer.onDidChangeItemHeight(() => this.layoutDynamicChatTreeItemMode()));
-        const mutableDisposable = this._register(( new MutableDisposable()));
+        const mutableDisposable = this._register(( (new MutableDisposable())));
         this._register(this.tree.onDidScroll((e) => {
             if (!this._dynamicMessageLayoutData?.enabled) {
                 return;
@@ -707,7 +798,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const inputHeight = this.inputPart.inputPartHeight;
         const totalMessages = this.viewModel.getItems();
         const messages = totalMessages.slice(-this._dynamicMessageLayoutData.numOfMessages);
-        const needsRerender = ( messages.some(m => m.currentRenderedHeight === undefined));
+        const needsRerender = ( (messages.some(m => m.currentRenderedHeight === undefined)));
         const listHeight = needsRerender
             ? this._dynamicMessageLayoutData.maxHeight
             : messages.reduce((acc, message) => acc + message.currentRenderedHeight, 0);
@@ -719,27 +810,41 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     saveState() {
         this.inputPart.saveState();
+        if (this.viewModel?.model.welcomeMessage) {
+            this.storageService.store(PersistWelcomeMessageContentKey, this.viewModel?.model.welcomeMessage, -1 , 1 );
+        }
     }
     getViewState() {
-        return { inputValue: this.getInput(), inputState: this.collectInputState() };
+        return {
+            inputValue: this.getInput(),
+            inputState: this.collectInputState(),
+            selectedLanguageModelId: this.inputPart.currentLanguageModel
+        };
+    }
+    updateChatInputContext() {
+        const currentAgent = this.parsedInput.parts.find(part => part instanceof ChatRequestAgentPart);
+        this.agentInInput.set(!!currentAgent);
+        this.agentSupportsModelPicker.set(!currentAgent || !!currentAgent.agent.supportsModelPicker);
     }
 };
-ChatWidget = ChatWidget_1 = ( __decorate([
-    ( __param(4, ICodeEditorService)),
-    ( __param(5, IContextKeyService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IChatService)),
-    ( __param(8, IChatAgentService)),
-    ( __param(9, IChatWidgetService)),
-    ( __param(10, IContextMenuService)),
-    ( __param(11, IChatAccessibilityService)),
-    ( __param(12, ILogService)),
-    ( __param(13, IThemeService)),
-    ( __param(14, IChatSlashCommandService))
-], ChatWidget));
+ChatWidget = ChatWidget_1 = ( (__decorate([
+    ( (__param(4, ICodeEditorService))),
+    ( (__param(5, IContextKeyService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IChatService))),
+    ( (__param(8, IChatAgentService))),
+    ( (__param(9, IChatWidgetService))),
+    ( (__param(10, IContextMenuService))),
+    ( (__param(11, IChatAccessibilityService))),
+    ( (__param(12, ILogService))),
+    ( (__param(13, IThemeService))),
+    ( (__param(14, IChatSlashCommandService))),
+    ( (__param(15, IChatEditingService))),
+    ( (__param(16, IStorageService)))
+], ChatWidget)));
 class ChatWidgetService {
     get lastFocusedWidget() {
-        return this._lastFocusedWidget;
+        return TerminalChatController.activeChatController?.chatWidget ?? this._lastFocusedWidget;
     }
     constructor() {
         this._widgets = [];
@@ -758,8 +863,8 @@ class ChatWidgetService {
         this._lastFocusedWidget = widget;
     }
     register(newWidget) {
-        if (( this._widgets.some(widget => widget === newWidget))) {
-            throw ( new Error('Cannot register the same widget multiple times'));
+        if (( (this._widgets.some(widget => widget === newWidget)))) {
+            throw ( (new Error('Cannot register the same widget multiple times')));
         }
         this._widgets.push(newWidget);
         return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1)));

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .interactive-result-code-block-toolbar{display:none}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar,.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);height:26px;line-height:26px;max-width:70%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:-15px;z-index:100}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar{left:0}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{right:10px}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .interactive-result-code-block-toolbar:focus-within,.interactive-result-code-block.focused .interactive-result-code-block-toolbar,.interactive-result-code-block:hover .interactive-result-code-block-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-item-container .value .rendered-markdown [data-code]{margin:16px 0}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent)}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}.interactive-result-code-block.compare.no-diff .message{display:inherit}.interactive-result-code-block.compare .message{display:none;padding:6px}.interactive-result-code-block.compare .message A{color:var(--vscode-textLink-foreground);cursor:pointer}.interactive-result-code-block.compare .message A>CODE{color:var(--vscode-textLink-foreground)}.interactive-result-code-block.compare .interactive-result-header{align-items:center;border-bottom:1px solid var(--vscode-chat-requestBorder);box-sizing:border-box;display:flex;justify-content:space-between;padding:0 3px}.interactive-result-code-block.compare.no-diff .interactive-result-editor,.interactive-result-code-block.compare.no-diff .interactive-result-header{display:none}";
+var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .interactive-result-code-block-toolbar{display:none}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar,.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);height:26px;line-height:26px;max-width:70%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:-15px;z-index:100}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar{left:0}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{border-radius:3px;right:10px}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .interactive-result-code-block-toolbar:focus-within,.interactive-result-code-block.focused .interactive-result-code-block-toolbar,.interactive-result-code-block:hover .interactive-result-code-block-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-item-container .value .rendered-markdown [data-code]{margin:16px 0}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent)}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}.interactive-result-code-block.compare.no-diff .message{display:inherit}.interactive-result-code-block.compare .message{display:none;padding:6px}.interactive-result-code-block.compare .message A{color:var(--vscode-textLink-foreground);cursor:pointer}.interactive-result-code-block.compare .message A>CODE{color:var(--vscode-textLink-foreground)}.interactive-result-code-block.compare .interactive-result-header{align-items:center;border-bottom:1px solid var(--vscode-chat-requestBorder);box-sizing:border-box;display:flex;justify-content:space-between;padding:0 3px}.interactive-result-code-block.compare.no-diff .interactive-result-editor,.interactive-result-code-block.compare.no-diff .interactive-result-header{display:none}";
 n(css,{});
 export { css, css as default };