@codingame/monaco-vscode-katex-common 27.0.0 → 28.0.0

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

@@ -16,7 +16,7 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -76,23 +76,23 @@ import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEd
 import { InlineChatConfigKeys } from '../../../../inlineChat/common/inlineChat.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatRequestVariableSet, isImageVariableEntry, isStringVariableEntry, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
-import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { getModeNameForTelemetry, 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 { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { agentOptionId, localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatAgentLocation, ChatModeKind, ChatConfiguration, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel, ChatConfiguration, isAutoApproveLevel, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ChatQuestionCarouselData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData';
+import { shouldResetOnModelListChange, shouldRestorePersistedModel, shouldRestoreLateArrivingModel, resolveModelFromSyncState, shouldResetModelToDefault, mergeModelsWithCache, filterModelsForSession, hasModelsTargetingSession, isModelValidForSession, findDefaultModel } from './chatModelSelectionLogic.js';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ChatHistoryNavigator } from '../../../common/widget/chatWidgetHistoryService.js';
-import { ChatSubmitAction, OpenModelPickerAction, OpenModePickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, OpenWorkspacePickerAction, ChatSessionPrimaryPickerAction } from '../../actions/chatExecuteActions.js';
-import { AgentSessionProviders, getAgentSessionProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { ChatSubmitAction, OpenModelPickerAction, OpenModePickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, OpenWorkspacePickerAction, ChatSessionPrimaryPickerAction, OpenPermissionPickerAction } from '../../actions/chatExecuteActions.js';
+import { getAgentSessionProvider, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { ChatAttachmentModel } from '../../attachments/chatAttachmentModel.js';
 import { IChatAttachmentWidgetRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service';
@@ -114,20 +114,33 @@ import { ChatInputPartWidgetController } from './chatInputPartWidgets.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
 import { DelegationSessionPickerActionItem } from './delegationSessionPickerActionItem.js';
 import { ModePickerActionItem } from './modePickerActionItem.js';
+import { PermissionPickerActionItem } from './permissionPickerActionItem.js';
 import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
 import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
 import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
-import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { EnhancedModelPickerActionItem } from './modelPickerActionItem2.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
-import { derivedOpts, derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 var ChatInputPart_1;
 const $ = $$1;
 const INPUT_EDITOR_MAX_HEIGHT = 250;
+const INPUT_EDITOR_LINE_HEIGHT = 20;
+const INPUT_EDITOR_PADDING = {
+    compact: {
+        top: 2,
+        bottom: 2
+    },
+    default: {
+        top: 12,
+        bottom: 12
+    }
+};
 const CachedLanguageModelsKey = "chat.cachedLanguageModels.v2";
+const CHAT_INPUT_PICKER_COLLAPSE_WIDTH = 320;
 var ChatWidgetLocation;
 (function(ChatWidgetLocation) {
     ChatWidgetLocation["SidebarLeft"] = "sidebarLeft";
@@ -164,7 +177,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     get attachmentModel() {
         return this._attachmentModel;
     }
-    getAttachedContext(sessionResource) {
+    getAttachedContext() {
         const contextArr = ( new ChatRequestVariableSet());
         contextArr.add(
             ...this.attachmentModel.attachments,
@@ -172,8 +185,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         );
         return contextArr;
     }
-    getAttachedAndImplicitContext(sessionResource) {
-        const contextArr = this.getAttachedContext(sessionResource);
+    getAttachedAndImplicitContext() {
+        const contextArr = this.getAttachedContext();
         if (this.implicitContext) {
             const implicitChatVariables = this.implicitContext.enabledBaseEntries(
                 this.configurationService.getValue("chat.implicitContext.suggestedContext")
@@ -207,6 +220,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     get currentModeObs() {
         return this._currentModeObservable;
     }
+    get currentPermissionLevelObs() {
+        return this._currentPermissionLevel;
+    }
     get currentModeInfo() {
         const mode = this._currentModeObservable.get();
         const modeId = mode.isBuiltin ? this.currentModeKind : "custom";
@@ -215,13 +231,17 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             kind: this.currentModeKind,
             isBuiltin: mode.isBuiltin,
             modeInstructions: modeInstructions ? {
+                uri: mode.uri?.get(),
                 name: mode.name.get(),
                 content: modeInstructions.content,
                 toolReferences: this.toolService.toToolReferences(modeInstructions.toolReferences),
-                metadata: modeInstructions.metadata
+                metadata: modeInstructions.metadata,
+                isBuiltin: mode.isBuiltin
             } : undefined,
             modeId: modeId,
-            applyCodeBlockSuggestionId: undefined
+            modeName: getModeNameForTelemetry(mode),
+            applyCodeBlockSuggestionId: undefined,
+            permissionLevel: this._currentPermissionLevel.get()
         };
     }
     get selectedElements() {
@@ -306,12 +326,19 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.viewDescriptorService = viewDescriptorService;
         this._chatAttachmentWidgetRegistry = _chatAttachmentWidgetRegistry;
         this._workingSetCollapsed = observableValue("chatInputPart.workingSetCollapsed", true);
+        this._stableInputPartWidth = observableValue("chatInputPart.stableInputPartWidth", 0);
         this._chatInputTodoListWidget = this._register(( new MutableDisposable()));
-        this._chatQuestionCarouselWidget = this._register(( new MutableDisposable()));
-        this._chatQuestionCarouselDisposables = this._register(( new DisposableStore()));
+        this._chatQuestionCarouselWidgets = this._register(( new DisposableMap()));
+        this._questionCarouselResponseIds = ( new Map());
+        this._questionCarouselSessionResources = ( new Map());
         this._chatEditingTodosDisposables = this._register(( new DisposableStore()));
         this._onDidLoadInputState = this._register(( new Emitter()));
         this.onDidLoadInputState = this._onDidLoadInputState.event;
+        this._toolbarRelayoutScheduler = this._register(( new RunOnceScheduler(() => {
+            if (typeof this.cachedWidth === "number") {
+                this.layout(this.cachedWidth);
+            }
+        }, 0)));
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;
         this._onDidBlur = this._register(( new Emitter()));
@@ -359,6 +386,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             onDidChangeVisibility: this._onDidChangeVisibility.event
         }));
         this._currentModeObservable = observableValue("currentMode", this.options.defaultMode ?? ChatMode.Agent);
+        this._currentPermissionLevel = observableValue("permissionLevel", ChatPermissionLevel.Default);
         this._register(this.editorService.onDidActiveEditorChange(() => {
             this._indexOfLastOpenedContext = -1;
             this.refreshChatSessionPickers();
@@ -398,6 +426,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.instantiationService.createInstance(ChatDragAndDrop, () => this._widget, this._attachmentModel, styles)
         );
         this.inputEditorMaxHeight = this.options.renderStyle === "compact" ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
+        const padding = this.options.renderStyle === "compact" ? INPUT_EDITOR_PADDING.compact : INPUT_EDITOR_PADDING.default;
+        this.inputEditorMinHeight = this.options.inputEditorMinLines ? this.options.inputEditorMinLines * INPUT_EDITOR_LINE_HEIGHT + padding.top + padding.bottom : undefined;
         this.inputEditorHasText = ChatContextKeys.inputHasText.bindTo(contextKeyService);
         this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
         this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
@@ -405,6 +435,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatModeKindKey = ChatContextKeys.chatModeKind.bindTo(contextKeyService);
         this.chatModeNameKey = ChatContextKeys.chatModeName.bindTo(contextKeyService);
         this.chatModelIdKey = ChatContextKeys.chatModelId.bindTo(contextKeyService);
+        this.permissionLevelKey = ChatContextKeys.chatPermissionLevel.bindTo(contextKeyService);
         this.withinEditSessionKey = ChatContextKeys.withinEditSessionDiff.bindTo(contextKeyService);
         this.filePartOfEditSessionKey = ChatContextKeys.filePartOfEditSession.bindTo(contextKeyService);
         this.chatSessionHasOptions = ChatContextKeys.chatSessionHasModels.bindTo(contextKeyService);
@@ -451,8 +482,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._hasFileAttachmentContextKey = ChatContextKeys.hasFileAttachments.bindTo(contextKeyService);
         this.initSelectedModel();
         this._register(this.languageModelsService.onDidChangeLanguageModels(() => {
-            const selectedModel = this._currentLanguageModel ? this.getModels().find(m => m.identifier === this._currentLanguageModel.get()?.identifier) : undefined;
-            if (!this.currentLanguageModel || !selectedModel) {
+            if (shouldResetOnModelListChange(this._currentLanguageModel.get()?.identifier, this.getModels())) {
                 this.setCurrentLanguageModelToDefault();
             }
         }));
@@ -494,12 +524,21 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             if (sessionResource) {
                 const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
                 if (ctx) {
-                    this.chatSessionsService.notifySessionOptionsChange(ctx.chatSessionResource, [{
-                        optionId: agentOptionId,
-                        value: mode.isBuiltin ? "" : modeName
-                    }]).catch(
-                        err => this.logService.error("Failed to notify extension of agent change:", err)
-                    );
+                    let needsUpdate = true;
+                    const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
+                    if (typeof agentOption !== "undefined") {
+                        const agentId = (typeof agentOption === "string" ? agentOption : agentOption.id) || ChatMode.Agent.id;
+                        const isDefaultAgent = agentId === ChatMode.Agent.id;
+                        needsUpdate = isDefaultAgent ? mode.id !== ChatMode.Agent.id : mode.label.read(undefined) !== agentId;
+                    }
+                    if (needsUpdate) {
+                        this.chatSessionsService.notifySessionOptionsChange(ctx.chatSessionResource, [{
+                            optionId: agentOptionId,
+                            value: mode.isBuiltin ? "" : modeName
+                        }]).catch(
+                            err => this.logService.error("Failed to notify extension of agent change:", err)
+                        );
+                    }
                 }
             }
         }));
@@ -532,25 +571,22 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const persistedSelection = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
         const persistedAsDefault = this.storageService.getBoolean(this.getSelectedModelIsDefaultStorageKey(), StorageScope.APPLICATION, true);
         if (persistedSelection) {
-            const model = this.getModels().find(m => m.identifier === persistedSelection);
-            if (model) {
-                if (!persistedAsDefault || model.metadata.isDefaultForLocation[this.location]) {
-                    this.setCurrentLanguageModel(model);
-                    this.checkModelSupported();
-                }
-            } else {
+            const result = shouldRestorePersistedModel(persistedSelection, persistedAsDefault, this.getModels(), this.location);
+            if (result.shouldRestore && result.model) {
+                this.setCurrentLanguageModel(result.model);
+                this.checkModelSupported();
+            } else if (!result.model) {
                 this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
                     const persistedModel = this.languageModelsService.lookupLanguageModel(persistedSelection);
                     if (persistedModel) {
                         this._waitForPersistedLanguageModel.clear();
-                        if (!persistedAsDefault || persistedModel.isDefaultForLocation[this.location]) {
-                            if (persistedModel.isUserSelectable) {
-                                this.setCurrentLanguageModel({
-                                    metadata: persistedModel,
-                                    identifier: persistedSelection
-                                });
-                                this.checkModelSupported();
-                            }
+                        const lateModel = {
+                            metadata: persistedModel,
+                            identifier: persistedSelection
+                        };
+                        if (shouldRestoreLateArrivingModel(persistedSelection, persistedAsDefault, lateModel, this.location)) {
+                            this.setCurrentLanguageModel(lateModel);
+                            this.checkModelSupported();
                         }
                     } else {
                         this.setCurrentLanguageModelToDefault();
@@ -561,11 +597,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._register(this._onDidChangeCurrentChatMode.event(() => {
             this.checkModelSupported();
         }));
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(ChatConfiguration.Edits2Enabled)) {
-                this.checkModelSupported();
-            }
-        }));
     }
     setEditing(enabled, editingSentRequest) {
         this.currentlyEditingInputKey?.set(enabled);
@@ -610,6 +641,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     openModePicker() {
         this.modeWidget?.show();
     }
+    openPermissionPicker() {
+        this.permissionWidget?.show();
+    }
+    setPermissionLevel(level) {
+        this._currentPermissionLevel.set(level, undefined);
+        this.permissionLevelKey.set(level);
+        this.permissionWidget?.refresh();
+    }
     openSessionTargetPicker() {
         this.sessionTargetWidget?.show();
     }
@@ -684,6 +723,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._modelSyncDisposables.clear();
         this.selectedToolsModel.resetSessionEnablementState();
         this._chatSessionIsEmpty = chatSessionIsEmpty;
+        if (chatSessionIsEmpty && !this.configurationService.getValue(ChatConfiguration.GlobalAutoApprove) && !isAutoApproveLevel(this._currentPermissionLevel.get())) {
+            this._currentPermissionLevel.set(ChatPermissionLevel.Default, undefined);
+            this.permissionLevelKey.set(ChatPermissionLevel.Default);
+            this.permissionWidget?.refresh();
+        }
         if (chatSessionIsEmpty) {
             this._setEmptyModelState();
         }
@@ -729,13 +773,24 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 }
             }
             if (state?.selectedModel) {
-                const lm = this._currentLanguageModel.get();
-                if (!lm || lm.identifier !== state.selectedModel.identifier) {
-                    if (this.isModelValidForCurrentSession(state.selectedModel)) {
-                        this.setCurrentLanguageModel(state.selectedModel);
-                    } else {
-                        this.setCurrentLanguageModelToDefault();
+                const allModels = this.getAllMergedModels();
+                const sessionType = this.getCurrentSessionType();
+                const syncResult = resolveModelFromSyncState(
+                    state.selectedModel,
+                    this._currentLanguageModel.get(),
+                    allModels,
+                    sessionType,
+                    {
+                        location: this.location,
+                        currentModeKind: this.currentModeKind,
+                        isInlineChatV2Enabled: !!this.configurationService.getValue(InlineChatConfigKeys.EnableV2),
+                        sessionType
                     }
+                );
+                if (syncResult.action === "apply") {
+                    this.setCurrentLanguageModel(state.selectedModel);
+                } else if (syncResult.action === "default") {
+                    this.setCurrentLanguageModelToDefault();
                 }
             }
             const currentAttachments = this._attachmentModel.attachments;
@@ -792,7 +847,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     checkModelSupported() {
         const lm = this._currentLanguageModel.get();
-        if (lm && (!this.modelSupportedForDefaultAgent(lm) || !this.modelSupportedForInlineChat(lm) || !this.isModelValidForCurrentSession(lm))) {
+        const allModels = this.getAllMergedModels();
+        if (shouldResetModelToDefault(lm, this.getModels(), {
+            location: this.location,
+            currentModeKind: this.currentModeKind,
+            isInlineChatV2Enabled: !!this.configurationService.getValue(InlineChatConfigKeys.EnableV2),
+            sessionType: this.getCurrentSessionType()
+        }, allModels)) {
             this.setCurrentLanguageModelToDefault();
         }
     }
@@ -800,7 +861,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!this.options.supportsChangingModes) {
             return;
         }
-        const mode2 = this.chatModeService.findModeById(mode) ?? this.chatModeService.findModeById(ChatModeKind.Agent) ?? ChatMode.Ask;
+        const mode2 = this.chatModeService.findModeById(mode) ?? this.chatModeService.findModeByName(mode) ?? this.chatModeService.findModeById(ChatModeKind.Agent) ?? ChatMode.Ask;
         this.setChatMode2(mode2, storeSelection);
     }
     setChatMode2(mode, storeSelection = true) {
@@ -811,47 +872,33 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._onDidChangeCurrentChatMode.fire();
         this._syncInputStateToModel();
     }
-    modelSupportedForDefaultAgent(model) {
-        if (this.currentModeKind === ChatModeKind.Agent || (this.currentModeKind === ChatModeKind.Edit && this.configurationService.getValue(ChatConfiguration.Edits2Enabled))) {
-            return ILanguageModelChatMetadata.suitableForAgentMode(model.metadata);
-        }
-        return true;
-    }
-    modelSupportedForInlineChat(model) {
-        if (this.location !== ChatAgentLocation.EditorInline || !this.configurationService.getValue(InlineChatConfigKeys.EnableV2)) {
-            return true;
-        }
-        return !!model.metadata.capabilities?.toolCalling;
-    }
-    getModels() {
+    getAllMergedModels() {
         const cachedModels = this.storageService.getObject(CachedLanguageModelsKey, StorageScope.APPLICATION, []);
         const liveModels = ( this.languageModelsService.getLanguageModelIds().map(modelId => ({
             identifier: modelId,
             metadata: this.languageModelsService.lookupLanguageModel(modelId)
         })));
-        let models;
+        const contributedVendors = ( new Set(( this.languageModelsService.getVendors().map(v => v.vendor))));
+        const models = mergeModelsWithCache(liveModels, cachedModels, contributedVendors);
         if (liveModels.length > 0) {
-            const liveVendors = ( new Set(( liveModels.map(m => m.metadata.vendor))));
-            const contributedVendors = ( new Set(( this.languageModelsService.getVendors().map(v => v.vendor))));
-            models = [...liveModels, ...cachedModels.filter(m => !( liveVendors.has(m.metadata.vendor)) && ( contributedVendors.has(m.metadata.vendor)))];
             this.storageService.store(
                 CachedLanguageModelsKey,
                 models,
                 StorageScope.APPLICATION,
                 StorageTarget.MACHINE
             );
-        } else {
-            models = cachedModels;
         }
+        return models;
+    }
+    getModels() {
+        const models = this.getAllMergedModels();
         models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
-        const sessionType = this.getCurrentSessionType();
-        if (sessionType && sessionType !== AgentSessionProviders.Local) {
-            return models.filter(
-                entry => entry.metadata?.targetChatSessionType === sessionType && entry.metadata?.isUserSelectable
-            );
-        }
-        return models.filter(
-            entry => !entry.metadata?.targetChatSessionType && entry.metadata?.isUserSelectable && this.modelSupportedForDefaultAgent(entry) && this.modelSupportedForInlineChat(entry)
+        return filterModelsForSession(
+            models,
+            this.getCurrentSessionType(),
+            this.currentModeKind,
+            this.location,
+            !!this.configurationService.getValue(InlineChatConfigKeys.EnableV2)
         );
     }
     getCurrentSessionType() {
@@ -864,20 +911,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return ctx?.chatSessionType;
     }
     hasModelsTargetingSessionType() {
-        const sessionType = this.getCurrentSessionType();
-        if (!sessionType) {
-            return false;
-        }
-        return ( this.languageModelsService.getLanguageModelIds().some(modelId => {
-            const metadata = this.languageModelsService.lookupLanguageModel(modelId);
-            return metadata?.targetChatSessionType === sessionType;
-        }));
+        return hasModelsTargetingSession(this.getAllMergedModels(), this.getCurrentSessionType());
     }
     isModelValidForCurrentSession(model) {
-        if (this.hasModelsTargetingSessionType()) {
-            return model.metadata.targetChatSessionType === this.getCurrentSessionType();
-        }
-        return !model.metadata.targetChatSessionType;
+        return isModelValidForSession(model, this.getAllMergedModels(), this.getCurrentSessionType());
     }
     checkModelInSessionPool() {
         const lm = this._currentLanguageModel.get();
@@ -929,7 +966,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     setCurrentLanguageModelToDefault() {
         const allModels = this.getModels();
-        const defaultModel = allModels.find(m => m.metadata.isDefaultForLocation[this.location]) || allModels[0];
+        const defaultModel = findDefaultModel(allModels, this.location);
         if (defaultModel) {
             this.setCurrentLanguageModel(defaultModel);
         }
@@ -960,40 +997,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(6689, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(6776, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(6690, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(6777, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(6691, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(6778, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(6692, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(6779, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(6693, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(6780, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                6694,
+                6781,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                6695,
+                6782,
                 "Chat Input {0}{1} Press Enter to send out the request. Use the Chat Accessibility Help command for more information.",
                 modeLabel,
                 modelInfo
             ));
         } else {
-            return localize(6696, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(6783, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1462,15 +1499,24 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.refreshChatSessionPickers();
             this.tryUpdateWidgetController();
             this.updateContextUsageWidget();
-            if (this._currentQuestionCarouselSessionResource && (!e.currentSessionResource || !isEqual(this._currentQuestionCarouselSessionResource, e.currentSessionResource))) {
+            let hasMatchingResource = false;
+            if (e.currentSessionResource) {
+                for (const r of ( this._questionCarouselSessionResources.values())) {
+                    if (isEqual(r, e.currentSessionResource)) {
+                        hasMatchingResource = true;
+                        break;
+                    }
+                }
+            }
+            if (this._questionCarouselSessionResources.size > 0 && (!e.currentSessionResource || !hasMatchingResource)) {
                 this.clearQuestionCarousel();
             }
             const newSessionType = this.getCurrentSessionType();
-            if (newSessionType !== this._currentSessionType) {
+            if (e.currentSessionResource && newSessionType !== this._currentSessionType) {
                 this._currentSessionType = newSessionType;
                 this.initSelectedModel();
+                this.checkModelInSessionPool();
             }
-            this.checkModelInSessionPool();
             this.preselectModelFromSessionHistory();
         }));
         let elements;
@@ -1481,13 +1527,17 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 h(".chat-todo-list-widget-container@chatInputTodoListWidgetContainer"),
                 h(".chat-editing-session@chatEditingSessionWidgetContainer"),
                 h(".chat-getting-started-tip-container@chatGettingStartedTipContainer"),
-                h(".interactive-input-and-side-toolbar@inputAndSideToolbar", [h(
-                    ".chat-input-container@inputContainer",
-                    [h(".chat-editor-container@editorContainer"), h(
-                        ".chat-input-toolbars@inputToolbars",
-                        [h(".chat-context-usage-container@contextUsageWidgetContainer")]
-                    )]
-                )]),
+                h(
+                    ".interactive-input-and-side-toolbar@inputAndSideToolbar",
+                    [h(".chat-input-container@inputContainer", [
+                        h(".chat-editor-container@editorContainer"),
+                        h(".chat-input-toolbars@inputToolbars")
+                    ])]
+                ),
+                h(
+                    ".chat-secondary-toolbar@secondaryToolbar",
+                    [h(".chat-context-usage-container@contextUsageWidgetContainer")]
+                ),
                 h(
                     ".chat-attachments-container@attachmentsContainer",
                     [h(".chat-attached-context@attachedContextContainer")]
@@ -1507,10 +1557,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     [h(".chat-input-container@inputContainer", [h(
                         ".chat-attachments-container@attachmentsContainer",
                         [h(".chat-attached-context@attachedContextContainer")]
-                    ), h(".chat-editor-container@editorContainer"), h(
-                        ".chat-input-toolbars@inputToolbars",
-                        [h(".chat-context-usage-container@contextUsageWidgetContainer")]
-                    )])]
+                    ), h(".chat-editor-container@editorContainer"), h(".chat-input-toolbars@inputToolbars")])]
+                ),
+                h(
+                    ".chat-secondary-toolbar@secondaryToolbar",
+                    [h(".chat-context-usage-container@contextUsageWidgetContainer")]
                 )
             ]);
         }
@@ -1528,6 +1579,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.attachmentsContainer = elements.attachmentsContainer;
         this.attachedContextContainer = elements.attachedContextContainer;
         const toolbarsContainer = elements.inputToolbars;
+        this.secondaryToolbarContainer = elements.secondaryToolbar;
+        if (this.options.isSessionsWindow || this.options.renderStyle === "compact") {
+            this.secondaryToolbarContainer.style.display = "none";
+        }
         this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
         this.chatInputTodoListWidgetContainer = elements.chatInputTodoListWidgetContainer;
         this.chatGettingStartedTipContainer = elements.chatGettingStartedTipContainer;
@@ -1535,6 +1590,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatQuestionCarouselContainer = elements.chatQuestionCarouselContainer;
         this.chatInputWidgetsContainer = elements.chatInputWidgetsContainer;
         this.contextUsageWidgetContainer = elements.contextUsageWidgetContainer;
+        if (this.options.isSessionsWindow || this.options.renderStyle === "compact") {
+            toolbarsContainer.prepend(this.contextUsageWidgetContainer);
+        }
         this.contextUsageWidget = this._register(this.instantiationService.createInstance(ChatContextUsageWidget));
         this.contextUsageWidgetContainer.appendChild(this.contextUsageWidget.domNode);
         if (this.options.enableImplicitContext && !this._implicitContext) {
@@ -1580,14 +1638,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         options.ariaLabel = this._getAriaLabel();
         options.fontFamily = DEFAULT_FONT_FAMILY;
         options.fontSize = 13;
-        options.lineHeight = 20;
-        options.padding = this.options.renderStyle === "compact" ? {
-            top: 2,
-            bottom: 2
-        } : {
-            top: 8,
-            bottom: 8
-        };
+        options.lineHeight = INPUT_EDITOR_LINE_HEIGHT;
+        options.padding = this.options.renderStyle === "compact" ? INPUT_EDITOR_PADDING.compact : INPUT_EDITOR_PADDING.default;
         options.cursorWidth = 1;
         options.wrappingStrategy = "advanced";
         options.bracketPairColorization = {
@@ -1603,9 +1655,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             showStatusBar: false,
             insertMode: "insert"
         };
-        options.scrollbar = {
+        options.scrollbar = this.options.renderStyle === "compact" ? {
             ...(options.scrollbar ?? {}),
             vertical: "hidden"
+        } : {
+            ...(options.scrollbar ?? {}),
+            vertical: "auto",
+            verticalScrollbarSize: 7
         };
         options.stickyScroll = {
             enabled: false
@@ -1682,10 +1738,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             actionContext: {
                 widget
             },
-            onlyShowIconsForDefaultActions: observableFromEvent(
-                this._inputEditor.onDidLayoutChange,
-                l => (l?.width ?? this._inputEditor.getLayoutInfo().width) < 650
-            ).recomputeInitiallyAndOnChange(this._store),
+            hideChevrons: derived(
+                reader => this._stableInputPartWidth.read(reader) < CHAT_INPUT_PICKER_COLLAPSE_WIDTH
+            ),
             hoverPosition: {
                 forcePosition: true,
                 hoverPosition: location === ChatWidgetLocation.SidebarRight && !isMaximized ? HoverPosition.LEFT : HoverPosition.RIGHT
@@ -1714,7 +1769,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     enabled: true,
                     kind: "last",
                     minItems: 1,
-                    actionMinWidth: 40
+                    actionMinWidth: 22
                 },
                 actionViewItemProvider: (action, options) => {
                     if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
@@ -1784,16 +1839,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                 pickerOptions
                             );
                         } else {
-                            const empty = ( new BaseActionViewItem(undefined, action));
-                            if (empty.element) {
-                                empty.element.style.display = "none";
-                            }
-                            return empty;
+                            return ( new HiddenActionViewItem(action));
                         }
                     } else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
                         const widgets = this.createChatSessionPickerWidgets(action);
                         if (widgets.length === 0) {
-                            return undefined;
+                            return ( new HiddenActionViewItem(action));
                         }
                         return this.instantiationService.createInstance(ChatSessionPickersContainerActionItem, action, widgets);
                     }
@@ -1810,7 +1861,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             const container = toolbarElement.querySelector(".chat-sessionPicker-container");
             this.chatSessionPickerContainer = container;
             if (this.cachedWidth && typeof this.cachedInputToolbarWidth === "number" && this.cachedInputToolbarWidth !== this.inputActionsToolbar.getItemsWidth()) {
-                this.layout(this.cachedWidth);
+                this._toolbarRelayoutScheduler.schedule();
             }
         }));
         this.executeToolbar = this._register(this.instantiationService.createInstance(
@@ -1832,7 +1883,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         };
         this._register(this.executeToolbar.onDidChangeMenuItems(() => {
             if (this.cachedWidth && typeof this.cachedExecuteToolbarWidth === "number" && this.cachedExecuteToolbarWidth !== this.executeToolbar.getItemsWidth()) {
-                this.layout(this.cachedWidth);
+                this._toolbarRelayoutScheduler.schedule();
             }
         }));
         if (this.options.menus.inputSideToolbar) {
@@ -1854,6 +1905,80 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 widget
             };
         }
+        this.secondaryToolbar = this._register(this.instantiationService.createInstance(
+            MenuWorkbenchToolBar,
+            this.secondaryToolbarContainer,
+            MenuId.ChatInputSecondary,
+            {
+                telemetrySource: this.options.menus.telemetrySource,
+                menuOptions: {
+                    shouldForwardArgs: true
+                },
+                hiddenItemStrategy: HiddenItemStrategy.NoHide,
+                hoverDelegate,
+                actionViewItemProvider: (action, options) => {
+                    if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
+                        const getActiveSessionType = () => {
+                            const sessionResource = this._widget?.viewModel?.sessionResource;
+                            return sessionResource ? getAgentSessionProvider(sessionResource) : undefined;
+                        };
+                        const delegate = this.options.sessionTypePickerDelegate ?? {
+                            getActiveSessionProvider: () => {
+                                return getActiveSessionType();
+                            },
+                            getPendingDelegationTarget: () => {
+                                return this._pendingDelegationTarget;
+                            },
+                            setPendingDelegationTarget: provider => {
+                                const isActive = getActiveSessionType() === provider;
+                                this._pendingDelegationTarget = isActive ? undefined : provider;
+                                this.updateWidgetLockStateFromSessionType(provider);
+                                this.updateAgentSessionTypeContextKey();
+                                this.refreshChatSessionPickers();
+                            }
+                        };
+                        const isWelcomeViewMode = !!this.options.sessionTypePickerDelegate?.setActiveSessionProvider;
+                        const Picker = (action.id === OpenSessionTargetPickerAction.ID || isWelcomeViewMode) ? SessionTypePickerActionItem : DelegationSessionPickerActionItem;
+                        return this.sessionTargetWidget = this.instantiationService.createInstance(
+                            Picker,
+                            action,
+                            location === ChatWidgetLocation.Editor ? "editor" : "sidebar",
+                            delegate,
+                            pickerOptions
+                        );
+                    } else if (action.id === OpenWorkspacePickerAction.ID && action instanceof MenuItemAction) {
+                        if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY && this.options.workspacePickerDelegate) {
+                            return this.instantiationService.createInstance(
+                                WorkspacePickerActionItem,
+                                action,
+                                this.options.workspacePickerDelegate,
+                                pickerOptions
+                            );
+                        } else {
+                            const empty = ( new BaseActionViewItem(undefined, action));
+                            if (empty.element) {
+                                empty.element.style.display = "none";
+                            }
+                            return empty;
+                        }
+                    } else if (action.id === OpenPermissionPickerAction.ID && action instanceof MenuItemAction) {
+                        const delegate = {
+                            currentPermissionLevel: this._currentPermissionLevel,
+                            setPermissionLevel: level => {
+                                this._currentPermissionLevel.set(level, undefined);
+                                this.permissionLevelKey.set(level);
+                            }
+                        };
+                        return this.permissionWidget = this.instantiationService.createInstance(PermissionPickerActionItem, action, delegate, pickerOptions);
+                    }
+                    return undefined;
+                }
+            }
+        ));
+        this.secondaryToolbar.getElement().classList.add("chat-secondary-input-toolbar");
+        this.secondaryToolbar.context = {
+            widget
+        };
         let inputModel = this.modelService.getModel(this.inputUri);
         if (!inputModel) {
             inputModel = this.modelService.createModel("", null, this.inputUri, true);
@@ -2207,50 +2332,60 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._chatInputTodoListWidget.value?.clear(sessionResource, force);
     }
     renderQuestionCarousel(carousel, context, options) {
-        if (this._chatQuestionCarouselWidget.value) {
-            const existingCarousel = this._chatQuestionCarouselWidget.value;
-            const existingResolveId = existingCarousel.carousel.resolveId;
-            if (existingResolveId && carousel.resolveId && existingResolveId === carousel.resolveId) {
-                return existingCarousel;
-            }
-            const oldCarousel = existingCarousel.carousel;
-            if (oldCarousel instanceof ChatQuestionCarouselData && !oldCarousel.completion.isSettled) {
-                oldCarousel.completion.complete({
-                    answers: undefined
-                });
-            }
-            this.clearQuestionCarousel();
+        const carouselKey = carousel.resolveId ?? `${isResponseVM(context.element) ? context.element.requestId : ""}_${context.contentIndex}`;
+        const existing = this._chatQuestionCarouselWidgets.get(carouselKey);
+        if (existing) {
+            return existing;
         }
-        this._currentQuestionCarouselResponseId = isResponseVM(context.element) ? context.element.requestId : undefined;
-        this._currentQuestionCarouselSessionResource = isResponseVM(context.element) ? context.element.sessionResource : undefined;
-        const part = this._chatQuestionCarouselDisposables.add(
-            this.instantiationService.createInstance(ChatQuestionCarouselPart, carousel, context, options)
-        );
-        this._chatQuestionCarouselWidget.value = part;
+        if (isResponseVM(context.element)) {
+            this._questionCarouselResponseIds.set(carouselKey, context.element.requestId);
+            this._questionCarouselSessionResources.set(carouselKey, context.element.sessionResource);
+        }
+        const part = this.instantiationService.createInstance(ChatQuestionCarouselPart, carousel, context, options);
+        this._chatQuestionCarouselWidgets.set(carouselKey, part);
         this._hasQuestionCarouselContextKey?.set(true);
-        clearNode(this.chatQuestionCarouselContainer);
         append(this.chatQuestionCarouselContainer, part.domNode);
         return part;
     }
-    clearQuestionCarousel(responseId) {
-        if (responseId && this._currentQuestionCarouselResponseId !== responseId) {
-            return;
+    clearQuestionCarousel(responseId, resolveId) {
+        if (resolveId !== undefined) {
+            const part = this._chatQuestionCarouselWidgets.get(resolveId);
+            if (part) {
+                part.domNode.remove();
+                this._chatQuestionCarouselWidgets.deleteAndDispose(resolveId);
+            }
+            this._questionCarouselResponseIds.delete(resolveId);
+            this._questionCarouselSessionResources.delete(resolveId);
+        } else if (responseId !== undefined) {
+            for (const [key, rid] of this._questionCarouselResponseIds) {
+                if (rid === responseId) {
+                    const part = this._chatQuestionCarouselWidgets.get(key);
+                    if (part) {
+                        part.domNode.remove();
+                        this._chatQuestionCarouselWidgets.deleteAndDispose(key);
+                    }
+                    this._questionCarouselResponseIds.delete(key);
+                    this._questionCarouselSessionResources.delete(key);
+                }
+            }
+        } else {
+            this._chatQuestionCarouselWidgets.clearAndDisposeAll();
+            this._questionCarouselResponseIds.clear();
+            this._questionCarouselSessionResources.clear();
+            clearNode(this.chatQuestionCarouselContainer);
         }
-        this._chatQuestionCarouselDisposables.clear();
-        this._chatQuestionCarouselWidget.clear();
-        this._currentQuestionCarouselResponseId = undefined;
-        this._currentQuestionCarouselSessionResource = undefined;
-        this._hasQuestionCarouselContextKey?.set(false);
-        clearNode(this.chatQuestionCarouselContainer);
-    }
-    get questionCarouselResponseId() {
-        return this._currentQuestionCarouselResponseId;
+        this._hasQuestionCarouselContextKey?.set(this._chatQuestionCarouselWidgets.size > 0);
     }
     get questionCarousel() {
-        return this._chatQuestionCarouselWidget.value;
+        for (const part of ( this._chatQuestionCarouselWidgets.values())) {
+            if (part.hasFocus()) {
+                return part;
+            }
+        }
+        return this._chatQuestionCarouselWidgets.size > 0 ? ( this._chatQuestionCarouselWidgets.values()).next().value : undefined;
     }
     focusQuestionCarousel() {
-        const carousel = this._chatQuestionCarouselWidget.value;
+        const carousel = this.questionCarousel;
         if (carousel) {
             carousel.focus();
             return true;
@@ -2258,15 +2393,19 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return false;
     }
     isQuestionCarouselFocused() {
-        const carousel = this._chatQuestionCarouselWidget.value;
-        return carousel?.hasFocus() ?? false;
+        for (const part of ( this._chatQuestionCarouselWidgets.values())) {
+            if (part.hasFocus()) {
+                return true;
+            }
+        }
+        return false;
     }
     navigateToPreviousQuestion() {
-        const carousel = this._chatQuestionCarouselWidget.value;
+        const carousel = this.questionCarousel;
         return carousel?.navigateToPreviousQuestion() ?? false;
     }
     navigateToNextQuestion() {
-        const carousel = this._chatQuestionCarouselWidget.value;
+        const carousel = this.questionCarousel;
         return carousel?.navigateToNextQuestion() ?? false;
     }
     setWorkingSetCollapsed(collapsed) {
@@ -2386,7 +2525,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(6697, "Toggle changed files."))
+            ariaLabel: ( localize(6784, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -2460,10 +2599,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(6698, "1 file changed")) : ( localize(6699, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(6785, "1 file changed")) : ( localize(6786, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                6700,
+                6787,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,
@@ -2579,6 +2718,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     layout(width) {
         this.cachedWidth = width;
+        this._stableInputPartWidth.set(width, undefined);
         return this._layout(width);
     }
     _layout(width, allowRecurse = true) {
@@ -2587,7 +2727,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.followupsContainer.style.width = `${followupsWidth}px`;
         const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
         const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.inputPartHorizontalPaddingInside - data.toolbarsWidth - data.sideToolbarWidth;
-        const inputEditorHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+        const inputEditorHeight = this.inputEditorMinHeight ? Math.max(
+            this.inputEditorMinHeight,
+            Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight)
+        ) : Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
         const newDimension = {
             width: newEditorWidth,
             height: inputEditorHeight
@@ -2603,18 +2746,19 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     getLayoutData() {
         const inputSideToolbarWidth = this.inputSideToolbarContainer ? getTotalWidth(this.inputSideToolbarContainer) : 0;
         const getToolbarsWidthCompact = () => {
+            const toolbarItemGap = 4;
             const executeToolbarWidth = this.cachedExecuteToolbarWidth = this.executeToolbar.getItemsWidth();
             const inputToolbarWidth = this.cachedInputToolbarWidth = this.inputActionsToolbar.getItemsWidth();
-            const executeToolbarPadding = (this.executeToolbar.getItemsLength() - 1) * 4;
-            const inputToolbarPadding = this.inputActionsToolbar.getItemsLength() ? (this.inputActionsToolbar.getItemsLength() - 1) * 4 : 0;
+            const executeToolbarPadding = (this.executeToolbar.getItemsLength() - 1) * toolbarItemGap;
+            const inputToolbarPadding = this.inputActionsToolbar.getItemsLength() ? (this.inputActionsToolbar.getItemsLength() - 1) * toolbarItemGap : 0;
             const contextUsageWidth = getTotalWidth(this.contextUsageWidgetContainer);
             const inputToolbarsPadding = 12;
             return executeToolbarWidth + executeToolbarPadding + contextUsageWidth + (this.options.renderInputToolbarBelowInput ? 0 : inputToolbarWidth + inputToolbarPadding + inputToolbarsPadding);
         };
         return {
             editorBorder: 2,
-            inputPartHorizontalPadding: this.options.renderStyle === "compact" ? 16 : 32,
-            inputPartHorizontalPaddingInside: 12,
+            inputPartHorizontalPadding: this.options.renderStyle === "compact" ? 16 : 24,
+            inputPartHorizontalPaddingInside: this.options.renderStyle === "compact" ? 12 : 10,
             toolbarsWidth: this.options.renderStyle === "compact" ? getToolbarsWidthCompact() : 0,
             sideToolbarWidth: inputSideToolbarWidth > 0 ? inputSideToolbarWidth + 4  : 0
         };
@@ -2683,5 +2827,14 @@ class ChatSessionPickersContainerActionItem extends ActionViewItem {
         super.dispose();
     }
 }
+class HiddenActionViewItem extends BaseActionViewItem {
+    constructor(action) {
+        super(undefined, action);
+    }
+    render(container) {
+        super.render(container);
+        container.style.display = "none";
+    }
+}
 
 export { ChatInputPart, ChatWidgetLocation };