@codingame/monaco-vscode-katex-common 25.1.2 → 26.0.1

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

@@ -5,7 +5,6 @@ import * as chat from './media/chat.css';
 import * as chatAgentHover from './media/chatAgentHover.css';
 import * as chatViewWelcome from './media/chatViewWelcome.css';
 import { $ as $$1, findParentWithClass, getTopLeftOffset, append, addStandardDisposableListener, EventType, setVisibility, clearNode, scheduleAtNextAnimationFrame, getWindow, createElement, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { timeout, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
@@ -29,25 +28,12 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
-import { WorkbenchObjectTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { bindContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
-import { buttonSecondaryHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -55,7 +41,6 @@ import { EditorResourceAccessor } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { katexContainerClassName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
 import { checkModeOption } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
@@ -64,7 +49,7 @@ import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader, ChatRequestSlashPromptPart, formatChatQuestion, ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, ChatRequestSlashPromptPart, formatChatQuestion, ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
@@ -73,8 +58,8 @@ import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { isWorkspaceVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { isResponseVM, isRequestVM, ChatViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
-import { ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ComputeAutomaticInstructions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
@@ -83,10 +68,9 @@ import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { handleModeSwitch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { isIChatResourceViewContext, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAccessibilityProvider } from '../accessibility/chatAccessibilityProvider.js';
 import { ChatSuggestNextWidget } from './chatContentParts/chatSuggestNextWidget.js';
 import { ChatInputPart } from './input/chatInputPart.js';
-import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
+import { ChatListWidget } from './chatListWidget.js';
 import { ChatEditorOptions } from './chatOptions.js';
 import { ChatViewWelcomePart } from '../viewsWelcome/chatViewWelcomeController.js';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
@@ -115,14 +99,22 @@ const supportsAllAttachments = {
     supportsSourceControlAttachments: true,
     supportsProblemAttachments: true,
     supportsSymbolAttachments: true,
-    supportsTerminalAttachments: true,
+    supportsTerminalAttachments: true
 };
-const DISCLAIMER = ( localize(5791, "AI responses may be inaccurate."));
+const DISCLAIMER = ( localize(6047, "AI responses may be inaccurate."));
 let ChatWidget = class ChatWidget extends Disposable {
-    static { ChatWidget_1 = this; }
-    static { this.CONTRIBS = []; }
-    get domNode() { return this.container; }
-    get visible() { return this._visible; }
+    static {
+        ChatWidget_1 = this;
+    }
+    static {
+        this.CONTRIBS = [];
+    }
+    get domNode() {
+        return this.container;
+    }
+    get visible() {
+        return this._visible;
+    }
     set viewModel(viewModel) {
         if (this._viewModel === viewModel) {
             return;
@@ -132,13 +124,18 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._viewModel = viewModel;
         if (viewModel) {
             this.viewModelDisposables.add(viewModel);
-            this.logService.debug('ChatWidget#setViewModel: have viewModel');
-        }
-        else {
-            this.logService.debug('ChatWidget#setViewModel: no viewModel');
+            this.logService.debug("ChatWidget#setViewModel: have viewModel");
+            if (viewModel.model.requestInProgress.get()) {
+                this.chatAccessibilityService.acceptRequest(viewModel.sessionResource, true);
+            }
+        } else {
+            this.logService.debug("ChatWidget#setViewModel: no viewModel");
         }
         this.currentRequest = undefined;
-        this._onDidChangeViewModel.fire({ previousSessionResource, currentSessionResource: this._viewModel?.sessionResource });
+        this._onDidChangeViewModel.fire({
+            previousSessionResource,
+            currentSessionResource: this._viewModel?.sessionResource
+        });
     }
     get viewModel() {
         return this._viewModel;
@@ -146,10 +143,12 @@ let ChatWidget = class ChatWidget extends Disposable {
     get parsedInput() {
         if (this.parsedChatRequest === undefined) {
             if (!this.viewModel) {
-                return { text: '', parts: [] };
+                return {
+                    text: "",
+                    parts: []
+                };
             }
-            this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser)
-                .parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
+            this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
                 selectedAgent: this._lastSelectedAgent,
                 mode: this.input.currentModeKind,
                 forcedAgent: this._lockedAgent?.id ? this.chatAgentService.getAgent(this._lockedAgent.id) : undefined
@@ -170,7 +169,36 @@ let ChatWidget = class ChatWidget extends Disposable {
     get locationData() {
         return this._location.resolveData?.();
     }
-    constructor(location, viewContext, viewOptions, styles, codeEditorService, editorService, configurationService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService, chatEditingService, telemetryService, promptsService, toolsService, chatModeService, chatLayoutService, chatEntitlementService, chatSessionsService, agentSessionsService, chatTodoListService, contextService, lifecycleService) {
+    constructor(
+        location,
+        viewContext,
+        viewOptions,
+        styles,
+        codeEditorService,
+        editorService,
+        configurationService,
+        contextKeyService,
+        instantiationService,
+        chatService,
+        chatAgentService,
+        chatWidgetService,
+        chatAccessibilityService,
+        logService,
+        themeService,
+        chatSlashCommandService,
+        chatEditingService,
+        telemetryService,
+        promptsService,
+        toolsService,
+        chatModeService,
+        chatLayoutService,
+        chatEntitlementService,
+        chatSessionsService,
+        agentSessionsService,
+        chatTodoListService,
+        contextService,
+        lifecycleService
+    ) {
         super();
         this.viewOptions = viewOptions;
         this.styles = styles;
@@ -182,7 +210,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.chatService = chatService;
         this.chatAgentService = chatAgentService;
         this.chatWidgetService = chatWidgetService;
-        this.contextMenuService = contextMenuService;
         this.chatAccessibilityService = chatAccessibilityService;
         this.logService = logService;
         this.themeService = themeService;
@@ -227,22 +254,17 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.contribs = [];
         this.visibilityTimeoutDisposable = this._register(( new MutableDisposable()));
         this.visibilityAnimationFrameDisposable = this._register(( new MutableDisposable()));
-        this.scrollAnimationFrameDisposable = this._register(( new MutableDisposable()));
         this.inputPartDisposable = this._register(( new MutableDisposable()));
         this.inlineInputPartDisposable = this._register(( new MutableDisposable()));
         this.recentlyRestoredCheckpoint = false;
-        this.settingChangeCounter = 0;
         this.welcomePart = this._register(( new MutableDisposable()));
         this.visibleChangeCount = 0;
         this._visible = false;
-        this.previousTreeScrollHeight = 0;
-        this.scrollLock = true;
         this._isRenderingWelcome = false;
         this._attachmentCapabilities = supportsAllAttachments;
         this.promptDescriptionsCache = ( new Map());
         this.promptUriCache = ( new Map());
         this._isLoadingPromptDescriptions = false;
-        this._mostRecentlyFocusedItemIndex = -1;
         this.viewModelDisposables = this._register(( new DisposableStore()));
         this._editingSession = observableValue(this, undefined);
         this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
@@ -250,74 +272,88 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._sessionIsEmptyContextKey = ChatContextKeys.chatSessionIsEmpty.bindTo(this.contextKeyService);
         this.viewContext = viewContext ?? {};
         const viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
-        if (typeof location === 'object') {
+        if (typeof location === "object") {
             this._location = location;
-        }
-        else {
-            this._location = { location };
+        } else {
+            this._location = {
+                location
+            };
         }
         ChatContextKeys.inChatSession.bindTo(contextKeyService).set(true);
         ChatContextKeys.location.bindTo(contextKeyService).set(this._location.location);
         ChatContextKeys.inQuickChat.bindTo(contextKeyService).set(isQuickChat(this));
         this.agentInInput = ChatContextKeys.inputHasAgent.bindTo(contextKeyService);
         this.requestInProgress = ChatContextKeys.requestInProgress.bindTo(contextKeyService);
-        this._register(this.chatEntitlementService.onDidChangeAnonymous(() => this.renderWelcomeViewContentIfNeeded()));
-        this._register(bindContextKey(decidedChatEditingResourceContextKey, contextKeyService, (reader) => {
-            const currentSession = this._editingSession.read(reader);
-            if (!currentSession) {
-                return;
-            }
-            const entries = currentSession.entries.read(reader);
-            const decidedEntries = entries.filter(entry => entry.state.read(reader) !== ModifiedFileEntryState.Modified);
-            return ( decidedEntries.map(entry => entry.entryId));
-        }));
-        this._register(bindContextKey(hasUndecidedChatEditingResourceContextKey, contextKeyService, (reader) => {
-            const currentSession = this._editingSession.read(reader);
-            const entries = currentSession?.entries.read(reader) ?? [];
-            const decidedEntries = entries.filter(entry => entry.state.read(reader) === ModifiedFileEntryState.Modified);
-            return decidedEntries.length > 0;
-        }));
-        this._register(bindContextKey(hasAppliedChatEditsContextKey, contextKeyService, (reader) => {
-            const currentSession = this._editingSession.read(reader);
-            if (!currentSession) {
-                return false;
-            }
-            const entries = currentSession.entries.read(reader);
-            return entries.length > 0;
-        }));
-        this._register(bindContextKey(inChatEditingSessionContextKey, contextKeyService, (reader) => {
-            return this._editingSession.read(reader) !== null;
-        }));
-        this._register(bindContextKey(ChatContextKeys.chatEditingCanUndo, contextKeyService, (r) => {
-            return this._editingSession.read(r)?.canUndo.read(r) || false;
-        }));
-        this._register(bindContextKey(ChatContextKeys.chatEditingCanRedo, contextKeyService, (r) => {
-            return this._editingSession.read(r)?.canRedo.read(r) || false;
-        }));
-        this._register(bindContextKey(applyingChatEditsFailedContextKey, contextKeyService, (r) => {
-            const chatModel = viewModelObs.read(r)?.model;
-            const editingSession = this._editingSession.read(r);
-            if (!editingSession || !chatModel) {
-                return false;
-            }
-            const lastResponse = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response).read(r);
-            return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
-        }));
+        this._register(
+            this.chatEntitlementService.onDidChangeAnonymous(() => this.renderWelcomeViewContentIfNeeded())
+        );
+        this._register(
+            bindContextKey(decidedChatEditingResourceContextKey, contextKeyService, reader => {
+                const currentSession = this._editingSession.read(reader);
+                if (!currentSession) {
+                    return;
+                }
+                const entries = currentSession.entries.read(reader);
+                const decidedEntries = entries.filter(entry => entry.state.read(reader) !== ModifiedFileEntryState.Modified);
+                return ( decidedEntries.map(entry => entry.entryId));
+            })
+        );
+        this._register(
+            bindContextKey(hasUndecidedChatEditingResourceContextKey, contextKeyService, reader => {
+                const currentSession = this._editingSession.read(reader);
+                const entries = currentSession?.entries.read(reader) ?? [];
+                const decidedEntries = entries.filter(entry => entry.state.read(reader) === ModifiedFileEntryState.Modified);
+                return decidedEntries.length > 0;
+            })
+        );
+        this._register(
+            bindContextKey(hasAppliedChatEditsContextKey, contextKeyService, reader => {
+                const currentSession = this._editingSession.read(reader);
+                if (!currentSession) {
+                    return false;
+                }
+                const entries = currentSession.entries.read(reader);
+                return entries.length > 0;
+            })
+        );
+        this._register(
+            bindContextKey(inChatEditingSessionContextKey, contextKeyService, reader => {
+                return this._editingSession.read(reader) !== null;
+            })
+        );
+        this._register(
+            bindContextKey(ChatContextKeys.chatEditingCanUndo, contextKeyService, r => {
+                return this._editingSession.read(r)?.canUndo.read(r) || false;
+            })
+        );
+        this._register(
+            bindContextKey(ChatContextKeys.chatEditingCanRedo, contextKeyService, r => {
+                return this._editingSession.read(r)?.canRedo.read(r) || false;
+            })
+        );
+        this._register(
+            bindContextKey(applyingChatEditsFailedContextKey, contextKeyService, r => {
+                const chatModel = viewModelObs.read(r)?.model;
+                const editingSession = this._editingSession.read(r);
+                if (!editingSession || !chatModel) {
+                    return false;
+                }
+                const lastResponse = observableFromEvent(
+                    this,
+                    chatModel.onDidChange,
+                    () => chatModel.getRequests().at(-1)?.response
+                ).read(r);
+                return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
+            })
+        );
         this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection, undefined));
         this.chatSuggestNextWidget = this._register(this.instantiationService.createInstance(ChatSuggestNextWidget));
-        this._register(this.configurationService.onDidChangeConfiguration((e) => {
-            if (e.affectsConfiguration('chat.renderRelatedFiles')) {
-                this.input.renderChatRelatedFiles();
-            }
-            if (e.affectsConfiguration(ChatConfiguration.EditRequests) || e.affectsConfiguration(ChatConfiguration.CheckpointsEnabled)) {
-                this.settingChangeCounter++;
-                this.onDidChangeItems();
-            }
-        }));
         this._register(autorun(r => {
             const viewModel = viewModelObs.read(r);
             const sessions = chatEditingService.editingSessionsObs.read(r);
-            const session = sessions.find(candidate => isEqual(candidate.chatSessionResource, viewModel?.sessionResource));
+            const session = sessions.find(
+                candidate => isEqual(candidate.chatSessionResource, viewModel?.sessionResource)
+            );
             this._editingSession.set(undefined, undefined);
             this.renderChatEditingSessionState();
             if (!session) {
@@ -332,62 +368,63 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this._editingSession.set(undefined, undefined);
                 this.renderChatEditingSessionState();
             }));
-            r.store.add(this.onDidChangeParsedInput(() => {
-                this.renderChatEditingSessionState();
-            }));
             r.store.add(this.inputEditor.onDidChangeModelContent(() => {
-                if (this.getInput() === '') {
+                if (this.getInput() === "") {
                     this.refreshParsedInput();
-                    this.renderChatEditingSessionState();
                 }
             }));
             this.renderChatEditingSessionState();
         }));
-        this._register(codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
-            const resource = input.resource;
-            if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
-                return null;
-            }
-            const responseId = resource.path.split('/').at(1);
-            if (!responseId) {
-                return null;
-            }
-            const item = this.viewModel?.getItems().find(item => item.id === responseId);
-            if (!item) {
-                return null;
-            }
-            this.reveal(item);
-            await timeout(0);
-            for (const codeBlockPart of this.renderer.editorsInUse()) {
-                if (extUri.isEqual(codeBlockPart.uri, resource, true)) {
-                    const editor = codeBlockPart.editor;
-                    let relativeTop = 0;
-                    const editorDomNode = editor.getDomNode();
-                    if (editorDomNode) {
-                        const row = findParentWithClass(editorDomNode, 'monaco-list-row');
-                        if (row) {
-                            relativeTop = getTopLeftOffset(editorDomNode).top - getTopLeftOffset(row).top;
+        this._register(
+            codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
+                const resource = input.resource;
+                if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
+                    return null;
+                }
+                const responseId = resource.path.split("/").at(1);
+                if (!responseId) {
+                    return null;
+                }
+                const item = this.viewModel?.getItems().find(item => item.id === responseId);
+                if (!item) {
+                    return null;
+                }
+                this.reveal(item);
+                await timeout(0);
+                for (const codeBlockPart of this.listWidget.editorsInUse()) {
+                    if (extUri.isEqual(codeBlockPart.uri, resource, true)) {
+                        const editor = codeBlockPart.editor;
+                        let relativeTop = 0;
+                        const editorDomNode = editor.getDomNode();
+                        if (editorDomNode) {
+                            const row = findParentWithClass(editorDomNode, "monaco-list-row");
+                            if (row) {
+                                relativeTop = getTopLeftOffset(editorDomNode).top - getTopLeftOffset(row).top;
+                            }
                         }
+                        if (input.options?.selection) {
+                            const editorSelectionTopOffset = editor.getTopForPosition(
+                                input.options.selection.startLineNumber,
+                                input.options.selection.startColumn
+                            );
+                            relativeTop += editorSelectionTopOffset;
+                            editor.focus();
+                            editor.setSelection({
+                                startLineNumber: input.options.selection.startLineNumber,
+                                startColumn: input.options.selection.startColumn,
+                                endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
+                                endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
+                            });
+                        }
+                        this.reveal(item, relativeTop);
+                        return editor;
                     }
-                    if (input.options?.selection) {
-                        const editorSelectionTopOffset = editor.getTopForPosition(input.options.selection.startLineNumber, input.options.selection.startColumn);
-                        relativeTop += editorSelectionTopOffset;
-                        editor.focus();
-                        editor.setSelection({
-                            startLineNumber: input.options.selection.startLineNumber,
-                            startColumn: input.options.selection.startColumn,
-                            endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
-                            endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
-                        });
-                    }
-                    this.reveal(item, relativeTop);
-                    return editor;
                 }
-            }
-            return null;
-        }));
+                return null;
+            })
+        );
         this._register(this.onDidChangeParsedInput(() => this.updateChatInputContext()));
-        this._register(this.chatTodoListService.onDidUpdateTodos((sessionResource) => {
+        this._register(this.chatTodoListService.onDidUpdateTodos(sessionResource => {
             if (isEqual(this.viewModel?.sessionResource, sessionResource)) {
                 this.inputPart.renderChatTodoListWidget(sessionResource);
             }
@@ -415,7 +452,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         return this._attachmentCapabilities;
     }
     get input() {
-        return this.viewModel?.editing && this.configurationService.getValue('chat.editRequests') !== 'input' ? this.inlineInputPart : this.inputPart;
+        return this.viewModel?.editing && this.configurationService.getValue("chat.editRequests") !== "input" ? this.inlineInputPart : this.inputPart;
     }
     get inputPart() {
         return this.inputPartDisposable.value;
@@ -427,73 +464,87 @@ let ChatWidget = class ChatWidget extends Disposable {
         return this.input.inputEditor;
     }
     get contentHeight() {
-        return this.input.contentHeight + this.tree.contentHeight + this.chatSuggestNextWidget.height;
+        return this.input.height.get() + this.listWidget.contentHeight + this.chatSuggestNextWidget.height;
     }
     get attachmentModel() {
         return this.input.attachmentModel;
     }
     render(parent) {
         const viewId = isIChatViewViewContext(this.viewContext) ? this.viewContext.viewId : undefined;
-        this.editorOptions = this._register(this.instantiationService.createInstance(ChatEditorOptions, viewId, this.styles.listForeground, this.styles.inputEditorBackground, this.styles.resultEditorBackground));
+        this.editorOptions = this._register(this.instantiationService.createInstance(
+            ChatEditorOptions,
+            viewId,
+            this.styles.listForeground,
+            this.styles.inputEditorBackground,
+            this.styles.resultEditorBackground
+        ));
         const renderInputOnTop = this.viewOptions.renderInputOnTop ?? false;
         const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
         const renderStyle = this.viewOptions.renderStyle;
         const renderInputToolbarBelowInput = this.viewOptions.renderInputToolbarBelowInput ?? false;
-        this.container = append(parent, $('.interactive-session'));
-        this.welcomeMessageContainer = append(this.container, $('.chat-welcome-view-container', { style: 'display: none' }));
-        this._register(addStandardDisposableListener(this.welcomeMessageContainer, EventType.CLICK, () => this.focusInput()));
+        this.container = append(parent, $(".interactive-session"));
+        this.welcomeMessageContainer = append(this.container, $(".chat-welcome-view-container", {
+            style: "display: none"
+        }));
+        this._register(
+            addStandardDisposableListener(this.welcomeMessageContainer, EventType.CLICK, () => this.focusInput())
+        );
         this._register(this.chatSuggestNextWidget.onDidChangeHeight(() => {
             if (this.bodyDimension) {
                 this.layout(this.bodyDimension.height, this.bodyDimension.width);
             }
         }));
-        this._register(this.chatSuggestNextWidget.onDidSelectPrompt(({ handoff, agentId }) => {
+        this._register(this.chatSuggestNextWidget.onDidSelectPrompt((
+            {
+                handoff,
+                agentId
+            }
+        ) => {
             this.handleNextPromptSelection(handoff, agentId);
         }));
         if (renderInputOnTop) {
-            this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
+            this.createInput(this.container, {
+                renderFollowups,
+                renderStyle,
+                renderInputToolbarBelowInput
+            });
             this.listContainer = append(this.container, $(`.interactive-list`));
-        }
-        else {
+        } else {
             this.listContainer = append(this.container, $(`.interactive-list`));
             append(this.container, this.chatSuggestNextWidget.domNode);
-            this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
+            this.createInput(this.container, {
+                renderFollowups,
+                renderStyle,
+                renderInputToolbarBelowInput
+            });
         }
         this.renderWelcomeViewContentIfNeeded();
-        this.createList(this.listContainer, { editable: !isInlineChat(this) && !isQuickChat(this), ...this.viewOptions.rendererOptions, renderStyle });
-        const scrollDownButton = this._register(( new Button(this.listContainer, {
-            supportIcons: true,
-            buttonBackground: asCssVariable(buttonSecondaryBackground),
-            buttonForeground: asCssVariable(buttonSecondaryForeground),
-            buttonHoverBackground: asCssVariable(buttonSecondaryHoverBackground),
-        })));
-        scrollDownButton.element.classList.add('chat-scroll-down');
-        scrollDownButton.label = `$(${Codicon.chevronDown.id})`;
-        scrollDownButton.setTitle(( localize(5792, "Scroll down")));
-        this._register(scrollDownButton.onDidClick(() => {
-            this.scrollLock = true;
-            this.scrollToEnd();
-        }));
+        this.createList(this.listContainer, {
+            editable: !isInlineChat(this) && !isQuickChat(this),
+            ...this.viewOptions.rendererOptions,
+            renderStyle
+        });
         this._register(autorun(reader => {
             const fontFamily = this.chatLayoutService.fontFamily.read(reader);
             const fontSize = this.chatLayoutService.fontSize.read(reader);
-            this.container.style.setProperty('--vscode-chat-font-family', fontFamily);
+            this.container.style.setProperty("--vscode-chat-font-family", fontFamily);
             this.container.style.fontSize = `${fontSize}px`;
             if (this.visible) {
-                this.tree.rerender();
+                this.listWidget.rerender();
             }
         }));
-        this._register(Event.runAndSubscribe(this.editorOptions.onDidChange, () => this.onDidStyleChange()));
+        this._register(
+            Event.runAndSubscribe(this.editorOptions.onDidChange, () => this.onDidStyleChange())
+        );
         if (this.viewModel) {
             this.onDidChangeItems();
-            this.scrollToEnd();
+            this.listWidget.scrollToEnd();
         }
         this.contribs = ( ChatWidget_1.CONTRIBS.map(contrib => {
             try {
                 return this._register(this.instantiationService.createInstance(contrib, this));
-            }
-            catch (err) {
-                this.logService.error('Failed to instantiate chat widget contrib', toErrorMessage(err));
+            } catch (err) {
+                this.logService.error("Failed to instantiate chat widget contrib", toErrorMessage(err));
                 return undefined;
             }
         })).filter(isDefined);
@@ -518,15 +569,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.attachmentModel.updateContext(oldPromptAttachments, ( newPromptAttachments.values()));
         }));
         if (!this.focusedInputDOM) {
-            this.focusedInputDOM = this.container.appendChild($$1('.focused-input-dom'));
-        }
-    }
-    scrollToEnd() {
-        if (this.lastItem) {
-            const offset = Math.max(this.lastItem.currentRenderedHeight ?? 0, 1e6);
-            if (this.tree.hasElement(this.lastItem)) {
-                this.tree.reveal(this.lastItem, offset);
-            }
+            this.focusedInputDOM = this.container.appendChild($$1(".focused-input-dom"));
         }
     }
     focusInput() {
@@ -540,8 +583,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (!this.viewModel) {
             return;
         }
-        this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind });
-        this._onDidChangeParsedInput.fire();
+        const previous = this.parsedChatRequest;
+        this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
+            selectedAgent: this._lastSelectedAgent,
+            mode: this.input.currentModeKind
+        });
+        if (!previous || !IParsedChatRequest.equals(previous, this.parsedChatRequest)) {
+            this._onDidChangeParsedInput.fire();
+        }
     }
     getSibling(item, type) {
         if (!isResponseVM(item)) {
@@ -556,14 +605,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (targetIndex === undefined) {
             return;
         }
-        const indexToFocus = type === 'next' ? targetIndex + 1 : targetIndex - 1;
+        const indexToFocus = type === "next" ? targetIndex + 1 : targetIndex - 1;
         if (indexToFocus < 0 || indexToFocus > responseItems.length - 1) {
             return;
         }
         return responseItems[indexToFocus];
     }
     async clear() {
-        this.logService.debug('ChatWidget#clear');
+        this.logService.debug("ChatWidget#clear");
         if (this._dynamicMessageLayoutData) {
             this._dynamicMessageLayoutData.enabled = true;
         }
@@ -574,9 +623,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.viewModel.resetInputPlaceholder();
         }
         if (this._lockedAgent) {
-            this.lockToCodingAgent(this._lockedAgent.name, this._lockedAgent.displayName, this._lockedAgent.id);
-        }
-        else {
+            this.lockToCodingAgent(
+                this._lockedAgent.name,
+                this._lockedAgent.displayName,
+                this._lockedAgent.id
+            );
+        } else {
             this.unlockFromCodingAgent();
         }
         this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
@@ -585,39 +637,15 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     onDidChangeItems(skipDynamicLayout) {
         if (this._visible || !this.viewModel) {
-            const treeItems = ( (this.viewModel?.getItems() ?? [])
-                .map((item) => {
-                return {
-                    element: item,
-                    collapsed: false,
-                    collapsible: false
-                };
-            }));
-            if (treeItems.length > 0) {
+            const items = this.viewModel?.getItems() ?? [];
+            if (items.length > 0) {
                 this.updateChatViewVisibility();
-            }
-            else {
+            } else {
                 this.renderWelcomeViewContentIfNeeded();
             }
             this._onWillMaybeChangeHeight.fire();
-            this.lastItem = treeItems.at(-1)?.element;
-            ChatContextKeys.lastItemId.bindTo(this.contextKeyService).set(this.lastItem ? [this.lastItem.id] : []);
-            this.tree.setChildren(null, treeItems, {
-                diffIdentityProvider: {
-                    getId: (element) => {
-                        return element.dataId +
-                            `${(isRequestVM(element)) }` +
-                            `${isResponseVM(element) && element.renderData ? `_${this.visibleChangeCount}` : ''}` +
-                            (isResponseVM(element) ? `_${element.contentReferences.length}` : '') +
-                            `_${element.shouldBeRemovedOnSend ? `${element.shouldBeRemovedOnSend.afterUndoStop || '1'}` : '0'}` +
-                            `_${element.shouldBeBlocked ? '1' : '0'}` +
-                            `_${this.viewModel?.editing ? '1' : '0'}` +
-                            `_${this.viewModel?.model.checkpoint ? '1' : '0'}` +
-                            `_setting${this.settingChangeCounter || '0'}` +
-                            (isRequestVM(element) && element.contentReferences ? `_${element.contentReferences?.length}` : '');
-                    },
-                }
-            });
+            this.listWidget.setVisibleChangeCount(this.visibleChangeCount);
+            this.listWidget.refresh();
             if (!skipDynamicLayout && this._dynamicMessageLayoutData) {
                 this.layoutDynamicChatTreeItemMode();
             }
@@ -625,12 +653,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
     }
     updateChatViewVisibility() {
-        if (!this.viewModel) {
-            return;
+        if (this.viewModel) {
+            const numItems = this.viewModel.getItems().length;
+            setVisibility(numItems === 0, this.welcomeMessageContainer);
+            setVisibility(numItems !== 0, this.listContainer);
         }
-        const numItems = this.viewModel.getItems().length;
-        setVisibility(numItems === 0, this.welcomeMessageContainer);
-        setVisibility(numItems !== 0, this.listContainer);
         this._onDidChangeEmptyState.fire();
     }
     isEmpty() {
@@ -642,7 +669,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         this._isRenderingWelcome = true;
         try {
-            if (this.viewOptions.renderStyle === 'compact' || this.viewOptions.renderStyle === 'minimal' || this.lifecycleService.willShutdown) {
+            if (this.viewOptions.renderStyle === "compact" || this.viewOptions.renderStyle === "minimal" || this.lifecycleService.willShutdown) {
                 return;
             }
             const numItems = this.viewModel?.getItems().length ?? 0;
@@ -652,15 +679,16 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        5793,
+                        6048,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
                         product.defaultChatAgent.termsStatementUrl,
                         product.defaultChatAgent.privacyStatementUrl
-                    )), { isTrusted: true }));
-                }
-                else {
+                    )), {
+                        isTrusted: true
+                    }));
+                } else {
                     additionalMessage = defaultAgent?.metadata.additionalWelcomeMessage;
                 }
                 if (!additionalMessage && !this._lockedAgent) {
@@ -677,8 +705,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 }
             }
             this.updateChatViewVisibility();
-        }
-        finally {
+        } finally {
             this._isRenderingWelcome = false;
         }
     }
@@ -694,17 +721,20 @@ let ChatWidget = class ChatWidget extends Disposable {
             }));
         }
         if (this._instructionFilesExist === true) {
-            return ( new MarkdownString(''));
-        }
-        else if (this._instructionFilesExist === false) {
-            const generateInstructionsCommand = 'workbench.action.chat.generateInstructions';
+            return ( new MarkdownString(""));
+        } else if (this._instructionFilesExist === false) {
+            const generateInstructionsCommand = "workbench.action.chat.generateInstructions";
             return (new MarkdownString(localize(
-                5794,
+                6049,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${generateInstructionsCommand}`
-            ), { isTrusted: { enabledCommands: [generateInstructionsCommand] } }));
+            ), {
+                isTrusted: {
+                    enabledCommands: [generateInstructionsCommand]
+                }
+            }));
         }
-        return ( new MarkdownString(''));
+        return ( new MarkdownString(""));
     }
     async _checkForAgentInstructionFiles() {
         try {
@@ -714,10 +744,9 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return true;
             }
             return ((await this.promptsService.listCopilotInstructionsMDs(CancellationToken.None)).length > 0 ||
-                (await this.promptsService.listAgentMDs(CancellationToken.None, false)).length > 0);
-        }
-        catch (error) {
-            this.logService.warn('[ChatWidget] Error checking for instruction files:', error);
+            (await this.promptsService.listAgentMDs(CancellationToken.None, false)).length > 0);
+        } catch (error) {
+            this.logService.warn("[ChatWidget] Error checking for instruction files:", error);
             return false;
         }
     }
@@ -726,37 +755,33 @@ let ChatWidget = class ChatWidget extends Disposable {
             const providerIcon = this._lockedAgent ? this.chatSessionsService.getIconForSessionType(this._lockedAgent.id) : undefined;
             const providerTitle = this._lockedAgent ? this.chatSessionsService.getWelcomeTitleForSessionType(this._lockedAgent.id) : undefined;
             const providerMessage = this._lockedAgent ? this.chatSessionsService.getWelcomeMessageForSessionType(this._lockedAgent.id) : undefined;
-            const message = providerMessage
-                ? ( new MarkdownString(providerMessage))
-                : (this._lockedAgent?.prefix === '@copilot '
-                    ? ( new MarkdownString(( localize(
-                5795,
+            const message = providerMessage ? ( new MarkdownString(providerMessage)) : (this._lockedAgent?.prefix === "@copilot " ? ( new MarkdownString(( localize(
+                6050,
                 "This chat session will be forwarded to the {0} [coding agent]({1}) where work is completed in the background. ",
                 this._lockedAgent.prefix,
-                'https://aka.ms/coding-agent-docs'
-            )) + DISCLAIMER, { isTrusted: true }))
-                    : ( new MarkdownString(( localize(
-                5796,
+                "https://aka.ms/coding-agent-docs"
+            )) + DISCLAIMER, {
+                isTrusted: true
+            })) : ( new MarkdownString(( localize(
+                6051,
                 "This chat session will be forwarded to the {0} coding agent where work is completed in the background. ",
                 this._lockedAgent?.prefix
             )) + DISCLAIMER)));
             return {
-                title: providerTitle ?? ( localize(5797, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(6052, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
-                useLargeIcon: !!providerIcon,
+                useLargeIcon: !!providerIcon
             };
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(5798, "Ask about your code"));
-        }
-        else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(5799, "Edit in context"));
-        }
-        else {
-            title = ( localize(5800, "Build with Agent"));
+            title = ( localize(6053, "Ask about your code"));
+        } else if (this.input.currentModeKind === ChatModeKind.Edit) {
+            title = ( localize(6054, "Edit in context"));
+        } else {
+            title = ( localize(6055, "Build with Agent"));
         }
         return {
             title,
@@ -770,32 +795,25 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (!this.chatEntitlementService.sentiment.installed) {
             const isEmpty = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
             if (isEmpty) {
-                return [
-                    {
-                        icon: Codicon.vscode,
-                        label: ( localize(5801, "Ask @vscode")),
-                        prompt: ( localize(5802, "@vscode How do I change the theme to light mode?")),
-                    },
-                    {
-                        icon: Codicon.newFolder,
-                        label: ( localize(5803, "Create Project")),
-                        prompt: ( localize(5804, "Create a #new Hello World project in TypeScript")),
-                    }
-                ];
-            }
-            else {
-                return [
-                    {
-                        icon: Codicon.debugAlt,
-                        label: ( localize(5805, "Build Workspace")),
-                        prompt: ( localize(5806, "How do I build this workspace?")),
-                    },
-                    {
-                        icon: Codicon.gear,
-                        label: ( localize(5807, "Show Config")),
-                        prompt: ( localize(5808, "Where is the configuration for this project defined?")),
-                    }
-                ];
+                return [{
+                    icon: Codicon.vscode,
+                    label: ( localize(6056, "Ask @vscode")),
+                    prompt: ( localize(6057, "@vscode How do I change the theme to light mode?"))
+                }, {
+                    icon: Codicon.newFolder,
+                    label: ( localize(6058, "Create Project")),
+                    prompt: ( localize(6059, "Create a #new Hello World project in TypeScript"))
+                }];
+            } else {
+                return [{
+                    icon: Codicon.debugAlt,
+                    label: ( localize(6060, "Build Workspace")),
+                    prompt: ( localize(6061, "How do I build this workspace?"))
+                }, {
+                    icon: Codicon.gear,
+                    label: ( localize(6062, "Show Config")),
+                    prompt: ( localize(6063, "Where is the configuration for this project defined?"))
+                }];
             }
         }
         const activeEditor = this.editorService.activeEditor;
@@ -819,10 +837,10 @@ let ChatWidget = class ChatWidget extends Disposable {
         const promptsWithScores = [];
         for (const [promptName, condition] of Object.entries(suggestions)) {
             let score = 0;
-            if (typeof condition === 'boolean') {
+            if (typeof condition === "boolean") {
                 score = condition ? 1 : 0;
             }
-            else if (typeof condition === 'string') {
+            else if (typeof condition === "string") {
                 try {
                     const whenClause = ContextKeyExpr.deserialize(condition);
                     if (whenClause) {
@@ -832,35 +850,41 @@ let ChatWidget = class ChatWidget extends Disposable {
                                 try {
                                     const editorContext = this.contextKeyService.getContext(editor.getDomNode());
                                     return count + (whenClause.evaluate(editorContext) ? 1 : 0);
-                                }
-                                catch (error) {
-                                    this.logService.warn('Failed to evaluate when clause for editor:', error);
+                                } catch (error) {
+                                    this.logService.warn("Failed to evaluate when clause for editor:", error);
                                     return count;
                                 }
                             }, 0);
-                        }
-                        else {
+                        } else {
                             score = this.contextKeyService.contextMatchesRules(whenClause) ? 1 : 0;
                         }
-                    }
-                    else {
+                    } else {
                         score = 0;
                     }
-                }
-                catch (error) {
-                    this.logService.warn('Failed to parse when clause for prompt file suggestion:', condition, error);
+                } catch (error) {
+                    this.logService.warn(
+                        "Failed to parse when clause for prompt file suggestion:",
+                        condition,
+                        error
+                    );
                     score = 0;
                 }
             }
             if (score > 0) {
-                promptsWithScores.push({ promptName, condition, score });
+                promptsWithScores.push({
+                    promptName,
+                    condition,
+                    score
+                });
             }
         }
         promptsWithScores.sort((a, b) => b.score - a.score);
         const topPrompts = promptsWithScores.slice(0, 5);
-        for (const { promptName } of topPrompts) {
+        for (const {
+            promptName
+        } of topPrompts) {
             const description = this.promptDescriptionsCache.get(promptName);
-            const commandLabel = ( localize(5809, "{0}", promptName));
+            const commandLabel = ( localize(6064, "{0}", promptName));
             const uri = this.promptUriCache.get(promptName);
             const descriptionText = description?.trim() ? description : undefined;
             result.push({
@@ -887,9 +911,8 @@ let ChatWidget = class ChatWidget extends Disposable {
                     if (description) {
                         this.promptDescriptionsCache.set(promptCommand.name, description);
                         cacheUpdated = true;
-                    }
-                    else {
-                        this.promptDescriptionsCache.set(promptCommand.name, '');
+                    } else {
+                        this.promptDescriptionsCache.set(promptCommand.name, "");
                         cacheUpdated = true;
                     }
                 }
@@ -897,11 +920,9 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (cacheUpdated) {
                 this.renderWelcomeViewContentIfNeeded();
             }
-        }
-        catch (error) {
-            this.logService.warn('Failed to load specific prompt descriptions:', error);
-        }
-        finally {
+        } catch (error) {
+            this.logService.warn("Failed to load specific prompt descriptions:", error);
+        } finally {
             this._isLoadingPromptDescriptions = false;
         }
     }
@@ -910,20 +931,14 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         this.input.renderChatEditingSessionState(this._editingSession.get() ?? null);
-        if (this.bodyDimension) {
-            this.layout(this.bodyDimension.height, this.bodyDimension.width);
-        }
     }
     async renderFollowups() {
-        if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete) {
-            this.input.renderFollowups(this.lastItem.replyFollowups, this.lastItem);
-        }
-        else {
+        const lastItem = this.listWidget.lastItem;
+        if (lastItem && isResponseVM(lastItem) && lastItem.isComplete) {
+            this.input.renderFollowups(lastItem.replyFollowups, lastItem);
+        } else {
             this.input.renderFollowups(undefined, undefined);
         }
-        if (this.bodyDimension) {
-            this.layout(this.bodyDimension.height, this.bodyDimension.width);
-        }
     }
     renderChatSuggestNextWidget() {
         if (this.lifecycleService.willShutdown) {
@@ -946,16 +961,15 @@ let ChatWidget = class ChatWidget extends Disposable {
         const handoffs = currentMode?.handOffs?.get();
         const shouldShow = currentMode && handoffs && handoffs.length > 0;
         if (shouldShow) {
-            const wasHidden = this.chatSuggestNextWidget.domNode.style.display === 'none';
+            const wasHidden = this.chatSuggestNextWidget.domNode.style.display === "none";
             this.chatSuggestNextWidget.render(currentMode);
             if (wasHidden) {
-                this.telemetryService.publicLog2('chat.handoffWidgetShown', {
+                this.telemetryService.publicLog2("chat.handoffWidgetShown", {
                     agent: currentMode.id,
                     handoffCount: handoffs.length
                 });
             }
-        }
-        else {
+        } else {
             this.chatSuggestNextWidget.hide();
         }
         if (this.bodyDimension) {
@@ -966,20 +980,22 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.chatSuggestNextWidget.hide();
         const promptToUse = handoff.prompt;
         const currentMode = this.input.currentModeObs.get();
-        const fromAgent = currentMode?.id ?? '';
-        this.telemetryService.publicLog2('chat.handoffClicked', {
+        const fromAgent = currentMode?.id ?? "";
+        this.telemetryService.publicLog2("chat.handoffClicked", {
             fromAgent: fromAgent,
-            toAgent: agentId || handoff.agent || '',
+            toAgent: agentId || handoff.agent || "",
             hasPrompt: Boolean(promptToUse),
             autoSend: Boolean(handoff.send)
         });
         if (agentId) {
             this.input.setValue(`@${agentId} ${promptToUse}`, false);
             this.input.focus();
-            this.acceptInput().catch(e => this.logService.error('Failed to handle handoff continueOn', e));
-        }
-        else if (handoff.agent) {
+            this.acceptInput().catch(e => this.logService.error("Failed to handle handoff continueOn", e));
+        } else if (handoff.agent) {
             this._switchToAgentByName(handoff.agent);
+            if (handoff.model) {
+                this.input.switchModelByQualifiedName([handoff.model]);
+            }
             this.input.setValue(promptToUse, false);
             this.input.focus();
             if (handoff.send) {
@@ -993,9 +1009,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         try {
             await this._handleDelegationExit();
-        }
-        catch (e) {
-            this.logService.error('Failed to handle delegation exit', e);
+        } catch (e) {
+            this.logService.error("Failed to handle delegation exit", e);
         }
     }
     _shouldExitAfterDelegation(sourceAgent, targetAgent) {
@@ -1074,7 +1089,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const wasVisible = this._visible;
         this._visible = visible;
         this.visibleChangeCount++;
-        this.renderer.setVisible(visible);
+        this.listWidget.setVisible(visible);
         this.input.setVisible(visible);
         if (visible) {
             if (!wasVisible) {
@@ -1087,118 +1102,67 @@ let ChatWidget = class ChatWidget extends Disposable {
                     this._onDidShow.fire();
                 });
             }
-        }
-        else if (wasVisible) {
+        } else if (wasVisible) {
             this._onDidHide.fire();
         }
     }
     createList(listContainer, options) {
-        const scopedInstantiationService = 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,
-            onDidScroll: this.onDidScroll,
-            container: listContainer,
-            currentChatMode: () => this.input.currentModeKind,
-        };
-        const overflowWidgetsContainer = createElement('div');
-        overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
+        const overflowWidgetsContainer = createElement("div");
+        overflowWidgetsContainer.classList.add("chat-overflow-widget-container", "monaco-editor");
         listContainer.append(overflowWidgetsContainer);
-        this.renderer = this._register(scopedInstantiationService.createInstance(ChatListItemRenderer, this.editorOptions, options, rendererDelegate, this._codeBlockModelCollection, overflowWidgetsContainer, this.viewModel));
-        this._register(this.renderer.onDidClickRequest(async (item) => {
+        this.listWidget = this._register(this.instantiationService.createInstance(ChatListWidget, listContainer, {
+            rendererOptions: options,
+            renderStyle: this.viewOptions.renderStyle,
+            defaultElementHeight: this.viewOptions.defaultElementHeight ?? 200,
+            overflowWidgetsDomNode: overflowWidgetsContainer,
+            styles: {
+                listForeground: this.styles.listForeground,
+                listBackground: this.styles.listBackground
+            },
+            currentChatMode: () => this.input.currentModeKind,
+            filter: this.viewOptions.filter ? {
+                filter: this.viewOptions.filter.bind(this.viewOptions)
+            } : undefined,
+            codeBlockModelCollection: this._codeBlockModelCollection,
+            viewModel: this.viewModel,
+            editorOptions: this.editorOptions,
+            location: this.location,
+            getCurrentLanguageModelId: () => this.input.currentLanguageModel,
+            getCurrentModeInfo: () => this.input.currentModeInfo
+        }));
+        this._register(this.listWidget.onDidClickRequest(async item => {
             this.clickedRequest(item);
         }));
-        this._register(this.renderer.onDidRerender(item => {
-            if (isRequestVM(item.currentElement) && this.configurationService.getValue('chat.editRequests') !== 'input') {
+        this._register(this.listWidget.onDidRerender(item => {
+            if (isRequestVM(item.currentElement) && this.configurationService.getValue("chat.editRequests") !== "input") {
                 if (!item.rowContainer.contains(this.inputContainer)) {
                     item.rowContainer.appendChild(this.inputContainer);
                 }
                 this.input.focus();
             }
         }));
-        this._register(this.renderer.onDidDispose((item) => {
+        this._register(this.listWidget.onDidDispose(() => {
             this.focusedInputDOM.appendChild(this.inputContainer);
             this.input.focus();
         }));
-        this._register(this.renderer.onDidFocusOutside(() => {
+        this._register(this.listWidget.onDidFocusOutside(() => {
             this.finishedEditing();
         }));
-        this._register(this.renderer.onDidClickFollowup(item => {
+        this._register(this.listWidget.onDidClickFollowup(item => {
             this.acceptInput(item.message);
         }));
-        this._register(this.renderer.onDidClickRerunWithAgentOrCommandDetection(e => {
-            const request = this.chatService.getSession(e.sessionResource)?.getRequests().find(candidate => candidate.id === e.requestId);
-            if (request) {
-                const options = {
-                    noCommandDetection: true,
-                    attempt: request.attempt + 1,
-                    location: this.location,
-                    userSelectedModelId: this.input.currentLanguageModel,
-                    modeInfo: this.input.currentModeInfo,
-                };
-                this.chatService.resendRequest(request, options).catch(e => this.logService.error('FAILED to rerun request', e));
-            }
-        }));
-        this.tree = this._register(scopedInstantiationService.createInstance((WorkbenchObjectTree), 'Chat', listContainer, delegate, [this.renderer], {
-            identityProvider: { getId: (e) => e.id },
-            horizontalScrolling: false,
-            alwaysConsumeMouseWheel: false,
-            supportDynamicHeights: true,
-            hideTwistiesOfChildlessElements: true,
-            accessibilityProvider: this.instantiationService.createInstance(ChatAccessibilityProvider),
-            keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e) => isRequestVM(e) ? e.message : isResponseVM(e) ? e.response.value : '' },
-            setRowLineHeight: false,
-            filter: this.viewOptions.filter ? { filter: this.viewOptions.filter.bind(this.viewOptions), } : undefined,
-            scrollToActiveElement: true,
-            overrideStyles: {
-                listFocusBackground: this.styles.listBackground,
-                listInactiveFocusBackground: this.styles.listBackground,
-                listActiveSelectionBackground: this.styles.listBackground,
-                listFocusAndSelectionBackground: this.styles.listBackground,
-                listInactiveSelectionBackground: this.styles.listBackground,
-                listHoverBackground: this.styles.listBackground,
-                listBackground: this.styles.listBackground,
-                listFocusForeground: this.styles.listForeground,
-                listHoverForeground: this.styles.listForeground,
-                listInactiveFocusForeground: this.styles.listForeground,
-                listInactiveSelectionForeground: this.styles.listForeground,
-                listActiveSelectionForeground: this.styles.listForeground,
-                listFocusAndSelectionForeground: this.styles.listForeground,
-                listActiveSelectionIconForeground: undefined,
-                listInactiveSelectionIconForeground: undefined,
-            }
-        }));
-        this._register(this.tree.onDidChangeFocus(() => {
-            const focused = this.tree.getFocus();
-            if (focused && focused.length > 0) {
-                const focusedItem = focused[0];
-                const items = this.tree.getNode(null).children;
-                const idx = items.findIndex(i => i.element === focusedItem);
-                if (idx !== -1) {
-                    this._mostRecentlyFocusedItemIndex = idx;
-                }
-            }
-        }));
-        this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-        this._register(this.tree.onDidChangeContentHeight(() => {
-            this.onDidChangeTreeContentHeight();
-        }));
-        this._register(this.renderer.onDidChangeItemHeight(e => {
-            if (this.tree.hasElement(e.element) && this.visible) {
-                this.tree.updateElementHeight(e.element, e.height);
-            }
+        this._register(this.listWidget.onDidChangeContentHeight(() => {
+            this._onDidChangeContentHeight.fire();
         }));
-        this._register(this.tree.onDidFocus(() => {
+        this._register(this.listWidget.onDidFocus(() => {
             this._onDidFocus.fire();
         }));
-        this._register(this.tree.onDidScroll(() => {
+        this._register(this.listWidget.onDidScroll(() => {
             this._onDidScroll.fire();
-            const isScrolledDown = this.tree.scrollTop >= this.tree.scrollHeight - this.tree.renderHeight - 2;
-            this.container.classList.toggle('show-scroll-down', !isScrolledDown && !this.scrollLock);
         }));
     }
     startEditing(requestId) {
-        const editedRequest = this.renderer.getTemplateDataForRequestId(requestId);
+        const editedRequest = this.listWidget.getTemplateDataForRequestId(requestId);
         if (editedRequest) {
             this.clickedRequest(editedRequest);
         }
@@ -1216,7 +1180,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.viewModel?.model.setCheckpoint(currentElement.id);
             const currentContext = [];
             const addedContextIds = ( new Set());
-            const addToContext = (entry) => {
+            const addToContext = entry => {
                 if (( addedContextIds.has(entry.id)) || isWorkspaceVariableEntry(entry)) {
                     return;
                 }
@@ -1229,7 +1193,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             for (let i = requests.length - 1; i >= 0; i -= 1) {
                 const request = requests[i];
                 if (request.id === currentElement.id) {
-                    request.shouldBeBlocked = false;
+                    request.setShouldBeBlocked(false);
                     request.attachedContext?.forEach(addToContext);
                     currentElement.variables.forEach(addToContext);
                 }
@@ -1238,17 +1202,16 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (item?.contextKeyService) {
                 ChatContextKeys.currentlyEditing.bindTo(item.contextKeyService).set(true);
             }
-            const isInput = this.configurationService.getValue('chat.editRequests') === 'input';
+            const isInput = this.configurationService.getValue("chat.editRequests") === "input";
             this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
             if (!isInput) {
                 const rowContainer = item.rowContainer;
-                this.inputContainer = $$1('.chat-edit-input-container');
+                this.inputContainer = $$1(".chat-edit-input-container");
                 rowContainer.appendChild(this.inputContainer);
                 this.createInput(this.inputContainer);
                 this.input.setChatMode(this.inputPart.currentModeObs.get().id);
-            }
-            else {
-                this.inputPart.element.classList.add('editing');
+            } else {
+                this.inputPart.element.classList.add("editing");
             }
             this.inputPart.toggleChatInputOverlay(!isInput);
             if (currentContext.length > 0) {
@@ -1257,43 +1220,41 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.inputPart.dnd.setDisabledOverlay(!isInput);
             this.input.renderAttachedContext();
             this.input.setValue(currentElement.messageText, false);
-            this.renderer.updateItemHeightOnRender(currentElement, item);
             this.onDidChangeItems();
             this.input.inputEditor.focus();
             this._register(this.inputPart.onDidClickOverlay(() => {
-                if (this.viewModel?.editing && this.configurationService.getValue('chat.editRequests') !== 'input') {
+                if (this.viewModel?.editing && this.configurationService.getValue("chat.editRequests") !== "input") {
                     this.finishedEditing();
                 }
             }));
             if (!isInput) {
                 this._register(this.inlineInputPart.inputEditor.onDidChangeModelContent(() => {
-                    this.scrollToCurrentItem(currentElement);
+                    this.listWidget.scrollToCurrentItem(currentElement);
                 }));
-                this._register(this.inlineInputPart.inputEditor.onDidChangeCursorSelection((e) => {
-                    this.scrollToCurrentItem(currentElement);
+                this._register(this.inlineInputPart.inputEditor.onDidChangeCursorSelection(e => {
+                    this.listWidget.scrollToCurrentItem(currentElement);
                 }));
             }
         }
-        this.telemetryService.publicLog2('chat.startEditingRequests', {
-            editRequestType: this.configurationService.getValue('chat.editRequests'),
+        this.telemetryService.publicLog2("chat.startEditingRequests", {
+            editRequestType: this.configurationService.getValue("chat.editRequests")
         });
     }
     finishedEditing(completedEdit) {
-        const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
+        const editedRequest = this.listWidget.getTemplateDataForRequestId(this.viewModel?.editing?.id);
         if (this.recentlyRestoredCheckpoint) {
             this.recentlyRestoredCheckpoint = false;
-        }
-        else {
+        } else {
             this.viewModel?.model.setCheckpoint(undefined);
         }
         this.inputPart.dnd.setDisabledOverlay(false);
         if (editedRequest?.contextKeyService) {
             ChatContextKeys.currentlyEditing.bindTo(editedRequest.contextKeyService).set(false);
         }
-        const isInput = this.configurationService.getValue('chat.editRequests') === 'input';
+        const isInput = this.configurationService.getValue("chat.editRequests") === "input";
         if (!isInput) {
             this.inputPart.setChatMode(this.input.currentModeObs.get().id);
-            const currentModel = this.input.selectedLanguageModel;
+            const currentModel = this.input.selectedLanguageModel.get();
             if (currentModel) {
                 this.inputPart.switchModel(currentModel.metadata);
             }
@@ -1301,116 +1262,78 @@ let ChatWidget = class ChatWidget extends Disposable {
             try {
                 if (editedRequest?.rowContainer?.contains(this.inputContainer)) {
                     editedRequest.rowContainer.removeChild(this.inputContainer);
-                }
-                else if (this.inputContainer.parentElement) {
+                } else if (this.inputContainer.parentElement) {
                     this.inputContainer.parentElement.removeChild(this.inputContainer);
                 }
+            } catch (e) {
+                this.logService.error("Error occurred while finishing editing:", e);
             }
-            catch (e) {
-                this.logService.error('Error occurred while finishing editing:', e);
-            }
-            this.inputContainer = $$1('.empty-chat-state');
+            this.inputContainer = $$1(".empty-chat-state");
             this.input.dispose();
         }
         if (isInput) {
-            this.inputPart.element.classList.remove('editing');
+            this.inputPart.element.classList.remove("editing");
         }
         this.viewModel?.setEditing(undefined);
         this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
         this.onDidChangeItems();
-        if (editedRequest?.currentElement) {
-            this.renderer.updateItemHeightOnRender(editedRequest.currentElement, editedRequest);
-        }
-        this.telemetryService.publicLog2('chat.editRequestsFinished', {
-            editRequestType: this.configurationService.getValue('chat.editRequests'),
+        this.telemetryService.publicLog2("chat.editRequestsFinished", {
+            editRequestType: this.configurationService.getValue("chat.editRequests"),
             editCanceled: !completedEdit
         });
         this.inputPart.focus();
     }
-    scrollToCurrentItem(currentElement) {
-        if (this.viewModel?.editing && currentElement) {
-            const element = currentElement;
-            if (!this.tree.hasElement(element)) {
-                return;
-            }
-            const relativeTop = this.tree.getRelativeTop(element);
-            if (relativeTop === null || relativeTop < 0 || relativeTop > 1) {
-                this.tree.reveal(element, 0);
-            }
-        }
-    }
-    onContextMenu(e) {
-        e.browserEvent.preventDefault();
-        e.browserEvent.stopPropagation();
-        const selected = e.element;
-        const target = e.browserEvent.target;
-        const isKatexElement = target.closest(`.${katexContainerClassName}`) !== null;
-        const scopedContextKeyService = this.contextKeyService.createOverlay([
-            [ChatContextKeys.responseIsFiltered.key, isResponseVM(selected) && !!selected.errorDetails?.responseIsFiltered],
-            [ChatContextKeys.isKatexMathElement.key, isKatexElement]
-        ]);
-        this.contextMenuService.showContextMenu({
-            menuId: MenuId.ChatContext,
-            menuActionOptions: { shouldForwardArgs: true },
-            contextKeyService: scopedContextKeyService,
-            getAnchor: () => e.anchor,
-            getActionsContext: () => selected,
-        });
-    }
-    onDidChangeTreeContentHeight() {
-        if (this.tree.scrollHeight !== this.previousTreeScrollHeight) {
-            const lastItem = this.viewModel?.getItems().at(-1);
-            const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
-            if (!lastResponseIsRendering || this.scrollLock) {
-                const lastElementWasVisible = this.tree.scrollTop + this.tree.renderHeight >= this.previousTreeScrollHeight - 2;
-                if (lastElementWasVisible) {
-                    this.scrollAnimationFrameDisposable.value = scheduleAtNextAnimationFrame(getWindow(this.listContainer), () => {
-                        this.scrollToEnd();
-                    }, 0);
-                }
-            }
-        }
-        this.previousTreeScrollHeight = this.tree.scrollHeight;
-        this._onDidChangeContentHeight.fire();
-    }
     getWidgetViewKindTag() {
         if (!this.viewContext) {
-            return 'editor';
-        }
-        else if (isIChatViewViewContext(this.viewContext)) {
-            return 'view';
-        }
-        else {
-            return 'quick';
+            return "editor";
+        } else if (isIChatViewViewContext(this.viewContext)) {
+            return "view";
+        } else {
+            return "quick";
         }
     }
     createInput(container, options) {
         const commonConfig = {
             renderFollowups: options?.renderFollowups ?? true,
-            renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
+            renderStyle: options?.renderStyle === "minimal" ? "compact" : options?.renderStyle,
             renderInputToolbarBelowInput: options?.renderInputToolbarBelowInput ?? false,
             menus: {
                 executeToolbar: MenuId.ChatExecute,
-                telemetrySource: 'chatWidget',
+                telemetrySource: "chatWidget",
                 ...this.viewOptions.menus
             },
             editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
             enableImplicitContext: this.viewOptions.enableImplicitContext,
-            renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit',
+            renderWorkingSet: this.viewOptions.enableWorkingSet === "explicit",
             supportsChangingModes: this.viewOptions.supportsChangingModes,
             dndContainer: this.viewOptions.dndContainer,
             widgetViewKindTag: this.getWidgetViewKindTag(),
-            defaultMode: this.viewOptions.defaultMode
+            defaultMode: this.viewOptions.defaultMode,
+            sessionTypePickerDelegate: this.viewOptions.sessionTypePickerDelegate,
+            workspacePickerDelegate: this.viewOptions.workspacePickerDelegate,
+            isQuickChat: isQuickChat(this)
         };
         if (this.viewModel?.editing) {
-            const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
+            const editedRequest = this.listWidget.getTemplateDataForRequestId(this.viewModel?.editing?.id);
             const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, editedRequest?.contextKeyService]))));
             this.inlineInputPartDisposable.value = scopedInstantiationService.createInstance(ChatInputPart, this.location, commonConfig, this.styles, true);
-        }
-        else {
+        } else {
             this.inputPartDisposable.value = this.instantiationService.createInstance(ChatInputPart, this.location, commonConfig, this.styles, false);
+            this._register(autorun(reader => {
+                this.inputPart.height.read(reader);
+                if (!this.listWidget) {
+                    return;
+                }
+                if (this.bodyDimension) {
+                    this.layout(this.bodyDimension.height, this.bodyDimension.width);
+                }
+                this._onDidChangeContentHeight.fire();
+            }));
+        }
+        this.input.render(container, "", this);
+        if (this.bodyDimension?.width) {
+            this.input.layout(this.bodyDimension.width);
         }
-        this.input.render(container, '', this);
         this._register(this.input.onDidLoadInputState(() => {
             this.refreshParsedInput();
         }));
@@ -1419,7 +1342,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (!this.viewModel) {
                 return;
             }
-            let msg = '';
+            let msg = "";
             if (e.followup.agentId && e.followup.agentId !== this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind)?.id) {
                 const agent = this.chatAgentService.getAgent(e.followup.agentId);
                 if (!agent) {
@@ -1430,8 +1353,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (e.followup.subCommand) {
                     msg += `${chatSubcommandLeader}${e.followup.subCommand} `;
                 }
-            }
-            else if (!e.followup.agentId && e.followup.subCommand && this.chatSlashCommandService.hasCommand(e.followup.subCommand)) {
+            } else if (!e.followup.agentId && e.followup.subCommand && this.chatSlashCommandService.hasCommand(e.followup.subCommand)) {
                 msg = `${chatSubcommandLeader}${e.followup.subCommand} `;
             }
             msg += e.followup.message;
@@ -1446,21 +1368,11 @@ let ChatWidget = class ChatWidget extends Disposable {
                 command: e.response.slashCommand?.name,
                 result: e.response.result,
                 action: {
-                    kind: 'followUp',
+                    kind: "followUp",
                     followup: e.followup
-                },
+                }
             });
         }));
-        this._register(this.input.onDidChangeHeight(() => {
-            const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
-            if (isRequestVM(editedRequest?.currentElement) && this.viewModel?.editing) {
-                this.renderer.updateItemHeightOnRender(editedRequest?.currentElement, editedRequest);
-            }
-            if (this.bodyDimension) {
-                this.layout(this.bodyDimension.height, this.bodyDimension.width);
-            }
-            this._onDidChangeContentHeight.fire();
-        }));
         this._register(this.inputEditor.onDidChangeModelContent(() => {
             this.parsedChatRequest = undefined;
             this.updateChatInputContext();
@@ -1480,29 +1392,35 @@ let ChatWidget = class ChatWidget extends Disposable {
             const toolIds = ( new Set());
             for (const [entry, enabled] of this.input.selectedToolsModel.entriesMap.read(r)) {
                 if (enabled) {
-                    if (entry instanceof ToolSet) {
+                    if (isToolSet(entry)) {
                         toolSetIds.add(entry.id);
-                    }
-                    else {
+                    } else {
                         toolIds.add(entry.id);
                     }
                 }
             }
-            const disabledTools = ( this.input.attachmentModel.attachments
-                .filter(a => a.kind === 'tool' && !( toolIds.has(a.id)) || a.kind === 'toolset' && !( toolSetIds.has(a.id)))
-                .map(a => a.id));
+            const disabledTools = ( this.input.attachmentModel.attachments.filter(a => a.kind === "tool" && !( toolIds.has(a.id)) || a.kind === "toolset" && !( toolSetIds.has(a.id))).map(a => a.id));
             this.input.attachmentModel.updateContext(disabledTools, Iterable.empty());
             this.refreshParsedInput();
         }));
     }
     onDidStyleChange() {
-        this.container.style.setProperty('--vscode-interactive-result-editor-background-color', this.editorOptions.configuration.resultEditor.backgroundColor?.toString() ?? '');
-        this.container.style.setProperty('--vscode-interactive-session-foreground', this.editorOptions.configuration.foreground?.toString() ?? '');
-        this.container.style.setProperty('--vscode-chat-list-background', this.themeService.getColorTheme().getColor(this.styles.listBackground)?.toString() ?? '');
+        this.container.style.setProperty(
+            "--vscode-interactive-result-editor-background-color",
+            this.editorOptions.configuration.resultEditor.backgroundColor?.toString() ?? ""
+        );
+        this.container.style.setProperty(
+            "--vscode-interactive-session-foreground",
+            this.editorOptions.configuration.foreground?.toString() ?? ""
+        );
+        this.container.style.setProperty(
+            "--vscode-chat-list-background",
+            this.themeService.getColorTheme().getColor(this.styles.listBackground)?.toString() ?? ""
+        );
     }
     setModel(model) {
         if (!this.container) {
-            throw ( new Error('Call render() before setModel()'));
+            throw ( new Error("Call render() before setModel()"));
         }
         if (!model) {
             if (this.viewModel?.editing) {
@@ -1521,39 +1439,43 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.inputPart.clearTodoListWidget(model.sessionResource, false);
         this.chatSuggestNextWidget.hide();
         this._codeBlockModelCollection.clear();
-        this.container.setAttribute('data-session-id', model.sessionId);
-        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection);
+        this.container.setAttribute("data-session-id", model.sessionId);
+        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
         this.inputPart.setInputModel(model.inputModel, model.getRequests().length === 0);
+        this.listWidget.setViewModel(this.viewModel);
         if (this._lockedAgent) {
             let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
             if (!placeholder) {
-                placeholder = ( localize(5810, "Chat with {0}", this._lockedAgent.id));
+                placeholder = ( localize(6065, "Chat with {0}", this._lockedAgent.id));
             }
             this.viewModel.setInputPlaceholder(placeholder);
-            this.inputEditor.updateOptions({ placeholder });
-        }
-        else if (this.viewModel.inputPlaceholder) {
-            this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
+            this.inputEditor.updateOptions({
+                placeholder
+            });
+        } else if (this.viewModel.inputPlaceholder) {
+            this.inputEditor.updateOptions({
+                placeholder: this.viewModel.inputPlaceholder
+            });
         }
-        const renderImmediately = this.configurationService.getValue('chat.experimental.renderMarkdownImmediately');
+        const renderImmediately = this.configurationService.getValue("chat.experimental.renderMarkdownImmediately");
         const delay = renderImmediately ? MicrotaskDelay : 0;
-        this.viewModelDisposables.add(Event.runAndSubscribe(Event.accumulate(this.viewModel.onDidChange, delay), (events => {
-            if (!this.viewModel || this._store.isDisposed) {
-                return;
-            }
-            this.requestInProgress.set(this.viewModel.model.requestInProgress.get());
-            if (events?.some(e => e?.kind === 'changePlaceholder')) {
-                this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
-            }
-            this.onDidChangeItems();
-            if (events?.some(e => e?.kind === 'addRequest') && this.visible) {
-                this.scrollToEnd();
-            }
-        })));
-        this.viewModelDisposables.add(autorun(reader => {
-            this._editingSession.read(reader);
-            this.renderChatEditingSessionState();
-        }));
+        this.viewModelDisposables.add(
+            Event.runAndSubscribe(Event.accumulate(this.viewModel.onDidChange, delay), (events => {
+                if (!this.viewModel || this._store.isDisposed) {
+                    return;
+                }
+                this.requestInProgress.set(this.viewModel.model.requestInProgress.get());
+                if (events?.some(e => e?.kind === "changePlaceholder")) {
+                    this.inputEditor.updateOptions({
+                        placeholder: this.viewModel.inputPlaceholder
+                    });
+                }
+                this.onDidChangeItems();
+                if (events?.some(e => e?.kind === "addRequest") && this.visible) {
+                    this.listWidget.scrollToEnd();
+                }
+            }))
+        );
         this.viewModelDisposables.add(this.viewModel.onDidDisposeModel(() => {
             if (this.viewModel?.editing) {
                 this.finishedEditing();
@@ -1563,52 +1485,53 @@ let ChatWidget = class ChatWidget extends Disposable {
         }));
         this._sessionIsEmptyContextKey.set(model.getRequests().length === 0);
         this.refreshParsedInput();
-        this.viewModelDisposables.add(model.onDidChange((e) => {
-            if (e.kind === 'setAgent') {
-                this._onDidChangeAgent.fire({ agent: e.agent, slashCommand: e.command });
+        this.viewModelDisposables.add(model.onDidChange(e => {
+            if (e.kind === "setAgent") {
+                this._onDidChangeAgent.fire({
+                    agent: e.agent,
+                    slashCommand: e.command
+                });
                 this._updateAgentCapabilitiesContextKeys(e.agent);
             }
-            if (e.kind === 'addRequest') {
+            if (e.kind === "addRequest") {
                 this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, false);
                 this._sessionIsEmptyContextKey.set(false);
             }
-            if (e.kind === 'removeRequest') {
+            if (e.kind === "removeRequest") {
                 this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
                 this.chatSuggestNextWidget.hide();
                 this._sessionIsEmptyContextKey.set((this.viewModel?.model.getRequests().length ?? 0) === 0);
             }
-            if (e.kind === 'completedRequest') {
+            if (e.kind === "completedRequest") {
                 const lastRequest = this.viewModel?.model.getRequests().at(-1);
                 const wasCancelled = lastRequest?.response?.isCanceled ?? false;
                 if (wasCancelled) {
                     this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
                 }
                 this.renderChatSuggestNextWidget();
+                if (this.visible && this.viewModel?.sessionResource) {
+                    this.agentSessionsService.getSession(this.viewModel.sessionResource)?.setRead(true);
+                }
             }
         }));
-        if (this.tree && this.visible) {
+        if (this.listWidget && this.visible) {
             this.onDidChangeItems();
-            this.scrollToEnd();
+            this.listWidget.scrollToEnd();
         }
-        this.renderer.updateViewModel(this.viewModel);
         this.updateChatInputContext();
         this.input.renderChatTodoListWidget(this.viewModel.sessionResource);
     }
     getFocus() {
-        return this.tree.getFocus()[0] ?? undefined;
+        return this.listWidget.getFocus()[0] ?? undefined;
     }
     reveal(item, relativeTop) {
-        this.tree.reveal(item, relativeTop);
+        this.listWidget.reveal(item, relativeTop);
     }
     focus(item) {
-        const items = this.tree.getNode(null).children;
-        const node = items.find(i => i.element?.id === item.id);
-        if (!node) {
+        if (!this.listWidget.hasElement(item)) {
             return;
         }
-        this._mostRecentlyFocusedItemIndex = items.indexOf(node);
-        this.tree.setFocus([node.element]);
-        this.tree.domFocus();
+        this.listWidget.focusItem(item);
     }
     setInputPlaceholder(placeholder) {
         this.viewModel?.setInputPlaceholder(placeholder);
@@ -1616,7 +1539,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     resetInputPlaceholder() {
         this.viewModel?.resetInputPlaceholder();
     }
-    setInput(value = '') {
+    setInput(value = "") {
         this.input.setValue(value, false);
         this.refreshParsedInput();
     }
@@ -1637,9 +1560,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.renderWelcomeViewContentIfNeeded();
         const agent = this.chatAgentService.getAgent(agentId);
         this._updateAgentCapabilitiesContextKeys(agent);
-        this.renderer.updateOptions({ restorable: false, editable: false, noFooter: true, progressMessageAtBottomOfResponse: true });
+        this.listWidget?.updateRendererOptions({
+            restorable: false,
+            editable: false,
+            noFooter: true,
+            progressMessageAtBottomOfResponse: true
+        });
         if (this.visible) {
-            this.tree.rerender();
+            this.listWidget?.rerender();
         }
     }
     unlockFromCodingAgent() {
@@ -1650,10 +1578,17 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this.viewModel) {
             this.viewModel.resetInputPlaceholder();
         }
-        this.inputEditor.updateOptions({ placeholder: undefined });
-        this.renderer.updateOptions({ restorable: true, editable: true, noFooter: false, progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask });
+        this.inputEditor?.updateOptions({
+            placeholder: undefined
+        });
+        this.listWidget?.updateRendererOptions({
+            restorable: true,
+            editable: true,
+            noFooter: false,
+            progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask
+        });
         if (this.visible) {
-            this.tree.rerender();
+            this.listWidget?.rerender();
         }
     }
     get isLockedToCodingAgent() {
@@ -1666,7 +1601,9 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.input.logInputHistory();
     }
     async acceptInput(query, options) {
-        return this._acceptInput(query ? { query } : undefined, options);
+        return this._acceptInput(query ? {
+            query
+        } : undefined, options);
     }
     async rerunLastRequest() {
         if (!this.viewModel) {
@@ -1685,7 +1622,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         return await this.chatService.resendRequest(lastRequest, options);
     }
     async _applyPromptFileIfSet(requestInput) {
-        const agentSlashPromptPart = this.parsedInput.parts.find((r) => r instanceof ChatRequestSlashPromptPart);
+        const agentSlashPromptPart = this.parsedInput.parts.find(r => r instanceof ChatRequestSlashPromptPart);
         if (!agentSlashPromptPart) {
             return;
         }
@@ -1694,10 +1631,24 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         const parseResult = slashCommand.parsedPromptFile;
-        const refs = parseResult.body?.variableReferences.map(({ name, offset }) => ({ name, range: ( new OffsetRange(offset, offset + name.length + 1)) })) ?? [];
+        const refs = parseResult.body?.variableReferences.map((
+            {
+                name,
+                offset
+            }
+        ) => ({
+            name,
+            range: ( new OffsetRange(offset, offset + name.length + 1))
+        })) ?? [];
         const toolReferences = this.toolsService.toToolReferences(refs);
-        requestInput.attachedContext.insertFirst(toPromptFileVariableEntry(parseResult.uri, PromptFileVariableKind.PromptFile, undefined, true, toolReferences));
-        requestInput.input = ( this.parsedInput.parts.filter(part => !(part instanceof ChatRequestSlashPromptPart)).map(part => part.text)).join('').trim();
+        requestInput.attachedContext.insertFirst(toPromptFileVariableEntry(
+            parseResult.uri,
+            PromptFileVariableKind.PromptFile,
+            undefined,
+            true,
+            toolReferences
+        ));
+        requestInput.input = ( this.parsedInput.parts.filter(part => !(part instanceof ChatRequestSlashPromptPart)).map(part => part.text)).join("").trim();
         const input = requestInput.input.trim();
         requestInput.input = `Follow instructions in [${basename(parseResult.uri)}](${( parseResult.uri.toString())}).`;
         if (input) {
@@ -1725,12 +1676,21 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (!this.viewModel) {
             return;
         }
+        if (this.viewOptions.submitHandler) {
+            const inputValue = !query ? this.getInput() : query.query;
+            const handled = await this.viewOptions.submitHandler(inputValue, this.input.currentModeKind);
+            if (handled) {
+                return;
+            }
+        }
         this._onDidAcceptInput.fire();
-        this.scrollLock = this.isLockedToCodingAgent || !!checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll);
+        this.listWidget.setScrollLock(
+            this.isLockedToCodingAgent || !!checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll)
+        );
         const editorValue = this.getInput();
         const requestInputs = {
             input: !query ? editorValue : query.query,
-            attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource),
+            attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource)
         };
         const isUserQuery = !query;
         if (this.viewModel?.editing) {
@@ -1745,7 +1705,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             const previousRequests = this.viewModel.model.getRequests();
             for (const request of previousRequests) {
                 for (const variable of request.variableData.variables) {
-                    if (URI.isUri(variable.value) && variable.kind === 'file') {
+                    if (URI.isUri(variable.value) && variable.kind === "file") {
                         const uri = variable.value;
                         if (!( uniqueWorkingSetEntries.has(uri))) {
                             editingSessionAttachedContext.add(variable);
@@ -1755,7 +1715,10 @@ let ChatWidget = class ChatWidget extends Disposable {
                 }
             }
             requestInputs.attachedContext = editingSessionAttachedContext;
-            this.telemetryService.publicLog2('chatEditing/workingSetSize', { originalSize: uniqueWorkingSetEntries.size, actualSize: uniqueWorkingSetEntries.size });
+            this.telemetryService.publicLog2("chatEditing/workingSetSize", {
+                originalSize: uniqueWorkingSetEntries.size,
+                actualSize: uniqueWorkingSetEntries.size
+            });
         }
         this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource);
         if (this.currentRequest) {
@@ -1778,12 +1741,15 @@ let ChatWidget = class ChatWidget extends Disposable {
             userSelectedModelId: this.input.currentLanguageModel,
             location: this.location,
             locationData: this._location.resolveData?.(),
-            parserContext: { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind },
+            parserContext: {
+                selectedAgent: this._lastSelectedAgent,
+                mode: this.input.currentModeKind
+            },
             attachedContext: requestInputs.attachedContext.asArray(),
             noCommandDetection: options?.noCommandDetection,
             ...this.getModeRequestOptions(),
             modeInfo: this.input.currentModeInfo,
-            agentIdSilent: this._lockedAgent?.id,
+            agentIdSilent: this._lockedAgent?.id
         });
         if (!result) {
             this.chatAccessibilityService.disposeRequest(this.viewModel.sessionResource);
@@ -1791,14 +1757,27 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         this.updateChatViewVisibility();
         this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
-        this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
+        this._onDidSubmitAgent.fire({
+            agent: result.agent,
+            slashCommand: result.slashCommand
+        });
         this.handleDelegationExitIfNeeded(this._lockedAgent, result.agent);
         this.currentRequest = result.responseCompletePromise.then(() => {
             const responses = this.viewModel?.getItems().filter(isResponseVM);
             const lastResponse = responses?.[responses.length - 1];
-            this.chatAccessibilityService.acceptResponse(this, this.container, lastResponse, this.viewModel?.sessionResource, options?.isVoiceInput);
+            this.chatAccessibilityService.acceptResponse(
+                this,
+                this.container,
+                lastResponse,
+                this.viewModel?.sessionResource,
+                options?.isVoiceInput
+            );
             if (lastResponse?.result?.nextQuestion) {
-                const { prompt, participant, command } = lastResponse.result.nextQuestion;
+                const {
+                    prompt,
+                    participant,
+                    command
+                } = lastResponse.result.nextQuestion;
                 const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);
                 if (question) {
                     this.input.setValue(question, false);
@@ -1811,77 +1790,56 @@ let ChatWidget = class ChatWidget extends Disposable {
     getModeRequestOptions() {
         return {
             modeInfo: this.input.currentModeInfo,
-            userSelectedTools: this.input.selectedToolsModel.userSelectedTools,
+            userSelectedTools: this.input.selectedToolsModel.userSelectedTools
         };
     }
     getCodeBlockInfosForResponse(response) {
-        return this.renderer.getCodeBlockInfosForResponse(response);
+        return this.listWidget.getCodeBlockInfosForResponse(response);
     }
     getCodeBlockInfoForEditor(uri) {
-        return this.renderer.getCodeBlockInfoForEditor(uri);
+        return this.listWidget.getCodeBlockInfoForEditor(uri);
     }
     getFileTreeInfosForResponse(response) {
-        return this.renderer.getFileTreeInfosForResponse(response);
+        return this.listWidget.getFileTreeInfosForResponse(response);
     }
     getLastFocusedFileTreeForResponse(response) {
-        return this.renderer.getLastFocusedFileTreeForResponse(response);
+        return this.listWidget.getLastFocusedFileTreeForResponse(response);
     }
     focusResponseItem(lastFocused) {
-        if (!this.viewModel) {
-            return;
-        }
-        const items = this.tree.getNode(null).children;
-        let item;
-        if (lastFocused) {
-            item = items[this._mostRecentlyFocusedItemIndex] ?? items[items.length - 1];
-        }
-        else {
-            item = items[items.length - 1];
-        }
-        if (!item) {
-            return;
-        }
-        this.tree.setFocus([item.element]);
-        this.tree.domFocus();
+        this.listWidget.focusLastItem(lastFocused);
     }
     layout(height, width) {
-        width = Math.min(width, this.viewOptions.renderStyle === 'minimal' ? width : 950);
-        const heightUpdated = this.bodyDimension && this.bodyDimension.height !== height;
+        width = Math.min(width, this.viewOptions.renderStyle === "minimal" ? width : 950);
         this.bodyDimension = new Dimension(width, height);
-        const layoutHeight = this._dynamicMessageLayoutData?.enabled ? this._dynamicMessageLayoutData.maxHeight : height;
         if (this.viewModel?.editing) {
-            this.inlineInputPart?.layout(layoutHeight, width);
+            this.inlineInputPart?.layout(width);
         }
-        this.inputPart.layout(layoutHeight, width);
-        const inputHeight = this.inputPart.inputPartHeight;
+        this.inputPart.layout(width);
+        const inputHeight = this.inputPart.height.get();
         const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
-        const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight - 2;
-        const lastItem = this.viewModel?.getItems().at(-1);
+        const lastElementVisible = this.listWidget.isScrolledToBottom;
+        const lastItem = this.listWidget.lastItem;
         const contentHeight = Math.max(0, height - inputHeight - chatSuggestNextWidgetHeight);
-        if (this.viewOptions.renderStyle === 'compact' || this.viewOptions.renderStyle === 'minimal') {
-            this.listContainer.style.removeProperty('--chat-current-response-min-height');
-        }
-        else {
-            this.listContainer.style.setProperty('--chat-current-response-min-height', contentHeight * .75 + 'px');
-            if (heightUpdated && lastItem && this.visible && this.tree.hasElement(lastItem)) {
-                this.tree.updateElementHeight(lastItem, undefined);
-            }
-        }
-        this.tree.layout(contentHeight, width);
+        this.listWidget.layout(contentHeight, width);
         this.welcomeMessageContainer.style.height = `${contentHeight}px`;
-        this.renderer.layout(width);
         const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
         if (lastElementVisible && (!lastResponseIsRendering || checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll))) {
-            this.scrollToEnd();
+            this.listWidget.scrollToEnd();
         }
         this.listContainer.style.height = `${contentHeight}px`;
         this._onDidChangeHeight.fire(height);
     }
     setDynamicChatTreeItemLayout(numOfChatTreeItems, maxHeight) {
-        this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
-        this._register(this.renderer.onDidChangeItemHeight(() => this.layoutDynamicChatTreeItemMode()));
+        this._dynamicMessageLayoutData = {
+            numOfMessages: numOfChatTreeItems,
+            maxHeight,
+            enabled: true
+        };
+        this._register(
+            this.listWidget.onDidChangeItemHeight(() => this.layoutDynamicChatTreeItemMode())
+        );
         const mutableDisposable = this._register(( new MutableDisposable()));
-        this._register(this.tree.onDidScroll((e) => {
+        this._register(this.listWidget.onDidScroll(e => {
             if (!this._dynamicMessageLayoutData?.enabled) {
                 return;
             }
@@ -1896,16 +1854,23 @@ let ChatWidget = class ChatWidget extends Disposable {
                 }
                 const possibleMaxHeight = (this._dynamicMessageLayoutData?.maxHeight ?? maxHeight);
                 const width = this.bodyDimension?.width ?? this.container.offsetWidth;
-                this.input.layout(possibleMaxHeight, width);
-                const inputPartHeight = this.input.inputPartHeight;
+                this.input.layout(width);
+                const inputPartHeight = this.input.height.get();
                 const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
-                const newHeight = Math.min(renderHeight + diff, possibleMaxHeight - inputPartHeight - chatSuggestNextWidgetHeight);
+                const newHeight = Math.min(
+                    renderHeight + diff,
+                    possibleMaxHeight - inputPartHeight - chatSuggestNextWidgetHeight
+                );
                 this.layout(newHeight + inputPartHeight + chatSuggestNextWidgetHeight, width);
             });
         }));
     }
     updateDynamicChatTreeItemLayout(numOfChatTreeItems, maxHeight) {
-        this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
+        this._dynamicMessageLayoutData = {
+            numOfMessages: numOfChatTreeItems,
+            maxHeight,
+            enabled: true
+        };
         let hasChanged = false;
         let height = this.bodyDimension.height;
         let width = this.bodyDimension.width;
@@ -1936,23 +1901,22 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         const width = this.bodyDimension?.width ?? this.container.offsetWidth;
-        this.input.layout(this._dynamicMessageLayoutData.maxHeight, width);
-        const inputHeight = this.input.inputPartHeight;
+        this.input.layout(width);
+        const inputHeight = this.input.height.get();
         const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
         const totalMessages = this.viewModel.getItems();
         const messages = totalMessages.slice(-this._dynamicMessageLayoutData.numOfMessages);
         const needsRerender = ( messages.some(m => m.currentRenderedHeight === undefined));
-        const listHeight = needsRerender
-            ? this._dynamicMessageLayoutData.maxHeight
-            : messages.reduce((acc, message) => acc + message.currentRenderedHeight, 0);
+        const listHeight = needsRerender ? this._dynamicMessageLayoutData.maxHeight : messages.reduce((acc, message) => acc + message.currentRenderedHeight, 0);
         this.layout(Math.min(
-        inputHeight + chatSuggestNextWidgetHeight + listHeight + (totalMessages.length > 2 ? 18 : 0), this._dynamicMessageLayoutData.maxHeight), width);
+            inputHeight + chatSuggestNextWidgetHeight + listHeight + (totalMessages.length > 2 ? 18 : 0),
+            this._dynamicMessageLayoutData.maxHeight
+        ), width);
         if (needsRerender || !listHeight) {
-            this.scrollToEnd();
+            this.listWidget.scrollToEnd();
         }
     }
-    saveState() {
-    }
+    saveState() {}
     getViewState() {
         return this.input.getCurrentInputState();
     }
@@ -1966,7 +1930,13 @@ let ChatWidget = class ChatWidget extends Disposable {
             const agent = this.chatModeService.findModeByName(agentName);
             if (agent) {
                 if (currentAgent.kind !== agent.kind) {
-                    const chatModeCheck = await this.instantiationService.invokeFunction(handleModeSwitch, currentAgent.kind, agent.kind, this.viewModel?.model.getRequests().length ?? 0, this.viewModel?.model);
+                    const chatModeCheck = await this.instantiationService.invokeFunction(
+                        handleModeSwitch,
+                        currentAgent.kind,
+                        agent.kind,
+                        this.viewModel?.model.getRequests().length ?? 0,
+                        this.viewModel?.model
+                    );
                     if (!chatModeCheck) {
                         return;
                     }
@@ -1978,7 +1948,14 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
         }
     }
-    async _applyPromptMetadata({ agent, tools, model }, requestInput) {
+    async _applyPromptMetadata(
+        {
+            agent,
+            tools,
+            model
+        },
+        requestInput
+    ) {
         if (tools !== undefined && !agent && this.input.currentModeKind !== ChatModeKind.Agent) {
             agent = ChatMode.Agent.name.get();
         }
@@ -1986,49 +1963,33 @@ let ChatWidget = class ChatWidget extends Disposable {
             this._switchToAgentByName(agent);
         }
         if (tools !== undefined && this.input.currentModeKind === ChatModeKind.Agent) {
-            const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, Target.VSCode);
+            const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, Target.VSCode, this.input.selectedLanguageModel.get()?.metadata);
             this.input.selectedToolsModel.set(enablementMap, true);
         }
         if (model !== undefined) {
             this.input.switchModelByQualifiedName(model);
         }
     }
-    async _autoAttachInstructions({ attachedContext }) {
+    async _autoAttachInstructions(
+        {
+            attachedContext
+        }
+    ) {
         this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are always enabled`);
-        const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.entriesMap.get() : undefined;
-        const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, enabledTools);
+        const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.userSelectedTools.get() : undefined;
+        const enabledSubAgents = this.input.currentModeKind === ChatModeKind.Agent ? this.input.currentModeObs.get().agents?.get() : undefined;
+        const computer = this.instantiationService.createInstance(
+            ComputeAutomaticInstructions,
+            this.input.currentModeKind,
+            enabledTools,
+            enabledSubAgents
+        );
         await computer.collect(attachedContext, CancellationToken.None);
     }
     delegateScrollFromMouseWheelEvent(browserEvent) {
-        this.tree.delegateScrollFromMouseWheelEvent(browserEvent);
+        this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
     }
 };
-ChatWidget = ChatWidget_1 = ( __decorate([
-    ( __param(4, ICodeEditorService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IContextKeyService)),
-    ( __param(8, IInstantiationService)),
-    ( __param(9, IChatService)),
-    ( __param(10, IChatAgentService)),
-    ( __param(11, IChatWidgetService)),
-    ( __param(12, IContextMenuService)),
-    ( __param(13, IChatAccessibilityService)),
-    ( __param(14, ILogService)),
-    ( __param(15, IThemeService)),
-    ( __param(16, IChatSlashCommandService)),
-    ( __param(17, IChatEditingService)),
-    ( __param(18, ITelemetryService)),
-    ( __param(19, IPromptsService)),
-    ( __param(20, ILanguageModelToolsService)),
-    ( __param(21, IChatModeService)),
-    ( __param(22, IChatLayoutService)),
-    ( __param(23, IChatEntitlementService)),
-    ( __param(24, IChatSessionsService)),
-    ( __param(25, IAgentSessionsService)),
-    ( __param(26, IChatTodoListService)),
-    ( __param(27, IWorkspaceContextService)),
-    ( __param(28, ILifecycleService))
-], ChatWidget));
+ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IEditorService)), ( __param(6, IConfigurationService)), ( __param(7, IContextKeyService)), ( __param(8, IInstantiationService)), ( __param(9, IChatService)), ( __param(10, IChatAgentService)), ( __param(11, IChatWidgetService)), ( __param(12, IChatAccessibilityService)), ( __param(13, ILogService)), ( __param(14, IThemeService)), ( __param(15, IChatSlashCommandService)), ( __param(16, IChatEditingService)), ( __param(17, ITelemetryService)), ( __param(18, IPromptsService)), ( __param(19, ILanguageModelToolsService)), ( __param(20, IChatModeService)), ( __param(21, IChatLayoutService)), ( __param(22, IChatEntitlementService)), ( __param(23, IChatSessionsService)), ( __param(24, IAgentSessionsService)), ( __param(25, IChatTodoListService)), ( __param(26, IWorkspaceContextService)), ( __param(27, ILifecycleService))], ChatWidget));
 
 export { ChatWidget, isQuickChat };